platform/x86/amd/pmf: Add helper routine to check pprof is balanced

[ Upstream commit 16909aa8c9cc284085f1202c6403ecb9814af812 ]

Add helper routine to check if the current platform profile
is balanced mode and remove duplicate code occurrences.

Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Link: https://lore.kernel.org/r/20230125095936.3292883-3-Shyam-sundar.S-k@amd.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Stable-dep-of: f21bf62290dd ("platform/x86/amd/pmf: Fix to update SPS thermals when power supply change")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/platform/x86/amd/pmf/cnqf.c b/drivers/platform/x86/amd/pmf/cnqf.c
index ef2ac30ff15ecae59a9a3e9b49ab00f16600f7fd..f39275ec5cc943438aed8bd3762d8100fe0c3cbb 100644 (file)
--- a/drivers/platform/x86/amd/pmf/cnqf.c
+++ b/drivers/platform/x86/amd/pmf/cnqf.c
@@ -103,7 +103,7 @@ int amd_pmf_trans_cnqf(struct amd_pmf_dev *dev, int socket_power, ktime_t time_l
 
        src = amd_pmf_cnqf_get_power_source(dev);
 
-       if (dev->current_profile == PLATFORM_PROFILE_BALANCED) {
+       if (is_pprof_balanced(dev)) {
                amd_pmf_set_cnqf(dev, src, config_store.current_mode, NULL);
        } else {
                /*
@@ -317,7 +317,7 @@ static ssize_t cnqf_enable_store(struct device *dev,
        src = amd_pmf_cnqf_get_power_source(pdev);
        pdev->cnqf_enabled = input;
 
-       if (pdev->cnqf_enabled && pdev->current_profile == PLATFORM_PROFILE_BALANCED) {
+       if (pdev->cnqf_enabled && is_pprof_balanced(pdev)) {
                amd_pmf_set_cnqf(pdev, src, config_store.current_mode, NULL);
        } else {
                if (is_apmf_func_supported(pdev, APMF_FUNC_STATIC_SLIDER_GRANULAR))
@@ -382,7 +382,7 @@ int amd_pmf_init_cnqf(struct amd_pmf_dev *dev)
        dev->cnqf_enabled = amd_pmf_check_flags(dev);
 
        /* update the thermal for CnQF */
-       if (dev->cnqf_enabled && dev->current_profile == PLATFORM_PROFILE_BALANCED) {
+       if (dev->cnqf_enabled && is_pprof_balanced(dev)) {
                src = amd_pmf_cnqf_get_power_source(dev);
                amd_pmf_set_cnqf(dev, src, config_store.current_mode, NULL);
        }

diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h
index b5b77a353b965ba11de0c0696448b805fe8df71e..b94e1a9030f8fab5a5891304a35730ae1f1d6b5c 100644 (file)
--- a/drivers/platform/x86/amd/pmf/pmf.h
+++ b/drivers/platform/x86/amd/pmf/pmf.h
@@ -391,6 +391,7 @@ int amd_pmf_init_sps(struct amd_pmf_dev *dev);
 void amd_pmf_deinit_sps(struct amd_pmf_dev *dev);
 int apmf_get_static_slider_granular(struct amd_pmf_dev *pdev,
                                    struct apmf_static_slider_granular_output *output);
+bool is_pprof_balanced(struct amd_pmf_dev *pmf);
 
 
 int apmf_update_fan_idx(struct amd_pmf_dev *pdev, bool manual, u32 idx);

diff --git a/drivers/platform/x86/amd/pmf/sps.c b/drivers/platform/x86/amd/pmf/sps.c
index 5bccea137bda48661906928a64980a62f8371737..bed762d47a14a5edcf39e78387041834d4c2033f 100644 (file)
--- a/drivers/platform/x86/amd/pmf/sps.c
+++ b/drivers/platform/x86/amd/pmf/sps.c
@@ -83,6 +83,11 @@ int amd_pmf_set_sps_power_limits(struct amd_pmf_dev *pmf)
        return 0;
 }
 
+bool is_pprof_balanced(struct amd_pmf_dev *pmf)
+{
+       return (pmf->current_profile == PLATFORM_PROFILE_BALANCED) ? true : false;
+}
+
 static int amd_pmf_profile_get(struct platform_profile_handler *pprof,
                               enum platform_profile_option *profile)
 {