Skip to content

Commit c99d381

Browse files
Lijo Lazaralexdeucher
Lijo Lazar
authored and
alexdeucher
committed
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>
1 parent f28b0a1 commit c99d381

7 files changed

Lines changed: 120 additions & 27 deletions

File tree

‎drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,6 @@ static int smu_sys_set_pp_table(void *handle,
693693

694694
static int smu_get_driver_allowed_feature_mask(struct smu_context *smu)
695695
{
696-
struct smu_feature *feature = &smu->smu_feature;
697696
uint32_t allowed_feature_mask[SMU_FEATURE_MAX/32];
698697
int ret = 0;
699698

@@ -705,20 +704,19 @@ static int smu_get_driver_allowed_feature_mask(struct smu_context *smu)
705704
* such scenario.
706705
*/
707706
if (smu->adev->scpm_enabled) {
708-
bitmap_fill(feature->allowed, SMU_FEATURE_MAX);
707+
smu_feature_list_set_all(smu, SMU_FEATURE_LIST_ALLOWED);
709708
return 0;
710709
}
711710

712-
bitmap_zero(feature->allowed, SMU_FEATURE_MAX);
711+
smu_feature_list_clear_all(smu, SMU_FEATURE_LIST_ALLOWED);
713712

714713
ret = smu_get_allowed_feature_mask(smu, allowed_feature_mask,
715714
SMU_FEATURE_MAX/32);
716715
if (ret)
717716
return ret;
718717

719-
bitmap_or(feature->allowed, feature->allowed,
720-
(unsigned long *)allowed_feature_mask,
721-
feature->feature_num);
718+
smu_feature_list_add_bits(smu, SMU_FEATURE_LIST_ALLOWED,
719+
(unsigned long *)allowed_feature_mask);
722720

723721
return ret;
724722
}
@@ -1368,9 +1366,7 @@ static int smu_sw_init(struct amdgpu_ip_block *ip_block)
13681366
int i, ret;
13691367

13701368
smu->pool_size = adev->pm.smu_prv_buffer_size;
1371-
smu->smu_feature.feature_num = SMU_FEATURE_MAX;
1372-
bitmap_zero(smu->smu_feature.supported, SMU_FEATURE_MAX);
1373-
bitmap_zero(smu->smu_feature.allowed, SMU_FEATURE_MAX);
1369+
smu_feature_init(smu, SMU_FEATURE_MAX);
13741370

13751371
INIT_WORK(&smu->throttling_logging_work, smu_throttling_logging_work_fn);
13761372
INIT_WORK(&smu->interrupt_work, smu_interrupt_work_fn);
@@ -1659,7 +1655,6 @@ static void smu_wbrf_fini(struct smu_context *smu)
16591655

16601656
static int smu_smc_hw_setup(struct smu_context *smu)
16611657
{
1662-
struct smu_feature *feature = &smu->smu_feature;
16631658
struct amdgpu_device *adev = smu->adev;
16641659
uint8_t pcie_gen = 0, pcie_width = 0;
16651660
uint64_t features_supported;
@@ -1822,9 +1817,8 @@ static int smu_smc_hw_setup(struct smu_context *smu)
18221817
dev_err(adev->dev, "Failed to retrieve supported dpm features!\n");
18231818
return ret;
18241819
}
1825-
bitmap_copy(feature->supported,
1826-
(unsigned long *)&features_supported,
1827-
feature->feature_num);
1820+
smu_feature_list_set_bits(smu, SMU_FEATURE_LIST_SUPPORTED,
1821+
(unsigned long *)&features_supported);
18281822

18291823
if (!smu_is_dpm_running(smu))
18301824
dev_info(adev->dev, "dpm has been disabled\n");

‎drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h‎

Lines changed: 102 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,10 +477,15 @@ struct smu_feature_bits {
477477
DECLARE_BITMAP(bits, SMU_FEATURE_MAX);
478478
};
479479

480+
enum smu_feature_list {
481+
SMU_FEATURE_LIST_SUPPORTED,
482+
SMU_FEATURE_LIST_ALLOWED,
483+
SMU_FEATURE_LIST_MAX,
484+
};
485+
480486
struct smu_feature {
481487
uint32_t feature_num;
482-
DECLARE_BITMAP(supported, SMU_FEATURE_MAX);
483-
DECLARE_BITMAP(allowed, SMU_FEATURE_MAX);
488+
struct smu_feature_bits bits[SMU_FEATURE_LIST_MAX];
484489
};
485490

486491
struct smu_clocks {
@@ -2055,4 +2060,99 @@ static inline void smu_feature_bits_or(struct smu_feature_bits *dst,
20552060
bitmap_or(dst->bits, src1->bits, src2, nbits);
20562061
}
20572062

2063+
static inline struct smu_feature_bits *
2064+
__smu_feature_get_list(struct smu_context *smu, enum smu_feature_list list)
2065+
{
2066+
if (unlikely(list >= SMU_FEATURE_LIST_MAX)) {
2067+
dev_warn(smu->adev->dev, "Invalid feature list: %d\n", list);
2068+
return &smu->smu_feature.bits[SMU_FEATURE_LIST_SUPPORTED];
2069+
}
2070+
2071+
return &smu->smu_feature.bits[list];
2072+
}
2073+
2074+
static inline bool smu_feature_list_is_set(struct smu_context *smu,
2075+
enum smu_feature_list list,
2076+
unsigned int bit)
2077+
{
2078+
if (bit >= smu->smu_feature.feature_num)
2079+
return false;
2080+
2081+
return smu_feature_bits_is_set(__smu_feature_get_list(smu, list), bit);
2082+
}
2083+
2084+
static inline void smu_feature_list_set_bit(struct smu_context *smu,
2085+
enum smu_feature_list list,
2086+
unsigned int bit)
2087+
{
2088+
if (bit >= smu->smu_feature.feature_num)
2089+
return;
2090+
2091+
smu_feature_bits_set_bit(__smu_feature_get_list(smu, list), bit);
2092+
}
2093+
2094+
static inline void smu_feature_list_clear_bit(struct smu_context *smu,
2095+
enum smu_feature_list list,
2096+
unsigned int bit)
2097+
{
2098+
if (bit >= smu->smu_feature.feature_num)
2099+
return;
2100+
2101+
smu_feature_bits_clear_bit(__smu_feature_get_list(smu, list), bit);
2102+
}
2103+
2104+
static inline void smu_feature_list_set_all(struct smu_context *smu,
2105+
enum smu_feature_list list)
2106+
{
2107+
smu_feature_bits_fill(__smu_feature_get_list(smu, list));
2108+
}
2109+
2110+
static inline void smu_feature_list_clear_all(struct smu_context *smu,
2111+
enum smu_feature_list list)
2112+
{
2113+
smu_feature_bits_clearall(__smu_feature_get_list(smu, list));
2114+
}
2115+
2116+
static inline bool smu_feature_list_is_empty(struct smu_context *smu,
2117+
enum smu_feature_list list)
2118+
{
2119+
return smu_feature_bits_empty(__smu_feature_get_list(smu, list),
2120+
smu->smu_feature.feature_num);
2121+
}
2122+
2123+
static inline void smu_feature_list_set_bits(struct smu_context *smu,
2124+
enum smu_feature_list dst_list,
2125+
const unsigned long *src)
2126+
{
2127+
smu_feature_bits_copy(__smu_feature_get_list(smu, dst_list), src,
2128+
smu->smu_feature.feature_num);
2129+
}
2130+
2131+
static inline void smu_feature_list_add_bits(struct smu_context *smu,
2132+
enum smu_feature_list list,
2133+
const unsigned long *src)
2134+
{
2135+
struct smu_feature_bits *bits = __smu_feature_get_list(smu, list);
2136+
2137+
smu_feature_bits_or(bits, bits, src, smu->smu_feature.feature_num);
2138+
}
2139+
2140+
static inline void smu_feature_list_to_arr32(struct smu_context *smu,
2141+
enum smu_feature_list list,
2142+
uint32_t *arr)
2143+
{
2144+
smu_feature_bits_to_arr32(__smu_feature_get_list(smu, list), arr,
2145+
smu->smu_feature.feature_num);
2146+
}
2147+
2148+
static inline void smu_feature_init(struct smu_context *smu, int feature_num)
2149+
{
2150+
if (!feature_num || smu->smu_feature.feature_num != 0)
2151+
return;
2152+
2153+
smu->smu_feature.feature_num = feature_num;
2154+
smu_feature_list_clear_all(smu, SMU_FEATURE_LIST_SUPPORTED);
2155+
smu_feature_list_clear_all(smu, SMU_FEATURE_LIST_ALLOWED);
2156+
}
2157+
20582158
#endif

‎drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -750,12 +750,13 @@ int smu_v11_0_set_allowed_mask(struct smu_context *smu)
750750
int ret = 0;
751751
uint32_t feature_mask[2];
752752

753-
if (bitmap_empty(feature->allowed, SMU_FEATURE_MAX) || feature->feature_num < 64) {
753+
if (smu_feature_list_is_empty(smu, SMU_FEATURE_LIST_ALLOWED) ||
754+
feature->feature_num < 64) {
754755
ret = -EINVAL;
755756
goto failed;
756757
}
757758

758-
bitmap_to_arr32(feature_mask, feature->allowed, 64);
759+
smu_feature_list_to_arr32(smu, SMU_FEATURE_LIST_ALLOWED, feature_mask);
759760

760761
ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetAllowedFeaturesMaskHigh,
761762
feature_mask[1], NULL);

‎drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -761,11 +761,11 @@ int smu_v13_0_set_allowed_mask(struct smu_context *smu)
761761
int ret = 0;
762762
uint32_t feature_mask[2];
763763

764-
if (bitmap_empty(feature->allowed, SMU_FEATURE_MAX) ||
764+
if (smu_feature_list_is_empty(smu, SMU_FEATURE_LIST_ALLOWED) ||
765765
feature->feature_num < 64)
766766
return -EINVAL;
767767

768-
bitmap_to_arr32(feature_mask, feature->allowed, 64);
768+
smu_feature_list_to_arr32(smu, SMU_FEATURE_LIST_ALLOWED, feature_mask);
769769

770770
ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetAllowedFeaturesMaskHigh,
771771
feature_mask[1], NULL);

‎drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -746,11 +746,11 @@ int smu_v14_0_set_allowed_mask(struct smu_context *smu)
746746
int ret = 0;
747747
uint32_t feature_mask[2];
748748

749-
if (bitmap_empty(feature->allowed, SMU_FEATURE_MAX) ||
749+
if (smu_feature_list_is_empty(smu, SMU_FEATURE_LIST_ALLOWED) ||
750750
feature->feature_num < 64)
751751
return -EINVAL;
752752

753-
bitmap_to_arr32(feature_mask, feature->allowed, 64);
753+
smu_feature_list_to_arr32(smu, SMU_FEATURE_LIST_ALLOWED, feature_mask);
754754

755755
ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetAllowedFeaturesMaskHigh,
756756
feature_mask[1], NULL);

‎drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -715,11 +715,11 @@ int smu_v15_0_set_allowed_mask(struct smu_context *smu)
715715
int ret = 0;
716716
uint32_t feature_mask[2];
717717

718-
if (bitmap_empty(feature->allowed, SMU_FEATURE_MAX) ||
718+
if (smu_feature_list_is_empty(smu, SMU_FEATURE_LIST_ALLOWED) ||
719719
feature->feature_num < 64)
720720
return -EINVAL;
721721

722-
bitmap_to_arr32(feature_mask, feature->allowed, 64);
722+
smu_feature_list_to_arr32(smu, SMU_FEATURE_LIST_ALLOWED, feature_mask);
723723

724724
ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetAllowedFeaturesMaskHigh,
725725
feature_mask[1], NULL);

‎drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,6 @@ int smu_cmn_to_asic_specific_index(struct smu_context *smu,
677677
int smu_cmn_feature_is_supported(struct smu_context *smu,
678678
enum smu_feature_mask mask)
679679
{
680-
struct smu_feature *feature = &smu->smu_feature;
681680
int feature_id;
682681

683682
feature_id = smu_cmn_to_asic_specific_index(smu,
@@ -686,9 +685,8 @@ int smu_cmn_feature_is_supported(struct smu_context *smu,
686685
if (feature_id < 0)
687686
return 0;
688687

689-
WARN_ON(feature_id > feature->feature_num);
690-
691-
return test_bit(feature_id, feature->supported);
688+
return smu_feature_list_is_set(smu, SMU_FEATURE_LIST_SUPPORTED,
689+
feature_id);
692690
}
693691

694692
static int __smu_get_enabled_features(struct smu_context *smu,

0 commit comments

Comments
 (0)