From nobody Fri Oct 2 11:42:52 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C642348986D; Sat, 1 Aug 2026 02:38:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785551933; cv=none; b=fuIOVPYl7tM+kJ3ycI9UKmbQ2qNbhVY0dVVgnW3OTXy5KoejyVtAMtc9KCnQz4eq/tOKdGaIPIYxE28aXoAjR1nMiAzWR8rtzd3jRXe0868gkX961LJKgN5Pgxx9bl5ter5EhyGuHKUTialHTJJixbfSPEaZxmjRWCLpXk7bCvs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785551933; c=relaxed/simple; bh=PHkVq1qwTPtcG6GJqRDQguXD0RYhgchMNj2ZEkAwgyo=; h=Date:From:To:Subject:Cc:MIME-Version:Message-ID:Content-Type; b=lTtt9zHQUNi5OV3prBI7TgPQ/zKTlm0f52o0B2EAmFjqk5GL77Jr/0vS8zovlecq45KAjRkdmFhY96GHs9XzxPlDSRY7C7B14r8U7AmswTsHKeHcOA9/xBSTbkeeQjWtH2hMvbmpH+rz4wl3U4lTpx+UGCPNGawGfkNbb45PKGM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=WogEaA7S; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=9gTQxBed; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="WogEaA7S"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="9gTQxBed" Date: Sat, 01 Aug 2026 02:38:47 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1785551929; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JOFu4rkRDxpqpc9qM8gWlBwoMoajho+PrxzYulmgGPk=; b=WogEaA7Seyiem/5/Bh2rPIMDyKErKGZY0xcczkDZyfm56GvN+EojPxtlFh25VC+xMEzLBj gLeJmw3zSw/LLWUUvv3Fi3hrFpzGuWBwPyAY4I0zCuQAy05TcaOd3Oxg+DsPKiybfMDm0r GEsbhYT1mK2MM1BkBOIa7NLUgqf61+h26WdblG285z+bTEr4DxyxEl1MOfrRnT+8PXps2o 2AVP5FOKpQuPiB6KqT4LustbVd8JJR1y+zuTH26L+FePh6qZWXmFLJVVBEPBWPfLAP4rg8 Ep3C4BsTJNYQ6JUg4LJPCXyU28SlvOzWEZmL2K2f5JOJB9901cGsI9g7CuPUug== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1785551929; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JOFu4rkRDxpqpc9qM8gWlBwoMoajho+PrxzYulmgGPk=; b=9gTQxBeduP2hMz7K7cZcfbKsiFYg3DQSmfjgfXwAFISLLXRds0RaRei5YqMeCQDydsLkmk 8MNRIHmE6mthZUCw== From: "tip-bot2 for Borislav Petkov (AMD)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cpu] x86/cpu/scattered: Sort it properly Cc: "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178555192741.1210945.3614488940601822577.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the x86/cpu branch of tip: Commit-ID: cb1e042a320e3c42fae60c4789c2adc618e0833d Gitweb: https://git.kernel.org/tip/cb1e042a320e3c42fae60c4789c2adc61= 8e0833d Author: Borislav Petkov (AMD) AuthorDate: Fri, 31 Jul 2026 18:52:49 -07:00 Committer: Borislav Petkov (AMD) CommitterDate: Fri, 31 Jul 2026 18:52:49 -07:00 x86/cpu/scattered: Sort it properly Sort it according to the following precedence of struct cpuid_bit fields: (level) -> (sub_leaf) -> (reg) -> (bit). No functional changes. Signed-off-by: Borislav Petkov (AMD) --- arch/x86/kernel/cpu/scattered.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattere= d.c index 937129c..8665a64 100644 --- a/arch/x86/kernel/cpu/scattered.c +++ b/arch/x86/kernel/cpu/scattered.c @@ -38,9 +38,9 @@ static const struct cpuid_bit cpuid_bits[] =3D { { X86_FEATURE_CQM_MBM_LOCAL, CPUID_EDX, 2, 0x0000000f, 1 }, { X86_FEATURE_CAT_L3, CPUID_EBX, 1, 0x00000010, 0 }, { X86_FEATURE_CAT_L2, CPUID_EBX, 2, 0x00000010, 0 }, + { X86_FEATURE_MBA, CPUID_EBX, 3, 0x00000010, 0 }, { X86_FEATURE_CDP_L3, CPUID_ECX, 2, 0x00000010, 1 }, { X86_FEATURE_CDP_L2, CPUID_ECX, 2, 0x00000010, 2 }, - { X86_FEATURE_MBA, CPUID_EBX, 3, 0x00000010, 0 }, { X86_FEATURE_PER_THREAD_MBA, CPUID_ECX, 0, 0x00000010, 3 }, { X86_FEATURE_SGX1, CPUID_EAX, 0, 0x00000012, 0 }, { X86_FEATURE_SGX2, CPUID_EAX, 1, 0x00000012, 0 }, @@ -61,9 +61,9 @@ static const struct cpuid_bit cpuid_bits[] =3D { { X86_FEATURE_BMEC, CPUID_EBX, 3, 0x80000020, 0 }, { X86_FEATURE_ABMC, CPUID_EBX, 5, 0x80000020, 0 }, { X86_FEATURE_SDCIAE, CPUID_EBX, 6, 0x80000020, 0 }, + { X86_FEATURE_AMD_WORKLOAD_CLASS, CPUID_EAX, 22, 0x80000021, 0 }, { X86_FEATURE_TSA_SQ_NO, CPUID_ECX, 1, 0x80000021, 0 }, { X86_FEATURE_TSA_L1_NO, CPUID_ECX, 2, 0x80000021, 0 }, - { X86_FEATURE_AMD_WORKLOAD_CLASS, CPUID_EAX, 22, 0x80000021, 0 }, { X86_FEATURE_PERFMON_V2, CPUID_EAX, 0, 0x80000022, 0 }, { X86_FEATURE_AMD_LBR_V2, CPUID_EAX, 1, 0x80000022, 0 }, { X86_FEATURE_AMD_LBR_PMC_FREEZE, CPUID_EAX, 2, 0x80000022, 0 },