diff options
Diffstat (limited to 'drivers/platform/x86/intel/pmc')
| -rw-r--r-- | drivers/platform/x86/intel/pmc/arl.c | 2 | ||||
| -rw-r--r-- | drivers/platform/x86/intel/pmc/core.c | 38 | ||||
| -rw-r--r-- | drivers/platform/x86/intel/pmc/core.h | 9 | ||||
| -rw-r--r-- | drivers/platform/x86/intel/pmc/lnl.c | 477 | 
4 files changed, 313 insertions, 213 deletions
diff --git a/drivers/platform/x86/intel/pmc/arl.c b/drivers/platform/x86/intel/pmc/arl.c index 34b4cd23bfe5..e10527c4e3e0 100644 --- a/drivers/platform/x86/intel/pmc/arl.c +++ b/drivers/platform/x86/intel/pmc/arl.c @@ -1,7 +1,7 @@  // SPDX-License-Identifier: GPL-2.0  /*   * This file contains platform specific structure definitions - * and init function used by Meteor Lake PCH. + * and init function used by Arrow Lake PCH.   *   * Copyright (c) 2022, Intel Corporation.   * All Rights Reserved. diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c index 10c96c1a850a..2ad2f8753e5d 100644 --- a/drivers/platform/x86/intel/pmc/core.c +++ b/drivers/platform/x86/intel/pmc/core.c @@ -678,6 +678,41 @@ static int pmc_core_ltr_show(struct seq_file *s, void *unused)  }  DEFINE_SHOW_ATTRIBUTE(pmc_core_ltr); +static int pmc_core_s0ix_blocker_show(struct seq_file *s, void *unused) +{ +	struct pmc_dev *pmcdev = s->private; +	unsigned int pmcidx; + +	for (pmcidx = 0; pmcidx < ARRAY_SIZE(pmcdev->pmcs); pmcidx++) { +		const struct pmc_bit_map **maps; +		unsigned int arr_size, r_idx; +		u32 offset, counter; +		struct pmc *pmc; + +		pmc = pmcdev->pmcs[pmcidx]; +		if (!pmc) +			continue; +		maps = pmc->map->s0ix_blocker_maps; +		offset = pmc->map->s0ix_blocker_offset; +		arr_size = pmc_core_lpm_get_arr_size(maps); + +		for (r_idx = 0; r_idx < arr_size; r_idx++) { +			const struct pmc_bit_map *map; + +			for (map = maps[r_idx]; map->name; map++) { +				if (!map->blk) +					continue; +				counter = pmc_core_reg_read(pmc, offset); +				seq_printf(s, "PMC%d:%-30s %-30d\n", pmcidx, +					   map->name, counter); +				offset += map->blk * S0IX_BLK_SIZE; +			} +		} +	} +	return 0; +} +DEFINE_SHOW_ATTRIBUTE(pmc_core_s0ix_blocker); +  static inline u64 adjust_lpm_residency(struct pmc *pmc, u32 offset,  				       const int lpm_adj_x2)  { @@ -1197,6 +1232,9 @@ static void pmc_core_dbgfs_register(struct pmc_dev *pmcdev)  	debugfs_create_file("ltr_show", 0444, dir, pmcdev, &pmc_core_ltr_fops); +	if (primary_pmc->map->s0ix_blocker_maps) +		debugfs_create_file("s0ix_blocker", 0444, dir, pmcdev, &pmc_core_s0ix_blocker_fops); +  	debugfs_create_file("package_cstate_show", 0444, dir, primary_pmc,  			    &pmc_core_pkgc_fops); diff --git a/drivers/platform/x86/intel/pmc/core.h b/drivers/platform/x86/intel/pmc/core.h index 83504c49a0e3..ea04de7eb9e8 100644 --- a/drivers/platform/x86/intel/pmc/core.h +++ b/drivers/platform/x86/intel/pmc/core.h @@ -22,6 +22,7 @@ struct telem_endpoint;  #define PMC_BASE_ADDR_DEFAULT			0xFE000000  #define MAX_NUM_PMC			3 +#define S0IX_BLK_SIZE			4  /* Sunrise Point Power Management Controller PCI Device ID */  #define SPT_PMC_PCI_DEVICE_ID			0x9d21 @@ -282,12 +283,14 @@ enum ppfear_regs {  #define LNL_PMC_LTR_OSSE			0x1B88  #define LNL_NUM_IP_IGN_ALLOWED			27  #define LNL_PPFEAR_NUM_ENTRIES			12 +#define LNL_S0IX_BLOCKER_OFFSET			0x2004  extern const char *pmc_lpm_modes[];  struct pmc_bit_map {  	const char *name;  	u32 bit_mask; +	u8 blk;  };  /** @@ -298,6 +301,7 @@ struct pmc_bit_map {   * @pll_sts:		Maps name of PLL to corresponding bit status   * @slps0_dbg_maps:	Array of SLP_S0_DBG* registers containing debug info   * @ltr_show_sts:	Maps PCH IP Names to their MMIO register offsets + * @s0ix_blocker_maps:	Maps name of IP block to S0ix blocker counter   * @slp_s0_offset:	PWRMBASE offset to read SLP_S0 residency   * @ltr_ignore_offset:	PWRMBASE offset to read/write LTR ignore bit   * @regmap_length:	Length of memory to map from PWRMBASE address to access @@ -307,6 +311,7 @@ struct pmc_bit_map {   * @pm_cfg_offset:	PWRMBASE offset to PM_CFG register   * @pm_read_disable_bit: Bit index to read PMC_READ_DISABLE   * @slps0_dbg_offset:	PWRMBASE offset to SLP_S0_DEBUG_REG* + * @s0ix_blocker_offset PWRMBASE offset to S0ix blocker counter   *   * Each PCH has unique set of register offsets and bit indexes. This structure   * captures them to have a common implementation. @@ -319,6 +324,7 @@ struct pmc_reg_map {  	const struct pmc_bit_map *ltr_show_sts;  	const struct pmc_bit_map *msr_sts;  	const struct pmc_bit_map **lpm_sts; +	const struct pmc_bit_map **s0ix_blocker_maps;  	const u32 slp_s0_offset;  	const int slp_s0_res_counter_step;  	const u32 ltr_ignore_offset; @@ -330,6 +336,7 @@ struct pmc_reg_map {  	const u32 slps0_dbg_offset;  	const u32 ltr_ignore_max;  	const u32 pm_vric1_offset; +	const u32 s0ix_blocker_offset;  	/* Low Power Mode registers */  	const int lpm_num_maps;  	const int lpm_num_modes; @@ -535,8 +542,10 @@ extern const struct pmc_bit_map lnl_vnn_req_status_2_map[];  extern const struct pmc_bit_map lnl_vnn_req_status_3_map[];  extern const struct pmc_bit_map lnl_vnn_misc_status_map[];  extern const struct pmc_bit_map *lnl_lpm_maps[]; +extern const struct pmc_bit_map *lnl_blk_maps[];  extern const struct pmc_bit_map lnl_pfear_map[];  extern const struct pmc_bit_map *ext_lnl_pfear_map[]; +extern const struct pmc_bit_map lnl_signal_status_map[];  /* ARL */  extern const struct pmc_bit_map arl_socs_ltr_show_map[]; diff --git a/drivers/platform/x86/intel/pmc/lnl.c b/drivers/platform/x86/intel/pmc/lnl.c index 068d72504683..e7a8077d1a3e 100644 --- a/drivers/platform/x86/intel/pmc/lnl.c +++ b/drivers/platform/x86/intel/pmc/lnl.c @@ -1,7 +1,7 @@  // SPDX-License-Identifier: GPL-2.0  /*   * This file contains platform specific structure definitions - * and init function used by Meteor Lake PCH. + * and init function used by Lunar Lake PCH.   *   * Copyright (c) 2022, Intel Corporation.   * All Rights Reserved. @@ -56,264 +56,296 @@ const struct pmc_bit_map lnl_ltr_show_map[] = {  };  const struct pmc_bit_map lnl_power_gating_status_0_map[] = { -	{"PMC_PGD0_PG_STS",			BIT(0)}, -	{"FUSE_OSSE_PGD0_PG_STS",		BIT(1)}, -	{"ESPISPI_PGD0_PG_STS",			BIT(2)}, -	{"XHCI_PGD0_PG_STS",			BIT(3)}, -	{"SPA_PGD0_PG_STS",			BIT(4)}, -	{"SPB_PGD0_PG_STS",			BIT(5)}, -	{"SPR16B0_PGD0_PG_STS",			BIT(6)}, -	{"GBE_PGD0_PG_STS",			BIT(7)}, -	{"SBR8B7_PGD0_PG_STS",			BIT(8)}, -	{"SBR8B6_PGD0_PG_STS",			BIT(9)}, -	{"SBR16B1_PGD0_PG_STS",			BIT(10)}, -	{"SBR8B8_PGD0_PG_STS",			BIT(11)}, -	{"ESE_PGD3_PG_STS",			BIT(12)}, -	{"D2D_DISP_PGD0_PG_STS",		BIT(13)}, -	{"LPSS_PGD0_PG_STS",			BIT(14)}, -	{"LPC_PGD0_PG_STS",			BIT(15)}, -	{"SMB_PGD0_PG_STS",			BIT(16)}, -	{"ISH_PGD0_PG_STS",			BIT(17)}, -	{"SBR8B2_PGD0_PG_STS",			BIT(18)}, -	{"NPK_PGD0_PG_STS",			BIT(19)}, -	{"D2D_NOC_PGD0_PG_STS",			BIT(20)}, -	{"SAFSS_PGD0_PG_STS",			BIT(21)}, -	{"FUSE_PGD0_PG_STS",			BIT(22)}, -	{"D2D_DISP_PGD1_PG_STS",		BIT(23)}, -	{"MPFPW1_PGD0_PG_STS",			BIT(24)}, -	{"XDCI_PGD0_PG_STS",			BIT(25)}, -	{"EXI_PGD0_PG_STS",			BIT(26)}, -	{"CSE_PGD0_PG_STS",			BIT(27)}, -	{"KVMCC_PGD0_PG_STS",			BIT(28)}, -	{"PMT_PGD0_PG_STS",			BIT(29)}, -	{"CLINK_PGD0_PG_STS",			BIT(30)}, -	{"PTIO_PGD0_PG_STS",			BIT(31)}, +	{"PMC_PGD0_PG_STS",			BIT(0),		0}, +	{"FUSE_OSSE_PGD0_PG_STS",		BIT(1),		0}, +	{"ESPISPI_PGD0_PG_STS",			BIT(2),		0}, +	{"XHCI_PGD0_PG_STS",			BIT(3),		1}, +	{"SPA_PGD0_PG_STS",			BIT(4),		1}, +	{"SPB_PGD0_PG_STS",			BIT(5),		1}, +	{"SPR16B0_PGD0_PG_STS",			BIT(6),		0}, +	{"GBE_PGD0_PG_STS",			BIT(7),		1}, +	{"SBR8B7_PGD0_PG_STS",			BIT(8),		0}, +	{"SBR8B6_PGD0_PG_STS",			BIT(9),		0}, +	{"SBR16B1_PGD0_PG_STS",			BIT(10),	0}, +	{"SBR8B8_PGD0_PG_STS",			BIT(11),	0}, +	{"ESE_PGD3_PG_STS",			BIT(12),	1}, +	{"D2D_DISP_PGD0_PG_STS",		BIT(13),	1}, +	{"LPSS_PGD0_PG_STS",			BIT(14),	1}, +	{"LPC_PGD0_PG_STS",			BIT(15),	0}, +	{"SMB_PGD0_PG_STS",			BIT(16),	0}, +	{"ISH_PGD0_PG_STS",			BIT(17),	0}, +	{"SBR8B2_PGD0_PG_STS",			BIT(18),	0}, +	{"NPK_PGD0_PG_STS",			BIT(19),	0}, +	{"D2D_NOC_PGD0_PG_STS",			BIT(20),	0}, +	{"SAFSS_PGD0_PG_STS",			BIT(21),	0}, +	{"FUSE_PGD0_PG_STS",			BIT(22),	0}, +	{"D2D_DISP_PGD1_PG_STS",		BIT(23),	1}, +	{"MPFPW1_PGD0_PG_STS",			BIT(24),	0}, +	{"XDCI_PGD0_PG_STS",			BIT(25),	1}, +	{"EXI_PGD0_PG_STS",			BIT(26),	0}, +	{"CSE_PGD0_PG_STS",			BIT(27),	1}, +	{"KVMCC_PGD0_PG_STS",			BIT(28),	1}, +	{"PMT_PGD0_PG_STS",			BIT(29),	1}, +	{"CLINK_PGD0_PG_STS",			BIT(30),	1}, +	{"PTIO_PGD0_PG_STS",			BIT(31),	1},  	{}  };  const struct pmc_bit_map lnl_power_gating_status_1_map[] = { -	{"USBR0_PGD0_PG_STS",			BIT(0)}, -	{"SUSRAM_PGD0_PG_STS",			BIT(1)}, -	{"SMT1_PGD0_PG_STS",			BIT(2)}, -	{"U3FPW1_PGD0_PG_STS",			BIT(3)}, -	{"SMS2_PGD0_PG_STS",			BIT(4)}, -	{"SMS1_PGD0_PG_STS",			BIT(5)}, -	{"CSMERTC_PGD0_PG_STS",			BIT(6)}, -	{"CSMEPSF_PGD0_PG_STS",			BIT(7)}, -	{"FIA_PG_PGD0_PG_STS",			BIT(8)}, -	{"SBR16B4_PGD0_PG_STS",			BIT(9)}, -	{"P2SB8B_PGD0_PG_STS",			BIT(10)}, -	{"DBG_SBR_PGD0_PG_STS",			BIT(11)}, -	{"SBR8B9_PGD0_PG_STS",			BIT(12)}, -	{"OSSE_SMT1_PGD0_PG_STS",		BIT(13)}, -	{"SBR8B10_PGD0_PG_STS",			BIT(14)}, -	{"SBR16B3_PGD0_PG_STS",			BIT(15)}, -	{"G5FPW1_PGD0_PG_STS",			BIT(16)}, -	{"SBRG_PGD0_PG_STS",			BIT(17)}, -	{"PSF4_PGD0_PG_STS",			BIT(18)}, -	{"CNVI_PGD0_PG_STS",			BIT(19)}, -	{"USFX2_PGD0_PG_STS",			BIT(20)}, -	{"ENDBG_PGD0_PG_STS",			BIT(21)}, -	{"FIACPCB_P5X4_PGD0_PG_STS",		BIT(22)}, -	{"SBR8B3_PGD0_PG_STS",			BIT(23)}, -	{"SBR8B0_PGD0_PG_STS",			BIT(24)}, -	{"NPK_PGD1_PG_STS",			BIT(25)}, -	{"OSSE_HOTHAM_PGD0_PG_STS",		BIT(26)}, -	{"D2D_NOC_PGD2_PG_STS",			BIT(27)}, -	{"SBR8B1_PGD0_PG_STS",			BIT(28)}, -	{"PSF6_PGD0_PG_STS",			BIT(29)}, -	{"PSF7_PGD0_PG_STS",			BIT(30)}, -	{"FIA_U_PGD0_PG_STS",			BIT(31)}, +	{"USBR0_PGD0_PG_STS",			BIT(0),		1}, +	{"SUSRAM_PGD0_PG_STS",			BIT(1),		1}, +	{"SMT1_PGD0_PG_STS",			BIT(2),		1}, +	{"U3FPW1_PGD0_PG_STS",			BIT(3),		0}, +	{"SMS2_PGD0_PG_STS",			BIT(4),		1}, +	{"SMS1_PGD0_PG_STS",			BIT(5),		1}, +	{"CSMERTC_PGD0_PG_STS",			BIT(6),		0}, +	{"CSMEPSF_PGD0_PG_STS",			BIT(7),		0}, +	{"FIA_PG_PGD0_PG_STS",			BIT(8),		0}, +	{"SBR16B4_PGD0_PG_STS",			BIT(9),		0}, +	{"P2SB8B_PGD0_PG_STS",			BIT(10),	1}, +	{"DBG_SBR_PGD0_PG_STS",			BIT(11),	0}, +	{"SBR8B9_PGD0_PG_STS",			BIT(12),	0}, +	{"OSSE_SMT1_PGD0_PG_STS",		BIT(13),	1}, +	{"SBR8B10_PGD0_PG_STS",			BIT(14),	0}, +	{"SBR16B3_PGD0_PG_STS",			BIT(15),	0}, +	{"G5FPW1_PGD0_PG_STS",			BIT(16),	0}, +	{"SBRG_PGD0_PG_STS",			BIT(17),	0}, +	{"PSF4_PGD0_PG_STS",			BIT(18),	0}, +	{"CNVI_PGD0_PG_STS",			BIT(19),	0}, +	{"USFX2_PGD0_PG_STS",			BIT(20),	1}, +	{"ENDBG_PGD0_PG_STS",			BIT(21),	0}, +	{"FIACPCB_P5X4_PGD0_PG_STS",		BIT(22),	0}, +	{"SBR8B3_PGD0_PG_STS",			BIT(23),	0}, +	{"SBR8B0_PGD0_PG_STS",			BIT(24),	0}, +	{"NPK_PGD1_PG_STS",			BIT(25),	0}, +	{"OSSE_HOTHAM_PGD0_PG_STS",		BIT(26),	1}, +	{"D2D_NOC_PGD2_PG_STS",			BIT(27),	1}, +	{"SBR8B1_PGD0_PG_STS",			BIT(28),	0}, +	{"PSF6_PGD0_PG_STS",			BIT(29),	0}, +	{"PSF7_PGD0_PG_STS",			BIT(30),	0}, +	{"FIA_U_PGD0_PG_STS",			BIT(31),	0},  	{}  };  const struct pmc_bit_map lnl_power_gating_status_2_map[] = { -	{"PSF8_PGD0_PG_STS",			BIT(0)}, -	{"SBR16B2_PGD0_PG_STS",			BIT(1)}, -	{"D2D_IPU_PGD0_PG_STS",			BIT(2)}, -	{"FIACPCB_U_PGD0_PG_STS",		BIT(3)}, -	{"TAM_PGD0_PG_STS",			BIT(4)}, -	{"D2D_NOC_PGD1_PG_STS",			BIT(5)}, -	{"TBTLSX_PGD0_PG_STS",			BIT(6)}, -	{"THC0_PGD0_PG_STS",			BIT(7)}, -	{"THC1_PGD0_PG_STS",			BIT(8)}, -	{"PMC_PGD0_PG_STS",			BIT(9)}, -	{"SBR8B5_PGD0_PG_STS",			BIT(10)}, -	{"UFSPW1_PGD0_PG_STS",			BIT(11)}, -	{"DBC_PGD0_PG_STS",			BIT(12)}, -	{"TCSS_PGD0_PG_STS",			BIT(13)}, -	{"FIA_P5X4_PGD0_PG_STS",		BIT(14)}, -	{"DISP_PGA_PGD0_PG_STS",		BIT(15)}, -	{"DISP_PSF_PGD0_PG_STS",		BIT(16)}, -	{"PSF0_PGD0_PG_STS",			BIT(17)}, -	{"P2SB16B_PGD0_PG_STS",			BIT(18)}, -	{"ACE_PGD0_PG_STS",			BIT(19)}, -	{"ACE_PGD1_PG_STS",			BIT(20)}, -	{"ACE_PGD2_PG_STS",			BIT(21)}, -	{"ACE_PGD3_PG_STS",			BIT(22)}, -	{"ACE_PGD4_PG_STS",			BIT(23)}, -	{"ACE_PGD5_PG_STS",			BIT(24)}, -	{"ACE_PGD6_PG_STS",			BIT(25)}, -	{"ACE_PGD7_PG_STS",			BIT(26)}, -	{"ACE_PGD8_PG_STS",			BIT(27)}, -	{"ACE_PGD9_PG_STS",			BIT(28)}, -	{"ACE_PGD10_PG_STS",			BIT(29)}, -	{"FIACPCB_PG_PGD0_PG_STS",		BIT(30)}, -	{"OSSE_PGD0_PG_STS",			BIT(31)}, +	{"PSF8_PGD0_PG_STS",			BIT(0),		0}, +	{"SBR16B2_PGD0_PG_STS",			BIT(1),		0}, +	{"D2D_IPU_PGD0_PG_STS",			BIT(2),		1}, +	{"FIACPCB_U_PGD0_PG_STS",		BIT(3),		0}, +	{"TAM_PGD0_PG_STS",			BIT(4),		1}, +	{"D2D_NOC_PGD1_PG_STS",			BIT(5),		1}, +	{"TBTLSX_PGD0_PG_STS",			BIT(6),		1}, +	{"THC0_PGD0_PG_STS",			BIT(7),		1}, +	{"THC1_PGD0_PG_STS",			BIT(8),		1}, +	{"PMC_PGD0_PG_STS",			BIT(9),		0}, +	{"SBR8B5_PGD0_PG_STS",			BIT(10),	0}, +	{"UFSPW1_PGD0_PG_STS",			BIT(11),	0}, +	{"DBC_PGD0_PG_STS",			BIT(12),	0}, +	{"TCSS_PGD0_PG_STS",			BIT(13),	0}, +	{"FIA_P5X4_PGD0_PG_STS",		BIT(14),	0}, +	{"DISP_PGA_PGD0_PG_STS",		BIT(15),	0}, +	{"DISP_PSF_PGD0_PG_STS",		BIT(16),	0}, +	{"PSF0_PGD0_PG_STS",			BIT(17),	0}, +	{"P2SB16B_PGD0_PG_STS",			BIT(18),	1}, +	{"ACE_PGD0_PG_STS",			BIT(19),	0}, +	{"ACE_PGD1_PG_STS",			BIT(20),	0}, +	{"ACE_PGD2_PG_STS",			BIT(21),	0}, +	{"ACE_PGD3_PG_STS",			BIT(22),	0}, +	{"ACE_PGD4_PG_STS",			BIT(23),	0}, +	{"ACE_PGD5_PG_STS",			BIT(24),	0}, +	{"ACE_PGD6_PG_STS",			BIT(25),	0}, +	{"ACE_PGD7_PG_STS",			BIT(26),	0}, +	{"ACE_PGD8_PG_STS",			BIT(27),	0}, +	{"ACE_PGD9_PG_STS",			BIT(28),	0}, +	{"ACE_PGD10_PG_STS",			BIT(29),	0}, +	{"FIACPCB_PG_PGD0_PG_STS",		BIT(30),	0}, +	{"OSSE_PGD0_PG_STS",			BIT(31),	1},  	{}  };  const struct pmc_bit_map lnl_d3_status_0_map[] = { -	{"LPSS_D3_STS",				BIT(3)}, -	{"XDCI_D3_STS",				BIT(4)}, -	{"XHCI_D3_STS",				BIT(5)}, -	{"SPA_D3_STS",				BIT(12)}, -	{"SPB_D3_STS",				BIT(13)}, -	{"OSSE_D3_STS",				BIT(15)}, -	{"ESPISPI_D3_STS",			BIT(18)}, -	{"PSTH_D3_STS",				BIT(21)}, +	{"LPSS_D3_STS",				BIT(3),		1}, +	{"XDCI_D3_STS",				BIT(4),		1}, +	{"XHCI_D3_STS",				BIT(5),		1}, +	{"SPA_D3_STS",				BIT(12),	0}, +	{"SPB_D3_STS",				BIT(13),	0}, +	{"OSSE_D3_STS",				BIT(15),	0}, +	{"ESPISPI_D3_STS",			BIT(18),	0}, +	{"PSTH_D3_STS",				BIT(21),	0},  	{}  };  const struct pmc_bit_map lnl_d3_status_1_map[] = { -	{"OSSE_SMT1_D3_STS",			BIT(7)}, -	{"GBE_D3_STS",				BIT(19)}, -	{"ITSS_D3_STS",				BIT(23)}, -	{"CNVI_D3_STS",				BIT(27)}, -	{"UFSX2_D3_STS",			BIT(28)}, -	{"OSSE_HOTHAM_D3_STS",			BIT(31)}, +	{"OSSE_SMT1_D3_STS",			BIT(7),		0}, +	{"GBE_D3_STS",				BIT(19),	0}, +	{"ITSS_D3_STS",				BIT(23),	0}, +	{"CNVI_D3_STS",				BIT(27),	0}, +	{"UFSX2_D3_STS",			BIT(28),	1}, +	{"OSSE_HOTHAM_D3_STS",			BIT(31),	0},  	{}  };  const struct pmc_bit_map lnl_d3_status_2_map[] = { -	{"ESE_D3_STS",				BIT(0)}, -	{"CSMERTC_D3_STS",			BIT(1)}, -	{"SUSRAM_D3_STS",			BIT(2)}, -	{"CSE_D3_STS",				BIT(4)}, -	{"KVMCC_D3_STS",			BIT(5)}, -	{"USBR0_D3_STS",			BIT(6)}, -	{"ISH_D3_STS",				BIT(7)}, -	{"SMT1_D3_STS",				BIT(8)}, -	{"SMT2_D3_STS",				BIT(9)}, -	{"SMT3_D3_STS",				BIT(10)}, -	{"OSSE_SMT2_D3_STS",			BIT(13)}, -	{"CLINK_D3_STS",			BIT(14)}, -	{"PTIO_D3_STS",				BIT(16)}, -	{"PMT_D3_STS",				BIT(17)}, -	{"SMS1_D3_STS",				BIT(18)}, -	{"SMS2_D3_STS",				BIT(19)}, +	{"ESE_D3_STS",				BIT(0),		0}, +	{"CSMERTC_D3_STS",			BIT(1),		0}, +	{"SUSRAM_D3_STS",			BIT(2),		0}, +	{"CSE_D3_STS",				BIT(4),		0}, +	{"KVMCC_D3_STS",			BIT(5),		0}, +	{"USBR0_D3_STS",			BIT(6),		0}, +	{"ISH_D3_STS",				BIT(7),		0}, +	{"SMT1_D3_STS",				BIT(8),		0}, +	{"SMT2_D3_STS",				BIT(9),		0}, +	{"SMT3_D3_STS",				BIT(10),	0}, +	{"OSSE_SMT2_D3_STS",			BIT(13),	0}, +	{"CLINK_D3_STS",			BIT(14),	0}, +	{"PTIO_D3_STS",				BIT(16),	0}, +	{"PMT_D3_STS",				BIT(17),	0}, +	{"SMS1_D3_STS",				BIT(18),	0}, +	{"SMS2_D3_STS",				BIT(19),	0},  	{}  };  const struct pmc_bit_map lnl_d3_status_3_map[] = { -	{"THC0_D3_STS",				BIT(14)}, -	{"THC1_D3_STS",				BIT(15)}, -	{"OSSE_SMT3_D3_STS",			BIT(21)}, -	{"ACE_D3_STS",				BIT(23)}, +	{"THC0_D3_STS",				BIT(14),	1}, +	{"THC1_D3_STS",				BIT(15),	1}, +	{"OSSE_SMT3_D3_STS",			BIT(21),	0}, +	{"ACE_D3_STS",				BIT(23),	0},  	{}  };  const struct pmc_bit_map lnl_vnn_req_status_0_map[] = { -	{"LPSS_VNN_REQ_STS",			BIT(3)}, -	{"OSSE_VNN_REQ_STS",			BIT(15)}, -	{"ESPISPI_VNN_REQ_STS",			BIT(18)}, +	{"LPSS_VNN_REQ_STS",			BIT(3),		1}, +	{"OSSE_VNN_REQ_STS",			BIT(15),	1}, +	{"ESPISPI_VNN_REQ_STS",			BIT(18),	1},  	{}  };  const struct pmc_bit_map lnl_vnn_req_status_1_map[] = { -	{"NPK_VNN_REQ_STS",			BIT(4)}, -	{"OSSE_SMT1_VNN_REQ_STS",		BIT(7)}, -	{"DFXAGG_VNN_REQ_STS",			BIT(8)}, -	{"EXI_VNN_REQ_STS",			BIT(9)}, -	{"P2D_VNN_REQ_STS",			BIT(18)}, -	{"GBE_VNN_REQ_STS",			BIT(19)}, -	{"SMB_VNN_REQ_STS",			BIT(25)}, -	{"LPC_VNN_REQ_STS",			BIT(26)}, +	{"NPK_VNN_REQ_STS",			BIT(4),		1}, +	{"OSSE_SMT1_VNN_REQ_STS",		BIT(7),		1}, +	{"DFXAGG_VNN_REQ_STS",			BIT(8),		0}, +	{"EXI_VNN_REQ_STS",			BIT(9),		1}, +	{"P2D_VNN_REQ_STS",			BIT(18),	1}, +	{"GBE_VNN_REQ_STS",			BIT(19),	1}, +	{"SMB_VNN_REQ_STS",			BIT(25),	1}, +	{"LPC_VNN_REQ_STS",			BIT(26),	0},  	{}  };  const struct pmc_bit_map lnl_vnn_req_status_2_map[] = { -	{"eSE_VNN_REQ_STS",			BIT(0)}, -	{"CSMERTC_VNN_REQ_STS",			BIT(1)}, -	{"CSE_VNN_REQ_STS",			BIT(4)}, -	{"ISH_VNN_REQ_STS",			BIT(7)}, -	{"SMT1_VNN_REQ_STS",			BIT(8)}, -	{"CLINK_VNN_REQ_STS",			BIT(14)}, -	{"SMS1_VNN_REQ_STS",			BIT(18)}, -	{"SMS2_VNN_REQ_STS",			BIT(19)}, -	{"GPIOCOM4_VNN_REQ_STS",		BIT(20)}, -	{"GPIOCOM3_VNN_REQ_STS",		BIT(21)}, -	{"GPIOCOM2_VNN_REQ_STS",		BIT(22)}, -	{"GPIOCOM1_VNN_REQ_STS",		BIT(23)}, -	{"GPIOCOM0_VNN_REQ_STS",		BIT(24)}, +	{"eSE_VNN_REQ_STS",			BIT(0),		1}, +	{"CSMERTC_VNN_REQ_STS",			BIT(1),		1}, +	{"CSE_VNN_REQ_STS",			BIT(4),		1}, +	{"ISH_VNN_REQ_STS",			BIT(7),		1}, +	{"SMT1_VNN_REQ_STS",			BIT(8),		1}, +	{"CLINK_VNN_REQ_STS",			BIT(14),	1}, +	{"SMS1_VNN_REQ_STS",			BIT(18),	1}, +	{"SMS2_VNN_REQ_STS",			BIT(19),	1}, +	{"GPIOCOM4_VNN_REQ_STS",		BIT(20),	1}, +	{"GPIOCOM3_VNN_REQ_STS",		BIT(21),	1}, +	{"GPIOCOM2_VNN_REQ_STS",		BIT(22),	0}, +	{"GPIOCOM1_VNN_REQ_STS",		BIT(23),	1}, +	{"GPIOCOM0_VNN_REQ_STS",		BIT(24),	1},  	{}  };  const struct pmc_bit_map lnl_vnn_req_status_3_map[] = { -	{"DISP_SHIM_VNN_REQ_STS",		BIT(2)}, -	{"DTS0_VNN_REQ_STS",			BIT(7)}, -	{"GPIOCOM5_VNN_REQ_STS",		BIT(11)}, +	{"DISP_SHIM_VNN_REQ_STS",		BIT(2),		0}, +	{"DTS0_VNN_REQ_STS",			BIT(7),		0}, +	{"GPIOCOM5_VNN_REQ_STS",		BIT(11),	2},  	{}  };  const struct pmc_bit_map lnl_vnn_misc_status_map[] = { -	{"CPU_C10_REQ_STS",			BIT(0)}, -	{"TS_OFF_REQ_STS",			BIT(1)}, -	{"PNDE_MET_REQ_STS",			BIT(2)}, -	{"PCIE_DEEP_PM_REQ_STS",		BIT(3)}, -	{"PMC_CLK_THROTTLE_EN_REQ_STS",		BIT(4)}, -	{"NPK_VNNAON_REQ_STS",			BIT(5)}, -	{"VNN_SOC_REQ_STS",			BIT(6)}, -	{"ISH_VNNAON_REQ_STS",			BIT(7)}, -	{"D2D_NOC_CFI_QACTIVE_REQ_STS",		BIT(8)}, -	{"D2D_NOC_GPSB_QACTIVE_REQ_STS",	BIT(9)}, -	{"D2D_NOC_IPU_QACTIVE_REQ_STS",		BIT(10)}, -	{"PLT_GREATER_REQ_STS",			BIT(11)}, -	{"PCIE_CLKREQ_REQ_STS",			BIT(12)}, -	{"PMC_IDLE_FB_OCP_REQ_STS",		BIT(13)}, -	{"PM_SYNC_STATES_REQ_STS",		BIT(14)}, -	{"EA_REQ_STS",				BIT(15)}, -	{"MPHY_CORE_OFF_REQ_STS",		BIT(16)}, -	{"BRK_EV_EN_REQ_STS",			BIT(17)}, -	{"AUTO_DEMO_EN_REQ_STS",		BIT(18)}, -	{"ITSS_CLK_SRC_REQ_STS",		BIT(19)}, -	{"LPC_CLK_SRC_REQ_STS",			BIT(20)}, -	{"ARC_IDLE_REQ_STS",			BIT(21)}, -	{"MPHY_SUS_REQ_STS",			BIT(22)}, -	{"FIA_DEEP_PM_REQ_STS",			BIT(23)}, -	{"UXD_CONNECTED_REQ_STS",		BIT(24)}, -	{"ARC_INTERRUPT_WAKE_REQ_STS",	BIT(25)}, -	{"D2D_NOC_DISP_DDI_QACTIVE_REQ_STS",	BIT(26)}, -	{"PRE_WAKE0_REQ_STS",			BIT(27)}, -	{"PRE_WAKE1_REQ_STS",			BIT(28)}, -	{"PRE_WAKE2_EN_REQ_STS",		BIT(29)}, -	{"WOV_REQ_STS",				BIT(30)}, -	{"D2D_NOC_DISP_EDP_QACTIVE_REQ_STS_31",	BIT(31)}, +	{"CPU_C10_REQ_STS",			BIT(0),		0}, +	{"TS_OFF_REQ_STS",			BIT(1),		0}, +	{"PNDE_MET_REQ_STS",			BIT(2),		1}, +	{"PCIE_DEEP_PM_REQ_STS",		BIT(3),		0}, +	{"PMC_CLK_THROTTLE_EN_REQ_STS",		BIT(4),		0}, +	{"NPK_VNNAON_REQ_STS",			BIT(5),		0}, +	{"VNN_SOC_REQ_STS",			BIT(6),		1}, +	{"ISH_VNNAON_REQ_STS",			BIT(7),		0}, +	{"D2D_NOC_CFI_QACTIVE_REQ_STS",		BIT(8),		1}, +	{"D2D_NOC_GPSB_QACTIVE_REQ_STS",	BIT(9),		1}, +	{"D2D_NOC_IPU_QACTIVE_REQ_STS",		BIT(10),	1}, +	{"PLT_GREATER_REQ_STS",			BIT(11),	1}, +	{"PCIE_CLKREQ_REQ_STS",			BIT(12),	0}, +	{"PMC_IDLE_FB_OCP_REQ_STS",		BIT(13),	0}, +	{"PM_SYNC_STATES_REQ_STS",		BIT(14),	0}, +	{"EA_REQ_STS",				BIT(15),	0}, +	{"MPHY_CORE_OFF_REQ_STS",		BIT(16),	0}, +	{"BRK_EV_EN_REQ_STS",			BIT(17),	0}, +	{"AUTO_DEMO_EN_REQ_STS",		BIT(18),	0}, +	{"ITSS_CLK_SRC_REQ_STS",		BIT(19),	1}, +	{"LPC_CLK_SRC_REQ_STS",			BIT(20),	0}, +	{"ARC_IDLE_REQ_STS",			BIT(21),	0}, +	{"MPHY_SUS_REQ_STS",			BIT(22),	0}, +	{"FIA_DEEP_PM_REQ_STS",			BIT(23),	0}, +	{"UXD_CONNECTED_REQ_STS",		BIT(24),	1}, +	{"ARC_INTERRUPT_WAKE_REQ_STS",		BIT(25),	0}, +	{"D2D_NOC_DISP_DDI_QACTIVE_REQ_STS",	BIT(26),	1}, +	{"PRE_WAKE0_REQ_STS",			BIT(27),	1}, +	{"PRE_WAKE1_REQ_STS",			BIT(28),	1}, +	{"PRE_WAKE2_EN_REQ_STS",		BIT(29),	1}, +	{"WOV_REQ_STS",				BIT(30),	0}, +	{"D2D_NOC_DISP_EDP_QACTIVE_REQ_STS_31",	BIT(31),	1},  	{}  };  const struct pmc_bit_map lnl_clocksource_status_map[] = { -	{"AON2_OFF_STS",			BIT(0)}, -	{"AON3_OFF_STS",			BIT(1)}, -	{"AON4_OFF_STS",			BIT(2)}, -	{"AON5_OFF_STS",			BIT(3)}, -	{"AON1_OFF_STS",			BIT(4)}, -	{"MPFPW1_0_PLL_OFF_STS",		BIT(6)}, -	{"USB3_PLL_OFF_STS",			BIT(8)}, -	{"AON3_SPL_OFF_STS",			BIT(9)}, -	{"G5FPW1_PLL_OFF_STS",			BIT(15)}, -	{"XTAL_AGGR_OFF_STS",			BIT(17)}, -	{"USB2_PLL_OFF_STS",			BIT(18)}, -	{"SAF_PLL_OFF_STS",			BIT(19)}, -	{"SE_TCSS_PLL_OFF_STS",			BIT(20)}, -	{"DDI_PLL_OFF_STS",			BIT(21)}, -	{"FILTER_PLL_OFF_STS",			BIT(22)}, -	{"ACE_PLL_OFF_STS",			BIT(24)}, -	{"FABRIC_PLL_OFF_STS",			BIT(25)}, -	{"SOC_PLL_OFF_STS",			BIT(26)}, -	{"REF_OFF_STS",				BIT(28)}, -	{"IMG_OFF_STS",				BIT(29)}, -	{"RTC_PLL_OFF_STS",			BIT(31)}, +	{"AON2_OFF_STS",			BIT(0),		0}, +	{"AON3_OFF_STS",			BIT(1),		1}, +	{"AON4_OFF_STS",			BIT(2),		1}, +	{"AON5_OFF_STS",			BIT(3),		1}, +	{"AON1_OFF_STS",			BIT(4),		0}, +	{"MPFPW1_0_PLL_OFF_STS",		BIT(6),		1}, +	{"USB3_PLL_OFF_STS",			BIT(8),		1}, +	{"AON3_SPL_OFF_STS",			BIT(9),		1}, +	{"G5FPW1_PLL_OFF_STS",			BIT(15),	1}, +	{"XTAL_AGGR_OFF_STS",			BIT(17),	1}, +	{"USB2_PLL_OFF_STS",			BIT(18),	0}, +	{"SAF_PLL_OFF_STS",			BIT(19),	1}, +	{"SE_TCSS_PLL_OFF_STS",			BIT(20),	1}, +	{"DDI_PLL_OFF_STS",			BIT(21),	1}, +	{"FILTER_PLL_OFF_STS",			BIT(22),	1}, +	{"ACE_PLL_OFF_STS",			BIT(24),	0}, +	{"FABRIC_PLL_OFF_STS",			BIT(25),	1}, +	{"SOC_PLL_OFF_STS",			BIT(26),	1}, +	{"REF_OFF_STS",				BIT(28),	1}, +	{"IMG_OFF_STS",				BIT(29),	1}, +	{"RTC_PLL_OFF_STS",			BIT(31),	0}, +	{} +}; + +const struct pmc_bit_map lnl_signal_status_map[] = { +	{"LSX_Wake0_STS",			BIT(0),		0}, +	{"LSX_Wake1_STS",			BIT(1),		0}, +	{"LSX_Wake2_STS",			BIT(2),		0}, +	{"LSX_Wake3_STS",			BIT(3),		0}, +	{"LSX_Wake4_STS",			BIT(4),		0}, +	{"LSX_Wake5_STS",			BIT(5),		0}, +	{"LSX_Wake6_STS",			BIT(6),		0}, +	{"LSX_Wake7_STS",			BIT(7),		0}, +	{"LPSS_Wake0_STS",			BIT(8),		1}, +	{"LPSS_Wake1_STS",			BIT(9),		1}, +	{"Int_Timer_SS_Wake0_STS",		BIT(10),	1}, +	{"Int_Timer_SS_Wake1_STS",		BIT(11),	1}, +	{"Int_Timer_SS_Wake2_STS",		BIT(12),	1}, +	{"Int_Timer_SS_Wake3_STS",		BIT(13),	1}, +	{"Int_Timer_SS_Wake4_STS",		BIT(14),	1}, +	{"Int_Timer_SS_Wake5_STS",		BIT(15),	1}, +	{} +}; + +const struct pmc_bit_map lnl_rsc_status_map[] = { +	{"Memory",				0,		1}, +	{"PSF0",				0,		1}, +	{"PSF4",				0,		1}, +	{"PSF6",				0,		1}, +	{"PSF7",				0,		1}, +	{"PSF8",				0,		1}, +	{"SAF_CFI_LINK",			0,		1}, +	{"SBR",					0,		1},  	{}  }; @@ -331,7 +363,26 @@ const struct pmc_bit_map *lnl_lpm_maps[] = {  	lnl_vnn_req_status_2_map,  	lnl_vnn_req_status_3_map,  	lnl_vnn_misc_status_map, -	mtl_socm_signal_status_map, +	lnl_signal_status_map, +	NULL +}; + +const struct pmc_bit_map *lnl_blk_maps[] = { +	lnl_power_gating_status_0_map, +	lnl_power_gating_status_1_map, +	lnl_power_gating_status_2_map, +	lnl_rsc_status_map, +	lnl_vnn_req_status_0_map, +	lnl_vnn_req_status_1_map, +	lnl_vnn_req_status_2_map, +	lnl_vnn_req_status_3_map, +	lnl_d3_status_0_map, +	lnl_d3_status_1_map, +	lnl_d3_status_2_map, +	lnl_d3_status_3_map, +	lnl_clocksource_status_map, +	lnl_vnn_misc_status_map, +	lnl_signal_status_map,  	NULL  }; @@ -475,6 +526,8 @@ const struct pmc_reg_map lnl_socm_reg_map = {  	.lpm_sts = lnl_lpm_maps,  	.lpm_status_offset = MTL_LPM_STATUS_OFFSET,  	.lpm_live_status_offset = MTL_LPM_LIVE_STATUS_OFFSET, +	.s0ix_blocker_maps = lnl_blk_maps, +	.s0ix_blocker_offset = LNL_S0IX_BLOCKER_OFFSET,  };  #define LNL_NPU_PCI_DEV		0x643e  |