erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mb/google/skyrim: Combine the function port_descriptors for variants

Browse source 
Remove the weak function. Combine all the getting descriptors together.

BUG=b:279144932
TEST=Build

Change-Id: I981e9c52c8e5fa32296e2e43be47411557133691
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83646
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
This commit is contained in:
Zheng Bao 2024-07-25 14:21:23 +08:00 • committed by Felix Held
commit c14cde6576
6 changed files with 45 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/mainboard/google/skyrim/variants/baseboard/include/baseboard/port_descriptors.h
View file

@ -54,4 +54,20 @@
.clk_req = CLK_REQ0, \
}
#define EMMC_DXIO_DESCRIPTOR { \
.engine_type = PCIE_ENGINE, \
.port_present = true, \
.start_logical_lane = 1, \
.end_logical_lane = 1, \
.device_number = PCI_SLOT(SD_DEVFN), \
.function_number = PCI_FUNC(SD_DEVFN), \
.link_speed_capability = GEN3, \
.turn_off_unused_lanes = true, \
.link_aspm = ASPM_L1, \
.link_aspm_L1_1 = true, \
.link_aspm_L1_2 = true, \
.gpio_group_id = GPIO_6, \
.clk_req = CLK_REQ1, \
}
#endif //__BASEBOARD_PORT_DESCRIPTORS_H__

32
src/mainboard/google/skyrim/variants/baseboard/port_descriptors.c
View file

@ -3,6 +3,20 @@
#include <baseboard/variants.h>
#include <baseboard/port_descriptors.h>
#include <soc/platform_descriptors.h>
#include <console/console.h>
enum emmc_dxio_port_id {
EMMC_DXIO_WLAN,
EMMC_DXIO_STORAGE,
};
static fsp_dxio_descriptor emmc_dxio_descriptors[] = {
[EMMC_DXIO_WLAN] = WLAN_DXIO_DESCRIPTOR,
/* This value modified at runtime, default to emmc */
[EMMC_DXIO_STORAGE] = EMMC_DXIO_DESCRIPTOR,
};
#define EMMC_CLKREQ_GPIO 115
enum baseboard_dxio_port_id {
BASEBOARD_DXIO_WLAN,
@ -16,8 +30,20 @@ static fsp_dxio_descriptor skyrim_mdn_dxio_descriptors[] = {
[BASEBOARD_DXIO_STORAGE] = NVME_DXIO_DESCRIPTOR,
};
__weak void variant_get_dxio_descriptors(const fsp_dxio_descriptor **dxio_descriptor, size_t *num)
void variant_get_dxio_descriptors(const fsp_dxio_descriptor **dxio_descriptor, size_t *num)
{
*dxio_descriptor = skyrim_mdn_dxio_descriptors;
*num = ARRAY_SIZE(skyrim_mdn_dxio_descriptors);
if (CONFIG(BOARD_GOOGLE_MARKARTH) || CONFIG(BOARD_GOOGLE_WINTERHOLD)) {
if (gpio_get(EMMC_CLKREQ_GPIO)) {
printk(BIOS_DEBUG, "Enabling NVMe.\n");
emmc_dxio_descriptors[EMMC_DXIO_STORAGE] =
(fsp_dxio_descriptor)NVME_DXIO_DESCRIPTOR;
} else {
printk(BIOS_DEBUG, "Defaulting to eMMC.\n");
}
*dxio_descriptor = emmc_dxio_descriptors;
*num = ARRAY_SIZE(emmc_dxio_descriptors);
} else {
*dxio_descriptor = skyrim_mdn_dxio_descriptors;
*num = ARRAY_SIZE(skyrim_mdn_dxio_descriptors);
}
}

2
src/mainboard/google/skyrim/variants/markarth/Makefile.mk
View file

@ -1,6 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-or-later
subdirs-y += ./memory
romstage-y += port_descriptors.c
ramstage-y += gpio.c
ramstage-y += port_descriptors.c

55
src/mainboard/google/skyrim/variants/markarth/port_descriptors.c
View file

@ -1,55 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <baseboard/variants.h>
#include <baseboard/port_descriptors.h>
#include <console/console.h>
#include <soc/platform_descriptors.h>
enum markarth_dxio_port_id {
MARKARTH_DXIO_WLAN,
MARKARTH_DXIO_STORAGE,
};
#define EMMC_DXIO_DESCRIPTOR { \
.engine_type = PCIE_ENGINE, \
.port_present = true, \
.start_logical_lane = 1, \
.end_logical_lane = 1, \
.device_number = PCI_SLOT(SD_DEVFN), \
.function_number = PCI_FUNC(SD_DEVFN), \
.link_speed_capability = GEN3, \
.turn_off_unused_lanes = true, \
.link_aspm = ASPM_L1, \
.link_aspm_L1_1 = true, \
.link_aspm_L1_2 = true, \
.gpio_group_id = GPIO_6, \
.clk_req = CLK_REQ1, \
}
#define EMMC_CLKREQ_GPIO 115
static fsp_dxio_descriptor markarth_dxio_descriptors[] = {
[MARKARTH_DXIO_WLAN] = WLAN_DXIO_DESCRIPTOR,
/* This value modified at runtime, default to emmc */
[MARKARTH_DXIO_STORAGE] = EMMC_DXIO_DESCRIPTOR,
};
void variant_get_dxio_descriptors(const fsp_dxio_descriptor **dxio_descriptor, size_t *num)
{
/*
* We can determine if a device is populated based on the state of the clkreq
* signal. If the device is present, the clkreq is held low by the device. If
* no device is present, clkreq is pulled high by an external pull-up.
*
* This allows checking the state of the NVMe device clkreq signal and enabling
* either eMMC or NVMe based on that.
*/
if (gpio_get(EMMC_CLKREQ_GPIO)) {
printk(BIOS_DEBUG, "Enabling NVMe.\n");
markarth_dxio_descriptors[MARKARTH_DXIO_STORAGE] = (fsp_dxio_descriptor)NVME_DXIO_DESCRIPTOR;
} else {
printk(BIOS_DEBUG, "Defaulting to eMMC.\n");
}
*dxio_descriptor = markarth_dxio_descriptors;
*num = ARRAY_SIZE(markarth_dxio_descriptors);
}

