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

mb/starlabs/*: Move CFR object defs to common directory

Browse source 
Move all of the CFR object definitons to the common directory
to reduce duplicated code.

Change-Id: I02d486563a01738335a9f1a20b5fcad2b96d6498
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/89809
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-29 21:17:28 +00:00
commit a58d99575e
9 changed files with 99 additions and 330 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,50 +6,7 @@
#include <ec/starlabs/merlin/cfr.h>
#include <intelblocks/cfr.h>
#include <variants.h>
static const struct sm_object gna = SM_DECLARE_BOOL({
.opt_name = "gna",
.ui_name = "Gaussian & Neural Accelerator",
.ui_helptext = "Enable or Disable the Gaussian & Neural Accelerator",
.default_value = false,
});
static const struct sm_object power_profile = SM_DECLARE_ENUM({
.opt_name = "power_profile",
.ui_name = "Power Profile",
.ui_helptext = "Select whether to maximize performance, battery life or both.",
.default_value = 1,
.values = (const struct sm_enum_value[]) {
{ "Power Saver", PP_POWER_SAVER },
{ "Balanced", PP_BALANCED },
{ "Performance", PP_PERFORMANCE },
SM_ENUM_VALUE_END },
});
static const struct sm_object vtd = SM_DECLARE_BOOL({
.opt_name = "vtd",
.ui_name = "VT-d",
.ui_helptext = "Enable or disable Intel VT-d (virtualization)",
.default_value = true,
});
static const struct sm_object bluetooth_rtd3 = SM_DECLARE_BOOL({
.opt_name = "bluetooth_rtd3",
.ui_name = "Bluetooth Runtime-D3",
.ui_helptext = "Enable or disable Bluetooth power optimization.\n"
"Recommended to disable when booting Windows.",
.default_value = true,
});
static const struct sm_object s0ix_enable = SM_DECLARE_BOOL({
.opt_name = "s0ix_enable",
.ui_name = "Modern Standby (S0ix)",
.ui_helptext = "Enabled: Use S0ix for device sleep.\n"
"Disabled: Use ACPI S3 for device sleep.\n"
"Requires Intel ME to be enabled.\n"
"Recommended: Enabled when booting Windows, disabled otherwise.",
.default_value = false,
});
#include <common/cfr.h>
static struct sm_obj_form performance = {
.ui_name = "Performance",

3
src/mainboard/starlabs/common/Makefile.mk
View file

@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
subdirs-$(CONFIG_VENDOR_STARLABS) += smbios
subdirs-$(CONFIG_VENDOR_STARLABS) += cfr
subdirs-$(CONFIG_VENDOR_STARLABS) += pin_mux
subdirs-$(CONFIG_VENDOR_STARLABS) += smbios
CPPFLAGS_common += -I$(src)/mainboard/starlabs/common/include

4
src/mainboard/starlabs/common/cfr/Makefile.mk Normal file
View file

@ -0,0 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
CPPFLAGS_common += -I$(src)/mainboard/starlabs/common/cfr
ramstage-y += cfr.c

11
src/mainboard/starlabs/common/cfr/cfr.c Normal file
View file

@ -0,0 +1,11 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <drivers/option/cfr_frontend.h>
#include <common/cfr.h>
void __weak cfr_card_reader_update(const struct sm_object *obj,
struct sm_object *new_obj)
{
(void)obj;
(void)new_obj;
}

120
src/mainboard/starlabs/starbook/cfr.h → src/mainboard/starlabs/common/include/common/cfr.h
View file

@ -1,17 +1,41 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef _STARBOOK_CFR_H_
#define _STARBOOK_CFR_H_
#ifndef _STARLABS_CMN_CFR_H_
#define _STARLABS_CMN_CFR_H_
#include <drivers/option/cfr_frontend.h>
#include <variants.h>
void cfr_card_reader_update(const struct sm_object *obj, struct sm_object *new_obj);
static const struct sm_object accelerometer = SM_DECLARE_BOOL({
.opt_name = "accelerometer",
.ui_name = "Accelerometer",
.ui_helptext = "Enable or disable the built-in accelerometer",
.default_value = true,
});
static const struct sm_object bluetooth_rtd3 = SM_DECLARE_BOOL({
.opt_name = "bluetooth_rtd3",
.ui_name = "Bluetooth Runtime-D3",
.ui_helptext = "Enable or disable Bluetooth power optimization.\n"
"Recommended to disable when booting Windows.",
.default_value = true,
});
static const struct sm_object card_reader = SM_DECLARE_BOOL({
.opt_name = "card_reader",
.ui_name = "Card Reader",
.ui_helptext = "Enable or disable the built-in card reader",
.default_value = true,
}, WITH_CALLBACK(cfr_card_reader_update));
static const struct sm_object display_native_res = SM_DECLARE_BOOL({
.opt_name = "display_native_res",
.ui_name = "Display: Use Native Resolution",
.ui_helptext = "Enabled: use the native panel resolution at boot.\n"
"Disabled: use a fixed/scaled video mode at boot.",
.default_value = false,
});
static const struct sm_object fingerprint_reader = SM_DECLARE_BOOL({
@ -35,16 +59,19 @@ static const struct sm_object hyper_threading = SM_DECLARE_BOOL({
.default_value = true,
});
static const struct sm_object power_profile = SM_DECLARE_ENUM({
.opt_name = "power_profile",
.ui_name = "Power Profile",
.ui_helptext = "Select whether to maximize performance, battery life or both.",
static const struct sm_object memory_speed = SM_DECLARE_ENUM({
.opt_name = "memory_speed",
.ui_name = "Memory Speed",
.ui_helptext = "Configure the speed that the memory will run at. "
"Higher speeds produce more heat and consume more power "
"but provide higher performance.",
.default_value = 1,
.values = (const struct sm_enum_value[]) {
{ "Power Saver", PP_POWER_SAVER },
{ "Balanced", PP_BALANCED },
{ "Performance", PP_PERFORMANCE },
SM_ENUM_VALUE_END },
{ "5500MT/s", 0 },
{ "6400MT/s", 1 },
{ "7500MT/s", 2 },
SM_ENUM_VALUE_END,
},
});
static const struct sm_object microphone = SM_DECLARE_BOOL({
@ -62,6 +89,28 @@ static const struct sm_object pci_hot_plug = SM_DECLARE_BOOL({
.default_value = false,
});
static const struct sm_object power_profile = SM_DECLARE_ENUM({
.opt_name = "power_profile",
.ui_name = "Power Profile",
.ui_helptext = "Select whether to maximize performance, battery life or both.",
.default_value = 1,
.values = (const struct sm_enum_value[]) {
{ "Power Saver", PP_POWER_SAVER },
{ "Balanced", PP_BALANCED },
{ "Performance", PP_PERFORMANCE },
SM_ENUM_VALUE_END },
});
static const struct sm_object s0ix_enable = SM_DECLARE_BOOL({
.opt_name = "s0ix_enable",
.ui_name = "Modern Standby (S0ix)",
.ui_helptext = "Enabled: Use S0ix for device sleep.\n"
"Disabled: Use ACPI S3 for device sleep.\n"
"Requires Intel ME to be enabled.\n"
"Recommended: Enabled when booting Windows, disabled otherwise.",
.default_value = false,
});
static const struct sm_object thunderbolt = SM_DECLARE_BOOL({
.opt_name = "thunderbolt",
.ui_name = "Thunderbolt",
@ -69,6 +118,13 @@ static const struct sm_object thunderbolt = SM_DECLARE_BOOL({
.default_value = true,
});
static const struct sm_object touchscreen = SM_DECLARE_BOOL({
.opt_name = "touchscreen",
.ui_name = "Touchscreen",
.ui_helptext = "Enable or disable the built-in touch-screen",
.default_value = true,
});
static const struct sm_object vpu = SM_DECLARE_BOOL({
.opt_name = "vpu",
.ui_name = "VPU",
@ -76,6 +132,13 @@ static const struct sm_object vpu = SM_DECLARE_BOOL({
.default_value = false,
});
static const struct sm_object vtd = SM_DECLARE_BOOL({
.opt_name = "vtd",
.ui_name = "VT-d",
.ui_helptext = "Enable or disable Intel VT-d (virtualization)",
.default_value = true,
});
static const struct sm_object webcam = SM_DECLARE_BOOL({
.opt_name = "webcam",
.ui_name = "Webcam",
@ -90,37 +153,4 @@ static const struct sm_object wireless = SM_DECLARE_BOOL({
.default_value = true,
});
static const struct sm_object vtd = SM_DECLARE_BOOL({
.opt_name = "vtd",
.ui_name = "VT-d",
.ui_helptext = "Enable or disable Intel VT-d (virtualization)",
.default_value = true,
});
static const struct sm_object bluetooth_rtd3 = SM_DECLARE_BOOL({
.opt_name = "bluetooth_rtd3",
.ui_name = "Bluetooth Runtime-D3",
.ui_helptext = "Enable or disable Bluetooth power optimization.\n"
"Recommended to disable when booting Windows.",
.default_value = true,
});
static const struct sm_object display_native_res = SM_DECLARE_BOOL({
.opt_name = "display_native_res",
.ui_name = "Display: Use Native Resolution",
.ui_helptext = "Enabled: use the native panel resolution at boot.\n"
"Disabled: use a fixed/scaled video mode at boot.",
.default_value = false,
});
static const struct sm_object s0ix_enable = SM_DECLARE_BOOL({
.opt_name = "s0ix_enable",
.ui_name = "Modern Standby (S0ix)",
.ui_helptext = "Enabled: Use S0ix for device sleep.\n"
"Disabled: Use ACPI S3 for device sleep.\n"
"Requires Intel ME to be enabled.\n"
"Recommended: Enabled when booting Windows, disabled otherwise.",
.default_value = false,
});
#endif /* _STARBOOK_CFR_H_ */
#endif /* _STARLABS_CMN_CFR_H_ */

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

