skl/kbl mainboards: Move PCIe related settings into their device scope

Change-Id: I1ffa87eeee521180f37371e5a0d1f9a1a06091aa
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83373
Reviewed-by: Eric Lai <ericllai@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-by: Erik van den Bogaert <ebogaert@eltan.com>
Reviewed-by: Jonathon Hall <jonathon.hall@puri.sm>
This commit is contained in:
Felix Singer
2024-07-08 04:29:39 +02:00
parent 702902d71f
commit 88bc0f1604
25 changed files with 493 additions and 637 deletions

View File

@@ -39,29 +39,6 @@ chip soc/intel/skylake
register "PmConfigSlpSusMinAssert" = "3" # 500ms register "PmConfigSlpSusMinAssert" = "3" # 500ms
register "PmConfigSlpAMinAssert" = "3" # 2s register "PmConfigSlpAMinAssert" = "3" # 2s
# Enable Root Ports 3, 4 and 9
register "PcieRpEnable[2]" = "1" # Ethernet controller
register "PcieRpClkReqSupport[2]" = "1"
register "PcieRpClkReqNumber[2]" = "0"
register "PcieRpClkSrcNumber[2]" = "0"
register "PcieRpAdvancedErrorReporting[2]" = "1"
register "PcieRpLtrEnable[2]" = "1"
register "PcieRpEnable[3]" = "1" # Wireless controller
register "PcieRpClkReqSupport[3]" = "1"
register "PcieRpClkReqNumber[3]" = "1"
register "PcieRpClkSrcNumber[3]" = "1"
register "PcieRpAdvancedErrorReporting[3]" = "1"
register "PcieRpLtrEnable[3]" = "1"
register "PcieRpEnable[8]" = "1" # NVMe controller
register "PcieRpClkReqSupport[8]" = "1"
register "PcieRpClkReqNumber[8]" = "4"
register "PcieRpClkSrcNumber[8]" = "4"
register "PcieRpAdvancedErrorReporting[8]" = "1"
register "PcieRpLtrEnable[8]" = "1"
# PL1 override 25W # PL1 override 25W
# PL2 override 44W # PL2 override 44W
register "power_limits_config" = "{ register "power_limits_config" = "{
@@ -110,9 +87,33 @@ chip soc/intel/skylake
[2] = 1, [2] = 1,
}" }"
end end
device ref pcie_rp3 on end device ref pcie_rp3 on
device ref pcie_rp4 on end # Ethernet controller
device ref pcie_rp9 on end register "PcieRpEnable[2]" = "1"
register "PcieRpClkReqSupport[2]" = "1"
register "PcieRpClkReqNumber[2]" = "0"
register "PcieRpClkSrcNumber[2]" = "0"
register "PcieRpAdvancedErrorReporting[2]" = "1"
register "PcieRpLtrEnable[2]" = "1"
end
device ref pcie_rp4 on
# Wireless controller
register "PcieRpEnable[3]" = "1"
register "PcieRpClkReqSupport[3]" = "1"
register "PcieRpClkReqNumber[3]" = "1"
register "PcieRpClkSrcNumber[3]" = "1"
register "PcieRpAdvancedErrorReporting[3]" = "1"
register "PcieRpLtrEnable[3]" = "1"
end
device ref pcie_rp9 on
# NVMe controller
register "PcieRpEnable[8]" = "1"
register "PcieRpClkReqSupport[8]" = "1"
register "PcieRpClkReqNumber[8]" = "4"
register "PcieRpClkSrcNumber[8]" = "4"
register "PcieRpAdvancedErrorReporting[8]" = "1"
register "PcieRpLtrEnable[8]" = "1"
end
device ref lpc_espi on device ref lpc_espi on
register "serirq_mode" = "SERIRQ_CONTINUOUS" register "serirq_mode" = "SERIRQ_CONTINUOUS"

View File

@@ -111,57 +111,6 @@ chip soc/intel/skylake
# Send an extra VR mailbox command for the PS4 exit issue # Send an extra VR mailbox command for the PS4 exit issue
register "SendVrMbxCmd" = "2" register "SendVrMbxCmd" = "2"
# Enable Root ports.
# PCIE Port 1 disabled
# PCIE Port 2 disabled
# PCIE Port 3 x1 -> Module x1 : Mapped to PCIe 2 on the baseboard
register "PcieRpEnable[2]" = "1"
# Disable CLKREQ#
register "PcieRpClkReqSupport[2]" = "0"
# Set MaxPayload to 256 bytes
register "PcieRpMaxPayload[2]" = "RpMaxPayload_256"
# Enable Latency Tolerance Reporting Mechanism
register "PcieRpLtrEnable[2]" = "1"
# Enable Advanced Error Reporting
register "PcieRpAdvancedErrorReporting[2]" = "1"
# Disable Aspm
register "pcie_rp_aspm[2]" = "AspmDisabled"
# PCIE Port 4 disabled
# PCIE Port 5 x1 -> MODULE i219
# PCIE Port 6 x1 -> BASEBOARD x1 i210 : Mapped to PCIe 4 on the baseboard
register "PcieRpEnable[5]" = "1"
register "PcieRpClkReqSupport[5]" = "0"
# Set MaxPayload to 256 bytes
register "PcieRpMaxPayload[5]" = "RpMaxPayload_256"
# Enable Latency Tolerance Reporting Mechanism
register "PcieRpLtrEnable[5]" = "1"
# Enable Advanced Error Reporting
register "PcieRpAdvancedErrorReporting[5]" = "1"
# Disable Aspm
register "pcie_rp_aspm[5]" = "AspmDisabled"
# PCIE Port 7 Disabled
# PCIE Port 8 Disabled
# PCIE Port 9 x4 -> BASEBOARD PEG0-3 FPGA
register "PcieRpEnable[8]" = "1"
# Disable CLKREQ#
register "PcieRpClkReqSupport[8]" = "0"
# Use Hot Plug subsystem
register "PcieRpHotPlug[8]" = "1"
# Set MaxPayload to 256 bytes
register "PcieRpMaxPayload[8]" = "RpMaxPayload_256"
# Enable Latency Tolerance Reporting Mechanism
register "PcieRpLtrEnable[8]" = "1"
# Enable Advanced Error Reporting
register "PcieRpAdvancedErrorReporting[8]" = "1"
# Disable Aspm
register "pcie_rp_aspm[8]" = "AspmDisabled"
# Must leave UART0 enabled or SD/eMMC will not work as PCI # Must leave UART0 enabled or SD/eMMC will not work as PCI
register "SerialIoDevMode" = "{ register "SerialIoDevMode" = "{
[PchSerialIoIndexI2C0] = PchSerialIoDisabled, [PchSerialIoIndexI2C0] = PchSerialIoDisabled,
@@ -205,9 +154,37 @@ chip soc/intel/skylake
register "SataSalpSupport" = "1" register "SataSalpSupport" = "1"
register "SataPortsEnable[0]" = "1" register "SataPortsEnable[0]" = "1"
end end
device ref pcie_rp3 on end # x1 baseboard WWAN device ref pcie_rp3 on
device ref pcie_rp6 on end # x1 baseboard i210 # x1 baseboard WWAN
device ref pcie_rp9 on end # x4 FPGA # PCIE Port 3 x1 -> Module x1 : Mapped to PCIe 2 on the baseboard
register "PcieRpEnable[2]" = "1"
register "PcieRpClkReqSupport[2]" = "0"
register "PcieRpMaxPayload[2]" = "RpMaxPayload_256"
register "PcieRpLtrEnable[2]" = "1"
register "PcieRpAdvancedErrorReporting[2]" = "1"
register "pcie_rp_aspm[2]" = "AspmDisabled"
end
device ref pcie_rp6 on
# x1 baseboard i210
# PCIE Port 6 x1 -> BASEBOARD x1 i210 : Mapped to PCIe 4 on the baseboard
register "PcieRpEnable[5]" = "1"
register "PcieRpClkReqSupport[5]" = "0"
register "PcieRpMaxPayload[5]" = "RpMaxPayload_256"
register "PcieRpLtrEnable[5]" = "1"
register "PcieRpAdvancedErrorReporting[5]" = "1"
register "pcie_rp_aspm[5]" = "AspmDisabled"
end
device ref pcie_rp9 on
# x4 FPGA
# PCIE Port 9 x4 -> BASEBOARD PEG0-3 FPGA
register "PcieRpEnable[8]" = "1"
register "PcieRpClkReqSupport[8]" = "0"
register "PcieRpHotPlug[8]" = "1"
register "PcieRpMaxPayload[8]" = "RpMaxPayload_256"
register "PcieRpLtrEnable[8]" = "1"
register "PcieRpAdvancedErrorReporting[8]" = "1"
register "pcie_rp_aspm[8]" = "AspmDisabled"
end
device ref uart0 on end device ref uart0 on end
device ref emmc on end device ref emmc on end
device ref lpc_espi on device ref lpc_espi on

View File

@@ -116,25 +116,6 @@ chip soc/intel/skylake
.dc_loadline = 430, .dc_loadline = 430,
}" }"
# Enable Root port 1 with SRCCLKREQ1#
register "PcieRpEnable[0]" = "1"
register "PcieRpClkReqSupport[0]" = "1"
register "PcieRpClkReqNumber[0]" = "1"
register "PcieRpAdvancedErrorReporting[0]" = "1"
register "PcieRpLtrEnable[0]" = "1"
register "PcieRpHotPlug[0]" = "1"
#RP 1 uses CLK SRC 1
register "PcieRpClkSrcNumber[0]" = "1"
# Enable Root port 5 with SRCCLKREQ4#
register "PcieRpEnable[4]" = "1"
register "PcieRpClkReqSupport[4]" = "1"
register "PcieRpClkReqNumber[4]" = "4"
register "PcieRpAdvancedErrorReporting[4]" = "1"
register "PcieRpLtrEnable[4]" = "1"
#RP 5 uses CLK SRC 4
register "PcieRpClkSrcNumber[4]" = "4"
# Intel Common SoC Config # Intel Common SoC Config
#+-------------------+---------------------------+ #+-------------------+---------------------------+
#| Field | Value | #| Field | Value |
@@ -355,12 +336,26 @@ chip soc/intel/skylake
end end
end # I2C #4 end # I2C #4
device ref pcie_rp1 on device ref pcie_rp1 on
register "PcieRpEnable[0]" = "1"
register "PcieRpClkReqSupport[0]" = "1"
register "PcieRpClkReqNumber[0]" = "1"
register "PcieRpAdvancedErrorReporting[0]" = "1"
register "PcieRpLtrEnable[0]" = "1"
register "PcieRpHotPlug[0]" = "1"
register "PcieRpClkSrcNumber[0]" = "1"
chip drivers/wifi/generic chip drivers/wifi/generic
register "wake" = "GPE0_PCI_EXP" register "wake" = "GPE0_PCI_EXP"
device pci 00.0 on end device pci 00.0 on end
end end
end end
device ref pcie_rp5 on end device ref pcie_rp5 on
register "PcieRpEnable[4]" = "1"
register "PcieRpClkReqSupport[4]" = "1"
register "PcieRpClkReqNumber[4]" = "4"
register "PcieRpAdvancedErrorReporting[4]" = "1"
register "PcieRpLtrEnable[4]" = "1"
register "PcieRpClkSrcNumber[4]" = "4"
end
device ref uart0 on end device ref uart0 on end
device ref gspi0 on device ref gspi0 on
chip drivers/spi/acpi chip drivers/spi/acpi

