From 6b75ee2220d66815f7f4f2ce32f04b74ded9685f Mon Sep 17 00:00:00 2001 From: Marshall Dawson Date: Tue, 25 Jul 2017 11:12:15 -0600 Subject: [PATCH] google/kahlee: Update PCIe link/lane configuration Enable: GPP0 x1 - WLan GPP1 x1 - Card Reader Change-Id: Idbfc2a3260b85949810bdd8dc904e59f8a779e48 Signed-off-by: Marc Jones Reviewed-on: https://review.coreboot.org/19838 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- .../google/kahlee/bootblock/OemCustomize.c | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/mainboard/google/kahlee/bootblock/OemCustomize.c b/src/mainboard/google/kahlee/bootblock/OemCustomize.c index 6d55a07ac0..0aead6c67e 100644 --- a/src/mainboard/google/kahlee/bootblock/OemCustomize.c +++ b/src/mainboard/google/kahlee/bootblock/OemCustomize.c @@ -19,60 +19,60 @@ #define FILECODE PROC_GNB_PCIE_FAMILY_0X15_F15PCIECOMPLEXCONFIG_FILECODE static const PCIe_PORT_DESCRIPTOR PortList[] = { - /* Init port descriptor (PCIe port, Lanes 7:4, D2F1) for x4 slot */ + /* Initialize Port descriptor (PCIe port, Lanes 7:4, D2F1) for NC*/ { 0, - PCIE_ENGINE_DATA_INITIALIZER(PciePortEngine, 4, 7), - PCIE_PORT_DATA_INITIALIZER_V2(PortEnabled, ChannelTypeExt6db, + PCIE_ENGINE_DATA_INITIALIZER(PcieUnusedEngine, 4, 7), + PCIE_PORT_DATA_INITIALIZER_V2(PortDisabled, ChannelTypeExt6db, 2, 1, HotplugDisabled, PcieGenMaxSupported, PcieGenMaxSupported, AspmL0sL1, 0x04, 0) }, - /* Initialize Port descriptor (PCIe port, Lanes 1:0, D2F2) for M.2 */ + /* Initialize Port descriptor (PCIe port, Lanes 0:0, D2F2) for WLAN */ { 0, - PCIE_ENGINE_DATA_INITIALIZER(PciePortEngine, 0, 1), + PCIE_ENGINE_DATA_INITIALIZER(PciePortEngine, 0, 0), PCIE_PORT_DATA_INITIALIZER_V2(PortEnabled, ChannelTypeExt6db, 2, 2, HotplugDisabled, PcieGenMaxSupported, PcieGenMaxSupported, - AspmL0sL1, 0x17, 0) + AspmL0sL1, 0x2, 0) }, - /* Disable M.2 x1 on lane 1, D2F3 */ + /* Init Port descriptor (PCIe port, Lanes 1:1, D2F3) for Card Reader */ { 0, - PCIE_ENGINE_DATA_INITIALIZER(PcieUnusedEngine, 1, 1), - PCIE_PORT_DATA_INITIALIZER_V2(PortDisabled, ChannelTypeExt6db, + PCIE_ENGINE_DATA_INITIALIZER(PciePortEngine, 1, 1), + PCIE_PORT_DATA_INITIALIZER_V2(PortEnabled, ChannelTypeExt6db, 2, 3, HotplugDisabled, PcieGenMaxSupported, PcieGenMaxSupported, - AspmL0sL1, 0x17, 0) + AspmL0sL1, 0x3, 0) }, - /* Initialize Port descriptor (PCIe port, Lane 2, D2F4) for x1 slot */ + /* Initialize Port descriptor (PCIe port, Lane 2, D2F4) for NC */ { 0, - PCIE_ENGINE_DATA_INITIALIZER(PciePortEngine, 2, 2), - PCIE_PORT_DATA_INITIALIZER_V2(PortEnabled, ChannelTypeExt6db, + PCIE_ENGINE_DATA_INITIALIZER(PcieUnusedEngine, 2, 2), + PCIE_PORT_DATA_INITIALIZER_V2(PortDisabled, ChannelTypeExt6db, 2, 4, HotplugDisabled, PcieGenMaxSupported, PcieGenMaxSupported, - AspmL0sL1, 0x13, 0) + AspmL0sL1, 0, 0) }, - /* Initialize Port descriptor (PCIe port, Lane3, D2F5) for SD */ + /* Initialize Port descriptor (PCIe port, Lane3, D2F5) for NC */ { DESCRIPTOR_TERMINATE_LIST, - PCIE_ENGINE_DATA_INITIALIZER(PciePortEngine, 3, 3), - PCIE_PORT_DATA_INITIALIZER_V2(PortEnabled, ChannelTypeExt6db, + PCIE_ENGINE_DATA_INITIALIZER(PcieUnusedEngine, 3, 3), + PCIE_PORT_DATA_INITIALIZER_V2(PortDisabled, ChannelTypeExt6db, 2, 5, HotplugDisabled, PcieGenMaxSupported, PcieGenMaxSupported, - AspmL0sL1, 0x16, 0) + AspmL0sL1, 0, 0) }, };