From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.182 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793264383; b=cAav/CCLiA9KytU1DPfGW1lxTqkice9HfVKT4k7/xzQuGMd+/GwXL1j2eJSERE4OvpXz Htp6g1weB5oBmNEJSp6P+ivxIDGO/XMDMVlFVVtd2KH1JVUYCLq2GHeJTYceFp9TNVmUe 9CZ0kyDgyzDHVETNzdJGBkcVsBglM/RKb10Dk/h1y8Is1ACtrS7TKFIza6ZJyMTDucE1W d6RBOsAaLfcHd8X4dOm5S2nclENOnVPLsYcWQ6x4m+aIAJxpyDGlzRPgjDx8EfzEVhhZD DMnJuKmnMpzQ/798Gh6xjF4Qw2/4yA0Ap8sZC/EXBAjdvWIWXzOsFf75MfU0Yaw5XIg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793264383; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=EWgIkiGG+9C3t4UZx8jQyb/h8aaD9D1BomPU2LdA7YI=; b=4YfNEphnDvQESXvxwCsVrVsU7nED+BgJ+0/Yg0Qt6R/2d+PnCoseE+WP4WN4p9jLbHBX ++Ggzqsxws/K28Thry6mAbZDwmQ0NEG9jRCOavNo2ZxBxYeRl1yPyJ+FL1nUCaLbBUCIg +hsHD5tXszFyisLvlAKTfjkXvG81gXlnZrDBe1qMvdfAWS9heUKM9X2QrtolDftPhutSU uLsQZCquP6nE3oUYtVt3b6beA7OHgRqLqO9IRRE2HHqvUbsJuen73pnPtachg8Czkg7Em j8I0vTUQMkScDdQLFUWlFqNGy5STD+LF2NyRBseLeCbxj8EkTLJtbHr9LLAZV3G9gog== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b="Qi2/jq4a"; arc=none smtp.remote-ip=74.125.82.182 Received: from mail-dy1-f182.google.com (mail-dy1-f182.google.com [74.125.82.182]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90E88606A31D for ; Thu, 29 Oct 2026 08:59:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 90E88606A31D Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=Qi2/jq4a Received: by mail-dy1-f182.google.com with SMTP id 5a478bee46e88-36a0f27c9f4so2887510eec.1 for ; Thu, 29 Oct 2026 01:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793264382; x=1793869182; 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=EWgIkiGG+9C3t4UZx8jQyb/h8aaD9D1BomPU2LdA7YI=; b=Qi2/jq4afQD4LZt+PZtRMASfRl+J+ccJhe0O0E/DfjB2yNciffUvLoLJDn/6LY/l1Y 4yGgRorgfRzDpgIYcMvHKJlFouz1kyEx/au5yfO7jE125Ij+A4zasZ2J+bAQJJJzvP6b UGccBoblZkkIqzI2Hdg0ryhaJ81jrr6qCTNpdAZcTWnPPk4iDoAx/YIO11jVrQc9ES0y ymciG6i8hrbZXRzHRR3ggBkZy7Lx0Q8uD6VoE4mqk+Ex7dw2/9ILWFfTzPIBNuxSss+B qpKPFctR4RtIjCFzQ34vwHj71QBPUSpVfjUrtfE5Pdw0CD9uRbl+g0Sq8R7ueaSTKSGK 3ZgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793264382; x=1793869182; 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=EWgIkiGG+9C3t4UZx8jQyb/h8aaD9D1BomPU2LdA7YI=; b=KlNPcsE/+oWgGZnq5jHXxdasDgUSPzjmtboIvDXnPXjG/+bw07XwPqNPUNEo4vN8vY DQr6odKZ2om6Xp/VwABKSdTxC9sY7ux+2dupmJB+XfO9EqaFiW9jIAswaYiNWyh7gW/J FCqnIilCFu9E3cTDJzorj8ZMQY1O94OZLo3AEr5QIOH0ME1rpiCimounYO/jl/iENRoD C5f82hGb6XwgiV+PnS20pDnIK+WdADZGGLmysvPP65Tilnp4Nnn6dMQl0zTw2xz+6wMi ibO/BxUObH3Z40TRDoVnBvdHp/XIlzPPuWtggaRLogyaCsHxw3zguhNsBHsoSc4unV2Y q1EA== X-Forwarded-Encrypted: i=1; AKwUvBz+mJxJSgtr7byXCw3XnZavkGKPxrXPSVeC3dgODeSmxuBDjCkDhkmPlKHYEzxdhbRJTltP1VoyMy2HLpdJeg==@vger.kernel.org X-Gm-Message-State: AFq9FYIh1bVO0iNh9gLQeAlk5ITIm6VAfSMfk+gKfNa4Qp2PEARSx/tY aVPpC7D/GqZfcDPrGzjx94hDwMaSvssmDTBjvUB+I2+oWYmyQ0Wq4Ak= X-Gm-Gg: AYBFou3CLnFWI342Py9dDI76t8U4Oq7UW/FjbMJYeU1Wt01P6yDVL/o1oLrkHcJlHO9 327T03BIPIba9+pBdJXtiiByuSRpQPRlOe483tERMtJHmqbeFRBbxNDOxDfFG4IS2/Qf6SE9aPP pAtJwVgUlukziAeoTtO0/k8/GX/QLd0vQ7PxPU+odjVvWQZIO5fLTBKHt8quQUYltEGm1JQg06g UVyfgO+8019pyYU7SD2H3lbwBL3AmPAY1diMjJN4VGktAga21lzUfMc6ALVvZ7izTy9dLRrssmr YbwFL4U9D5OBWgm1yrWYVULT7PN/Vn+PTJrOGvfkuWUGh+Xf2PZHX/CLdxNjSEGF9O8dgjKM1Q8 aVayLKGKSnG0c9tg8oYegHsUqDvv7Ewb6uheMPGnz3/XJ1++2K2kyBG3ulG1UsOyr37pww5xEH4 87/SRYMbCQFlpgHEDUbfb8y0V46GXdWzd6vJKFpj49iVQG3ImTcCwhPgVj4iMACfftltGDBj12f PkeaB1Rn81oWVONBf0Jie4pj2BxdaFxLQITBDeGhpbSfH3xkcQXxHB12XAjFvBn6Z7dbwVTeTz4 5Z31Eg9NtogxxjEuz2YWc+yEQn4Qgm1YFJjHIa+Ot60gXT4czAA1qmMY66ezAQ== X-Received: by 2002:a05:693c:20c8:10b0:36a:1e0a:accb with SMTP id 5a478bee46e88-36a203e2f43mr7265770eec.35.1793264381578; Thu, 29 Oct 2026 01:59:41 -0700 (PDT) Received: from at-Standard-PC-Q35-ICH9-2009 ([27.60.20.232]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-36a23641e78sm16497937eec.0.2026.10.29.01.59.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2026 01:59:41 -0700 (PDT) From: Atharva Tiwari To: Cc: Atharva Tiwari , Bjorn Helgaas , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , "Rafael J. Wysocki" , Len Brown , Linus Walleij , Bartosz Golaszewski , Sven Peter , Janne Grunau , Neal Gompa , Guenter Roeck , Jonathan Cameron , David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , Andy Shevchenko , Lee Jones , Pavel Machek , Griffin Kroah-Hartman , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sebastian Reichel , Alexandre Belloni , Wim Van Sebroeck , Jarkko Sakkinen , Mimi Zohar , Roberto Sassu , Dmitry Kasatkin , Eric Snowberg , Paul Moore , James Morris , "Serge E. Hallyn" , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, linux-gpio@vger.kernel.org, asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-hwmon@vger.kernel.org, linux-iio@vger.kernel.org, linux-leds@vger.kernel.org, mfd@lists.linux.dev, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, linux-rtc@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-integrity@vger.kernel.org, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [RFC PATCH 08/14] treewide: Add a flag to detect the Apple T2 chip Date: Thu, 29 Oct 2026 04:52:05 -0400 Message-ID: <20261029085504.3547-9-atharvatiwarilinuxdev@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261029085504.3547-1-atharvatiwarilinuxdev@gmail.com> References: <20261029085504.3547-1-atharvatiwarilinuxdev@gmail.com> X-Mailing-List: linux-watchdog@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add a flag to detect Apple T2 chips on Intel Macs. Cache the result to avoid repeated checks. That will be used in upcoming patches. Signed-off-by: Atharva Tiwari --- arch/x86/kernel/quirks.c | 37 ++++++++++++++++++ include/linux/platform_data/x86/apple.h | 5 +++ .../platform_certs/keyring_handler.h | 8 ---- security/integrity/platform_certs/load_uefi.c | 38 ++++--------------- 4 files changed, 50 insertions(+), 38 deletions(-) diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index a92f18db9..6651e5d4d 100644 --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c @@ -664,8 +664,45 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2083, quirk_intel_purley_xeon_ras bool x86_apple_machine; EXPORT_SYMBOL(x86_apple_machine); +bool has_apple_t2_chip; +EXPORT_SYMBOL(has_apple_t2_chip); + +static const char * const __initconst apple_t2_models[] = { + "MacBookPro15,1", + "MacBookPro15,2", + "MacBookPro15,3", + "MacBookPro15,4", + "MacBookPro16,1", + "MacBookPro16,2", + "MacBookPro16,3", + "MacBookPro16,4", + "MacBookAir8,1", + "MacBookAir8,2", + "MacBookAir9,1", + "Macmini8,1", + "MacPro7,1", + "iMac20,1", + "iMac20,2", + "iMacPro1,1", +}; + void __init early_platform_quirks(void) { x86_apple_machine = dmi_match(DMI_SYS_VENDOR, "Apple Inc.") || dmi_match(DMI_SYS_VENDOR, "Apple Computer, Inc."); + + if (x86_apple_machine) { + const char *product_name = dmi_get_system_info(DMI_PRODUCT_NAME); + int i; + + if (!product_name) + return; + + for (i = 0; i < ARRAY_SIZE(apple_t2_models); i++) { + if (!strcmp(product_name, apple_t2_models[i])) { + has_apple_t2_chip = true; + break; + } + } + } } diff --git a/include/linux/platform_data/x86/apple.h b/include/linux/platform_data/x86/apple.h index 079e816c3..47b27dcea 100644 --- a/include/linux/platform_data/x86/apple.h +++ b/include/linux/platform_data/x86/apple.h @@ -6,8 +6,13 @@ * x86_apple_machine - whether the machine is an x86 Apple Macintosh */ extern bool x86_apple_machine; +/** + * has_apple_t2_chip - whether the machine has the Apple T2 chip + */ +extern bool has_apple_t2_chip; #else #define x86_apple_machine false +#define has_apple_t2_chip false #endif #endif diff --git a/security/integrity/platform_certs/keyring_handler.h b/security/integrity/platform_certs/keyring_handler.h index f92895cc5..a355f4400 100644 --- a/security/integrity/platform_certs/keyring_handler.h +++ b/security/integrity/platform_certs/keyring_handler.h @@ -45,11 +45,3 @@ efi_element_handler_t get_handler_for_code_signing_keys(const efi_guid_t *sig_ty efi_element_handler_t get_handler_for_dbx(const efi_guid_t *sig_type); #endif - -#ifndef UEFI_QUIRK_SKIP_CERT -#define UEFI_QUIRK_SKIP_CERT(vendor, product) \ - .matches = { \ - DMI_MATCH(DMI_BOARD_VENDOR, vendor), \ - DMI_MATCH(DMI_PRODUCT_NAME, product), \ - }, -#endif diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c index c0d694844..b4096d4c8 100644 --- a/security/integrity/platform_certs/load_uefi.c +++ b/security/integrity/platform_certs/load_uefi.c @@ -3,42 +3,16 @@ #include #include #include -#include #include #include #include #include +#include #include #include #include "../integrity.h" #include "keyring_handler.h" -/* - * On T2 Macs reading the db and dbx efi variables to load UEFI Secure Boot - * certificates causes occurrence of a page fault in Apple's firmware and - * a crash disabling EFI runtime services. The following quirk skips reading - * these variables. - */ -static const struct dmi_system_id uefi_skip_cert[] = { - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookPro15,1") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookPro15,2") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookPro15,3") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookPro15,4") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookPro16,1") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookPro16,2") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookPro16,3") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookPro16,4") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookAir8,1") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookAir8,2") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookAir9,1") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "Macmini8,1") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacPro7,1") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "iMac20,1") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "iMac20,2") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "iMacPro1,1") }, - { } -}; - /* * Look to see if a UEFI variable called MokIgnoreDB exists and return true if * it does. @@ -165,10 +139,14 @@ static int __init load_uefi_certs(void) unsigned long dbsize = 0, dbxsize = 0, mokxsize = 0; efi_status_t status; int rc = 0; - const struct dmi_system_id *dmi_id; - dmi_id = dmi_first_match(uefi_skip_cert); - if (dmi_id) { + /* + * On T2 Macs reading the db and dbx efi variables to load UEFI Secure Boot + * certificates causes occurrence of a page fault in Apple's firmware and + * a crash disabling EFI runtime services. The following quirk skips reading + * these variables. + */ + if (has_apple_t2_chip) { pr_err("Reading UEFI Secure Boot Certs is not supported on T2 Macs.\n"); return false; } -- 2.55.0