drm/amd/pm: Add smu feature interface functions

Instead of using bitmap operations, add wrapper interface functions to
operate on smu features.

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Asad Kamal <asad.kamal@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 3f70731105a2329275343c37e54ab56a734956b9..b635792f59068cc22db314f2373ed1ed8f57906a 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -693,7 +693,6 @@ static int smu_sys_set_pp_table(void *handle,
 
 static int smu_get_driver_allowed_feature_mask(struct smu_context *smu)
 {
-       struct smu_feature *feature = &smu->smu_feature;
        uint32_t allowed_feature_mask[SMU_FEATURE_MAX/32];
        int ret = 0;
 
@@ -705,20 +704,19 @@ static int smu_get_driver_allowed_feature_mask(struct smu_context *smu)
         * such scenario.
         */
        if (smu->adev->scpm_enabled) {
-               bitmap_fill(feature->allowed, SMU_FEATURE_MAX);
+               smu_feature_list_set_all(smu, SMU_FEATURE_LIST_ALLOWED);
                return 0;
        }
 
-       bitmap_zero(feature->allowed, SMU_FEATURE_MAX);
+       smu_feature_list_clear_all(smu, SMU_FEATURE_LIST_ALLOWED);
 
        ret = smu_get_allowed_feature_mask(smu, allowed_feature_mask,
                                             SMU_FEATURE_MAX/32);
        if (ret)
                return ret;
 
-       bitmap_or(feature->allowed, feature->allowed,
-                     (unsigned long *)allowed_feature_mask,
-                     feature->feature_num);
+       smu_feature_list_add_bits(smu, SMU_FEATURE_LIST_ALLOWED,
+                                 (unsigned long *)allowed_feature_mask);
 
        return ret;
 }
@@ -1368,9 +1366,7 @@ static int smu_sw_init(struct amdgpu_ip_block *ip_block)
        int i, ret;
 
        smu->pool_size = adev->pm.smu_prv_buffer_size;
-       smu->smu_feature.feature_num = SMU_FEATURE_MAX;
-       bitmap_zero(smu->smu_feature.supported, SMU_FEATURE_MAX);
-       bitmap_zero(smu->smu_feature.allowed, SMU_FEATURE_MAX);
+       smu_feature_init(smu, SMU_FEATURE_MAX);
 
        INIT_WORK(&smu->throttling_logging_work, smu_throttling_logging_work_fn);
        INIT_WORK(&smu->interrupt_work, smu_interrupt_work_fn);
@@ -1659,7 +1655,6 @@ static void smu_wbrf_fini(struct smu_context *smu)
 
 static int smu_smc_hw_setup(struct smu_context *smu)
 {
-       struct smu_feature *feature = &smu->smu_feature;
        struct amdgpu_device *adev = smu->adev;
        uint8_t pcie_gen = 0, pcie_width = 0;
        uint64_t features_supported;
@@ -1822,9 +1817,8 @@ static int smu_smc_hw_setup(struct smu_context *smu)
                dev_err(adev->dev, "Failed to retrieve supported dpm features!\n");
                return ret;
        }
-       bitmap_copy(feature->supported,
-                   (unsigned long *)&features_supported,
-                   feature->feature_num);
+       smu_feature_list_set_bits(smu, SMU_FEATURE_LIST_SUPPORTED,
+                                 (unsigned long *)&features_supported);
 
        if (!smu_is_dpm_running(smu))
                dev_info(adev->dev, "dpm has been disabled\n");

diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
index 017df903a7bde279a4e21ea2a587130efdd3f088..2290298579e1ec20c289bc1b38a31fc41fb32302 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
@@ -477,10 +477,15 @@ struct smu_feature_bits {
        DECLARE_BITMAP(bits, SMU_FEATURE_MAX);
 };
 
+enum smu_feature_list {
+       SMU_FEATURE_LIST_SUPPORTED,
+       SMU_FEATURE_LIST_ALLOWED,
+       SMU_FEATURE_LIST_MAX,
+};
+
 struct smu_feature {
        uint32_t feature_num;
-       DECLARE_BITMAP(supported, SMU_FEATURE_MAX);
-       DECLARE_BITMAP(allowed, SMU_FEATURE_MAX);
+       struct smu_feature_bits bits[SMU_FEATURE_LIST_MAX];
 };
 
 struct smu_clocks {
@@ -2055,4 +2060,99 @@ static inline void smu_feature_bits_or(struct smu_feature_bits *dst,
        bitmap_or(dst->bits, src1->bits, src2, nbits);
 }
 
+static inline struct smu_feature_bits *
+__smu_feature_get_list(struct smu_context *smu, enum smu_feature_list list)
+{
+       if (unlikely(list >= SMU_FEATURE_LIST_MAX)) {
+               dev_warn(smu->adev->dev, "Invalid feature list: %d\n", list);
+               return &smu->smu_feature.bits[SMU_FEATURE_LIST_SUPPORTED];
+       }
+
+       return &smu->smu_feature.bits[list];
+}
+
+static inline bool smu_feature_list_is_set(struct smu_context *smu,
+                                          enum smu_feature_list list,
+                                          unsigned int bit)
+{
+       if (bit >= smu->smu_feature.feature_num)
+               return false;
+
+       return smu_feature_bits_is_set(__smu_feature_get_list(smu, list), bit);
+}
+
+static inline void smu_feature_list_set_bit(struct smu_context *smu,
+                                           enum smu_feature_list list,
+                                           unsigned int bit)
+{
+       if (bit >= smu->smu_feature.feature_num)
+               return;
+
+       smu_feature_bits_set_bit(__smu_feature_get_list(smu, list), bit);
+}
+
+static inline void smu_feature_list_clear_bit(struct smu_context *smu,
+                                             enum smu_feature_list list,
+                                             unsigned int bit)
+{
+       if (bit >= smu->smu_feature.feature_num)
+               return;
+
+       smu_feature_bits_clear_bit(__smu_feature_get_list(smu, list), bit);
+}
+
+static inline void smu_feature_list_set_all(struct smu_context *smu,
+                                           enum smu_feature_list list)
+{
+       smu_feature_bits_fill(__smu_feature_get_list(smu, list));
+}
+
+static inline void smu_feature_list_clear_all(struct smu_context *smu,
+                                             enum smu_feature_list list)
+{
+       smu_feature_bits_clearall(__smu_feature_get_list(smu, list));
+}
+
+static inline bool smu_feature_list_is_empty(struct smu_context *smu,
+                                            enum smu_feature_list list)
+{
+       return smu_feature_bits_empty(__smu_feature_get_list(smu, list),
+                                     smu->smu_feature.feature_num);
+}
+
+static inline void smu_feature_list_set_bits(struct smu_context *smu,
+                                            enum smu_feature_list dst_list,
+                                            const unsigned long *src)
+{
+       smu_feature_bits_copy(__smu_feature_get_list(smu, dst_list), src,
+                             smu->smu_feature.feature_num);
+}
+
+static inline void smu_feature_list_add_bits(struct smu_context *smu,
+                                            enum smu_feature_list list,
+                                            const unsigned long *src)
+{
+       struct smu_feature_bits *bits = __smu_feature_get_list(smu, list);
+
+       smu_feature_bits_or(bits, bits, src, smu->smu_feature.feature_num);
+}
+
+static inline void smu_feature_list_to_arr32(struct smu_context *smu,
+                                            enum smu_feature_list list,
+                                            uint32_t *arr)
+{
+       smu_feature_bits_to_arr32(__smu_feature_get_list(smu, list), arr,
+                                 smu->smu_feature.feature_num);
+}
+
+static inline void smu_feature_init(struct smu_context *smu, int feature_num)
+{
+       if (!feature_num || smu->smu_feature.feature_num != 0)
+               return;
+
+       smu->smu_feature.feature_num = feature_num;
+       smu_feature_list_clear_all(smu, SMU_FEATURE_LIST_SUPPORTED);
+       smu_feature_list_clear_all(smu, SMU_FEATURE_LIST_ALLOWED);
+}
+
 #endif

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index eb1b9faf8e5c34983dfd7742cf69e031180348cc..1d0f9f8ddf9b5190412b4bdc3f010ee07c93b723 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
@@ -750,12 +750,13 @@ int smu_v11_0_set_allowed_mask(struct smu_context *smu)
        int ret = 0;
        uint32_t feature_mask[2];
 
-       if (bitmap_empty(feature->allowed, SMU_FEATURE_MAX) || feature->feature_num < 64) {
+       if (smu_feature_list_is_empty(smu, SMU_FEATURE_LIST_ALLOWED) ||
+           feature->feature_num < 64) {
                ret = -EINVAL;
                goto failed;
        }
 
-       bitmap_to_arr32(feature_mask, feature->allowed, 64);
+       smu_feature_list_to_arr32(smu, SMU_FEATURE_LIST_ALLOWED, feature_mask);
 
        ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetAllowedFeaturesMaskHigh,
                                          feature_mask[1], NULL);

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
index 70581326dc368f0bc5b9f9db51b74e9a421fbd58..3b0aa6a2e78edf4ac5f5f9bf5769359d27d4eb85 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
@@ -761,11 +761,11 @@ int smu_v13_0_set_allowed_mask(struct smu_context *smu)
        int ret = 0;
        uint32_t feature_mask[2];
 
-       if (bitmap_empty(feature->allowed, SMU_FEATURE_MAX) ||
+       if (smu_feature_list_is_empty(smu, SMU_FEATURE_LIST_ALLOWED) ||
            feature->feature_num < 64)
                return -EINVAL;
 
-       bitmap_to_arr32(feature_mask, feature->allowed, 64);
+       smu_feature_list_to_arr32(smu, SMU_FEATURE_LIST_ALLOWED, feature_mask);
 
        ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetAllowedFeaturesMaskHigh,
                                              feature_mask[1], NULL);

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
index 17caf98bd6ddc2c380c9d44b7ef3da49b51a4356..cabbd234c6e2c19914e587b9bdd8d26e2333357c 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
@@ -746,11 +746,11 @@ int smu_v14_0_set_allowed_mask(struct smu_context *smu)
        int ret = 0;
        uint32_t feature_mask[2];
 
-       if (bitmap_empty(feature->allowed, SMU_FEATURE_MAX) ||
+       if (smu_feature_list_is_empty(smu, SMU_FEATURE_LIST_ALLOWED) ||
            feature->feature_num < 64)
                return -EINVAL;
 
-       bitmap_to_arr32(feature_mask, feature->allowed, 64);
+       smu_feature_list_to_arr32(smu, SMU_FEATURE_LIST_ALLOWED, feature_mask);
 
        ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetAllowedFeaturesMaskHigh,
                                              feature_mask[1], NULL);

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c
index 6557085a7c728a717391e4e09df95b7b7617e83b..d77eaac556d9b94c74495c844a1cab203452b91d 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c
@@ -715,11 +715,11 @@ int smu_v15_0_set_allowed_mask(struct smu_context *smu)
        int ret = 0;
        uint32_t feature_mask[2];
 
-       if (bitmap_empty(feature->allowed, SMU_FEATURE_MAX) ||
+       if (smu_feature_list_is_empty(smu, SMU_FEATURE_LIST_ALLOWED) ||
            feature->feature_num < 64)
                return -EINVAL;
 
-       bitmap_to_arr32(feature_mask, feature->allowed, 64);
+       smu_feature_list_to_arr32(smu, SMU_FEATURE_LIST_ALLOWED, feature_mask);
 
        ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetAllowedFeaturesMaskHigh,
                                              feature_mask[1], NULL);

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
index 24835600c1cd83450fdebcc20eab2bbb7fc19700..9bb7e3760c0ff3f9a407d077ad99badf41de3149 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
@@ -677,7 +677,6 @@ int smu_cmn_to_asic_specific_index(struct smu_context *smu,
 int smu_cmn_feature_is_supported(struct smu_context *smu,
                                 enum smu_feature_mask mask)
 {
-       struct smu_feature *feature = &smu->smu_feature;
        int feature_id;
 
        feature_id = smu_cmn_to_asic_specific_index(smu,
@@ -686,9 +685,8 @@ int smu_cmn_feature_is_supported(struct smu_context *smu,
        if (feature_id < 0)
                return 0;
 
-       WARN_ON(feature_id > feature->feature_num);
-
-       return test_bit(feature_id, feature->supported);
+       return smu_feature_list_is_set(smu, SMU_FEATURE_LIST_SUPPORTED,
+                                      feature_id);
 }
 
 static int __smu_get_enabled_features(struct smu_context *smu,