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
Subject: Re: [PATCH v2 RESEND 07/11] platform/x86/amd/pmf: Get performance metrics from PMFW
Date: Mon, 1 Aug 2022 13:50:54 +0200 [thread overview]
Message-ID: <0c24cafa-58a8-c770-7b62-39ab7f4d3c48@redhat.com> (raw)
In-Reply-To: <20220728182028.2082096-8-Shyam-sundar.S-k@amd.com>
Hi,
On 7/28/22 20:20, Shyam Sundar S K wrote:
> PMF driver polls for metrics information from PMFW to understand the system
> behavior, power consumption etc.
>
> This metrics table information will be used the PMF features to tweak the
> thermal heuristics. The poll duration can also be changed by the user
> by changing the poll duration time.
>
> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
> ---
> drivers/platform/x86/amd/pmf/core.c | 56 +++++++++++++++++++++++++++++
> drivers/platform/x86/amd/pmf/pmf.h | 39 ++++++++++++++++++++
> 2 files changed, 95 insertions(+)
>
> diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
> index 6c1c5a89fe71..ede4eefc33a4 100644
> --- a/drivers/platform/x86/amd/pmf/core.c
> +++ b/drivers/platform/x86/amd/pmf/core.c
> @@ -47,6 +47,11 @@
> #define DELAY_MIN_US 2000
> #define DELAY_MAX_US 3000
>
> +/* override Metrics Table sample size time (in ms) */
> +static int metrics_table_loop_ms = 1000;
> +module_param(metrics_table_loop_ms, int, 0644);
> +MODULE_PARM_DESC(metrics_table_loop_ms, " Metrics Table sample size time (default = 1000ms) ");
> +
> static int current_power_limits_show(struct seq_file *seq, void *unused)
> {
> struct amd_pmf_dev *dev = seq->private;
> @@ -88,6 +93,29 @@ int amd_pmf_get_power_source(void)
> return POWER_SOURCE_DC;
> }
>
> +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);
> + enum platform_profile_option current_profile;
> + ktime_t time_elapsed_ms;
> + int socket_power;
> +
> + /* Get the current profile information */
> + current_profile = READ_ONCE(dev->current_profile);
As Mario already mentioned current_profile is no longer used, so this can be dropped now.
> +
> + /* Transfer table contents */
> + memset(&dev->m_table, 0, sizeof(dev->m_table));
You are memsetting dev->m_table here, and then 2 lines down completely
overwrite it with the contents of dev->buf. As already mentioned in my review
of v1 do you perhaps intend to memset dev->buf to 0 here ?
> + amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, 0, 7, NULL);
> + memcpy(&dev->m_table, dev->buf, sizeof(dev->m_table));
> +
> + time_elapsed_ms = ktime_to_ms(ktime_get()) - dev->start_time;
> + /* Calculate the avg SoC power consumption */
> + socket_power = dev->m_table.apu_power + dev->m_table.dgpu_power;
> +
> + dev->start_time = ktime_to_ms(ktime_get());
> + schedule_delayed_work(&dev->work_buffer, msecs_to_jiffies(metrics_table_loop_ms));
> +}
> +
> static inline u32 amd_pmf_reg_read(struct amd_pmf_dev *dev, int reg_offset)
> {
> return ioread32(dev->regbase + reg_offset);
> @@ -181,6 +209,34 @@ static const struct pci_device_id pmf_pci_ids[] = {
> { }
> };
>
> +int amd_pmf_init_metrics_table(struct amd_pmf_dev *dev)
> +{
> + u64 phys_addr;
> + u32 hi, low;
> +
> + INIT_DELAYED_WORK(&dev->work_buffer, amd_pmf_get_metrics);
> +
> + /* Get Metrics Table Address */
> + dev->buf = kzalloc(sizeof(dev->m_table), GFP_KERNEL);
> + if (!dev->buf)
> + return -ENOMEM;
> +
> + phys_addr = virt_to_phys(dev->buf);
> + hi = phys_addr >> 32;
> + low = phys_addr & GENMASK(31, 0);
> +
> + amd_pmf_send_cmd(dev, SET_DRAM_ADDR_HIGH, 0, hi, NULL);
> + amd_pmf_send_cmd(dev, SET_DRAM_ADDR_LOW, 0, low, NULL);
> +
> + /*
> + * Start collecting the metrics data after a small delay
> + * or else, we might end up getting stale values from PMFW.
> + */
> + schedule_delayed_work(&dev->work_buffer, msecs_to_jiffies(metrics_table_loop_ms * 3));
> +
> + return 0;
> +}
> +
> static void amd_pmf_init_features(struct amd_pmf_dev *dev)
> {
> /* Enable Static Slider */
> diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h
> index b6501a68aa4e..49d3232ee2e0 100644
> --- a/drivers/platform/x86/amd/pmf/pmf.h
> +++ b/drivers/platform/x86/amd/pmf/pmf.h
> @@ -84,6 +84,41 @@ struct apmf_fan_idx {
> u32 fan_ctl_idx;
> } __packed;
>
> +struct smu_pmf_metrics {
> + u16 gfxclk_freq; /* in MHz */
> + u16 socclk_freq; /* in MHz */
> + u16 vclk_freq; /* in MHz */
> + u16 dclk_freq; /* in MHz */
> + u16 memclk_freq; /* in MHz */
> + u16 spare;
> + u16 gfx_activity; /* in Centi */
> + u16 uvd_activity; /* in Centi */
> + u16 voltage[2]; /* in mV */
> + u16 currents[2]; /* in mA */
> + u16 power[2];/* in mW */
> + u16 core_freq[8]; /* in MHz */
> + u16 core_power[8]; /* in mW */
> + u16 core_temp[8]; /* in centi-Celsius */
> + u16 l3_freq; /* in MHz */
> + u16 l3_temp; /* in centi-Celsius */
> + u16 gfx_temp; /* in centi-Celsius */
> + u16 soc_temp; /* in centi-Celsius */
> + u16 throttler_status;
> + u16 current_socketpower; /* in mW */
> + u16 stapm_orig_limit; /* in W */
> + u16 stapm_cur_limit; /* in W */
> + u32 apu_power; /* in mW */
> + u32 dgpu_power; /* in mW */
> + u16 vdd_tdc_val; /* in mA */
> + u16 soc_tdc_val; /* in mA */
> + u16 vdd_edc_val; /* in mA */
> + u16 soc_edcv_al; /* in mA */
> + u16 infra_cpu_maxfreq; /* in MHz */
> + u16 infra_gfx_maxfreq; /* in MHz */
> + u16 skin_temp; /* in centi-Celsius */
> + u16 device_state;
> +};
> +
Since you are memcpy-ing this from memory read from the PMF,
you should use __packed here.
> enum amd_stt_skin_temp {
> STT_TEMP_APU,
> STT_TEMP_HS2,
> @@ -121,6 +156,9 @@ struct amd_pmf_dev {
> struct delayed_work heart_beat;
> struct mutex lock; /* protects the PMF interface */
> struct dentry *dbgfs_dir;
> + struct smu_pmf_metrics m_table;
> + struct delayed_work work_buffer;
> + ktime_t start_time;
> };
>
> struct apmf_sps_prop_granular {
> @@ -154,6 +192,7 @@ int apmf_acpi_init(struct amd_pmf_dev *pmf_dev);
> void apmf_acpi_deinit(struct amd_pmf_dev *pmf_dev);
> int is_apmf_func_supported(unsigned long index);
> int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32 *data);
> +int amd_pmf_init_metrics_table(struct amd_pmf_dev *dev);
> int amd_pmf_get_power_source(void);
>
> /* SPS Layer */
Regards,
Hans
next prev parent reply other threads:[~2022-08-01 11:55 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 [this message]
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
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=0c24cafa-58a8-c770-7b62-39ab7f4d3c48@redhat.com \
--to=hdegoede@redhat.com \
--cc=Patil.Reddy@amd.com \
--cc=Shyam-sundar.S-k@amd.com \
--cc=markgross@kernel.org \
--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).