View File

@@ -146,83 +146,6 @@ chip soc/intel/skylake
.dc_loadline = 310, .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[0]" = "I2C_VOLTAGE_3V3" # HDMI CEC
register "i2c_voltage[1]" = "I2C_VOLTAGE_3V3" # TPM 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_rp1 on end
device ref pcie_rp3 on device ref pcie_rp3 on
# LAN, will be swapped to port 1 by FSP # 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 chip drivers/net
register "customized_leds" = "0x0fa5" register "customized_leds" = "0x0fa5"
register "wake" = "GPE0_PCI_EXP" register "wake" = "GPE0_PCI_EXP"
@@ -376,23 +306,57 @@ chip soc/intel/skylake
end end
end end
device ref pcie_rp4 on 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 chip drivers/wifi/generic
register "wake" = "GPE0_PCI_EXP" register "wake" = "GPE0_PCI_EXP"
device pci 00.0 on end device pci 00.0 on end
end 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 device ref pcie_rp9 on
# 2nd LAN # 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 chip drivers/net
register "customized_leds" = "0x0fa5" register "customized_leds" = "0x0fa5"
register "device_index" = "1" register "device_index" = "1"
device pci 00.0 on end device pci 00.0 on end
end end
end end
device ref pcie_rp11 on end device ref pcie_rp11 on
device ref pcie_rp12 on end 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 uart0 on end
device ref gspi0 on device ref gspi0 on
chip drivers/spi/acpi chip drivers/spi/acpi

View File

@@ -1,47 +1,5 @@
chip soc/intel/skylake 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[0]" = "I2C_VOLTAGE_3V3" # TPU
register "i2c_voltage[1]" = "I2C_VOLTAGE_3V3" # TPM register "i2c_voltage[1]" = "I2C_VOLTAGE_3V3" # TPM
register "i2c_voltage[2]" = "I2C_VOLTAGE_1V8" # None register "i2c_voltage[2]" = "I2C_VOLTAGE_1V8" # None
@@ -159,11 +117,40 @@ chip soc/intel/skylake
device i2c 13 on end device i2c 13 on end
end end
end end
device ref pcie_rp7 on end # TPU1 device ref pcie_rp7 on
device ref pcie_rp8 on end # TPU0 # x1 TPU1
device ref pcie_rp9 on end # POE LAN register "PcieRpEnable[6]" = "1"
device ref pcie_rp10 off end register "PcieRpClkReqSupport[6]" = "1"
device ref pcie_rp11 off end register "PcieRpClkReqNumber[6]" = "4"
device ref pcie_rp12 off end 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
end end

View File

@@ -41,13 +41,6 @@ chip soc/intel/skylake
register "PmConfigSlpSusMinAssert" = "3" # 4s register "PmConfigSlpSusMinAssert" = "3" # 4s
register "PmConfigSlpAMinAssert" = "3" # 2s register "PmConfigSlpAMinAssert" = "3" # 2s
# Enable Root port 1
register "PcieRpEnable[0]" = "1"
# Enable CLKREQ#
register "PcieRpClkReqSupport[0]" = "1"
# RP 1 uses SRCCLKREQ1#
register "PcieRpClkReqNumber[0]" = "1"
# Must leave UART0 enabled or SD/eMMC will not work as PCI # Must leave UART0 enabled or SD/eMMC will not work as PCI
register "SerialIoDevMode" = "{ register "SerialIoDevMode" = "{
[PchSerialIoIndexI2C0] = PchSerialIoPci, [PchSerialIoIndexI2C0] = PchSerialIoPci,
@@ -85,6 +78,9 @@ chip soc/intel/skylake
device ref uart2 on end device ref uart2 on end
device ref i2c4 on end device ref i2c4 on end
device ref pcie_rp1 on device ref pcie_rp1 on
register "PcieRpEnable[0]" = "1"
register "PcieRpClkReqSupport[0]" = "1"
register "PcieRpClkReqNumber[0]" = "1"
chip drivers/wifi/generic chip drivers/wifi/generic
register "wake" = "GPE0_DW0_16" register "wake" = "GPE0_DW0_16"
device pci 00.0 on end device pci 00.0 on end

View File

@@ -126,14 +126,6 @@ chip soc/intel/skylake
.dc_loadline = 425, .dc_loadline = 425,
}" }"
# PCIe Root port 1 with SRCCLKREQ1# (WLAN)
register "PcieRpEnable[0]" = "1"
register "PcieRpClkReqSupport[0]" = "1"
register "PcieRpClkReqNumber[0]" = "1"
register "PcieRpClkSrcNumber[0]" = "1"
register "PcieRpAdvancedErrorReporting[0]" = "1"
register "PcieRpLtrEnable[0]" = "1"
# Intel Common SoC Config # Intel Common SoC Config
#+-------------------+---------------------------+ #+-------------------+---------------------------+
#| Field | Value | #| Field | Value |
@@ -326,6 +318,13 @@ chip soc/intel/skylake
end end
end end
device ref pcie_rp1 on device ref pcie_rp1 on
# WLAN
register "PcieRpEnable[0]" = "1"
register "PcieRpClkReqSupport[0]" = "1"
register "PcieRpClkReqNumber[0]" = "1"
register "PcieRpClkSrcNumber[0]" = "1"
register "PcieRpAdvancedErrorReporting[0]" = "1"
register "PcieRpLtrEnable[0]" = "1"
chip drivers/wifi/generic chip drivers/wifi/generic
register "wake" = "GPE0_DW1_07" # GPP_B7 register "wake" = "GPE0_DW1_07" # GPP_B7
device pci 00.0 on end device pci 00.0 on end

