soc/intel/common: Update Jasper Lake Device IDs

Update Jasper Lake CPU, SA and PCH IDs.

BUG=b:149185282
BRANCH=None
TEST=Compilation for Jasper Lake board is working

Change-Id: I2c9ec1eb4236184b981d99250f263172c82f7117
Signed-off-by: Meera Ravindranath <meera.ravindranath@intel.com>
Signed-off-by: Varshit Pandya <varshit.b.pandya@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38849
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aamir Bohra <aamir.bohra@intel.com>
Reviewed-by: Wonkyu Kim <wonkyu.kim@intel.com>

20 files changed, 42 insertions, 34 deletions

diff --git a/src/soc/intel/common/block/cpu/mp_init.c b/src/soc/intel/common/block/cpu/mp_init.c
index 66a358f09a..87cebc0a8f 100644
--- a/src/soc/intel/common/block/cpu/mp_init.c
+++ b/src/soc/intel/common/block/cpu/mp_init.c
@@ -87,6 +87,7 @@ static const struct cpu_device_id cpu_table[] = {
 	{ X86_VENDOR_INTEL, CPUID_COMETLAKE_H_S_10_2_Q0_P1 },
 	{ X86_VENDOR_INTEL, CPUID_TIGERLAKE_A0 },
 	{ X86_VENDOR_INTEL, CPUID_ELKHARTLAKE_A0 },
+	{ X86_VENDOR_INTEL, CPUID_JASPERLAKE_A0},
 	{ 0, 0 },
 };
 
diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c
index 5877d537f8..48c26f3897 100644
--- a/src/soc/intel/common/block/cse/cse.c
+++ b/src/soc/intel/common/block/cse/cse.c
@@ -791,11 +791,14 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CMP_CSE0,
 	PCI_DEVICE_ID_INTEL_CMP_H_CSE0,
 	PCI_DEVICE_ID_INTEL_TGL_CSE0,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_CSE0,
 	PCI_DEVICE_ID_INTEL_MCC_CSE0,
 	PCI_DEVICE_ID_INTEL_MCC_CSE1,
 	PCI_DEVICE_ID_INTEL_MCC_CSE2,
 	PCI_DEVICE_ID_INTEL_MCC_CSE3,
+	PCI_DEVICE_ID_INTEL_JSP_CSE0,
+	PCI_DEVICE_ID_INTEL_JSP_CSE1,
+	PCI_DEVICE_ID_INTEL_JSP_CSE2,
+	PCI_DEVICE_ID_INTEL_JSP_CSE3,
 	0,
 };
 
diff --git a/src/soc/intel/common/block/dsp/dsp.c b/src/soc/intel/common/block/dsp/dsp.c
index 78f43a036e..dc21b8e116 100644
--- a/src/soc/intel/common/block/dsp/dsp.c
+++ b/src/soc/intel/common/block/dsp/dsp.c
@@ -36,8 +36,8 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CMP_H_AUDIO,
 	PCI_DEVICE_ID_INTEL_ICL_AUDIO,
 	PCI_DEVICE_ID_INTEL_TGL_AUDIO,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_AUDIO,
 	PCI_DEVICE_ID_INTEL_MCC_AUDIO,
+	PCI_DEVICE_ID_INTEL_JSP_AUDIO,
 	0,
 };
 
diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c
index 6c1436a281..29d6c53e42 100644
--- a/src/soc/intel/common/block/graphics/graphics.c
+++ b/src/soc/intel/common/block/graphics/graphics.c
@@ -219,13 +219,14 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_TGL_GT2_ULT,
 	PCI_DEVICE_ID_INTEL_TGL_GT2_ULX,
 	PCI_DEVICE_ID_INTEL_TGL_GT3_ULT,
-	PCI_DEVICE_ID_INTEL_JSL_PRE_PROD_GT0,
 	PCI_DEVICE_ID_INTEL_EHL_GT1_1,
 	PCI_DEVICE_ID_INTEL_EHL_GT2_1,
 	PCI_DEVICE_ID_INTEL_EHL_GT1_2,
 	PCI_DEVICE_ID_INTEL_EHL_GT2_2,
 	PCI_DEVICE_ID_INTEL_EHL_GT1_3,
 	PCI_DEVICE_ID_INTEL_EHL_GT2_3,
+	PCI_DEVICE_ID_INTEL_JSL_GT1,
+	PCI_DEVICE_ID_INTEL_JSL_GT2,
 	0,
 };
 
diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c
index ca854a9720..57dad62b8b 100644
--- a/src/soc/intel/common/block/i2c/i2c.c
+++ b/src/soc/intel/common/block/i2c/i2c.c
@@ -249,12 +249,6 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_TGP_I2C5,
 	PCI_DEVICE_ID_INTEL_TGP_I2C6,
 	PCI_DEVICE_ID_INTEL_TGP_I2C7,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_I2C0,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_I2C1,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_I2C2,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_I2C3,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_I2C4,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_I2C5,
 	PCI_DEVICE_ID_INTEL_MCC_I2C0,
 	PCI_DEVICE_ID_INTEL_MCC_I2C1,
 	PCI_DEVICE_ID_INTEL_MCC_I2C2,
@@ -263,6 +257,12 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_MCC_I2C5,
 	PCI_DEVICE_ID_INTEL_MCC_I2C6,
 	PCI_DEVICE_ID_INTEL_MCC_I2C7,
+	PCI_DEVICE_ID_INTEL_JSP_I2C0,
+	PCI_DEVICE_ID_INTEL_JSP_I2C1,
+	PCI_DEVICE_ID_INTEL_JSP_I2C2,
+	PCI_DEVICE_ID_INTEL_JSP_I2C3,
+	PCI_DEVICE_ID_INTEL_JSP_I2C4,
+	PCI_DEVICE_ID_INTEL_JSP_I2C5,
 	0,
 };
 
diff --git a/src/soc/intel/common/block/include/intelblocks/mp_init.h b/src/soc/intel/common/block/include/intelblocks/mp_init.h
index c0c58afc8d..4c528e0f78 100644
--- a/src/soc/intel/common/block/include/intelblocks/mp_init.h
+++ b/src/soc/intel/common/block/include/intelblocks/mp_init.h
@@ -46,6 +46,7 @@
 #define CPUID_COFFEELAKE_R0	0x906ed
 #define CPUID_ICELAKE_A0	0x706e0
 #define CPUID_ICELAKE_B0	0x706e1
+#define CPUID_JASPERLAKE_A0	0x906c0
 #define CPUID_COMETLAKE_U_A0		0xa0660
 #define CPUID_COMETLAKE_U_K0_S0		0xa0661
 #define CPUID_COMETLAKE_H_S_6_2_G0	0xa0650
diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c
index af90df6e6c..3524a8f9e6 100644
--- a/src/soc/intel/common/block/lpc/lpc.c
+++ b/src/soc/intel/common/block/lpc/lpc.c
@@ -231,8 +231,6 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_TGP_ESPI_24,
 	PCI_DEVICE_ID_INTEL_TGP_ESPI_25,
 	PCI_DEVICE_ID_INTEL_TGP_ESPI_26,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_ESPI_1,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_ESPI_2,
 	PCI_DEVICE_ID_INTEL_MCC_ESPI_0,
 	PCI_DEVICE_ID_INTEL_MCC_ESPI_1,
 	PCI_DEVICE_ID_INTEL_MCC_BASE_ESPI,
@@ -241,6 +239,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_MCC_ESPI_2,
 	PCI_DEVICE_ID_INTEL_MCC_ESPI_3,
 	PCI_DEVICE_ID_INTEL_MCC_ESPI_4,
+	PCI_DEVICE_ID_INTEL_JSP_SUPER_ESPI,
 	0
 };
 
diff --git a/src/soc/intel/common/block/p2sb/p2sb.c b/src/soc/intel/common/block/p2sb/p2sb.c
index c968409e0a..5b72e72fe7 100644
--- a/src/soc/intel/common/block/p2sb/p2sb.c
+++ b/src/soc/intel/common/block/p2sb/p2sb.c
@@ -155,8 +155,8 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CMP_P2SB,
 	PCI_DEVICE_ID_INTEL_CMP_H_P2SB,
 	PCI_DEVICE_ID_INTEL_TGL_P2SB,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_P2SB,
 	PCI_DEVICE_ID_INTEL_EHL_P2SB,
+	PCI_DEVICE_ID_INTEL_JSP_P2SB,
 	0,
 };
 
diff --git a/src/soc/intel/common/block/pcie/pcie.c b/src/soc/intel/common/block/pcie/pcie.c
index eab6667b7f..cc20a48d22 100644
--- a/src/soc/intel/common/block/pcie/pcie.c
+++ b/src/soc/intel/common/block/pcie/pcie.c
@@ -290,14 +290,6 @@ static const unsigned short pcie_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP14,
 	PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP15,
 	PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP16,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_PCIE_RP1,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_PCIE_RP2,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_PCIE_RP3,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_PCIE_RP4,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_PCIE_RP5,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_PCIE_RP6,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_PCIE_RP7,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_PCIE_RP8,
 	PCI_DEVICE_ID_INTEL_MCC_PCIE_RP1,
 	PCI_DEVICE_ID_INTEL_MCC_PCIE_RP2,
 	PCI_DEVICE_ID_INTEL_MCC_PCIE_RP3,
@@ -305,6 +297,14 @@ static const unsigned short pcie_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_MCC_PCIE_RP5,
 	PCI_DEVICE_ID_INTEL_MCC_PCIE_RP6,
 	PCI_DEVICE_ID_INTEL_MCC_PCIE_RP7,
+	PCI_DEVICE_ID_INTEL_JSP_PCIE_RP1,
+	PCI_DEVICE_ID_INTEL_JSP_PCIE_RP2,
+	PCI_DEVICE_ID_INTEL_JSP_PCIE_RP3,
+	PCI_DEVICE_ID_INTEL_JSP_PCIE_RP4,
+	PCI_DEVICE_ID_INTEL_JSP_PCIE_RP5,
+	PCI_DEVICE_ID_INTEL_JSP_PCIE_RP6,
+	PCI_DEVICE_ID_INTEL_JSP_PCIE_RP7,
+	PCI_DEVICE_ID_INTEL_JSP_PCIE_RP8,
 	0
 };
 
diff --git a/src/soc/intel/common/block/pmc/pmc.c b/src/soc/intel/common/block/pmc/pmc.c
index 3a9431baed..ba64063425 100644
--- a/src/soc/intel/common/block/pmc/pmc.c
+++ b/src/soc/intel/common/block/pmc/pmc.c
@@ -135,8 +135,8 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CMP_PMC,
 	PCI_DEVICE_ID_INTEL_CMP_H_PMC,
 	PCI_DEVICE_ID_INTEL_TGP_PMC,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_PMC,
 	PCI_DEVICE_ID_INTEL_MCC_PMC,
+	PCI_DEVICE_ID_INTEL_JSP_PMC,
 	0
 };
 
diff --git a/src/soc/intel/common/block/sata/sata.c b/src/soc/intel/common/block/sata/sata.c
index cb12ad3e2c..5439767c32 100644
--- a/src/soc/intel/common/block/sata/sata.c
+++ b/src/soc/intel/common/block/sata/sata.c
@@ -103,8 +103,9 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_TGP_SATA,
 	PCI_DEVICE_ID_INTEL_TGP_PREMIUM_SATA,
 	PCI_DEVICE_ID_INTEL_TGP_COMPAT_SATA,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_SATA,
 	PCI_DEVICE_ID_INTEL_MCC_AHCI_SATA,
+	PCI_DEVICE_ID_INTEL_JSP_SATA_1,
+	PCI_DEVICE_ID_INTEL_JSP_SATA_2,
 	0
 };
 
diff --git a/src/soc/intel/common/block/scs/mmc.c b/src/soc/intel/common/block/scs/mmc.c
index 4ff3ac5e7e..bbdde39ed5 100644
--- a/src/soc/intel/common/block/scs/mmc.c
+++ b/src/soc/intel/common/block/scs/mmc.c
@@ -85,6 +85,7 @@ static struct device_operations dev_ops = {
 
 static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CMP_EMMC,
+	PCI_DEVICE_ID_INTEL_JSP_EMMC,
 	0
 };
 
diff --git a/src/soc/intel/common/block/scs/sd.c b/src/soc/intel/common/block/scs/sd.c
index 6b360d5cd1..3f036e9847 100644
--- a/src/soc/intel/common/block/scs/sd.c
+++ b/src/soc/intel/common/block/scs/sd.c
@@ -74,8 +74,8 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_ICL_SD,
 	PCI_DEVICE_ID_INTEL_CMP_SD,
 	PCI_DEVICE_ID_INTEL_CMP_H_SD,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_SD,
 	PCI_DEVICE_ID_INTEL_MCC_SD,
+	PCI_DEVICE_ID_INTEL_JSP_SD,
 	0
 };
 
diff --git a/src/soc/intel/common/block/smbus/smbus.c b/src/soc/intel/common/block/smbus/smbus.c
index 44b216562b..d647cf839b 100644
--- a/src/soc/intel/common/block/smbus/smbus.c
+++ b/src/soc/intel/common/block/smbus/smbus.c
@@ -97,8 +97,8 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CMP_SMBUS,
 	PCI_DEVICE_ID_INTEL_CMP_H_SMBUS,
 	PCI_DEVICE_ID_INTEL_TGP_LP_SMBUS,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_SMBUS,
 	PCI_DEVICE_ID_INTEL_MCC_SMBUS,
+	PCI_DEVICE_ID_INTEL_JSP_SMBUS,
 	0
 };
 
