GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/zork: remove indirection for dxio lane configuration 

There was a mix of open coding DXIO logical lane numbers and clkreq
pins. And there are separate macros depending on the baseboard
as well as processor type. Remove the indirection and supply the values
directly in the descriptors.

BUG=b:162423378

Change-Id: I779cb0a514e3b668265e6039d6e7e7bd0f3d49ed
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44029
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Aaron Durbin 2020-07-29 13:54:22 -06:00
parent 821b1e2f28
commit 80e2dd8854
3 changed files with 21 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mainboard/google/zork/variants/baseboard/fsps_baseboard_dalboz.c
View File

@ -18,45 +18,45 @@ static const fsp_dxio_descriptor dxio_descriptors[] = {
// NVME SSD // NVME SSD
.port_present = true, .port_present = true,
.engine_type = PCIE_ENGINE, .engine_type = PCIE_ENGINE,
.start_logical_lane = NVME_START_LANE, .start_logical_lane = 4,
.end_logical_lane = NVME_END_LANE, .end_logical_lane = 5,
.device_number = 1, .device_number = 1,
.function_number = 7, .function_number = 7,
.link_aspm = ASPM_L1, .link_aspm = ASPM_L1,
.link_aspm_L1_1 = true, .link_aspm_L1_1 = true,
.link_aspm_L1_2 = true, .link_aspm_L1_2 = true,
.turn_off_unused_lanes = true, .turn_off_unused_lanes = true,
.clk_req = NVME_CLKREQ, .clk_req = CLK_REQ2,
.clk_pm_support = true, .clk_pm_support = true,
}, },
{ {
// WLAN // WLAN
.port_present = true, .port_present = true,
.engine_type = PCIE_ENGINE, .engine_type = PCIE_ENGINE,
.start_logical_lane = WLAN_START_LANE, .start_logical_lane = 0,
.end_logical_lane = WLAN_END_LANE, .end_logical_lane = 0,
.device_number = 1, .device_number = 1,
.function_number = 2, .function_number = 2,
.link_aspm = ASPM_L1, .link_aspm = ASPM_L1,
.link_aspm_L1_1 = true, .link_aspm_L1_1 = true,
.link_aspm_L1_2 = true, .link_aspm_L1_2 = true,
.turn_off_unused_lanes = true, .turn_off_unused_lanes = true,
.clk_req = WLAN_CLKREQ, .clk_req = CLK_REQ0,
.clk_pm_support = true, .clk_pm_support = true,
}, },
{ {
// SD Reader // SD Reader
.port_present = true, .port_present = true,
.engine_type = PCIE_ENGINE, .engine_type = PCIE_ENGINE,
.start_logical_lane = SD_START_LANE, .start_logical_lane = 1,
.end_logical_lane = SD_END_LANE, .end_logical_lane = 1,
.device_number = 1, .device_number = 1,
.function_number = 3, .function_number = 3,
.link_aspm = ASPM_L1, .link_aspm = ASPM_L1,
.link_aspm_L1_1 = true, .link_aspm_L1_1 = true,
.link_aspm_L1_2 = true, .link_aspm_L1_2 = true,
.turn_off_unused_lanes = true, .turn_off_unused_lanes = true,
.clk_req = SD_CLKREQ, .clk_req = CLK_REQ1,
} }
}; };

24
src/mainboard/google/zork/variants/baseboard/fsps_baseboard_trembyle.c
View File