View File

@@ -111,19 +111,6 @@ chip soc/intel/skylake
.dc_loadline = 420, .dc_loadline = 420,
}" }"
# Enable Root port 1.
register "PcieRpEnable[0]" = "1"
# Enable CLKREQ#
register "PcieRpClkReqSupport[0]" = "1"
# RP 1 uses SRCCLKREQ1#
register "PcieRpClkReqNumber[0]" = "1"
# RP 1, Enable Advanced Error Reporting
register "PcieRpAdvancedErrorReporting[0]" = "1"
# RP 1, Enable Latency Tolerance Reporting Mechanism
register "PcieRpLtrEnable[0]" = "1"
# RP 1 uses CLK SRC 1
register "PcieRpClkSrcNumber[0]" = "1"
# Intel Common SoC Config # Intel Common SoC Config
#+-------------------+---------------------------+ #+-------------------+---------------------------+
#| Field | Value | #| Field | Value |
@@ -342,6 +329,12 @@ chip soc/intel/skylake
end end
device ref i2c4 on end device ref i2c4 on end
device ref pcie_rp1 on device ref pcie_rp1 on
register "PcieRpEnable[0]" = "1"
register "PcieRpClkReqSupport[0]" = "1"
register "PcieRpClkReqNumber[0]" = "1"
register "PcieRpAdvancedErrorReporting[0]" = "1"
register "PcieRpLtrEnable[0]" = "1"
register "PcieRpClkSrcNumber[0]" = "1"
chip drivers/wifi/generic chip drivers/wifi/generic
register "wake" = "GPE0_DW0_00" register "wake" = "GPE0_DW0_00"
device pci 00.0 on end device pci 00.0 on end

View File

@@ -119,48 +119,6 @@ chip soc/intel/skylake
.dc_loadline = 310, .dc_loadline = 310,
}" }"
# Root port 4 (x1)
# PcieRpEnable: Enable root port
# PcieRpClkReqSupport: Enable CLKREQ#
# PcieRpClkReqNumber: Uses SRCCLKREQ1#
# PcieRpClkSrcNumber: Uses 1
# PcieRpAdvancedErrorReporting: Enable Advanced Error Reporting
# PcieRpLtrEnable: Enable Latency Tolerance Reporting Mechanism
register "PcieRpEnable[3]" = "1"
register "PcieRpClkReqSupport[3]" = "1"
register "PcieRpClkReqNumber[3]" = "1"
register "PcieRpClkSrcNumber[3]" = "1"
register "PcieRpAdvancedErrorReporting[3]" = "1"
register "PcieRpLtrEnable[3]" = "1"
# Root port 5 (x4)
# PcieRpEnable: Enable root port
# PcieRpClkReqSupport: Enable CLKREQ#
# PcieRpClkReqNumber: Uses SRCCLKREQ3#
# PcieRpClkSrcNumber: Uses 3
# PcieRpAdvancedErrorReporting: Enable Advanced Error Reporting
# PcieRpLtrEnable: Enable Latency Tolerance Reporting Mechanism
register "PcieRpEnable[4]" = "1"
register "PcieRpClkReqSupport[4]" = "1"
register "PcieRpClkReqNumber[4]" = "3"
register "PcieRpClkSrcNumber[4]" = "3"
register "PcieRpAdvancedErrorReporting[4]" = "1"
register "PcieRpLtrEnable[4]" = "1"
# Root port 9 (x2)
# PcieRpEnable: Enable root port
# PcieRpClkReqSupport: Enable CLKREQ#
# PcieRpClkReqNumber: Uses SRCCLKREQ2#
# PcieRpClkSrcNumber: Uses 2
# PcieRpAdvancedErrorReporting: Enable Advanced Error Reporting
# PcieRpLtrEnable: Enable Latency Tolerance Reporting Mechanism
register "PcieRpEnable[8]" = "1"
register "PcieRpClkReqSupport[8]" = "1"
register "PcieRpClkReqNumber[8]" = "2"
register "PcieRpClkSrcNumber[8]" = "2"
register "PcieRpAdvancedErrorReporting[8]" = "1"
register "PcieRpLtrEnable[8]" = "1"
# Touchscreen # Touchscreen
register "i2c_voltage[0]" = "I2C_VOLTAGE_3V3" register "i2c_voltage[0]" = "I2C_VOLTAGE_3V3"
@@ -419,16 +377,39 @@ chip soc/intel/skylake
device ref pcie_rp2 off end device ref pcie_rp2 off end
device ref pcie_rp3 off end device ref pcie_rp3 off end
device ref pcie_rp4 on device ref pcie_rp4 on
# x1
register "PcieRpEnable[3]" = "1"
register "PcieRpClkReqSupport[3]" = "1"
register "PcieRpClkReqNumber[3]" = "1"
register "PcieRpClkSrcNumber[3]" = "1"
register "PcieRpAdvancedErrorReporting[3]" = "1"
register "PcieRpLtrEnable[3]" = "1"
chip drivers/wifi/generic chip drivers/wifi/generic
register "wake" = "GPE0_DW2_22" # Wake pin = GPP_E22 register "wake" = "GPE0_DW2_22" # Wake pin = GPP_E22
device pci 00.0 on end device pci 00.0 on end
end end
end end
device ref pcie_rp5 on end device ref pcie_rp5 on
# x4
register "PcieRpEnable[4]" = "1"
register "PcieRpClkReqSupport[4]" = "1"
register "PcieRpClkReqNumber[4]" = "3"
register "PcieRpClkSrcNumber[4]" = "3"
register "PcieRpAdvancedErrorReporting[4]" = "1"
register "PcieRpLtrEnable[4]" = "1"
end
device ref pcie_rp6 off end device ref pcie_rp6 off end
device ref pcie_rp7 off end device ref pcie_rp7 off end
device ref pcie_rp8 off end device ref pcie_rp8 off end
device ref pcie_rp9 on end device ref pcie_rp9 on
# x2
register "PcieRpEnable[8]" = "1"
register "PcieRpClkReqSupport[8]" = "1"
register "PcieRpClkReqNumber[8]" = "2"
register "PcieRpClkSrcNumber[8]" = "2"
register "PcieRpAdvancedErrorReporting[8]" = "1"
register "PcieRpLtrEnable[8]" = "1"
end
device ref pcie_rp10 off end device ref pcie_rp10 off end
device ref pcie_rp11 off end device ref pcie_rp11 off end
device ref pcie_rp12 off end device ref pcie_rp12 off end

View File

@@ -129,19 +129,6 @@ chip soc/intel/skylake
.dc_loadline = 420, .dc_loadline = 420,
}" }"
# Enable Root port 1.
register "PcieRpEnable[0]" = "1"
# Enable CLKREQ#
register "PcieRpClkReqSupport[0]" = "1"
# RP 1 uses SRCCLKREQ1#
register "PcieRpClkReqNumber[0]" = "1"
# RP 1 uses CLK SRC 1
register "PcieRpClkSrcNumber[0]" = "1"
# RP 1, Enable Advanced Error Reporting
register "PcieRpAdvancedErrorReporting[0]" = "1"
# RP 1, Enable Latency Tolerance Reporting Mechanism
register "PcieRpLtrEnable[0]" = "1"
# Intel Common SoC Config # Intel Common SoC Config
#+-------------------+---------------------------+ #+-------------------+---------------------------+
#| Field | Value | #| Field | Value |
@@ -380,6 +367,12 @@ chip soc/intel/skylake
end end
end end
device ref pcie_rp1 on device ref pcie_rp1 on
register "PcieRpEnable[0]" = "1"
register "PcieRpClkReqSupport[0]" = "1"
register "PcieRpClkReqNumber[0]" = "1"
register "PcieRpClkSrcNumber[0]" = "1"
register "PcieRpAdvancedErrorReporting[0]" = "1"
register "PcieRpLtrEnable[0]" = "1"
chip drivers/wifi/generic chip drivers/wifi/generic
register "wake" = "GPE0_DW0_00" register "wake" = "GPE0_DW0_00"
device pci 00.0 on end device pci 00.0 on end

