From nobody Fri Oct 2 06:57:24 2026 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 BEE0F4477F1 for ; Tue, 4 Aug 2026 10:13:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785838405; cv=none; b=WXGLSUrxTfT8yZ6mxDQLAwsIpozS3cHN2n0jWqkOHpyw9PgWtVee2j+AC/bzHn1ONHgutldGrxwts1fSnrzHBZcpqcJXeptMorUSwIXiC9GliEWfp4uyRI96GYi0gmwhXYtmR5053NKPWBeMVAs1t7/TyOEJfhnD2XnsnPylHjU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785838405; c=relaxed/simple; bh=5F+9d6zSwaI23ajpCCP4JCHQTIKUiBdtuz68jRALsbE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qpJSbW3Ooy0+WIPuiT2/sZgi9OakNz9DGvWB/L67fUVelfW7TzQO55l7oBT8KH6LNo8/jha5VXUYxy6t61sxYxKMMd+i4bFXV2oQ8a3YO6FsOc+/hyMluOBVwLrl45r+GaJTT2vZmmObV+PH/fZ/yj9v63noDXRlvVhrcqng0X0= 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=cumMePAV; arc=none smtp.client-ip=209.85.128.50 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="cumMePAV" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-495757ccbc1so29474995e9.2 for ; Tue, 04 Aug 2026 03:13:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starlabs-systems.20251104.gappssmtp.com; s=20251104; t=1785838401; x=1786443201; 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=eyYlZFVCc06FCgom6L11YucB1au+iuvrVnF7FufZeZ4=; b=cumMePAVXP505ygUg2nAJ9qAt6lghi92bdO97fSK7uvCQKt2rnx4qmCoUethUW2uNe rUK+KVIYg0VJtJuBbZt+LJPkehjhL4FIQ9YSaDrsjeYvHk8iAL+m1RkXHWfdY4GWv/5i n3TQnW8tmAiK95nlFKO8imXk2MB4Eo7D6RNeyxCVuy0Pk466pl1gr1+HcUekqgPHHVT4 ymDP+PZ/YU6QSO494zB6G9aVaOoZAG5yEsn2mn0LHsFSULrSV3kfN7grLizCMDauFESx FF+HJKEGM+l8AIDzWYv0CWFwZ/3/7pxMM6SUgiLGIO9ZcGjW7gzue1kAfNPDHWFsNf/J GT8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785838401; x=1786443201; 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=eyYlZFVCc06FCgom6L11YucB1au+iuvrVnF7FufZeZ4=; b=Hs8+OhmiB1oums9ztfDeHGmKWgHZWFPTLR9qE7NemTGQc0lxovI+vy3AB8fngWA/yQ bswzgr56J/Ubsqn0Ye/XGNb9t3/Ud19+aSV9jbDsh7kjkVtoZww6CHTL9SAts2Suby7O OJwID3T0QpH7/CgdQck0L5/clpzFmbq4vzDBAP3Socxb+ivDaup/mOWOwBrmqjfSYUsd zpaESeitNz14eaDzd0ZPPEPcf8K9bmWEsXICZAdCD4sAftEOYJ2DhZRvKDxoGmM6RoFh IKt47EfJ+9v/nLic2fHc/y1R9X3fR+rIfJ90L7nEM8kSAnvX8bauxP4R1nDFJ+cAEh8z fdjQ== X-Forwarded-Encrypted: i=1; AHgh+Rob+TD0UEXUPZyYMte6wOjE4oJGqM/JMhV1rUX9JFXALs1Mu7hH4CLGaqUi90NOG6Rd4c/P6U+Lw4KoATI=@vger.kernel.org X-Gm-Message-State: AOJu0YzweMUaloDhh4S2wpTYzbwPYNNEbEu74DNS+Ney4Hg9xABqsxfD +Kf6MwzE4EuzVIZxICWWYGa5esT9TwtPwym0JL9/+h55OGcYurjbNIGQz8ErjuL6gw== X-Gm-Gg: AR+sD130g0qaXG3fGK++GpasgrazQ4jRfJgVUhYymWvWBeg6OU4bqN9+uOoHVR+7oEc PBE2krIi5ZX7xMyNTrkCjy5rmFGtjGh0Lbf5RR7gh2GzRc7vWn+l4oa0zRo/5USaEH9lbhkt/9q TcH+P8+hJcs4/MyNIDvPTjIIqF2Jnc/CctbSigQFprOllJVgemi2XdJv09AIsW7OsUPC/sxdR0+ ypUyJ6lEsbVxmBHm5NNpjia1qClMd5KC9GkzADOWwLUOaFwE7xsyfAoJY3WNSEDjibLGx0mM4VZ nmn/AnRF7XuWkEp/0fE2wvuHlUa6jYUTyIt7BqXlN4UtKEwQcxUV2EusOzrr28U1vIkcQmsxBUk HsDs5fCnid5D4aQOUpqsP3vv+oZ4rdIO+PdENYdrcLFNEnbDFg7vm4Sxxe+lXN+47oXMrl+lu58 3jRlKW5itC37+JyA4JxjOhTudx9D2Ru4TbzCRNkmqrFruzGpXD2pboQuigmJe4GppEX3UwMDNou yaEnx/qEaIxyOKBULg6r1Xc2noT+JQ3 X-Received: by 2002:a05:600c:4e52:b0:495:3f84:a792 with SMTP id 5b1f17b1804b1-4980c674dcamr370512765e9.12.1785838400893; Tue, 04 Aug 2026 03:13:20 -0700 (PDT) Received: from horizon.localdomain ([216.128.28.240]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49949fcb0c5sm67300275e9.4.2026.08.04.03.13.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2026 03:13:15 -0700 (PDT) From: Sean Rhodes To: chrome-platform@lists.linux.dev Cc: Corentin Chary , "Luke D. Jones" , Denis Benato , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Prasanth Ksr , Jorge Lopez , Mark Pearson , "Derek J. Clark" , Joshua Grisham , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Dell.Client.Kernel@dell.com, Sean Rhodes , Florian Fainelli , Huacai Chen , "Michael S. Tsirkin" , Chen-Yu Tsai , Tzung-Bi Shih , Brian Norris , Julius Werner , Thomas Zimmermann , Javier Martinez Canillas , Maarten Lankhorst , Maxime Ripard , David Airlie , Simona Vetter , Krzysztof Kozlowski , Bjorn Andersson , Geert Uytterhoeven , Dmitry Baryshkov , Arnd Bergmann , Eric Biggers , Luca Weiss , Michal Simek , Sven Peter , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= , Bjorn Helgaas , Danilo Krummrich , Takashi Sakamoto , Titouan Ameline de Cadeville , Kees Cook , dri-devel@lists.freedesktop.org, Oliver Lin Subject: [PATCH v11 1/4] platform/x86: Sort firmware attributes class includes Date: Tue, 4 Aug 2026 11:13:06 +0100 Message-ID: <8ce2352ed27152d9bcf8ec861739b4ed42cb5887.1785838269.git.sean@starlabs.systems> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: 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" Move firmware_attributes_class.h into the main include block and sort the affected includes. This lets the header move replace each include in place. Suggested-by: Derek J. Clark Signed-off-by: Sean Rhodes --- 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 ++- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/drivers/platform/x86/asus-armoury.c b/drivers/platform/x86/asu= s-armoury.c index 495dc1e31d40..f3d8c5a85762 100644 --- a/drivers/platform/x86/asus-armoury.c +++ b/drivers/platform/x86/asus-armoury.c @@ -20,6 +20,7 @@ #include #include #include +#include "firmware_attributes_class.h" #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..4ff9003c6589 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 "../../firmware_attributes_class.h" +#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..1965a329be48 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 "../../firmware_attributes_class.h" #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..9e4b3e973de9 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 "../firmware_attributes_class.h" #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..fdebaa0a9992 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 "../firmware_attributes_class.h" #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..74103c00b0c8 100644 --- a/drivers/platform/x86/samsung-galaxybook.c +++ b/drivers/platform/x86/samsung-galaxybook.c @@ -14,6 +14,7 @@ #include #include #include +#include "firmware_attributes_class.h" #include #include #include @@ -27,8 +28,8 @@ #include #include #include + #include -#include "firmware_attributes_class.h" =20 #define DRIVER_NAME "samsung-galaxybook" From nobody Fri Oct 2 06:57:24 2026 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.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 8943644C51D for ; Tue, 4 Aug 2026 10:13:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785838408; cv=none; b=TmNZ6k4v8QRwwPPa+AZ6LAyojdh4hllRDDC6oqnXZ7ap6paE4UBu5o/gsQqQLK+TkO4eJyK1S4sgDMAb8fOoPx0LtUNFQIUI1OQGh1X6Ox8anygaekg1lpGL48d3mpowF/XvA1/OgqVIa8UjlYG/g2GujraYFA+L+tnkF/TJ9zQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785838408; c=relaxed/simple; bh=g4yd8p12/M5P5QQ0oaJeAwrqiehzUOpkYS/18oaqz5s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=olNMdIRo7AtCXsYSwZd9IKPVh3tfQvqyNWholc+cHg147IcQ3gkr9uxGS300TRirV+Hc6LvJeCvWFO0SauNbmql/QoZ36kvpLQ59bxw98ad6t+LlolWfEKjkT2+YeHc+MyusR6MlSviugTiTtwXR6cobNe/RSwbztmTQqkAx+Ac= 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=W7+9u/9/; arc=none smtp.client-ip=209.85.221.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="W7+9u/9/" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-471eeac43bfso4175950f8f.3 for ; Tue, 04 Aug 2026 03:13:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starlabs-systems.20251104.gappssmtp.com; s=20251104; t=1785838404; x=1786443204; 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=QC4AFuTm4HDDPDQl/NigTkSn6PdRCMtpbKbWNy2fmpU=; b=W7+9u/9/EvRV5NhjKYYQ+gYQmNaXXyjudfY7dg/dFdNQ0b+lhTNcMoAINRfQSsDY3A VKvwV/UgYCRnou5+GLVtGGFblF72Rq2PboagY4OZLUFVbRsKrzGvZnD06KStuqjuYI6t cWOxPKKk7C13j/D4+z3AIApw8rks3/IjW6XM8tWdSxzijeHSaAQzcDr7SKb1ocd5U2Y0 zfIFWPSPDHcW7usA1E72YqpawFbXf3t0qEtf2Hk7pgA09kwP/UAA6fZ96ZbtknK3zBIE SOWM0d61E8/adw7NLnnYa/BeTP7Ccp2/c/kwBfWca/2EciP0JNyrTXPddj1BvFLi4IuB FK/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785838404; x=1786443204; 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=QC4AFuTm4HDDPDQl/NigTkSn6PdRCMtpbKbWNy2fmpU=; b=qAFFw3r5b8IapAJkg/DuHXmxJDABvsp8s8ZFNp9qyiwxmgddJjxp661BoqB9zcazve UT3wp7xi1hbqVF55v2j4InXAlFJ6jX34PQoRnExNRO7SWmNXZce0+RyKuBUFP3KgKj40 Ny8X1pC3YlWF9aGx7emBYfkoI7hchXP6qqzPCeA59FY5X+zAZwz+tN0eeCXivo00zaKv TSCQpvsSt70Z3WWvI+lqftA0niphvDgmI/s+xZpIS/vczksFq+MkyhIfzksWkHcPXxyd X8VSrgi2acNR4M+RxUe7AoihL8sx3NGH3o72PEh6zbXuSzgOs0fgYXW9kzaiRFUiMmsW kIyA== X-Forwarded-Encrypted: i=1; AHgh+Roz7EPHFnCyetvDQGnMzKsaI2X5ugnVtlQ25uHyEs7a6pMHtOM/pH9gs07/MRuuVhIrlFLOBw7X7TLPKMY=@vger.kernel.org X-Gm-Message-State: AOJu0YyN78e1R3t0cPsNoZG5SviIaTEP37czkYtvb9q7W9maZWIpzbK9 EEUIcu90cYQH1TPCnpASBaBA2/3j8UZUq4g8ru+IjH+2HDCRG5MGfU0nmebutkUFIg== X-Gm-Gg: AR+sD13g99TfocMAD3pbW+TXPgwx2jVkQh8fDK7G6PRb+pGx7pAFxjPAFK8Hv7ikOfz eYVIQkW2BvujIEYJGjKJXeYcbJEjqOSgij8umjfI87T4ylTNp0AwYxquTjYIEePqscOtNo4Jhds d5zFYQwIzAPi/V9Lm/RfRMI0Azb+/+w4JaKjryXJI7HaBRkcJmzGMiNh/OQA4uWYjCZeZvszxlh jXTIiZjN7iQkv9W313bOhKWneD0vwjzGHO3PVpLwX0sVjprRzWim9WNXPuzmYy0cdLBlQgkZGNg hge3I8MLS0QPVugIyXY8iA6CK7ur21EVU5xOMBOEeJENEwd3K6/JSJlWH6jw7Ez3QMqV5yV6w2N 6V9gonEJwn455f/pL2UnMb1cpQS07fJnH5I7N6U+FZD1bxQ75aAojBEetTskRQsKFhKRWsWo0en 21562e4neApfFm8o/1hd7Jdva0IDbD+TMlqydZCwoa9BLEzoP+eUJzWmFFh4texwxWu6n8qrnjr MeJF1btnyVxwPh/M4ysRC3wUUAjLAQd X-Received: by 2002:a05:600c:2153:b0:497:fe58:d714 with SMTP id 5b1f17b1804b1-4980c674df7mr198300025e9.9.1785838403656; Tue, 04 Aug 2026 03:13:23 -0700 (PDT) Received: from horizon.localdomain ([216.128.28.240]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49949fcb0c5sm67300275e9.4.2026.08.04.03.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2026 03:13:23 -0700 (PDT) From: Sean Rhodes To: chrome-platform@lists.linux.dev Cc: Corentin Chary , "Luke D. Jones" , Denis Benato , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Prasanth Ksr , Jorge Lopez , Mark Pearson , "Derek J. Clark" , Joshua Grisham , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Dell.Client.Kernel@dell.com, Sean Rhodes , Florian Fainelli , Huacai Chen , "Michael S. Tsirkin" , Chen-Yu Tsai , Tzung-Bi Shih , Brian Norris , Julius Werner , Thomas Zimmermann , Javier Martinez Canillas , Maarten Lankhorst , Maxime Ripard , David Airlie , Simona Vetter , Krzysztof Kozlowski , Bjorn Andersson , Geert Uytterhoeven , Dmitry Baryshkov , Arnd Bergmann , Eric Biggers , Luca Weiss , Michal Simek , Sven Peter , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= , Bjorn Helgaas , Danilo Krummrich , Takashi Sakamoto , Titouan Ameline de Cadeville , Kees Cook , dri-devel@lists.freedesktop.org, Oliver Lin Subject: [PATCH v11 2/4] firmware: Move firmware attributes class helper Date: Tue, 4 Aug 2026 11:13:07 +0100 Message-ID: <6d82b7ed6fd917ff4923436fdc6fafcaf8745cc3.1785838269.git.sean@starlabs.systems> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: 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 2f9472c1a090..e6a8c271e79d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10115,6 +10115,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 f3d8c5a85762..e6af93608ec5 100644 --- a/drivers/platform/x86/asus-armoury.c +++ b/drivers/platform/x86/asus-armoury.c @@ -20,7 +20,7 @@ #include #include #include -#include "firmware_attributes_class.h" +#include #include #include #include diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c b/drivers/p= latform/x86/dell/dell-wmi-sysman/sysman.c index 4ff9003c6589..963b3473991d 100644 --- a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c +++ b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c @@ -9,7 +9,7 @@ =20 #include #include -#include "../../firmware_attributes_class.h" +#include #include #include #include diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c b/drivers/platfor= m/x86/hp/hp-bioscfg/bioscfg.c index 1965a329be48..f13f21580acd 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c +++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c @@ -8,7 +8,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt =20 #include -#include "../../firmware_attributes_class.h" +#include #include #include #include diff --git a/drivers/platform/x86/lenovo/think-lmi.c b/drivers/platform/x86= /lenovo/think-lmi.c index 9e4b3e973de9..4437785aa1f2 100644 --- a/drivers/platform/x86/lenovo/think-lmi.c +++ b/drivers/platform/x86/lenovo/think-lmi.c @@ -15,7 +15,7 @@ #include #include #include -#include "../firmware_attributes_class.h" +#include #include #include #include diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86= /lenovo/wmi-other.c index fdebaa0a9992..b175971bb308 100644 --- a/drivers/platform/x86/lenovo/wmi-other.c +++ b/drivers/platform/x86/lenovo/wmi-other.c @@ -33,7 +33,7 @@ #include #include #include -#include "../firmware_attributes_class.h" +#include #include #include #include diff --git a/drivers/platform/x86/samsung-galaxybook.c b/drivers/platform/x= 86/samsung-galaxybook.c index 74103c00b0c8..3911f60c23ea 100644 --- a/drivers/platform/x86/samsung-galaxybook.c +++ b/drivers/platform/x86/samsung-galaxybook.c @@ -14,7 +14,7 @@ #include #include #include -#include "firmware_attributes_class.h" +#include #include #include #include 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 */ From nobody Fri Oct 2 06:57:24 2026 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 86CAD466AF4 for ; Tue, 4 Aug 2026 10:13:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785838410; cv=none; b=kLoNjUC6daulOb6/OsNOAr+oHtS3QrmHalyY+FRXvA9w+jZF5WIUJ+vUaKPZUCnsbqrt9tTaGulOxfKaAr2pYkqCT5uGVXScAdK+Lj0Wa1g59CUmuW8taKy+DWKPNpIDWjHCXsNeFYJgkSgKOoBp3xU5MFEKqcCwUvAsxrBxKiw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785838410; c=relaxed/simple; bh=655sXRuPwCv8keUAqLh0V+ifZPkrkHWb7tuYg7b0E9Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UpQYODLuKnlrA0dxacNd3Wb9TDCbYgUAgZ9R7wA/1VfRYXXFXqQJHnEcNLg5Fifl4AN67Zh65GJJurfnVzJjC7hdIo19gwB1mkTmmNT2tPyoqXXDBLtsUTx3LQ38QEex5GfcIWYBhZ57yGWFgZleHD1r4xa+q/zGwqaDC0hZRqM= 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=ndkXW4+U; arc=none smtp.client-ip=209.85.221.48 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="ndkXW4+U" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-47fe2d179e2so1219923f8f.1 for ; Tue, 04 Aug 2026 03:13:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starlabs-systems.20251104.gappssmtp.com; s=20251104; t=1785838407; x=1786443207; 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=iLdt9DbJhtF9Wr8WDpk+P3jJIYzXdtmn+TfxgVbn6u0=; b=ndkXW4+U3KGunT4NpnXW3smwWODvKtZErhblhKoGEGGC2tJiZdFeM+slSXVD52PStA hWD0n0AWPh1DfRpp5Tv7ZBTlGaHiEbPqSFiTDyHdbtBQhU4e1ZfBsH7sagNZ1+jHRhIh 1JEkCY1Js0HlkAXBi4zddBUmrUXmhDvWZRr6JW6JgzLR8sJlDWf54qldbuZzvAZzAlKM MSTjojGpK35KcN4gYnrta30tn6QfsozIKq/RRXuzqkGwrvt6tx2ZDo6O6rTf7IRnI5rN /6Y/WjaB2Owh/peUUi+ZopVlWlEwHVHBGtfTrh+Gl4XJirnZFxxQjFRO5mOehvpYqziQ VuWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785838407; x=1786443207; 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=iLdt9DbJhtF9Wr8WDpk+P3jJIYzXdtmn+TfxgVbn6u0=; b=PmHFAKLH3R3Ufj38vhovagwrPyDgs55/q5p5fY8fAXhgvg2XetB/d46TG1fziUvqCC uKtU8b8lh0DBvCL2krBXa1MqehFGJ2rJawSv3NuZhp2iBXNmqIMi31S+neK543F3tMw0 TjfCyjS6inQV+drzkyttbE1+C65zOvkADJbtlbA5Db3h2Anev//XnIhzaen+pk1h5Hl5 layOu+bRsEfNkPZphEloyn+BMmTwHV1xYN4hg0Qblo66lFWwOnn5ZbQ9/6fqqFQQ+3r4 PBfk+QRCi7FyUJWrS6FFq5CJW06fMMM/LM2PGr+BhA2jyXoVgOjZDDHewnm698LVHh0E j3mg== X-Forwarded-Encrypted: i=1; AHgh+RqqVk+moPBQfHdqvP3GqLPZxAJVal6D8LZT5L2Vsr1VHJL2q8tyrszHVrCx/xiDCzGTl8gIE5zm9+p9q0Q=@vger.kernel.org X-Gm-Message-State: AOJu0YxeAgcj8CEuI7yEwnRBneuNOEhOMrBVUqqGMS1fjsLhvT0InwDt kDiGBxMAhCIwcG89362DFdcYEPCFWuXuSORucUQSVgaiLccqFTcTQNu8I67RMYL30g== X-Gm-Gg: AR+sD137xblI5MSKyos364It8pG84bVuSqP9Uy3Q6YYebWtsEcHHumkyHrzskYyOIXc 67SDUZXtSH3v6PG2O6B0HV9nKaR1DBIdMQf3VPTWFm1fN7wBai3RSl/j17rcgE+Ds08aARdRXqu Im5tNE98g2MNQCaahv/dOhEMzLKpYjUWQ5Js06Ge2vtzEtxhx7BEarfK084NF4RtensfiR9HVhS WaW32VtyOo41OW6smqj+gpCIBvGwZYz6yLNozHjpDYiDYnIMYo+Mfixn5TJapjlkXeBufA1cmag DZRvPPGc1G0eQKxZn7Usk8cxeA94SE2fu/j0NZc7HIQgUDentR6yKECFEm4W1eRQa0abAIwqVl3 TATNBZFFCNhl0eUPMEnHJVPUjBykpHEDyY2L4vEO3XnY7dfeVMJRLxT8M2h1VMKfQL1dvi1T/bo 6Uq1zLkTUegD4MV/mgYj5L5rmP/YopMLVuAEDkzkLI8/Oz5+iXfNHFj6dsRtXrhH6NaG0EZLfZq g7G6qLWvEAnoUSXN0fvzWSoon7AFItd X-Received: by 2002:a05:600c:1992:b0:498:28b:1045 with SMTP id 5b1f17b1804b1-4980c645611mr264401445e9.3.1785838406680; Tue, 04 Aug 2026 03:13:26 -0700 (PDT) Received: from horizon.localdomain ([216.128.28.240]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49949fcb0c5sm67300275e9.4.2026.08.04.03.13.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2026 03:13:26 -0700 (PDT) From: Sean Rhodes To: chrome-platform@lists.linux.dev Cc: Corentin Chary , "Luke D. Jones" , Denis Benato , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Prasanth Ksr , Jorge Lopez , Mark Pearson , "Derek J. Clark" , Joshua Grisham , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Dell.Client.Kernel@dell.com, Sean Rhodes , Florian Fainelli , Huacai Chen , "Michael S. Tsirkin" , Chen-Yu Tsai , Tzung-Bi Shih , Brian Norris , Julius Werner , Thomas Zimmermann , Javier Martinez Canillas , Maarten Lankhorst , Maxime Ripard , David Airlie , Simona Vetter , Krzysztof Kozlowski , Bjorn Andersson , Geert Uytterhoeven , Dmitry Baryshkov , Arnd Bergmann , Eric Biggers , Luca Weiss , Michal Simek , Sven Peter , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= , Bjorn Helgaas , Danilo Krummrich , Takashi Sakamoto , Titouan Ameline de Cadeville , Kees Cook , dri-devel@lists.freedesktop.org, Oliver Lin Subject: [PATCH v11 3/4] firmware: Rename google firmware directory to coreboot Date: Tue, 4 Aug 2026 11:13:08 +0100 Message-ID: <6f65c9869714188539f2890aef6cf30e7bd2edcb.1785838269.git.sean@starlabs.systems> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: 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. Rename the generic coreboot Kconfig symbols at the same time. Keep the old CONFIG_GOOGLE_* names as transitional symbols so existing configurations migrate to the new names. Suggested-by: Julius Werner Signed-off-by: Sean Rhodes --- MAINTAINERS | 4 +- arch/arm64/configs/defconfig | 6 +- drivers/firmware/Kconfig | 2 +- drivers/firmware/Makefile | 2 +- drivers/firmware/{google =3D> coreboot}/Kconfig | 74 ++++++++++++++----- .../firmware/{google =3D> coreboot}/Makefile | 10 +-- drivers/firmware/{google =3D> coreboot}/cbmem.c | 0 .../{google =3D> coreboot}/coreboot_table.c | 0 .../{google =3D> coreboot}/coreboot_table.h | 0 .../framebuffer-coreboot.c | 0 drivers/firmware/{google =3D> coreboot}/gsmi.c | 0 .../memconsole-coreboot.c | 0 .../memconsole-x86-legacy.c | 0 .../{google =3D> coreboot}/memconsole.c | 0 .../{google =3D> coreboot}/memconsole.h | 6 +- drivers/firmware/{google =3D> coreboot}/vpd.c | 0 .../{google =3D> coreboot}/vpd_decode.c | 0 .../{google =3D> coreboot}/vpd_decode.h | 0 drivers/gpu/drm/sysfb/Kconfig | 2 +- 19 files changed, 72 insertions(+), 34 deletions(-) rename drivers/firmware/{google =3D> coreboot}/Kconfig (64%) rename drivers/firmware/{google =3D> coreboot}/Makefile (51%) 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 e6a8c271e79d..62ddee473f55 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11069,14 +11069,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/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 654a102cb5bc..32ec89a872d9 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -267,9 +267,9 @@ CONFIG_RASPBERRYPI_FIRMWARE=3Dy CONFIG_INTEL_STRATIX10_SERVICE=3Dy CONFIG_INTEL_STRATIX10_RSU=3Dm CONFIG_MTK_ADSP_IPC=3Dm -CONFIG_GOOGLE_FIRMWARE=3Dy -CONFIG_GOOGLE_CBMEM=3Dm -CONFIG_GOOGLE_COREBOOT_TABLE=3Dm +CONFIG_COREBOOT_FIRMWARE=3Dy +CONFIG_COREBOOT_CBMEM=3Dm +CONFIG_COREBOOT_TABLE=3Dm CONFIG_EFI_CAPSULE_LOADER=3Dy CONFIG_IMX_SCU=3Dy CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE=3Dy 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..f8da96382680 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_COREBOOT_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 64% rename from drivers/firmware/google/Kconfig rename to drivers/firmware/coreboot/Kconfig index b78c644fa253..d273bd836245 100644 --- a/drivers/firmware/google/Kconfig +++ b/drivers/firmware/coreboot/Kconfig @@ -1,13 +1,16 @@ # SPDX-License-Identifier: GPL-2.0-only -menuconfig GOOGLE_FIRMWARE - bool "Google Firmware Drivers" +menuconfig COREBOOT_FIRMWARE + bool "coreboot firmware drivers" + default GOOGLE_FIRMWARE 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. + They include shared support for coreboot table entries and + drivers for CBMEM, framebuffer, firmware console and VPD records. If in doubt, say "N". =20 -if GOOGLE_FIRMWARE +if COREBOOT_FIRMWARE =20 config GOOGLE_SMI tristate "SMI interface for Google platforms" @@ -19,9 +22,10 @@ config GOOGLE_SMI driver provides an interface for reading and writing NVRAM variables. =20 -config GOOGLE_CBMEM +config COREBOOT_CBMEM tristate "CBMEM entries in sysfs" - depends on GOOGLE_COREBOOT_TABLE + depends on COREBOOT_TABLE + default GOOGLE_CBMEM help CBMEM is a downwards-growing memory region created by the Coreboot BIOS containing tagged data structures from the @@ -34,9 +38,10 @@ config GOOGLE_CBMEM memory for each entry in sysfs under /sys/bus/coreboot/devices/cbmem-. =20 -config GOOGLE_COREBOOT_TABLE +config COREBOOT_TABLE tristate "Coreboot Table Access" depends on HAS_IOMEM && (ACPI || OF) + default GOOGLE_COREBOOT_TABLE help This option enables the coreboot_table module, which provides other firmware modules access to the coreboot table. The coreboot table @@ -44,42 +49,75 @@ config GOOGLE_COREBOOT_TABLE device tree node /firmware/coreboot. If unsure say N. =20 -config GOOGLE_MEMCONSOLE +config COREBOOT_MEMCONSOLE_COMMON tristate - depends on GOOGLE_MEMCONSOLE_X86_LEGACY || GOOGLE_MEMCONSOLE_COREBOOT + depends on GOOGLE_MEMCONSOLE_X86_LEGACY || COREBOOT_MEMCONSOLE + default GOOGLE_MEMCONSOLE =20 config GOOGLE_MEMCONSOLE_X86_LEGACY tristate "Firmware Memory Console - X86 Legacy support" depends on X86 && ACPI && DMI - select GOOGLE_MEMCONSOLE + select COREBOOT_MEMCONSOLE_COMMON help This option enables the kernel to search for a firmware log in the EBDA on Google servers. If found, this log is exported to userland in the file /sys/firmware/log. + This driver is limited to x86 systems that expose the legacy + Google EBDA console format. =20 -config GOOGLE_FRAMEBUFFER_COREBOOT +config COREBOOT_FRAMEBUFFER tristate "Coreboot Framebuffer" - depends on GOOGLE_COREBOOT_TABLE + depends on COREBOOT_TABLE + default GOOGLE_FRAMEBUFFER_COREBOOT help This option enables the kernel to search for a framebuffer in the coreboot table. If found, it is registered with a platform device of type coreboot-framebuffer. Using the old device of type simple-framebuffer is deprecated. =20 -config GOOGLE_MEMCONSOLE_COREBOOT +config COREBOOT_MEMCONSOLE tristate "Firmware Memory Console" - depends on GOOGLE_COREBOOT_TABLE - select GOOGLE_MEMCONSOLE + depends on COREBOOT_TABLE + select COREBOOT_MEMCONSOLE_COMMON + default GOOGLE_MEMCONSOLE_COREBOOT help This option enables the kernel to search for a firmware log in the coreboot table. If found, this log is exported to userland in the file /sys/firmware/log. + This is the coreboot-table backed variant of the firmware memory + console driver. =20 config GOOGLE_VPD tristate "Vital Product Data" - depends on GOOGLE_COREBOOT_TABLE + depends on COREBOOT_TABLE help This option enables the kernel to expose the content of Google VPD under /sys/firmware/vpd. + VPD records carry firmware-provided key/value data used by + Google devices. + +endif # COREBOOT_FIRMWARE =20 -endif # GOOGLE_FIRMWARE +config GOOGLE_FIRMWARE + bool + transitional + +config GOOGLE_CBMEM + tristate + transitional + +config GOOGLE_COREBOOT_TABLE + tristate + transitional + +config GOOGLE_MEMCONSOLE + tristate + transitional + +config GOOGLE_FRAMEBUFFER_COREBOOT + tristate + transitional + +config GOOGLE_MEMCONSOLE_COREBOOT + tristate + transitional diff --git a/drivers/firmware/google/Makefile b/drivers/firmware/coreboot/M= akefile similarity index 51% rename from drivers/firmware/google/Makefile rename to drivers/firmware/coreboot/Makefile index 8151e323cc43..e681f274417a 100644 --- a/drivers/firmware/google/Makefile +++ b/drivers/firmware/coreboot/Makefile @@ -1,14 +1,14 @@ # SPDX-License-Identifier: GPL-2.0 =20 obj-$(CONFIG_GOOGLE_SMI) +=3D gsmi.o -obj-$(CONFIG_GOOGLE_COREBOOT_TABLE) +=3D coreboot_table.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 +obj-$(CONFIG_COREBOOT_TABLE) +=3D coreboot_table.o +obj-$(CONFIG_COREBOOT_FRAMEBUFFER) +=3D framebuffer-coreboot.o +obj-$(CONFIG_COREBOOT_MEMCONSOLE_COMMON) +=3D memconsole.o +obj-$(CONFIG_COREBOOT_MEMCONSOLE) +=3D memconsole-coreboot.o obj-$(CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY) +=3D memconsole-x86-legacy.o =20 # Must come after coreboot_table.o, as this driver depends on that bus typ= e. -obj-$(CONFIG_GOOGLE_CBMEM) +=3D cbmem.o +obj-$(CONFIG_COREBOOT_CBMEM) +=3D cbmem.o =20 vpd-sysfs-y :=3D vpd.o vpd_decode.o obj-$(CONFIG_GOOGLE_VPD) +=3D vpd-sysfs.o 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 diff --git a/drivers/gpu/drm/sysfb/Kconfig b/drivers/gpu/drm/sysfb/Kconfig index 2559ead6cf1f..34d3fa8b30c9 100644 --- a/drivers/gpu/drm/sysfb/Kconfig +++ b/drivers/gpu/drm/sysfb/Kconfig @@ -10,7 +10,7 @@ config DRM_SYSFB_HELPER config DRM_COREBOOTDRM tristate "Coreboot framebuffer driver" depends on DRM && MMU - depends on GOOGLE_FRAMEBUFFER_COREBOOT + depends on COREBOOT_FRAMEBUFFER select APERTURE_HELPERS select DRM_CLIENT_SELECTION select DRM_GEM_SHMEM_HELPER From nobody Fri Oct 2 06:57:24 2026 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 9754A468C03 for ; Tue, 4 Aug 2026 10:13:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785838416; cv=none; b=AQymDS6gcBcdV3WCT7zuMQ7B15UBKB4DGHaL+QK3bbJan96Y9XEKhrpi0GpHhI5M7SGcCaVuLZaKhY28q186Ci2PgPtepC3S+sWZrSAhdN9Ka6j0BoKVufcvTqacwuni4S2pcUeHjmGyl1QGFfKIUy6FIXoWkhsr2nuceqRdlPg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785838416; c=relaxed/simple; bh=cQ8McewAbexGun+H5VYfyEjN70W5AgVNwwV332nIqeY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h72Df01HMbMxrTemJGMM2nRkHdlPB8XBftoEOiGSRpRHbs8Hgj1GO4l6IrnFB3BY7nZ1ojw7yZqU4vm3qkO4ihCvG8O3SXKZpyEE6Ww0hI2tbh+SIVMQG7F+UjjjUTqAniL8/hTOgJypLXNAbjwnT7nwMXQwOpIpX0OGKFvYbaA= 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=HxknL9L1; arc=none smtp.client-ip=209.85.128.41 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="HxknL9L1" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4980fe6b3beso5507455e9.0 for ; Tue, 04 Aug 2026 03:13:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starlabs-systems.20251104.gappssmtp.com; s=20251104; t=1785838410; x=1786443210; 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=eJlw5PTTNyraxPUfmPIOb9X5pMmUIHGiAklseFII50s=; b=HxknL9L1aBpOYMXDzlHcSRy68tCdVh9Lr4syZtUAPGPUG6WnVLrAQgZdBiYsjwKaQE QnwpUT/BHnIesmBpinnKIa8PvH0+iQrQARDLJsWaXjirDOz2+7CadwOEfyEsifFMnE1F B/B885qHlq3CRPL1un4Bk82TOR3Z0WKpQd9gII6WOF6VT5H8AzUa+Q5q0ADr+4qmEH/x YKF6nWSDwjXPnaoKrxfKcI0Mo1tpzgueaAmOADSJ6bnlvPDvFceCeLMmVtED2ESAe8Rf sRo3im6kXXx1TFU4qZy4U935rhYW5W9J5Pxqp07bJubXl6iwPrTgPuCSSFOCpM/OUADY fayQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785838410; x=1786443210; 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=eJlw5PTTNyraxPUfmPIOb9X5pMmUIHGiAklseFII50s=; b=pT1sY7e7+0/n3UT/e2E2KvJ4T13kh+UoPflCIkU5q/E81sVKTtRaXJ4t+kEPjyvUOj zV+prAjP1X9AsPuK82YHXEm8o+EYADdGYJlg6kI5ZipdAHAh52dXKDhtpTTx455rbL53 YvW1JhIGGoqU2A4hk3jVDbHeUOdusVgRYQ+j4nhWYAiCdHBG057QpFXDvPEEpssUa7RZ T4fyLBSh71VUYhZON0xtfZDQKX2TBVIwKyptwcwsfV7oF9hvYJ5mgX9CQOltldUoskHW Q78LI0xgH3L9C0isW+lDpn2jrd0pe9rRY7wwgqeEC1DxD8fmhTNFvtBm9Ua85e71c5fG bSLA== X-Forwarded-Encrypted: i=1; AHgh+RoOWfE1Ws8zLlCUsqI/UxGy1wZn9+Og5T7QYl5pRiQRo4VTdqucRTruJbWgd+wpGaMrrBkyRgsjNpxwXVs=@vger.kernel.org X-Gm-Message-State: AOJu0YxqA6xAI/Gz/ZjJSJ5liOYp849sFzjhIj0QrxvgXiU2GkkVdsn+ uEVGYYcysLBWeRFghgW05hti8aHDZTk9c2mckn1SGjlZ0KMkpjLltlch9vUHDyhuOA== X-Gm-Gg: AR+sD13AfKKZBFoV46Pm/1OZAIgP4QV7WjAghZPu61C9KqQvN8NiWxoUTdJybn6HGPP oXcgysz6ieZSuCpfxXt9ghhSSWQ8npgUa53aU1vW5wj1vHbM98tDT2J3t62cr4Q+4748lO8QsW0 u+3IrN2Wpnydp/3f01LbY17B+G2FA2bDGfr7ufkUYZ2LpYYGiLHn1s1XaexpAXS29fHjQBwnYGh XAOw16GKkHiHMeexHYHAqJiUzLKR3jxSF+rmOXxJMPYj9GFO2HpsrgelU0obPuFGyil7I4Ja6Bp weMSaE3sMVF1APyfTL1Z0BmJ0WuFdjiuaW+eyUHpPBf1nc7ZwAQy/avgmGz07gcEp9eW8g3wgom sfyKuiQM75fCCv0Lrg/I2vG8L87J5Hm5WKAxfjyCNFng4Fvcpkym/T+WvN6q1S/NwWpL6i7Hgdj aeARQJIhPET5JY/MmnhVIw4rjghkYH6YttmZuHfypWX3n4s8RI0nVufvEgkTzNKA0becnVUllI4 G1aR0uNvI80Dtyq43N1MXbwloqhW/cc X-Received: by 2002:a05:600c:3b0a:b0:495:3a52:71b1 with SMTP id 5b1f17b1804b1-4994a0fc5dbmr59108425e9.5.1785838409506; Tue, 04 Aug 2026 03:13:29 -0700 (PDT) Received: from horizon.localdomain ([216.128.28.240]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49949fcb0c5sm67300275e9.4.2026.08.04.03.13.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2026 03:13:28 -0700 (PDT) From: Sean Rhodes To: chrome-platform@lists.linux.dev Cc: Corentin Chary , "Luke D. Jones" , Denis Benato , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Prasanth Ksr , Jorge Lopez , Mark Pearson , "Derek J. Clark" , Joshua Grisham , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Dell.Client.Kernel@dell.com, Sean Rhodes , Florian Fainelli , Huacai Chen , "Michael S. Tsirkin" , Chen-Yu Tsai , Tzung-Bi Shih , Brian Norris , Julius Werner , Thomas Zimmermann , Javier Martinez Canillas , Maarten Lankhorst , Maxime Ripard , David Airlie , Simona Vetter , Krzysztof Kozlowski , Bjorn Andersson , Geert Uytterhoeven , Dmitry Baryshkov , Arnd Bergmann , Eric Biggers , Luca Weiss , Michal Simek , Sven Peter , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= , Bjorn Helgaas , Danilo Krummrich , Takashi Sakamoto , Titouan Ameline de Cadeville , Kees Cook , dri-devel@lists.freedesktop.org, Oliver Lin Subject: [PATCH v11 4/4] firmware: coreboot: Add CFR firmware attributes driver Date: Tue, 4 Aug 2026 11:13:09 +0100 Message-ID: <4022650144cca8c242c6507825b29988adb6ac69.1785838269.git.sean@starlabs.systems> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: 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: 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 | 1205 ++++++++++++++++++++++ 4 files changed, 1226 insertions(+) create mode 100644 drivers/firmware/coreboot/coreboot-cfr.c diff --git a/MAINTAINERS b/MAINTAINERS index 62ddee473f55..50638f37e023 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6666,6 +6666,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 d273bd836245..30ee5a814a88 100644 --- a/drivers/firmware/coreboot/Kconfig +++ b/drivers/firmware/coreboot/Kconfig @@ -49,6 +49,20 @@ config 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 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 COREBOOT_MEMCONSOLE_COMMON tristate depends on GOOGLE_MEMCONSOLE_X86_LEGACY || COREBOOT_MEMCONSOLE diff --git a/drivers/firmware/coreboot/Makefile b/drivers/firmware/coreboot= /Makefile index e681f274417a..a08d167a95a8 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_COREBOOT_TABLE) +=3D coreboot_table.o +obj-$(CONFIG_COREBOOT_CFR) +=3D coreboot-cfr.o obj-$(CONFIG_COREBOOT_FRAMEBUFFER) +=3D framebuffer-coreboot.o obj-$(CONFIG_COREBOOT_MEMCONSOLE_COMMON) +=3D memconsole.o obj-$(CONFIG_COREBOOT_MEMCONSOLE) +=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..1dfb2d29046b --- /dev/null +++ b/drivers/firmware/coreboot/coreboot-cfr.c @@ -0,0 +1,1205 @@ +// 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 +#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; +}; + +struct coreboot_cfr_iterator { + const u8 *cursor; + size_t remaining; +}; + +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, '/') && + strcmp(name, "pending_reboot") !=3D 0; +} + +static bool coreboot_cfr_string_is_valid_label(const char *label) +{ + return label && !strchr(label, ';') && !strchr(label, '\n'); +} + +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_next_entry(struct coreboot_cfr_iterator *iterator) +{ + const struct coreboot_table_entry *entry; + + if (!iterator->remaining) + return NULL; + + if (iterator->remaining < sizeof(*entry)) + return ERR_PTR(-EINVAL); + + entry =3D (const struct coreboot_table_entry *)iterator->cursor; + if (entry->size < sizeof(*entry) || entry->size > iterator->remaining) + return ERR_PTR(-EINVAL); + + iterator->cursor +=3D entry->size; + iterator->remaining -=3D entry->size; + + return entry; +} + +static const struct coreboot_table_entry * +coreboot_cfr_child_entry(const void *base, size_t len, u32 tag) +{ + struct coreboot_cfr_iterator iterator =3D { + .cursor =3D base, + .remaining =3D len, + }; + const struct coreboot_table_entry *entry; + + for (;;) { + entry =3D coreboot_cfr_next_entry(&iterator); + if (IS_ERR_OR_NULL(entry)) + return entry; + + if (entry->tag =3D=3D tag) + return entry; + } +} + +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 (IS_ERR(entry)) + return ERR_CAST(entry); + if (!entry) + return NULL; + + if (entry->size < sizeof(*str)) + return ERR_PTR(-EINVAL); + + str =3D (const struct lb_cfr_varbinary *)entry; + if (str->data_length > entry->size - sizeof(*str)) + return ERR_PTR(-EINVAL); + + 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 (IS_ERR(entry)) + return ERR_CAST(entry); + 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); +} + +/* Caller must hold the efivar lock. */ +static int coreboot_cfr_read_efi_value(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 __free(kfree) =3D + coreboot_cfr_efi_name(setting->name); + int ret; + + if (IS_ERR(efi_name)) + return PTR_ERR(no_free_ptr(efi_name)); + + ret =3D efivar_lock(); + if (ret) + return ret; + + ret =3D coreboot_cfr_read_efi_value(efi_name, value, attrs); + efivar_unlock(); + + return ret; +} + +/* Caller must hold the efivar lock. */ +static int coreboot_cfr_write_efi_value(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; + + 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(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(efi_name, value, attrs); + if (ret) + goto out_unlock_efi; + + 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(efi_name, old, attrs); + if (restore_ret) { + setting->drvdata->pending_reboot =3D true; + ret =3D restore_ret; + } else { + goto out_unlock_efi; + } + } + + efivar_unlock(); + kobject_uevent(&setting->drvdata->class_dev->kobj, KOBJ_CHANGE); + mutex_unlock(&setting->drvdata->lock); + kfree(efi_name); + return ret; + +out_unlock_efi: + efivar_unlock(); +out_unlock_mutex: + mutex_unlock(&setting->drvdata->lock); + kfree(efi_name); + 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 device *dev =3D kobj_to_dev(kobj->parent); + struct coreboot_cfr_drvdata *data; + + data =3D dev_get_drvdata(dev); + + 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) +{ + struct coreboot_cfr_iterator iterator =3D { + .cursor =3D base, + .remaining =3D len, + }; + const struct coreboot_table_entry *entry; + int count =3D 0; + + for (;;) { + entry =3D coreboot_cfr_next_entry(&iterator); + if (IS_ERR(entry)) + return PTR_ERR(entry); + if (!entry) + return count; + + if (entry->tag =3D=3D CFR_TAG_ENUM_VALUE) + count++; + } +} + +static int coreboot_cfr_copy_enum_values(struct coreboot_cfr_setting *sett= ing, + const void *base, size_t len) +{ + struct coreboot_cfr_iterator iterator =3D { + .cursor =3D base, + .remaining =3D len, + }; + const struct lb_cfr_enum_value *enum_value; + const struct lb_cfr_varbinary *label; + const struct coreboot_table_entry *entry; + struct coreboot_cfr_enum *value; + 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 (;;) { + entry =3D coreboot_cfr_next_entry(&iterator); + if (IS_ERR(entry)) + return PTR_ERR(entry); + if (!entry) + return 0; + + if (entry->tag !=3D CFR_TAG_ENUM_VALUE) + continue; + + if (entry->size < sizeof(*enum_value)) + return -EINVAL; + + enum_value =3D (const struct lb_cfr_enum_value *)entry; + label =3D coreboot_cfr_child_string(enum_value + 1, + enum_value->size - sizeof(*enum_value), + CFR_TAG_VARCHAR_UI_NAME); + if (IS_ERR(label)) + return PTR_ERR(label); + if (!label) + return -EINVAL; + + value =3D &setting->values[setting->n_values]; + value->label =3D coreboot_cfr_string_dup(label); + if (!value->label) + return -ENOMEM; + if (!coreboot_cfr_string_is_valid_label(value->label)) + return -EINVAL; + + value->value =3D enum_value->value; + setting->n_values++; + } +} + +static bool +coreboot_cfr_possible_values_fit(const struct coreboot_cfr_setting *settin= g) +{ + size_t len =3D 1; /* Trailing newline. */ + size_t label_len; + unsigned int i; + + for (i =3D 0; i < setting->n_values; i++) { + if (len >=3D PAGE_SIZE) + return false; + + if (i) + len++; + + label_len =3D strlen(setting->values[i].label); + if (label_len >=3D PAGE_SIZE - len) + return false; + + len +=3D label_len; + } + + 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) + goto err_put_kobj; + + ret =3D sysfs_create_group(&setting->kobj, &coreboot_cfr_setting_group); + if (ret) + goto err_put_kobj; + + list_add_tail(&setting->node, &data->settings); + return 0; + +err_put_kobj: + kobject_put(&setting->kobj); + return ret; +} + +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 (IS_ERR(name)) { + ret =3D PTR_ERR(name); + goto err_put_setting; + } + 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 (IS_ERR(display_name)) { + ret =3D PTR_ERR(display_name); + goto err_put_setting; + } + 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->max < setting->min) + ret =3D -EINVAL; + else + ret =3D 0; + break; + default: + ret =3D -EINVAL; + break; + } + + if (ret) + goto err_put_setting; + /* possible_values must be returned completely in one sysfs read. */ + 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) { + /* + * CFR may describe options without a matching, readable runtime + * EFI variable. Skip those, but propagate transient EFI failures. + */ + if (ret =3D=3D -ENOENT || ret =3D=3D -EINVAL || ret =3D=3D -EOPNOTSUPP || + ret =3D=3D -ENAMETOOLONG) + ret =3D 0; + goto err_put_setting; + } + + /* The kobject release callback owns setting after this call. */ + return coreboot_cfr_register_setting(data, setting); + +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) +{ + struct coreboot_cfr_iterator iterator =3D { + .cursor =3D base, + .remaining =3D len, + }; + const struct lb_cfr_option_form *form; + const struct lb_cfr_numeric_option *option; + const struct coreboot_table_entry *entry; + const void *child_base; + size_t child_len; + int ret; + + for (;;) { + entry =3D coreboot_cfr_next_entry(&iterator); + if (IS_ERR(entry)) + return PTR_ERR(entry); + if (!entry) + return 0; + + switch (entry->tag) { + case CFR_TAG_OPTION_FORM: + if (entry->size < sizeof(struct lb_cfr_option_form)) + return -EINVAL; + + form =3D (const struct lb_cfr_option_form *)entry; + if (form->dependency_id || + form->flags & CFR_OPTFLAG_SUPPRESS) + break; + + if (depth >=3D COREBOOT_CFR_MAX_FORM_DEPTH) + return -E2BIG; + + child_base =3D form + 1; + 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: + option =3D (const struct lb_cfr_numeric_option *)entry; + if (entry->size < sizeof(*option)) + return -EINVAL; + ret =3D coreboot_cfr_add_numeric_option(data, option, + parent_read_only); + if (ret) + return ret; + break; + default: + /* Ignore unsupported, child-only and future record types. */ + break; + } + } +} + +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");