@ -31,7 +31,7 @@ static const fsp_dxio_descriptor pco_dxio_descriptors[] = {
.link_aspm_L1_1 = true, .link_aspm_L1_1 = true,
.link_aspm_L1_2 = true, .link_aspm_L1_2 = true,
.turn_off_unused_lanes = true, .turn_off_unused_lanes = true,
.clk_req = NVME_CLKREQ, .clk_req = CLK_REQ4,
}, },
{ {
// WLAN // WLAN
@ -45,7 +45,7 @@ static const fsp_dxio_descriptor pco_dxio_descriptors[] = {
.link_aspm_L1_1 = true, .link_aspm_L1_1 = true,
.link_aspm_L1_2 = true, .link_aspm_L1_2 = true,
.turn_off_unused_lanes = true, .turn_off_unused_lanes = true,
.clk_req = WLAN_CLKREQ, .clk_req = CLK_REQ0,
.clk_pm_support = true, .clk_pm_support = true,
}, },
{ {
@ -60,7 +60,7 @@ static const fsp_dxio_descriptor pco_dxio_descriptors[] = {
.link_aspm_L1_1 = true, .link_aspm_L1_1 = true,
.link_aspm_L1_2 = true, .link_aspm_L1_2 = true,
.turn_off_unused_lanes = true, .turn_off_unused_lanes = true,
.clk_req = SD_CLKREQ, .clk_req = CLK_REQ1,
} }
}; };
@ -69,45 +69,45 @@ static const fsp_dxio_descriptor dali_dxio_descriptors[] = {
// NVME SSD // NVME SSD
.port_present = true, .port_present = true,
.engine_type = PCIE_ENGINE, .engine_type = PCIE_ENGINE,
.start_logical_lane = NVME_START_LANE, .start_logical_lane = 0,
.end_logical_lane = NVME_END_LANE, .end_logical_lane = 1,
.device_number = 1, .device_number = 1,
.function_number = 7, .function_number = 7,
.link_aspm = ASPM_L1, .link_aspm = ASPM_L1,
.link_aspm_L1_1 = true, .link_aspm_L1_1 = true,
.link_aspm_L1_2 = true, .link_aspm_L1_2 = true,
.turn_off_unused_lanes = true, .turn_off_unused_lanes = true,
.clk_req = NVME_CLKREQ, .clk_req = CLK_REQ4,
.clk_pm_support = true, .clk_pm_support = true,
}, },
{ {
// WLAN // WLAN
.port_present = true, .port_present = true,
.engine_type = PCIE_ENGINE, .engine_type = PCIE_ENGINE,
.start_logical_lane = WLAN_START_LANE, .start_logical_lane = 4,
.end_logical_lane = WLAN_END_LANE, .end_logical_lane = 4,
.device_number = 1, .device_number = 1,
.function_number = 2, .function_number = 2,
.link_aspm = ASPM_L1, .link_aspm = ASPM_L1,
.link_aspm_L1_1 = true, .link_aspm_L1_1 = true,
.link_aspm_L1_2 = true, .link_aspm_L1_2 = true,
.turn_off_unused_lanes = true, .turn_off_unused_lanes = true,
.clk_req = WLAN_CLKREQ, .clk_req = CLK_REQ0,
.clk_pm_support = true, .clk_pm_support = true,
}, },
{ {
// SD Reader // SD Reader
.port_present = true, .port_present = true,
.engine_type = PCIE_ENGINE, .engine_type = PCIE_ENGINE,
.start_logical_lane = SD_START_LANE, .start_logical_lane = 5,
.end_logical_lane = SD_END_LANE, .end_logical_lane = 5,
.device_number = 1, .device_number = 1,
.function_number = 3, .function_number = 3,
.link_aspm = ASPM_L1, .link_aspm = ASPM_L1,
.link_aspm_L1_1 = true, .link_aspm_L1_1 = true,
.link_aspm_L1_2 = true, .link_aspm_L1_2 = true,
.turn_off_unused_lanes = true, .turn_off_unused_lanes = true,
.clk_req = SD_CLKREQ, .clk_req = CLK_REQ1,
} }
}; };

21
src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h
View File

@ -7,31 +7,10 @@
#include <soc/gpio.h> #include <soc/gpio.h>
#include <platform_descriptors.h> #include <platform_descriptors.h>
#define WLAN_CLKREQ CLK_REQ0
#define SD_CLKREQ CLK_REQ1
#if CONFIG(BOARD_GOOGLE_BASEBOARD_DALBOZ)
#define NVME_START_LANE 4
#define NVME_END_LANE 5
#define WLAN_START_LANE 0
#define WLAN_END_LANE 0
#define SD_START_LANE 1
#define SD_END_LANE 1
#else
#define NVME_START_LANE 0
#define NVME_END_LANE 1
#define WLAN_START_LANE 4
#define WLAN_END_LANE 4
#define SD_START_LANE 5
#define SD_END_LANE 5
#endif
#if CONFIG(BOARD_GOOGLE_BASEBOARD_TREMBYLE) #if CONFIG(BOARD_GOOGLE_BASEBOARD_TREMBYLE)
#define EC_IN_RW_OD GPIO_130 #define EC_IN_RW_OD GPIO_130
#define NVME_CLKREQ CLK_REQ4
#else #else
#define EC_IN_RW_OD GPIO_11 #define EC_IN_RW_OD GPIO_11
#define NVME_CLKREQ CLK_REQ2
#endif #endif
/* SPI Write protect */ /* SPI Write protect */