View File

@@ -119,28 +119,6 @@ chip soc/intel/skylake
.dc_loadline = 430, .dc_loadline = 430,
}" }"
# PCIe Root port 1 with SRCCLKREQ1#
register "PcieRpEnable[0]" = "1"
register "PcieRpClkReqSupport[0]" = "1"
register "PcieRpClkReqNumber[0]" = "1"
register "PcieRpClkSrcNumber[0]" = "1"
register "PcieRpAdvancedErrorReporting[0]" = "1"
register "PcieRpLtrEnable[0]" = "1"
# Root port 9 (x2)
# PcieRpEnable: Enable root port
# PcieRpClkReqSupport: Enable CLKREQ#
# PcieRpClkReqNumber: Uses SRCCLKREQ2#
# PcieRpClkSrcNumber: Uses 3
# PcieRpAdvancedErrorReporting: Enable Advanced Error Reporting
# PcieRpLtrEnable: Enable Latency Tolerance Reporting Mechanism
register "PcieRpEnable[8]" = "1"
register "PcieRpClkReqSupport[8]" = "1"
register "PcieRpClkReqNumber[8]" = "2"
register "PcieRpClkSrcNumber[8]" = "3"
register "PcieRpAdvancedErrorReporting[8]" = "1"
register "PcieRpLtrEnable[8]" = "1"
# Intel Common SoC Config # Intel Common SoC Config
#+-------------------+---------------------------+ #+-------------------+---------------------------+
#| Field | Value | #| Field | Value |
@@ -354,6 +332,12 @@ chip soc/intel/skylake
end end
end end
device ref pcie_rp1 on device ref pcie_rp1 on
register "PcieRpEnable[0]" = "1"
register "PcieRpClkReqSupport[0]" = "1"
register "PcieRpClkReqNumber[0]" = "1"
register "PcieRpClkSrcNumber[0]" = "1"
register "PcieRpAdvancedErrorReporting[0]" = "1"
register "PcieRpLtrEnable[0]" = "1"
chip drivers/wifi/generic chip drivers/wifi/generic
register "wake" = "GPE0_DW2_01" register "wake" = "GPE0_DW2_01"
device pci 00.0 on end device pci 00.0 on end
@@ -366,7 +350,15 @@ chip soc/intel/skylake
device ref pcie_rp6 off end device ref pcie_rp6 off end
device ref pcie_rp7 off end device ref pcie_rp7 off end
device ref pcie_rp8 off end device ref pcie_rp8 off end
device ref pcie_rp9 on end device ref pcie_rp9 on
# x2
register "PcieRpEnable[8]" = "1"
register "PcieRpClkReqSupport[8]" = "1"
register "PcieRpClkReqNumber[8]" = "2"
register "PcieRpClkSrcNumber[8]" = "3"
register "PcieRpAdvancedErrorReporting[8]" = "1"
register "PcieRpLtrEnable[8]" = "1"
end
device ref pcie_rp10 off end device ref pcie_rp10 off end
device ref pcie_rp11 off end device ref pcie_rp11 off end
device ref pcie_rp12 off end device ref pcie_rp12 off end

View File

@@ -118,19 +118,6 @@ chip soc/intel/skylake
.dc_loadline = 430, .dc_loadline = 430,
}" }"
# Enable Root port 1.
register "PcieRpEnable[0]" = "1"
# Enable CLKREQ#
register "PcieRpClkReqSupport[0]" = "1"
# RP 1 uses SRCCLKREQ1#
register "PcieRpClkReqNumber[0]" = "1"
# RP 1 uses CLK SRC 1
register "PcieRpClkSrcNumber[0]" = "1"
# RP 1, Enable Advanced Error Reporting
register "PcieRpAdvancedErrorReporting[0]" = "1"
# RP 1, Enable Latency Tolerance Reporting Mechanism
register "PcieRpLtrEnable[0]" = "1"
# Intel Common SoC Config # Intel Common SoC Config
#+-------------------+---------------------------+ #+-------------------+---------------------------+
#| Field | Value | #| Field | Value |
@@ -339,6 +326,12 @@ chip soc/intel/skylake
end end
device ref i2c4 off end device ref i2c4 off end
device ref pcie_rp1 on device ref pcie_rp1 on
register "PcieRpEnable[0]" = "1"
register "PcieRpClkReqSupport[0]" = "1"
register "PcieRpClkReqNumber[0]" = "1"
register "PcieRpClkSrcNumber[0]" = "1"
register "PcieRpAdvancedErrorReporting[0]" = "1"
register "PcieRpLtrEnable[0]" = "1"
chip drivers/wifi/generic chip drivers/wifi/generic
register "wake" = "GPE0_DW0_00" # GPP_B0 register "wake" = "GPE0_DW0_00" # GPP_B0
device pci 00.0 on end device pci 00.0 on end

View File

@@ -120,19 +120,6 @@ chip soc/intel/skylake
.dc_loadline = 420, .dc_loadline = 420,
}" }"
# Enable Root port 1.
register "PcieRpEnable[0]" = "1"
# Enable CLKREQ#
register "PcieRpClkReqSupport[0]" = "1"
# RP 1 uses SRCCLKREQ1#
register "PcieRpClkReqNumber[0]" = "1"
# RP 1, Enable Advanced Error Reporting
register "PcieRpAdvancedErrorReporting[0]" = "1"
# RP 1, Enable Latency Tolerance Reporting Mechanism
register "PcieRpLtrEnable[0]" = "1"
# RP 1 uses CLK SRC 1
register "PcieRpClkSrcNumber[0]" = "1"
# Intel Common SoC Config # Intel Common SoC Config
#+-------------------+---------------------------+ #+-------------------+---------------------------+
#| Field | Value | #| Field | Value |
@@ -325,6 +312,12 @@ chip soc/intel/skylake
end end
device ref i2c4 on end device ref i2c4 on end
device ref pcie_rp1 on device ref pcie_rp1 on
register "PcieRpEnable[0]" = "1"
register "PcieRpClkReqSupport[0]" = "1"
register "PcieRpClkReqNumber[0]" = "1"
register "PcieRpAdvancedErrorReporting[0]" = "1"
register "PcieRpLtrEnable[0]" = "1"
register "PcieRpClkSrcNumber[0]" = "1"
chip drivers/wifi/generic chip drivers/wifi/generic
register "wake" = "GPE0_PCI_EXP" register "wake" = "GPE0_PCI_EXP"
device pci 00.0 on end device pci 00.0 on end

View File

