[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <bf149e17-5199-4242-8986-0660b972848d@gmx.de>
Date: Wed, 6 Nov 2024 04:32:23 +0100
From: Armin Wolf <W_Armin@....de>
To: Mario Limonciello <mario.limonciello@....com>,
Hans de Goede <hdegoede@...hat.com>,
Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
Cc: "Rafael J . Wysocki" <rafael@...nel.org>, Len Brown <lenb@...nel.org>,
Maximilian Luz <luzmaximilian@...il.com>, Lee Chun-Yi <jlee@...e.com>,
Shyam Sundar S K <Shyam-sundar.S-k@....com>,
Corentin Chary <corentin.chary@...il.com>, "Luke D . Jones"
<luke@...nes.dev>, Ike Panhc <ike.pan@...onical.com>,
Henrique de Moraes Holschuh <hmh@....eng.br>,
Alexis Belmonte <alexbelm48@...il.com>,
Uwe Kleine-König <u.kleine-koenig@...gutronix.de>,
Ai Chao <aichao@...inos.cn>, Gergo Koteles <soyer@....hu>,
open list <linux-kernel@...r.kernel.org>,
"open list:ACPI" <linux-acpi@...r.kernel.org>,
"open list:MICROSOFT SURFACE PLATFORM PROFILE DRIVER"
<platform-driver-x86@...r.kernel.org>,
"open list:THINKPAD ACPI EXTRAS DRIVER"
<ibm-acpi-devel@...ts.sourceforge.net>,
Mark Pearson <mpearson-lenovo@...ebb.ca>,
Matthew Schwartz <matthew.schwartz@...ux.dev>
Subject: Re: [PATCH v4 03/20] ACPI: platform_profile: Add device pointer into
platform profile handler
Am 05.11.24 um 16:32 schrieb Mario Limonciello:
> In order to let platform profile handlers manage platform profile
> for their driver the core code will need a pointer to the device.
>
> Add this to the structure and use it in the trivial driver cases.
>
> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
> Reviewed-by: Maximilian Luz <luzmaximilian@...il.com>
> Reviewed-by: Mark Pearson <mpearson-lenovo@...ebb.ca>
> Signed-off-by: Mario Limonciello <mario.limonciello@....com>
> ---
> v4:
> * add alienware-wmi too
> ---
> drivers/acpi/platform_profile.c | 5 +++++
> drivers/platform/surface/surface_platform_profile.c | 1 +
> drivers/platform/x86/acer-wmi.c | 5 +++--
> drivers/platform/x86/amd/pmf/sps.c | 1 +
> drivers/platform/x86/asus-wmi.c | 1 +
> drivers/platform/x86/dell/alienware-wmi.c | 5 +++--
> drivers/platform/x86/dell/dell-pc.c | 1 +
> drivers/platform/x86/hp/hp-wmi.c | 5 +++--
> drivers/platform/x86/ideapad-laptop.c | 1 +
> drivers/platform/x86/inspur_platform_profile.c | 1 +
> drivers/platform/x86/thinkpad_acpi.c | 1 +
> include/linux/platform_profile.h | 1 +
> 12 files changed, 22 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/acpi/platform_profile.c b/drivers/acpi/platform_profile.c
> index d2f7fd7743a13..5d9f3f7ba71c5 100644
> --- a/drivers/acpi/platform_profile.c
> +++ b/drivers/acpi/platform_profile.c
> @@ -179,6 +179,11 @@ int platform_profile_register(struct platform_profile_handler *pprof)
> {
> int err;
>
> + if (!pprof->dev) {
> + pr_err("platform_profile: handler device is not set\n");
> + return -EINVAL;
> + }
Is there a reason why we require "dev" to be set? AFAIK having no parent device should be ok.
Thanks,
Armin Wolf
> +
> mutex_lock(&profile_lock);
> /* We can only have one active profile */
> if (cur_profile) {
> diff --git a/drivers/platform/surface/surface_platform_profile.c b/drivers/platform/surface/surface_platform_profile.c
> index 61aa488a80eb5..5f45f8e8cd69b 100644
> --- a/drivers/platform/surface/surface_platform_profile.c
> +++ b/drivers/platform/surface/surface_platform_profile.c
> @@ -212,6 +212,7 @@ static int surface_platform_profile_probe(struct ssam_device *sdev)
> tpd->sdev = sdev;
>
> tpd->handler.name = "Surface Platform Profile";
> + tpd->handler.dev = &sdev->dev;
> tpd->handler.profile_get = ssam_platform_profile_get;
> tpd->handler.profile_set = ssam_platform_profile_set;
>
> diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
> index 53fbc9b4d3df7..aca4a5746bee1 100644
> --- a/drivers/platform/x86/acer-wmi.c
> +++ b/drivers/platform/x86/acer-wmi.c
> @@ -1873,12 +1873,13 @@ acer_predator_v4_platform_profile_set(struct platform_profile_handler *pprof,
> return 0;
> }
>
> -static int acer_platform_profile_setup(void)
> +static int acer_platform_profile_setup(struct platform_device *device)
> {
> if (quirks->predator_v4) {
> int err;
>
> platform_profile_handler.name = "acer-wmi";
> + platform_profile_handler.dev = &device->dev;
> platform_profile_handler.profile_get =
> acer_predator_v4_platform_profile_get;
> platform_profile_handler.profile_set =
> @@ -2531,7 +2532,7 @@ static int acer_platform_probe(struct platform_device *device)
> goto error_rfkill;
>
> if (has_cap(ACER_CAP_PLATFORM_PROFILE)) {
> - err = acer_platform_profile_setup();
> + err = acer_platform_profile_setup(device);
> if (err)
> goto error_platform_profile;
> }
> diff --git a/drivers/platform/x86/amd/pmf/sps.c b/drivers/platform/x86/amd/pmf/sps.c
> index e2d0cc92c4396..1b94af7c0e0c4 100644
> --- a/drivers/platform/x86/amd/pmf/sps.c
> +++ b/drivers/platform/x86/amd/pmf/sps.c
> @@ -406,6 +406,7 @@ int amd_pmf_init_sps(struct amd_pmf_dev *dev)
> }
>
> dev->pprof.name = "amd-pmf";
> + dev->pprof.dev = dev->dev;
> dev->pprof.profile_get = amd_pmf_profile_get;
> dev->pprof.profile_set = amd_pmf_profile_set;
>
> diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
> index c7c104c65a85a..78621b2af0ddb 100644
> --- a/drivers/platform/x86/asus-wmi.c
> +++ b/drivers/platform/x86/asus-wmi.c
> @@ -3911,6 +3911,7 @@ static int platform_profile_setup(struct asus_wmi *asus)
> dev_info(dev, "Using throttle_thermal_policy for platform_profile support\n");
>
> asus->platform_profile_handler.name = "asus-wmi";
> + asus->platform_profile_handler.dev = dev;
> asus->platform_profile_handler.profile_get = asus_wmi_platform_profile_get;
> asus->platform_profile_handler.profile_set = asus_wmi_platform_profile_set;
>
> diff --git a/drivers/platform/x86/dell/alienware-wmi.c b/drivers/platform/x86/dell/alienware-wmi.c
> index ac0038afd98fa..c03b1aa7dfb5f 100644
> --- a/drivers/platform/x86/dell/alienware-wmi.c
> +++ b/drivers/platform/x86/dell/alienware-wmi.c
> @@ -1017,7 +1017,7 @@ static int thermal_profile_set(struct platform_profile_handler *pprof,
> return wmax_thermal_control(supported_thermal_profiles[profile]);
> }
>
> -static int create_thermal_profile(void)
> +static int create_thermal_profile(struct platform_device *platform_device)
> {
> u32 out_data;
> enum wmax_thermal_mode mode;
> @@ -1057,6 +1057,7 @@ static int create_thermal_profile(void)
> pp_handler.profile_get = thermal_profile_get;
> pp_handler.profile_set = thermal_profile_set;
> pp_handler.name = "alienware-wmi";
> + pp_handler.dev = &platform_device->dev;
>
> return platform_profile_register(&pp_handler);
> }
> @@ -1125,7 +1126,7 @@ static int __init alienware_wmi_init(void)
> }
>
> if (quirks->thermal) {
> - ret = create_thermal_profile();
> + ret = create_thermal_profile(platform_device);
> if (ret)
> goto fail_prep_thermal_profile;
> }
> diff --git a/drivers/platform/x86/dell/dell-pc.c b/drivers/platform/x86/dell/dell-pc.c
> index b145fedb6b710..730f97aab70cd 100644
> --- a/drivers/platform/x86/dell/dell-pc.c
> +++ b/drivers/platform/x86/dell/dell-pc.c
> @@ -260,6 +260,7 @@ static int thermal_init(void)
> goto cleanup_platform_device;
> }
> thermal_handler->name = "dell-pc";
> + thermal_handler->dev = &platform_device->dev;
> thermal_handler->profile_get = thermal_platform_profile_get;
> thermal_handler->profile_set = thermal_platform_profile_set;
>
> diff --git a/drivers/platform/x86/hp/hp-wmi.c b/drivers/platform/x86/hp/hp-wmi.c
> index 26cac73caf2b9..ffb09799142bc 100644
> --- a/drivers/platform/x86/hp/hp-wmi.c
> +++ b/drivers/platform/x86/hp/hp-wmi.c
> @@ -1565,7 +1565,7 @@ static inline void omen_unregister_powersource_event_handler(void)
> unregister_acpi_notifier(&platform_power_source_nb);
> }
>
> -static int thermal_profile_setup(void)
> +static int thermal_profile_setup(struct platform_device *device)
> {
> int err, tp;
>
> @@ -1625,6 +1625,7 @@ static int thermal_profile_setup(void)
> }
>
> platform_profile_handler.name = "hp-wmi";
> + platform_profile_handler.dev = &device->dev;
> set_bit(PLATFORM_PROFILE_BALANCED, platform_profile_handler.choices);
> set_bit(PLATFORM_PROFILE_PERFORMANCE, platform_profile_handler.choices);
>
> @@ -1664,7 +1665,7 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
> if (err < 0)
> return err;
>
> - thermal_profile_setup();
> + thermal_profile_setup(device);
>
> return 0;
> }
> diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
> index 1f94c14c3b832..24367c3590c99 100644
> --- a/drivers/platform/x86/ideapad-laptop.c
> +++ b/drivers/platform/x86/ideapad-laptop.c
> @@ -1103,6 +1103,7 @@ static int ideapad_dytc_profile_init(struct ideapad_private *priv)
> mutex_init(&priv->dytc->mutex);
>
> priv->dytc->pprof.name = "ideapad-laptop";
> + priv->dytc->pprof.dev = &priv->platform_device->dev;
> priv->dytc->priv = priv;
> priv->dytc->pprof.profile_get = dytc_profile_get;
> priv->dytc->pprof.profile_set = dytc_profile_set;
> diff --git a/drivers/platform/x86/inspur_platform_profile.c b/drivers/platform/x86/inspur_platform_profile.c
> index 03da2c8cf6789..5a53949bbbf5f 100644
> --- a/drivers/platform/x86/inspur_platform_profile.c
> +++ b/drivers/platform/x86/inspur_platform_profile.c
> @@ -178,6 +178,7 @@ static int inspur_wmi_probe(struct wmi_device *wdev, const void *context)
> dev_set_drvdata(&wdev->dev, priv);
>
> priv->handler.name = "inspur-wmi";
> + priv->handler.dev = &wdev->dev;
> priv->handler.profile_get = inspur_platform_profile_get;
> priv->handler.profile_set = inspur_platform_profile_set;
>
> diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
> index c8c316b8507a5..222fba97d79a7 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -10616,6 +10616,7 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)
> dbg_printk(TPACPI_DBG_INIT,
> "DYTC version %d: thermal mode available\n", dytc_version);
>
> + dytc_profile.dev = &tpacpi_pdev->dev;
> /* Create platform_profile structure and register */
> err = platform_profile_register(&dytc_profile);
> /*
> diff --git a/include/linux/platform_profile.h b/include/linux/platform_profile.h
> index 6fa988e417428..daec6b9bad81f 100644
> --- a/include/linux/platform_profile.h
> +++ b/include/linux/platform_profile.h
> @@ -28,6 +28,7 @@ enum platform_profile_option {
>
> struct platform_profile_handler {
> const char *name;
> + struct device *dev;
> unsigned long choices[BITS_TO_LONGS(PLATFORM_PROFILE_LAST)];
> int (*profile_get)(struct platform_profile_handler *pprof,
> enum platform_profile_option *profile);
Powered by blists - more mailing lists