From nobody Sat Jul 25 22:03:30 2026 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D8523ACA6E for ; Mon, 13 Jul 2026 08:13:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783930408; cv=none; b=TNNZjbR79InDVvsizPoqHg3Al3glbQCpYr56hqtIYpvyApnfCmIfn1Rrwx23ygpoA62sd9LNHtq5B1+fzoNAG2V0KdrxbLWP7InpKbmulAZLnDt96ghQMi70QMLK7ADTj37xBbNlT0AYki9nopraXzdoR312dlayF0WSPvZW6cA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783930408; c=relaxed/simple; bh=35oUoRW0DK5+n+ACxF4dgMpIlFiiBt5t+nhavC6fIq8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MEdZ2ta/C3Is5bgziSWb0thLMndJqsjS4Pur0JTGpcnUZKgS2ghVzFuwh1oYBnIhJG3lEAzOBclv7NctBQt1xYRmk4s+MfGqTBMCD1vev2kWA4skKEQ3N7cyLHbJo2rS6C9V4X/GTXyQ9f+081IVo4TcEhMjLfL0jZPKdjBY7v4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=starlabs.systems; spf=pass smtp.mailfrom=starlabs.systems; dkim=pass (2048-bit key) header.d=starlabs-systems.20251104.gappssmtp.com header.i=@starlabs-systems.20251104.gappssmtp.com header.b=A+PU9dLp; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=starlabs.systems Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=starlabs.systems Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=starlabs-systems.20251104.gappssmtp.com header.i=@starlabs-systems.20251104.gappssmtp.com header.b="A+PU9dLp" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-493ba701891so26685895e9.3 for ; Mon, 13 Jul 2026 01:13:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starlabs-systems.20251104.gappssmtp.com; s=20251104; t=1783930403; x=1784535203; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=HV1xf7W0XqeDB+mrV0SGgj+8q7LrpAPrrGmlafpeAYk=; b=A+PU9dLpvr76z5pdx+2FL3GGanZn90o0LDtalzl6RQx31hKmd5+fkn0MkPCp+B/Q2l 8rxcsI9YPlaGc+SgQM8y9/Hdb7FfFIrejKOQEb5CKj+5AYqpJzw+JN4z/71x/MV1xkkD SmO/j1odVSngqNpha9xO+RlICpbFw+oGcsUR1jQPJZKI9DlxhMxfyPCdCJuO43Dcxr6Z 5YAqpkf+YSUiznBJ+Umtr2hB6LefHr/c74/YvbasdUIqCVIBnEHKg/QSVsi0XqqtJ2PO 6e/Gs6tn+ISsTki8cXA6auO7jRGg16aTnP2+OOSHtG2oZG1I52KGlMYEGjvrRPmnrJPp hBPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783930403; x=1784535203; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=HV1xf7W0XqeDB+mrV0SGgj+8q7LrpAPrrGmlafpeAYk=; b=MlwkfjlVImsgCZZzXC5iIFW0S0hnB1enKjj/PVtnf9j1OB11AeOnUWmklffuDdnVHZ JOPJckROUYz2j+5psA412JJQV4/ROvMKj8sb/GlBHBpOM8ksDQ8uwAGhakh+XLo3rYst YFPm1b8+AbY341e5CB1xroK7kDEdgV/kFBZVRTQMGs4rTunQ9keGh5oluCYS0+WgF4Rl ea1o4pqSh1kP/d1k5eKgt4qWmWlwt09jSv9G6pq1DM9mv+Qp0bJSCCetPAXx4BnVqK4h Nw+oc5ehwvEzUmC+sYAzAVJo9C6EZmjvyFYk3ru43g2kL5k5QvlsnTmf6PteMnPU32hy qr1g== X-Forwarded-Encrypted: i=1; AHgh+RplMQJi54bGCFFl4Qv8yeSv82SgGgNFU9CaaXCGX0/ulCblPZWFfPD8240NIrbsmGW4irXgWyHT3xbkdRk=@vger.kernel.org X-Gm-Message-State: AOJu0YxeAolp9v494bE8lrnSeqxhlFFze0EFBXbIJdZUls4rYgHI1Hmy 7/tc5NDphfJQRRhYZN4gsGSAi8jAbJKhCDiyKhhe9ub5xCH/42j/PB8op/l1zxAT2Q== X-Gm-Gg: AfdE7cn31BI3BapC5h3atmt7FhOCkrXvo9YOF9coA6I711nMUiVZeJ0PJhWXKyCMM3Z d0kr/6oHr+IAr/BhbbgldAYuUIv5mg6cxNOssQ7wWxEiuqHJpXWPEctBBhXpJAniNrSh6IQA0Qm uAopIZYhFapPVXLkwY8duwW0S/tgPUZWvmSWx8WJxpqCbWYbkqxoJMzpetMRYIJNqB5vXXlygC0 mvgOB+eYEepWq7wT4gjURevWpNvXFwMMn2QbDDEI6LqOD6vbuosomADH8t6BPBnuVfWQ8RIlcpQ QIAOIGWCpAaz9UozZnNgKxIy993fPQY3jdFE62WBgGlYC6P/p8mqAjyLaNhza2/mW21XloZMm7E up2yulAU1gg4H/CpIS5kT7d3qPrO8Sb7CPO0+YbcU41nSYzfizDJda6EotEl1ubYJlQMUQU5ZjZ FXIWu1a0ScGgfOVvafp3UaTPgYTCU9DOdPFRYtG3JqoVm2BNOymbxPqISt X-Received: by 2002:a05:600c:b90:b0:493:b967:178d with SMTP id 5b1f17b1804b1-493f881d05emr82844795e9.19.1783930403309; Mon, 13 Jul 2026 01:13:23 -0700 (PDT) Received: from horizon.localdomain ([150.228.38.212]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-493eb73ae14sm343217885e9.11.2026.07.13.01.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2026 01:13:22 -0700 (PDT) From: Sean Rhodes To: tzungbi@kernel.org Cc: hansg@kernel.org, ilpo.jarvinen@linux.intel.com, corentin.chary@gmail.com, luke@ljones.dev, denis.benato@linux.dev, prasanth.ksr@dell.com, jorge.lopez2@hp.com, mpearson-lenovo@squebb.ca, derekjohn.clark@gmail.com, josh@joshuagrisham.com, briannorris@chromium.org, jwerner@chromium.org, tzimmermann@suse.de, javierm@redhat.com, kees@kernel.org, u.kleine-koenig@baylibre.com, mst@redhat.com, chenhuacai@kernel.org, wenst@chromium.org, florian.fainelli@broadcom.com, titouan.ameline@gmail.com, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, Dell.Client.Kernel@dell.com, chrome-platform@lists.linux.dev Subject: [PATCH v6 1/3] firmware: Move firmware attributes class helper Date: Mon, 13 Jul 2026 09:13:15 +0100 Message-ID: <20260713081317.2954586-2-sean@starlabs.systems> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260713081317.2954586-1-sean@starlabs.systems> References: <20260713054526.2902319-1-sean@starlabs.systems> <20260713081317.2954586-1-sean@starlabs.systems> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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. Reviewed-by: Mark Pearson Reviewed-by: Derek J. Clark Signed-off-by: Sean Rhodes Tested-by: Oliver Lin --- MAINTAINERS | 8 ++++++++ drivers/firmware/Kconfig | 3 +++ drivers/firmware/Makefile | 1 + .../x86 =3D> 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 | 9 +++++---- drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 9 +++++---- drivers/platform/x86/lenovo/think-lmi.c | 5 +++-- drivers/platform/x86/lenovo/wmi-other.c | 2 +- drivers/platform/x86/samsung-galaxybook.c | 3 ++- .../linux/firmware_attributes.h | 6 +++--- 13 files changed, 33 insertions(+), 22 deletions(-) rename drivers/{platform/x86 =3D> firmware}/firmware_attributes_class.c (9= 4%) rename drivers/platform/x86/firmware_attributes_class.h =3D> include/linux= /firmware_attributes.h (60%) diff --git a/MAINTAINERS b/MAINTAINERS index f37a81950e25..07bdba98b1b1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10114,6 +10114,14 @@ F: include/linux/firewire.h F: include/uapi/linux/firewire*.h F: tools/firewire/ =20 +FIRMWARE ATTRIBUTES CLASS +M: Hans de Goede +M: Ilpo J=C3=A4rvinen +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 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" =20 source "drivers/firmware/arm_scmi/Kconfig" =20 +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) +=3D memmap.o obj-$(CONFIG_MTK_ADSP_IPC) +=3D mtk-adsp-ipc.o obj-$(CONFIG_RASPBERRYPI_FIRMWARE) +=3D raspberrypi.o obj-$(CONFIG_FW_CFG_SYSFS) +=3D qemu_fw_cfg.o +obj-$(CONFIG_FW_ATTR_CLASS) +=3D firmware_attributes_class.o obj-$(CONFIG_SYSFB) +=3D sysfb.o obj-$(CONFIG_SYSFB_SIMPLEFB) +=3D sysfb_simplefb.o obj-$(CONFIG_TH1520_AON_PROTOCOL) +=3D thead,th1520-aon.o diff --git a/drivers/platform/x86/firmware_attributes_class.c b/drivers/fir= mware/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 */ =20 #include -#include "firmware_attributes_class.h" +#include =20 const struct class firmware_attributes_class =3D { .name =3D "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 =20 source "drivers/platform/x86/x86-android-tablets/Kconfig" =20 -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) +=3D hp/ # Hewlett Packard Enterprise obj-$(CONFIG_UV_SYSFS) +=3D uv_sysfs.o =20 -obj-$(CONFIG_FW_ATTR_CLASS) +=3D firmware_attributes_class.o - # IBM Thinkpad (before 2005) obj-$(CONFIG_IBM_RTL) +=3D ibm_rtl.o obj-$(CONFIG_SENSORS_HDAPS) +=3D hdaps.o diff --git a/drivers/platform/x86/asus-armoury.c b/drivers/platform/x86/asu= s-armoury.c index 495dc1e31d40..e6af93608ec5 100644 --- a/drivers/platform/x86/asus-armoury.c +++ b/drivers/platform/x86/asus-armoury.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -34,7 +35,6 @@ #include =20 #include "asus-armoury.h" -#include "firmware_attributes_class.h" =20 #define ASUS_NB_WMI_EVENT_GUID "0B3CBB35-E3C2-45ED-91C2-4C5A6D195D1C" =20 diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c b/drivers/p= latform/x86/dell/dell-wmi-sysman/sysman.c index ab46a023cc34..963b3473991d 100644 --- a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c +++ b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c @@ -8,18 +8,19 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt =20 #include -#include #include -#include +#include +#include #include +#include +#include #include #include #include + #include "dell-wmi-sysman.h" -#include "../../firmware_attributes_class.h" =20 #define MAX_TYPES 4 -#include =20 struct wmi_sysman_priv wmi_priv =3D { .mutex =3D __MUTEX_INITIALIZER(wmi_priv.mutex), diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c b/drivers/platfor= m/x86/hp/hp-bioscfg/bioscfg.c index 27fd6cd21529..f13f21580acd 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c +++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c @@ -7,16 +7,17 @@ =20 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt =20 +#include +#include #include -#include #include +#include +#include #include #include #include + #include "bioscfg.h" -#include "../../firmware_attributes_class.h" -#include -#include =20 MODULE_AUTHOR("Jorge Lopez "); MODULE_DESCRIPTION("HP BIOS Configuration Driver"); diff --git a/drivers/platform/x86/lenovo/think-lmi.c b/drivers/platform/x86= /lenovo/think-lmi.c index e215e86e3db7..4437785aa1f2 100644 --- a/drivers/platform/x86/lenovo/think-lmi.c +++ b/drivers/platform/x86/lenovo/think-lmi.c @@ -13,14 +13,15 @@ =20 #include #include +#include #include +#include #include #include #include #include -#include #include -#include "../firmware_attributes_class.h" + #include "think-lmi.h" =20 static bool debug_support; diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86= /lenovo/wmi-other.c index fbb32bf404f2..b175971bb308 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -50,7 +51,6 @@ #include "wmi-capdata.h" #include "wmi-events.h" #include "wmi-helpers.h" -#include "../firmware_attributes_class.h" =20 #define LENOVO_OTHER_MODE_GUID "DC2A8805-3A8C-41BA-A6F7-092E0089CD3B" =20 diff --git a/drivers/platform/x86/samsung-galaxybook.c b/drivers/platform/x= 86/samsung-galaxybook.c index 6382af0b106c..3911f60c23ea 100644 --- a/drivers/platform/x86/samsung-galaxybook.c +++ b/drivers/platform/x86/samsung-galaxybook.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -27,8 +28,8 @@ #include #include #include + #include -#include "firmware_attributes_class.h" =20 #define DRIVER_NAME "samsung-galaxybook" =20 diff --git a/drivers/platform/x86/firmware_attributes_class.h b/include/lin= ux/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 @@ =20 /* Firmware attributes class helper module */ =20 -#ifndef FW_ATTR_CLASS_H -#define FW_ATTR_CLASS_H +#ifndef _LINUX_FIRMWARE_ATTRIBUTES_H +#define _LINUX_FIRMWARE_ATTRIBUTES_H =20 #include =20 extern const struct class firmware_attributes_class; =20 -#endif /* FW_ATTR_CLASS_H */ +#endif /* _LINUX_FIRMWARE_ATTRIBUTES_H */ --=20 2.53.0 From nobody Sat Jul 25 22:03:30 2026 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D22C3AD524 for ; Mon, 13 Jul 2026 08:13:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783930409; cv=none; b=CIRLfvm3rsK8SLb1rqNn6QmKF9v5KGgE/zP8cxf5rlk/GpHVN1LrxilO7jTKi2It1ricGJOoCVj3YESni6VLHPtk/binN34UB2XZstU7WR06VJ19+O0Hc83xrHE8Y4cJns3zL13gwv0Er9Pm+Wa3cEgN3XUSKhN1FplJKV+Iwgw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783930409; c=relaxed/simple; bh=QY2qCsT5gS4+FUURGOFQWBEwlDJ5AoZzDXv74k/9cSQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=snKgx2ru1R39e2jKfno7ui4f2GuhcGyEP/I2Y00ZXyMV2ixSSwx7PlfaiQ39hMvp5NmOD8nNqtlX0luCoHqKZrRc64a5tPmh7htALP3tW2j6lcOu826FWhHLcTD75MoG0kK/WaEsp1vM5oSqoP0JILZl24EWB/lwAD+YN81ouxA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=starlabs.systems; spf=pass smtp.mailfrom=starlabs.systems; dkim=pass (2048-bit key) header.d=starlabs-systems.20251104.gappssmtp.com header.i=@starlabs-systems.20251104.gappssmtp.com header.b=QqzK4QZj; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=starlabs.systems Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=starlabs.systems Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=starlabs-systems.20251104.gappssmtp.com header.i=@starlabs-systems.20251104.gappssmtp.com header.b="QqzK4QZj" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-490cf322ed0so20749065e9.1 for ; Mon, 13 Jul 2026 01:13:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starlabs-systems.20251104.gappssmtp.com; s=20251104; t=1783930406; x=1784535206; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=EnOZE3fkSqZ4ELC1ntUIknKBMd0F4RA56k/w3JH2jic=; b=QqzK4QZjgYJZk8fdE9XM/m4S7Fuh02nshpKNR6weexg4i9XruYKSr9bM2PK/5mpNMj TrQzcSesNmjLFdmZMVTfnQYXTN3S5QuuUE949GfcMt3KCCKWBisEN9s2inRsDmHzo4y0 CRTCHRoRMPqKhZOkWuRTPRtMosH23OcNby329r8FyiZHWqnh4CXJJbcAJHr/yli9ETd4 EXHgUyvlf72JQcm5yW3gqy1qjvu11Y2mzNURPX5NwUCXST/7DaTk2pCVCcq8/b2WRqJ+ lDi37JJFZ55FSPXHlbRNxykqE9Fwiawcf7CLewPEGKF+Wz4uvh6oMVnOTQsLrYuEUM6Q 7KyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783930406; x=1784535206; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=EnOZE3fkSqZ4ELC1ntUIknKBMd0F4RA56k/w3JH2jic=; b=rrpDqHjXDbGva064Xq5djkGA0i6ZYVvDobwrsIo4Sxslwn9od2zn7FcSDRaNS1OaTI CQswlhsMnKKW59TjzATS7sqg4h2Z5FjPtyf9QpTfoJavXiLNx8GXy2kZkkz4XCWpo1JE 4mZl21HMlpcrtgup9gUmzP1pOiG8xmWeac9C7eQNUStrT6axysIWgjgD5bttoD1MI/m1 KBJUSZLhq6taGIKoJcwid94w3iWz4YHmrNY+OFJcjr5W+ZkzJFGxkVHzhgpSBujzI8rB XngSQywocVd0RwdyblpBxN9MLAqygzvmy0HiYnrz8CGi+OJ9CD5QyX9Gt0akw9CWG/my jIbA== X-Forwarded-Encrypted: i=1; AHgh+Rr6C4EU27ba0Sw8u21DTyFjrSd7BOAQYTHtDil4PymA4kvUyWio+9KSbZje2SwzJ5aePIXO8qcVpmLJVug=@vger.kernel.org X-Gm-Message-State: AOJu0YxiMsat70rQUIKOyIu3v7h7z7jJnRFNsb3B5MSam59N8Q3yw4ve 8ZG9BWq+B+UViy6iO0LxbFgfVxmdIoA5pXVHMyLfLs6FCNEVJsCbfN1KwgnD83JXpQ== X-Gm-Gg: AfdE7cm4gO315u6XEOSV24TOO2k5Gemi+jz//JjSKC9jDG2bc2IUVJQ6bz2abAJf+9j ne9jAO7iJizz6dRYlYMwtm+H4aKyYMDYWhZHhOWckb5QPcMuLNxP/AK7cBLCE0rCOiMx26sUa2k qjL2Y7zl7/Mv8kY16xM32oQc+k6KFynUpllew7c1UTa2t4c5VcWvVFhNQlsW0b0cEsuvnIf9I4p +6CNgQh5S3MqmsiDpXiaqJaPOXg0WHYxfkDU0tBKrkqn84G0NvaJz78q8e9+9wQ+U4DOTjyDULx 7m4y4uGpMMfiKEMx+QQY5RgE3sIzCTJLXBeIkFH8o8RtCiPl/t39nCG/mNNw6H1Rogx23tvwDvb c0PqgkGyWVRbov/ySQS1i2vEV+iqx0nh5w1Ri69D5tUOhQmyjy9An1ou7nJwBwn3Tkzq7bGxsJ0 RLE6sV4f+pbxDAxHsKsYQBJNE8saYWJABm9j5AGGQa0LFhicaHNLnzQZrOM0ixXNJgZz8= X-Received: by 2002:a05:600d:6413:10b0:494:1cdd:4f9e with SMTP id 5b1f17b1804b1-4941cdd5035mr4884335e9.31.1783930405768; Mon, 13 Jul 2026 01:13:25 -0700 (PDT) Received: from horizon.localdomain ([150.228.38.212]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-493eb73ae14sm343217885e9.11.2026.07.13.01.13.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2026 01:13:25 -0700 (PDT) From: Sean Rhodes To: tzungbi@kernel.org Cc: hansg@kernel.org, ilpo.jarvinen@linux.intel.com, corentin.chary@gmail.com, luke@ljones.dev, denis.benato@linux.dev, prasanth.ksr@dell.com, jorge.lopez2@hp.com, mpearson-lenovo@squebb.ca, derekjohn.clark@gmail.com, josh@joshuagrisham.com, briannorris@chromium.org, jwerner@chromium.org, tzimmermann@suse.de, javierm@redhat.com, kees@kernel.org, u.kleine-koenig@baylibre.com, mst@redhat.com, chenhuacai@kernel.org, wenst@chromium.org, florian.fainelli@broadcom.com, titouan.ameline@gmail.com, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, Dell.Client.Kernel@dell.com, chrome-platform@lists.linux.dev Subject: [PATCH v6 2/3] firmware: Rename google firmware directory to coreboot Date: Mon, 13 Jul 2026 09:13:16 +0100 Message-ID: <20260713081317.2954586-3-sean@starlabs.systems> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260713081317.2954586-1-sean@starlabs.systems> References: <20260713054526.2902319-1-sean@starlabs.systems> <20260713081317.2954586-1-sean@starlabs.systems> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- MAINTAINERS | 4 ++-- drivers/firmware/Kconfig | 2 +- drivers/firmware/Makefile | 2 +- drivers/firmware/{google =3D> coreboot}/Kconfig | 6 +++--- drivers/firmware/{google =3D> coreboot}/Makefile | 0 drivers/firmware/{google =3D> coreboot}/cbmem.c | 0 drivers/firmware/{google =3D> coreboot}/coreboot_table.c | 0 drivers/firmware/{google =3D> coreboot}/coreboot_table.h | 0 .../firmware/{google =3D> coreboot}/framebuffer-coreboot.c | 0 drivers/firmware/{google =3D> coreboot}/gsmi.c | 0 drivers/firmware/{google =3D> coreboot}/memconsole-coreboot.c | 0 .../firmware/{google =3D> coreboot}/memconsole-x86-legacy.c | 0 drivers/firmware/{google =3D> coreboot}/memconsole.c | 0 drivers/firmware/{google =3D> coreboot}/memconsole.h | 6 +++--- drivers/firmware/{google =3D> coreboot}/vpd.c | 0 drivers/firmware/{google =3D> coreboot}/vpd_decode.c | 0 drivers/firmware/{google =3D> coreboot}/vpd_decode.h | 0 17 files changed, 10 insertions(+), 10 deletions(-) rename drivers/firmware/{google =3D> coreboot}/Kconfig (94%) rename drivers/firmware/{google =3D> coreboot}/Makefile (100%) rename drivers/firmware/{google =3D> coreboot}/cbmem.c (100%) rename drivers/firmware/{google =3D> coreboot}/coreboot_table.c (100%) rename drivers/firmware/{google =3D> coreboot}/coreboot_table.h (100%) rename drivers/firmware/{google =3D> coreboot}/framebuffer-coreboot.c (100= %) rename drivers/firmware/{google =3D> coreboot}/gsmi.c (100%) rename drivers/firmware/{google =3D> coreboot}/memconsole-coreboot.c (100%) rename drivers/firmware/{google =3D> coreboot}/memconsole-x86-legacy.c (10= 0%) rename drivers/firmware/{google =3D> coreboot}/memconsole.c (100%) rename drivers/firmware/{google =3D> coreboot}/memconsole.h (82%) rename drivers/firmware/{google =3D> coreboot}/vpd.c (100%) rename drivers/firmware/{google =3D> coreboot}/vpd_decode.c (100%) rename drivers/firmware/{google =3D> coreboot}/vpd_decode.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 07bdba98b1b1..8cf2766d515d 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 =20 -GOOGLE FIRMWARE DRIVERS +COREBOOT FIRMWARE DRIVERS M: Tzung-Bi Shih R: Brian Norris R: Julius Werner 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 =20 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 +=3D broadcom/ obj-y +=3D cirrus/ obj-y +=3D meson/ obj-y +=3D microchip/ -obj-$(CONFIG_GOOGLE_FIRMWARE) +=3D google/ +obj-$(CONFIG_GOOGLE_FIRMWARE) +=3D coreboot/ obj-y +=3D efi/ obj-y +=3D imx/ obj-y +=3D psci/ diff --git a/drivers/firmware/google/Kconfig b/drivers/firmware/coreboot/Kc= onfig 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". =20 if GOOGLE_FIRMWARE diff --git a/drivers/firmware/google/Makefile b/drivers/firmware/coreboot/M= akefile 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/cb= mem.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/co= reboot/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/co= reboot/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/firmw= are/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/gsm= i.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/firmwa= re/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/firm= ware/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/corebo= ot/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/corebo= ot/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. */ =20 -#ifndef __FIRMWARE_GOOGLE_MEMCONSOLE_H -#define __FIRMWARE_GOOGLE_MEMCONSOLE_H +#ifndef __FIRMWARE_COREBOOT_MEMCONSOLE_H +#define __FIRMWARE_COREBOOT_MEMCONSOLE_H =20 #include =20 @@ -33,4 +33,4 @@ int memconsole_sysfs_init(void); */ void memconsole_exit(void); =20 -#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/corebo= ot/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/corebo= ot/vpd_decode.h similarity index 100% rename from drivers/firmware/google/vpd_decode.h rename to drivers/firmware/coreboot/vpd_decode.h --=20 2.53.0 From nobody Sat Jul 25 22:03:30 2026 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 887553AEB2C for ; Mon, 13 Jul 2026 08:13:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783930415; cv=none; b=Ztgf2q2dao+IDDdFfS/27el7kAWsRq+fOfuSLc8dMmHqyZxbQeYapKx1Qsw2zw5eKdWxUJn5013IV35WPf2SThC4GeHAUAsaBXu6duIT0vcK3ivnGE4cZ9t5XmYuf6Nqz+F27PDTLVElarr3lX5lGasMPf/c5fChkonXPUx1dg4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783930415; c=relaxed/simple; bh=S94oCv1sKaRXNelLqy1bWkF805oLPsDh6WzmdJMTiEI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qH1rO7Jsr/SyIfxrelkZJLHERsBz7XYu03cHSqDYrqlK/uAuChxYfQzCn4zyFAqe6ipu3rKa8Qz3200ebrbmC7j/0NJPpezKb6E7HM7K8UqstZRnhrRRic6+OH7ZpTacJmM2rrCuU+vsixCjuu+12sdxvzFN6zhMR47JGlXjMTA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=starlabs.systems; spf=pass smtp.mailfrom=starlabs.systems; dkim=pass (2048-bit key) header.d=starlabs-systems.20251104.gappssmtp.com header.i=@starlabs-systems.20251104.gappssmtp.com header.b=EHaHwW2a; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=starlabs.systems Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=starlabs.systems Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=starlabs-systems.20251104.gappssmtp.com header.i=@starlabs-systems.20251104.gappssmtp.com header.b="EHaHwW2a" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4921eed3fa2so26489255e9.0 for ; Mon, 13 Jul 2026 01:13:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starlabs-systems.20251104.gappssmtp.com; s=20251104; t=1783930409; x=1784535209; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=yDPDBXQwUcNBWvjxJSXqQoGjnan8r5wipzaZZQnvLug=; b=EHaHwW2a3n+mYnL1ioRt+kjMlz2eNYdhSy+p0j22jAX3fWF5nOIERlkRW3Tjpsqj8x 2dOQFVUYtDLHHu43iO/hG8nerT4LT4TrJjp+VjYcWw19Dnx9KLd9ntbeynhTs5ba3A7s Yk1WHmPgUNlFXM6rfOjo6ADHuobEjNSdaZ/btUT/Tri3tDjHb9Tkf3fePkN8AEdV9mlf iOWNrcv8yNc+Jl5vpKACb4E3BIHFmMxZykThjXrlmcurq6WBWBiWNShSrj7MRJQXe6W9 aK/S24oPSJp6DEqnEWhynEnQrocZzUzMDSR2tpZNz0M6Gj6MxTvhhQtgjn8A4M6PGzBR K7Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783930409; x=1784535209; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=yDPDBXQwUcNBWvjxJSXqQoGjnan8r5wipzaZZQnvLug=; b=WsnaaIREvsBZLTgNgXYCOZLUVlZIW3JMAhI41kKwsiH1eoR4BHYYRToE1L1pLj3pJ5 2rLdimwsvUgnCI1vpk9zAgICYXYz659BVvbHRd5hMpx8X9UVo88TWSEBFz1djAeAXSLK 7Cw0OoDJKrXIBI/e1eou1TCQvZ7se58JUyymk3bdoU1+T9YxyM9nPbTRYp1b0AvHQzBv ZxCP18qpkFMIEGsGkV9sHlGAd66LhuNxI5jZI9kpcPFIR1aCfT03hXlXL/9gfjumPgDS xBk+43vE1+hJEpTrcEsge6I92xKJxpZcxjaI/tAtZhTanMDM0C0hNWrxhoLUvVKQCZfh 5+og== X-Forwarded-Encrypted: i=1; AHgh+RokvSB9fsaOF1iL/HM3WQBJ2Rv+BfSQv+iDNiDcIXWentBnlLU5DzoWUoB5vbStBjZtazXlqvP/EX9mKxM=@vger.kernel.org X-Gm-Message-State: AOJu0YxrfAZMdaSWfZKzUfaR5RPTTiTBODOtvtY+XHV4hqzN/mOq2fOF fFHiQHuurUsMw1refZa3s9oBFxzA5kBkH6Dn/4Jf7jCaengDOr48MrkXCgOtO/I96w== X-Gm-Gg: AfdE7clOnYBUaRA0pKVcx8croVVssYaoZj+l9tVTh60fNVVVfHZW6Stnjp4Ta2AoqDp y244IUZl76YXCCWGfQ79ynyW1pYBS2o7UmervJnOqhW/J004jTI3+Ne+E8hEpCumVUmZG26/yAP KPsfgogyg6XGvg7olnCUbawlOtAORbt6JAn4LVCTJY583ge93KWPhwMyde7K4uviGmcwbfxBMkS BduF53tx8e9+dsk4x2wOXDfeff6X13Pxuk+id1M9bYT+dfc7p5JU6yULTfi3rWrpBujehYhpv/A TTDuQLPxz0wNLgA7F9Q8M4jg09U3dHh6eZrDRhGKErWKB4fwT8ooTMOTUsKE24ZXuBTAg7WOJ6f QE13y4PO1Xj8Gv/HflfhaIN21meHWMJnia1p4n8Bo0NztHNlEO8ZSKBQE5rXFMUOI9eYNBcR1zJ Ppv5b+aDJ7Oxf1oh8Ha0Wqgk4Qa9nEAfxbS3MeVq/kP4ZaZ1xIHxcVRHeT X-Received: by 2002:a05:600c:4693:b0:493:b7a6:3dac with SMTP id 5b1f17b1804b1-493f8830fd3mr75643205e9.33.1783930408724; Mon, 13 Jul 2026 01:13:28 -0700 (PDT) Received: from horizon.localdomain ([150.228.38.212]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-493eb73ae14sm343217885e9.11.2026.07.13.01.13.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2026 01:13:28 -0700 (PDT) From: Sean Rhodes To: tzungbi@kernel.org Cc: hansg@kernel.org, ilpo.jarvinen@linux.intel.com, corentin.chary@gmail.com, luke@ljones.dev, denis.benato@linux.dev, prasanth.ksr@dell.com, jorge.lopez2@hp.com, mpearson-lenovo@squebb.ca, derekjohn.clark@gmail.com, josh@joshuagrisham.com, briannorris@chromium.org, jwerner@chromium.org, tzimmermann@suse.de, javierm@redhat.com, kees@kernel.org, u.kleine-koenig@baylibre.com, mst@redhat.com, chenhuacai@kernel.org, wenst@chromium.org, florian.fainelli@broadcom.com, titouan.ameline@gmail.com, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, Dell.Client.Kernel@dell.com, chrome-platform@lists.linux.dev Subject: [PATCH v6 3/3] firmware: coreboot: Add CFR firmware attributes driver Date: Mon, 13 Jul 2026 09:13:17 +0100 Message-ID: <20260713081317.2954586-4-sean@starlabs.systems> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260713081317.2954586-1-sean@starlabs.systems> References: <20260713054526.2902319-1-sean@starlabs.systems> <20260713081317.2954586-1-sean@starlabs.systems> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- MAINTAINERS | 6 + drivers/firmware/coreboot/Kconfig | 13 + drivers/firmware/coreboot/Makefile | 1 + drivers/firmware/coreboot/coreboot-cfr.c | 1065 ++++++++++++++++++++++ 4 files changed, 1085 insertions(+) create mode 100644 drivers/firmware/coreboot/coreboot-cfr.c diff --git a/MAINTAINERS b/MAINTAINERS index 8cf2766d515d..a00f54e0324e 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 =20 +COREBOOT CFR FIRMWARE ATTRIBUTES DRIVER +M: Sean Rhodes +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. =20 +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 @@ =20 obj-$(CONFIG_GOOGLE_SMI) +=3D gsmi.o obj-$(CONFIG_GOOGLE_COREBOOT_TABLE) +=3D coreboot_table.o +obj-$(CONFIG_COREBOOT_CFR) +=3D coreboot-cfr.o obj-$(CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT) +=3D framebuffer-coreboot.o obj-$(CONFIG_GOOGLE_MEMCONSOLE) +=3D memconsole.o obj-$(CONFIG_GOOGLE_MEMCONSOLE_COREBOOT) +=3D memconsole-coreboot.o diff --git a/drivers/firmware/coreboot/coreboot-cfr.c b/drivers/firmware/co= reboot/coreboot-cfr.c new file mode 100644 index 000000000000..a03d5a0f1fdb --- /dev/null +++ b/drivers/firmware/coreboot/coreboot-cfr.c @@ -0,0 +1,1065 @@ +// 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 cla= ss. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#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 =3D 1, + CFR_TAG_ENUM_VALUE =3D 2, + CFR_TAG_OPTION_ENUM =3D 3, + CFR_TAG_OPTION_NUMBER =3D 4, + CFR_TAG_OPTION_BOOL =3D 5, + CFR_TAG_VARCHAR_OPT_NAME =3D 7, + CFR_TAG_VARCHAR_UI_NAME =3D 8, + CFR_TAG_RUNTIME_APPLY =3D 13, +}; + +enum cfr_option_flags { + CFR_OPTFLAG_READONLY =3D BIT(0), + CFR_OPTFLAG_INACTIVE =3D BIT(1), + CFR_OPTFLAG_SUPPRESS =3D BIT(2), + CFR_OPTFLAG_VOLATILE =3D BIT(3), + CFR_OPTFLAG_RUNTIME =3D BIT(4), +}; + +enum cfr_runtime_apply_method { + CFR_RUNTIME_APPLY_NONE =3D 0, + CFR_RUNTIME_APPLY_APM_CNT =3D 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 =3D EFI_GUID(0xceae4c1d, 0x335b, 0x468= 5, + 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_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 =3D (const char *)(str + 1); + size_t len =3D 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 =3D 0; + + while (off < len) { + if (len - off < sizeof(*entry)) + return NULL; + + entry =3D base + off; + if (entry->size < sizeof(*entry) || entry->size > len - off) + return NULL; + + if (entry->tag =3D=3D tag) + return entry; + + off +=3D 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 =3D coreboot_cfr_child_entry(base, len, tag); + if (!entry) + return NULL; + + if (entry->size < sizeof(*str)) + return NULL; + + str =3D (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 =3D 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 =3D (const struct lb_cfr_runtime_apply *)entry; + if (runtime_apply->method =3D=3D 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 =3D strlen(name); + if (len >=3D EFI_VAR_NAME_LEN) + return ERR_PTR(-ENAMETOOLONG); + + efi_char16_t *efi_name __free(kfree) =3D + kcalloc(len + 1, sizeof(*efi_name), GFP_KERNEL); + if (!efi_name) + return ERR_PTR(-ENOMEM); + + for (i =3D 0; i < len; i++) { + if (!isascii(name[i])) + return ERR_PTR(-EINVAL); + efi_name[i] =3D name[i]; + } + + return no_free_ptr(efi_name); +} + +static int coreboot_cfr_read_value(const struct coreboot_cfr_setting *sett= ing, + u32 *value, u32 *attrs) +{ + unsigned long size =3D sizeof(__le32); + efi_char16_t *efi_name; + efi_status_t status; + __le32 data; + u32 attr; + + efi_name =3D coreboot_cfr_efi_name(setting->name); + if (IS_ERR(efi_name)) + return PTR_ERR(efi_name); + + status =3D efivar_get_variable(efi_name, &coreboot_cfr_guid, &attr, + &size, &data); + kfree(efi_name); + if (status !=3D EFI_SUCCESS) + return efi_status_to_err(status); + + if (size !=3D sizeof(data)) + return -EINVAL; + + if (!(attr & EFI_VARIABLE_RUNTIME_ACCESS)) + return -EOPNOTSUPP; + + *value =3D le32_to_cpu(data); + if (attrs) + *attrs =3D attr; + + return 0; +} + +static int coreboot_cfr_write_efi_value(struct coreboot_cfr_setting *setti= ng, + u32 value, u32 attrs) +{ + efi_char16_t *efi_name; + efi_status_t status; + __le32 data; + + efi_name =3D coreboot_cfr_efi_name(setting->name); + if (IS_ERR(efi_name)) + return PTR_ERR(efi_name); + + data =3D cpu_to_le32(value); + status =3D efivar_set_variable(efi_name, &coreboot_cfr_guid, attrs, + sizeof(data), &data); + kfree(efi_name); + if (status !=3D 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 !=3D 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 =3D 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 =3D false; + + if (setting->read_only) + return -EACCES; + + scoped_guard(mutex, &setting->drvdata->lock) { + ret =3D coreboot_cfr_read_value(setting, &old, &attrs); + if (ret) + return ret; + + if ((attrs & COREBOOT_CFR_EFI_ATTRS) !=3D COREBOOT_CFR_EFI_ATTRS) + return -EOPNOTSUPP; + + if (old =3D=3D value) + return 0; + + ret =3D coreboot_cfr_write_efi_value(setting, value, attrs); + if (ret) + return ret; + changed =3D true; + + ret =3D coreboot_cfr_apply_runtime(setting); + if (ret =3D=3D -EOPNOTSUPP) { + /* EFI changed; firmware will consume it after reboot. */ + setting->drvdata->pending_reboot =3D true; + ret =3D 0; + } else if (ret) { + int restore_ret; + + restore_ret =3D coreboot_cfr_write_efi_value(setting, old, attrs); + if (restore_ret) + ret =3D restore_ret; + else + changed =3D 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 =3D 0; i < setting->n_values; i++) { + if (setting->values[i].value =3D=3D 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 =3D 0; i < setting->n_values; i++) { + if (!sysfs_streq(label, setting->values[i].label)) + continue; + + *value_out =3D setting->values[i].value; + return 0; + } + + return kstrtou32(label, 0, value_out); +} + +static bool coreboot_cfr_value_is_valid(struct coreboot_cfr_setting *setti= ng, + u32 value) +{ + u32 delta; + + if (setting->type !=3D 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 =3D value - setting->min; + return delta % setting->step =3D=3D 0; +} + +static ssize_t type_show(struct kobject *kobj, struct kobj_attribute *attr, + char *buf) +{ + struct coreboot_cfr_setting *setting =3D to_coreboot_cfr_setting(kobj); + + if (setting->type =3D=3D 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 =3D 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 =3D to_coreboot_cfr_setting(kobj); + ssize_t len =3D 0; + unsigned int i; + + for (i =3D 0; i < setting->n_values; i++) { + len +=3D sysfs_emit_at(buf, len, "%s%s", i ? ";" : "", + setting->values[i].label); + if (len >=3D PAGE_SIZE) + return len; + } + + len +=3D 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 =3D 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 =3D 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 =3D 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 =3D to_coreboot_cfr_setting(kobj); + const char *label; + + if (setting->type =3D=3D COREBOOT_CFR_SETTING_NUMBER) + return sysfs_emit(buf, "%u\n", setting->default_value); + + label =3D 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 =3D to_coreboot_cfr_setting(kobj); + const char *label; + u32 value; + int ret; + + ret =3D coreboot_cfr_read_value(setting, &value, NULL); + if (ret) + return ret; + + if (setting->type =3D=3D COREBOOT_CFR_SETTING_NUMBER) + return sysfs_emit(buf, "%u\n", value); + + label =3D 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 =3D to_coreboot_cfr_setting(kobj); + u32 value; + int ret; + + ret =3D coreboot_cfr_parse_value(setting, buf, &value); + if (ret) + return ret; + + if (!coreboot_cfr_value_is_valid(setting, value)) + return -EINVAL; + + ret =3D coreboot_cfr_write_value(setting, value); + if (ret) + return ret; + + return count; +} + +static struct kobj_attribute type_attr =3D __ATTR_RO(type); +static struct kobj_attribute display_name_language_code_attr =3D + __ATTR_RO(display_name_language_code); +static struct kobj_attribute display_name_attr =3D __ATTR_RO(display_name); +static struct kobj_attribute possible_values_attr =3D __ATTR_RO(possible_v= alues); +static struct kobj_attribute min_value_attr =3D __ATTR_RO(min_value); +static struct kobj_attribute max_value_attr =3D __ATTR_RO(max_value); +static struct kobj_attribute scalar_increment_attr =3D __ATTR_RO(scalar_in= crement); +static struct kobj_attribute default_value_attr =3D __ATTR_RO(default_valu= e); +static struct kobj_attribute current_value_attr =3D __ATTR_RW(current_valu= e); + +static struct attribute *coreboot_cfr_setting_attrs[] =3D { + &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 =3D to_coreboot_cfr_setting(kobj); + + if (setting->type =3D=3D COREBOOT_CFR_SETTING_NUMBER && + attr =3D=3D &possible_values_attr.attr) + return 0; + + if (setting->type !=3D COREBOOT_CFR_SETTING_NUMBER && + (attr =3D=3D &min_value_attr.attr || attr =3D=3D &max_value_attr.attr= || + attr =3D=3D &scalar_increment_attr.attr)) + return 0; + + if (setting->read_only && attr =3D=3D ¤t_value_attr.attr) + return 0444; + + return attr->mode; +} + +static const struct attribute_group coreboot_cfr_setting_group =3D { + .attrs =3D coreboot_cfr_setting_attrs, + .is_visible =3D coreboot_cfr_attr_is_visible, +}; + +static void coreboot_cfr_free_setting(struct coreboot_cfr_setting *setting) +{ + unsigned int i; + + for (i =3D 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 =3D { + .release =3D coreboot_cfr_setting_release, + .sysfs_ops =3D &kobj_sysfs_ops, +}; + +static ssize_t pending_reboot_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + struct coreboot_cfr_drvdata *data; + + data =3D dev_get_drvdata(kobj_to_dev(kobj->parent)); + + return sysfs_emit(buf, "%d\n", data->pending_reboot); +} + +static struct kobj_attribute pending_reboot_attr =3D __ATTR_RO(pending_reb= oot); + +static int coreboot_cfr_copy_bool_values(struct coreboot_cfr_setting *sett= ing) +{ + static const struct coreboot_cfr_enum bool_values[] =3D { + { .label =3D "Disabled", .value =3D 0 }, + { .label =3D "Enabled", .value =3D 1 }, + }; + unsigned int i; + + setting->values =3D kcalloc(ARRAY_SIZE(bool_values), sizeof(*setting->val= ues), + GFP_KERNEL); + if (!setting->values) + return -ENOMEM; + + for (i =3D 0; i < ARRAY_SIZE(bool_values); i++) { + setting->values[i].label =3D kstrdup(bool_values[i].label, + GFP_KERNEL); + if (!setting->values[i].label) + return -ENOMEM; + setting->values[i].value =3D 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 =3D 0; + int count =3D 0; + + while (off < len) { + if (len - off < sizeof(*entry)) + return -EINVAL; + + entry =3D base + off; + if (entry->size < sizeof(*entry) || entry->size > len - off) + return -EINVAL; + + if (entry->tag =3D=3D CFR_TAG_ENUM_VALUE) + count++; + + off +=3D entry->size; + } + + return count; +} + +static int coreboot_cfr_copy_enum_values(struct coreboot_cfr_setting *sett= ing, + 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 =3D 0; + int count; + + count =3D coreboot_cfr_count_enum_values(base, len); + if (count <=3D 0) + return count ?: -EINVAL; + + setting->values =3D kcalloc(count, sizeof(*setting->values), GFP_KERNEL); + if (!setting->values) + return -ENOMEM; + + while (off < len) { + entry =3D base + off; + if (entry->tag !=3D CFR_TAG_ENUM_VALUE) { + off +=3D entry->size; + continue; + } + + if (entry->size < sizeof(*enum_value)) + return -EINVAL; + + enum_value =3D base + off; + label =3D 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 =3D + coreboot_cfr_string_dup(label); + if (!setting->values[setting->n_values].label) + return -ENOMEM; + + setting->values[setting->n_values].value =3D enum_value->value; + setting->n_values++; + off +=3D entry->size; + } + + return 0; +} + +static int coreboot_cfr_setting_is_usable(struct coreboot_cfr_setting *set= ting) +{ + u32 value; + int ret; + + ret =3D 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 =3D 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 =3D 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 *da= ta, + 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 =3D option + 1; + struct coreboot_cfr_setting *setting; + size_t child_len =3D 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 =3D kzalloc_obj(*setting, GFP_KERNEL); + if (!setting) + return -ENOMEM; + + INIT_LIST_HEAD(&setting->node); + setting->drvdata =3D data; + setting->default_value =3D option->default_value; + setting->min =3D option->min; + setting->max =3D option->max; + setting->step =3D option->step ?: 1; + setting->read_only =3D option->flags & COREBOOT_CFR_OPT_READ_ONLY_FLAGS; + + runtime_apply =3D coreboot_cfr_child_runtime_apply(child_base, child_len); + if (IS_ERR(runtime_apply)) { + ret =3D PTR_ERR(runtime_apply); + goto err_put_setting; + } + + if (runtime_apply && runtime_apply->method =3D=3D CFR_RUNTIME_APPLY_APM_C= NT && + runtime_apply->id) { + setting->runtime_apply_method =3D runtime_apply->method; + setting->runtime_apply_id =3D runtime_apply->id; + } + + name =3D coreboot_cfr_child_string(child_base, child_len, + CFR_TAG_VARCHAR_OPT_NAME); + if (!name) { + ret =3D -EINVAL; + goto err_put_setting; + } + + setting->name =3D coreboot_cfr_string_dup(name); + if (!setting->name) { + ret =3D -ENOMEM; + goto err_put_setting; + } + + if (!coreboot_cfr_string_is_valid_name(setting->name)) { + ret =3D -EINVAL; + goto err_put_setting; + } + + display_name =3D coreboot_cfr_child_string(child_base, child_len, + CFR_TAG_VARCHAR_UI_NAME); + if (display_name) + setting->display_name =3D coreboot_cfr_string_dup(display_name); + else + setting->display_name =3D kstrdup(setting->name, GFP_KERNEL); + if (!setting->display_name) { + ret =3D -ENOMEM; + goto err_put_setting; + } + + switch (option->tag) { + case CFR_TAG_OPTION_BOOL: + setting->type =3D COREBOOT_CFR_SETTING_BOOL; + setting->min =3D 0; + setting->max =3D 1; + setting->step =3D 1; + ret =3D coreboot_cfr_copy_bool_values(setting); + break; + case CFR_TAG_OPTION_ENUM: + setting->type =3D COREBOOT_CFR_SETTING_ENUM; + ret =3D coreboot_cfr_copy_enum_values(setting, child_base, + child_len); + break; + case CFR_TAG_OPTION_NUMBER: + setting->type =3D COREBOOT_CFR_SETTING_NUMBER; + if (!setting->min && !setting->max) + setting->max =3D U32_MAX; + else if (setting->max < setting->min) + setting->max =3D U32_MAX; + ret =3D 0; + break; + default: + ret =3D -EINVAL; + break; + } + + if (ret) + goto err_put_setting; + + ret =3D coreboot_cfr_setting_is_usable(setting); + if (ret) { + ret =3D 0; + goto err_put_setting; + } + + ret =3D 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 =3D 0; + int ret; + + while (off < len) { + if (len - off < sizeof(*entry)) + return -EINVAL; + + entry =3D 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 =3D base + off + sizeof(struct lb_cfr_option_form); + child_len =3D entry->size - sizeof(struct lb_cfr_option_form); + ret =3D 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 =3D coreboot_cfr_add_numeric_option(data, base + off); + if (ret) + return ret; + break; + default: + break; + } + + off +=3D 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 =3D (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 !=3D LB_TAG_CFR_ROOT || root->version !=3D CFR_VERSION) + return -EINVAL; + + if (root->size < sizeof(*root) || root->size > dev->entry.size) + return -EINVAL; + + if (!efivar_is_available()) + return -EPROBE_DEFER; + + data =3D devm_kzalloc(&dev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + INIT_LIST_HEAD(&data->settings); + ret =3D devm_mutex_init(&dev->dev, &data->lock); + if (ret) + return ret; + + dev_set_drvdata(&dev->dev, data); + + data->class_dev =3D device_create(&firmware_attributes_class, NULL, + MKDEV(0, 0), NULL, DRIVER_NAME); + if (IS_ERR(data->class_dev)) { + ret =3D PTR_ERR(data->class_dev); + goto err_clear_data; + } + dev_set_drvdata(data->class_dev, data); + + data->attrs_kset =3D kset_create_and_add("attributes", NULL, + &data->class_dev->kobj); + if (!data->attrs_kset) { + ret =3D -ENOMEM; + goto err_unregister_dev; + } + + ret =3D sysfs_create_file(&data->attrs_kset->kobj, + &pending_reboot_attr.attr); + if (ret) + goto err_unregister_attrs; + + payload_len =3D root->size - sizeof(*root); + ret =3D coreboot_cfr_parse_records(data, root + 1, payload_len); + if (ret) + goto err_unregister_settings; + + if (list_empty(&data->settings)) { + ret =3D -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: + return ret; +} + +static void coreboot_cfr_remove(struct coreboot_device *dev) +{ + struct coreboot_cfr_drvdata *data =3D 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); +} + +static const struct coreboot_device_id coreboot_cfr_ids[] =3D { + { .tag =3D LB_TAG_CFR_ROOT }, + { } +}; +MODULE_DEVICE_TABLE(coreboot, coreboot_cfr_ids); + +static struct coreboot_driver coreboot_cfr_driver =3D { + .probe =3D coreboot_cfr_probe, + .remove =3D coreboot_cfr_remove, + .drv =3D { + .name =3D DRIVER_NAME, + }, + .id_table =3D coreboot_cfr_ids, +}; +module_coreboot_driver(coreboot_cfr_driver); + +MODULE_AUTHOR("Sean Rhodes "); +MODULE_DESCRIPTION("coreboot CFR firmware attributes driver"); +MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS("EFIVAR"); --=20 2.53.0