@@ -4,43 +4,6 @@ chip soc/intel/skylake
register "DspEnable" = "0" register "DspEnable" = "0"
register "ScsEmmcHs400Enabled" = "0" register "ScsEmmcHs400Enabled" = "0"
# Enable PCIE slot
register "PcieRpEnable[5]" = "1"
register "PcieRpClkReqSupport[5]" = "1"
register "PcieRpClkReqNumber[5]" = "1" #uses SRCCLKREQ1
# RP6, uses CLK SRC 1
register "PcieRpClkSrcNumber[5]" = "1"
register "PcieRpEnable[6]" = "1"
register "PcieRpClkReqSupport[6]" = "1"
register "PcieRpClkReqNumber[6]" = "2" #uses SRCCLKREQ2
# RP7, uses CLK SRC 2
register "PcieRpClkSrcNumber[6]" = "2"
register "PcieRpEnable[7]" = "1"
register "PcieRpClkReqSupport[7]" = "1"
register "PcieRpClkReqNumber[7]" = "3" #uses SRCCLKREQ3
# RP8, uses CLK SRC 3
register "PcieRpClkSrcNumber[7]" = "3"
register "PcieRpEnable[8]" = "1"
register "PcieRpClkReqSupport[8]" = "1"
register "PcieRpClkReqNumber[8]" = "4" #uses SRCCLKREQ4
# RP9, uses CLK SRC 4
register "PcieRpClkSrcNumber[8]" = "4"
register "PcieRpEnable[13]" = "1"
register "PcieRpClkReqSupport[13]" = "1"
register "PcieRpClkReqNumber[13]" = "5" #uses SRCCLKREQ5
# RP14, uses CLK SRC 5
register "PcieRpClkSrcNumber[13]" = "5"
register "PcieRpEnable[16]" = "1"
register "PcieRpClkReqSupport[16]" = "1"
register "PcieRpClkReqNumber[16]" = "7" #uses SRCCLKREQ7
# RP17, uses CLK SRC 7
register "PcieRpClkSrcNumber[16]" = "7"
register "SerialIoDevMode" = "{ register "SerialIoDevMode" = "{
[PchSerialIoIndexI2C0] = PchSerialIoPci, [PchSerialIoIndexI2C0] = PchSerialIoPci,
[PchSerialIoIndexI2C1] = PchSerialIoPci, [PchSerialIoIndexI2C1] = PchSerialIoPci,
@@ -111,6 +74,42 @@ chip soc/intel/skylake
}" }"
end end
device ref i2c4 off end device ref i2c4 off end
device ref pcie_rp6 on
register "PcieRpEnable[5]" = "1"
register "PcieRpClkReqSupport[5]" = "1"
register "PcieRpClkReqNumber[5]" = "1"
register "PcieRpClkSrcNumber[5]" = "1"
end
device ref pcie_rp7 on
register "PcieRpEnable[6]" = "1"
register "PcieRpClkReqSupport[6]" = "1"
register "PcieRpClkReqNumber[6]" = "2"
register "PcieRpClkSrcNumber[6]" = "2"
end
device ref pcie_rp8 on
register "PcieRpEnable[7]" = "1"
register "PcieRpClkReqSupport[7]" = "1"
register "PcieRpClkReqNumber[7]" = "3"
register "PcieRpClkSrcNumber[7]" = "3"
end
device ref pcie_rp9 on
register "PcieRpEnable[8]" = "1"
register "PcieRpClkReqSupport[8]" = "1"
register "PcieRpClkReqNumber[8]" = "4"
register "PcieRpClkSrcNumber[8]" = "4"
end
device ref pcie_rp14 on
register "PcieRpEnable[13]" = "1"
register "PcieRpClkReqSupport[13]" = "1"
register "PcieRpClkReqNumber[13]" = "5"
register "PcieRpClkSrcNumber[13]" = "5"
end
device ref pcie_rp17 on
register "PcieRpEnable[16]" = "1"
register "PcieRpClkReqSupport[16]" = "1"
register "PcieRpClkReqNumber[16]" = "7"
register "PcieRpClkSrcNumber[16]" = "7"
end
device ref emmc off end device ref emmc off end
device ref sdxc off end device ref sdxc off end
device ref hda on end device ref hda on end

View File

@@ -33,44 +33,6 @@ chip soc/intel/skylake
.voltage_limit = 1520 .voltage_limit = 1520
}" }"
# Enable Root ports.
# PCIE Port 1 x4 -> SLOT1
register "PcieRpEnable[0]" = "1"
register "PcieRpClkReqSupport[0]" = "1"
register "PcieRpClkReqNumber[0]" = "2"
# RP1, uses CLK SRC 2
register "PcieRpClkSrcNumber[0]" = "2"
# PCIE Port 5 x1 -> SLOT2/LAN
register "PcieRpEnable[4]" = "1"
register "PcieRpClkReqSupport[4]" = "1"
register "PcieRpClkReqNumber[4]" = "3"
# RP5, uses CLK SRC 3
register "PcieRpClkSrcNumber[4]" = "3"
# PCIE Port 6 x1 -> SLOT3
register "PcieRpEnable[5]" = "1"
register "PcieRpClkReqSupport[5]" = "1"
register "PcieRpClkReqNumber[5]" = "1"
# RP6, uses CLK SRC 1
register "PcieRpClkSrcNumber[5]" = "1"
# PCIE Port 7 Disabled
# PCIE Port 8 Disabled
# PCIE Port 9 x1 -> WLAN
register "PcieRpEnable[8]" = "1"
register "PcieRpClkReqSupport[8]" = "1"
register "PcieRpClkReqNumber[8]" = "5"
# RP9, uses CLK SRC 5
register "PcieRpClkSrcNumber[8]" = "5"
# PCIE Port 10 x1 -> WiGig
register "PcieRpEnable[9]" = "1"
register "PcieRpClkReqSupport[9]" = "1"
register "PcieRpClkReqNumber[9]" = "4"
# RP10, uses CLK SRC 4
register "PcieRpClkSrcNumber[9]" = "4"
# Must leave UART0 enabled or SD/eMMC will not work as PCI # Must leave UART0 enabled or SD/eMMC will not work as PCI
register "SerialIoDevMode" = "{ register "SerialIoDevMode" = "{
[PchSerialIoIndexI2C0] = PchSerialIoPci, [PchSerialIoIndexI2C0] = PchSerialIoPci,
@@ -113,11 +75,41 @@ chip soc/intel/skylake
end end
device ref imgu on end device ref imgu on end
device ref cio on end device ref cio on end
device ref pcie_rp1 on end # x4 SLOT1 device ref pcie_rp1 on
device ref pcie_rp5 on end # x1 SLOT2/LAN # PCIE x4 -> SLOT1
device ref pcie_rp6 on end # x1 SLOT3 register "PcieRpEnable[0]" = "1"
device ref pcie_rp9 on end # x1 WLAN register "PcieRpClkReqSupport[0]" = "1"
device ref pcie_rp10 on end # x1 WIGIG register "PcieRpClkReqNumber[0]" = "2"
register "PcieRpClkSrcNumber[0]" = "2"
end
device ref pcie_rp5 on
# PCIE x1 -> SLOT2/LAN
register "PcieRpEnable[4]" = "1"
register "PcieRpClkReqSupport[4]" = "1"
register "PcieRpClkReqNumber[4]" = "3"
register "PcieRpClkSrcNumber[4]" = "3"
end
device ref pcie_rp6 on
# PCIE x1 -> SLOT3
register "PcieRpEnable[5]" = "1"
register "PcieRpClkReqSupport[5]" = "1"
register "PcieRpClkReqNumber[5]" = "1"
register "PcieRpClkSrcNumber[5]" = "1"
end
device ref pcie_rp9 on
# PCIE x1 -> WLAN
register "PcieRpEnable[8]" = "1"
register "PcieRpClkReqSupport[8]" = "1"
register "PcieRpClkReqNumber[8]" = "5"
register "PcieRpClkSrcNumber[8]" = "5"
end
device ref pcie_rp10 on
# PCIE x1 -> WiGig
register "PcieRpEnable[9]" = "1"
register "PcieRpClkReqSupport[9]" = "1"
register "PcieRpClkReqNumber[9]" = "4"
register "PcieRpClkSrcNumber[9]" = "4"
end
device ref lpc_espi on device ref lpc_espi on
# EC host command ranges are in 0x800-0x8ff & 0x200-0x20f # EC host command ranges are in 0x800-0x8ff & 0x200-0x20f
register "gen2_dec" = "0x000c0201" register "gen2_dec" = "0x000c0201"

View File

@@ -72,39 +72,6 @@ chip soc/intel/skylake
.voltage_limit = 0 .voltage_limit = 0
}" }"
# Enable Root ports.
register "PcieRpEnable[2]" = "1"
register "PcieRpEnable[3]" = "1"
register "PcieRpEnable[4]" = "1"
register "PcieRpEnable[5]" = "1"
register "PcieRpEnable[8]" = "1"
# Enable CLKREQ#
register "PcieRpClkReqSupport[2]" = "1"
register "PcieRpClkReqSupport[3]" = "1"
register "PcieRpClkReqSupport[4]" = "1"
register "PcieRpClkReqSupport[5]" = "1"
register "PcieRpClkReqSupport[8]" = "1"
# RP 3 uses SRCCLKREQ5#
register "PcieRpClkReqNumber[2]" = "5"
register "PcieRpClkReqNumber[3]" = "2"
register "PcieRpClkReqNumber[4]" = "3"
register "PcieRpClkReqNumber[5]" = "4"
register "PcieRpClkReqNumber[8]" = "1"
# RP 3 uses CLK SRC 5#
register "PcieRpClkSrcNumber[2]" = "5"
# RP 4 uses CLK SRC 2#
register "PcieRpClkSrcNumber[3]" = "2"
# RP 5 uses CLK SRC 3#
register "PcieRpClkSrcNumber[4]" = "3"
# RP 6 uses CLK SRC 4#
register "PcieRpClkSrcNumber[5]" = "4"
# RP 9 uses CLK SRC 1#
register "PcieRpClkSrcNumber[8]" = "1"
register "SerialIoDevMode" = "{ register "SerialIoDevMode" = "{
[PchSerialIoIndexI2C0] = PchSerialIoPci, [PchSerialIoIndexI2C0] = PchSerialIoPci,
[PchSerialIoIndexI2C1] = PchSerialIoPci, [PchSerialIoIndexI2C1] = PchSerialIoPci,
@@ -156,10 +123,36 @@ chip soc/intel/skylake
[2] = 1, [2] = 1,
}" }"
end end
device ref pcie_rp3 on end device ref pcie_rp3 on
device ref pcie_rp4 on end register "PcieRpEnable[2]" = "1"
device ref pcie_rp5 on end register "PcieRpClkReqSupport[2]" = "1"
device ref pcie_rp6 on end register "PcieRpClkReqNumber[2]" = "5"
register "PcieRpClkSrcNumber[2]" = "5"
end
device ref pcie_rp4 on
register "PcieRpEnable[3]" = "1"
register "PcieRpClkReqSupport[3]" = "1"
register "PcieRpClkReqNumber[3]" = "2"
register "PcieRpClkSrcNumber[3]" = "2"
end
device ref pcie_rp5 on
register "PcieRpEnable[4]" = "1"
register "PcieRpClkReqSupport[4]" = "1"
register "PcieRpClkReqNumber[4]" = "3"
register "PcieRpClkSrcNumber[4]" = "3"
end
device ref pcie_rp6 on
register "PcieRpEnable[5]" = "1"
register "PcieRpClkReqSupport[5]" = "1"
register "PcieRpClkReqNumber[5]" = "4"
register "PcieRpClkSrcNumber[5]" = "4"
end
device ref pcie_rp9 on
register "PcieRpEnable[8]" = "1"
register "PcieRpClkReqSupport[8]" = "1"
register "PcieRpClkReqNumber[8]" = "1"
register "PcieRpClkSrcNumber[8]" = "1"
end
device ref lpc_espi on device ref lpc_espi on
# EC host command ranges are in 0x800-0x8ff & 0x200-0x20f # EC host command ranges are in 0x800-0x8ff & 0x200-0x20f
register "gen2_dec" = "0x000c0201" register "gen2_dec" = "0x000c0201"

