From patchwork Fri Aug 11 21:03:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 134737 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1388334vqi; Fri, 11 Aug 2023 15:20:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE0hO+eCZ1JSNanUEtiW0mco7+H3ePBzQkDIQYZhOcvm8sdKdApOi2tUCQLZGuIxibJ8FKr X-Received: by 2002:a17:902:9893:b0:1bb:3406:a612 with SMTP id s19-20020a170902989300b001bb3406a612mr2678086plp.57.1691792401309; Fri, 11 Aug 2023 15:20:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691792401; cv=none; d=google.com; s=arc-20160816; b=AiVH446bSdJFgop0s1GQXS+xoDpn+ne5Z73bXAxPRV5PQWGaEh+1jOCBUsgI1++n+y +Y9ye9oKxak81rXcUKeeLga99Zp4BK+YQgcsb0pNKR077JJ9ox/cjkxAtdgz9L6omdwj EBVTGmjZ4bSeY42WKhkCJaKdqzS2VN1u7K5gPSEJZm86xbW3sSSyDoArNUrhF3Fd44Pd dIeOXwQypaJu94Q4Gt16rhNoRLQC7LPUcWZzuTe1Eio+KiYDgsw9eSbRLCYPmrFknGms /hZ3Wkk3qrtQNxxhxS2i9Wms/9AWD6T4FfV4vzG05zo3QtmpF5TrXKT1ndh/8pvv7lGi F8iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=qQEbgcv3SXBzdgQ2vH6bH00o0e6nyx9jJoKAj9oSlmc=; fh=toxjrodxfjYLGjriow+TmEdko7lzSH71TsoICT2UDrY=; b=cia5CCU4+9TnH4vvXnDDK7qfii59xtugFBnIs2L2Dd6M52i8VkdZ/dLPrA5sMcAebQ XrVqMQny8rI3oWnjzVGlERWWg7AY2iuhuGYFgGax2XQQ8BO/0vik2EI1rHFRGtRf/8iC hZwnlERfwH00kwljwozGAHvKuXCqvNzteN4LppkMWm6qD65o1omBWZMb6pLPKLt1FMsd e4MME1oHT30HtG6sUrOHgQvY0QLxiPtgXpgZZfqRleO3vp4hKPIFnCmjOGPBsvd2/3Fc 641Cw7PapNIT8MJoSOX10mBXOZm+S6vBUCCdlmbpHgvqhK4HXAPWiX3vXW7BN5oWJqX1 yX+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ys2iEpJA; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=Lo0AjL85; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j4-20020a170903028400b001bbc138af0dsi3870729plr.163.2023.08.11.15.19.48; Fri, 11 Aug 2023 15:20:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ys2iEpJA; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=Lo0AjL85; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236812AbjHKVDM (ORCPT + 99 others); Fri, 11 Aug 2023 17:03:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236722AbjHKVDK (ORCPT ); Fri, 11 Aug 2023 17:03:10 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18900E77; Fri, 11 Aug 2023 14:03:10 -0700 (PDT) Date: Fri, 11 Aug 2023 21:03:06 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691787787; 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: in-reply-to:in-reply-to:references:references; bh=qQEbgcv3SXBzdgQ2vH6bH00o0e6nyx9jJoKAj9oSlmc=; b=ys2iEpJAXMMK0zl/MA4h+ZSsqF9if5VQw5MG1I0PvTxYMKe37Ohgzl3V5DWE8Puguw9DLS l7npYzjaN0IJQhrkVZQLJLRFvT28pLI2QMlhpxOyNvZFeOQWK1xSfPSufrNd2rI6LQZXSJ CAPCgLn2L5kChkMytyhAv5h9/GNjI7Qht3SFBywvA93J6+N3QDziyPfPJ3t9SALsh5PuJJ UyZdZxfEPKGya2c24LoLZ/PytP90xOfdyNL8P/1D/sd9uJw4/jj9yo/ZvhqroySxMNoCzP Y2tX3zJbWQmlJUVpHjc7cWeYFFq78lJb+xpEqZpN7iKeWamRRfhzSXjensCmmw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691787787; 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: in-reply-to:in-reply-to:references:references; bh=qQEbgcv3SXBzdgQ2vH6bH00o0e6nyx9jJoKAj9oSlmc=; b=Lo0AjL857grJ4eGOtWUXvVX4zQPHHG/11xzTdKx4hxBGAVDVT4+dND2khfXZeRmrhTWF9k IXNnytUv072/B8Aw== From: "tip-bot2 for Cristian Ciocaltea" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] x86/cpu/amd: Enable Zenbleed fix for AMD Custom APU 0405 Cc: Cristian Ciocaltea , "Borislav Petkov (AMD)" , stable@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230811203705.1699914-1-cristian.ciocaltea@collabora.com> References: <20230811203705.1699914-1-cristian.ciocaltea@collabora.com> MIME-Version: 1.0 Message-ID: <169178778665.27769.10759890614564556189.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773968359740393336 X-GMAIL-MSGID: 1773972909051686085 The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 6dbef74aeb090d6bee7d64ef3fa82ae6fa53f271 Gitweb: https://git.kernel.org/tip/6dbef74aeb090d6bee7d64ef3fa82ae6fa53f271 Author: Cristian Ciocaltea AuthorDate: Fri, 11 Aug 2023 23:37:05 +03:00 Committer: Borislav Petkov (AMD) CommitterDate: Fri, 11 Aug 2023 22:52:29 +02:00 x86/cpu/amd: Enable Zenbleed fix for AMD Custom APU 0405 Commit 522b1d69219d ("x86/cpu/amd: Add a Zenbleed fix") provided a fix for the Zen2 VZEROUPPER data corruption bug affecting a range of CPU models, but the AMD Custom APU 0405 found on SteamDeck was not listed, although it is clearly affected by the vulnerability. Add this CPU variant to the Zenbleed erratum list, in order to unconditionally enable the fallback fix until a proper microcode update is available. Fixes: 522b1d69219d ("x86/cpu/amd: Add a Zenbleed fix") Signed-off-by: Cristian Ciocaltea Signed-off-by: Borislav Petkov (AMD) Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20230811203705.1699914-1-cristian.ciocaltea@collabora.com --- arch/x86/kernel/cpu/amd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 26ad7ca..c15b4f0 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -73,6 +73,7 @@ static const int amd_erratum_1054[] = static const int amd_zenbleed[] = AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0x30, 0x0, 0x4f, 0xf), AMD_MODEL_RANGE(0x17, 0x60, 0x0, 0x7f, 0xf), + AMD_MODEL_RANGE(0x17, 0x90, 0x0, 0x91, 0xf), AMD_MODEL_RANGE(0x17, 0xa0, 0x0, 0xaf, 0xf)); static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum)