From nobody Mon Dec 1 23:03:59 2025 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 F23C82F83CB for ; Wed, 26 Nov 2025 11:34:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764156890; cv=none; b=YdcFeXqVawI4EXq1wcg0/AiRLnGkH67X9THtGvq2Pe8z3FgdOrdL2RPt5uLNs8XtoWzNWrC0IlDs7Hf/beF47CMBim93dgK3WglPOlzgcxUYpop0vubhMUHkWGXaiQzf/zmfXXp9fg0/Drw6zn523SqoZtYpT5VPxjpdr68YwoA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764156890; c=relaxed/simple; bh=/nls0MzKzW874B0Ki0DqlkO2JKrWBQZ1hqZNK7wdnJ0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Vve2oZF7uDJmeebg13kxm4GLY5EwVHk0ejq9pV/a/Vv2IaRSh32y+OSTrTeG6AuXKceq1UpJhGmtwnub8ygt+Ej5EJVO2ETMukJ9/NDfLV5myRgdIDHn8Sw+34Fd6pr6BR1sNpOv9FpoPQKjaiaAF881+RwX+bBXRFmZrctRbeE= 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=cPKqjeTq; arc=none smtp.client-ip=209.85.128.53 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="cPKqjeTq" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4775ae77516so62593675e9.1 for ; Wed, 26 Nov 2025 03:34:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1764156885; x=1764761685; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=cHIKVJlGJ6FLpBhWKo/nx54LFem8GrxO9NboXXlz1Ig=; b=cPKqjeTqm0M8xxzRL5EAHwMltmf8c7n1IecU2jXkEkjBYf34Ln5GTA7LBdcqaN+Pbu QUzrysu23rCQSfdCPqX0FBDcTyzl2QSfPyuIKUOH6xmRwWijUkEBTnaAl/q+cOSjwOU3 IzTe1gBpITg0Vp0T2M9sK6rnnEQEs+SqKx7+c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764156885; x=1764761685; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=cHIKVJlGJ6FLpBhWKo/nx54LFem8GrxO9NboXXlz1Ig=; b=srFl0hu7zUfmBouUqZ3dI6bb171zB1vNd+XXerfFcm3LSpBMwt1Bjn0rOVU+KZKh6A ULGtb4RvQZUkjEGRsLrNM4frcV7mAxFkzEAxsNxJc/Pj423nMW8By28XoNMJmGaTp2HC nYqJ33b3q9qKrQE1OowJciLiJhTirr3LEmeyfXSpdJ8s9FI1cI4FKu3oGAmU0FMYbZ5J 80G1kBkxFMWT1Uax9f5O0sGvpTKd2fdmlkIZvZP8Q0EdE+AG2Iu1l0hNYXemzuu21cmU 8dMtyyVTF6P958HMcU5YUZVU/u+BWE0pOzQomrph85UHDlQCWNsNrGeE3A6RKdcTS1aJ 7ApQ== X-Gm-Message-State: AOJu0YxcSVaUbgCrzBveA/1dF0r+hXJJhU0Fx2FYvW3Ib9izT21GhAsy pOTRCBMAI5XLhlo5RzaE3NKVLfzCt3FajncY5lOi7J5kNPuTF1l95F0X2LbNJEQiznGIcBfWUTa OCNBG X-Gm-Gg: ASbGncsFZla4OwYbQW7GzPHogmZ4FJCMa3vrnBLo0+dCCzRfpq6U1ehDnX4wkmB8Xnt AhkDCqb9VNCTAzlR0zhvLlfugIl29uAk3YsLF6OwDLrqdiVoguUH8Fh9hZ7Xd8d6J8rYEr0ALk3 CJO3JlOFg+gHVA4ewhu7y2je6K5qSsQgsb3ZR1IX7yzrgUlLgjwtoja5HTmoEjxhee8eoIz0KsW gfHWFAyqZ0tMUk3fAcnbyxxdosKF16ctWnOgzA2cR0HFK8l54UW9wZBl1vB+EtTGFxtxXGbJZuY NVbL9yP+F5LkSfXGquDFcYqGOrRGYA3YAC2wZn6KBMQ5vuTKuZg3N/oTLkrvgjLPsPvooiSWFWU Raye9nsX4cJVY5u6jBnFT6odkd0HUNErsViPwVe04i20xtcf7djXZHaMMHXyuFCOXJXBxQSKGyj r4IifeLjfOjCHvFkJ66S1wV59fsRiRdK2cZ2/uG7C0/pVzP9YdUBsHbWMsXwtgHjGqinLG6t0U X-Google-Smtp-Source: AGHT+IHl7HMHGWCTyZERtGixjEh1bOWr8I31oR9lJ2OQPCL82AS8uKX2xdF7VJxMf3pL8pSukheujA== X-Received: by 2002:a05:600c:1ca4:b0:45d:f83b:96aa with SMTP id 5b1f17b1804b1-477c10c92d8mr228579085e9.7.1764156885025; Wed, 26 Nov 2025 03:34:45 -0800 (PST) Received: from localhost.localdomain (host-92-29-237-183.as13285.net. [92.29.237.183]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-479052cfe70sm38258885e9.10.2025.11.26.03.34.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 03:34:44 -0800 (PST) From: Andrew Cooper To: LKML Cc: Andrew Cooper , Borislav Petkov , Mario Limonciello , x86@kernel.org Subject: [PATCH] x86/cpu/amd: Use ZEN_MODEL_STEP_UCODE() for erratum_1386_microcode[] Date: Wed, 26 Nov 2025 11:34:42 +0000 Message-Id: <20251126113442.877024-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 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" ... to simplify the result. No functional change. Signed-off-by: Andrew Cooper --- CC: Borislav Petkov CC: Mario Limonciello CC: x86@kernel.org CC: linux-kernel@vger.kernel.org --- arch/x86/kernel/cpu/amd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index a92750f3079a..505ff37b850c 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -873,8 +873,8 @@ static void init_amd_bd(struct cpuinfo_x86 *c) } =20 static const struct x86_cpu_id erratum_1386_microcode[] =3D { - X86_MATCH_VFM_STEPS(VFM_MAKE(X86_VENDOR_AMD, 0x17, 0x01), 0x2, 0x2, 0x080= 0126e), - X86_MATCH_VFM_STEPS(VFM_MAKE(X86_VENDOR_AMD, 0x17, 0x31), 0x0, 0x0, 0x083= 01052), + ZEN_MODEL_STEP_UCODE(0x17, 0x01, 0x2, 0x0800126e), + ZEN_MODEL_STEP_UCODE(0x17, 0x31, 0x0, 0x08301052), {} }; =20 --=20 2.39.5