View File

@@ -75,24 +75,6 @@ chip soc/intel/skylake
.voltage_limit = 0 .voltage_limit = 0
}" }"
# Enable Root port.
register "PcieRpEnable[3]" = "1"
register "PcieRpEnable[4]" = "1"
register "PcieRpEnable[8]" = "1"
register "PcieRpEnable[16]" = "1"
# Enable CLKREQ#
register "PcieRpClkReqSupport[3]" = "1"
register "PcieRpClkReqSupport[4]" = "1"
register "PcieRpClkReqSupport[8]" = "1"
register "PcieRpClkReqSupport[16]" = "1"
# SRCCLKREQ#
register "PcieRpClkReqNumber[3]" = "2"
register "PcieRpClkReqNumber[4]" = "1"
register "PcieRpClkReqNumber[8]" = "6"
register "PcieRpClkReqNumber[16]" = "7"
# Must leave UART0 enabled or SD/eMMC will not work as PCI # Must leave UART0 enabled or SD/eMMC will not work as PCI
register "SerialIoDevMode" = "{ register "SerialIoDevMode" = "{
[PchSerialIoIndexI2C0] = PchSerialIoPci, [PchSerialIoIndexI2C0] = PchSerialIoPci,
@@ -165,8 +147,26 @@ chip soc/intel/skylake
device ref i2c4 off end device ref i2c4 off end
device ref pcie_rp1 off end device ref pcie_rp1 off end
device ref pcie_rp3 on end device ref pcie_rp3 on end
device ref pcie_rp4 on end device ref pcie_rp4 on
device ref pcie_rp5 on end register "PcieRpEnable[3]" = "1"
register "PcieRpClkReqSupport[3]" = "1"
register "PcieRpClkReqNumber[3]" = "2"
end
device ref pcie_rp5 on
register "PcieRpEnable[4]" = "1"
register "PcieRpClkReqSupport[4]" = "1"
register "PcieRpClkReqNumber[4]" = "1"
end
device ref pcie_rp9 on
register "PcieRpEnable[8]" = "1"
register "PcieRpClkReqSupport[8]" = "1"
register "PcieRpClkReqNumber[8]" = "6"
end
device ref pcie_rp17 on
register "PcieRpEnable[16]" = "1"
register "PcieRpClkReqSupport[16]" = "1"
register "PcieRpClkReqNumber[16]" = "7"
end
device ref emmc off end device ref emmc off end
device ref sdxc off end device ref sdxc off end
device ref lpc_espi on device ref lpc_espi on

View File

@@ -103,17 +103,6 @@ chip soc/intel/skylake
.voltage_limit = 1520, .voltage_limit = 1520,
}" }"
# Enable Root port 1 and 5.
register "PcieRpEnable[0]" = "1"
register "PcieRpEnable[4]" = "1"
# Enable CLKREQ#
register "PcieRpClkReqSupport[0]" = "1"
register "PcieRpClkReqSupport[4]" = "1"
# RP 1 uses SRCCLKREQ1# while RP 5 uses SRCCLKREQ2#
register "PcieRpClkReqNumber[0]" = "1"
register "PcieRpClkReqNumber[4]" = "2"
register "i2c_voltage[4]" = "I2C_VOLTAGE_1V8" # I2C4 is 1.8V register "i2c_voltage[4]" = "I2C_VOLTAGE_1V8" # I2C4 is 1.8V
# Must leave UART0 enabled or SD/eMMC will not work as PCI # Must leave UART0 enabled or SD/eMMC will not work as PCI
@@ -221,12 +210,19 @@ chip soc/intel/skylake
end end
end end
device ref pcie_rp1 on device ref pcie_rp1 on
register "PcieRpEnable[0]" = "1"
register "PcieRpClkReqSupport[0]" = "1"
register "PcieRpClkReqNumber[0]" = "1"
chip drivers/wifi/generic chip drivers/wifi/generic
register "wake" = "GPE0_DW0_16" register "wake" = "GPE0_DW0_16"
device pci 00.0 on end device pci 00.0 on end
end end
end end
device ref pcie_rp5 on end device ref pcie_rp5 on
register "PcieRpEnable[4]" = "1"
register "PcieRpClkReqSupport[4]" = "1"
register "PcieRpClkReqNumber[4]" = "2"
end
device ref uart0 on end device ref uart0 on end
device ref emmc on end device ref emmc on end
device ref sdxc on end device ref sdxc on end

View File

