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

mb/starlabs/starbook: Add NVMe/WiFi power sequencing

Browse source 
Provide staged GPIO pad configuration for the M.2 NVMe SSD and the
(discrete) M.2 2230 wireless module on supported StarBook variants.

Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Change-Id: I6b3b607e73a2b1c437349f31cc6faaf662365da7
Reviewed-on: https://review.coreboot.org/c/coreboot/+/90993
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
This commit is contained in:
Sean Rhodes 2026-01-29 12:06:46 +00:00
commit 49a5b949ca
7 changed files with 253 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/mainboard/starlabs/starbook/Kconfig
View file

@ -16,6 +16,7 @@ config BOARD_STARLABS_STARBOOK_SERIES
select NO_UART_ON_SUPERIO
select SPD_READ_BY_WORD
select SOC_INTEL_COMMON_BLOCK_HDA_VERB
select STARLABS_NVME_POWER_SEQUENCE
select SYSTEM_TYPE_LAPTOP
select VALIDATE_INTEL_DESCRIPTOR

9
src/mainboard/starlabs/starbook/mainboard.c
View file

@ -1,12 +1,13 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <bootstate.h>
#include <device/device.h>
#include <drivers/intel/gma/opregion.h>
#include <soc/ramstage.h>
#include <option.h>
#include <variants.h>
static void init_mainboard(void *chip_info)
static void starlabs_configure_gpios(void *unused)
{
const struct pad_config *pads;
size_t num;
@ -15,9 +16,9 @@ static void init_mainboard(void *chip_info)
gpio_configure_pads(pads, num);
}
struct chip_operations mainboard_ops = {
.init = init_mainboard,
};
BOOT_STATE_INIT_ENTRY(BS_PRE_DEVICE, BS_ON_ENTRY, starlabs_configure_gpios, NULL);
struct chip_operations mainboard_ops = {};
const char *mainboard_vbt_filename(void)
{

58
src/mainboard/starlabs/starbook/variants/adl/gpio.c
View file

@ -1,13 +1,57 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <variants.h>
#include <common/nvme_seq.h>
#if ENV_RAMSTAGE
/* clang-format off */
static const struct pad_config nvme_pads[] = {
PAD_CFG_GPO(GPP_D16, 1, DEEP), /* Enable */
PAD_CFG_NF(GPP_D6, NONE, DEEP, NF1), /* Clock Request 1 */
PAD_CFG_GPO(GPP_H0, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_E3, 1, DEEP), /* WiFi RF Kill */
PAD_CFG_NF(GPP_D7, NONE, DEEP, NF1), /* Clock Request 2 */
PAD_CFG_GPO(GPP_H2, 0, PLTRST), /* Reset asserted */
};
static const struct pad_config post_nvme_pads[] = {
PAD_CFG_GPO(GPP_H0, 1, PLTRST), /* Reset deasserted */
PAD_CFG_GPO(GPP_H2, 1, PLTRST), /* Reset deasserted */
};
/* clang-format on */
const struct pad_config *variant_nvme_power_sequence_pads(size_t *num)
{
*num = ARRAY_SIZE(nvme_pads);
return nvme_pads;
}
const struct pad_config *variant_nvme_power_sequence_post_pads(size_t *num)
{
*num = ARRAY_SIZE(post_nvme_pads);
return post_nvme_pads;
}
#endif
/* Early pad configuration in bootblock */
/* clang-format off */
const struct pad_config early_gpio_table[] = {
/* Debug Connector */
PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2), /* RXD */
PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2), /* TXD */
/* SSD */
PAD_CFG_GPI(GPP_D6, NONE, DEEP), /* Clock Request 1 */
PAD_CFG_GPO(GPP_H0, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_D16, 0, DEEP), /* Enable (PWREN off) */
/* Wireless */
PAD_CFG_GPI(GPP_D7, NONE, DEEP), /* Clock Request 2 */
PAD_CFG_GPO(GPP_H2, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_E3, 0, DEEP), /* WiFi disabled */
};
/* clang-format on */
const struct pad_config *variant_early_gpio_table(size_t *num)
{
@ -16,6 +60,7 @@ const struct pad_config *variant_early_gpio_table(size_t *num)
}
/* Pad configuration in ramstage. */
/* clang-format off */
const struct pad_config gpio_table[] = {
/* General Purpose I/O Deep */
PAD_CFG_NF(GPD0, NONE, DEEP, NF1), /* Battery Low */
@ -40,16 +85,16 @@ const struct pad_config gpio_table[] = {
PAD_CFG_GPI_APIC_LOW(GPP_E12, NONE, PLTRST), /* Interrupt */
/* SSD */
PAD_CFG_NF(GPP_D6, NONE, DEEP, NF1), /* Clock Request 1 */
PAD_CFG_GPO(GPP_H0, 1, PLTRST), /* Reset */
PAD_CFG_GPO(GPP_D16, 1, DEEP), /* Enable */
PAD_NC(GPP_D6, NONE), /* Clock Request 1 */
PAD_CFG_GPO(GPP_H0, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_D16, 0, DEEP), /* Enable (PWREN off) */
PAD_CFG_NF(GPP_H13, NONE, DEEP, NF5), /* Device Sleep */
PAD_CFG_NF(GPP_A12, NONE, DEEP, NF1), /* PEDET */
/* Wireless */
PAD_CFG_NF(GPP_D7, NONE, DEEP, NF1), /* Clock Request 2 */
PAD_CFG_GPO(GPP_H2, 1, PLTRST), /* Reset */
PAD_CFG_GPO(GPP_E3, 1, DEEP), /* WiFi RF Kill */
PAD_NC(GPP_D7, NONE), /* Clock Request 2 */
PAD_CFG_GPO(GPP_H2, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_E3, 0, DEEP), /* WiFi disabled */
PAD_CFG_GPO(GPP_A13, 1, DEEP), /* Bluetooth RF Kill */
/* Display */
@ -261,6 +306,7 @@ const struct pad_config gpio_table[] = {
PAD_NC(GPP_R6, NONE),
PAD_NC(GPP_R7, NONE),
};
/* clang-format on */
const struct pad_config *variant_gpio_table(size_t *num)
{

58
src/mainboard/starlabs/starbook/variants/adl_n/gpio.c
View file

@ -1,13 +1,57 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <variants.h>
#include <common/nvme_seq.h>
#if ENV_RAMSTAGE
/* clang-format off */
static const struct pad_config nvme_pads[] = {
PAD_CFG_GPO(GPP_D16, 1, DEEP), /* Enable */
PAD_CFG_NF(GPP_D5, NONE, DEEP, NF1), /* Clock Request 0 */
PAD_CFG_GPO(GPP_H0, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_E3, 1, DEEP), /* WiFi RF Kill */
PAD_CFG_NF(GPP_D6, NONE, DEEP, NF1), /* Clock Request 1 */
PAD_CFG_GPO(GPP_H2, 0, PLTRST), /* Reset asserted */
};
static const struct pad_config post_nvme_pads[] = {
PAD_CFG_GPO(GPP_H0, 1, PLTRST), /* Reset deasserted */
PAD_CFG_GPO(GPP_H2, 1, PLTRST), /* Reset deasserted */
};
/* clang-format on */
const struct pad_config *variant_nvme_power_sequence_pads(size_t *num)
{
*num = ARRAY_SIZE(nvme_pads);
return nvme_pads;
}
const struct pad_config *variant_nvme_power_sequence_post_pads(size_t *num)
{
*num = ARRAY_SIZE(post_nvme_pads);
return post_nvme_pads;
}
#endif
/* Early pad configuration in bootblock */
/* clang-format off */
const struct pad_config early_gpio_table[] = {
/* Debug Connector */
PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2), /* RXD */
PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2), /* TXD */
/* SSD */
PAD_CFG_GPI(GPP_D5, NONE, DEEP), /* Clock Request 0 */
PAD_CFG_GPO(GPP_H0, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_D16, 0, DEEP), /* Enable (PWREN off) */
/* Wireless */
PAD_CFG_GPI(GPP_D6, NONE, DEEP), /* Clock Request 1 */
PAD_CFG_GPO(GPP_H2, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_E3, 0, DEEP), /* WiFi disabled */
};
/* clang-format on */
const struct pad_config *variant_early_gpio_table(size_t *num)
{
@ -16,6 +60,7 @@ const struct pad_config *variant_early_gpio_table(size_t *num)
}
/* Pad configuration in ramstage. */
/* clang-format off */
const struct pad_config gpio_table[] = {
/* General Purpose I/O Deep */
PAD_CFG_NF(GPD0, NONE, DEEP, NF1), /* Battery Low */
@ -40,14 +85,14 @@ const struct pad_config gpio_table[] = {
PAD_CFG_GPI_APIC_LOW(GPP_E12, NONE, PLTRST), /* Interrupt */
/* SSD */
PAD_CFG_NF(GPP_D5, NONE, DEEP, NF1), /* Clock Request 0 */
PAD_CFG_GPO(GPP_H0, 1, PLTRST), /* Reset */
PAD_CFG_GPO(GPP_D16, 1, DEEP), /* Enable */
PAD_NC(GPP_D5, NONE), /* Clock Request 0 */
PAD_CFG_GPO(GPP_H0, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_D16, 0, DEEP), /* Enable (PWREN off) */
/* Wireless */
PAD_CFG_NF(GPP_D6, NONE, DEEP, NF1), /* Clock Request 1 */
PAD_CFG_GPO(GPP_H2, 1, PLTRST), /* Reset */
PAD_CFG_GPO(GPP_E3, 1, DEEP), /* WiFi RF Kill */
PAD_NC(GPP_D6, NONE), /* Clock Request 1 */
PAD_CFG_GPO(GPP_H2, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_E3, 0, DEEP), /* WiFi disabled */
PAD_CFG_GPO(GPP_A13, 1, DEEP), /* Bluetooth RF Kill */
/* Display */
@ -258,6 +303,7 @@ const struct pad_config gpio_table[] = {
PAD_NC(GPP_R6, NONE),
PAD_NC(GPP_R7, NONE),
};
/* clang-format on */
const struct pad_config *variant_gpio_table(size_t *num)
{

58
src/mainboard/starlabs/starbook/variants/mtl/gpio.c
View file

@ -1,8 +1,41 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <variants.h>
#include <common/nvme_seq.h>
#if ENV_RAMSTAGE
/* clang-format off */
static const struct pad_config nvme_pads[] = {
PAD_CFG_GPO(GPP_H07, 1, DEEP), /* Enable */
PAD_CFG_NF_IOSTANDBY_IGNORE(GPP_D20, NONE, PLTRST, NF1), /* Clock Request 8 */
PAD_CFG_GPO(GPP_A20, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_B19, 1, DEEP), /* WiFi RF Kill */
PAD_CFG_NF_IOSTANDBY_IGNORE(GPP_D21, NONE, PLTRST, NF2), /* Clock Request 5 */
PAD_CFG_GPO(GPP_H02, 0, PLTRST), /* Reset asserted */
};
static const struct pad_config post_nvme_pads[] = {
PAD_CFG_GPO(GPP_A20, 1, PLTRST), /* Reset deasserted */
PAD_CFG_GPO(GPP_H02, 1, PLTRST), /* Reset deasserted */
};
/* clang-format on */
const struct pad_config *variant_nvme_power_sequence_pads(size_t *num)
{
*num = ARRAY_SIZE(nvme_pads);
return nvme_pads;
}
const struct pad_config *variant_nvme_power_sequence_post_pads(size_t *num)
{
*num = ARRAY_SIZE(post_nvme_pads);
return post_nvme_pads;
}
#endif
/* Early pad configuration in bootblock */
/* clang-format off */
const struct pad_config early_gpio_table[] = {
/* Debug Connector */
PAD_CFG_NF(GPP_H08, NONE, DEEP, NF1), /* RXD */
@ -11,7 +44,18 @@ const struct pad_config early_gpio_table[] = {
/* SMBus */
PAD_CFG_NF(GPP_C00, NONE, DEEP, NF1), /* Clock */
PAD_CFG_NF(GPP_C01, NONE, DEEP, NF1), /* Data */
/* SSD */
PAD_CFG_GPI(GPP_D20, NONE, PLTRST), /* Clock Request 8 */
PAD_CFG_GPO(GPP_A20, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_H07, 0, DEEP), /* Enable (PWREN off) */
/* Wireless */
PAD_CFG_GPI(GPP_D21, NONE, PLTRST), /* Clock Request 5 */
PAD_CFG_GPO(GPP_H02, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_B19, 0, DEEP), /* WiFi disabled */
};
/* clang-format on */
const struct pad_config *variant_early_gpio_table(size_t *num)
{
@ -20,6 +64,7 @@ const struct pad_config *variant_early_gpio_table(size_t *num)
}
/* Pad configuration in ramstage. */
/* clang-format off */
const struct pad_config gpio_table[] = {
/* General Purpose I/O Deep */
PAD_CFG_NF_IOSTANDBY_IGNORE(GPP_V00, NONE, DEEP, NF1), /* Battery Low */
@ -44,14 +89,14 @@ const struct pad_config gpio_table[] = {
PAD_CFG_GPI_APIC(GPP_B00, NONE, DEEP, LEVEL, INVERT), /* Interrupt */
/* SSD */
PAD_CFG_NF_IOSTANDBY_IGNORE(GPP_D20, NONE, PLTRST, NF1), /* Clock Request 8 */
PAD_CFG_GPO(GPP_A20, 1, PLTRST), /* Reset */
PAD_CFG_GPO(GPP_H07, 1, DEEP), /* Enable */
PAD_NC(GPP_D20, NONE), /* Clock Request 8 */
PAD_CFG_GPO(GPP_A20, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_H07, 0, DEEP), /* Enable (PWREN off) */
/* Wireless */
PAD_CFG_NF_IOSTANDBY_IGNORE(GPP_D21, NONE, PLTRST, NF2), /* Clock Request 5 */
PAD_CFG_GPO(GPP_H02, 1, PLTRST), /* Reset */
PAD_CFG_GPO(GPP_B19, 1, DEEP), /* WiFi RF Kill */
PAD_NC(GPP_D21, NONE), /* Clock Request 5 */
PAD_CFG_GPO(GPP_H02, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_B19, 0, DEEP), /* WiFi disabled */
PAD_CFG_GPO(GPP_B18, 1, DEEP), /* Bluetooth RF Kill */
/* Display */
@ -246,6 +291,7 @@ const struct pad_config gpio_table[] = {
PAD_NC(GPP_D22, NONE),
PAD_NC(GPP_D23, NONE),
};
/* clang-format on */
const struct pad_config *variant_gpio_table(size_t *num)
{

58
src/mainboard/starlabs/starbook/variants/rpl/gpio.c
View file

@ -1,13 +1,57 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <variants.h>
#include <common/nvme_seq.h>
#if ENV_RAMSTAGE
/* clang-format off */
static const struct pad_config nvme_pads[] = {
PAD_CFG_GPO(GPP_D14, 1, DEEP), /* Enable */
PAD_CFG_NF(GPP_H19, NONE, DEEP, NF1), /* Clock Request 4 */
PAD_CFG_GPO(GPP_F20, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_E3, 1, DEEP), /* WiFi RF Kill */
PAD_CFG_NF(GPP_D7, NONE, DEEP, NF1), /* Clock Request 2 */
PAD_CFG_GPO(GPP_H2, 0, PLTRST), /* Reset asserted */
};
static const struct pad_config post_nvme_pads[] = {
PAD_CFG_GPO(GPP_F20, 1, PLTRST), /* Reset deasserted */
PAD_CFG_GPO(GPP_H2, 1, PLTRST), /* Reset deasserted */
};
/* clang-format on */
const struct pad_config *variant_nvme_power_sequence_pads(size_t *num)
{
*num = ARRAY_SIZE(nvme_pads);
return nvme_pads;
}
const struct pad_config *variant_nvme_power_sequence_post_pads(size_t *num)
{
*num = ARRAY_SIZE(post_nvme_pads);
return post_nvme_pads;
}
#endif
/* Early pad configuration in bootblock */
/* clang-format off */
const struct pad_config early_gpio_table[] = {
/* Debug Connector */
PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2), /* RXD */
PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2), /* TXD */
/* SSD */
PAD_CFG_GPI(GPP_H19, NONE, DEEP), /* Clock Request 4 */
PAD_CFG_GPO(GPP_F20, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_D14, 0, DEEP), /* Enable (PWREN off) */
/* Wireless */
PAD_CFG_GPI(GPP_D7, NONE, DEEP), /* Clock Request 2 */
PAD_CFG_GPO(GPP_H2, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_E3, 0, DEEP), /* WiFi disabled */
};
/* clang-format on */
const struct pad_config *variant_early_gpio_table(size_t *num)
{
@ -16,6 +60,7 @@ const struct pad_config *variant_early_gpio_table(size_t *num)
}
/* Pad configuration in ramstage. */
/* clang-format off */
const struct pad_config gpio_table[] = {
/* General Purpose I/O Deep */
PAD_CFG_NF(GPD0, NONE, DEEP, NF1), /* Battery Low */
@ -40,14 +85,14 @@ const struct pad_config gpio_table[] = {
PAD_CFG_GPI_APIC_LOW(GPP_E12, NONE, PLTRST), /* Interrupt */
/* SSD */
PAD_CFG_NF(GPP_H19, NONE, DEEP, NF1), /* Clock Request 4 */
PAD_CFG_GPO(GPP_F20, 1, PLTRST), /* Reset */
PAD_CFG_GPO(GPP_D14, 1, DEEP), /* Enable */
PAD_NC(GPP_H19, NONE), /* Clock Request 4 */
PAD_CFG_GPO(GPP_F20, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_D14, 0, DEEP), /* Enable (PWREN off) */
/* Wireless */
PAD_CFG_NF(GPP_D7, NONE, DEEP, NF1), /* Clock Request 2 */
PAD_CFG_GPO(GPP_H2, 1, PLTRST), /* Reset */
PAD_CFG_GPO(GPP_E3, 1, DEEP), /* WiFi RF Kill */
PAD_NC(GPP_D7, NONE), /* Clock Request 2 */
PAD_CFG_GPO(GPP_H2, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_E3, 0, DEEP), /* WiFi disabled */
PAD_CFG_GPO(GPP_A13, 1, DEEP), /* Bluetooth RF Kill */
/* Display */
@ -260,6 +305,7 @@ const struct pad_config gpio_table[] = {
PAD_NC(GPP_R6, NONE),
PAD_NC(GPP_R7, NONE),
};
/* clang-format on */
const struct pad_config *variant_gpio_table(size_t *num)
{

42
src/mainboard/starlabs/starbook/variants/tgl/gpio.c
View file

@ -1,13 +1,47 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <variants.h>
#include <common/nvme_seq.h>
#if ENV_RAMSTAGE
/* clang-format off */
static const struct pad_config nvme_pads[] = {
PAD_CFG_GPO(GPP_D16, 1, PLTRST), /* Enable */
PAD_CFG_NF(GPP_D8, NONE, DEEP, NF1), /* Clock Request 3 */
PAD_CFG_GPO(GPP_A11, 0, PLTRST), /* Reset asserted */
};
static const struct pad_config post_nvme_pads[] = {
PAD_CFG_GPO(GPP_A11, 1, PLTRST), /* Reset deasserted */
};
/* clang-format on */
const struct pad_config *variant_nvme_power_sequence_pads(size_t *num)
{
*num = ARRAY_SIZE(nvme_pads);
return nvme_pads;
}
const struct pad_config *variant_nvme_power_sequence_post_pads(size_t *num)
{
*num = ARRAY_SIZE(post_nvme_pads);
return post_nvme_pads;
}
#endif
/* Early pad configuration in bootblock */
/* clang-format off */
const struct pad_config early_gpio_table[] = {
/* Debug Connector */
PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1), /* RXD */
PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1), /* TXD */
/* SSD */
PAD_CFG_GPI(GPP_D8, NONE, DEEP), /* Clock Request 3 */
PAD_CFG_GPO(GPP_A11, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_D16, 0, PLTRST), /* Enable (PWREN off) */
};
/* clang-format on */
const struct pad_config *variant_early_gpio_table(size_t *num)
{
@ -16,6 +50,7 @@ const struct pad_config *variant_early_gpio_table(size_t *num)
}
/* Pad configuration in ramstage. */
/* clang-format off */
const struct pad_config gpio_table[] = {
/* General Purpose I/O Deep */
PAD_CFG_NF(GPD0, NONE, DEEP, NF1), /* Battery Low */
@ -40,9 +75,9 @@ const struct pad_config gpio_table[] = {
PAD_CFG_GPI_APIC(GPP_C8, NONE, DEEP, LEVEL, INVERT), /* Interrupt */
/* SSD */
PAD_CFG_NF(GPP_D8, NONE, DEEP, NF1), /* Clock Request 3 */
PAD_CFG_GPO(GPP_A11, 1, PLTRST), /* Reset */
PAD_CFG_GPO(GPP_D16, 1, PLTRST), /* Enable */
PAD_NC(GPP_D8, NONE), /* Clock Request 3 */
PAD_CFG_GPO(GPP_A11, 0, PLTRST), /* Reset asserted */
PAD_CFG_GPO(GPP_D16, 0, PLTRST), /* Enable (PWREN off) */
/* SATA */
PAD_CFG_NF(GPP_A12, UP_20K, DEEP, NF1), /* PEDET */
@ -250,6 +285,7 @@ const struct pad_config gpio_table[] = {
PAD_NC(GPP_U4, NONE),
PAD_NC(GPP_U5, NONE),
};
/* clang-format on */
const struct pad_config *variant_gpio_table(size_t *num)
{