From nobody Sat Jul 25 05:29:18 2026 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 24AC4340402 for ; Fri, 17 Jul 2026 08:50:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784278211; cv=none; b=oohuD6olEFmS5ByhQZuN8edCke0pALcGiTttRcIeiOlCCnEk768N0SVheINRbxcbCyWSMfjoPnEojqcg1rEIz3kUOMSEpLJR57+f7VHmlpHYxJVEnY6KUe/9PkYUu1oxBAUEbYpKhl5Dm8vELLEH/JzoqfDUxrzpTGyPlFF/DnE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784278211; c=relaxed/simple; bh=SlEoEkdqLh7hoM8IMAtG1tISwjgkZR9TWH9eZ/2nNls=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=o4fCfX4VsC3DnGvHw/oWfMk8m4otuPI1G50xX7qIVVmHQsWyinIknLaFcMVa9gOudT8w5c0RmSMF/5ooRph1cCFZs4VtsfyQKWx1Ptp/qaliHhY2YgSpywjKxTZ2AB1HNgVclMwa8PlAJdD85SmpIcE7Aerm/H9d73Kbt4+S7LE= 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=HFSvUWXh; arc=none smtp.client-ip=209.85.128.53 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="HFSvUWXh" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-493f25d47dcso26419175e9.1 for ; Fri, 17 Jul 2026 01:50:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starlabs-systems.20251104.gappssmtp.com; s=20251104; t=1784278206; x=1784883006; 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=KUChXml0ApNzEumm2gCr60jaGALK/ZhnPhXHzrUzRIY=; b=HFSvUWXhZtPSDlET1+dyb4bLq92YnFJ+ePn5ICBbehtW6x2lnANzf9X7FAlnhkP2fr qRogw80Ec/3ApUwZpUZbFFqjeK9Ejjed3usrJtaT+Dxwflshiv29b8DG6ApUYK2RPeK9 PSRWkxOS7sw/UtkeFJST5KLoMXzeitHt3TXVT0rI2sluPujOHKsbsewbGMlqL/SXslfa lE5Xq9Bjjx/CNHz3fF7Ym07l6BktHStD+q+YJoiDy4LJJMfottfm95Sy8Kohg++AT5Es gcF4nz5rXAkbaEqvHM8tTCQcDyjkh7hlQ3X6ptXV84XAp31bL6P9m2K+SAPcU6I1znCJ sMng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784278206; x=1784883006; 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=KUChXml0ApNzEumm2gCr60jaGALK/ZhnPhXHzrUzRIY=; b=reRVHGUqV5v5QtlPF44rQwDSPNR1FYGta47vZLsQfF4EupXqg/iLp2yGgSl0SFHZjs i/GgLaRhn62HCNgY4Io8WiAyXUgBcnDu+tqwM4JsPdXw06Mt0vUD3Q6v7nE6+G2fpuMT Z7/yfh/r4rBAT9B9HaORkh62M/EyZ1F/Jcoy1kselJ9m9GNOZujNjYz9PDjWAhSAUTMK ZlUkPWA25Tw0sfOwyCsG1mKoG9zHwAHRlXF2MftXGMuy4HPlrKv7CdFrOKUvJBKDXFWF +2qdCz3VcbioW1v02oGoM7SOPKa+0Rn9lPFyCYvRpEprHgt3PK1y+xn6YfGsyIeBt3Cf 51MA== X-Forwarded-Encrypted: i=1; AHgh+RpIkhYH6+bvZ/2Y+HJDT/P7qK+Cmqu/Ym5z7d6lF2MZO/bJvr5HIPRhDhqfhaHxNiNZ2+I3bakCHY3fVe8=@vger.kernel.org X-Gm-Message-State: AOJu0YxddeFrQLm+9UZ0sSyBjNLCkm4xvibv0x1sL73ZokeMW/34o8KT gJCLMfQtOdIdwG2AUfCUhwciXJqPrlw78dbLfXjuSbopr+Y0MRjCcgt/xV4dlY6JyA== X-Gm-Gg: AfdE7ckdmf5T9VSnmQXIw600T68Kkmds9ytgi2I/SX3eaQfbfjkN4eHbhZglZTX7p8n O/cRLkBbn4aB379UnDaz2vJZ6QGbUp8ZVNeYpQ+Iq/9xHu8c1PbTujYKeys7y2ublgDRwGilb+w LqbDWa8z9KuymjnmOmv7w6SRu7Y08lmm4k73wQ7fTE3Uvn/xfNSxBz27Sy1En9zfhHNyFIIv9bc vx54h+KfBRXlSHEF0RULw9sMjFnoHiEzZMVkwz0elADou7MaJLU/4CuZOPCOb6cs4hsrW7hEkFh idjWsujq70MviQPOqCjH7YDLSQy0tusnGU7yHrpE+lO1eD+kOob7ADYTUDpe22XNZWqNVaZIZl0 F3//Y13I0Sm11EHob27ublSKkC9EgPOxl+LfWUlNZoQ7CVns+I3VA+cJattqcmy1QV4vNpeYNG0 dMPCFjeWQGl1wJBKDLcr/z7Shf2g9s X-Received: by 2002:a05:600c:3587:b0:493:bb0:3b43 with SMTP id 5b1f17b1804b1-4954a3d06d9mr17929655e9.2.1784278205957; Fri, 17 Jul 2026 01:50:05 -0700 (PDT) Received: from horizon ([217.155.46.38]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4954a2a2504sm33972955e9.2.2026.07.17.01.50.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 01:50:05 -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, oliver@liuxiaozhen.dev, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, Dell.Client.Kernel@dell.com, chrome-platform@lists.linux.dev, Sean Rhodes Subject: [PATCH v7 1/3] firmware: Move firmware attributes class helper Date: Fri, 17 Jul 2026 09:50:01 +0100 Message-ID: <20260717085003.369496-2-sean@starlabs.systems> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260717085003.369496-1-sean@starlabs.systems> References: <20260717085003.369496-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 Tested-by: Oliver Lin Signed-off-by: Sean Rhodes --- 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 | 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 =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..93fac0d464d2 100644 --- a/drivers/platform/x86/asus-armoury.c +++ b/drivers/platform/x86/asus-armoury.c @@ -34,7 +34,7 @@ #include =20 #include "asus-armoury.h" -#include "firmware_attributes_class.h" +#include =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..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 #include #include "dell-wmi-sysman.h" -#include "../../firmware_attributes_class.h" +#include =20 #define MAX_TYPES 4 #include diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c b/drivers/platfor= m/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 #include #include "bioscfg.h" -#include "../../firmware_attributes_class.h" +#include #include #include =20 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 #include #include -#include "../firmware_attributes_class.h" +#include #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..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 =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..74b8c887dd79 100644 --- a/drivers/platform/x86/samsung-galaxybook.c +++ b/drivers/platform/x86/samsung-galaxybook.c @@ -28,7 +28,7 @@ #include #include #include -#include "firmware_attributes_class.h" +#include =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 05:29:18 2026 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 14D032BE053 for ; Fri, 17 Jul 2026 08:50:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784278212; cv=none; b=YdgAJK/AgQtsPxJKYlSUe0S80ONyIY0Ktecrk/H4/HwsyRTgq+6kqgMpGkfDeTvQEc+Hw5GKYSd3AsTgf4tILY/zKsMDJONeissJ+IU52aI4EQEcJzJdCQa28Xnk+dglPUVUDaG8+HlsYHPC+6ZBUMHNrgEvJH6ETfwjpOCtqss= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784278212; c=relaxed/simple; bh=QY2qCsT5gS4+FUURGOFQWBEwlDJ5AoZzDXv74k/9cSQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IBu8g5SQ2brbVrexhFHSs6mE/4lEDXrqFZlpesA3ne84iMjrsjl8A8LhSPta5heWFjvswba8pmI1Gr+fBWIAZ6Yjl+xXKb2pjUwofxPWeoNjM8mvD9HZd3jSeRNquhQ6ZgXoNSlBY/6L0vzS/MSnS8W95bltP7jo03kT0N/KC8Y= 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=AqUmyLG1; arc=none smtp.client-ip=209.85.128.49 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="AqUmyLG1" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-493c19bad03so60647205e9.2 for ; Fri, 17 Jul 2026 01:50:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starlabs-systems.20251104.gappssmtp.com; s=20251104; t=1784278208; x=1784883008; 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=AqUmyLG1bijKTbGxS40bBjvLhjzfn6b9baWEZislCNZXTKil+oJgDzp2HPiLsr2ChM UxQrhEhT957d8giFlS+NtfC+3MUE2yTjTHfDV7ClrLMaJhq44esFXGRicmZDxLwyMZck M0llJXZtHeVFhwCJObvAi0v83MI7OqiFzwSsuUyulu4iFGWns3leyQwqpdGmI7bDxzAt NO9cZ9nc5SMKIgqtULn0NY8Y6i/37pzMiIthhB5Lm7LMkMBYe5IotN2YJU9P0zQGnNyb o9SIg8bqB5FFc56me8Ik7cNDMiS46SUwnOMj+YE3/DH3jBd38xaBPi4Pl8J/YjCuZbCu cU+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784278208; x=1784883008; 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=YQkwvAWNeWUZZbuAIYs+7pJb+REvudD5QHfkfJLT4uQX1exq4ZYqbTEpJ7fl76GkYV NaqxgJhuZRpcT3tWAfHYG08mh87dC1mf0ifB6HUGPgUOG/1/M/pGKi7TCFHNHvcYlrme wyGYa4c69t63+47oHJCS1JAQMO6B1lxbEKZaUBFR5sCvzuxVX/B+6gw96eI4ynbRwmMV bFgcPJslu8V160fOKJcZqh2UxbcI1hQ+yhSXk1JtjNn2EZDXvEYRD2VDalBhmFeKVsj7 v3SyTmO7Kw15L/M+3scUbruUGGgqoktr+6fKDPat+WXtZixX44+/PPDAYi4uOL9FZ4xJ nRvQ== X-Forwarded-Encrypted: i=1; AHgh+RoxIe7r65aggMEn/Ap4j3zyR6nybj5MazYGRc8PJmlZYMCylOSEn3Xl24TRTrXBtUqQBnd5+I28di5V5t0=@vger.kernel.org X-Gm-Message-State: AOJu0YzaD9NHFTnwl5ZnSZulDeaBSJd0Vi0mc6Szr5QmQUHBlfqc8gCv XtNYtK7lfpgIKS+qBTK7NvscVdKnRaHVRN6tNn+e7ClRr3unXoCgTUsf1GZct/uKow== X-Gm-Gg: AfdE7ckOtoCGzP9rFCbiXu4+PTnbkhSTGjcC3Pwi3l6OMZhQlRSatnyvGXQBBWV0AC8 MyOf91VGuH53jsEOXB/hmUyhChKRm6RVjjh5kX/D2vluoBDeC5jjje/hSayGLSzoZ5vnN26A4/s KqYYCernxNcndiaWhG1XCS3rN3wBw/HlZt8U1cXhNKkIkv/blPD/48CCh/hPFDDUmFFtvUR+DMa czWOiQtgTkqFuh1rq34cpJNFgEMNjQ4G8KpROWGQuRhqQEBzhtAV5iefYoSsWSaiHH2y1HTjkch y7tOLUnlm1AX4y1yiaCHE4UbGCcLftwJs/OcRvfJMa0njQwvwxtFLqfmgq/TrfCaE9ZRNKfraTt r8qVJjsrv5TSR2k3V9MxGDhk44LKpGHYTah5ceG6xtSyt+Q5Pfygj1el5K963AbBs43afzJR+Z7 Kp4c+MLPtvq4sLJe3A91ZGsYmUogsy X-Received: by 2002:a05:600c:1d1e:b0:493:b6ee:fcb7 with SMTP id 5b1f17b1804b1-4954a3f39ffmr18160385e9.14.1784278207615; Fri, 17 Jul 2026 01:50:07 -0700 (PDT) Received: from horizon ([217.155.46.38]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4954a2a2504sm33972955e9.2.2026.07.17.01.50.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 01:50:06 -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, oliver@liuxiaozhen.dev, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, Dell.Client.Kernel@dell.com, chrome-platform@lists.linux.dev, Sean Rhodes Subject: [PATCH v7 2/3] firmware: Rename google firmware directory to coreboot Date: Fri, 17 Jul 2026 09:50:02 +0100 Message-ID: <20260717085003.369496-3-sean@starlabs.systems> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260717085003.369496-1-sean@starlabs.systems> References: <20260717085003.369496-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 05:29:18 2026 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 E8CAF3876BD for ; Fri, 17 Jul 2026 08:50:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784278214; cv=none; b=kLtATpm4Jq0HTyQAa3dEHV2wGyzHJdrTEbHGtv6IojGjHd6+X78p+1JekbVcbAanmxC/V0+gZHzsuj/03JRfZw4QYQ7fyRi/72VFTmG7pK85rMZs5hT4JEbghn+ENCvHPOlIuz6hY6eyTdUJxV8mf5YYUoQjYk1Cd/rK6FIeUyI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784278214; c=relaxed/simple; bh=InrOCXIxp7nIY035nqFDre0Vside73w6ThFWt9C2IsA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hMaEBHrb29dSbCsOyiWg4GFgRfNCCTIlvO/LYPsBAg2Q4tp7Bj8E+DCVa3puSeiINBWHgaZ+7OBtA6AG7r0Ll+T6rbkLOG9UmHCytKuHLJJ8EoVKj3Wv+8bTVrYEcjNSRs/VAs9+y/LgRHMfYDubNEAEX1RxjIdIdu67yEiCT9w= 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=ijj1CXRR; arc=none smtp.client-ip=209.85.128.49 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="ijj1CXRR" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-493ce08a75bso30836645e9.1 for ; Fri, 17 Jul 2026 01:50:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starlabs-systems.20251104.gappssmtp.com; s=20251104; t=1784278209; x=1784883009; 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=jUX0rBc+sxxS3GxaezDrNFvT2vy14h9ZrkbEMYUzuj4=; b=ijj1CXRR7gS+f8v1A0jJYtyut0oOpHyaqOhpIUYXcbz2cVhk40Z7PiguJAt/6tePPi onZv+4WYyQTACgbYbnt3W1Go+Ehn4V9iSa2caFfWnxS3Zs2eUOmAsRqxUtZkf3VuAM1w Flsa5se2iQADM/BNB/tjpyq/zoL12MiK1euQDSIuOZzKCnaSvNwJJ2gq7Knqze24yz78 SIFiXZKdGELNmECue0eqaC8KUo3uyYPjdJjgVWNKpLePkublyUpSx+3QgIcxoKafajVi QGDuL8rxrJhGagfjsB7KxPaaIDkWyDn10Aq5h3DJ6TY4VBEn7XLVPBkmCIobdT2rPDf+ 1EDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784278209; x=1784883009; 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=jUX0rBc+sxxS3GxaezDrNFvT2vy14h9ZrkbEMYUzuj4=; b=PfI4pbU542ieuS2IodWCXQsSH0G3vvarQOMN8vHa7s48SY9v0zrpWlJYg/+iMPoyka XrC7zFOSNpMka8+EmUfkvVEqAWIflt1uZmqn8cjxm1xkyK9+TkatepOqMxTn8eXqhUgp IhuZajyHMNk1Z64y/IcZ757D5A/L2aimEa5km958KumV5Et9gUfdhWuhWeAZ60yulGCA cWfm/Y8z0yI+Y7ZlCKSJA1p5ELvEsHhQuFyfMCAsIF963RMC2uY/imvWEca4jt6DpRYy hYCo1Un7nctxDzJ/t2GkN2ytwF7AcLxXqI4jpJ+CGaPNJKQIlQpus1G/SoPJjZxTWSWI wAIA== X-Forwarded-Encrypted: i=1; AHgh+RoShoTqPkoDs5VMTwVdh/Q76tBiLk/G8KXh7UC3rdBZFLieZIcx/1X+GBAqC+tOQVJ3bPCj7aO44ZIPWuM=@vger.kernel.org X-Gm-Message-State: AOJu0Yx9ng3Tmu/2hXBy2JXvVaYhVH3k6lbIcPTzHmEKxYb3y1aPTe7T 8VYlVLmesbsKGLoocI4y6tD1fvxkZhe18EujUsIBxfng5EjXS22JBx8NB240W+yx2Q== X-Gm-Gg: AfdE7ckvKuwCpM/vM5oLBGnkv/Y6qMnWt39xowfNsjwetXSjAFXnZXM4Kz7On6lBhhR lBqoQa6WQzSSAkpq5fyU4bQXjOg/z+S9PeX/YkXUcJ/RIlvJjmnGCaG16XEBOrff2V/ERKllHvl ZqpSbSMADOe+Xi50vZIlPxcElONqbtxMZHmvfnotKgXc4BKzxjqgPoZcIA4XaQh9rBuWR9SLNdU F5pF9X3n7+UIlVWbxKhStbTuH6KsyovHpLO5RIiqQRUXcvj8CfSxV5l69HYRGfW3Ng/MSVw37YL qgpq5oErgYZGBKmMQvDvmKDeKRfMY5P+KJy70Ruh3stDTe8OdIgKxQe6yfLjaBGaYQD2E6Xjbbg iv/wNstOedLNyqcm4VLTPpkY8GzVRMtbWoOskoihbRDppK58YHvmoxjJVsPatP5c8+Rbiwfa7GN OY6uUguP2T7BUxJqRSOuq6APYLMyyEHR31Qe+qja0= X-Received: by 2002:a05:600c:4e0c:b0:492:3e44:214b with SMTP id 5b1f17b1804b1-4954bf564d0mr8339215e9.13.1784278208768; Fri, 17 Jul 2026 01:50:08 -0700 (PDT) Received: from horizon ([217.155.46.38]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4954a2a2504sm33972955e9.2.2026.07.17.01.50.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 01:50:08 -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, oliver@liuxiaozhen.dev, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, Dell.Client.Kernel@dell.com, chrome-platform@lists.linux.dev, Sean Rhodes Subject: [PATCH v7 3/3] firmware: coreboot: Add CFR firmware attributes driver Date: Fri, 17 Jul 2026 09:50:03 +0100 Message-ID: <20260717085003.369496-4-sean@starlabs.systems> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260717085003.369496-1-sean@starlabs.systems> References: <20260717085003.369496-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 | 14 + drivers/firmware/coreboot/Makefile | 1 + drivers/firmware/coreboot/coreboot-cfr.c | 1141 ++++++++++++++++++++++ 4 files changed, 1162 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..5c37bdc9c9fd 100644 --- a/drivers/firmware/coreboot/Kconfig +++ b/drivers/firmware/coreboot/Kconfig @@ -44,6 +44,20 @@ 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 CRC32 + 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..ba9708a434c6 --- /dev/null +++ b/drivers/firmware/coreboot/coreboot-cfr.c @@ -0,0 +1,1141 @@ +// 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 + +#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 +#define COREBOOT_CFR_MAX_FORM_DEPTH 16 + +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 efi_writes_supported; + 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; + + for (off =3D 0; off < len; off +=3D entry->size) { + 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; + } + + 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_efi_value_locked(efi_char16_t *efi_name, + u32 *value, u32 *attrs) +{ + unsigned long size =3D sizeof(__le32); + efi_status_t status; + __le32 data; + u32 attr; + + status =3D efivar_get_variable(efi_name, &coreboot_cfr_guid, &attr, + &size, &data); + 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_read_value(const struct coreboot_cfr_setting *sett= ing, + u32 *value, u32 *attrs) +{ + efi_char16_t *efi_name; + int ret; + + efi_name =3D coreboot_cfr_efi_name(setting->name); + if (IS_ERR(efi_name)) + return PTR_ERR(efi_name); + + ret =3D efivar_lock(); + if (ret) { + kfree(efi_name); + return ret; + } + + ret =3D coreboot_cfr_read_efi_value_locked(efi_name, value, attrs); + efivar_unlock(); + kfree(efi_name); + + return ret; +} + +static int coreboot_cfr_write_efi_value_locked(efi_char16_t *efi_name, + u32 value, u32 attrs) +{ + efi_status_t status; + __le32 data; + + if (!efivar_supports_writes()) + return -EROFS; + + data =3D cpu_to_le32(value); + status =3D efivar_set_variable_locked(efi_name, &coreboot_cfr_guid, attrs, + sizeof(data), &data, false); + 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) + 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) +{ + efi_char16_t *efi_name; + u32 attrs; + u32 old; + int restore_ret; + int ret; + bool changed =3D false; + + if (setting->read_only) + return -EACCES; + + efi_name =3D coreboot_cfr_efi_name(setting->name); + if (IS_ERR(efi_name)) + return PTR_ERR(efi_name); + + mutex_lock(&setting->drvdata->lock); + ret =3D efivar_lock(); + if (ret) + goto out_unlock_mutex; + + ret =3D coreboot_cfr_read_efi_value_locked(efi_name, &old, &attrs); + if (ret) + goto out_unlock_efi; + + if ((attrs & COREBOOT_CFR_EFI_ATTRS) !=3D COREBOOT_CFR_EFI_ATTRS) { + ret =3D -EOPNOTSUPP; + goto out_unlock_efi; + } + + if (old =3D=3D value) + goto out_unlock_efi; + + ret =3D coreboot_cfr_write_efi_value_locked(efi_name, value, attrs); + if (ret) + goto out_unlock_efi; + 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) { + restore_ret =3D coreboot_cfr_write_efi_value_locked(efi_name, old, attrs= ); + if (restore_ret) { + setting->drvdata->pending_reboot =3D true; + ret =3D restore_ret; + } else if (coreboot_cfr_apply_runtime(setting)) { + setting->drvdata->pending_reboot =3D true; + } else { + changed =3D false; + } + } + +out_unlock_efi: + efivar_unlock(); +out_unlock_mutex: + mutex_unlock(&setting->drvdata->lock); + kfree(efi_name); + + 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) { + /* Enum and bool values are valid only if they have a label. */ + 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); + } + + 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; + int count =3D 0; + + for (off =3D 0; off < len; off +=3D entry->size) { + 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++; + } + + 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; + 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; + + for (off =3D 0; off < len; off +=3D entry->size) { + entry =3D base + off; + if (entry->tag !=3D CFR_TAG_ENUM_VALUE) + 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++; + } + + return 0; +} + +static bool +coreboot_cfr_possible_values_fit(const struct coreboot_cfr_setting *settin= g) +{ + size_t len =3D 1; /* Trailing newline. */ + unsigned int i; + + for (i =3D 0; i < setting->n_values; i++) { + if (i) + len++; + + if (strlen(setting->values[i].label) >=3D PAGE_SIZE - len) + return false; + + len +=3D strlen(setting->values[i].label); + } + + return true; +} + +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, + bool parent_read_only) +{ + 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) || + !data->efi_writes_supported || parent_read_only; + + 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) { + 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; + if (setting->type !=3D COREBOOT_CFR_SETTING_NUMBER && + !coreboot_cfr_possible_values_fit(setting)) { + ret =3D 0; + goto err_put_setting; + } + + ret =3D coreboot_cfr_setting_is_usable(setting); + if (ret) { + if (ret =3D=3D -ENOENT || ret =3D=3D -EINVAL || ret =3D=3D -EOPNOTSUPP || + ret =3D=3D -ENAMETOOLONG) + 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, + unsigned int depth, + bool parent_read_only) +{ + const struct lb_cfr_option_form *form; + const struct coreboot_table_entry *entry; + const void *child_base; + size_t child_len; + size_t off; + int ret; + + for (off =3D 0; off < len; off +=3D entry->size) { + 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; + + form =3D base + off; + if (form->dependency_id || + form->flags & CFR_OPTFLAG_SUPPRESS) + break; + + if (depth >=3D COREBOOT_CFR_MAX_FORM_DEPTH) + return -E2BIG; + + 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, depth + 1, + parent_read_only || + (form->flags & + COREBOOT_CFR_OPT_READ_ONLY_FLAGS)); + 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, + parent_read_only); + if (ret) + return ret; + break; + default: + /* Ignore unsupported, child-only and future record types. */ + break; + } + } + + 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; + + payload_len =3D root->size - sizeof(*root); + if (crc32_be(0, root + 1, payload_len) !=3D root->checksum) + return -EBADMSG; + + if (!efivar_is_available()) + return -EPROBE_DEFER; + + data =3D devm_kzalloc(&dev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + ret =3D efivar_lock(); + if (ret) + return ret; + data->efi_writes_supported =3D efivar_supports_writes(); + efivar_unlock(); + + 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)) + return PTR_ERR(data->class_dev); + 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; + + ret =3D coreboot_cfr_parse_records(data, root + 1, payload_len, 0, false); + 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); + 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