@@ -98,28 +98,6 @@ chip soc/intel/skylake
.voltage_limit = 1520, .voltage_limit = 1520,
}" }"
# Enable x1 slot
register "PcieRpEnable[7]" = "1"
register "PcieRpClkReqSupport[7]" = "1"
register "PcieRpClkReqNumber[7]" = "3" #uses SRCCLKREQ3
# Enable x4 slot
register "PcieRpEnable[8]" = "1"
register "PcieRpClkReqSupport[8]" = "1"
register "PcieRpClkReqNumber[8]" = "4" #uses SRCCLKREQ4
# Enable Root port 6 and 13.
register "PcieRpEnable[5]" = "1"
register "PcieRpEnable[12]" = "1"
# Enable CLKREQ#
register "PcieRpClkReqSupport[5]" = "1"
register "PcieRpClkReqSupport[12]" = "1"
# RP 6 uses SRCCLKREQ1# while RP `3 uses SRCCLKREQ2#
register "PcieRpClkReqNumber[5]" = "0"
register "PcieRpClkReqNumber[12]" = "1"
register "i2c_voltage[4]" = "I2C_VOLTAGE_1V8" # I2C4 is 1.8V register "i2c_voltage[4]" = "I2C_VOLTAGE_1V8" # I2C4 is 1.8V
# Must leave UART0 enabled or SD/eMMC will not work as PCI # Must leave UART0 enabled or SD/eMMC will not work as PCI
@@ -207,6 +185,28 @@ chip soc/intel/skylake
device ref i2c5 on end device ref i2c5 on end
device ref i2c4 on end device ref i2c4 on end
device ref pcie_rp1 on end device ref pcie_rp1 on end
device ref pcie_rp6 on
register "PcieRpEnable[5]" = "1"
register "PcieRpClkReqSupport[5]" = "1"
register "PcieRpClkReqNumber[5]" = "0"
end
device ref pcie_rp8 on
# x1
register "PcieRpEnable[7]" = "1"
register "PcieRpClkReqSupport[7]" = "1"
register "PcieRpClkReqNumber[7]" = "3"
end
device ref pcie_rp9 on
# x4
register "PcieRpEnable[8]" = "1"
register "PcieRpClkReqSupport[8]" = "1"
register "PcieRpClkReqNumber[8]" = "4"
end
device ref pcie_rp13 on
register "PcieRpEnable[12]" = "1"
register "PcieRpClkReqSupport[12]" = "1"
register "PcieRpClkReqNumber[12]" = "1"
end
device ref uart0 on end device ref uart0 on end
device ref uart1 on end device ref uart1 on end
device ref gspi0 on end device ref gspi0 on end

View File

@@ -1,13 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
chip soc/intel/skylake chip soc/intel/skylake
# Enable Root port 1..4 (COMe 4..7), 12 (COMe 3)
register "PcieRpEnable[ 0]" = "1"
register "PcieRpEnable[ 1]" = "1"
register "PcieRpEnable[ 2]" = "1"
register "PcieRpEnable[ 3]" = "1"
register "PcieRpEnable[11]" = "1"
device domain 0 on device domain 0 on
device ref south_xhci on device ref south_xhci on
register "usb2_ports" = "{ register "usb2_ports" = "{
@@ -27,11 +20,26 @@ chip soc/intel/skylake
device ref sata on device ref sata on
register "SataPortsEnable[3]" = "1" register "SataPortsEnable[3]" = "1"
end end
device ref pcie_rp1 on end device ref pcie_rp1 on
device ref pcie_rp2 on end # COMe 4
device ref pcie_rp3 on end register "PcieRpEnable[0]" = "1"
device ref pcie_rp4 on end end
device ref pcie_rp12 on end device ref pcie_rp2 on
# COMe 5
register "PcieRpEnable[1]" = "1"
end
device ref pcie_rp3 on
# COMe 6
register "PcieRpEnable[2]" = "1"
end
device ref pcie_rp4 on
# COMe 7
register "PcieRpEnable[3]" = "1"
end
device ref pcie_rp12 on
# COMe 3
register "PcieRpEnable[11]" = "1"
end
device ref smbus on device ref smbus on
chip drivers/i2c/nct7802y chip drivers/i2c/nct7802y
register "peci[0]" = "{ PECI_DOMAIN_0, 100 }" register "peci[0]" = "{ PECI_DOMAIN_0, 100 }"

View File

@@ -97,21 +97,7 @@ chip soc/intel/skylake
.voltage_limit = 1520, .voltage_limit = 1520,
}" }"
register "PcieRpEnable[2]" = "1"
register "PcieRpEnable[3]" = "1"
register "PcieRpEnable[4]" = "1"
register "PcieRpEnable[8]" = "1"
register "PcieRpEnable[9]" = "1"
register "PcieRpEnable[10]" = "1"
register "PcieRpEnable[11]" = "1"
register "PcieRpClkSrcNumber[0]" = "0" register "PcieRpClkSrcNumber[0]" = "0"
register "PcieRpClkSrcNumber[3]" = "1"
register "PcieRpClkSrcNumber[4]" = "2"
register "PcieRpClkSrcNumber[8]" = "3"
register "PcieRpClkSrcNumber[9]" = "3"
register "PcieRpClkSrcNumber[10]" = "3"
register "PcieRpClkSrcNumber[11]" = "3"
# PL2 override 25W # PL2 override 25W
register "power_limits_config" = "{ register "power_limits_config" = "{
@@ -154,19 +140,38 @@ chip soc/intel/skylake
}" }"
register "SataSpeedLimit" = "2" register "SataSpeedLimit" = "2"
end end
device ref pcie_rp3 on end device ref pcie_rp3 on
register "PcieRpEnable[2]" = "1"
end
device ref pcie_rp4 on
register "PcieRpEnable[3]" = "1"
register "PcieRpClkSrcNumber[3]" = "1"
end
device ref pcie_rp5 on device ref pcie_rp5 on
register "PcieRpEnable[4]" = "1"
register "PcieRpClkSrcNumber[4]" = "2"
smbios_slot_desc "SlotTypePciExpressMini52pinWithoutBSKO" smbios_slot_desc "SlotTypePciExpressMini52pinWithoutBSKO"
"SlotLengthOther" "MPCIE_WIFI1" "SlotDataBusWidth1X" "SlotLengthOther" "MPCIE_WIFI1" "SlotDataBusWidth1X"
end end
device ref pcie_rp6 on end device ref pcie_rp6 on end
device ref pcie_rp9 on device ref pcie_rp9 on
register "PcieRpEnable[8]" = "1"
register "PcieRpClkSrcNumber[8]" = "3"
smbios_slot_desc "SlotTypeM2Socket3" "SlotLengthOther" smbios_slot_desc "SlotTypeM2Socket3" "SlotLengthOther"
"SSD_M.2 2242/2280" "SlotDataBusWidth4X" "SSD_M.2 2242/2280" "SlotDataBusWidth4X"
end end
device ref pcie_rp10 on end device ref pcie_rp10 on
device ref pcie_rp11 on end register "PcieRpEnable[9]" = "1"
device ref pcie_rp12 on end register "PcieRpClkSrcNumber[9]" = "3"
end
device ref pcie_rp11 on
register "PcieRpEnable[10]" = "1"
register "PcieRpClkSrcNumber[10]" = "3"
end
device ref pcie_rp12 on
register "PcieRpEnable[11]" = "1"
register "PcieRpClkSrcNumber[11]" = "3"
end
device ref lpc_espi on device ref lpc_espi on
register "serirq_mode" = "SERIRQ_CONTINUOUS" register "serirq_mode" = "SERIRQ_CONTINUOUS"

View File

