From 88bc0f1604494de0f87c6954c050e7ef4d1c4457 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 8 Jul 2024 04:29:39 +0200 Subject: skl/kbl mainboards: Move PCIe related settings into their device scope Change-Id: I1ffa87eeee521180f37371e5a0d1f9a1a06091aa Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/83373 Reviewed-by: Eric Lai Tested-by: build bot (Jenkins) Reviewed-by: Frans Hendriks Reviewed-by: Matt DeVillier Reviewed-by: Erik van den Bogaert Reviewed-by: Jonathon Hall --- .../google/fizz/variants/baseboard/devicetree.cb | 126 ++++++++------------- .../google/fizz/variants/endeavour/overridetree.cb | 83 ++++++-------- 2 files changed, 80 insertions(+), 129 deletions(-) (limited to 'src/mainboard/google/fizz/variants') diff --git a/src/mainboard/google/fizz/variants/baseboard/devicetree.cb b/src/mainboard/google/fizz/variants/baseboard/devicetree.cb index 9458c81299..25b8d9f159 100644 --- a/src/mainboard/google/fizz/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/fizz/variants/baseboard/devicetree.cb @@ -146,83 +146,6 @@ chip soc/intel/skylake .dc_loadline = 310, }" - # Enable Root port 3(x1) for LAN. - register "PcieRpEnable[2]" = "1" - # Enable CLKREQ# - register "PcieRpClkReqSupport[2]" = "1" - # RP 3 uses SRCCLKREQ0# - register "PcieRpClkReqNumber[2]" = "0" - # RP 3, Enable Advanced Error Reporting - register "PcieRpAdvancedErrorReporting[2]" = "1" - # RP 3, Enable Latency Tolerance Reporting Mechanism - register "PcieRpLtrEnable[2]" = "1" - # RP 3 uses CLK SRC 0 - register "PcieRpClkSrcNumber[2]" = "0" - - # Enable Root port 4(x1) for WLAN. - register "PcieRpEnable[3]" = "1" - # Enable CLKREQ# - register "PcieRpClkReqSupport[3]" = "1" - # RP 4 uses SRCCLKREQ5# - register "PcieRpClkReqNumber[3]" = "5" - # RP 4, Enable Advanced Error Reporting - register "PcieRpAdvancedErrorReporting[3]" = "1" - # RP 4, Enable Latency Tolerance Reporting Mechanism - register "PcieRpLtrEnable[3]" = "1" - # RP 4 uses CLK SRC 5 - register "PcieRpClkSrcNumber[3]" = "5" - - # Enable Root port 5(x4) for NVMe. - register "PcieRpEnable[4]" = "1" - # Enable CLKREQ# - register "PcieRpClkReqSupport[4]" = "1" - # RP 5 uses SRCCLKREQ1# - register "PcieRpClkReqNumber[4]" = "1" - # RP 5, Enable Advanced Error Reporting - register "PcieRpAdvancedErrorReporting[4]" = "1" - # RP 5, Enable Latency Tolerance Reporting Mechanism - register "PcieRpLtrEnable[4]" = "1" - # RP 5 uses CLK SRC 1 - register "PcieRpClkSrcNumber[4]" = "1" - - # Enable Root port 9 for BtoB. - register "PcieRpEnable[8]" = "1" - # Enable CLKREQ# - register "PcieRpClkReqSupport[8]" = "1" - # RP 9 uses SRCCLKREQ2# - register "PcieRpClkReqNumber[8]" = "2" - # RP 9, Enable Advanced Error Reporting - register "PcieRpAdvancedErrorReporting[8]" = "1" - # RP 9, Enable Latency Tolerance Reporting Mechanism - register "PcieRpLtrEnable[8]" = "1" - # RP 9 uses CLK SRC 2 - register "PcieRpClkSrcNumber[8]" = "2" - - # Enable Root port 11 for BtoB. - register "PcieRpEnable[10]" = "1" - # Enable CLKREQ# - register "PcieRpClkReqSupport[10]" = "1" - # RP 11 uses SRCCLKREQ2# - register "PcieRpClkReqNumber[10]" = "2" - # RP 11, Enable Advanced Error Reporting - register "PcieRpAdvancedErrorReporting[10]" = "1" - # RP 11, Enable Latency Tolerance Reporting Mechanism - register "PcieRpLtrEnable[10]" = "1" - # RP 11 uses CLK SRC 2 - register "PcieRpClkSrcNumber[10]" = "2" - - # Enable Root port 12 for BtoB. - register "PcieRpEnable[11]" = "1" - # Enable CLKREQ# - register "PcieRpClkReqSupport[11]" = "1" - # RP 12 uses SRCCLKREQ2# - register "PcieRpClkReqNumber[11]" = "2" - # RP 12, Enable Advanced Error Reporting - register "PcieRpAdvancedErrorReporting[11]" = "1" - # RP 12, Enable Latency Tolerance Reporting Mechanism - register "PcieRpLtrEnable[11]" = "1" - # RP 12 uses CLK SRC 2 - register "PcieRpClkSrcNumber[11]" = "2" register "i2c_voltage[0]" = "I2C_VOLTAGE_3V3" # HDMI CEC register "i2c_voltage[1]" = "I2C_VOLTAGE_3V3" # TPM @@ -368,6 +291,13 @@ chip soc/intel/skylake device ref pcie_rp1 on end device ref pcie_rp3 on # LAN, will be swapped to port 1 by FSP + # x1 + register "PcieRpEnable[2]" = "1" + register "PcieRpClkReqSupport[2]" = "1" + register "PcieRpClkReqNumber[2]" = "0" + register "PcieRpAdvancedErrorReporting[2]" = "1" + register "PcieRpLtrEnable[2]" = "1" + register "PcieRpClkSrcNumber[2]" = "0" chip drivers/net register "customized_leds" = "0x0fa5" register "wake" = "GPE0_PCI_EXP" @@ -376,23 +306,57 @@ chip soc/intel/skylake end end device ref pcie_rp4 on - # WLAN + # x1 WLAN + register "PcieRpEnable[3]" = "1" + register "PcieRpClkReqSupport[3]" = "1" + register "PcieRpClkReqNumber[3]" = "5" + register "PcieRpAdvancedErrorReporting[3]" = "1" + register "PcieRpLtrEnable[3]" = "1" + register "PcieRpClkSrcNumber[3]" = "5" chip drivers/wifi/generic register "wake" = "GPE0_PCI_EXP" device pci 00.0 on end end end - device ref pcie_rp5 on end # NVMe + device ref pcie_rp5 on + # x4 NVMe + register "PcieRpEnable[4]" = "1" + register "PcieRpClkReqSupport[4]" = "1" + register "PcieRpClkReqNumber[4]" = "1" + register "PcieRpAdvancedErrorReporting[4]" = "1" + register "PcieRpLtrEnable[4]" = "1" + register "PcieRpClkSrcNumber[4]" = "1" + end device ref pcie_rp9 on # 2nd LAN + register "PcieRpEnable[8]" = "1" + register "PcieRpClkReqSupport[8]" = "1" + register "PcieRpClkReqNumber[8]" = "2" + register "PcieRpAdvancedErrorReporting[8]" = "1" + register "PcieRpLtrEnable[8]" = "1" + register "PcieRpClkSrcNumber[8]" = "2" chip drivers/net register "customized_leds" = "0x0fa5" register "device_index" = "1" device pci 00.0 on end end end - device ref pcie_rp11 on end - device ref pcie_rp12 on end + device ref pcie_rp11 on + register "PcieRpEnable[10]" = "1" + register "PcieRpClkReqSupport[10]" = "1" + register "PcieRpClkReqNumber[10]" = "2" + register "PcieRpAdvancedErrorReporting[10]" = "1" + register "PcieRpLtrEnable[10]" = "1" + register "PcieRpClkSrcNumber[10]" = "2" + end + device ref pcie_rp12 on + register "PcieRpEnable[11]" = "1" + register "PcieRpClkReqSupport[11]" = "1" + register "PcieRpClkReqNumber[11]" = "2" + register "PcieRpAdvancedErrorReporting[11]" = "1" + register "PcieRpLtrEnable[11]" = "1" + register "PcieRpClkSrcNumber[11]" = "2" + end device ref uart0 on end device ref gspi0 on chip drivers/spi/acpi diff --git a/src/mainboard/google/fizz/variants/endeavour/overridetree.cb b/src/mainboard/google/fizz/variants/endeavour/overridetree.cb index 3da4f0e4f6..649b5c11f6 100644 --- a/src/mainboard/google/fizz/variants/endeavour/overridetree.cb +++ b/src/mainboard/google/fizz/variants/endeavour/overridetree.cb @@ -1,47 +1,5 @@ chip soc/intel/skylake - # Enable Root port 7(x1) for TPU1 - register "PcieRpEnable[6]" = "1" - # Enable CLKREQ# - register "PcieRpClkReqSupport[6]" = "1" - # RP 7 uses SRCCLKREQ4# - register "PcieRpClkReqNumber[6]" = "4" - # RP 7, Enable Advanced Error Reporting - register "PcieRpAdvancedErrorReporting[6]" = "1" - # RP 7, Enable Latency Tolerance Reporting Mechanism - register "PcieRpLtrEnable[6]" = "1" - # RP 7 uses CLK SRC 4 - register "PcieRpClkSrcNumber[6]" = "4" - - # Enable Root port 8(x1) for TPU0 - register "PcieRpEnable[7]" = "1" - # Enable CLKREQ# - register "PcieRpClkReqSupport[7]" = "1" - # RP 8 uses SRCCLKREQ2# - register "PcieRpClkReqNumber[7]" = "2" - # RP 8, Enable Advanced Error Reporting - register "PcieRpAdvancedErrorReporting[7]" = "1" - # RP 8, Enable Latency Tolerance Reporting Mechanism - register "PcieRpLtrEnable[7]" = "1" - # RP 8 uses CLK SRC 2 - register "PcieRpClkSrcNumber[7]" = "2" - - # Enable Root port 9(x4) for i350 LAN - register "PcieRpEnable[8]" = "1" - # Disable CLKREQ# - register "PcieRpClkReqSupport[8]" = "0" - # RP 9, Enable Advanced Error Reporting - register "PcieRpAdvancedErrorReporting[8]" = "1" - # RP 9, Enable Latency Tolerance Reporting Mechanism - register "PcieRpLtrEnable[8]" = "1" - # RP 9 uses CLK SRC 2 - register "PcieRpClkSrcNumber[8]" = "2" - - # These are part of Root port 9(x4) - register "PcieRpEnable[9]" = "0" - register "PcieRpEnable[10]" = "0" - register "PcieRpEnable[11]" = "0" - register "i2c_voltage[0]" = "I2C_VOLTAGE_3V3" # TPU register "i2c_voltage[1]" = "I2C_VOLTAGE_3V3" # TPM register "i2c_voltage[2]" = "I2C_VOLTAGE_1V8" # None @@ -159,11 +117,40 @@ chip soc/intel/skylake device i2c 13 on end end end - device ref pcie_rp7 on end # TPU1 - device ref pcie_rp8 on end # TPU0 - device ref pcie_rp9 on end # POE LAN - device ref pcie_rp10 off end - device ref pcie_rp11 off end - device ref pcie_rp12 off end + device ref pcie_rp7 on + # x1 TPU1 + register "PcieRpEnable[6]" = "1" + register "PcieRpClkReqSupport[6]" = "1" + register "PcieRpClkReqNumber[6]" = "4" + register "PcieRpAdvancedErrorReporting[6]" = "1" + register "PcieRpLtrEnable[6]" = "1" + register "PcieRpClkSrcNumber[6]" = "4" + end + device ref pcie_rp8 on + # x1 TPU0 + register "PcieRpEnable[7]" = "1" + register "PcieRpClkReqSupport[7]" = "1" + register "PcieRpClkReqNumber[7]" = "2" + register "PcieRpAdvancedErrorReporting[7]" = "1" + register "PcieRpLtrEnable[7]" = "1" + register "PcieRpClkSrcNumber[7]" = "2" + end + device ref pcie_rp9 on + # x4 i350 LAN + register "PcieRpEnable[8]" = "1" + register "PcieRpClkReqSupport[8]" = "0" + register "PcieRpAdvancedErrorReporting[8]" = "1" + register "PcieRpLtrEnable[8]" = "1" + register "PcieRpClkSrcNumber[8]" = "2" + end + device ref pcie_rp10 off + register "PcieRpEnable[9]" = "0" + end + device ref pcie_rp11 off + register "PcieRpEnable[10]" = "0" + end + device ref pcie_rp12 off + register "PcieRpEnable[11]" = "0" + end end end -- cgit v1.2.3