From f4d98fdd20bbe3981684d32d3d3b257ab81163bb Mon Sep 17 00:00:00 2001 From: Varshit Pandya Date: Sun, 17 Jan 2021 18:39:29 +0530 Subject: soc/intel/commmon: Include Alder Lake device IDs Add Alder Lake M specific CPU, System AGent, PCH (Alder Point aka ADP), IGD device IDs. Document Number: 619501, 626817 Signed-off-by: Varshit Pandya Change-Id: Ib13fe229f9e65eae8967aa20e28e29ac5c319265 Reviewed-on: https://review.coreboot.org/c/coreboot/+/49629 Reviewed-by: Maulik V Vaghela Reviewed-by: Subrata Banik Tested-by: build bot (Jenkins) --- src/soc/intel/common/block/cpu/mp_init.c | 1 + src/soc/intel/common/block/cse/cse.c | 4 +++ src/soc/intel/common/block/dsp/dsp.c | 7 +++++ src/soc/intel/common/block/hda/hda.c | 7 +++++ src/soc/intel/common/block/i2c/i2c.c | 6 ++++ .../common/block/include/intelblocks/mp_init.h | 1 + src/soc/intel/common/block/lpc/lpc.c | 32 ++++++++++++++++++++++ src/soc/intel/common/block/p2sb/p2sb.c | 1 + src/soc/intel/common/block/pcie/pcie.c | 10 +++++++ src/soc/intel/common/block/pmc/pmc.c | 1 + src/soc/intel/common/block/sata/sata.c | 3 ++ src/soc/intel/common/block/smbus/smbus.c | 1 + src/soc/intel/common/block/spi/spi.c | 4 +++ src/soc/intel/common/block/sram/sram.c | 1 + src/soc/intel/common/block/uart/uart.c | 4 +++ src/soc/intel/common/block/xdci/xdci.c | 1 + src/soc/intel/common/block/xhci/xhci.c | 1 + 17 files changed, 85 insertions(+) (limited to 'src/soc/intel/common/block') diff --git a/src/soc/intel/common/block/cpu/mp_init.c b/src/soc/intel/common/block/cpu/mp_init.c index c3fe40bc18..4fd2074343 100644 --- a/src/soc/intel/common/block/cpu/mp_init.c +++ b/src/soc/intel/common/block/cpu/mp_init.c @@ -79,6 +79,7 @@ static const struct cpu_device_id cpu_table[] = { { X86_VENDOR_INTEL, CPUID_JASPERLAKE_A0 }, { X86_VENDOR_INTEL, CPUID_ALDERLAKE_S_A0 }, { X86_VENDOR_INTEL, CPUID_ALDERLAKE_P_A0 }, + { X86_VENDOR_INTEL, CPUID_ALDERLAKE_M_A0 }, { 0, 0 }, }; diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c index d10492bbe0..c6f87b41e9 100644 --- a/src/soc/intel/common/block/cse/cse.c +++ b/src/soc/intel/common/block/cse/cse.c @@ -910,6 +910,10 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_INTEL_ADP_S_CSE1, PCI_DEVICE_ID_INTEL_ADP_S_CSE2, PCI_DEVICE_ID_INTEL_ADP_S_CSE3, + PCI_DEVICE_ID_INTEL_ADP_M_CSE0, + PCI_DEVICE_ID_INTEL_ADP_M_CSE1, + PCI_DEVICE_ID_INTEL_ADP_M_CSE2, + PCI_DEVICE_ID_INTEL_ADP_M_CSE3, 0, }; diff --git a/src/soc/intel/common/block/dsp/dsp.c b/src/soc/intel/common/block/dsp/dsp.c index 776a22b553..edfbce8db6 100644 --- a/src/soc/intel/common/block/dsp/dsp.c +++ b/src/soc/intel/common/block/dsp/dsp.c @@ -33,6 +33,13 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_6, PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_7, PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_8, + PCI_DEVICE_ID_INTEL_ADP_M_AUDIO_1, + PCI_DEVICE_ID_INTEL_ADP_M_AUDIO_2, + PCI_DEVICE_ID_INTEL_ADP_M_AUDIO_3, + PCI_DEVICE_ID_INTEL_ADP_M_AUDIO_4, + PCI_DEVICE_ID_INTEL_ADP_M_AUDIO_5, + PCI_DEVICE_ID_INTEL_ADP_M_AUDIO_6, + PCI_DEVICE_ID_INTEL_ADP_M_AUDIO_7, 0, }; diff --git a/src/soc/intel/common/block/hda/hda.c b/src/soc/intel/common/block/hda/hda.c index e4bcf9913d..ece06caaeb 100644 --- a/src/soc/intel/common/block/hda/hda.c +++ b/src/soc/intel/common/block/hda/hda.c @@ -81,6 +81,13 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_6, PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_7, PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_8, + PCI_DEVICE_ID_INTEL_ADP_M_AUDIO_1, + PCI_DEVICE_ID_INTEL_ADP_M_AUDIO_2, + PCI_DEVICE_ID_INTEL_ADP_M_AUDIO_3, + PCI_DEVICE_ID_INTEL_ADP_M_AUDIO_4, + PCI_DEVICE_ID_INTEL_ADP_M_AUDIO_5, + PCI_DEVICE_ID_INTEL_ADP_M_AUDIO_6, + PCI_DEVICE_ID_INTEL_ADP_M_AUDIO_7, 0 }; diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c index 57e5d5e373..b466de27b1 100644 --- a/src/soc/intel/common/block/i2c/i2c.c +++ b/src/soc/intel/common/block/i2c/i2c.c @@ -256,6 +256,12 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_INTEL_ADP_S_I2C3, PCI_DEVICE_ID_INTEL_ADP_S_I2C4, PCI_DEVICE_ID_INTEL_ADP_S_I2C5, + PCI_DEVICE_ID_INTEL_ADP_M_I2C0, + PCI_DEVICE_ID_INTEL_ADP_M_I2C1, + PCI_DEVICE_ID_INTEL_ADP_M_I2C2, + PCI_DEVICE_ID_INTEL_ADP_M_I2C3, + PCI_DEVICE_ID_INTEL_ADP_M_I2C4, + PCI_DEVICE_ID_INTEL_ADP_M_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 96b3c0a2c8..7dc85df24e 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_ELKHARTLAKE_B0 0x90661 #define CPUID_ALDERLAKE_S_A0 0x90670 #define CPUID_ALDERLAKE_P_A0 0x906a0 +#define CPUID_ALDERLAKE_M_A0 0x906a1 /* * MP Init callback function to Find CPU Topology. This function is common * among all SOCs and thus its in Common CPU block. diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c index 0bffaf62e6..7bdc2b0b49 100644 --- a/src/soc/intel/common/block/lpc/lpc.c +++ b/src/soc/intel/common/block/lpc/lpc.c @@ -298,6 +298,38 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_INTEL_ADP_S_ESPI_29, PCI_DEVICE_ID_INTEL_ADP_S_ESPI_30, PCI_DEVICE_ID_INTEL_ADP_S_ESPI_31, + PCI_DEVICE_ID_INTEL_ADP_P_ESPI_32, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_0, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_1, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_2, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_3, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_4, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_5, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_7, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_8, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_9, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_10, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_11, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_12, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_13, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_14, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_15, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_16, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_17, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_18, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_19, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_20, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_21, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_22, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_23, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_24, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_25, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_26, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_27, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_28, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_29, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_30, + PCI_DEVICE_ID_INTEL_ADP_M_ESPI_31, 0 }; diff --git a/src/soc/intel/common/block/p2sb/p2sb.c b/src/soc/intel/common/block/p2sb/p2sb.c index 05bef2bc4e..18c958e84d 100644 --- a/src/soc/intel/common/block/p2sb/p2sb.c +++ b/src/soc/intel/common/block/p2sb/p2sb.c @@ -193,6 +193,7 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_INTEL_JSP_P2SB, PCI_DEVICE_ID_INTEL_ADP_P_P2SB, PCI_DEVICE_ID_INTEL_ADP_S_P2SB, + PCI_DEVICE_ID_INTEL_ADP_M_P2SB, 0, }; diff --git a/src/soc/intel/common/block/pcie/pcie.c b/src/soc/intel/common/block/pcie/pcie.c index e506905283..4f5687fd5f 100644 --- a/src/soc/intel/common/block/pcie/pcie.c +++ b/src/soc/intel/common/block/pcie/pcie.c @@ -331,6 +331,16 @@ static const unsigned short pcie_device_ids[] = { PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP26, PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP27, PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP28, + PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP1, + PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP2, + PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP3, + PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP4, + PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP5, + PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP6, + PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP7, + PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP8, + PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP9, + PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP10, 0 }; diff --git a/src/soc/intel/common/block/pmc/pmc.c b/src/soc/intel/common/block/pmc/pmc.c index fe4dca6fa4..93cbe3692c 100644 --- a/src/soc/intel/common/block/pmc/pmc.c +++ b/src/soc/intel/common/block/pmc/pmc.c @@ -99,6 +99,7 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_INTEL_JSP_PMC, PCI_DEVICE_ID_INTEL_ADP_P_PMC, PCI_DEVICE_ID_INTEL_ADP_S_PMC, + PCI_DEVICE_ID_INTEL_ADP_M_PMC, 0 }; diff --git a/src/soc/intel/common/block/sata/sata.c b/src/soc/intel/common/block/sata/sata.c index 7b234a9500..71c023f9fa 100644 --- a/src/soc/intel/common/block/sata/sata.c +++ b/src/soc/intel/common/block/sata/sata.c @@ -59,6 +59,9 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_INTEL_ADP_S_SATA_4, PCI_DEVICE_ID_INTEL_ADP_S_SATA_5, PCI_DEVICE_ID_INTEL_ADP_S_SATA_6, + PCI_DEVICE_ID_INTEL_ADP_M_SATA_1, + PCI_DEVICE_ID_INTEL_ADP_M_SATA_2, + PCI_DEVICE_ID_INTEL_ADP_M_SATA_3, 0 }; diff --git a/src/soc/intel/common/block/smbus/smbus.c b/src/soc/intel/common/block/smbus/smbus.c index 59870fbdc8..bc906a6ad1 100644 --- a/src/soc/intel/common/block/smbus/smbus.c +++ b/src/soc/intel/common/block/smbus/smbus.c @@ -90,6 +90,7 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_INTEL_JSP_SMBUS, PCI_DEVICE_ID_INTEL_ADP_P_SMBUS, PCI_DEVICE_ID_INTEL_ADP_S_SMBUS, + PCI_DEVICE_ID_INTEL_ADP_M_SMBUS, 0 }; diff --git a/src/soc/intel/common/block/spi/spi.c b/src/soc/intel/common/block/spi/spi.c index 295df09ed8..beac64cb69 100644 --- a/src/soc/intel/common/block/spi/spi.c +++ b/src/soc/intel/common/block/spi/spi.c @@ -89,6 +89,7 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_INTEL_JSP_HWSEQ_SPI, PCI_DEVICE_ID_INTEL_ADP_P_HWSEQ_SPI, PCI_DEVICE_ID_INTEL_ADP_S_HWSEQ_SPI, + PCI_DEVICE_ID_INTEL_ADP_M_HWSEQ_SPI, PCI_DEVICE_ID_INTEL_ADP_P_SPI0, PCI_DEVICE_ID_INTEL_ADP_P_SPI1, PCI_DEVICE_ID_INTEL_ADP_P_SPI2, @@ -103,6 +104,9 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_INTEL_ADP_S_SPI4, PCI_DEVICE_ID_INTEL_ADP_S_SPI5, PCI_DEVICE_ID_INTEL_ADP_S_SPI6, + PCI_DEVICE_ID_INTEL_ADP_M_SPI0, + PCI_DEVICE_ID_INTEL_ADP_M_SPI1, + PCI_DEVICE_ID_INTEL_ADP_M_SPI2, 0 }; diff --git a/src/soc/intel/common/block/sram/sram.c b/src/soc/intel/common/block/sram/sram.c index 426a5f75ae..a9a96edda8 100644 --- a/src/soc/intel/common/block/sram/sram.c +++ b/src/soc/intel/common/block/sram/sram.c @@ -43,6 +43,7 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_INTEL_JSP_SRAM, PCI_DEVICE_ID_INTEL_ADP_P_SRAM, PCI_DEVICE_ID_INTEL_ADP_S_SRAM, + PCI_DEVICE_ID_INTEL_ADP_M_SRAM, 0, }; diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c index 3a64a16e6f..4a84935ad4 100644 --- a/src/soc/intel/common/block/uart/uart.c +++ b/src/soc/intel/common/block/uart/uart.c @@ -429,6 +429,10 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_INTEL_ADP_P_UART4, PCI_DEVICE_ID_INTEL_ADP_P_UART5, PCI_DEVICE_ID_INTEL_ADP_P_UART6, + PCI_DEVICE_ID_INTEL_ADP_M_UART0, + PCI_DEVICE_ID_INTEL_ADP_M_UART1, + PCI_DEVICE_ID_INTEL_ADP_M_UART2, + PCI_DEVICE_ID_INTEL_ADP_M_UART3, 0, }; diff --git a/src/soc/intel/common/block/xdci/xdci.c b/src/soc/intel/common/block/xdci/xdci.c index 54cb07650e..9f15ac1d6e 100644 --- a/src/soc/intel/common/block/xdci/xdci.c +++ b/src/soc/intel/common/block/xdci/xdci.c @@ -35,6 +35,7 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_INTEL_JSP_XDCI, PCI_DEVICE_ID_INTEL_ADP_P_XDCI, PCI_DEVICE_ID_INTEL_ADP_S_XDCI, + PCI_DEVICE_ID_INTEL_ADP_M_XDCI, 0 }; diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c index 705fbb0c62..295bb3917d 100644 --- a/src/soc/intel/common/block/xhci/xhci.c +++ b/src/soc/intel/common/block/xhci/xhci.c @@ -123,6 +123,7 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_INTEL_JSP_XHCI, PCI_DEVICE_ID_INTEL_ADP_P_XHCI, PCI_DEVICE_ID_INTEL_ADP_S_XHCI, + PCI_DEVICE_ID_INTEL_ADP_M_XHCI, 0 }; -- cgit v1.2.3