* [PATCH v3 0/3] coreboot CFR firmware attributes
@ 2026-07-10 6:12 Sean Rhodes
2026-07-10 6:12 ` [PATCH v3 1/3] firmware: Move firmware attributes class helper Sean Rhodes
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Sean Rhodes @ 2026-07-10 6:12 UTC (permalink / raw)
To: Tzung-Bi Shih
Cc: Hans de Goede, Ilpo Järvinen, Corentin Chary, Luke D. Jones,
Denis Benato, Prasanth Ksr, Jorge Lopez, Mark Pearson,
Derek J. Clark, Joshua Grisham, Sean Rhodes, Michael S. Tsirkin,
Huacai Chen, Chen-Yu Tsai, Florian Fainelli, linux-kernel,
platform-driver-x86, Dell.Client.Kernel, Brian Norris,
Julius Werner, Thomas Zimmermann, Javier Martinez Canillas,
Titouan Ameline de Cadeville, Kees Cook, chrome-platform
Hi,
This series adds a coreboot CFR firmware-attributes driver.
v3 addresses Julius's review feedback that this does not belong under
platform/x86. The driver now lives under drivers/firmware/coreboot/,
next to the existing coreboot table consumers. To support that, the
firmware-attributes class helper is moved from drivers/platform/x86 to
drivers/firmware.
The series also renames drivers/firmware/google to
drivers/firmware/coreboot, because the drivers in that directory are
coreboot table drivers rather than Google-specific firmware drivers.
The existing CONFIG_GOOGLE_* symbols are intentionally kept to avoid
user configuration churn.
The CFR driver uses the existing firmware-attributes ABI. It exposes
runtime EFI variable-backed boolean, enum and integer options, skips
suppressed, volatile, dependency-gated and non-runtime options, and keeps
read-only or inactive options read-only in sysfs.
For CFR runtime-apply metadata using APM_CNT, x86 systems can apply a
setting immediately after writing the EFI variable. Non-x86 builds keep
the EFI write and report pending_reboot.
Changes in v3:
- Move the driver from platform/x86 to drivers/firmware/coreboot.
- Split out the firmware-attributes class helper move.
- Rename drivers/firmware/google to drivers/firmware/coreboot.
- Keep CONFIG_GOOGLE_* symbols unchanged.
- Keep coreboot bus internals private to drivers/firmware/coreboot.
- Keep CFR record definitions private to the CFR driver.
- Avoid rewriting EFI variables when userspace writes the current value.
Testing:
- Tested on a Star Labs Byte with firmware 26.07 and the driver built as a
module against Linux 6.17.
- Verified runtime APM_CNT apply with power_led.
- Verified reboot-needed behavior with debug_level.
- Built x86 objects with W=1 for the CFR/coreboot/helper path and touched
platform-x86 firmware-attributes users.
- Built ARM64 objects with clang for the CFR/coreboot/helper path.
- Passed git diff --check and scripts/checkpatch.pl --strict.
Sean Rhodes (3):
firmware: Move firmware attributes class helper
firmware: Rename google firmware directory to coreboot
firmware: coreboot: Add CFR firmware attributes driver
MAINTAINERS | 18 +-
drivers/firmware/Kconfig | 5 +-
drivers/firmware/Makefile | 3 +-
drivers/firmware/{google => coreboot}/Kconfig | 19 +-
.../firmware/{google => coreboot}/Makefile | 1 +
drivers/firmware/{google => coreboot}/cbmem.c | 0
drivers/firmware/coreboot/coreboot-cfr.c | 1068 +++++++++++++++++
.../{google => coreboot}/coreboot_table.c | 0
.../{google => coreboot}/coreboot_table.h | 0
.../framebuffer-coreboot.c | 0
drivers/firmware/{google => coreboot}/gsmi.c | 0
.../memconsole-coreboot.c | 0
.../memconsole-x86-legacy.c | 0
.../{google => coreboot}/memconsole.c | 0
.../{google => coreboot}/memconsole.h | 6 +-
drivers/firmware/{google => coreboot}/vpd.c | 0
.../{google => coreboot}/vpd_decode.c | 0
.../{google => coreboot}/vpd_decode.h | 0
.../firmware_attributes_class.c | 2 +-
drivers/platform/x86/Kconfig | 3 -
drivers/platform/x86/Makefile | 2 -
drivers/platform/x86/asus-armoury.c | 2 +-
.../x86/dell/dell-wmi-sysman/sysman.c | 2 +-
drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 2 +-
drivers/platform/x86/lenovo/think-lmi.c | 2 +-
drivers/platform/x86/lenovo/wmi-other.c | 2 +-
drivers/platform/x86/samsung-galaxybook.c | 2 +-
.../linux/firmware_attributes.h | 6 +-
28 files changed, 1120 insertions(+), 25 deletions(-)
rename drivers/firmware/{google => coreboot}/Kconfig (83%)
rename drivers/firmware/{google => coreboot}/Makefile (92%)
rename drivers/firmware/{google => coreboot}/cbmem.c (100%)
create mode 100644 drivers/firmware/coreboot/coreboot-cfr.c
rename drivers/firmware/{google => coreboot}/coreboot_table.c (100%)
rename drivers/firmware/{google => coreboot}/coreboot_table.h (100%)
rename drivers/firmware/{google => coreboot}/framebuffer-coreboot.c (100%)
rename drivers/firmware/{google => coreboot}/gsmi.c (100%)
rename drivers/firmware/{google => coreboot}/memconsole-coreboot.c (100%)
rename drivers/firmware/{google => coreboot}/memconsole-x86-legacy.c (100%)
rename drivers/firmware/{google => coreboot}/memconsole.c (100%)
rename drivers/firmware/{google => coreboot}/memconsole.h (82%)
rename drivers/firmware/{google => coreboot}/vpd.c (100%)
rename drivers/firmware/{google => coreboot}/vpd_decode.c (100%)
rename drivers/firmware/{google => coreboot}/vpd_decode.h (100%)
rename drivers/{platform/x86 => firmware}/firmware_attributes_class.c (94%)
rename drivers/platform/x86/firmware_attributes_class.h => include/linux/firmware_attributes.h (60%)
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH v3 1/3] firmware: Move firmware attributes class helper 2026-07-10 6:12 [PATCH v3 0/3] coreboot CFR firmware attributes Sean Rhodes @ 2026-07-10 6:12 ` Sean Rhodes 2026-07-10 12:11 ` Mark Pearson 2026-07-10 6:12 ` [PATCH v3 2/3] firmware: Rename google firmware directory to coreboot Sean Rhodes 2026-07-10 6:12 ` [PATCH v3 3/3] firmware: coreboot: Add CFR firmware attributes driver Sean Rhodes 2 siblings, 1 reply; 7+ messages in thread From: Sean Rhodes @ 2026-07-10 6:12 UTC (permalink / raw) To: Tzung-Bi Shih Cc: Hans de Goede, Ilpo Järvinen, Corentin Chary, Luke D. Jones, Denis Benato, Prasanth Ksr, Jorge Lopez, Mark Pearson, Derek J. Clark, Joshua Grisham, Sean Rhodes, Michael S. Tsirkin, Huacai Chen, Chen-Yu Tsai, Florian Fainelli, linux-kernel, platform-driver-x86, Dell.Client.Kernel, Brian Norris, Julius Werner, Thomas Zimmermann, Javier Martinez Canillas, Titouan Ameline de Cadeville, Kees Cook, chrome-platform Move the firmware attributes class helper from drivers/platform/x86 to drivers/firmware and expose its class declaration through a public Linux header. The helper is not x86-specific. Keeping it in firmware lets coreboot firmware drivers use the standard firmware-attributes ABI without living under platform/x86. Signed-off-by: Sean Rhodes <sean@starlabs.systems> --- MAINTAINERS | 8 ++++++++ drivers/firmware/Kconfig | 3 +++ drivers/firmware/Makefile | 1 + .../x86 => firmware}/firmware_attributes_class.c | 2 +- drivers/platform/x86/Kconfig | 3 --- drivers/platform/x86/Makefile | 2 -- drivers/platform/x86/asus-armoury.c | 2 +- drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 2 +- drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 2 +- drivers/platform/x86/lenovo/think-lmi.c | 2 +- drivers/platform/x86/lenovo/wmi-other.c | 2 +- drivers/platform/x86/samsung-galaxybook.c | 2 +- .../linux/firmware_attributes.h | 6 +++--- 13 files changed, 22 insertions(+), 15 deletions(-) rename drivers/{platform/x86 => firmware}/firmware_attributes_class.c (94%) rename drivers/platform/x86/firmware_attributes_class.h => include/linux/firmware_attributes.h (60%) diff --git a/MAINTAINERS b/MAINTAINERS index 15011f5752a9..ec0a12121357 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10114,6 +10114,14 @@ F: include/linux/firewire.h F: include/uapi/linux/firewire*.h F: tools/firewire/ +FIRMWARE ATTRIBUTES CLASS +M: Hans de Goede <hansg@kernel.org> +M: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> +L: platform-driver-x86@vger.kernel.org +S: Maintained +F: drivers/firmware/firmware_attributes_class.c +F: include/linux/firmware_attributes.h + FIRMWARE FRAMEWORK FOR ARMV8-A M: Sudeep Holla <sudeep.holla@kernel.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 12dc70254842..78a239f8bbef 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -8,6 +8,9 @@ menu "Firmware Drivers" source "drivers/firmware/arm_scmi/Kconfig" +config FW_ATTR_CLASS + tristate + config ARM_SCPI_PROTOCOL tristate "ARM System Control and Power Interface (SCPI) Message Protocol" depends on ARM || ARM64 || COMPILE_TEST diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index 4ddec2820c96..385b6e8b7fc6 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o obj-$(CONFIG_MTK_ADSP_IPC) += mtk-adsp-ipc.o obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o obj-$(CONFIG_FW_CFG_SYSFS) += qemu_fw_cfg.o +obj-$(CONFIG_FW_ATTR_CLASS) += firmware_attributes_class.o obj-$(CONFIG_SYSFB) += sysfb.o obj-$(CONFIG_SYSFB_SIMPLEFB) += sysfb_simplefb.o obj-$(CONFIG_TH1520_AON_PROTOCOL) += thead,th1520-aon.o diff --git a/drivers/platform/x86/firmware_attributes_class.c b/drivers/firmware/firmware_attributes_class.c similarity index 94% rename from drivers/platform/x86/firmware_attributes_class.c rename to drivers/firmware/firmware_attributes_class.c index 736e96c186d9..503ecc288086 100644 --- a/drivers/platform/x86/firmware_attributes_class.c +++ b/drivers/firmware/firmware_attributes_class.c @@ -3,7 +3,7 @@ /* Firmware attributes class helper module */ #include <linux/module.h> -#include "firmware_attributes_class.h" +#include <linux/firmware_attributes.h> const struct class firmware_attributes_class = { .name = "firmware-attributes", diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index b54b5212b204..beed14c38b54 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -926,9 +926,6 @@ config DASHARO_ACPI source "drivers/platform/x86/x86-android-tablets/Kconfig" -config FW_ATTR_CLASS - tristate - config INTEL_IMR bool "Intel Isolated Memory Region support" depends on X86_INTEL_QUARK && IOSF_MBI diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 872ac3842391..cab20a4145e3 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -63,8 +63,6 @@ obj-$(CONFIG_X86_PLATFORM_DRIVERS_HP) += hp/ # Hewlett Packard Enterprise obj-$(CONFIG_UV_SYSFS) += uv_sysfs.o -obj-$(CONFIG_FW_ATTR_CLASS) += firmware_attributes_class.o - # IBM Thinkpad (before 2005) obj-$(CONFIG_IBM_RTL) += ibm_rtl.o obj-$(CONFIG_SENSORS_HDAPS) += hdaps.o diff --git a/drivers/platform/x86/asus-armoury.c b/drivers/platform/x86/asus-armoury.c index 495dc1e31d40..93fac0d464d2 100644 --- a/drivers/platform/x86/asus-armoury.c +++ b/drivers/platform/x86/asus-armoury.c @@ -34,7 +34,7 @@ #include <linux/sysfs.h> #include "asus-armoury.h" -#include "firmware_attributes_class.h" +#include <linux/firmware_attributes.h> #define ASUS_NB_WMI_EVENT_GUID "0B3CBB35-E3C2-45ED-91C2-4C5A6D195D1C" diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c index ab46a023cc34..85670be01647 100644 --- a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c +++ b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c @@ -16,7 +16,7 @@ #include <linux/sysfs.h> #include <linux/wmi.h> #include "dell-wmi-sysman.h" -#include "../../firmware_attributes_class.h" +#include <linux/firmware_attributes.h> #define MAX_TYPES 4 #include <linux/nls.h> diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c index 27fd6cd21529..44314ae4e5e3 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c +++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c @@ -14,7 +14,7 @@ #include <linux/string.h> #include <linux/wmi.h> #include "bioscfg.h" -#include "../../firmware_attributes_class.h" +#include <linux/firmware_attributes.h> #include <linux/nls.h> #include <linux/errno.h> diff --git a/drivers/platform/x86/lenovo/think-lmi.c b/drivers/platform/x86/lenovo/think-lmi.c index e215e86e3db7..a56f152b5f28 100644 --- a/drivers/platform/x86/lenovo/think-lmi.c +++ b/drivers/platform/x86/lenovo/think-lmi.c @@ -20,7 +20,7 @@ #include <linux/types.h> #include <linux/dmi.h> #include <linux/wmi.h> -#include "../firmware_attributes_class.h" +#include <linux/firmware_attributes.h> #include "think-lmi.h" static bool debug_support; diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c index fbb32bf404f2..e9a2c4684e5f 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -50,7 +50,7 @@ #include "wmi-capdata.h" #include "wmi-events.h" #include "wmi-helpers.h" -#include "../firmware_attributes_class.h" +#include <linux/firmware_attributes.h> #define LENOVO_OTHER_MODE_GUID "DC2A8805-3A8C-41BA-A6F7-092E0089CD3B" diff --git a/drivers/platform/x86/samsung-galaxybook.c b/drivers/platform/x86/samsung-galaxybook.c index 6382af0b106c..74b8c887dd79 100644 --- a/drivers/platform/x86/samsung-galaxybook.c +++ b/drivers/platform/x86/samsung-galaxybook.c @@ -28,7 +28,7 @@ #include <linux/uuid.h> #include <linux/workqueue.h> #include <acpi/battery.h> -#include "firmware_attributes_class.h" +#include <linux/firmware_attributes.h> #define DRIVER_NAME "samsung-galaxybook" diff --git a/drivers/platform/x86/firmware_attributes_class.h b/include/linux/firmware_attributes.h similarity index 60% rename from drivers/platform/x86/firmware_attributes_class.h rename to include/linux/firmware_attributes.h index d27abe54fcf9..d4026ba1fcc2 100644 --- a/drivers/platform/x86/firmware_attributes_class.h +++ b/include/linux/firmware_attributes.h @@ -2,11 +2,11 @@ /* Firmware attributes class helper module */ -#ifndef FW_ATTR_CLASS_H -#define FW_ATTR_CLASS_H +#ifndef _LINUX_FIRMWARE_ATTRIBUTES_H +#define _LINUX_FIRMWARE_ATTRIBUTES_H #include <linux/device/class.h> extern const struct class firmware_attributes_class; -#endif /* FW_ATTR_CLASS_H */ +#endif /* _LINUX_FIRMWARE_ATTRIBUTES_H */ ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/3] firmware: Move firmware attributes class helper 2026-07-10 6:12 ` [PATCH v3 1/3] firmware: Move firmware attributes class helper Sean Rhodes @ 2026-07-10 12:11 ` Mark Pearson 0 siblings, 0 replies; 7+ messages in thread From: Mark Pearson @ 2026-07-10 12:11 UTC (permalink / raw) To: Sean Rhodes, Tzung-Bi Shih Cc: Hans de Goede, Ilpo Järvinen, Corentin Chary, Luke D . Jones, Denis Benato, Prasanth Ksr, Jorge Lopez, Derek J . Clark, Joshua Grisham, Michael S. Tsirkin, Huacai Chen, Chen-Yu Tsai, Florian Fainelli, linux-kernel, platform-driver-x86@vger.kernel.org, Dell.Client.Kernel, Brian Norris, Julius Werner, Thomas Zimmermann, Javier Martinez Canillas, Titouan Ameline de Cadeville, Kees Cook, chrome-platform On Fri, Jul 10, 2026, at 2:12 AM, Sean Rhodes wrote: > Move the firmware attributes class helper from drivers/platform/x86 to > drivers/firmware and expose its class declaration through a public Linux > header. > > The helper is not x86-specific. Keeping it in firmware lets coreboot > firmware drivers use the standard firmware-attributes ABI without living > under platform/x86. > > Signed-off-by: Sean Rhodes <sean@starlabs.systems> > --- > MAINTAINERS | 8 ++++++++ > drivers/firmware/Kconfig | 3 +++ > drivers/firmware/Makefile | 1 + > .../x86 => firmware}/firmware_attributes_class.c | 2 +- > drivers/platform/x86/Kconfig | 3 --- > drivers/platform/x86/Makefile | 2 -- > drivers/platform/x86/asus-armoury.c | 2 +- > drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 2 +- > drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 2 +- > drivers/platform/x86/lenovo/think-lmi.c | 2 +- > drivers/platform/x86/lenovo/wmi-other.c | 2 +- > drivers/platform/x86/samsung-galaxybook.c | 2 +- > .../linux/firmware_attributes.h | 6 +++--- > 13 files changed, 22 insertions(+), 15 deletions(-) > rename drivers/{platform/x86 => firmware}/firmware_attributes_class.c > (94%) > rename drivers/platform/x86/firmware_attributes_class.h => > include/linux/firmware_attributes.h (60%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 15011f5752a9..ec0a12121357 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -10114,6 +10114,14 @@ F: include/linux/firewire.h > F: include/uapi/linux/firewire*.h > F: tools/firewire/ > > +FIRMWARE ATTRIBUTES CLASS > +M: Hans de Goede <hansg@kernel.org> > +M: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> > +L: platform-driver-x86@vger.kernel.org > +S: Maintained > +F: drivers/firmware/firmware_attributes_class.c > +F: include/linux/firmware_attributes.h > + > FIRMWARE FRAMEWORK FOR ARMV8-A > M: Sudeep Holla <sudeep.holla@kernel.org> > L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) > diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig > index 12dc70254842..78a239f8bbef 100644 > --- a/drivers/firmware/Kconfig > +++ b/drivers/firmware/Kconfig > @@ -8,6 +8,9 @@ menu "Firmware Drivers" > > source "drivers/firmware/arm_scmi/Kconfig" > > +config FW_ATTR_CLASS > + tristate > + > config ARM_SCPI_PROTOCOL > tristate "ARM System Control and Power Interface (SCPI) Message > Protocol" > depends on ARM || ARM64 || COMPILE_TEST > diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile > index 4ddec2820c96..385b6e8b7fc6 100644 > --- a/drivers/firmware/Makefile > +++ b/drivers/firmware/Makefile > @@ -16,6 +16,7 @@ obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o > obj-$(CONFIG_MTK_ADSP_IPC) += mtk-adsp-ipc.o > obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o > obj-$(CONFIG_FW_CFG_SYSFS) += qemu_fw_cfg.o > +obj-$(CONFIG_FW_ATTR_CLASS) += firmware_attributes_class.o > obj-$(CONFIG_SYSFB) += sysfb.o > obj-$(CONFIG_SYSFB_SIMPLEFB) += sysfb_simplefb.o > obj-$(CONFIG_TH1520_AON_PROTOCOL) += thead,th1520-aon.o > diff --git a/drivers/platform/x86/firmware_attributes_class.c > b/drivers/firmware/firmware_attributes_class.c > similarity index 94% > rename from drivers/platform/x86/firmware_attributes_class.c > rename to drivers/firmware/firmware_attributes_class.c > index 736e96c186d9..503ecc288086 100644 > --- a/drivers/platform/x86/firmware_attributes_class.c > +++ b/drivers/firmware/firmware_attributes_class.c > @@ -3,7 +3,7 @@ > /* Firmware attributes class helper module */ > > #include <linux/module.h> > -#include "firmware_attributes_class.h" > +#include <linux/firmware_attributes.h> > > const struct class firmware_attributes_class = { > .name = "firmware-attributes", > diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig > index b54b5212b204..beed14c38b54 100644 > --- a/drivers/platform/x86/Kconfig > +++ b/drivers/platform/x86/Kconfig > @@ -926,9 +926,6 @@ config DASHARO_ACPI > > source "drivers/platform/x86/x86-android-tablets/Kconfig" > > -config FW_ATTR_CLASS > - tristate > - > config INTEL_IMR > bool "Intel Isolated Memory Region support" > depends on X86_INTEL_QUARK && IOSF_MBI > diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile > index 872ac3842391..cab20a4145e3 100644 > --- a/drivers/platform/x86/Makefile > +++ b/drivers/platform/x86/Makefile > @@ -63,8 +63,6 @@ obj-$(CONFIG_X86_PLATFORM_DRIVERS_HP) += hp/ > # Hewlett Packard Enterprise > obj-$(CONFIG_UV_SYSFS) += uv_sysfs.o > > -obj-$(CONFIG_FW_ATTR_CLASS) += firmware_attributes_class.o > - > # IBM Thinkpad (before 2005) > obj-$(CONFIG_IBM_RTL) += ibm_rtl.o > obj-$(CONFIG_SENSORS_HDAPS) += hdaps.o > diff --git a/drivers/platform/x86/asus-armoury.c > b/drivers/platform/x86/asus-armoury.c > index 495dc1e31d40..93fac0d464d2 100644 > --- a/drivers/platform/x86/asus-armoury.c > +++ b/drivers/platform/x86/asus-armoury.c > @@ -34,7 +34,7 @@ > #include <linux/sysfs.h> > > #include "asus-armoury.h" > -#include "firmware_attributes_class.h" > +#include <linux/firmware_attributes.h> > > #define ASUS_NB_WMI_EVENT_GUID "0B3CBB35-E3C2-45ED-91C2-4C5A6D195D1C" > > diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c > b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c > index ab46a023cc34..85670be01647 100644 > --- a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c > +++ b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c > @@ -16,7 +16,7 @@ > #include <linux/sysfs.h> > #include <linux/wmi.h> > #include "dell-wmi-sysman.h" > -#include "../../firmware_attributes_class.h" > +#include <linux/firmware_attributes.h> > > #define MAX_TYPES 4 > #include <linux/nls.h> > diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c > b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c > index 27fd6cd21529..44314ae4e5e3 100644 > --- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c > +++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c > @@ -14,7 +14,7 @@ > #include <linux/string.h> > #include <linux/wmi.h> > #include "bioscfg.h" > -#include "../../firmware_attributes_class.h" > +#include <linux/firmware_attributes.h> > #include <linux/nls.h> > #include <linux/errno.h> > > diff --git a/drivers/platform/x86/lenovo/think-lmi.c > b/drivers/platform/x86/lenovo/think-lmi.c > index e215e86e3db7..a56f152b5f28 100644 > --- a/drivers/platform/x86/lenovo/think-lmi.c > +++ b/drivers/platform/x86/lenovo/think-lmi.c > @@ -20,7 +20,7 @@ > #include <linux/types.h> > #include <linux/dmi.h> > #include <linux/wmi.h> > -#include "../firmware_attributes_class.h" > +#include <linux/firmware_attributes.h> > #include "think-lmi.h" > > static bool debug_support; > diff --git a/drivers/platform/x86/lenovo/wmi-other.c > b/drivers/platform/x86/lenovo/wmi-other.c > index fbb32bf404f2..e9a2c4684e5f 100644 > --- a/drivers/platform/x86/lenovo/wmi-other.c > +++ b/drivers/platform/x86/lenovo/wmi-other.c > @@ -50,7 +50,7 @@ > #include "wmi-capdata.h" > #include "wmi-events.h" > #include "wmi-helpers.h" > -#include "../firmware_attributes_class.h" > +#include <linux/firmware_attributes.h> > > #define LENOVO_OTHER_MODE_GUID "DC2A8805-3A8C-41BA-A6F7-092E0089CD3B" > > diff --git a/drivers/platform/x86/samsung-galaxybook.c > b/drivers/platform/x86/samsung-galaxybook.c > index 6382af0b106c..74b8c887dd79 100644 > --- a/drivers/platform/x86/samsung-galaxybook.c > +++ b/drivers/platform/x86/samsung-galaxybook.c > @@ -28,7 +28,7 @@ > #include <linux/uuid.h> > #include <linux/workqueue.h> > #include <acpi/battery.h> > -#include "firmware_attributes_class.h" > +#include <linux/firmware_attributes.h> > > #define DRIVER_NAME "samsung-galaxybook" > > diff --git a/drivers/platform/x86/firmware_attributes_class.h > b/include/linux/firmware_attributes.h > similarity index 60% > rename from drivers/platform/x86/firmware_attributes_class.h > rename to include/linux/firmware_attributes.h > index d27abe54fcf9..d4026ba1fcc2 100644 > --- a/drivers/platform/x86/firmware_attributes_class.h > +++ b/include/linux/firmware_attributes.h > @@ -2,11 +2,11 @@ > > /* Firmware attributes class helper module */ > > -#ifndef FW_ATTR_CLASS_H > -#define FW_ATTR_CLASS_H > +#ifndef _LINUX_FIRMWARE_ATTRIBUTES_H > +#define _LINUX_FIRMWARE_ATTRIBUTES_H > > #include <linux/device/class.h> > > extern const struct class firmware_attributes_class; > > -#endif /* FW_ATTR_CLASS_H */ > +#endif /* _LINUX_FIRMWARE_ATTRIBUTES_H */ Looks good to me. Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca> Mark ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 2/3] firmware: Rename google firmware directory to coreboot 2026-07-10 6:12 [PATCH v3 0/3] coreboot CFR firmware attributes Sean Rhodes 2026-07-10 6:12 ` [PATCH v3 1/3] firmware: Move firmware attributes class helper Sean Rhodes @ 2026-07-10 6:12 ` Sean Rhodes 2026-07-10 7:34 ` Thomas Zimmermann 2026-07-10 6:12 ` [PATCH v3 3/3] firmware: coreboot: Add CFR firmware attributes driver Sean Rhodes 2 siblings, 1 reply; 7+ messages in thread From: Sean Rhodes @ 2026-07-10 6:12 UTC (permalink / raw) To: Tzung-Bi Shih Cc: Hans de Goede, Ilpo Järvinen, Corentin Chary, Luke D. Jones, Denis Benato, Prasanth Ksr, Jorge Lopez, Mark Pearson, Derek J. Clark, Joshua Grisham, Sean Rhodes, Michael S. Tsirkin, Huacai Chen, Chen-Yu Tsai, Florian Fainelli, linux-kernel, platform-driver-x86, Dell.Client.Kernel, Brian Norris, Julius Werner, Thomas Zimmermann, Javier Martinez Canillas, Titouan Ameline de Cadeville, Kees Cook, chrome-platform Most drivers in drivers/firmware/google are coreboot table drivers rather than Google-specific firmware drivers. Rename the directory to coreboot and update the Kconfig prompt, build path and maintainer entry. Keep the existing CONFIG_GOOGLE_* symbols to avoid user configuration churn in this mechanical move. Signed-off-by: Sean Rhodes <sean@starlabs.systems> --- MAINTAINERS | 4 ++-- drivers/firmware/Kconfig | 2 +- drivers/firmware/Makefile | 2 +- drivers/firmware/{google => coreboot}/Kconfig | 6 +++--- drivers/firmware/{google => coreboot}/Makefile | 0 drivers/firmware/{google => coreboot}/cbmem.c | 0 drivers/firmware/{google => coreboot}/coreboot_table.c | 0 drivers/firmware/{google => coreboot}/coreboot_table.h | 0 .../firmware/{google => coreboot}/framebuffer-coreboot.c | 0 drivers/firmware/{google => coreboot}/gsmi.c | 0 drivers/firmware/{google => coreboot}/memconsole-coreboot.c | 0 .../firmware/{google => coreboot}/memconsole-x86-legacy.c | 0 drivers/firmware/{google => coreboot}/memconsole.c | 0 drivers/firmware/{google => coreboot}/memconsole.h | 6 +++--- drivers/firmware/{google => coreboot}/vpd.c | 0 drivers/firmware/{google => coreboot}/vpd_decode.c | 0 drivers/firmware/{google => coreboot}/vpd_decode.h | 0 17 files changed, 10 insertions(+), 10 deletions(-) rename drivers/firmware/{google => coreboot}/Kconfig (94%) rename drivers/firmware/{google => coreboot}/Makefile (100%) rename drivers/firmware/{google => coreboot}/cbmem.c (100%) rename drivers/firmware/{google => coreboot}/coreboot_table.c (100%) rename drivers/firmware/{google => coreboot}/coreboot_table.h (100%) rename drivers/firmware/{google => coreboot}/framebuffer-coreboot.c (100%) rename drivers/firmware/{google => coreboot}/gsmi.c (100%) rename drivers/firmware/{google => coreboot}/memconsole-coreboot.c (100%) rename drivers/firmware/{google => coreboot}/memconsole-x86-legacy.c (100%) rename drivers/firmware/{google => coreboot}/memconsole.c (100%) rename drivers/firmware/{google => coreboot}/memconsole.h (82%) rename drivers/firmware/{google => coreboot}/vpd.c (100%) rename drivers/firmware/{google => coreboot}/vpd_decode.c (100%) rename drivers/firmware/{google => coreboot}/vpd_decode.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index ec0a12121357..01344fc92253 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11068,14 +11068,14 @@ S: Maintained F: Documentation/networking/device_drivers/ethernet/google/gve.rst F: drivers/net/ethernet/google -GOOGLE FIRMWARE DRIVERS +COREBOOT FIRMWARE DRIVERS M: Tzung-Bi Shih <tzungbi@kernel.org> R: Brian Norris <briannorris@chromium.org> R: Julius Werner <jwerner@chromium.org> L: chrome-platform@lists.linux.dev S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git -F: drivers/firmware/google/ +F: drivers/firmware/coreboot/ F: include/linux/coreboot.h GOOGLE TENSOR SoC SUPPORT diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 78a239f8bbef..4df0a0ad18b8 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -293,7 +293,7 @@ endif # TURRIS_MOX_RWTM source "drivers/firmware/arm_ffa/Kconfig" source "drivers/firmware/broadcom/Kconfig" source "drivers/firmware/cirrus/Kconfig" -source "drivers/firmware/google/Kconfig" +source "drivers/firmware/coreboot/Kconfig" source "drivers/firmware/efi/Kconfig" source "drivers/firmware/imx/Kconfig" source "drivers/firmware/meson/Kconfig" diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index 385b6e8b7fc6..7a8fc3eeb3f0 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -30,7 +30,7 @@ obj-y += broadcom/ obj-y += cirrus/ obj-y += meson/ obj-y += microchip/ -obj-$(CONFIG_GOOGLE_FIRMWARE) += google/ +obj-$(CONFIG_GOOGLE_FIRMWARE) += coreboot/ obj-y += efi/ obj-y += imx/ obj-y += psci/ diff --git a/drivers/firmware/google/Kconfig b/drivers/firmware/coreboot/Kconfig similarity index 94% rename from drivers/firmware/google/Kconfig rename to drivers/firmware/coreboot/Kconfig index b78c644fa253..b248bafe8b6b 100644 --- a/drivers/firmware/google/Kconfig +++ b/drivers/firmware/coreboot/Kconfig @@ -1,10 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-only menuconfig GOOGLE_FIRMWARE - bool "Google Firmware Drivers" + bool "coreboot firmware drivers" default n help - These firmware drivers are used by Google servers, - Chromebooks and other devices using coreboot firmware. + These firmware drivers are used by devices running coreboot + firmware, including Chromebooks and some Google servers. If in doubt, say "N". if GOOGLE_FIRMWARE diff --git a/drivers/firmware/google/Makefile b/drivers/firmware/coreboot/Makefile similarity index 100% rename from drivers/firmware/google/Makefile rename to drivers/firmware/coreboot/Makefile diff --git a/drivers/firmware/google/cbmem.c b/drivers/firmware/coreboot/cbmem.c similarity index 100% rename from drivers/firmware/google/cbmem.c rename to drivers/firmware/coreboot/cbmem.c diff --git a/drivers/firmware/google/coreboot_table.c b/drivers/firmware/coreboot/coreboot_table.c similarity index 100% rename from drivers/firmware/google/coreboot_table.c rename to drivers/firmware/coreboot/coreboot_table.c diff --git a/drivers/firmware/google/coreboot_table.h b/drivers/firmware/coreboot/coreboot_table.h similarity index 100% rename from drivers/firmware/google/coreboot_table.h rename to drivers/firmware/coreboot/coreboot_table.h diff --git a/drivers/firmware/google/framebuffer-coreboot.c b/drivers/firmware/coreboot/framebuffer-coreboot.c similarity index 100% rename from drivers/firmware/google/framebuffer-coreboot.c rename to drivers/firmware/coreboot/framebuffer-coreboot.c diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/coreboot/gsmi.c similarity index 100% rename from drivers/firmware/google/gsmi.c rename to drivers/firmware/coreboot/gsmi.c diff --git a/drivers/firmware/google/memconsole-coreboot.c b/drivers/firmware/coreboot/memconsole-coreboot.c similarity index 100% rename from drivers/firmware/google/memconsole-coreboot.c rename to drivers/firmware/coreboot/memconsole-coreboot.c diff --git a/drivers/firmware/google/memconsole-x86-legacy.c b/drivers/firmware/coreboot/memconsole-x86-legacy.c similarity index 100% rename from drivers/firmware/google/memconsole-x86-legacy.c rename to drivers/firmware/coreboot/memconsole-x86-legacy.c diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/coreboot/memconsole.c similarity index 100% rename from drivers/firmware/google/memconsole.c rename to drivers/firmware/coreboot/memconsole.c diff --git a/drivers/firmware/google/memconsole.h b/drivers/firmware/coreboot/memconsole.h similarity index 82% rename from drivers/firmware/google/memconsole.h rename to drivers/firmware/coreboot/memconsole.h index aaff2b72b606..58899c2abaaa 100644 --- a/drivers/firmware/google/memconsole.h +++ b/drivers/firmware/coreboot/memconsole.h @@ -7,8 +7,8 @@ * Copyright 2017 Google Inc. */ -#ifndef __FIRMWARE_GOOGLE_MEMCONSOLE_H -#define __FIRMWARE_GOOGLE_MEMCONSOLE_H +#ifndef __FIRMWARE_COREBOOT_MEMCONSOLE_H +#define __FIRMWARE_COREBOOT_MEMCONSOLE_H #include <linux/types.h> @@ -33,4 +33,4 @@ int memconsole_sysfs_init(void); */ void memconsole_exit(void); -#endif /* __FIRMWARE_GOOGLE_MEMCONSOLE_H */ +#endif /* __FIRMWARE_COREBOOT_MEMCONSOLE_H */ diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/coreboot/vpd.c similarity index 100% rename from drivers/firmware/google/vpd.c rename to drivers/firmware/coreboot/vpd.c diff --git a/drivers/firmware/google/vpd_decode.c b/drivers/firmware/coreboot/vpd_decode.c similarity index 100% rename from drivers/firmware/google/vpd_decode.c rename to drivers/firmware/coreboot/vpd_decode.c diff --git a/drivers/firmware/google/vpd_decode.h b/drivers/firmware/coreboot/vpd_decode.h similarity index 100% rename from drivers/firmware/google/vpd_decode.h rename to drivers/firmware/coreboot/vpd_decode.h ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v3 2/3] firmware: Rename google firmware directory to coreboot 2026-07-10 6:12 ` [PATCH v3 2/3] firmware: Rename google firmware directory to coreboot Sean Rhodes @ 2026-07-10 7:34 ` Thomas Zimmermann 0 siblings, 0 replies; 7+ messages in thread From: Thomas Zimmermann @ 2026-07-10 7:34 UTC (permalink / raw) To: Sean Rhodes, Tzung-Bi Shih Cc: Hans de Goede, Ilpo Järvinen, Corentin Chary, Luke D. Jones, Denis Benato, Prasanth Ksr, Jorge Lopez, Mark Pearson, Derek J. Clark, Joshua Grisham, Michael S. Tsirkin, Huacai Chen, Chen-Yu Tsai, Florian Fainelli, linux-kernel, platform-driver-x86, Dell.Client.Kernel, Brian Norris, Julius Werner, Javier Martinez Canillas, Titouan Ameline de Cadeville, Kees Cook, chrome-platform Hi Am 10.07.26 um 08:12 schrieb Sean Rhodes: > Most drivers in drivers/firmware/google are coreboot table drivers rather > than Google-specific firmware drivers. Rename the directory to coreboot > and update the Kconfig prompt, build path and maintainer entry. > > Keep the existing CONFIG_GOOGLE_* symbols to avoid user configuration > churn in this mechanical move. You can use 'transitional' for easily renaming Kconfig options. https://elixir.bootlin.com/linux/v7.1.2/source/Documentation/kbuild/kconfig-language.rst#L245 Best regards Thomas > > Signed-off-by: Sean Rhodes <sean@starlabs.systems> > --- > MAINTAINERS | 4 ++-- > drivers/firmware/Kconfig | 2 +- > drivers/firmware/Makefile | 2 +- > drivers/firmware/{google => coreboot}/Kconfig | 6 +++--- > drivers/firmware/{google => coreboot}/Makefile | 0 > drivers/firmware/{google => coreboot}/cbmem.c | 0 > drivers/firmware/{google => coreboot}/coreboot_table.c | 0 > drivers/firmware/{google => coreboot}/coreboot_table.h | 0 > .../firmware/{google => coreboot}/framebuffer-coreboot.c | 0 > drivers/firmware/{google => coreboot}/gsmi.c | 0 > drivers/firmware/{google => coreboot}/memconsole-coreboot.c | 0 > .../firmware/{google => coreboot}/memconsole-x86-legacy.c | 0 > drivers/firmware/{google => coreboot}/memconsole.c | 0 > drivers/firmware/{google => coreboot}/memconsole.h | 6 +++--- > drivers/firmware/{google => coreboot}/vpd.c | 0 > drivers/firmware/{google => coreboot}/vpd_decode.c | 0 > drivers/firmware/{google => coreboot}/vpd_decode.h | 0 > 17 files changed, 10 insertions(+), 10 deletions(-) > rename drivers/firmware/{google => coreboot}/Kconfig (94%) > rename drivers/firmware/{google => coreboot}/Makefile (100%) > rename drivers/firmware/{google => coreboot}/cbmem.c (100%) > rename drivers/firmware/{google => coreboot}/coreboot_table.c (100%) > rename drivers/firmware/{google => coreboot}/coreboot_table.h (100%) > rename drivers/firmware/{google => coreboot}/framebuffer-coreboot.c (100%) > rename drivers/firmware/{google => coreboot}/gsmi.c (100%) > rename drivers/firmware/{google => coreboot}/memconsole-coreboot.c (100%) > rename drivers/firmware/{google => coreboot}/memconsole-x86-legacy.c (100%) > rename drivers/firmware/{google => coreboot}/memconsole.c (100%) > rename drivers/firmware/{google => coreboot}/memconsole.h (82%) > rename drivers/firmware/{google => coreboot}/vpd.c (100%) > rename drivers/firmware/{google => coreboot}/vpd_decode.c (100%) > rename drivers/firmware/{google => coreboot}/vpd_decode.h (100%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index ec0a12121357..01344fc92253 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -11068,14 +11068,14 @@ S: Maintained > F: Documentation/networking/device_drivers/ethernet/google/gve.rst > F: drivers/net/ethernet/google > > -GOOGLE FIRMWARE DRIVERS > +COREBOOT FIRMWARE DRIVERS > M: Tzung-Bi Shih <tzungbi@kernel.org> > R: Brian Norris <briannorris@chromium.org> > R: Julius Werner <jwerner@chromium.org> > L: chrome-platform@lists.linux.dev > S: Maintained > T: git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git > -F: drivers/firmware/google/ > +F: drivers/firmware/coreboot/ > F: include/linux/coreboot.h > > GOOGLE TENSOR SoC SUPPORT > diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig > index 78a239f8bbef..4df0a0ad18b8 100644 > --- a/drivers/firmware/Kconfig > +++ b/drivers/firmware/Kconfig > @@ -293,7 +293,7 @@ endif # TURRIS_MOX_RWTM > source "drivers/firmware/arm_ffa/Kconfig" > source "drivers/firmware/broadcom/Kconfig" > source "drivers/firmware/cirrus/Kconfig" > -source "drivers/firmware/google/Kconfig" > +source "drivers/firmware/coreboot/Kconfig" > source "drivers/firmware/efi/Kconfig" > source "drivers/firmware/imx/Kconfig" > source "drivers/firmware/meson/Kconfig" > diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile > index 385b6e8b7fc6..7a8fc3eeb3f0 100644 > --- a/drivers/firmware/Makefile > +++ b/drivers/firmware/Makefile > @@ -30,7 +30,7 @@ obj-y += broadcom/ > obj-y += cirrus/ > obj-y += meson/ > obj-y += microchip/ > -obj-$(CONFIG_GOOGLE_FIRMWARE) += google/ > +obj-$(CONFIG_GOOGLE_FIRMWARE) += coreboot/ > obj-y += efi/ > obj-y += imx/ > obj-y += psci/ > diff --git a/drivers/firmware/google/Kconfig b/drivers/firmware/coreboot/Kconfig > similarity index 94% > rename from drivers/firmware/google/Kconfig > rename to drivers/firmware/coreboot/Kconfig > index b78c644fa253..b248bafe8b6b 100644 > --- a/drivers/firmware/google/Kconfig > +++ b/drivers/firmware/coreboot/Kconfig > @@ -1,10 +1,10 @@ > # SPDX-License-Identifier: GPL-2.0-only > menuconfig GOOGLE_FIRMWARE > - bool "Google Firmware Drivers" > + bool "coreboot firmware drivers" > default n > help > - These firmware drivers are used by Google servers, > - Chromebooks and other devices using coreboot firmware. > + These firmware drivers are used by devices running coreboot > + firmware, including Chromebooks and some Google servers. > If in doubt, say "N". > > if GOOGLE_FIRMWARE > diff --git a/drivers/firmware/google/Makefile b/drivers/firmware/coreboot/Makefile > similarity index 100% > rename from drivers/firmware/google/Makefile > rename to drivers/firmware/coreboot/Makefile > diff --git a/drivers/firmware/google/cbmem.c b/drivers/firmware/coreboot/cbmem.c > similarity index 100% > rename from drivers/firmware/google/cbmem.c > rename to drivers/firmware/coreboot/cbmem.c > diff --git a/drivers/firmware/google/coreboot_table.c b/drivers/firmware/coreboot/coreboot_table.c > similarity index 100% > rename from drivers/firmware/google/coreboot_table.c > rename to drivers/firmware/coreboot/coreboot_table.c > diff --git a/drivers/firmware/google/coreboot_table.h b/drivers/firmware/coreboot/coreboot_table.h > similarity index 100% > rename from drivers/firmware/google/coreboot_table.h > rename to drivers/firmware/coreboot/coreboot_table.h > diff --git a/drivers/firmware/google/framebuffer-coreboot.c b/drivers/firmware/coreboot/framebuffer-coreboot.c > similarity index 100% > rename from drivers/firmware/google/framebuffer-coreboot.c > rename to drivers/firmware/coreboot/framebuffer-coreboot.c > diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/coreboot/gsmi.c > similarity index 100% > rename from drivers/firmware/google/gsmi.c > rename to drivers/firmware/coreboot/gsmi.c > diff --git a/drivers/firmware/google/memconsole-coreboot.c b/drivers/firmware/coreboot/memconsole-coreboot.c > similarity index 100% > rename from drivers/firmware/google/memconsole-coreboot.c > rename to drivers/firmware/coreboot/memconsole-coreboot.c > diff --git a/drivers/firmware/google/memconsole-x86-legacy.c b/drivers/firmware/coreboot/memconsole-x86-legacy.c > similarity index 100% > rename from drivers/firmware/google/memconsole-x86-legacy.c > rename to drivers/firmware/coreboot/memconsole-x86-legacy.c > diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/coreboot/memconsole.c > similarity index 100% > rename from drivers/firmware/google/memconsole.c > rename to drivers/firmware/coreboot/memconsole.c > diff --git a/drivers/firmware/google/memconsole.h b/drivers/firmware/coreboot/memconsole.h > similarity index 82% > rename from drivers/firmware/google/memconsole.h > rename to drivers/firmware/coreboot/memconsole.h > index aaff2b72b606..58899c2abaaa 100644 > --- a/drivers/firmware/google/memconsole.h > +++ b/drivers/firmware/coreboot/memconsole.h > @@ -7,8 +7,8 @@ > * Copyright 2017 Google Inc. > */ > > -#ifndef __FIRMWARE_GOOGLE_MEMCONSOLE_H > -#define __FIRMWARE_GOOGLE_MEMCONSOLE_H > +#ifndef __FIRMWARE_COREBOOT_MEMCONSOLE_H > +#define __FIRMWARE_COREBOOT_MEMCONSOLE_H > > #include <linux/types.h> > > @@ -33,4 +33,4 @@ int memconsole_sysfs_init(void); > */ > void memconsole_exit(void); > > -#endif /* __FIRMWARE_GOOGLE_MEMCONSOLE_H */ > +#endif /* __FIRMWARE_COREBOOT_MEMCONSOLE_H */ > diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/coreboot/vpd.c > similarity index 100% > rename from drivers/firmware/google/vpd.c > rename to drivers/firmware/coreboot/vpd.c > diff --git a/drivers/firmware/google/vpd_decode.c b/drivers/firmware/coreboot/vpd_decode.c > similarity index 100% > rename from drivers/firmware/google/vpd_decode.c > rename to drivers/firmware/coreboot/vpd_decode.c > diff --git a/drivers/firmware/google/vpd_decode.h b/drivers/firmware/coreboot/vpd_decode.h > similarity index 100% > rename from drivers/firmware/google/vpd_decode.h > rename to drivers/firmware/coreboot/vpd_decode.h -- -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com GF: Jochen Jaser, Andrew McDonald, (HRB 36809, AG Nürnberg) ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 3/3] firmware: coreboot: Add CFR firmware attributes driver 2026-07-10 6:12 [PATCH v3 0/3] coreboot CFR firmware attributes Sean Rhodes 2026-07-10 6:12 ` [PATCH v3 1/3] firmware: Move firmware attributes class helper Sean Rhodes 2026-07-10 6:12 ` [PATCH v3 2/3] firmware: Rename google firmware directory to coreboot Sean Rhodes @ 2026-07-10 6:12 ` Sean Rhodes 2026-07-10 7:42 ` Uwe Kleine-König 2 siblings, 1 reply; 7+ messages in thread From: Sean Rhodes @ 2026-07-10 6:12 UTC (permalink / raw) To: Tzung-Bi Shih Cc: Hans de Goede, Ilpo Järvinen, Corentin Chary, Luke D. Jones, Denis Benato, Prasanth Ksr, Jorge Lopez, Mark Pearson, Derek J. Clark, Joshua Grisham, Sean Rhodes, Michael S. Tsirkin, Huacai Chen, Chen-Yu Tsai, Florian Fainelli, linux-kernel, platform-driver-x86, Dell.Client.Kernel, Brian Norris, Julius Werner, Thomas Zimmermann, Javier Martinez Canillas, Titouan Ameline de Cadeville, Kees Cook, chrome-platform coreboot can publish a CFR tree in its coreboot table to describe firmware setup options. Add a firmware-attributes driver for that table entry under the coreboot firmware driver directory. The driver exposes runtime EFI variable-backed boolean, enum and integer settings through the firmware-attributes ABI. It only registers settings with readable runtime EFI variables, skips suppressed, volatile, dependency-gated and non-runtime options, and keeps read-only or inactive options read-only in sysfs. For settings with an APM_CNT runtime-apply record, write the EFI variable and ask firmware to apply the setting immediately on x86. If firmware reports a failure, restore the old EFI variable value. Settings without a runtime apply hook, or non-x86 builds, keep the EFI variable update and set pending_reboot. Tested on a Star Labs Byte with firmware 26.07 and the driver built as a module against Linux 6.17: runtime APM_CNT apply was verified with power_led, and reboot-needed behavior was verified with debug_level. Link: https://doc.coreboot.org/drivers/cfr.html Link: https://doc.coreboot.org/drivers/cfr_internal.html Signed-off-by: Sean Rhodes <sean@starlabs.systems> --- MAINTAINERS | 6 + drivers/firmware/coreboot/Kconfig | 13 + drivers/firmware/coreboot/Makefile | 1 + drivers/firmware/coreboot/coreboot-cfr.c | 1068 ++++++++++++++++++++++ 4 files changed, 1088 insertions(+) create mode 100644 drivers/firmware/coreboot/coreboot-cfr.c diff --git a/MAINTAINERS b/MAINTAINERS index 01344fc92253..135040ce8758 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6665,6 +6665,12 @@ F: tools/testing/selftests/cgroup/test_hugetlb_memcg.c F: tools/testing/selftests/cgroup/test_kmem.c F: tools/testing/selftests/cgroup/test_memcontrol.c +COREBOOT CFR FIRMWARE ATTRIBUTES DRIVER +M: Sean Rhodes <sean@starlabs.systems> +L: chrome-platform@lists.linux.dev +S: Maintained +F: drivers/firmware/coreboot/coreboot-cfr.c + CORETEMP HARDWARE MONITORING DRIVER L: linux-hwmon@vger.kernel.org S: Orphan diff --git a/drivers/firmware/coreboot/Kconfig b/drivers/firmware/coreboot/Kconfig index b248bafe8b6b..e935a31e508d 100644 --- a/drivers/firmware/coreboot/Kconfig +++ b/drivers/firmware/coreboot/Kconfig @@ -44,6 +44,19 @@ config GOOGLE_COREBOOT_TABLE device tree node /firmware/coreboot. If unsure say N. +config COREBOOT_CFR + tristate "coreboot CFR firmware attributes" + depends on EFI + depends on GOOGLE_COREBOOT_TABLE + select FW_ATTR_CLASS + help + This driver parses the coreboot CFR table and exposes runtime EFI + variable-backed options through the firmware-attributes sysfs + interface. + + If you have a system running coreboot with CFR runtime + configuration support, say Y or M here. + config GOOGLE_MEMCONSOLE tristate depends on GOOGLE_MEMCONSOLE_X86_LEGACY || GOOGLE_MEMCONSOLE_COREBOOT diff --git a/drivers/firmware/coreboot/Makefile b/drivers/firmware/coreboot/Makefile index 8151e323cc43..1b9d0c0e7593 100644 --- a/drivers/firmware/coreboot/Makefile +++ b/drivers/firmware/coreboot/Makefile @@ -2,6 +2,7 @@ obj-$(CONFIG_GOOGLE_SMI) += gsmi.o obj-$(CONFIG_GOOGLE_COREBOOT_TABLE) += coreboot_table.o +obj-$(CONFIG_COREBOOT_CFR) += coreboot-cfr.o obj-$(CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT) += framebuffer-coreboot.o obj-$(CONFIG_GOOGLE_MEMCONSOLE) += memconsole.o obj-$(CONFIG_GOOGLE_MEMCONSOLE_COREBOOT) += memconsole-coreboot.o diff --git a/drivers/firmware/coreboot/coreboot-cfr.c b/drivers/firmware/coreboot/coreboot-cfr.c new file mode 100644 index 000000000000..25b8354a4fd5 --- /dev/null +++ b/drivers/firmware/coreboot/coreboot-cfr.c @@ -0,0 +1,1068 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * coreboot CFR firmware attributes driver. + * + * Parses LB_TAG_CFR_ROOT records from the coreboot table and exposes + * runtime EFI variable-backed options through the firmware-attributes class. + */ + +#include <linux/array_size.h> +#include <linux/bitops.h> +#include <linux/cleanup.h> +#include <linux/ctype.h> +#include <linux/efi.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/kdev_t.h> +#include <linux/kobject.h> +#include <linux/limits.h> +#include <linux/list.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/slab.h> +#include <linux/string.h> +#include <linux/sysfs.h> +#include <linux/types.h> + +#include <linux/firmware_attributes.h> + +#include "coreboot_table.h" + +#define DRIVER_NAME "coreboot-cfr" + +#define LB_TAG_CFR_ROOT 0x47 +#define CFR_VERSION 0 + +enum cfr_tags { + CFR_TAG_OPTION_FORM = 1, + CFR_TAG_ENUM_VALUE = 2, + CFR_TAG_OPTION_ENUM = 3, + CFR_TAG_OPTION_NUMBER = 4, + CFR_TAG_OPTION_BOOL = 5, + CFR_TAG_VARCHAR_OPT_NAME = 7, + CFR_TAG_VARCHAR_UI_NAME = 8, + CFR_TAG_RUNTIME_APPLY = 13, +}; + +enum cfr_option_flags { + CFR_OPTFLAG_READONLY = BIT(0), + CFR_OPTFLAG_INACTIVE = BIT(1), + CFR_OPTFLAG_SUPPRESS = BIT(2), + CFR_OPTFLAG_VOLATILE = BIT(3), + CFR_OPTFLAG_RUNTIME = BIT(4), +}; + +enum cfr_runtime_apply_method { + CFR_RUNTIME_APPLY_NONE = 0, + CFR_RUNTIME_APPLY_APM_CNT = 1, +}; + +struct lb_cfr { + u32 tag; + u32 size; + u32 version; + u32 checksum; +} __packed; + +struct lb_cfr_varbinary { + u32 tag; + u32 size; + u32 data_length; +} __packed; + +struct lb_cfr_enum_value { + u32 tag; + u32 size; + u32 value; +} __packed; + +struct lb_cfr_runtime_apply { + u32 tag; + u32 size; + u32 method; + u32 id; +} __packed; + +struct lb_cfr_numeric_option { + u32 tag; + u32 size; + cb_u64 object_id; + cb_u64 dependency_id; + u32 flags; + u32 default_value; + u32 min; + u32 max; + u32 step; + u32 display_flags; +} __packed; + +struct lb_cfr_option_form { + u32 tag; + u32 size; + cb_u64 object_id; + cb_u64 dependency_id; + u32 flags; +} __packed; + +#define COREBOOT_CFR_OPT_SKIP_FLAGS \ + (CFR_OPTFLAG_SUPPRESS | CFR_OPTFLAG_VOLATILE) + +#define COREBOOT_CFR_OPT_READ_ONLY_FLAGS \ + (CFR_OPTFLAG_READONLY | CFR_OPTFLAG_INACTIVE) + +#define COREBOOT_CFR_EFI_ATTRS \ + (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | \ + EFI_VARIABLE_RUNTIME_ACCESS) + +#define COREBOOT_CFR_APM_CNT_PORT 0xb2 +#define COREBOOT_CFR_APM_STS_PORT 0xb3 +#define COREBOOT_CFR_APM_APPLY_CMD 0xe3 + +static efi_guid_t coreboot_cfr_guid = EFI_GUID(0xceae4c1d, 0x335b, 0x4685, + 0xa4, 0xa0, 0xfc, 0x4a, + 0x94, 0xee, 0xa0, 0x85); + +enum coreboot_cfr_setting_type { + COREBOOT_CFR_SETTING_ENUM, + COREBOOT_CFR_SETTING_NUMBER, + COREBOOT_CFR_SETTING_BOOL, +}; + +struct coreboot_cfr_enum { + char *label; + u32 value; +}; + +struct coreboot_cfr_setting { + struct kobject kobj; + struct list_head node; + struct coreboot_cfr_drvdata *drvdata; + enum coreboot_cfr_setting_type type; + char *name; + char *display_name; + struct coreboot_cfr_enum *values; + unsigned int n_values; + u32 default_value; + u32 min; + u32 max; + u32 step; + u32 runtime_apply_method; + u32 runtime_apply_id; + bool read_only; +}; + +struct coreboot_cfr_drvdata { + struct device *class_dev; + struct kset *attrs_kset; + struct list_head settings; + /* Serializes EFI variable writes and the matching runtime apply hook. */ + struct mutex lock; + bool pending_reboot; +}; + +static struct coreboot_cfr_drvdata *coreboot_cfr_data; + +static struct coreboot_cfr_setting *to_coreboot_cfr_setting(struct kobject *kobj) +{ + return container_of(kobj, struct coreboot_cfr_setting, kobj); +} + +static bool coreboot_cfr_string_is_valid_name(const char *name) +{ + return name && name[0] && !strchr(name, '/'); +} + +static char *coreboot_cfr_string_dup(const struct lb_cfr_varbinary *str) +{ + const char *data = (const char *)str + sizeof(*str); + size_t len = str->data_length; + + if (len && !data[len - 1]) + len--; + + return kmemdup_nul(data, len, GFP_KERNEL); +} + +static const struct coreboot_table_entry * +coreboot_cfr_child_entry(const void *base, size_t len, u32 tag) +{ + const struct coreboot_table_entry *entry; + size_t off = 0; + + while (off < len) { + if (len - off < sizeof(*entry)) + return NULL; + + entry = base + off; + if (entry->size < sizeof(*entry) || entry->size > len - off) + return NULL; + + if (entry->tag == tag) + return entry; + + off += entry->size; + } + + return NULL; +} + +static const struct lb_cfr_varbinary * +coreboot_cfr_child_string(const void *base, size_t len, u32 tag) +{ + const struct lb_cfr_varbinary *str; + const struct coreboot_table_entry *entry; + + entry = coreboot_cfr_child_entry(base, len, tag); + if (!entry) + return NULL; + + if (entry->size < sizeof(*str)) + return NULL; + + str = (const struct lb_cfr_varbinary *)entry; + if (str->data_length > entry->size - sizeof(*str)) + return NULL; + + return str; +} + +static const struct lb_cfr_runtime_apply * +coreboot_cfr_child_runtime_apply(const void *base, size_t len) +{ + const struct lb_cfr_runtime_apply *runtime_apply; + const struct coreboot_table_entry *entry; + + entry = coreboot_cfr_child_entry(base, len, CFR_TAG_RUNTIME_APPLY); + if (!entry) + return NULL; + + if (entry->size < sizeof(*runtime_apply)) + return ERR_PTR(-EINVAL); + + runtime_apply = (const struct lb_cfr_runtime_apply *)entry; + if (runtime_apply->method == CFR_RUNTIME_APPLY_APM_CNT && + runtime_apply->id > U8_MAX) + return ERR_PTR(-EINVAL); + + return runtime_apply; +} + +static efi_char16_t *coreboot_cfr_efi_name(const char *name) +{ + size_t len, i; + + len = strlen(name); + if (len >= EFI_VAR_NAME_LEN) + return ERR_PTR(-ENAMETOOLONG); + + efi_char16_t *efi_name __free(kfree) = + kcalloc(len + 1, sizeof(*efi_name), GFP_KERNEL); + if (!efi_name) + return ERR_PTR(-ENOMEM); + + for (i = 0; i < len; i++) { + if (!isascii(name[i])) + return ERR_PTR(-EINVAL); + efi_name[i] = name[i]; + } + + return no_free_ptr(efi_name); +} + +static int coreboot_cfr_read_value(const struct coreboot_cfr_setting *setting, + u32 *value, u32 *attrs) +{ + unsigned long size = sizeof(__le32); + efi_char16_t *efi_name; + efi_status_t status; + __le32 data; + u32 attr; + + efi_name = coreboot_cfr_efi_name(setting->name); + if (IS_ERR(efi_name)) + return PTR_ERR(efi_name); + + status = efivar_get_variable(efi_name, &coreboot_cfr_guid, &attr, + &size, &data); + kfree(efi_name); + if (status != EFI_SUCCESS) + return efi_status_to_err(status); + + if (size != sizeof(data)) + return -EINVAL; + + if (!(attr & EFI_VARIABLE_RUNTIME_ACCESS)) + return -EOPNOTSUPP; + + *value = le32_to_cpu(data); + if (attrs) + *attrs = attr; + + return 0; +} + +static int coreboot_cfr_write_efi_value(struct coreboot_cfr_setting *setting, + u32 value, u32 attrs) +{ + efi_char16_t *efi_name; + efi_status_t status; + __le32 data; + + efi_name = coreboot_cfr_efi_name(setting->name); + if (IS_ERR(efi_name)) + return PTR_ERR(efi_name); + + data = cpu_to_le32(value); + status = efivar_set_variable(efi_name, &coreboot_cfr_guid, attrs, + sizeof(data), &data); + kfree(efi_name); + if (status != EFI_SUCCESS) + return efi_status_to_err(status); + + return 0; +} + +static int coreboot_cfr_apply_runtime(struct coreboot_cfr_setting *setting) +{ +#ifdef CONFIG_X86 + u8 status; + + if (setting->runtime_apply_method != CFR_RUNTIME_APPLY_APM_CNT || + !setting->runtime_apply_id) + return -EOPNOTSUPP; + + outb((u8)setting->runtime_apply_id, COREBOOT_CFR_APM_STS_PORT); + outb(COREBOOT_CFR_APM_APPLY_CMD, COREBOOT_CFR_APM_CNT_PORT); + status = inb(COREBOOT_CFR_APM_STS_PORT); + if (status) + return -EIO; + + return 0; +#else + return -EOPNOTSUPP; +#endif +} + +static int coreboot_cfr_write_value(struct coreboot_cfr_setting *setting, + u32 value) +{ + u32 attrs; + u32 old; + int ret; + bool changed = false; + + if (setting->read_only) + return -EACCES; + + scoped_guard(mutex, &setting->drvdata->lock) { + ret = coreboot_cfr_read_value(setting, &old, &attrs); + if (ret) + return ret; + + if ((attrs & COREBOOT_CFR_EFI_ATTRS) != COREBOOT_CFR_EFI_ATTRS) + return -EOPNOTSUPP; + + if (old == value) + return 0; + + ret = coreboot_cfr_write_efi_value(setting, value, attrs); + if (ret) + return ret; + changed = true; + + ret = coreboot_cfr_apply_runtime(setting); + if (ret == -EOPNOTSUPP) { + /* EFI changed; firmware will consume it after reboot. */ + setting->drvdata->pending_reboot = true; + ret = 0; + } else if (ret) { + int restore_ret; + + restore_ret = coreboot_cfr_write_efi_value(setting, old, attrs); + if (restore_ret) + ret = restore_ret; + else + changed = false; + } + } + + if (changed) + kobject_uevent(&setting->drvdata->class_dev->kobj, KOBJ_CHANGE); + return ret; +} + +static const char * +coreboot_cfr_label_from_value(const struct coreboot_cfr_setting *setting, + u32 value) +{ + unsigned int i; + + for (i = 0; i < setting->n_values; i++) { + if (setting->values[i].value == value) + return setting->values[i].label; + } + + return NULL; +} + +static int coreboot_cfr_parse_value(struct coreboot_cfr_setting *setting, + const char *label, u32 *value_out) +{ + unsigned int i; + + for (i = 0; i < setting->n_values; i++) { + if (!sysfs_streq(label, setting->values[i].label)) + continue; + + *value_out = setting->values[i].value; + return 0; + } + + return kstrtou32(label, 0, value_out); +} + +static bool coreboot_cfr_value_is_valid(struct coreboot_cfr_setting *setting, + u32 value) +{ + u32 delta; + + if (setting->type != COREBOOT_CFR_SETTING_NUMBER) + return coreboot_cfr_label_from_value(setting, value); + + if (value < setting->min || value > setting->max) + return false; + + if (!setting->step) + return true; + + delta = value - setting->min; + return delta % setting->step == 0; +} + +static ssize_t type_show(struct kobject *kobj, struct kobj_attribute *attr, + char *buf) +{ + struct coreboot_cfr_setting *setting = to_coreboot_cfr_setting(kobj); + + if (setting->type == COREBOOT_CFR_SETTING_NUMBER) + return sysfs_emit(buf, "integer\n"); + + return sysfs_emit(buf, "enumeration\n"); +} + +static ssize_t display_name_language_code_show(struct kobject *kobj, + struct kobj_attribute *attr, + char *buf) +{ + return sysfs_emit(buf, "en_US.UTF-8\n"); +} + +static ssize_t display_name_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + struct coreboot_cfr_setting *setting = to_coreboot_cfr_setting(kobj); + + return sysfs_emit(buf, "%s\n", setting->display_name); +} + +static ssize_t possible_values_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + struct coreboot_cfr_setting *setting = to_coreboot_cfr_setting(kobj); + ssize_t len = 0; + unsigned int i; + + for (i = 0; i < setting->n_values; i++) { + len += sysfs_emit_at(buf, len, "%s%s", i ? ";" : "", + setting->values[i].label); + if (len >= PAGE_SIZE) + return len; + } + + len += sysfs_emit_at(buf, len, "\n"); + return len; +} + +static ssize_t min_value_show(struct kobject *kobj, struct kobj_attribute *attr, + char *buf) +{ + struct coreboot_cfr_setting *setting = to_coreboot_cfr_setting(kobj); + + return sysfs_emit(buf, "%u\n", setting->min); +} + +static ssize_t max_value_show(struct kobject *kobj, struct kobj_attribute *attr, + char *buf) +{ + struct coreboot_cfr_setting *setting = to_coreboot_cfr_setting(kobj); + + return sysfs_emit(buf, "%u\n", setting->max); +} + +static ssize_t scalar_increment_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + struct coreboot_cfr_setting *setting = to_coreboot_cfr_setting(kobj); + + return sysfs_emit(buf, "%u\n", setting->step); +} + +static ssize_t default_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + struct coreboot_cfr_setting *setting = to_coreboot_cfr_setting(kobj); + const char *label; + + if (setting->type == COREBOOT_CFR_SETTING_NUMBER) + return sysfs_emit(buf, "%u\n", setting->default_value); + + label = coreboot_cfr_label_from_value(setting, setting->default_value); + if (!label) + return sysfs_emit(buf, "%u\n", setting->default_value); + + return sysfs_emit(buf, "%s\n", label); +} + +static ssize_t current_value_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + struct coreboot_cfr_setting *setting = to_coreboot_cfr_setting(kobj); + const char *label; + u32 value; + int ret; + + ret = coreboot_cfr_read_value(setting, &value, NULL); + if (ret) + return ret; + + if (setting->type == COREBOOT_CFR_SETTING_NUMBER) + return sysfs_emit(buf, "%u\n", value); + + label = coreboot_cfr_label_from_value(setting, value); + if (!label) + return -EINVAL; + + return sysfs_emit(buf, "%s\n", label); +} + +static ssize_t current_value_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + struct coreboot_cfr_setting *setting = to_coreboot_cfr_setting(kobj); + u32 value; + int ret; + + ret = coreboot_cfr_parse_value(setting, buf, &value); + if (ret) + return ret; + + if (!coreboot_cfr_value_is_valid(setting, value)) + return -EINVAL; + + ret = coreboot_cfr_write_value(setting, value); + if (ret) + return ret; + + return count; +} + +static struct kobj_attribute type_attr = __ATTR_RO(type); +static struct kobj_attribute display_name_language_code_attr = + __ATTR_RO(display_name_language_code); +static struct kobj_attribute display_name_attr = __ATTR_RO(display_name); +static struct kobj_attribute possible_values_attr = __ATTR_RO(possible_values); +static struct kobj_attribute min_value_attr = __ATTR_RO(min_value); +static struct kobj_attribute max_value_attr = __ATTR_RO(max_value); +static struct kobj_attribute scalar_increment_attr = __ATTR_RO(scalar_increment); +static struct kobj_attribute default_value_attr = __ATTR_RO(default_value); +static struct kobj_attribute current_value_attr = __ATTR_RW(current_value); + +static struct attribute *coreboot_cfr_setting_attrs[] = { + &type_attr.attr, + &display_name_language_code_attr.attr, + &display_name_attr.attr, + &possible_values_attr.attr, + &min_value_attr.attr, + &max_value_attr.attr, + &scalar_increment_attr.attr, + &default_value_attr.attr, + ¤t_value_attr.attr, + NULL, +}; + +static umode_t coreboot_cfr_attr_is_visible(struct kobject *kobj, + struct attribute *attr, int n) +{ + struct coreboot_cfr_setting *setting = to_coreboot_cfr_setting(kobj); + + if (setting->type == COREBOOT_CFR_SETTING_NUMBER && + attr == &possible_values_attr.attr) + return 0; + + if (setting->type != COREBOOT_CFR_SETTING_NUMBER && + (attr == &min_value_attr.attr || attr == &max_value_attr.attr || + attr == &scalar_increment_attr.attr)) + return 0; + + if (setting->read_only && attr == ¤t_value_attr.attr) + return 0444; + + return attr->mode; +} + +static const struct attribute_group coreboot_cfr_setting_group = { + .attrs = coreboot_cfr_setting_attrs, + .is_visible = coreboot_cfr_attr_is_visible, +}; + +static void coreboot_cfr_free_setting(struct coreboot_cfr_setting *setting) +{ + unsigned int i; + + for (i = 0; i < setting->n_values; i++) + kfree(setting->values[i].label); + + kfree(setting->values); + kfree(setting->display_name); + kfree(setting->name); + kfree(setting); +} + +static void coreboot_cfr_setting_release(struct kobject *kobj) +{ + coreboot_cfr_free_setting(to_coreboot_cfr_setting(kobj)); +} + +static const struct kobj_type coreboot_cfr_setting_ktype = { + .release = coreboot_cfr_setting_release, + .sysfs_ops = &kobj_sysfs_ops, +}; + +static ssize_t pending_reboot_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return sysfs_emit(buf, "%d\n", + coreboot_cfr_data && coreboot_cfr_data->pending_reboot); +} + +static struct kobj_attribute pending_reboot_attr = __ATTR_RO(pending_reboot); + +static int coreboot_cfr_copy_bool_values(struct coreboot_cfr_setting *setting) +{ + static const struct coreboot_cfr_enum bool_values[] = { + { .label = "Disabled", .value = 0 }, + { .label = "Enabled", .value = 1 }, + }; + unsigned int i; + + setting->values = kcalloc(ARRAY_SIZE(bool_values), sizeof(*setting->values), + GFP_KERNEL); + if (!setting->values) + return -ENOMEM; + + for (i = 0; i < ARRAY_SIZE(bool_values); i++) { + setting->values[i].label = kstrdup(bool_values[i].label, + GFP_KERNEL); + if (!setting->values[i].label) + return -ENOMEM; + setting->values[i].value = bool_values[i].value; + setting->n_values++; + } + + return 0; +} + +static int coreboot_cfr_count_enum_values(const void *base, size_t len) +{ + const struct coreboot_table_entry *entry; + size_t off = 0; + int count = 0; + + while (off < len) { + if (len - off < sizeof(*entry)) + return -EINVAL; + + entry = base + off; + if (entry->size < sizeof(*entry) || entry->size > len - off) + return -EINVAL; + + if (entry->tag == CFR_TAG_ENUM_VALUE) + count++; + + off += entry->size; + } + + return count; +} + +static int coreboot_cfr_copy_enum_values(struct coreboot_cfr_setting *setting, + const void *base, size_t len) +{ + const struct lb_cfr_enum_value *enum_value; + const struct lb_cfr_varbinary *label; + const struct coreboot_table_entry *entry; + size_t off = 0; + int count; + + count = coreboot_cfr_count_enum_values(base, len); + if (count <= 0) + return count ?: -EINVAL; + + setting->values = kcalloc(count, sizeof(*setting->values), GFP_KERNEL); + if (!setting->values) + return -ENOMEM; + + while (off < len) { + entry = base + off; + if (entry->tag != CFR_TAG_ENUM_VALUE) { + off += entry->size; + continue; + } + + if (entry->size < sizeof(*enum_value)) + return -EINVAL; + + enum_value = base + off; + label = coreboot_cfr_child_string(enum_value + 1, + enum_value->size - sizeof(*enum_value), + CFR_TAG_VARCHAR_UI_NAME); + if (!label) + return -EINVAL; + + setting->values[setting->n_values].label = + coreboot_cfr_string_dup(label); + if (!setting->values[setting->n_values].label) + return -ENOMEM; + + setting->values[setting->n_values].value = enum_value->value; + setting->n_values++; + off += entry->size; + } + + return 0; +} + +static int coreboot_cfr_setting_is_usable(struct coreboot_cfr_setting *setting) +{ + u32 value; + int ret; + + ret = coreboot_cfr_read_value(setting, &value, NULL); + if (ret) + return ret; + + if (!coreboot_cfr_value_is_valid(setting, value)) + return -EINVAL; + + return 0; +} + +static int coreboot_cfr_register_setting(struct coreboot_cfr_drvdata *data, + struct coreboot_cfr_setting *setting) +{ + int ret; + + ret = kobject_init_and_add(&setting->kobj, &coreboot_cfr_setting_ktype, + &data->attrs_kset->kobj, "%s", setting->name); + if (ret) { + kobject_put(&setting->kobj); + return ret; + } + + ret = sysfs_create_group(&setting->kobj, &coreboot_cfr_setting_group); + if (ret) { + kobject_put(&setting->kobj); + return ret; + } + + list_add_tail(&setting->node, &data->settings); + return 0; +} + +static int coreboot_cfr_add_numeric_option(struct coreboot_cfr_drvdata *data, + const struct lb_cfr_numeric_option *option) +{ + const struct lb_cfr_varbinary *name; + const struct lb_cfr_varbinary *display_name; + const struct lb_cfr_runtime_apply *runtime_apply; + const void *child_base = option + 1; + struct coreboot_cfr_setting *setting; + size_t child_len = option->size - sizeof(*option); + int ret; + + if (!(option->flags & CFR_OPTFLAG_RUNTIME)) + return 0; + + if (option->flags & COREBOOT_CFR_OPT_SKIP_FLAGS) + return 0; + + if (option->dependency_id) + return 0; + + setting = kzalloc_obj(*setting, GFP_KERNEL); + if (!setting) + return -ENOMEM; + + INIT_LIST_HEAD(&setting->node); + setting->drvdata = data; + setting->default_value = option->default_value; + setting->min = option->min; + setting->max = option->max; + setting->step = option->step ?: 1; + setting->read_only = option->flags & COREBOOT_CFR_OPT_READ_ONLY_FLAGS; + + runtime_apply = coreboot_cfr_child_runtime_apply(child_base, child_len); + if (IS_ERR(runtime_apply)) { + ret = PTR_ERR(runtime_apply); + goto err_put_setting; + } + + if (runtime_apply && runtime_apply->method == CFR_RUNTIME_APPLY_APM_CNT && + runtime_apply->id) { + setting->runtime_apply_method = runtime_apply->method; + setting->runtime_apply_id = runtime_apply->id; + } + + name = coreboot_cfr_child_string(child_base, child_len, + CFR_TAG_VARCHAR_OPT_NAME); + if (!name) { + ret = -EINVAL; + goto err_put_setting; + } + + setting->name = coreboot_cfr_string_dup(name); + if (!setting->name) { + ret = -ENOMEM; + goto err_put_setting; + } + + if (!coreboot_cfr_string_is_valid_name(setting->name)) { + ret = -EINVAL; + goto err_put_setting; + } + + display_name = coreboot_cfr_child_string(child_base, child_len, + CFR_TAG_VARCHAR_UI_NAME); + if (display_name) + setting->display_name = coreboot_cfr_string_dup(display_name); + else + setting->display_name = kstrdup(setting->name, GFP_KERNEL); + if (!setting->display_name) { + ret = -ENOMEM; + goto err_put_setting; + } + + switch (option->tag) { + case CFR_TAG_OPTION_BOOL: + setting->type = COREBOOT_CFR_SETTING_BOOL; + setting->min = 0; + setting->max = 1; + setting->step = 1; + ret = coreboot_cfr_copy_bool_values(setting); + break; + case CFR_TAG_OPTION_ENUM: + setting->type = COREBOOT_CFR_SETTING_ENUM; + ret = coreboot_cfr_copy_enum_values(setting, child_base, + child_len); + break; + case CFR_TAG_OPTION_NUMBER: + setting->type = COREBOOT_CFR_SETTING_NUMBER; + if (!setting->min && !setting->max) + setting->max = U32_MAX; + else if (setting->max < setting->min) + setting->max = U32_MAX; + ret = 0; + break; + default: + ret = -EINVAL; + break; + } + + if (ret) + goto err_put_setting; + + ret = coreboot_cfr_setting_is_usable(setting); + if (ret) { + ret = 0; + goto err_put_setting; + } + + ret = coreboot_cfr_register_setting(data, setting); + if (ret) + return ret; + + return 0; + +err_put_setting: + coreboot_cfr_free_setting(setting); + return ret; +} + +static int coreboot_cfr_parse_records(struct coreboot_cfr_drvdata *data, + const void *base, size_t len) +{ + const struct coreboot_table_entry *entry; + const void *child_base; + size_t child_len; + size_t off = 0; + int ret; + + while (off < len) { + if (len - off < sizeof(*entry)) + return -EINVAL; + + entry = base + off; + if (entry->size < sizeof(*entry) || entry->size > len - off) + return -EINVAL; + + switch (entry->tag) { + case CFR_TAG_OPTION_FORM: + if (entry->size < sizeof(struct lb_cfr_option_form)) + return -EINVAL; + + child_base = base + off + sizeof(struct lb_cfr_option_form); + child_len = entry->size - sizeof(struct lb_cfr_option_form); + ret = coreboot_cfr_parse_records(data, child_base, + child_len); + if (ret) + return ret; + break; + case CFR_TAG_OPTION_ENUM: + case CFR_TAG_OPTION_NUMBER: + case CFR_TAG_OPTION_BOOL: + if (entry->size < sizeof(struct lb_cfr_numeric_option)) + return -EINVAL; + ret = coreboot_cfr_add_numeric_option(data, base + off); + if (ret) + return ret; + break; + default: + break; + } + + off += entry->size; + } + + return 0; +} + +static void coreboot_cfr_unregister_settings(struct coreboot_cfr_drvdata *data) +{ + struct coreboot_cfr_setting *setting, *tmp; + + list_for_each_entry_safe(setting, tmp, &data->settings, node) { + sysfs_remove_group(&setting->kobj, &coreboot_cfr_setting_group); + list_del(&setting->node); + kobject_put(&setting->kobj); + } +} + +static int coreboot_cfr_probe(struct coreboot_device *dev) +{ + const struct lb_cfr *root = (const struct lb_cfr *)dev->raw; + struct coreboot_cfr_drvdata *data; + size_t payload_len; + int ret; + + if (dev->entry.size < sizeof(*root)) + return -EINVAL; + + if (root->tag != LB_TAG_CFR_ROOT || root->version != CFR_VERSION) + return -EINVAL; + + if (root->size < sizeof(*root) || root->size > dev->entry.size) + return -EINVAL; + + if (!efivar_is_available()) + return -EPROBE_DEFER; + + data = devm_kzalloc(&dev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + INIT_LIST_HEAD(&data->settings); + ret = devm_mutex_init(&dev->dev, &data->lock); + if (ret) + return ret; + + dev_set_drvdata(&dev->dev, data); + coreboot_cfr_data = data; + + data->class_dev = device_create(&firmware_attributes_class, NULL, + MKDEV(0, 0), NULL, DRIVER_NAME); + if (IS_ERR(data->class_dev)) { + ret = PTR_ERR(data->class_dev); + goto err_clear_data; + } + + data->attrs_kset = kset_create_and_add("attributes", NULL, + &data->class_dev->kobj); + if (!data->attrs_kset) { + ret = -ENOMEM; + goto err_unregister_dev; + } + + ret = sysfs_create_file(&data->attrs_kset->kobj, + &pending_reboot_attr.attr); + if (ret) + goto err_unregister_attrs; + + payload_len = root->size - sizeof(*root); + ret = coreboot_cfr_parse_records(data, root + 1, payload_len); + if (ret) + goto err_unregister_settings; + + if (list_empty(&data->settings)) { + ret = -ENODEV; + goto err_unregister_settings; + } + + return 0; + +err_unregister_settings: + coreboot_cfr_unregister_settings(data); + sysfs_remove_file(&data->attrs_kset->kobj, &pending_reboot_attr.attr); +err_unregister_attrs: + kset_unregister(data->attrs_kset); +err_unregister_dev: + device_unregister(data->class_dev); +err_clear_data: + if (coreboot_cfr_data == data) + coreboot_cfr_data = NULL; + return ret; +} + +static void coreboot_cfr_remove(struct coreboot_device *dev) +{ + struct coreboot_cfr_drvdata *data = dev_get_drvdata(&dev->dev); + + coreboot_cfr_unregister_settings(data); + sysfs_remove_file(&data->attrs_kset->kobj, &pending_reboot_attr.attr); + kset_unregister(data->attrs_kset); + device_unregister(data->class_dev); + if (coreboot_cfr_data == data) + coreboot_cfr_data = NULL; +} + +static const struct coreboot_device_id coreboot_cfr_ids[] = { + { .tag = LB_TAG_CFR_ROOT }, + { } +}; +MODULE_DEVICE_TABLE(coreboot, coreboot_cfr_ids); + +static struct coreboot_driver coreboot_cfr_driver = { + .probe = coreboot_cfr_probe, + .remove = coreboot_cfr_remove, + .drv = { + .name = DRIVER_NAME, + }, + .id_table = coreboot_cfr_ids, +}; +module_coreboot_driver(coreboot_cfr_driver); + +MODULE_AUTHOR("Sean Rhodes <sean@starlabs.systems>"); +MODULE_DESCRIPTION("coreboot CFR firmware attributes driver"); +MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS("EFIVAR"); ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v3 3/3] firmware: coreboot: Add CFR firmware attributes driver 2026-07-10 6:12 ` [PATCH v3 3/3] firmware: coreboot: Add CFR firmware attributes driver Sean Rhodes @ 2026-07-10 7:42 ` Uwe Kleine-König 0 siblings, 0 replies; 7+ messages in thread From: Uwe Kleine-König @ 2026-07-10 7:42 UTC (permalink / raw) To: Sean Rhodes Cc: Tzung-Bi Shih, Hans de Goede, Ilpo Järvinen, Corentin Chary, Luke D. Jones, Denis Benato, Prasanth Ksr, Jorge Lopez, Mark Pearson, Derek J. Clark, Joshua Grisham, Michael S. Tsirkin, Huacai Chen, Chen-Yu Tsai, Florian Fainelli, linux-kernel, platform-driver-x86, Dell.Client.Kernel, Brian Norris, Julius Werner, Thomas Zimmermann, Javier Martinez Canillas, Titouan Ameline de Cadeville, Kees Cook, chrome-platform [-- Attachment #1: Type: text/plain, Size: 231 bytes --] On Fri, Jul 10, 2026 at 07:12:46AM +0100, Sean Rhodes wrote: > +#include <linux/mod_devicetable.h> Please don't add new users for this header file. Only use those <linux/device-id/*.h> that you actually need (if any). Thanks Uwe [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2026-07-10 12:12 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2026-07-10 6:12 [PATCH v3 0/3] coreboot CFR firmware attributes Sean Rhodes 2026-07-10 6:12 ` [PATCH v3 1/3] firmware: Move firmware attributes class helper Sean Rhodes 2026-07-10 12:11 ` Mark Pearson 2026-07-10 6:12 ` [PATCH v3 2/3] firmware: Rename google firmware directory to coreboot Sean Rhodes 2026-07-10 7:34 ` Thomas Zimmermann 2026-07-10 6:12 ` [PATCH v3 3/3] firmware: coreboot: Add CFR firmware attributes driver Sean Rhodes 2026-07-10 7:42 ` Uwe Kleine-König
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox