From nobody Mon Dec 1 22:41:51 2025 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.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 9C6F71DE4E0 for ; Wed, 26 Nov 2025 13:04:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764162252; cv=none; b=ue29VIH3L6JfLlxeBTB4K6/ONEPmTtiHgBIcgHnn7t6AJWNqE86JybnQOyIrAohxw9eYrB091XjZNI6IZVDC2P7eSL4jgsmx5dDTduBTKBlanrbFsoP8HbN4hDEITuMgIDKDYJImdVk7SzmFMH7Ff+dgzfw/ePyiwG4sMquNVk0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764162252; c=relaxed/simple; bh=6C6uMxIQg3WtwFPUBxI+/fE6McynQPa+Lz5HYYXE7xM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=G16sYL9KX2ehL6QcDoFWP04kXNiNgj+wER5YsHH4l7L9DN56umBEKgIDmo4MP5HVPMjxIvNaJVd85agkO/WuperCTETnFIY62jo5Xn7sxsd1G2wrnvzGWK8DvTeGvKmsGksS9HZ010agydU0Kum95JJIGOa3An/uqVpDUyopv9A= 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=fqBRg8Ng; arc=none smtp.client-ip=209.85.221.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="fqBRg8Ng" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-42b31c610fcso5747898f8f.0 for ; Wed, 26 Nov 2025 05:04:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1764162247; x=1764767047; 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=NSD9vOkKnMKZGuvgJe0ZRd85k8bl1hgtFl1q/BdqtVQ=; b=fqBRg8NgkTgg51ihHg2LHSGdjaKvkOjg9vO5ABCUioGHUNuvZkSmIE+z7G/o0z3q99 3HDOIGkdKZn7Zx9Dc+IUpECGFWwPqB4mqUAWlOuy23Jcf85b8EfhNBvBnQjFVZoeenuc +7YPLlElB/RcXRmq7TqV510NVzjGRQ8V9bUiA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764162247; x=1764767047; 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=NSD9vOkKnMKZGuvgJe0ZRd85k8bl1hgtFl1q/BdqtVQ=; b=JLM0SI5pi6aHAISCUUgqyIZpslOS/mgEbvjPa/4uF0JOljXfjulnPWJZ//ez+Ut2Ky VSop+uxy8R5q60fo/xMk+2LRx0Zt3F+S/F4Ynh9JVu3l8ujKwtft8ly+hVxSVVRHU6Vq EuBFbZM8v/jVDmsus6X2nttrw+iMw/UUUryPXv6wzAGGrPZcX2azWzJaBpqcEOutUX1a IagISZnn+WhBfqtp/F1KikdR7NYMD3XUMJOwuJ29+8Ay4dU2y0sDSmN5g+5PKJCfs1ZT LH2QJ2gHNAA2Ogc7dh+I39H7yvCth7kAIJlVVuyZHlJhGx/TRcaB1Nj9IdOSpJyNDfO5 x0JA== X-Gm-Message-State: AOJu0YwdL5KgEGPdrmefeTwKLorsMVkhxWxWVZIbktn1M27vwlozuTsb ob4EzIV3+FF4ZeFwow7le/pdyS/K7iguwFd78uaCX8rDbOU1cOjpTfAYFYZcif/3cDXYCi3Toox OQkKj X-Gm-Gg: ASbGnctmtBbPM7Y6fT98CU+osX25UehE5tmP4ivLz7oGsSufb9COFqDvWoslpi3y3ly Y6sUEG2gsuTj2rJHIXz8INFqIPMSb5obazo0ofXsp2owEp6uCtgHggCWkKkYr9ybjiMzVwXAzgs 6mnMETrlMonGTzmEZ1WSM3ljpBcgELG1xlPG8Wah+h0qvc6w/apdumdfLuO/Szydg1Gwoo/DbE2 RLYMF5NRT/s0moMGHfo0vJ0oy6FcBb2RBYnJm3eKAsEYi15z6kRyozegDM3vRUsa2pjGJj7jOPf qX0B8S2JJguhGKDo9H4WusrrTd6comrrDcDWBmbwi8ax1tQ40+RevQMoNigR/m82GtvsG5yXwzD l/fRgLeT0RggRv32NvKewWiXIGd2S5JdWsOtfCiXSuLKn6yBgCzXmryZ3UxwxkQmrVv02pliUvV 1g2hI9yfS+9XktTE8vUkQioADzUc0CmAJecO1R5wLfWpqaK1J982VTHUvzTyklZg== X-Google-Smtp-Source: AGHT+IFOKxF+x4pfpWep+mMGlpghkKy7AjFPLRM+R40trXlEJHHvKPOXfE4hCvT6l+jTTzmAFoyYVw== X-Received: by 2002:a5d:5d08:0:b0:429:d6dc:ae10 with SMTP id ffacd0b85a97d-42e0f348e6fmr7491092f8f.29.1764162246510; Wed, 26 Nov 2025 05:04:06 -0800 (PST) Received: from localhost.localdomain (host-92-29-237-183.as13285.net. [92.29.237.183]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42cb7f363e4sm41421705f8f.12.2025.11.26.05.04.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 05:04:06 -0800 (PST) From: Andrew Cooper To: LKML Cc: Andrew Cooper , Borislav Petkov , Mario Limonciello , x86@kernel.org Subject: [PATCH v2] x86/cpu/amd: Correct the microcode table for Zenbleed Date: Wed, 26 Nov 2025 13:03:52 +0000 Message-Id: <20251126130352.880424-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251126112655.874792-1-andrew.cooper3@citrix.com> References: <20251126112655.874792-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" The good revisions are tied to exact steppings, meaning it's not valid to match on model number alone, let alone a range. This is probably only a latent issue. From public microcode archives, the following CPUs exist 17-30-00, 17-60-00, 17-70-00 and would be captured by = the model ranges. They're likely pre-production steppings, and likely didn't g= et Zenbleed microcode, but it's still incorrect to compare them to a different steppings revision. Either way, convert the logic to use x86_match_min_microcode_rev(), which is the preferred mechanism. Fixes: 522b1d69219d ("x86/cpu/amd: Add a Zenbleed fix") Signed-off-by: Andrew Cooper --- CC: Borislav Petkov CC: Mario Limonciello CC: x86@kernel.org CC: linux-kernel@vger.kernel.org v2: * Terminate the list with {}. --- arch/x86/kernel/cpu/amd.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 5d46709c58d0..a92750f3079a 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -951,26 +951,14 @@ static void init_amd_zen1(struct cpuinfo_x86 *c) } } =20 -static bool cpu_has_zenbleed_microcode(void) -{ - u32 good_rev =3D 0; - - switch (boot_cpu_data.x86_model) { - case 0x30 ... 0x3f: good_rev =3D 0x0830107b; break; - case 0x60 ... 0x67: good_rev =3D 0x0860010c; break; - case 0x68 ... 0x6f: good_rev =3D 0x08608107; break; - case 0x70 ... 0x7f: good_rev =3D 0x08701033; break; - case 0xa0 ... 0xaf: good_rev =3D 0x08a00009; break; - - default: - return false; - } - - if (boot_cpu_data.microcode < good_rev) - return false; - - return true; -} +static const struct x86_cpu_id amd_zenbleed_microcode[] =3D { + ZEN_MODEL_STEP_UCODE(0x17, 0x31, 0x0, 0x0830107b), + ZEN_MODEL_STEP_UCODE(0x17, 0x60, 0x1, 0x0860010c), + ZEN_MODEL_STEP_UCODE(0x17, 0x68, 0x1, 0x08608107), + ZEN_MODEL_STEP_UCODE(0x17, 0x71, 0x0, 0x08701033), + ZEN_MODEL_STEP_UCODE(0x17, 0xa0, 0x0, 0x08a00009), + {} +}; =20 static void zen2_zenbleed_check(struct cpuinfo_x86 *c) { @@ -980,7 +968,7 @@ static void zen2_zenbleed_check(struct cpuinfo_x86 *c) if (!cpu_has(c, X86_FEATURE_AVX)) return; =20 - if (!cpu_has_zenbleed_microcode()) { + if (!x86_match_min_microcode_rev(amd_zenbleed_microcode)) { pr_notice_once("Zenbleed: please update your microcode for the most opti= mal fix\n"); msr_set_bit(MSR_AMD64_DE_CFG, MSR_AMD64_DE_CFG_ZEN2_FP_BACKUP_FIX_BIT); } else { --=20 2.39.5