From nobody Sun Feb 8 02:08:28 2026 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 D5C26347FDE for ; Tue, 6 Jan 2026 18:14:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767723283; cv=none; b=GKI+Oww5Yc+oMFrZ8sgaSTTIb6EpYQjdLtTF1L/35PI8dk51YyDVSm3wp0zpWJpQXc3CxvqUG6Bx6LEVF2YGy3AvHBIV+0zOHDIXCDb9I+7L5JgBR93UcMJcjoTqBN71Ubitm8T4kTOGB8qH/D8Sti+L3IocVE1gcRm7uUjP1M0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767723283; c=relaxed/simple; bh=nMSV4WC4n3c71XmIS6pHU6Vp9wOR4cClFjOfCi1u3UY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Tj7hqga9rlZsZJP/OVa04f+NqU4iecCrMA7MY/V9ku6xNIcLl3t1jlOAYhGjtFZaQAuLLuc3Ns1LQ01mP+4E++hpmj/ZRNdnLDuiiTfXqWhSHrj/7t8UvRg5v9t4qBnqXPfsu6nr0677nyQAjBQWWDSXwHTiaOPbkxAH6QRbi8U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=citrix.com; spf=pass smtp.mailfrom=citrix.com; dkim=pass (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b=I4BVh4EJ; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=citrix.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=citrix.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="I4BVh4EJ" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4779cc419b2so10407505e9.3 for ; Tue, 06 Jan 2026 10:14:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1767723277; x=1768328077; 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; bh=3FgbJNcGGJdssACTrnujqsJO7n8U+ndnt8hF1xdnK1U=; b=I4BVh4EJ5Vus7Z9DFNabztRUON04iO4Po9s74lFu+aVB1G7RQbk6/cytvTKCB5L3Dr 58F8s6tXXqOfIMWtJ+OjDUC5cT5zXbgx44eAQILzjsTpwhOq6J0u+ku4ZSvZZ/JMvQtZ FwHGagU7xd0npOtfqQb0noUWmKd8v7o3jMXIg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767723277; x=1768328077; 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; bh=3FgbJNcGGJdssACTrnujqsJO7n8U+ndnt8hF1xdnK1U=; b=AIiMmyhSnLcKhOpmZvaP+K/C4NSmclMzMigpY2HdkZC2CxUMBKMsDJ/FxG/crdHbuR nXtNYhx5zjkXx5nTxzzPAuFXBfg7HvgMUwy7vEafkwCiOy44pVWKr7QKYjZuIbn6idEF w89kdWr0wW5N1kDNV8cFVeTQ1P33GYNHwHYEkvUDStj4Xva0RSBydecdX3H7TYi9UeSs HsLymLPW8Ou/btCdIEaYiUcH+eWCCvoArf4m1VFVZqRD/VmRERTfGYYuw8PEWrDsJ+3V or9L0+AFANSQSU9y798cr5Pqxvx5NKbja6XvJ6T2x52guf3KumycYCw3c0bzGiv1cF0Q 0MYg== X-Gm-Message-State: AOJu0YzwY2DAjPs6ob4Umy2Z9tV5nFeY6j7a774utqvNSdqaqLOf1nfm LymbKMye3jw4yst/12UxlxfWFWUgMFtpEBkvhaEp5hFSYHQsnSMXYxw93agii49X7qJIF9Wwfvx Jzrer X-Gm-Gg: AY/fxX7UTGlOfG91A1i+T8yS+MxStCwfMUMQYs3llJedR5uhJ04lZjBh+dHAFaJwkVD ZvZYPzz96VNw2F9RTO226/UQ66Asbg/KEmUeeDjTOTW6JmtB/z4iI1gI53S4GMCIPLFfPdQZKpq KO6KIhlULdTplxWHLm0tYchJlqi7hBirAKe/0J6KMJ08MoFGhQBW/M2QnOyjYwUKzlbppazaq+c 5sHTuSZVUE5ZJZDZpWmIw5KhoS1UYCkmyMe3n34JLc71TZqaXZ4cSxszOAABto6bpP2wHrgK4bK laiXBHtj+p6gf1NEgeFtEhZKbxKbBDHXh6SBbC/HqFaMeUz0GWlpvtVqAgukPhd67AM6m42L8VI fv+6T1mwSdQcPP5oCZW8mHnA+JAjipm40Oua8moceEsPDOzYUcqrlJD0ilrR156j9BizzbwN8oI rEJMd3OG0pROjkUnkGJOkCIq3YE6GiusI3cTcYEXaEn/O+svmMWGOKcQ/uYoJZwA== X-Google-Smtp-Source: AGHT+IEkO7JiEjI8INJNq7UAk3IQaoIYqPceFk6UmClAmRPidKAaul2fGj5++UcWqBEk7qT7Dv189w== X-Received: by 2002:a05:600c:1d8c:b0:477:7af8:c8ad with SMTP id 5b1f17b1804b1-47d7f0a1981mr43877035e9.31.1767723276619; Tue, 06 Jan 2026 10:14:36 -0800 (PST) Received: from localhost.localdomain (host-92-26-102-188.as13285.net. [92.26.102.188]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47d7f653c78sm57657835e9.11.2026.01.06.10.14.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jan 2026 10:14:36 -0800 (PST) From: Andrew Cooper To: LKML Cc: Andrew Cooper , Sohil Mehta , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Peter Zijlstra , Yuntao Wang , Zhang Rui Subject: [PATCH v2] x86/apic: Drop useless CXL/CPX row from the TSC deadline errata table Date: Tue, 6 Jan 2026 18:14:34 +0000 Message-Id: <20260106181434.710599-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250716160824.2167709-1-andrew.cooper3@citrix.com> References: <20250716160824.2167709-1-andrew.cooper3@citrix.com> 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" This erratum is fixed in later steppings. Instead of including the fixed steppings in the table in a way that will unconditionally cause apic_validate_deadline_timer() to decide "not vulnerable", simply omit the row. No functional change. Reviewed-by: Sohil Mehta Signed-off-by: Andrew Cooper --- CC: Thomas Gleixner CC: Ingo Molnar CC: Borislav Petkov CC: Dave Hansen CC: x86@kernel.org CC: "H. Peter Anvin" CC: Peter Zijlstra CC: Sohil Mehta CC: Yuntao Wang CC: Zhang Rui CC: linux-kernel@vger.kernel.org v2: * Adjust the commit message. Strictly speaking, this is: Fixes: 66abf2388331 ("x86/apic: Convert the TSC deadline timer matching t= o steppings macro") but I really don't think it's interesting to backport. --- arch/x86/kernel/apic/apic.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index d93f87f29d03..829c8efce1c1 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -524,7 +524,6 @@ static const struct x86_cpu_id deadline_match[] __initc= onst =3D { =20 X86_MATCH_VFM_STEPS(INTEL_SKYLAKE_X, 0x3, 0x3, 0x01000136), X86_MATCH_VFM_STEPS(INTEL_SKYLAKE_X, 0x4, 0x4, 0x02000014), - X86_MATCH_VFM_STEPS(INTEL_SKYLAKE_X, 0x5, 0xf, 0), =20 X86_MATCH_VFM(INTEL_HASWELL, 0x22), X86_MATCH_VFM(INTEL_HASWELL_L, 0x20), base-commit: 7f98ab9da046865d57c102fd3ca9669a29845f67 --=20 2.39.5