From patchwork Mon Nov 20 10:41:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 167044 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp2110003vqn; Mon, 20 Nov 2023 02:44:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IH3TLcYd9GcF9fTn9dz9yOnuYW950LbGktVRrZvuWDEBP0MFO7+yYeMspR+k4x/NvkszDlr X-Received: by 2002:a05:6a00:b4a:b0:6cb:84e1:3571 with SMTP id p10-20020a056a000b4a00b006cb84e13571mr4873475pfo.20.1700477054363; Mon, 20 Nov 2023 02:44:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700477054; cv=none; d=google.com; s=arc-20160816; b=ZrTIY87dNK3ajo06rxd7NCAPRCfRbvdctb7gND66O4bO++k4MEiK6K0Wg6HWjVoduu IMz1xVujAGrpgyzDQwgoSyVceBn01apgNFN3aqJfdCpQl/DiftZz61DkkDfmdp29Qvmq 2Qt0OQ7z/+fuqWLKEa182uI9oc9jRtAQDmC232q0vEKO2VzHvYxXvO2QU3Dj1AZhHw7L irhYrThULNqcVp3CbGNqkjA0P9xP1rrTpT9+aBrzs+0x/sHH30+3euYn59J/9FIFxdn2 trZeIlOoQIBXDC/uJfmQuLOmYIGeNdUls0RYm7MX3P2c2nR+kQEPFB76cV0qI/h9jA7E Bp+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=MRYYy1qzr7LVB3Vurx9wPLfvDcoxrPmLAVgXcW2iR7c=; fh=yRofEPOsMYSFYi/7/f3tXB782BWAy0107oR1j5aafGk=; b=wb+fdVGvIdljFCsnIKhfKEFgMINmcKeE1JMBYHn9XX7c1cji0oCdXOORDQzednhlwp ocVNJ26U3LmwjO5N3p34f4BiZmG+NYgACXXBQoy6ovrBgYrocxbIZzoGgjJmSEcLPNLB 3cSdaIIjlNko2AxZqLCf+yyyEeVIMfY4fhL+MfJR+t7CtZXTn79z+5NnZn+epQX9nP+g C+B0bxxlty0f7PvIZQGxj5Jwi8Xxbi7yZG3Ai8AYSebTEa/uX/ywCJWJO/tcbHZxwuPr T/WAV9L97jKCQlvGP1wseXsQGKGHL7CW8NilzwR46GXQjiBdjnLJDvUH23X83Kd8SDhn cr1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@alien8.de header.s=alien8 header.b=FHO2qSO3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id c6-20020a056a000ac600b006c34752a6e8si4575197pfl.81.2023.11.20.02.44.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 02:44:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@alien8.de header.s=alien8 header.b=FHO2qSO3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 05F478046473; Mon, 20 Nov 2023 02:44:12 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232558AbjKTKoA (ORCPT + 27 others); Mon, 20 Nov 2023 05:44:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233227AbjKTKnc (ORCPT ); Mon, 20 Nov 2023 05:43:32 -0500 Received: from mail.alien8.de (mail.alien8.de [65.109.113.108]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BC581989 for ; Mon, 20 Nov 2023 02:42:54 -0800 (PST) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.alien8.de (SuperMail on ZX Spectrum 128k) with ESMTP id D158E40E01AF; Mon, 20 Nov 2023 10:42:52 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at mail.alien8.de Authentication-Results: mail.alien8.de (amavisd-new); dkim=fail (4096-bit key) reason="fail (body has been altered)" header.d=alien8.de Received: from mail.alien8.de ([127.0.0.1]) by localhost (mail.alien8.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 4zufFcqVaxxJ; Mon, 20 Nov 2023 10:42:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=alien8; t=1700476958; bh=3REK8cjilB4gave8JLXkaKTmlF3e5GW/wMP1cCyHtis=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FHO2qSO3VMNY9RwxREiTRprM+KxzgGwsdIz6n7JCC0w7d8MUF2ciaRsiS3ver3ZMq RK6SaECmLOi7SEX3OYwoqLEonArd4Egw/th2cPWB7EA38l3NkdOkQaLZ+JBzi2k/tr lAGV0PkQ3gubQQZzzgId+RckqDAKwYNtWGOla+pcYnQLSSpxxPcaOzyjahR8SATB8N msswRbdN5V1rmTVX4lJ6A9npB14wUjVX3QBw3oUHb9MvG3aJulSEmlUD6A6t6Z6Eth WMZpdSZYeK9fn62BLE1P8z+VnbY9ZmVTHmPMViRXo4J7GxNlwkILScGpUupbGGJFIW pk7p9uGMn0R9M8hKBUNmCDRfWdYgJty0Jaa6PhzHBQw5cOUWw8UNdBPNNXOb0QtDsH aKZzuxTQYgITxwum6ZN4vu5XkaJgbURZ4nccwhsbOglueh4QmFGNdY1vV1E8HwA2dw qLQ4KVeyixUvt+1hdHLTcktVJjXrs9QZ5vtUK7CUdsnpH5WDs1D3tcvQmEilmny3lP H9h37QyeCxVxWah8G/jlq8VDoljMz1o733e3VHp0NnVzPO8exFiDiTXra2/0R4DoWq jB/Yb06Gg5opd1KR20t7Jn63f+0p6AqSyX+UpXl/eaI34MZJU7VHRCvhALKZl9IX+b nOIS2To+RYV8h9iSnsShLM6M= Received: from zn.tnic (pd95304da.dip0.t-ipconnect.de [217.83.4.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature ECDSA (P-256) server-digest SHA256) (No client certificate requested) by mail.alien8.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id AB7F140E01AA; Mon, 20 Nov 2023 10:42:36 +0000 (UTC) From: Borislav Petkov To: X86 ML Cc: LKML Subject: [PATCH 10/13] x86/CPU/AMD: Get rid of amd_erratum_383[] Date: Mon, 20 Nov 2023 11:41:49 +0100 Message-ID: <20231120104152.13740-11-bp@alien8.de> X-Mailer: git-send-email 2.42.0.rc0.25.ga82fb66fed25 In-Reply-To: <20231120104152.13740-1-bp@alien8.de> References: <20231120104152.13740-1-bp@alien8.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 20 Nov 2023 02:44:12 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783079427811164544 X-GMAIL-MSGID: 1783079427811164544 From: "Borislav Petkov (AMD)" Set it in init_amd_gh() unconditionally as that is the F10h init function. No functional changes. Signed-off-by: Borislav Petkov (AMD) --- arch/x86/kernel/cpu/amd.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 62aa99b5d6c8..3e25fa9c5275 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -63,9 +63,6 @@ static const int amd_erratum_400[] = AMD_OSVW_ERRATUM(1, AMD_MODEL_RANGE(0xf, 0x41, 0x2, 0xff, 0xf), AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0xff, 0xf)); -static const int amd_erratum_383[] = - AMD_OSVW_ERRATUM(3, AMD_MODEL_RANGE(0x10, 0, 0, 0xff, 0xf)); - static const int amd_erratum_1485[] = AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x19, 0x10, 0x0, 0x1f, 0xf), AMD_MODEL_RANGE(0x19, 0x60, 0x0, 0xaf, 0xf)); @@ -876,8 +873,7 @@ static void init_amd_gh(struct cpuinfo_x86 *c) */ msr_clear_bit(MSR_AMD64_BU_CFG2, 24); - if (cpu_has_amd_erratum(c, amd_erratum_383)) - set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH); + set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH); } static void init_amd_ln(struct cpuinfo_x86 *c)