summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorMarc Jones <marcjones@sysproconsulting.com>2020-07-23 17:30:49 -0600
committerAngel Pons <th3fanbus@gmail.com>2020-09-16 10:18:59 +0000
commit5cb7599ca11daf4645b533f873fc261ca5124814 (patch)
tree8caf078a243a65bbb5fe5db3bbaeaa6a317ff8ce /src/soc
parent8015482f67c8974c9c63e0a043a183c4539cdee3 (diff)
xeon_sp/skx: Reorder pci_devs.h
Reorder to be similar to cpx/include/soc/pci_devs.h. We may be able to merge the files in the future. Checked TiogaPass with BUILD_TIMELESS=1 Change-Id: I939707cc9e58e23f053156f40df4c21a6072570b Signed-off-by: Marc Jones <marcjones@sysproconsulting.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/45220 Reviewed-by: Jay Talbott <JayTalbott@sysproconsulting.com> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/xeon_sp/skx/include/soc/pci_devs.h125
1 files changed, 63 insertions, 62 deletions
diff --git a/src/soc/intel/xeon_sp/skx/include/soc/pci_devs.h b/src/soc/intel/xeon_sp/skx/include/soc/pci_devs.h
index bce7738460..62aa4d1e25 100644
--- a/src/soc/intel/xeon_sp/skx/include/soc/pci_devs.h
+++ b/src/soc/intel/xeon_sp/skx/include/soc/pci_devs.h
@@ -31,26 +31,6 @@
#define _PCH_DEV(slot, func) PCI_DEV(0, PCH_DEV_SLOT_ ## slot, func)
#endif
-#define MMAP_VTD_CFG_REG_DEVID 0x2024
-#define VTD_DEV 5
-#define VTD_FUNC 0
-
-#define VTD_TOLM_CSR 0xd0
-#define VTD_TSEG_BASE_CSR 0xa8
-#define VTD_TSEG_LIMIT_CSR 0xac
-#define VTD_EXT_CAP_LOW 0x10
-#define VTD_MMCFG_BASE_CSR 0x90
-#define VTD_MMCFG_LIMIT_CSR 0x98
-#define VTD_TOHM_CSR 0xd4
-#define VTD_MMIOL_CSR 0xdc
-#define VTD_ME_BASE_CSR 0xf0
-#define VTD_ME_LIMIT_CSR 0xf8
-#define VTD_VERSION 0x00
-#define VTD_CAP 0x08
-#define VTD_CAP_LOW 0x08
-#define VTD_CAP_HIGH 0x0C
-#define VTD_EXT_CAP_HIGH 0x14
-
#define SAD_ALL_DEV 29
#define SAD_ALL_FUNC 0
#define SAD_ALL_PAM0123_CSR 0x40
@@ -71,6 +51,15 @@
#define MAX_NON_TURBO_LIM_RATIO_SHIFT 8 /* 8:15 */
#define MAX_NON_TURBO_LIM_RATIO_MASK (0xff << MAX_NON_TURBO_LIM_RATIO_SHIFT)
+#define PCU_CR1_BIOS_MB_DATA_REG 0x8c
+
+#define PCU_CR1_BIOS_MB_INTERFACE_REG 0x90
+#define BIOS_MB_RUN_BUSY_MASK ((uint32_t)1 << 31)
+#define BIOS_MB_CMD_MASK ((uint32_t)0xff)
+#define BIOS_CMD_READ_PCU_MISC_CFG 0x5
+#define BIOS_CMD_WRITE_PCU_MISC_CFG 0x6
+#define BIOS_ERR_INVALID_CMD 0x01
+
#define PCU_CR1_BIOS_RESET_CPL_REG 0x94
#define RST_CPL1_MASK ((uint32_t)1 << 1)
#define RST_CPL2_MASK ((uint32_t)1 << 2)
@@ -81,18 +70,30 @@
#define PCODE_INIT_DONE3_MASK ((uint32_t)1 << 11)
#define PCODE_INIT_DONE4_MASK ((uint32_t)1 << 12)
-#define PCU_CR1_BIOS_MB_DATA_REG 0x8c
-
-#define PCU_CR1_BIOS_MB_INTERFACE_REG 0x90
-#define BIOS_MB_RUN_BUSY_MASK ((uint32_t)1 << 31)
-#define BIOS_MB_CMD_MASK ((uint32_t)0xff)
-#define BIOS_CMD_READ_PCU_MISC_CFG 0x5
-#define BIOS_CMD_WRITE_PCU_MISC_CFG 0x6
-#define BIOS_ERR_INVALID_CMD 0x01
-
#define PCU_CR1_DESIRED_CORES_CFG2_REG 0xa0
#define PCU_CR1_DESIRED_CORES_CFG2_REG_LOCK_MASK ((uint32_t)1 << 31)
+#define UBOX_DECS_BUS 0
+#define UBOX_DECS_DEV 8
+#define UBOX_DECS_FUNC 2
+#define UBOX_DECS_CPUBUSNO_CSR 0xcc
+
+#define VTD_TOLM_CSR 0xd0
+#define VTD_TSEG_BASE_CSR 0xa8
+#define VTD_TSEG_LIMIT_CSR 0xac
+#define VTD_EXT_CAP_LOW 0x10
+#define VTD_MMCFG_BASE_CSR 0x90
+#define VTD_MMCFG_LIMIT_CSR 0x98
+#define VTD_TOHM_CSR 0xd4
+#define VTD_MMIOL_CSR 0xdc
+#define VTD_ME_BASE_CSR 0xf0
+#define VTD_ME_LIMIT_CSR 0xf8
+#define VTD_VERSION 0x00
+#define VTD_CAP 0x08
+#define VTD_CAP_LOW 0x08
+#define VTD_CAP_HIGH 0x0C
+#define VTD_EXT_CAP_HIGH 0x14
+
#define PCU_CR1_C2C3TT_REG 0xdc
#define PCU_CR1_PCIE_ILTR_OVRD 0xfc
#define PCU_CR1_SAPMCTL 0xb0
@@ -111,30 +112,50 @@
#define PCU_CR2_PROCHOT_RESPONSE_RATIO_REG 0xb0
#define PROCHOT_RATIO 0xa /* bits 0:7 */
-#define UBOX_DECS_BUS 0
-#define UBOX_DECS_DEV 8
-#define UBOX_DECS_FUNC 2
-#define UBOX_DECS_CPUBUSNO_CSR 0xcc
-
#define CHA_UTIL_ALL_DEV 29
#define CHA_UTIL_ALL_FUNC 1
#define CHA_UTIL_ALL_MMCFG_CSR 0xc0
-#define CBDMA_DEV_NUM 0x04
-#define IIO_CBDMA_MMIO_SIZE 0x10000 //64kB for one CBDMA function
-#define IIO_CBDMA_MMIO_ALIGNMENT 14 //2^14 - 16kB
+/* PCH Device info */
+
+#define XHCI_BUS_NUMBER 0x0
+#define PCH_DEV_SLOT_XHCI 0x14
+#define XHCI_FUNC_NUM 0x0
+
+#define HPET_BUS_NUM 0x0
+#define HPET_DEV_NUM PCH_DEV_SLOT_LPC
+#define HPET0_FUNC_NUM 0x00
+
+#define MMAP_VTD_CFG_REG_DEVID 0x2024
+#define VTD_DEV 5
+#define VTD_FUNC 0
+
+#define PCH_DEV_SLOT_LPC 0x1f
+#define PCH_DEVFN_LPC _PCH_DEVFN(LPC, 0)
+#define PCH_DEVFN_P2SB _PCH_DEVFN(LPC, 1)
+#define PCH_DEVFN_PMC _PCH_DEVFN(LPC, 2)
+#define PCH_DEVFN_SPI _PCH_DEVFN(LPC, 5)
+#define PCH_DEV_LPC _PCH_DEV(LPC, 0)
+#define PCH_DEV_P2SB _PCH_DEV(LPC, 1)
+#define PCH_DEV_PMC _PCH_DEV(LPC, 2)
+#define PCH_DEV_SPI _PCH_DEV(LPC, 5)
+
+
+#define CBDMA_DEV_NUM 0x04
+#define IIO_CBDMA_MMIO_SIZE 0x10000 //64kB for one CBDMA function
+#define IIO_CBDMA_MMIO_ALIGNMENT 14 //2^14 - 16kB
-#define VMD_DEV_NUM 5
-#define VMD_FUNC_NUM 5
+#define VMD_DEV_NUM 0x05
+#define VMD_FUNC_NUM 0x05
-#define APIC_DEV_NUM 5
-#define APIC_FUNC_NUM 0
+#define APIC_DEV_NUM 0x05
+#define APIC_FUNC_NUM 0x00
#define PCH_IOAPIC_BUS_NUMBER 0xF0
#define PCH_IOAPIC_DEV_NUM 0x1F
#define PCH_IOAPIC_FUNC_NUM 0x00
-// ================================== IOAPIC Definitions for DMAR/ACPI ====================
+// ========== IOAPIC Definitions for DMAR/ACPI ========
#define PCH_IOAPIC_ID 0x08
#define PC00_IOAPIC_ID 0x09
#define PC01_IOAPIC_ID 0x0A
@@ -149,24 +170,4 @@
#define PC10_IOAPIC_ID 0x13
#define PC11_IOAPIC_ID 0x14
-/* PCH Device info */
-
-#define XHCI_BUS_NUMBER 0x0
-#define PCH_DEV_SLOT_XHCI 0x14
-#define XHCI_FUNC_NUM 0x0
-
-#define HPET_BUS_NUM 0x0
-#define HPET_DEV_NUM PCH_DEV_SLOT_LPC
-#define HPET0_FUNC_NUM 0x00
-
-#define PCH_DEV_SLOT_LPC 0x1f
-#define PCH_DEVFN_LPC _PCH_DEVFN(LPC, 0)
-#define PCH_DEVFN_P2SB _PCH_DEVFN(LPC, 1)
-#define PCH_DEVFN_PMC _PCH_DEVFN(LPC, 2)
-#define PCH_DEVFN_SPI _PCH_DEVFN(LPC, 5)
-#define PCH_DEV_LPC _PCH_DEV(LPC, 0)
-#define PCH_DEV_P2SB _PCH_DEV(LPC, 1)
-#define PCH_DEV_PMC _PCH_DEV(LPC, 2)
-#define PCH_DEV_SPI _PCH_DEV(LPC, 5)
-
#endif /* _SOC_PCI_DEVS_H_ */