Re: [PATCH 4/5] platform/x86/amd/pmf: Refactor NPU metrics for platform extensibility

[Mario Limonciello <mario.limonciello@amd.com>]

On 7/10/26 12:42, Shyam Sundar S K wrote:
> Refactor the NPU metrics retrieval code to use a switch-case structure
> based on CPU ID, preparing the driver for supporting additional
> platforms with different metrics table formats.
> 
> This change restructures amd_pmf_get_smu_metrics() to handle
> platform-specific metrics retrieval paths. The existing logic for
> 1AH_M20H and 1AH_M60H platforms is preserved within the switch-case
> block.
> 
> No functional changes.
> 
> Co-developed-by: Patil Rajesh Reddy <Patil.Reddy@amd.com>
> Signed-off-by: Patil Rajesh Reddy <Patil.Reddy@amd.com>
> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>

Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>

> ---
>   drivers/platform/x86/amd/pmf/metrics.c | 42 +++++++++++++++-----------
>   1 file changed, 24 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/platform/x86/amd/pmf/metrics.c b/drivers/platform/x86/amd/pmf/metrics.c
> index bb4f9127c655..5a8ebacbc3b3 100644
> --- a/drivers/platform/x86/amd/pmf/metrics.c
> +++ b/drivers/platform/x86/amd/pmf/metrics.c
> @@ -9,6 +9,7 @@
>    *	    Patil Rajesh Reddy <Patil.Reddy@amd.com>
>    */
>   
> +#include <linux/array_size.h>
>   #include <linux/bits.h>
>   #include <linux/cleanup.h>
>   #include <linux/container_of.h>
> @@ -134,28 +135,33 @@ static int amd_pmf_get_smu_metrics(struct amd_pmf_dev *dev, struct amd_pmf_npu_m
>   	if (ret)
>   		return ret;
>   
> -	ret = amd_pmf_set_dram_addr(dev, true);
> -	if (ret)
> -		return ret;
> +	switch (dev->cpu_id) {
> +	case PCI_DEVICE_ID_AMD_1AH_M20H_ROOT:
> +	case PCI_DEVICE_ID_AMD_1AH_M60H_ROOT:
> +		ret = amd_pmf_set_dram_addr(dev, true);
> +		if (ret)
> +			return ret;
>   
> -	memset(dev->buf, 0, dev->mtable_size);
> +		memset(dev->buf, 0, dev->mtable_size);
>   
> -	/* Send SMU command to get NPU metrics */
> -	ret = amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, SET_CMD, METRICS_TABLE_ID, NULL);
> -	if (ret) {
> -		dev_err(dev->dev, "SMU command failed to get NPU metrics: %d\n", ret);
> -		return ret;
> -	}
> +		/* Send SMU command to get NPU metrics */
> +		ret = amd_pmf_send_cmd(dev, SET_TRANSFER_TABLE, SET_CMD, METRICS_TABLE_ID, NULL);
> +		if (ret) {
> +			dev_err(dev->dev, "SMU command failed to get NPU metrics: %d\n", ret);
> +			return ret;
> +		}
>   
> -	memcpy(&dev->m_table_v2, dev->buf, dev->mtable_size);
> +		memcpy(&dev->m_table_v2, dev->buf, dev->mtable_size);
>   
> -	data->npuclk_freq = dev->m_table_v2.npuclk_freq;
> -	for (i = 0; i < ARRAY_SIZE(data->npu_busy); i++)
> -		data->npu_busy[i] = dev->m_table_v2.npu_busy[i];
> -	data->npu_power = dev->m_table_v2.npu_power;
> -	data->mpnpuclk_freq = dev->m_table_v2.mpnpuclk_freq;
> -	data->npu_reads = dev->m_table_v2.npu_reads;
> -	data->npu_writes = dev->m_table_v2.npu_writes;
> +		data->npuclk_freq = dev->m_table_v2.npuclk_freq;
> +		for (i = 0; i < ARRAY_SIZE(data->npu_busy); i++)
> +			data->npu_busy[i] = dev->m_table_v2.npu_busy[i];
> +		data->npu_power = dev->m_table_v2.npu_power;
> +		data->mpnpuclk_freq = dev->m_table_v2.mpnpuclk_freq;
> +		data->npu_reads = dev->m_table_v2.npu_reads;
> +		data->npu_writes = dev->m_table_v2.npu_writes;
> +		break;
> +	}
>   
>   	return 0;
>   }