From 180c702bb94f3af04d25be87e56415f520c301e1 Mon Sep 17 00:00:00 2001 From: Ravi Sarawadi Date: Tue, 26 Sep 2023 12:45:04 -0700 Subject: [PATCH] soc/intel/meteorlake: Update TBT PCIe Reg Map offsets for QS Within TBT PCIe, following register offsets have been updated for production silicon. Update ASL with new offsets. 1. MPC - Miscellaneous Port Configuration Register 2. RPPGEN - Root Port Power Gating Enable 3. SMSCS - SMI/SCI Status Register BUG=306026121 TEST= Check TBT PCIe Tunnel creation and device enumration. Change-Id: I0497f7108ef5046c2694aece232263582514a0c5 Signed-off-by: Ravi Sarawadi Reviewed-on: https://review.coreboot.org/c/coreboot/+/78163 Tested-by: build bot (Jenkins) Reviewed-by: Eric Lai Reviewed-by: Kapil Porwal Reviewed-by: Jamie Ryu Reviewed-by: Subrata Banik --- src/soc/intel/meteorlake/acpi/tcss_pcierp.asl | 45 +++++++++++++++++-- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/src/soc/intel/meteorlake/acpi/tcss_pcierp.asl b/src/soc/intel/meteorlake/acpi/tcss_pcierp.asl index 6dbde46f49..4ae1376858 100644 --- a/src/soc/intel/meteorlake/acpi/tcss_pcierp.asl +++ b/src/soc/intel/meteorlake/acpi/tcss_pcierp.asl @@ -1,6 +1,24 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ -OperationRegion (PXCS, SystemMemory, BASE(_ADR), 0x800) +/* + * TCSS PCIE RP Channel Configuration (CCFG) Config Space register offsets + * MPC - Miscellaneous Port Configuration Register + * RPPGEN - Root Port Power Gating Enable Register + * SMSCS - SMI/SCI Status Register + */ +#if CONFIG(SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON) +#define PXCS_OPREGION_SIZE 0x800 +#define TCSS_CFG_MPC_FROM_CCFG 0xD8 +#define TCSS_CFG_SMSCS_FROM_CCFG 0xDC +#define TCSS_CFG_RPPGEN_FROM_CCFG 0xE2 +#else +#define PXCS_OPREGION_SIZE 0xC00 +#define TCSS_CFG_MPC_FROM_CCFG 0xBA8 +#define TCSS_CFG_SMSCS_FROM_CCFG 0xBAC +#define TCSS_CFG_RPPGEN_FROM_CCFG 0xBB2 +#endif + +OperationRegion (PXCS, SystemMemory, BASE(_ADR), PXCS_OPREGION_SIZE) Field (PXCS, AnyAcc, NoLock, Preserve) { VDID, 32, @@ -25,11 +43,12 @@ Field (PXCS, AnyAcc, NoLock, Preserve) PSPX, 1, /* 16, PME Status */ Offset(0xA4), D3HT, 2, /* Power State */ - Offset(0xD8), /* 0xD8, MPC - Miscellaneous Port Configuration Register */ +#if CONFIG(SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON) + Offset(TCSS_CFG_MPC_FROM_CCFG), , 30, HPEX, 1, /* 30, Hot Plug SCI Enable */ PMEX, 1, /* 31, Power Management SCI Enable */ - Offset(0xE2), /* 0xE2, RPPGEN - Root Port Power Gating Enable */ + Offset(TCSS_CFG_RPPGEN_FROM_CCFG), , 2, L23E, 1, /* 2, L23_Rdy Entry Request (L23ER) */ L23R, 1, /* 3, L23_Rdy to Detect Transition (L23R2DT) */ @@ -41,11 +60,29 @@ Field (PXCS, AnyAcc, NoLock, Preserve) , 3, RPER, 1, /* RTD3PERST[3] */ RPFE, 1, /* RTD3PFETDIS[4] */ +#else + Offset(0x420), /* 0x420, PCIEPMECTL (PCIe PM Extension Control) */ + , 30, + DPGE, 1, /* PCIEPMECTL[30]: Disabled, Detect and L23_Rdy State PHY Lane */ + /* Power Gating Enable (DLSULPPGE) */ + Offset(0x5BC), /* 0x5BC, PCIE ADVMCTRL */ + , 3, + RPER, 1, /* RTD3PERST[3] */ + RPFE, 1, /* RTD3PFETDIS[4] */ + Offset(TCSS_CFG_MPC_FROM_CCFG), + , 30, + HPEX, 1, /* 30, Hot Plug SCI Enable */ + PMEX, 1, /* 31, Power Management SCI Enable */ + Offset(TCSS_CFG_RPPGEN_FROM_CCFG), + , 2, + L23E, 1, /* 2, L23_Rdy Entry Request (L23ER) */ + L23R, 1, /* 3, L23_Rdy to Detect Transition (L23R2DT) */ +#endif } Field (PXCS, AnyAcc, NoLock, WriteAsZeros) { - Offset(0xDC), /* 0xDC, SMSCS - SMI/SCI Status Register */ + Offset(TCSS_CFG_SMSCS_FROM_CCFG), , 30, HPSX, 1, /* 30, Hot Plug SCI Status */ PMSX, 1 /* 31, Power Management SCI Status */