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

mb/starlabs/*: Separate WiFi and Bluetooth controls

Browse source 
Split the "wireless" option into "WiFi" and "Bluetooth" in CFR
to allow more granular control.

Test=Disable WiFi and Bluetooth in turn and make sure the devices
are disabled independently.

Change-Id: I3f617486c78a89a60a1e8c7c8ab7d157dc20bf2e
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/89797
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Sean Rhodes 2025-10-28 20:03:01 +00:00
commit 082ad480d9
21 changed files with 73 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/mainboard/starlabs/byte_adl/cfr.c
View file

@ -40,8 +40,9 @@ static struct sm_obj_form power = {
static struct sm_obj_form devices = {
.ui_name = "Devices",
.obj_list = (const struct sm_object *[]) {
&bluetooth,
&gna,
&wireless,
&wifi,
NULL
},
};

11
src/mainboard/starlabs/byte_adl/variants/mk_ii/devtree.c
View file

@ -21,7 +21,7 @@ void devtree_update(void)
struct soc_power_limits_config *soc_conf_8core =
&cfg->power_limits_config[ADL_N_041_15W_CORE];
struct device *nic_dev = pcidev_on_root(0x14, 3);
struct device *wifi_dev = pcidev_on_root(0x14, 3);
struct device *gna_dev = pcidev_on_root(0x08, 0);
uint8_t performance_scale = 100;
@ -55,11 +55,14 @@ void devtree_update(void)
soc_conf_8core->tdp_pl1_override = (soc_conf_8core->tdp_pl1_override * performance_scale) / 100;
soc_conf_8core->tdp_pl2_override = (soc_conf_8core->tdp_pl2_override * performance_scale) / 100;
/* Enable/Disable WiFi based on CMOS settings */
if (get_uint_option("wifi", 1) == 0)
wifi_dev->enabled = 0;
/* Enable/Disable Bluetooth based on CMOS settings */
if (get_uint_option("wireless", 1) == 0) {
if (get_uint_option("bluetooth", 1) == 0)
cfg->usb2_ports[9].enable = 0;
nic_dev->enabled = 0;
}
/* Enable/Disable GNA based on CMOS settings */
if (get_uint_option("gna", 0) == 0)

15
src/mainboard/starlabs/common/include/common/cfr.h
View file

