From: Hans de Goede <hdegoede@redhat.com>
To: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>, markgross@kernel.org
Cc: platform-driver-x86@vger.kernel.org, Patil.Reddy@amd.com,
Mario Limonciello <mario.limonciello@amd.com>,
Mark Pearson <markpearson@lenovo.com>
Subject: Re: [PATCH v2 RESEND 09/11] platform/x86/amd/pmf: Handle AMT and CQL events for Auto mode
Date: Mon, 1 Aug 2022 16:01:00 +0200 [thread overview]
Message-ID: <b4200b73-90a1-9a05-0390-cfc41fc92590@redhat.com> (raw)
In-Reply-To: <20220728182028.2082096-10-Shyam-sundar.S-k@amd.com>
On 7/28/22 20:20, Shyam Sundar S K wrote:
> The transition to auto-mode happens when the PMF driver receives
> AMT (Auto Mode transition) event. transition logic will reside in the
> PMF driver but the events would come from other supported drivers[1].
>
> The thermal parameters would vary between when a performance "on-lap" mode
> is detected and versus when not. The CQL event would get triggered from
> other drivers, so that PMF driver would adjust the system thermal config
> based on the ACPI inputs.
>
> OEMs can control whether or not to enable AMT or CQL via other supported
> drivers[1] but the actual transition logic resides in the AMD PMF driver.
> When an AMT event is received the automatic mode transition RAPL algorithm
> will run. When a CQL event is received an performance "on-lap" mode will
> be enabled and thermal parameters will be adjusted accordingly.
>
> [1]
> Link: https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/commit/?h=review-hans&id=755b249250df1b612d982f3b702c831b26ecdf73
>
> Cc: Mario Limonciello <mario.limonciello@amd.com>
> Cc: Mark Pearson <markpearson@lenovo.com>
> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
> ---
> drivers/platform/x86/amd/pmf/acpi.c | 59 ++++++++++++++++++++++++
> drivers/platform/x86/amd/pmf/auto-mode.c | 22 +++++++++
> drivers/platform/x86/amd/pmf/core.c | 32 +++++++++++++
> drivers/platform/x86/amd/pmf/pmf.h | 22 +++++++++
> 4 files changed, 135 insertions(+)
>
> diff --git a/drivers/platform/x86/amd/pmf/acpi.c b/drivers/platform/x86/amd/pmf/acpi.c
> index 724150ec58fb..dedaebf18d88 100644
> --- a/drivers/platform/x86/amd/pmf/acpi.c
> +++ b/drivers/platform/x86/amd/pmf/acpi.c
> @@ -12,6 +12,8 @@
> #include "pmf.h"
>
> #define APMF_METHOD "\\_SB_.PMF_.APMF"
> +#define APMF_CQL_NOTIFICATION 2
> +#define APMF_AMT_NOTIFICATION 3
>
> static unsigned long supported_func;
>
> @@ -99,6 +101,7 @@ static void apmf_if_parse_functions(struct apmf_if_functions *func, u32 mask)
> {
> func->system_params = mask & APMF_FUNC_GET_SYS_PARAMS;
> func->static_slider_granular = mask & APMF_FUNC_STATIC_SLIDER_GRANULAR;
> + func->sbios_requests = mask & APMF_FUNC_SBIOS_REQUESTS;
> func->auto_mode_def = mask & APMF_FUNC_AUTO_MODE;
> func->fan_table_idx = mask & APMF_FUNC_SET_FAN_IDX;
> }
> @@ -167,6 +170,44 @@ int apmf_get_auto_mode_def(struct apmf_if *apmf_if, struct apmf_auto_mode *data)
> data, sizeof(*data));
> }
>
> +int apmf_get_sbios_requests(struct apmf_if *apmf_if, struct apmf_sbios_req *req)
> +{
> + return apmf_if_call_store_buffer(apmf_if, APMF_FUNC_SBIOS_REQUESTS,
> + req, sizeof(*req));
> +}
> +
> +static void apmf_event_handler(acpi_handle handle, u32 event, void *data)
> +{
> + struct amd_pmf_dev *pmf_dev = data;
> + struct apmf_if *apmf_if = pmf_dev->apmf_if;
> + int ret;
> +
> + if (apmf_if->func.sbios_requests) {
> + struct apmf_sbios_req req;
> +
> + ret = apmf_get_sbios_requests(apmf_if, &req);
> + if (ret) {
> + dev_err(pmf_dev->dev, "Failed to get SBIOS requests:%d\n", ret);
> + return;
> + }
> +
> + if (req.pending_req & BIT(APMF_AMT_NOTIFICATION)) {
> + pr_debug("PMF: AMT is supported and notifications %s\n",
> + req.amt_event ? "Enabled" : "Disabled");
> + pmf_dev->is_amt_event = !!req.amt_event;
> + }
> +
> + if (req.pending_req & BIT(APMF_CQL_NOTIFICATION)) {
> + pr_debug("PMF: CQL is supported and notifications %s\n",
> + req.cql_event ? "Enabled" : "Disabled");
> + pmf_dev->is_cql_event = !!req.cql_event;
> +
> + /* update the target mode information */
> + amd_pmf_update_2_cql(pmf_dev);
I forgot to mention that this needs an "if (pmf_dev->amt_enabled)" guard so
that the handler does not mess with the limits while AMT is disabled, even
if CQL events are received while AMT is disabled.
> + }
> + }
> +}
> +
> static int apmf_if_verify_interface(struct amd_pmf_dev *pdev, struct apmf_if *apmf_if)
> {
> struct apmf_verify_interface output;
> @@ -211,12 +252,19 @@ static int apmf_get_system_params(struct apmf_if *apmf_if)
>
> void apmf_acpi_deinit(struct amd_pmf_dev *pmf_dev)
> {
> + acpi_handle ahandle = ACPI_HANDLE(pmf_dev->dev);
> +
> if (pmf_dev->apmf_if->func.sbios_heartbeat)
> cancel_delayed_work_sync(&pmf_dev->heart_beat);
> +
> + if (is_apmf_func_supported(APMF_FUNC_AUTO_MODE))
> + acpi_remove_notify_handler(ahandle, ACPI_ALL_NOTIFY,
> + apmf_event_handler);
> }
>
> int apmf_acpi_init(struct amd_pmf_dev *pmf_dev)
> {
> + acpi_handle ahandle = ACPI_HANDLE(pmf_dev->dev);
> struct apmf_notification_cfg *n;
> acpi_handle apmf_if_handle;
> struct apmf_if *apmf_if;
> @@ -256,6 +304,17 @@ int apmf_acpi_init(struct amd_pmf_dev *pmf_dev)
> schedule_delayed_work(&pmf_dev->heart_beat, 0);
> }
>
> + /* Install the APMF Notify handler */
> + if (is_apmf_func_supported(APMF_FUNC_AUTO_MODE)) {
> + status = acpi_install_notify_handler(ahandle,
> + ACPI_ALL_NOTIFY,
> + apmf_event_handler, pmf_dev);
> + if (ACPI_FAILURE(status)) {
> + dev_err(pmf_dev->dev, "failed to install notify handler\n");
> + return -ENODEV;
> + }
> + }
> +
> out:
> return ret;
> }
> diff --git a/drivers/platform/x86/amd/pmf/auto-mode.c b/drivers/platform/x86/amd/pmf/auto-mode.c
> index 954fde25e71e..a85ef4b95cdb 100644
> --- a/drivers/platform/x86/amd/pmf/auto-mode.c
> +++ b/drivers/platform/x86/amd/pmf/auto-mode.c
> @@ -111,6 +111,13 @@ void amd_pmf_trans_automode(struct amd_pmf_dev *dev, int socket_power, ktime_t t
> bool update = false;
> int i, j;
>
> + if (!dev->amt_running && dev->is_amt_event) {
> + dev_dbg(dev->dev, "setting AMT thermals\n");
> + amd_pmf_handle_automode(dev, SLIDER_OP_SET, config_store.current_mode, NULL);
> + dev->amt_running = true;
> + return;
> + }
> +
> /* Get the average moving average computed by auto mode algorithm */
> avg_power = amd_pmf_get_moving_avg(socket_power);
>
> @@ -161,6 +168,21 @@ void amd_pmf_trans_automode(struct amd_pmf_dev *dev, int socket_power, ktime_t t
> }
> }
>
> +void amd_pmf_update_2_cql(struct amd_pmf_dev *dev)
> +{
> + config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].target_mode =
> + dev->is_cql_event ? AUTO_PERFORMANCE_ON_LAP : AUTO_PERFORMANCE;
> + if ((config_store.current_mode == AUTO_PERFORMANCE ||
> + config_store.current_mode == AUTO_PERFORMANCE_ON_LAP) &&
> + config_store.current_mode !=
> + config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].target_mode) {
> + config_store.current_mode =
> + config_store.transition[AUTO_TRANSITION_TO_PERFORMANCE].target_mode;
> + amd_pmf_handle_automode(dev, SLIDER_OP_SET, config_store.current_mode, NULL);
> + }
> + dev_dbg(dev->dev, "updated CQL thermals\n");
> +}
> +
> static void amd_pmf_get_power_threshold(void)
> {
> config_store.transition[AUTO_TRANSITION_TO_QUIET].power_threshold =
> diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
> index ef71f8326248..bfae779ccc23 100644
> --- a/drivers/platform/x86/amd/pmf/core.c
> +++ b/drivers/platform/x86/amd/pmf/core.c
> @@ -93,6 +93,27 @@ int amd_pmf_get_power_source(void)
> return POWER_SOURCE_DC;
> }
>
> +static void amd_pmf_reset_amt(struct amd_pmf_dev *dev)
> +{
> + pr_debug("resetting AMT thermals\n");
> + dev->amt_running = false;
> +
> + /*
> + * OEM BIOS implementation guide says that if the auto mode is enabled
> + * the platform_profile registration shall be done by the OEM driver.
> + * There could be cases where both static slider and auto mode BIOS
> + * functions are enabled and we could end up in a race. To avoid that
> + * add a protection and touch the static slider only if that's enabled
> + * from the BIOS side.
> + */
> +
> + if (is_apmf_func_supported(APMF_FUNC_STATIC_SLIDER_GRANULAR)) {
> + u8 mode = amd_pmf_get_pprof_modes(dev);
> +
> + amd_pmf_update_slider(dev, SLIDER_OP_SET, mode, NULL);
> + }
> +}
> +
> static void amd_pmf_get_metrics(struct work_struct *work)
> {
> struct amd_pmf_dev *dev = container_of(work, struct amd_pmf_dev, work_buffer.work);
> @@ -103,6 +124,9 @@ static void amd_pmf_get_metrics(struct work_struct *work)
> /* Get the current profile information */
> current_profile = READ_ONCE(dev->current_profile);
>
> + if (!dev->is_amt_event)
> + dev_dbg(dev->dev, "amt event: %s\n", dev->is_amt_event ? "Enabled" : "Disabled");
> +
> /* Transfer table contents */
> memset(&dev->m_table, 0, sizeof(dev->m_table));
> amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, 0, 7, NULL);
> @@ -112,6 +136,14 @@ static void amd_pmf_get_metrics(struct work_struct *work)
> /* Calculate the avg SoC power consumption */
> socket_power = dev->m_table.apu_power + dev->m_table.dgpu_power;
>
> + if (dev->is_amt_event) {
> + /* Apply the Auto Mode transition */
> + amd_pmf_trans_automode(dev, socket_power, time_elapsed_ms);
> + } else if (!dev->is_amt_event && dev->amt_running) {
> + /* reset to other mode if we receive a AMT disable event */
> + amd_pmf_reset_amt(dev);
> + }
> +
> dev->start_time = ktime_to_ms(ktime_get());
> schedule_delayed_work(&dev->work_buffer, msecs_to_jiffies(metrics_table_loop_ms));
> }
> diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h
> index 4618ddc5a662..0f8b25524845 100644
> --- a/drivers/platform/x86/amd/pmf/pmf.h
> +++ b/drivers/platform/x86/amd/pmf/pmf.h
> @@ -17,6 +17,7 @@
> /* APMF Functions */
> #define APMF_FUNC_VERIFY_INTERFACE 0
> #define APMF_FUNC_GET_SYS_PARAMS 1
> +#define APMF_FUNC_SBIOS_REQUESTS 2
> #define APMF_FUNC_SBIOS_HEARTBEAT 4
> #define APMF_FUNC_AUTO_MODE 5
> #define APMF_FUNC_SET_FAN_IDX 7
> @@ -49,6 +50,7 @@
> /* AMD PMF BIOS interfaces */
> struct apmf_if_functions {
> bool system_params;
> + bool sbios_requests;
> bool sbios_heartbeat;
> bool auto_mode_def;
> bool fan_table_idx;
> @@ -80,6 +82,21 @@ struct apmf_system_params {
> u32 heartbeat_int;
> } __packed;
>
> +struct apmf_sbios_req {
> + u16 size;
> + u32 pending_req;
> + u8 rsd;
> + u8 cql_event;
> + u8 amt_event;
> + u32 fppt;
> + u32 sppt;
> + u32 fppt_apu_only;
> + u32 spl;
> + u32 stt_min_limit;
> + u8 skin_temp_apu;
> + u8 skin_temp_hs2;
> +} __packed;
> +
> struct apmf_fan_idx {
> u16 size;
> u8 fan_ctl_mode;
> @@ -161,6 +178,9 @@ struct amd_pmf_dev {
> struct smu_pmf_metrics m_table;
> struct delayed_work work_buffer;
> ktime_t start_time;
> + bool is_amt_event;
> + bool is_cql_event;
> + bool amt_running;
> };
>
> struct apmf_sps_prop_granular {
> @@ -320,5 +340,7 @@ int apmf_get_auto_mode_def(struct apmf_if *ampf_if, struct apmf_auto_mode *data)
> void amd_pmf_init_auto_mode(struct amd_pmf_dev *dev);
> void amd_pmf_deinit_auto_mode(struct amd_pmf_dev *dev);
> void amd_pmf_trans_automode(struct amd_pmf_dev *dev, int socket_power, ktime_t time_elapsed_ms);
> +int apmf_get_sbios_requests(struct apmf_if *ampf_if, struct apmf_sbios_req *req);
> +void amd_pmf_update_2_cql(struct amd_pmf_dev *dev);
>
> #endif /* PMF_H */
next prev parent reply other threads:[~2022-08-01 14:01 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-28 18:20 [PATCH v2 RESEND 00/11] platform/x86/amd/pmf: Introduce AMD PMF Driver Shyam Sundar S K
2022-07-28 18:20 ` [PATCH v2 RESEND 01/11] platform/x86/amd/pmf: Add support for PMF core layer Shyam Sundar S K
2022-08-01 11:16 ` Hans de Goede
2022-07-28 18:20 ` [PATCH v2 RESEND 02/11] platform/x86/amd/pmf: Add support for PMF APCI layer Shyam Sundar S K
2022-08-01 11:24 ` Hans de Goede
2022-08-01 12:48 ` Hans de Goede
2022-08-01 13:18 ` Hans de Goede
2022-07-28 18:20 ` [PATCH v2 RESEND 03/11] platform/x86/amd/pmf: Add support SPS PMF feature Shyam Sundar S K
2022-08-01 11:30 ` Hans de Goede
2022-08-01 12:50 ` Hans de Goede
2022-07-28 18:20 ` [PATCH v2 RESEND 04/11] platform/x86/amd/pmf: Add debugfs information Shyam Sundar S K
2022-08-01 11:35 ` Hans de Goede
2022-07-28 18:20 ` [PATCH v2 RESEND 05/11] platform/x86/amd/pmf: Add heartbeat signal support Shyam Sundar S K
2022-08-01 11:38 ` Hans de Goede
2022-07-28 18:20 ` [PATCH v2 RESEND 06/11] platform/x86/amd/pmf: Add fan control support Shyam Sundar S K
2022-08-01 11:40 ` Hans de Goede
2022-08-01 12:51 ` Hans de Goede
2022-07-28 18:20 ` [PATCH v2 RESEND 07/11] platform/x86/amd/pmf: Get performance metrics from PMFW Shyam Sundar S K
2022-07-28 21:02 ` Limonciello, Mario
2022-07-29 17:43 ` Shyam Sundar S K
2022-08-01 11:50 ` Hans de Goede
2022-07-28 18:20 ` [PATCH v2 RESEND 08/11] platform/x86/amd/pmf: Add support for Auto mode feature Shyam Sundar S K
2022-08-01 12:55 ` Hans de Goede
2022-08-01 13:20 ` Hans de Goede
2022-07-28 18:20 ` [PATCH v2 RESEND 09/11] platform/x86/amd/pmf: Handle AMT and CQL events for Auto mode Shyam Sundar S K
2022-08-01 13:55 ` Hans de Goede
2022-08-02 11:22 ` Shyam Sundar S K
2022-08-02 12:20 ` Hans de Goede
2022-08-01 14:01 ` Hans de Goede [this message]
2022-07-28 18:20 ` [PATCH v2 RESEND 10/11] platform/x86/amd/pmf: Force load driver on older supported platforms Shyam Sundar S K
2022-08-01 13:58 ` Hans de Goede
2022-07-28 18:20 ` [PATCH v2 RESEND 11/11] MAINTAINERS: Add AMD PMF driver entry Shyam Sundar S K
2022-08-01 13:58 ` Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b4200b73-90a1-9a05-0390-cfc41fc92590@redhat.com \
--to=hdegoede@redhat.com \
--cc=Patil.Reddy@amd.com \
--cc=Shyam-sundar.S-k@amd.com \
--cc=mario.limonciello@amd.com \
--cc=markgross@kernel.org \
--cc=markpearson@lenovo.com \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).