diff --git a/src/soc/intel/common/block/spi/spi.c b/src/soc/intel/common/block/spi/spi.c
index 95981be7eb..51ac697eae 100644
--- a/src/soc/intel/common/block/spi/spi.c
+++ b/src/soc/intel/common/block/spi/spi.c
@@ -93,14 +93,14 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_TGP_GSPI4,
 	PCI_DEVICE_ID_INTEL_TGP_GSPI5,
 	PCI_DEVICE_ID_INTEL_TGP_GSPI6,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_SPI0,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_SPI1,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_SPI2,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_HWSEQ_SPI,
 	PCI_DEVICE_ID_INTEL_MCC_SPI0,
 	PCI_DEVICE_ID_INTEL_MCC_GSPI0,
 	PCI_DEVICE_ID_INTEL_MCC_GSPI1,
 	PCI_DEVICE_ID_INTEL_MCC_GSPI2,
+	PCI_DEVICE_ID_INTEL_JSP_SPI0,
+	PCI_DEVICE_ID_INTEL_JSP_SPI1,
+	PCI_DEVICE_ID_INTEL_JSP_SPI2,
+	PCI_DEVICE_ID_INTEL_JSP_HWSEQ_SPI,
 	0
 };
 
diff --git a/src/soc/intel/common/block/sram/sram.c b/src/soc/intel/common/block/sram/sram.c
index 6498d4010e..bfbacea740 100644
--- a/src/soc/intel/common/block/sram/sram.c
+++ b/src/soc/intel/common/block/sram/sram.c
@@ -53,8 +53,8 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CMP_SRAM,
 	PCI_DEVICE_ID_INTEL_CMP_H_SRAM,
 	PCI_DEVICE_ID_INTEL_TGL_SRAM,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_SRAM,
 	PCI_DEVICE_ID_INTEL_MCC_SRAM,
+	PCI_DEVICE_ID_INTEL_JSP_SRAM,
 	0,
 };
 
diff --git a/src/soc/intel/common/block/systemagent/systemagent.c b/src/soc/intel/common/block/systemagent/systemagent.c
index e660dbf162..02a67884dd 100644
--- a/src/soc/intel/common/block/systemagent/systemagent.c
+++ b/src/soc/intel/common/block/systemagent/systemagent.c
@@ -400,9 +400,9 @@ static const unsigned short systemagent_ids[] = {
 	PCI_DEVICE_ID_INTEL_TGL_ID_U_1,
 	PCI_DEVICE_ID_INTEL_TGL_ID_U_2_2,
 	PCI_DEVICE_ID_INTEL_TGL_ID_Y,
-	PCI_DEVICE_ID_INTEL_JSL_PRE_PROD,
 	PCI_DEVICE_ID_INTEL_JSL_EHL,
 	PCI_DEVICE_ID_INTEL_EHL_ID_1,
+	PCI_DEVICE_ID_INTEL_JSL_ID_1,
 	0
 };
 
diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c
index 08c0090b21..6f027e7af1 100644
--- a/src/soc/intel/common/block/uart/uart.c
+++ b/src/soc/intel/common/block/uart/uart.c
@@ -281,12 +281,12 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_TGP_UART0,
 	PCI_DEVICE_ID_INTEL_TGP_UART1,
 	PCI_DEVICE_ID_INTEL_TGP_UART2,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_UART0,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_UART1,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_UART2,
 	PCI_DEVICE_ID_INTEL_MCC_UART0,
 	PCI_DEVICE_ID_INTEL_MCC_UART1,
 	PCI_DEVICE_ID_INTEL_MCC_UART2,
+	PCI_DEVICE_ID_INTEL_JSP_UART0,
+	PCI_DEVICE_ID_INTEL_JSP_UART1,
+	PCI_DEVICE_ID_INTEL_JSP_UART2,
 	0,
 };
 
diff --git a/src/soc/intel/common/block/xdci/xdci.c b/src/soc/intel/common/block/xdci/xdci.c
index 5b70f9d9b8..ff4320197b 100644
--- a/src/soc/intel/common/block/xdci/xdci.c
+++ b/src/soc/intel/common/block/xdci/xdci.c
@@ -46,6 +46,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CMP_H_XDCI,
 	PCI_DEVICE_ID_INTEL_TGP_LP_XDCI,
 	PCI_DEVICE_ID_INTEL_MCC_XDCI,
+	PCI_DEVICE_ID_INTEL_JSP_XDCI,
 	0
 };
 
diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c
index 4b8a5cc1ec..e4f98eb39b 100644
--- a/src/soc/intel/common/block/xhci/xhci.c
+++ b/src/soc/intel/common/block/xhci/xhci.c
@@ -133,8 +133,8 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CMP_LP_XHCI,
 	PCI_DEVICE_ID_INTEL_CMP_H_XHCI,
 	PCI_DEVICE_ID_INTEL_TGP_LP_XHCI,
-	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_XHCI,
 	PCI_DEVICE_ID_INTEL_MCC_XHCI,
+	PCI_DEVICE_ID_INTEL_JSP_XHCI,
 	0
 };