From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 791582AD00 for ; Tue, 18 Nov 2025 15:54:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763481278; cv=none; b=naGJE8uI/zbaBi6xDcO7GeodqByvfCGO7gwMuiOyuOOuqHGa/X5RBPNJRdUXxOXAVCtp+8J1LN9DfP8c0BMmINCn4T3oaQ8YnCAbFqibRT9IGW+ugK5o7QYpd22FVCvP6saC7HmLYqSlYxWfKZ/77ItxxCkcJxe0hznFwNX7QRw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763481278; c=relaxed/simple; bh=c1gFyWScIrB4MW+DrcTlUWUZB9a0IMf2Cyem9XPfwTs=; h=From:Date:To:cc:Subject:In-Reply-To:Message-ID:References: MIME-Version:Content-Type; b=d7l68TnGzK2tbkKYFMnkO2+y3zOcOElXwPg1oV5FyaLuEIYOhhzDfI9fGPrqvNZJ6TAovHXaUr28HoNFHuD2RpMRflpLQTJKA257xGbUVvTlSJL5lxATs8o9qPKB020B8kiXE5T48L04CxFwUnp63L3yABnGwEes/hH6abJkdwM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ddVCdrvo; arc=none smtp.client-ip=192.198.163.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ddVCdrvo" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1763481277; x=1795017277; h=from:date:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=c1gFyWScIrB4MW+DrcTlUWUZB9a0IMf2Cyem9XPfwTs=; b=ddVCdrvog1Qdde93300waBo7tbAfMdIFC/RrSdMf16UKcarODLMfENuV hiduCHwFb1m9UJK0VZ5Q/FLoXMZf5NMdl1zo87cCCzw4hU3fLuDxQkcMH /1nDirnXCisAUb5wcCwIbqRxL2+oamLGf/aNloPjR7++GzZ+ycl9RBhEC Grn2pIpzXjDOwpGpstdeJujBirUwc+gf23BTyYj6DWHLIx/kIDTeqh4sU oOn2J2pEIcIZ2zZUeFGpeBXYdBd4ReEupbynWOpNtsD8RUlLUyJmqV3sO a3mTdQ3ZWNpk0qDBEXo5WSSZjFMgT8vHwbdqYvWxMs+K/EUSD766xY9mJ w==; X-CSE-ConnectionGUID: velWLqMRS0KAm6O9IYip6A== X-CSE-MsgGUID: MxNvYrm/SHad4VUUJ4IsEA== X-IronPort-AV: E=McAfee;i="6800,10657,11617"; a="65545943" X-IronPort-AV: E=Sophos;i="6.19,314,1754982000"; d="scan'208";a="65545943" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2025 07:54:36 -0800 X-CSE-ConnectionGUID: PA8//fNYR3K3Bp2sk7C1uw== X-CSE-MsgGUID: 6b3TKfxSTSGSbaxgmynHuw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,314,1754982000"; d="scan'208";a="190604555" Received: from ijarvine-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.245.74]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2025 07:54:33 -0800 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Date: Tue, 18 Nov 2025 17:54:29 +0200 (EET) To: Shyam Sundar S K cc: Hans de Goede , platform-driver-x86@vger.kernel.org, Patil.Reddy@amd.com, mario.limonciello@amd.com, lizhi.hou@amd.com Subject: Re: [PATCH v2 4/5] platform/x86/amd/pmf: Introduce new interface to export NPU metrics In-Reply-To: <20251111063737.4156385-5-Shyam-sundar.S-k@amd.com> Message-ID: <67f1b612-1de9-fea8-024b-c2c829d04419@linux.intel.com> References: <20251111063737.4156385-1-Shyam-sundar.S-k@amd.com> <20251111063737.4156385-5-Shyam-sundar.S-k@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII On Tue, 11 Nov 2025, Shyam Sundar S K wrote: > The PMF driver retrieves NPU metrics data from the PMFW. Introduce a new > interface to make NPU metrics accessible to other drivers like AMDXDNA > driver, which can access and utilize this information as needed. > > Reviewed-by: Mario Limonciello > Co-developed-by: Patil Rajesh Reddy > Signed-off-by: Patil Rajesh Reddy > Signed-off-by: Shyam Sundar S K > --- > drivers/platform/x86/amd/pmf/core.c | 65 +++++++++++++++++++++++++++++ > drivers/platform/x86/amd/pmf/pmf.h | 2 + > include/linux/amd-pmf-io.h | 21 ++++++++++ > 3 files changed, 88 insertions(+) > > diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c > index a6a5d416edf9..c1c317418633 100644 > --- a/drivers/platform/x86/amd/pmf/core.c > +++ b/drivers/platform/x86/amd/pmf/core.c > @@ -53,6 +53,8 @@ static bool force_load; > module_param(force_load, bool, 0444); > MODULE_PARM_DESC(force_load, "Force load this driver on supported older platforms (experimental)"); > > +static struct device *pmf; > + > static int amd_pmf_pwr_src_notify_call(struct notifier_block *nb, unsigned long event, void *data) > { > struct amd_pmf_dev *pmf = container_of(nb, struct amd_pmf_dev, pwr_src_notifier); > @@ -314,6 +316,63 @@ int amd_pmf_init_metrics_table(struct amd_pmf_dev *dev) > return 0; > } > > +static int is_npu_metrics_supported(struct amd_pmf_dev *pdev) > +{ > + switch (pdev->cpu_id) { > + case PCI_DEVICE_ID_AMD_1AH_M20H_ROOT: > + case PCI_DEVICE_ID_AMD_1AH_M60H_ROOT: > + return 0; > + default: > + return -EOPNOTSUPP; > + } > +} > + > +static int amd_pmf_get_smu_metrics(struct amd_pmf_dev *dev, struct amd_pmf_npu_metrics *data) > +{ > + int ret, i; > + > + guard(mutex)(&dev->metrics_mutex); > + > + if (is_npu_metrics_supported(dev)) > + return -EOPNOTSUPP; > + > + ret = amd_pmf_set_dram_addr(dev, true); > + if (ret) > + return ret; > + > + 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; > + } > + > + 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; > + > + return 0; > +} > + > +int amd_pmf_get_npu_data(struct amd_pmf_npu_metrics *info) > +{ > + struct amd_pmf_dev *pdev = dev_get_drvdata(pmf); > + > + if (!pdev || !info) > + return -EINVAL; > + > + return amd_pmf_get_smu_metrics(pdev, info); > +} > +EXPORT_SYMBOL_GPL(amd_pmf_get_npu_data); > + > static int amd_pmf_suspend_handler(struct device *dev) > { > struct amd_pmf_dev *pdev = dev_get_drvdata(dev); > @@ -468,6 +527,7 @@ static int amd_pmf_probe(struct platform_device *pdev) > mutex_init(&dev->lock); > mutex_init(&dev->update_mutex); > mutex_init(&dev->cb_mutex); > + mutex_init(&dev->metrics_mutex); As mentioned with the other series, you should use devm to init these mutexes. > > apmf_acpi_init(dev); > platform_set_drvdata(pdev, dev); > @@ -477,6 +537,8 @@ static int amd_pmf_probe(struct platform_device *pdev) > if (is_apmf_func_supported(dev, APMF_FUNC_SBIOS_HEARTBEAT_V2)) > amd_pmf_notify_sbios_heartbeat_event_v2(dev, ON_LOAD); > > + pmf = dev->dev; > + > dev_info(dev->dev, "registered PMF device successfully\n"); > > return 0; > @@ -494,6 +556,9 @@ static void amd_pmf_remove(struct platform_device *pdev) > mutex_destroy(&dev->lock); > mutex_destroy(&dev->update_mutex); > mutex_destroy(&dev->cb_mutex); > + mutex_destroy(&dev->metrics_mutex); > + if (pmf) > + pmf = NULL; Why's this needed? -- i. > } > > static const struct attribute_group *amd_pmf_driver_groups[] = { > diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h > index 561919b9f671..63de4172a383 100644 > --- a/drivers/platform/x86/amd/pmf/pmf.h > +++ b/drivers/platform/x86/amd/pmf/pmf.h > @@ -12,6 +12,7 @@ > #define PMF_H > > #include > +#include > #include > #include > #include > @@ -410,6 +411,7 @@ struct amd_pmf_dev { > struct apmf_sbios_req_v1 req1; > struct pmf_bios_inputs_prev cb_prev; /* To preserve custom BIOS inputs */ > bool cb_flag; /* To handle first custom BIOS input */ > + struct mutex metrics_mutex; > }; > > struct apmf_sps_prop_granular_v2 { > diff --git a/include/linux/amd-pmf-io.h b/include/linux/amd-pmf-io.h > index 6fa510f419c0..55198d2875cc 100644 > --- a/include/linux/amd-pmf-io.h > +++ b/include/linux/amd-pmf-io.h > @@ -61,5 +61,26 @@ enum laptop_placement { > LP_UNDEFINED, > }; > > +/** > + * struct amd_pmf_npu_metrics: Get NPU metrics data from PMF driver > + * @npuclk_freq: NPU clock frequency [MHz] > + * @npu_busy: NPU busy % [0-100] > + * @npu_power: NPU power [mW] > + * @mpnpuclk_freq: MPNPU [MHz] > + * @npu_reads: NPU read bandwidth [MB/sec] > + * @npu_writes: NPU write bandwidth [MB/sec] > + */ > +struct amd_pmf_npu_metrics { > + u16 npuclk_freq; > + u16 npu_busy[8]; > + u16 npu_power; > + u16 mpnpuclk_freq; > + u16 npu_reads; > + u16 npu_writes; > +}; > + > int amd_get_sfh_info(struct amd_sfh_info *sfh_info, enum sfh_message_type op); > + > +/* AMD PMF and NPU interface */ > +int amd_pmf_get_npu_data(struct amd_pmf_npu_metrics *info); > #endif >