diff mbox series

[v2,03/11] platform/x86:intel/pmc: Move PMC devid to core.h

Message ID 20240828222932.1279508-4-xi.pardee@linux.intel.com
State New
Headers show
Series Create Intel PMC SSRAM Telemetry driver | expand

Commit Message

Xi Pardee Aug. 28, 2024, 10:29 p.m. UTC
Move PMC devid definition for each PMC of Arrow Lake and Meteor
Lake platforms to core.h. This patch is a preparation step to
introduce a new SSRAM Telemetry driver which will be using the
PMC devid.

Signed-off-by: Xi Pardee <xi.pardee@linux.intel.com>
---
 drivers/platform/x86/intel/pmc/arl.c  |  9 +++------
 drivers/platform/x86/intel/pmc/core.h | 10 ++++++++++
 drivers/platform/x86/intel/pmc/mtl.c  |  9 +++------
 3 files changed, 16 insertions(+), 12 deletions(-)

Comments

Ilpo Järvinen Aug. 29, 2024, 10:52 a.m. UTC | #1
On Wed, 28 Aug 2024, Xi Pardee wrote:

> Move PMC devid definition for each PMC of Arrow Lake and Meteor
> Lake platforms to core.h. This patch is a preparation step to
> introduce a new SSRAM Telemetry driver which will be using the
> PMC devid.
> 
> Signed-off-by: Xi Pardee <xi.pardee@linux.intel.com>
> ---
>  drivers/platform/x86/intel/pmc/arl.c  |  9 +++------
>  drivers/platform/x86/intel/pmc/core.h | 10 ++++++++++
>  drivers/platform/x86/intel/pmc/mtl.c  |  9 +++------
>  3 files changed, 16 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/platform/x86/intel/pmc/arl.c b/drivers/platform/x86/intel/pmc/arl.c
> index e10527c4e3e0..870da98ceb41 100644
> --- a/drivers/platform/x86/intel/pmc/arl.c
> +++ b/drivers/platform/x86/intel/pmc/arl.c
> @@ -650,23 +650,20 @@ const struct pmc_reg_map arl_pchs_reg_map = {
>  	.etr3_offset = ETR3_OFFSET,
>  };
>  
> -#define PMC_DEVID_SOCS 0xae7f
> -#define PMC_DEVID_IOEP 0x7ecf
> -#define PMC_DEVID_PCHS 0x7f27
>  static struct pmc_info arl_pmc_info_list[] = {
>  	{
>  		.guid	= IOEP_LPM_REQ_GUID,
> -		.devid	= PMC_DEVID_IOEP,
> +		.devid	= PMC_DEVID_MTL_IOEP,
>  		.map	= &mtl_ioep_reg_map,
>  	},
>  	{
>  		.guid	= SOCS_LPM_REQ_GUID,
> -		.devid	= PMC_DEVID_SOCS,
> +		.devid	= PMC_DEVID_ARL_SOCS,
>  		.map	= &arl_socs_reg_map,
>  	},
>  	{
>  		.guid	= PCHS_LPM_REQ_GUID,
> -		.devid	= PMC_DEVID_PCHS,
> +		.devid	= PMC_DEVID_ARL_PCHS,
>  		.map	= &arl_pchs_reg_map,
>  	},
>  	{}
> diff --git a/drivers/platform/x86/intel/pmc/core.h b/drivers/platform/x86/intel/pmc/core.h
> index 9a1cc01f31d9..6763e59180a4 100644
> --- a/drivers/platform/x86/intel/pmc/core.h
> +++ b/drivers/platform/x86/intel/pmc/core.h
> @@ -290,6 +290,16 @@ enum ppfear_regs {
>  #define LNL_PPFEAR_NUM_ENTRIES			12
>  #define LNL_S0IX_BLOCKER_OFFSET			0x2004
>  
> +/* SSRAM PMC Device ID*/

Missing space.

Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Xi Pardee Sept. 10, 2024, 6:55 a.m. UTC | #2
On 8/29/2024 3:52 AM, Ilpo Järvinen wrote:
> On Wed, 28 Aug 2024, Xi Pardee wrote:
>
>> Move PMC devid definition for each PMC of Arrow Lake and Meteor
>> Lake platforms to core.h. This patch is a preparation step to
>> introduce a new SSRAM Telemetry driver which will be using the
>> PMC devid.
>>
>> Signed-off-by: Xi Pardee <xi.pardee@linux.intel.com>
>> ---
>>   drivers/platform/x86/intel/pmc/arl.c  |  9 +++------
>>   drivers/platform/x86/intel/pmc/core.h | 10 ++++++++++
>>   drivers/platform/x86/intel/pmc/mtl.c  |  9 +++------
>>   3 files changed, 16 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/platform/x86/intel/pmc/arl.c b/drivers/platform/x86/intel/pmc/arl.c
>> index e10527c4e3e0..870da98ceb41 100644
>> --- a/drivers/platform/x86/intel/pmc/arl.c
>> +++ b/drivers/platform/x86/intel/pmc/arl.c
>> @@ -650,23 +650,20 @@ const struct pmc_reg_map arl_pchs_reg_map = {
>>   	.etr3_offset = ETR3_OFFSET,
>>   };
>>   
>> -#define PMC_DEVID_SOCS 0xae7f
>> -#define PMC_DEVID_IOEP 0x7ecf
>> -#define PMC_DEVID_PCHS 0x7f27
>>   static struct pmc_info arl_pmc_info_list[] = {
>>   	{
>>   		.guid	= IOEP_LPM_REQ_GUID,
>> -		.devid	= PMC_DEVID_IOEP,
>> +		.devid	= PMC_DEVID_MTL_IOEP,
>>   		.map	= &mtl_ioep_reg_map,
>>   	},
>>   	{
>>   		.guid	= SOCS_LPM_REQ_GUID,
>> -		.devid	= PMC_DEVID_SOCS,
>> +		.devid	= PMC_DEVID_ARL_SOCS,
>>   		.map	= &arl_socs_reg_map,
>>   	},
>>   	{
>>   		.guid	= PCHS_LPM_REQ_GUID,
>> -		.devid	= PMC_DEVID_PCHS,
>> +		.devid	= PMC_DEVID_ARL_PCHS,
>>   		.map	= &arl_pchs_reg_map,
>>   	},
>>   	{}
>> diff --git a/drivers/platform/x86/intel/pmc/core.h b/drivers/platform/x86/intel/pmc/core.h
>> index 9a1cc01f31d9..6763e59180a4 100644
>> --- a/drivers/platform/x86/intel/pmc/core.h
>> +++ b/drivers/platform/x86/intel/pmc/core.h
>> @@ -290,6 +290,16 @@ enum ppfear_regs {
>>   #define LNL_PPFEAR_NUM_ENTRIES			12
>>   #define LNL_S0IX_BLOCKER_OFFSET			0x2004
>>   
>> +/* SSRAM PMC Device ID*/
> Missing space.
>
> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>


Will add a space in next version.

Thanks!

Xi

>
diff mbox series

Patch

diff --git a/drivers/platform/x86/intel/pmc/arl.c b/drivers/platform/x86/intel/pmc/arl.c
index e10527c4e3e0..870da98ceb41 100644
--- a/drivers/platform/x86/intel/pmc/arl.c
+++ b/drivers/platform/x86/intel/pmc/arl.c
@@ -650,23 +650,20 @@  const struct pmc_reg_map arl_pchs_reg_map = {
 	.etr3_offset = ETR3_OFFSET,
 };
 
-#define PMC_DEVID_SOCS 0xae7f
-#define PMC_DEVID_IOEP 0x7ecf
-#define PMC_DEVID_PCHS 0x7f27
 static struct pmc_info arl_pmc_info_list[] = {
 	{
 		.guid	= IOEP_LPM_REQ_GUID,
-		.devid	= PMC_DEVID_IOEP,
+		.devid	= PMC_DEVID_MTL_IOEP,
 		.map	= &mtl_ioep_reg_map,
 	},
 	{
 		.guid	= SOCS_LPM_REQ_GUID,
-		.devid	= PMC_DEVID_SOCS,
+		.devid	= PMC_DEVID_ARL_SOCS,
 		.map	= &arl_socs_reg_map,
 	},
 	{
 		.guid	= PCHS_LPM_REQ_GUID,
-		.devid	= PMC_DEVID_PCHS,
+		.devid	= PMC_DEVID_ARL_PCHS,
 		.map	= &arl_pchs_reg_map,
 	},
 	{}
diff --git a/drivers/platform/x86/intel/pmc/core.h b/drivers/platform/x86/intel/pmc/core.h
index 9a1cc01f31d9..6763e59180a4 100644
--- a/drivers/platform/x86/intel/pmc/core.h
+++ b/drivers/platform/x86/intel/pmc/core.h
@@ -290,6 +290,16 @@  enum ppfear_regs {
 #define LNL_PPFEAR_NUM_ENTRIES			12
 #define LNL_S0IX_BLOCKER_OFFSET			0x2004
 
+/* SSRAM PMC Device ID*/
+/* ARL */
+#define PMC_DEVID_ARL_SOCS	0xae7f
+#define PMC_DEVID_ARL_PCHS	0x7f27
+
+/* MTL */
+#define PMC_DEVID_MTL_SOCM	0x7e7f
+#define PMC_DEVID_MTL_IOEP	0x7ecf
+#define PMC_DEVID_MTL_IOEM	0x7ebf
+
 extern const char *pmc_lpm_modes[];
 
 struct pmc_bit_map {
diff --git a/drivers/platform/x86/intel/pmc/mtl.c b/drivers/platform/x86/intel/pmc/mtl.c
index c7d15d864039..908b5f8bb6e5 100644
--- a/drivers/platform/x86/intel/pmc/mtl.c
+++ b/drivers/platform/x86/intel/pmc/mtl.c
@@ -947,23 +947,20 @@  const struct pmc_reg_map mtl_ioem_reg_map = {
 	.lpm_reg_index = MTL_LPM_REG_INDEX,
 };
 
-#define PMC_DEVID_SOCM	0x7e7f
-#define PMC_DEVID_IOEP	0x7ecf
-#define PMC_DEVID_IOEM	0x7ebf
 static struct pmc_info mtl_pmc_info_list[] = {
 	{
 		.guid	= SOCP_LPM_REQ_GUID,
-		.devid	= PMC_DEVID_SOCM,
+		.devid	= PMC_DEVID_MTL_SOCM,
 		.map	= &mtl_socm_reg_map,
 	},
 	{
 		.guid	= IOEP_LPM_REQ_GUID,
-		.devid	= PMC_DEVID_IOEP,
+		.devid	= PMC_DEVID_MTL_IOEP,
 		.map	= &mtl_ioep_reg_map,
 	},
 	{
 		.guid	= IOEM_LPM_REQ_GUID,
-		.devid	= PMC_DEVID_IOEM,
+		.devid	= PMC_DEVID_MTL_IOEM,
 		.map	= &mtl_ioem_reg_map
 	},
 	{}