Skip to content

Commit d4868f4

Browse files
committed
platform/x86:intel/pmc: Move PMC devid to core.h
JIRA: https://issues.redhat.com/browse/RHEL-110838 commit 1b1aaa9 Author: Xi Pardee <xi.pardee@linux.intel.com> Date: Wed Apr 9 12:10:45 2025 -0700 platform/x86:intel/pmc: Move PMC devid to core.h 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> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Link: https://lore.kernel.org/r/20250409191056.15434-4-xi.pardee@linux.intel.com Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Steve Best <sbest@redhat.com>
1 parent 69650ca commit d4868f4

File tree

3 files changed

+19
-14
lines changed

3 files changed

+19
-14
lines changed

drivers/platform/x86/intel/pmc/arl.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -651,29 +651,25 @@ static const struct pmc_reg_map arl_pchs_reg_map = {
651651
.etr3_offset = ETR3_OFFSET,
652652
};
653653

654-
#define PMC_DEVID_SOCM 0x777f
655-
#define PMC_DEVID_SOCS 0xae7f
656-
#define PMC_DEVID_IOEP 0x7ecf
657-
#define PMC_DEVID_PCHS 0x7f27
658654
static struct pmc_info arl_pmc_info_list[] = {
659655
{
660656
.guid = IOEP_LPM_REQ_GUID,
661-
.devid = PMC_DEVID_IOEP,
657+
.devid = PMC_DEVID_ARL_IOEP,
662658
.map = &mtl_ioep_reg_map,
663659
},
664660
{
665661
.guid = SOCS_LPM_REQ_GUID,
666-
.devid = PMC_DEVID_SOCS,
662+
.devid = PMC_DEVID_ARL_SOCS,
667663
.map = &arl_socs_reg_map,
668664
},
669665
{
670666
.guid = PCHS_LPM_REQ_GUID,
671-
.devid = PMC_DEVID_PCHS,
667+
.devid = PMC_DEVID_ARL_PCHS,
672668
.map = &arl_pchs_reg_map,
673669
},
674670
{
675671
.guid = SOCM_LPM_REQ_GUID,
676-
.devid = PMC_DEVID_SOCM,
672+
.devid = PMC_DEVID_ARL_SOCM,
677673
.map = &mtl_socm_reg_map,
678674
},
679675
{}

drivers/platform/x86/intel/pmc/core.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,18 @@ enum ppfear_regs {
298298
#define PTL_PMC_LTR_CUR_PLT 0x1C2C
299299
#define PTL_PCD_PMC_MMIO_REG_LEN 0x31A8
300300

301+
/* SSRAM PMC Device ID */
302+
/* ARL */
303+
#define PMC_DEVID_ARL_SOCM 0x777f
304+
#define PMC_DEVID_ARL_SOCS 0xae7f
305+
#define PMC_DEVID_ARL_IOEP 0x7ecf
306+
#define PMC_DEVID_ARL_PCHS 0x7f27
307+
308+
/* MTL */
309+
#define PMC_DEVID_MTL_SOCM 0x7e7f
310+
#define PMC_DEVID_MTL_IOEP 0x7ecf
311+
#define PMC_DEVID_MTL_IOEM 0x7ebf
312+
301313
extern const char *pmc_lpm_modes[];
302314

303315
struct pmc_bit_map {

drivers/platform/x86/intel/pmc/mtl.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -947,23 +947,20 @@ static const struct pmc_reg_map mtl_ioem_reg_map = {
947947
.lpm_reg_index = MTL_LPM_REG_INDEX,
948948
};
949949

950-
#define PMC_DEVID_SOCM 0x7e7f
951-
#define PMC_DEVID_IOEP 0x7ecf
952-
#define PMC_DEVID_IOEM 0x7ebf
953950
static struct pmc_info mtl_pmc_info_list[] = {
954951
{
955952
.guid = SOCP_LPM_REQ_GUID,
956-
.devid = PMC_DEVID_SOCM,
953+
.devid = PMC_DEVID_MTL_SOCM,
957954
.map = &mtl_socm_reg_map,
958955
},
959956
{
960957
.guid = IOEP_LPM_REQ_GUID,
961-
.devid = PMC_DEVID_IOEP,
958+
.devid = PMC_DEVID_MTL_IOEP,
962959
.map = &mtl_ioep_reg_map,
963960
},
964961
{
965962
.guid = IOEM_LPM_REQ_GUID,
966-
.devid = PMC_DEVID_IOEM,
963+
.devid = PMC_DEVID_MTL_IOEM,
967964
.map = &mtl_ioem_reg_map
968965
},
969966
{}

0 commit comments

Comments
 (0)