@ -6,63 +6,7 @@
#include <ec/starlabs/merlin/cfr.h>
#include <intelblocks/cfr.h>
#include <variants.h>
static const struct sm_object card_reader = SM_DECLARE_BOOL({
.opt_name = "card_reader",
.ui_name = "Card Reader",
.ui_helptext = "Enable or disable the built-in card reader",
.default_value = true,
});
static const struct sm_object power_profile = SM_DECLARE_ENUM({
.opt_name = "power_profile",
.ui_name = "Power Profile",
.ui_helptext = "Select whether to maximize performance, battery life or both.",
.default_value = 1,
.values = (const struct sm_enum_value[]) {
{ "Power Saver", PP_POWER_SAVER },
{ "Balanced", PP_BALANCED },
{ "Performance", PP_PERFORMANCE },
SM_ENUM_VALUE_END },
});
static const struct sm_object microphone = SM_DECLARE_BOOL({
.opt_name = "microphone",
.ui_name = "Microphone",
.ui_helptext = "Enable or disable the built-in microphone",
.default_value = true,
});
static const struct sm_object webcam = SM_DECLARE_BOOL({
.opt_name = "webcam",
.ui_name = "Webcam",
.ui_helptext = "Enable or disable the built-in webcam",
.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",
.default_value = true,
});
static const struct sm_object vtd = SM_DECLARE_BOOL({
.opt_name = "vtd",
.ui_name = "VT-d",
.ui_helptext = "Enable or disable Intel VT-d (virtualization)",
.default_value = true,
});
static const struct sm_object s0ix_enable = SM_DECLARE_BOOL({
.opt_name = "s0ix_enable",
.ui_name = "Modern Standby (S0ix)",
.ui_helptext = "Enabled: Use S0ix for device sleep.\n"
"Disabled: Use ACPI S3 for device sleep.\n"
"Requires Intel ME to be enabled.\n"
"Recommended: Enabled when booting Windows, disabled otherwise.",
.default_value = false,
});
#include <common/cfr.h>
static struct sm_obj_form performance = {
.ui_name = "Performance",

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

@ -5,7 +5,7 @@
#include <drivers/option/cfr_frontend.h>
#include <ec/starlabs/merlin/cfr.h>
#include <intelblocks/cfr.h>
#include "cfr.h"
#include <common/cfr.h>
static struct sm_obj_form performance = {
.ui_name = "Performance",

72
src/mainboard/starlabs/starfighter/cfr.c
View file

@ -6,77 +6,7 @@
#include <ec/starlabs/merlin/cfr.h>
#include <intelblocks/cfr.h>
#include <variants.h>
#if CONFIG(SOC_INTEL_TIGERLAKE) || CONFIG(SOC_INTEL_ALDERLAKE) || CONFIG(SOC_INTEL_RAPTORLAKE)
static const struct sm_object gna = SM_DECLARE_BOOL({
.opt_name = "gna",
.ui_name = "Gaussian & Neural Accelerator",
.ui_helptext = "Enable or Disable the Gaussian & Neural Accelerator",
.default_value = false,
});
#endif
static const struct sm_object hyper_threading = SM_DECLARE_BOOL({
.opt_name = "hyper_threading",
.ui_name = "Hyper-Threading",
.ui_helptext = "Enable or disable Hyper-Threading",
.default_value = true,
});
static const struct sm_object power_profile = SM_DECLARE_ENUM({
.opt_name = "power_profile",
.ui_name = "Power Profile",
.ui_helptext = "Select whether to maximize performance, battery life or both.",
.default_value = 1,
.values = (const struct sm_enum_value[]) {
{ "Power Saver", PP_POWER_SAVER },
{ "Balanced", PP_BALANCED },
{ "Performance", PP_PERFORMANCE },
SM_ENUM_VALUE_END },
});
#if CONFIG(DRIVERS_INTEL_USB4_RETIMER)
static const struct sm_object thunderbolt = SM_DECLARE_BOOL({
.opt_name = "thunderbolt",
.ui_name = "Thunderbolt",
.ui_helptext = "Enable or disable Thunderbolt support",
.default_value = true,
});
#endif
static const struct sm_object vtd = SM_DECLARE_BOOL({
.opt_name = "vtd",
.ui_name = "VT-d",
.ui_helptext = "Enable or disable Intel VT-d (virtualization)",
.default_value = true,
});
static const struct sm_object bluetooth_rtd3 = SM_DECLARE_BOOL({
.opt_name = "bluetooth_rtd3",
.ui_name = "Bluetooth Runtime-D3",
.ui_helptext = "Enable or disable Bluetooth power optimization.\n"
"Recommended to disable when booting Windows.",
.default_value = true,
});
static const struct sm_object display_native_res = SM_DECLARE_BOOL({
.opt_name = "display_native_res",
.ui_name = "Display: Use Native Resolution",
.ui_helptext = "Enabled: use the native panel resolution at boot.\n"
"Disabled: use a fixed/scaled video mode at boot.",
.default_value = false,
});
static const struct sm_object s0ix_enable = SM_DECLARE_BOOL({
.opt_name = "s0ix_enable",
.ui_name = "Modern Standby (S0ix)",
.ui_helptext = "Enabled: Use S0ix for device sleep.\n"
"Disabled: Use ACPI S3 for device sleep.\n"
"Requires Intel ME to be enabled.\n"
"Recommended: Enabled when booting Windows, disabled otherwise.",
.default_value = false,
});
#include <common/cfr.h>
static struct sm_obj_form performance = {
.ui_name = "Performance",

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

@ -9,124 +9,16 @@
#include <device/i2c_simple.h>
#include <static.h>
#include <variants.h>
#include <common/cfr.h>
static const struct sm_object accelerometer = SM_DECLARE_BOOL({
.opt_name = "accelerometer",
.ui_name = "Accelerometer",
.ui_helptext = "Enable or disable the built-in accelerometer",
.default_value = true,
});
static void update_card_reader(const struct sm_object *obj, struct sm_object *new)
void cfr_card_reader_update(const struct sm_object *obj, struct sm_object *new_obj)
{
struct device *mxc_accel = DEV_PTR(mxc6655);
if (!i2c_dev_detect(i2c_busdev(mxc_accel), mxc_accel->path.i2c.device))
new->sm_bool.flags = CFR_OPTFLAG_SUPPRESS;
new_obj->sm_bool.flags = CFR_OPTFLAG_SUPPRESS;
}
static const struct sm_object card_reader = SM_DECLARE_BOOL({
.opt_name = "card_reader",
.ui_name = "Card Reader",
.ui_helptext = "Enable or disable the built-in card reader",
.default_value = true,
}, WITH_CALLBACK(update_card_reader));
#if CONFIG(SOC_INTEL_TIGERLAKE) || CONFIG(SOC_INTEL_ALDERLAKE) || CONFIG(SOC_INTEL_RAPTORLAKE)
static const struct sm_object gna = SM_DECLARE_BOOL({
.opt_name = "gna",
.ui_name = "Gaussian & Neural Accelerator",
.ui_helptext = "Enable or Disable the Gaussian & Neural Accelerator",
.default_value = false,
});
#endif
static const struct sm_object memory_speed = SM_DECLARE_ENUM({
.opt_name = "memory_speed",
.ui_name = "Memory Speed",
.ui_helptext = "Configure the speed that the memory will run at. Higher speeds produce more heat and consume more power but provide higher performance.",
.default_value = 1,
.values = (const struct sm_enum_value[]) {
{ "5500MT/s", 0 },
{ "6400MT/s", 1 },
{ "7500MT/s", 2 },
SM_ENUM_VALUE_END,
}
});
static const struct sm_object power_profile = SM_DECLARE_ENUM({
.opt_name = "power_profile",
.ui_name = "Power Profile",
.ui_helptext = "Select whether to maximize performance, battery life or both.",
.default_value = 1,
.values = (const struct sm_enum_value[]) {
{ "Power Saver", PP_POWER_SAVER },
{ "Balanced", PP_BALANCED },
{ "Performance", PP_PERFORMANCE },
SM_ENUM_VALUE_END },
});
static const struct sm_object microphone = SM_DECLARE_BOOL({
.opt_name = "microphone",
.ui_name = "Microphone",
.ui_helptext = "Enable or disable the built-in microphone",
.default_value = true,
});
static const struct sm_object touchscreen = SM_DECLARE_BOOL({
.opt_name = "touchscreen",
.ui_name = "Touchscreen",
.ui_helptext = "Enable or disable the built-in touch-screen",
.default_value = true,
});
static const struct sm_object webcam = SM_DECLARE_BOOL({
.opt_name = "webcam",
.ui_name = "Webcam",
.ui_helptext = "Enable or disable the built-in webcam",
.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",
.default_value = true,
});
static const struct sm_object vtd = SM_DECLARE_BOOL({
.opt_name = "vtd",
.ui_name = "VT-d",
.ui_helptext = "Enable or disable Intel VT-d (virtualization)",
.default_value = true,
});
static const struct sm_object bluetooth_rtd3 = SM_DECLARE_BOOL({
.opt_name = "bluetooth_rtd3",
.ui_name = "Bluetooth Runtime-D3",
.ui_helptext = "Enable or disable Bluetooth power optimization.\n"
"Recommended to disable when booting Windows.",
.default_value = true,
});
static const struct sm_object display_native_res = SM_DECLARE_BOOL({
.opt_name = "display_native_res",
.ui_name = "Display: Use Native Resolution",
.ui_helptext = "Enabled: use the native panel resolution at boot.\n"
"Disabled: use a fixed/scaled video mode at boot.",
.default_value = false,
});
static const struct sm_object s0ix_enable = SM_DECLARE_BOOL({
.opt_name = "s0ix_enable",
.ui_name = "Modern Standby (S0ix)",
.ui_helptext = "Enabled: Use S0ix for device sleep.\n"
"Disabled: Use ACPI S3 for device sleep.\n"
"Requires Intel ME to be enabled.\n"
"Recommended: Enabled when booting Windows, disabled otherwise.",
.default_value = false,
});
static struct sm_obj_form performance = {
.ui_name = "Performance",
.obj_list = (const struct sm_object *[]) {