mb/google/guybrush: Add devfn macros for devices on GPP bridge

Add devfn macros for some peripheral devices that are attached to PCIE
GPP Bridge.

BUG=None
TEST=Build and boot to OS in Guybrush.

Change-Id: I7c5433dff2329f13c282908e2b848405819347ff
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55601
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
This commit is contained in:
Karthikeyan Ramasubramanian 2021-06-16 17:37:38 -06:00 committed by Patrick Georgi
parent 8b60afe1b0
commit f8b237b28d
2 changed files with 20 additions and 12 deletions

View File

@ -1,5 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <baseboard/variants.h>
#include <device/pci_def.h>
#include <soc/platform_descriptors.h> #include <soc/platform_descriptors.h>
#include <soc/gpio.h> #include <soc/gpio.h>
#include <types.h> #include <types.h>
@ -11,8 +13,8 @@ static const fsp_dxio_descriptor guybrush_czn_dxio_descriptors[] = {
.port_present = true, .port_present = true,
.start_logical_lane = 0, .start_logical_lane = 0,
.end_logical_lane = 0, .end_logical_lane = 0,
.device_number = 2, .device_number = PCI_SLOT(WLAN_DEVFN),
.function_number = 1, .function_number = PCI_FUNC(WLAN_DEVFN),
.link_aspm = ASPM_L1, .link_aspm = ASPM_L1,
.turn_off_unused_lanes = true, .turn_off_unused_lanes = true,
.clk_req = CLK_REQ0, .clk_req = CLK_REQ0,
@ -24,8 +26,8 @@ static const fsp_dxio_descriptor guybrush_czn_dxio_descriptors[] = {
.port_present = true, .port_present = true,
.start_logical_lane = 1, .start_logical_lane = 1,
.end_logical_lane = 1, .end_logical_lane = 1,
.device_number = 2, .device_number = PCI_SLOT(SD_DEVFN),
.function_number = 2, .function_number = PCI_FUNC(SD_DEVFN),
.link_aspm = ASPM_L1, .link_aspm = ASPM_L1,
.turn_off_unused_lanes = true, .turn_off_unused_lanes = true,
.clk_req = CLK_REQ1, .clk_req = CLK_REQ1,
@ -37,8 +39,8 @@ static const fsp_dxio_descriptor guybrush_czn_dxio_descriptors[] = {
.port_present = true, .port_present = true,
.start_logical_lane = 2, .start_logical_lane = 2,
.end_logical_lane = 2, .end_logical_lane = 2,
.device_number = 2, .device_number = PCI_SLOT(WWAN_DEVFN),
.function_number = 3, .function_number = PCI_FUNC(WWAN_DEVFN),
.link_aspm = ASPM_L1, .link_aspm = ASPM_L1,
.turn_off_unused_lanes = true, .turn_off_unused_lanes = true,
.clk_req = CLK_REQ2, .clk_req = CLK_REQ2,
@ -50,8 +52,8 @@ static const fsp_dxio_descriptor guybrush_czn_dxio_descriptors[] = {
.port_present = true, .port_present = true,
.start_logical_lane = 4, .start_logical_lane = 4,
.end_logical_lane = 7, .end_logical_lane = 7,
.device_number = 2, .device_number = PCI_SLOT(NVME_DEVFN),
.function_number = 4, .function_number = PCI_FUNC(NVME_DEVFN),
.link_aspm = ASPM_L1, .link_aspm = ASPM_L1,
.turn_off_unused_lanes = true, .turn_off_unused_lanes = true,
.clk_req = CLK_REQ3, .clk_req = CLK_REQ3,
@ -63,8 +65,8 @@ static const fsp_dxio_descriptor guybrush_czn_dxio_descriptors[] = {
.port_present = true, .port_present = true,
.start_logical_lane = 8, .start_logical_lane = 8,
.end_logical_lane = 11, .end_logical_lane = 11,
.device_number = 2, .device_number = PCIE_GPP_BRIDGE_2_DEV,
.function_number = 5, .function_number = PCIE_GPP_2_4_FUNC,
.turn_off_unused_lanes = true, .turn_off_unused_lanes = true,
.clk_req = CLK_REQ5, .clk_req = CLK_REQ5,
.port_params = {PP_PSPP_AC, 0x133, PP_PSPP_DC, 0x122} .port_params = {PP_PSPP_AC, 0x133, PP_PSPP_DC, 0x122}
@ -74,8 +76,8 @@ static const fsp_dxio_descriptor guybrush_czn_dxio_descriptors[] = {
.port_present = true, .port_present = true,
.start_logical_lane = 16, .start_logical_lane = 16,
.end_logical_lane = 23, .end_logical_lane = 23,
.device_number = 1, .device_number = PCIE_GPP_BRIDGE_1_DEV,
.function_number = 1, .function_number = PCIE_GPP_1_0_FUNC,
.turn_off_unused_lanes = true, .turn_off_unused_lanes = true,
.clk_req = CLK_REQ6, .clk_req = CLK_REQ6,
.port_params = {PP_PSPP_AC, 0x133, PP_PSPP_DC, 0x122} .port_params = {PP_PSPP_AC, 0x133, PP_PSPP_DC, 0x122}

View File

@ -4,6 +4,12 @@
#define __BASEBOARD_VARIANTS_H__ #define __BASEBOARD_VARIANTS_H__
#include <amdblocks/gpio_banks.h> #include <amdblocks/gpio_banks.h>
#include <soc/pci_devs.h>
#define WLAN_DEVFN PCIE_GPP_2_0_DEVFN
#define SD_DEVFN PCIE_GPP_2_1_DEVFN
#define WWAN_DEVFN PCIE_GPP_2_2_DEVFN
#define NVME_DEVFN PCIE_GPP_2_3_DEVFN
/* /*
* This function provides base GPIO configuration table. It is typically provided by * This function provides base GPIO configuration table. It is typically provided by