@ -15,6 +15,13 @@ static const struct sm_object accelerometer = SM_DECLARE_BOOL({
.default_value = true,
});
static const struct sm_object bluetooth = SM_DECLARE_BOOL({
.opt_name = "bluetooth",
.ui_name = "Bluetooth",
.ui_helptext = "Enable or disable the built-in Bluetooth",
.default_value = true,
});
static const struct sm_object bluetooth_rtd3 = SM_DECLARE_BOOL({
.opt_name = "bluetooth_rtd3",
.ui_name = "Bluetooth Runtime-D3",
@ -146,10 +153,10 @@ static const struct sm_object webcam = SM_DECLARE_BOOL({
.default_value = true,
});
static const struct sm_object wireless = SM_DECLARE_BOOL({
.opt_name = "wireless",
.ui_name = "Wireless",
.ui_helptext = "Enable or disable the built-in wireless card",
static const struct sm_object wifi = SM_DECLARE_BOOL({
.opt_name = "wifi",
.ui_name = "WiFi",
.ui_helptext = "Enable or disable the built-in WiFi",
.default_value = true,
});

3
src/mainboard/starlabs/lite/cfr.c
View file

@ -45,10 +45,11 @@ static struct sm_obj_form keyboard = {
static struct sm_obj_form devices = {
.ui_name = "Devices",
.obj_list = (const struct sm_object *[]) {
&bluetooth,
&card_reader,
&microphone,
&webcam,
&wireless,
&wifi,
NULL
},
};

9
src/mainboard/starlabs/lite/devtree.c
View file

@ -23,7 +23,7 @@ void devtree_update(void)
struct soc_power_limits_config *soc_conf =
&cfg->power_limits_config;
struct device *nic_dev = pcidev_on_root(0x0c, 0);
struct device *wifi_dev = pcidev_on_root(0x0c, 0);
uint8_t performance_scale = 100;
@ -52,9 +52,10 @@ void devtree_update(void)
soc_conf->tdp_pl1_override = (soc_conf->tdp_pl1_override * performance_scale) / 100;
soc_conf->tdp_pl2_override = (soc_conf->tdp_pl2_override * performance_scale) / 100;
/* Enable/Disable Wireless based on CMOS settings */
if (get_uint_option("wireless", 1) == 0)
nic_dev->enabled = 0;
/* Enable/Disable WiFi based on CMOS settings */
if (get_uint_option("wifi", 1) == 0)
wifi_dev->enabled = 0;
/* Enable/Disable Webcam based on CMOS settings */
cfg->usb2_port[CONFIG_WEBCAM_USB_PORT].enable = get_uint_option("webcam", 1);

3
src/mainboard/starlabs/starbook/cfr.c
View file

@ -55,6 +55,7 @@ static struct sm_obj_form keyboard = {
static struct sm_obj_form devices = {
.ui_name = "Devices",
.obj_list = (const struct sm_object *[]) {
&bluetooth,
&card_reader,
#if CONFIG(BOARD_USES_FIXED_MODE_VBT)
&display_native_res,
@ -76,7 +77,7 @@ static struct sm_obj_form devices = {
&vpu,
#endif
&webcam,
&wireless,
&wifi,
NULL
},
};

2
src/mainboard/starlabs/starbook/variants/adl/devtree.c
View file

@ -57,7 +57,7 @@ void devtree_update(void)
soc_conf_12core->tdp_pl2_override = (soc_conf_12core->tdp_pl2_override * performance_scale) / 100;
/* Enable/Disable Bluetooth based on CMOS settings */
if (get_uint_option("wireless", 1) == 0)
if (get_uint_option("bluetooth", 1) == 0)
cfg->usb2_ports[9].enable = 0;
/* Enable/Disable Webcam based on CMOS settings */

4
src/mainboard/starlabs/starbook/variants/adl/romstage.c
View file

@ -32,8 +32,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
const uint8_t vtd = get_uint_option("vtd", 1);
mupd->FspmConfig.VtdDisable = !vtd;
/* Enable/Disable Wireless (RP05) based on CMOS settings */
if (get_uint_option("wireless", 1) == 0)
/* Enable/Disable WiFi (RP05) based on CMOS settings */
if (get_uint_option("wifi", 1) == 0)
mupd->FspmConfig.PcieRpEnableMask &= ~(1 << 4);
mupd->FspmConfig.DmiMaxLinkSpeed = 4;

2
src/mainboard/starlabs/starbook/variants/adl_n/devtree.c
View file

@ -49,7 +49,7 @@ void devtree_update(void)
soc_conf_4core->tdp_pl2_override = (soc_conf_4core->tdp_pl2_override * performance_scale) / 100;
/* Enable/Disable Bluetooth based on CMOS settings */
if (get_uint_option("wireless", 1) == 0)
if (get_uint_option("bluetooth", 1) == 0)
cfg->usb2_ports[9].enable = 0;
/* Enable/Disable Webcam based on CMOS settings */

4
src/mainboard/starlabs/starbook/variants/adl_n/romstage.c
View file

@ -29,7 +29,7 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
const uint8_t vtd = get_uint_option("vtd", 1);
mupd->FspmConfig.VtdDisable = !vtd;
/* Enable/Disable Wireless (RP07) based on CMOS settings */
if (get_uint_option("wireless", 1) == 0)
/* Enable/Disable WiFi (RP07) based on CMOS settings */
if (get_uint_option("wifi", 1) == 0)
mupd->FspmConfig.PcieRpEnableMask &= ~(1 << 6);
};

12
src/mainboard/starlabs/starbook/variants/cml/devtree.c
View file

@ -18,7 +18,7 @@ void devtree_update(void)
struct soc_power_limits_config *soc_conf = &cfg->power_limits_config;
struct device *nic_dev = pcidev_on_root(0x14, 3);
struct device *wifi_dev = pcidev_on_root(0x14, 3);
uint8_t performance_scale = 100;
@ -47,11 +47,13 @@ void devtree_update(void)
soc_conf->tdp_pl1_override = (soc_conf->tdp_pl1_override * performance_scale) / 100;
soc_conf->tdp_pl2_override = (soc_conf->tdp_pl2_override * performance_scale) / 100;
/* Enable/Disable Wireless based on CMOS settings */
if (get_uint_option("wireless", 1) == 0) {
nic_dev->enabled = 0;
/* Enable/Disable WiFi based on CMOS settings */
if (get_uint_option("wifi", 1) == 0)
wifi_dev->enabled = 0;
/* Enable/Disable Bluetooth based on CMOS settings */
if (get_uint_option("bluetooth", 1) == 0)
cfg->usb2_ports[9].enable = 0;
}
/* Enable/Disable Webcam based on CMOS settings */
cfg->usb2_ports[CONFIG_CCD_PORT].enable = get_uint_option("webcam", 1);

12
src/mainboard/starlabs/starbook/variants/kbl/devtree.c
View file

@ -18,7 +18,7 @@ void devtree_update(void)
struct soc_power_limits_config *soc_conf = &cfg->power_limits_config;
struct device *nic_dev = pcidev_on_root(0x1c, 5);
struct device *wifi_dev = pcidev_on_root(0x1c, 5);
uint8_t performance_scale = 100;
@ -47,11 +47,13 @@ void devtree_update(void)
soc_conf->tdp_pl1_override = (soc_conf->tdp_pl1_override * performance_scale) / 100;
soc_conf->tdp_pl2_override = (soc_conf->tdp_pl2_override * performance_scale) / 100;
/* Enable/Disable Wireless based on CMOS settings */
if (get_uint_option("wireless", 1) == 0) {
nic_dev->enabled = 0;
/* Enable/Disable WiFi based on CMOS settings */
if (get_uint_option("wifi", 1) == 0)
wifi_dev->enabled = 0;
/* Enable/Disable Bluetooth based on CMOS settings */
if (get_uint_option("bluetooth", 1) == 0)
cfg->usb2_ports[9].enable = 0;
}
/* Enable/Disable Webcam based on CMOS settings */
cfg->usb2_ports[CONFIG_CCD_PORT].enable = get_uint_option("webcam", 1);

2
src/mainboard/starlabs/starbook/variants/mtl/devtree.c
View file

@ -50,7 +50,7 @@ void devtree_update(void)
soc_conf_20core->tdp_pl2_override = (soc_conf_20core->tdp_pl2_override * performance_scale) / 100;
/* Enable/Disable Bluetooth based on CMOS settings */
if (get_uint_option("wireless", 1) == 0)
if (get_uint_option("bluetooth", 1) == 0)
cfg->usb2_ports[9].enable = 0;
/* Enable/Disable Webcam based on CMOS settings */

4
src/mainboard/starlabs/starbook/variants/mtl/romstage.c
View file

@ -32,8 +32,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
const uint8_t vtd = get_uint_option("vtd", 1);
mupd->FspmConfig.VtdDisable = !vtd;
/* Enable/Disable Wireless (RP09) based on CMOS settings */
if (get_uint_option("wireless", 1) == 0)
/* Enable/Disable WiFi (RP09) based on CMOS settings */
if (get_uint_option("wifi", 1) == 0)
mupd->FspmConfig.PcieRpEnableMask &= ~(1 << 8);
mupd->FspmConfig.PchHdaSubSystemIds = 0x70381e50;

2
src/mainboard/starlabs/starbook/variants/rpl/devtree.c
View file

@ -59,7 +59,7 @@ void devtree_update(void)
soc_conf_12core->tdp_pl2_override = (soc_conf_12core->tdp_pl2_override * performance_scale) / 100;
/* Enable/Disable Bluetooth based on CMOS settings */
if (get_uint_option("wireless", 1) == 0)
if (get_uint_option("bluetooth", 1) == 0)
cfg->usb2_ports[9].enable = 0;
/* Enable/Disable Webcam based on CMOS settings */

4
src/mainboard/starlabs/starbook/variants/rpl/romstage.c
View file

@ -32,8 +32,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
const uint8_t vtd = get_uint_option("vtd", 1);
mupd->FspmConfig.VtdDisable = !vtd;
/* Enable/Disable Wireless (RP05) based on CMOS settings */
if (get_uint_option("wireless", 1) == 0)
/* Enable/Disable WiFi (RP05) based on CMOS settings */
if (get_uint_option("wifi", 1) == 0)
mupd->FspmConfig.PcieRpEnableMask &= ~(1 << 4);
/* Enable/Disable Thunderbolt based on CMOS settings */

12
src/mainboard/starlabs/starbook/variants/tgl/devtree.c
View file

@ -22,7 +22,7 @@ void devtree_update(void)
struct soc_power_limits_config *soc_conf_4core =
&cfg->power_limits_config[POWER_LIMITS_U_4_CORE];
struct device *nic_dev = pcidev_on_root(0x14, 3);
struct device *wifi_dev = pcidev_on_root(0x14, 3);
struct device *tbt_pci_dev = pcidev_on_root(0x07, 0);
struct device *tbt_dma_dev = pcidev_on_root(0x0d, 2);
struct device *gna_dev = pcidev_on_root(0x08, 0);
@ -59,11 +59,13 @@ void devtree_update(void)
soc_conf_4core->tdp_pl1_override = (soc_conf_4core->tdp_pl1_override * performance_scale) / 100;
soc_conf_4core->tdp_pl2_override = (soc_conf_4core->tdp_pl2_override * performance_scale) / 100;
/* Enable/Disable Wireless based on CMOS settings */
if (get_uint_option("wireless", 1) == 0) {
nic_dev->enabled = 0;
/* Enable/Disable WiFi based on CMOS settings */
if (get_uint_option("wifi", 1) == 0)
wifi_dev->enabled = 0;
/* Enable/Disable Bluetooth based on CMOS settings */
if (get_uint_option("bluetooth", 1) == 0)
cfg->usb2_ports[9].enable = 0;
}
/* Enable/Disable Webcam based on CMOS settings */
cfg->usb2_ports[CONFIG_CCD_PORT].enable = get_uint_option("webcam", 1);

2
src/mainboard/starlabs/starfighter/variants/rpl/devtree.c
View file

@ -60,7 +60,7 @@ void devtree_update(void)
soc_conf_14core->tdp_pl2_override = (soc_conf_14core->tdp_pl2_override * performance_scale) / 100;
/* Enable/Disable Bluetooth based on CMOS settings */
if (get_uint_option("wireless", 1) == 0)
if (get_uint_option("bluetooth", 1) == 0)
cfg->usb2_ports[9].enable = 0;
/* Enable/Disable Webcam based on CMOS settings */

2
src/mainboard/starlabs/starfighter/variants/rpl/romstage.c
View file

@ -127,7 +127,7 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
mupd->FspmConfig.VtdDisable = !vtd;
/* Enable/Disable Wireless (RP05) based on CMOS settings */
if (get_uint_option("wireless", 1) == 0)
if (get_uint_option("wifi", 1) == 0)
mupd->FspmConfig.PcieRpEnableMask &= ~(1 << 4);
/* Enable/Disable Thunderbolt based on CMOS settings */

3
src/mainboard/starlabs/starlite_adl/cfr.c
View file

@ -57,6 +57,7 @@ static struct sm_obj_form devices = {
.ui_name = "Devices",
.obj_list = (const struct sm_object *[]) {
&accelerometer,
&bluetooth,
&card_reader,
&display_native_res,
#if CONFIG(SOC_INTEL_TIGERLAKE) || CONFIG(SOC_INTEL_ALDERLAKE) || CONFIG(SOC_INTEL_RAPTORLAKE)
@ -68,7 +69,7 @@ static struct sm_obj_form devices = {
&microphone,
&touchscreen,
&webcam,
&wireless,
&wifi,
NULL
},
};

11
src/mainboard/starlabs/starlite_adl/variants/mk_v/devtree.c
View file

@ -19,7 +19,7 @@ void devtree_update(void)
struct soc_power_limits_config *soc_conf_4core =
&cfg->power_limits_config[ADL_N_041_6W_CORE];
struct device *nic_dev = pcidev_on_root(0x14, 3);
struct device *wifi_dev = pcidev_on_root(0x14, 3);
struct device *touchscreen_dev = pcidev_on_root(0x15, 2);
struct device *accelerometer_dev = pcidev_on_root(0x15, 0);
struct device *gna_dev = pcidev_on_root(0x08, 0);
@ -51,11 +51,14 @@ void devtree_update(void)
soc_conf_4core->tdp_pl1_override = (soc_conf_4core->tdp_pl1_override * performance_scale) / 100;
soc_conf_4core->tdp_pl2_override = (soc_conf_4core->tdp_pl2_override * performance_scale) / 100;
/* Enable/Disable WiFi based on CMOS settings */
if (get_uint_option("wifi", 1) == 0)
wifi_dev->enabled = 0;
/* Enable/Disable Bluetooth based on CMOS settings */
if (get_uint_option("wireless", 1) == 0) {
if (get_uint_option("bluetooth", 1) == 0)
cfg->usb2_ports[9].enable = 0;
nic_dev->enabled = 0;
}
/* Enable/Disable Webcam/Camera based on CMOS settings */
if (get_uint_option("webcam", 1) == 0)