4
src/mainboard/google/skyrim/variants/winterhold/Makefile.mk
View file

@ -1,8 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-or-later
subdirs-y += ./memory
romstage-y += port_descriptors.c
ramstage-y += gpio.c
ramstage-y += port_descriptors.c

55
src/mainboard/google/skyrim/variants/winterhold/port_descriptors.c
View file

@ -1,55 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <baseboard/variants.h>
#include <baseboard/port_descriptors.h>
#include <console/console.h>
#include <soc/platform_descriptors.h>
enum winterhold_dxio_port_id {
WINTERHOLD_DXIO_WLAN,
WINTERHOLD_DXIO_STORAGE,
};
#define EMMC_DXIO_DESCRIPTOR { \
.engine_type = PCIE_ENGINE, \
.port_present = true, \
.start_logical_lane = 1, \
.end_logical_lane = 1, \
.device_number = PCI_SLOT(SD_DEVFN), \
.function_number = PCI_FUNC(SD_DEVFN), \
.link_speed_capability = GEN3, \
.turn_off_unused_lanes = true, \
.link_aspm = ASPM_L1, \
.link_aspm_L1_1 = true, \
.link_aspm_L1_2 = true, \
.gpio_group_id = GPIO_6, \
.clk_req = CLK_REQ1, \
}
#define EMMC_CLKREQ_GPIO 115
static fsp_dxio_descriptor winterhold_dxio_descriptors[] = {
[WINTERHOLD_DXIO_WLAN] = WLAN_DXIO_DESCRIPTOR,
/* This value modified at runtime, default to emmc */
[WINTERHOLD_DXIO_STORAGE] = EMMC_DXIO_DESCRIPTOR,
};
void variant_get_dxio_descriptors(const fsp_dxio_descriptor **dxio_descriptor, size_t *num)
{
/*
* We can determine if a device is populated based on the state of the clkreq
* signal. If the device is present, the clkreq is held low by the device. If
* no device is present, clkreq is pulled high by an external pull-up.
*
* This allows checking the state of the NVMe device clkreq signal and enabling
* either eMMC or NVMe based on that.
*/
if (gpio_get(EMMC_CLKREQ_GPIO)) {
printk(BIOS_DEBUG, "Enabling NVMe.\n");
winterhold_dxio_descriptors[WINTERHOLD_DXIO_STORAGE] = (fsp_dxio_descriptor)NVME_DXIO_DESCRIPTOR;
} else {
printk(BIOS_DEBUG, "Defaulting to eMMC.\n");
}
*dxio_descriptor = winterhold_dxio_descriptors;
*num = ARRAY_SIZE(winterhold_dxio_descriptors);
}