From e4ff2b75fa54e12a3c5a5cc26bf7ddcba49c1698 Mon Sep 17 00:00:00 2001 From: Marshall Dawson Date: Tue, 18 Jul 2017 15:37:36 -0600 Subject: [PATCH] amd/gardenia: Correct PCIe port settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix the OEM settings for two ports. Fix and clarify comments to reflect Rev. B of the board design. Change-Id: I2812ea5945f67229872e78041c771606047bbbec Signed-off-by: Marshall Dawson Reviewed-on: https://review.coreboot.org/20744 Reviewed-by: Kyösti Mälkki Tested-by: build bot (Jenkins) --- src/mainboard/amd/gardenia/OemCustomize.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mainboard/amd/gardenia/OemCustomize.c b/src/mainboard/amd/gardenia/OemCustomize.c index 47e332ebcf..3a34761e50 100644 --- a/src/mainboard/amd/gardenia/OemCustomize.c +++ b/src/mainboard/amd/gardenia/OemCustomize.c @@ -17,11 +17,13 @@ #include #define FILECODE PROC_GNB_PCIE_FAMILY_0X15_F15PCIECOMPLEXCONFIG_FILECODE + +/* Port descriptor list for Gardenia Rev. B */ static const PCIe_PORT_DESCRIPTOR PortList[] = { /* Init port descriptor (PCIe port, Lanes 7:4, D2F1) for x4 slot */ { 0, - PCIE_ENGINE_DATA_INITIALIZER(PcieUnusedEngine, 4, 7), + PCIE_ENGINE_DATA_INITIALIZER(PciePortEngine, 4, 7), PCIE_PORT_DATA_INITIALIZER_V2(PortEnabled, ChannelTypeExt6db, 2, 1, HotplugDisabled, @@ -32,14 +34,15 @@ static const PCIe_PORT_DESCRIPTOR PortList[] = { /* Initialize Port descriptor (PCIe port, Lanes 1:0, D2F2) for M.2 */ { 0, - PCIE_ENGINE_DATA_INITIALIZER(PcieUnusedEngine, 0, 1), - PCIE_PORT_DATA_INITIALIZER_V2(PortDisabled, ChannelTypeExt6db, + PCIE_ENGINE_DATA_INITIALIZER(PciePortEngine, 0, 1), + PCIE_PORT_DATA_INITIALIZER_V2(PortEnabled, ChannelTypeExt6db, 2, 2, HotplugDisabled, PcieGenMaxSupported, PcieGenMaxSupported, AspmL0sL1, 0x17, 0) }, + /* Disable M.2 x1 on lane 1, D2F3 */ { 0, PCIE_ENGINE_DATA_INITIALIZER(PcieUnusedEngine, 1, 1), @@ -72,7 +75,6 @@ static const PCIe_PORT_DESCRIPTOR PortList[] = { PcieGenMaxSupported, AspmL0sL1, 0x16, 0) }, - /* Initialize Port descriptor (PCIe port, Lane 1, D2F3) for M.2 */ }; static const PCIe_DDI_DESCRIPTOR DdiList[] = {