@@ -98,48 +98,6 @@ chip soc/intel/skylake
# Send an extra VR mailbox command for the PS4 exit issue # Send an extra VR mailbox command for the PS4 exit issue
register "SendVrMbxCmd" = "2" register "SendVrMbxCmd" = "2"
# Enable Root ports. 1-6 for LAN and Root Port 9
register "PcieRpEnable[0]" = "1"
register "PcieRpEnable[1]" = "1"
register "PcieRpEnable[2]" = "1"
register "PcieRpEnable[3]" = "1"
register "PcieRpEnable[4]" = "1"
register "PcieRpEnable[5]" = "1"
register "PcieRpEnable[8]" = "1" # mPCIe WiFi
# Enable Advanced Error Reporting for RP 1-6, 9
register "PcieRpAdvancedErrorReporting[0]" = "1"
register "PcieRpAdvancedErrorReporting[1]" = "1"
register "PcieRpAdvancedErrorReporting[2]" = "1"
register "PcieRpAdvancedErrorReporting[3]" = "1"
register "PcieRpAdvancedErrorReporting[4]" = "1"
register "PcieRpAdvancedErrorReporting[5]" = "1"
register "PcieRpAdvancedErrorReporting[8]" = "1"
# Enable Latency Tolerance Reporting Mechanism RP 1-6, 9
register "PcieRpLtrEnable[0]" = "1"
register "PcieRpLtrEnable[1]" = "1"
register "PcieRpLtrEnable[2]" = "1"
register "PcieRpLtrEnable[3]" = "1"
register "PcieRpLtrEnable[4]" = "1"
register "PcieRpLtrEnable[5]" = "1"
register "PcieRpLtrEnable[8]" = "1"
# Enable RP 9 CLKREQ# support
register "PcieRpClkReqSupport[8]" = "1"
# RP 9 uses CLKREQ0#
register "PcieRpClkReqNumber[8]" = "0"
# Clocks 0-5 for RP 1-6
register "PcieRpClkSrcNumber[0]" = "0"
register "PcieRpClkSrcNumber[1]" = "1"
register "PcieRpClkSrcNumber[2]" = "2"
register "PcieRpClkSrcNumber[3]" = "3"
register "PcieRpClkSrcNumber[4]" = "4"
register "PcieRpClkSrcNumber[5]" = "5"
# RP 9 shares CLKSRC5# with RP 6
register "PcieRpClkSrcNumber[8]" = "5"
register "SerialIoDevMode" = "{ register "SerialIoDevMode" = "{
[PchSerialIoIndexI2C0] = PchSerialIoDisabled, [PchSerialIoIndexI2C0] = PchSerialIoDisabled,
[PchSerialIoIndexI2C1] = PchSerialIoDisabled, [PchSerialIoIndexI2C1] = PchSerialIoDisabled,
@@ -182,14 +140,56 @@ chip soc/intel/skylake
[1] = 1, [1] = 1,
}" }"
end end
device ref pcie_rp1 on end device ref pcie_rp1 on
device ref pcie_rp2 on end # LAN
device ref pcie_rp3 on end register "PcieRpEnable[0]" = "1"
device ref pcie_rp4 on end register "PcieRpAdvancedErrorReporting[0]" = "1"
device ref pcie_rp5 on end register "PcieRpLtrEnable[0]" = "1"
device ref pcie_rp6 on end register "PcieRpClkSrcNumber[0]" = "0"
end
device ref pcie_rp2 on
# LAN
register "PcieRpEnable[1]" = "1"
register "PcieRpAdvancedErrorReporting[1]" = "1"
register "PcieRpLtrEnable[1]" = "1"
register "PcieRpClkSrcNumber[1]" = "1"
end
device ref pcie_rp3 on
# LAN
register "PcieRpEnable[2]" = "1"
register "PcieRpAdvancedErrorReporting[2]" = "1"
register "PcieRpLtrEnable[2]" = "1"
register "PcieRpClkSrcNumber[2]" = "2"
end
device ref pcie_rp4 on
# LAN
register "PcieRpEnable[3]" = "1"
register "PcieRpAdvancedErrorReporting[3]" = "1"
register "PcieRpLtrEnable[3]" = "1"
register "PcieRpClkSrcNumber[3]" = "3"
end
device ref pcie_rp5 on
# LAN
register "PcieRpEnable[4]" = "1"
register "PcieRpAdvancedErrorReporting[4]" = "1"
register "PcieRpLtrEnable[4]" = "1"
register "PcieRpClkSrcNumber[4]" = "4"
end
device ref pcie_rp6 on
# LAN
register "PcieRpEnable[5]" = "1"
register "PcieRpAdvancedErrorReporting[5]" = "1"
register "PcieRpLtrEnable[5]" = "1"
register "PcieRpClkSrcNumber[5]" = "5"
end
device ref pcie_rp9 on device ref pcie_rp9 on
# WIFI # mPCIe WIFI
register "PcieRpEnable[8]" = "1"
register "PcieRpAdvancedErrorReporting[8]" = "1"
register "PcieRpLtrEnable[8]" = "1"
register "PcieRpClkSrcNumber[8]" = "5"
register "PcieRpClkReqSupport[8]" = "1"
register "PcieRpClkReqNumber[8]" = "0"
smbios_slot_desc smbios_slot_desc
"SlotTypePciExpressMini52pinWithoutBSKO" "SlotTypePciExpressMini52pinWithoutBSKO"
"SlotLengthShort" "WIFI1" "SlotDataBusWidth1X" "SlotLengthShort" "WIFI1" "SlotDataBusWidth1X"

View File

@@ -123,10 +123,6 @@ chip soc/intel/skylake
.dc_loadline = 420, .dc_loadline = 420,
}" }"
# Enable Root Ports 5 and 9
register "PcieRpEnable[4]" = "1"
register "PcieRpEnable[8]" = "1"
# PL2 override 25W # PL2 override 25W
register "power_limits_config" = "{ register "power_limits_config" = "{
.tdp_pl2_override = 25, .tdp_pl2_override = 25,
@@ -147,8 +143,12 @@ chip soc/intel/skylake
[2] = 1, [2] = 1,
}" }"
end end
device ref pcie_rp5 on end device ref pcie_rp5 on
device ref pcie_rp9 on end register "PcieRpEnable[4]" = "1"
end
device ref pcie_rp9 on
register "PcieRpEnable[8]" = "1"
end
device ref lpc_espi on device ref lpc_espi on
# EC/KBC requires continuous mode # EC/KBC requires continuous mode
register "serirq_mode" = "SERIRQ_CONTINUOUS" register "serirq_mode" = "SERIRQ_CONTINUOUS"

View File

@@ -1,10 +1,5 @@
chip soc/intel/skylake chip soc/intel/skylake
# Disable CLKREQ# for RP9
register "PcieRpClkReqSupport[8]" = "0"
# SRCCLKREQ2# for NVMe per schematic
register "PcieRpClkReqNumber[8]" = "2"
device domain 0 on device domain 0 on
device ref south_xhci on device ref south_xhci on
register "usb2_ports" = "{ register "usb2_ports" = "{
@@ -28,5 +23,9 @@ chip soc/intel/skylake
}" }"
end end
device ref pcie_rp5 on end device ref pcie_rp5 on end
device ref pcie_rp9 on
register "PcieRpClkReqSupport[8]" = "0"
register "PcieRpClkReqNumber[8]" = "2"
end
end end
end end

View File

@@ -102,17 +102,6 @@ chip soc/intel/skylake
.dc_loadline = 310, .dc_loadline = 310,
}" }"
# Enable Root Ports 3, 5 and 9
register "PcieRpEnable[2]" = "1"
register "PcieRpEnable[4]" = "1"
register "PcieRpEnable[8]" = "1"
register "PcieRpLtrEnable[2]" = "1"
register "PcieRpLtrEnable[4]" = "1"
register "PcieRpLtrEnable[8]" = "1"
register "PcieRpHotPlug[4]" = "1"
# PL1 override 25W # PL1 override 25W
# PL2 override 44W # PL2 override 44W
register "power_limits_config" = "{ register "power_limits_config" = "{
@@ -167,8 +156,19 @@ chip soc/intel/skylake
device ref heci1 on end device ref heci1 on end
device ref uart2 on end device ref uart2 on end
device ref pcie_rp1 on end device ref pcie_rp1 on end
device ref pcie_rp5 on end device ref pcie_rp3 on
device ref pcie_rp9 on end register "PcieRpEnable[2]" = "1"
register "PcieRpLtrEnable[2]" = "1"
end
device ref pcie_rp5 on
register "PcieRpEnable[4]" = "1"
register "PcieRpLtrEnable[4]" = "1"
register "PcieRpHotPlug[4]" = "1"
end
device ref pcie_rp9 on
register "PcieRpEnable[8]" = "1"
register "PcieRpLtrEnable[8]" = "1"
end
device ref lpc_espi on device ref lpc_espi on
register "serirq_mode" = "SERIRQ_CONTINUOUS" register "serirq_mode" = "SERIRQ_CONTINUOUS"