From patchwork Sat Apr 1 06:36:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 78073 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1099630vqo; Sat, 1 Apr 2023 01:48:24 -0700 (PDT) X-Google-Smtp-Source: AKy350aBLjh2iAsNGKvYmfmoS6pZhE7TAzVWh5dh1rm+OczoJNEyqmviE5iVPlPpCz4RuEz9PWa/ X-Received: by 2002:a17:907:8a19:b0:947:fb8a:f2d2 with SMTP id sc25-20020a1709078a1900b00947fb8af2d2mr2083212ejc.62.1680338904216; Sat, 01 Apr 2023 01:48:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680338904; cv=none; d=google.com; s=arc-20160816; b=OUY9AaS9jTpDy8i9qOUeFb33MQwoDFkHqiNrunMM0owqjBqiDEcaY32m9ffNsx4GWw AyjxSGIDOdO5lc9c2RL1YhsKth06AZpLrigVr1tZe4jheon8cWZmuLPdSp1xPX/JVKZb gXWkYPU8XFivdJgGLKOAC5ypCv19WukgDvSz/gGydrTcKWgPLNs27B7gwprqwkYnFksl Mt7T/+q0Bgc4ELRqzmL/oBGsBvni3o+ajKCwkkhTIpG1HtCf7iZ0yhm5S+EfA0wjlBQK A8ydqDMXsBlMliSaj3KKjSTfgULy0UFPHvaWh3CBCxsS82O3VqlYms9SDFcVI1Ml+t8l CuHg== 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=E7DHxTtJvlqvZrPXbQiV8NhXaH2BVGP/WAcxWNnt620=; b=g5n9vj74tU86/ZIbQ5Gwp0En1oh5ONGVFNNHPca4Opr1gm97RPz9MatENQbrTBrUAv ZVM69vWnFhq9JI+Ll4du5gwcvPu+rNhQ1GcbxDBZbrhJ5pJ3CYJ2iQNhZM4T0tLlb4SH 3PDiNqGXUMaFnKN5QNXEU+pHKD7x8xUkNL+QGxvOMAhGQrUIQSmnXDtaVjI7MM2+B4O+ YIDs/bl+WghcNfhYrknj6xQwWSgesdjhzlf+i2l2PTzJIW7hsG1Mi8VD7LXcGYvjZJOz yMqAt9DI/2ZZ8IhuGuzrw8lC+9qHT3q3ra3056atq/iI2vraOYDHX0HIG62ILPf16yHv GzHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=G372kCwa; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id li13-20020a170906f98d00b0091f37de5613si234833ejb.301.2023.04.01.01.48.01; Sat, 01 Apr 2023 01:48:24 -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=@suse.com header.s=susede1 header.b=G372kCwa; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233580AbjDAGjM (ORCPT + 99 others); Sat, 1 Apr 2023 02:39:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233565AbjDAGir (ORCPT ); Sat, 1 Apr 2023 02:38:47 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 130AE21AA8 for ; Fri, 31 Mar 2023 23:38:25 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 0CFD31FD78; Sat, 1 Apr 2023 06:38:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1680331101; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=E7DHxTtJvlqvZrPXbQiV8NhXaH2BVGP/WAcxWNnt620=; b=G372kCwacV4DxPuUb7YsrKwAhoclIcxKTpoMLXIgetyWZQDNwL2mQE7gyFkHku5RACdJgI Rg2qoMbOhcsjptTaKLjKxNhMgIQLY4XoxdCloH3/L/Y7eAfEsSQvTRZkJR1OrkxuUvwfwU DIGcr9i7AwC2vtvVTTQNIr5v1Nn9WgA= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C59F7134FB; Sat, 1 Apr 2023 06:38:20 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id z1P/LlzRJ2SZdwAAMHmgww (envelope-from ); Sat, 01 Apr 2023 06:38:20 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH v5 15/15] x86/mtrr: remove unused code Date: Sat, 1 Apr 2023 08:36:52 +0200 Message-Id: <20230401063652.23522-16-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230401063652.23522-1-jgross@suse.com> References: <20230401063652.23522-1-jgross@suse.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761963046895082601?= X-GMAIL-MSGID: =?utf-8?q?1761963046895082601?= mtrr_centaur_report_mcr() isn't used by anyone, so it can be removed. Signed-off-by: Juergen Gross --- V5: - new patch --- arch/x86/include/asm/mtrr.h | 4 ---- arch/x86/kernel/cpu/mtrr/centaur.c | 9 --------- 2 files changed, 13 deletions(-) diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h index b17a66da1237..3aced3568e2b 100644 --- a/arch/x86/include/asm/mtrr.h +++ b/arch/x86/include/asm/mtrr.h @@ -60,7 +60,6 @@ extern int mtrr_add_page(unsigned long base, unsigned long size, unsigned int type, bool increment); extern int mtrr_del(int reg, unsigned long base, unsigned long size); extern int mtrr_del_page(int reg, unsigned long base, unsigned long size); -extern void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi); extern void mtrr_bp_restore(void); extern int mtrr_trim_uncached_memory(unsigned long end_pfn); extern int amd_special_default_mtrr(void); @@ -108,9 +107,6 @@ static inline int mtrr_trim_uncached_memory(unsigned long end_pfn) { return 0; } -static inline void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi) -{ -} #define mtrr_bp_init() do {} while (0) #define mtrr_bp_restore() do {} while (0) #define mtrr_disable() do {} while (0) diff --git a/arch/x86/kernel/cpu/mtrr/centaur.c b/arch/x86/kernel/cpu/mtrr/centaur.c index 4466ddeb0125..6f6c3ae92943 100644 --- a/arch/x86/kernel/cpu/mtrr/centaur.c +++ b/arch/x86/kernel/cpu/mtrr/centaur.c @@ -45,15 +45,6 @@ centaur_get_free_region(unsigned long base, unsigned long size, int replace_reg) return -ENOSPC; } -/* - * Report boot time MCR setups - */ -void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi) -{ - centaur_mcr[mcr].low = lo; - centaur_mcr[mcr].high = hi; -} - static void centaur_get_mcr(unsigned int reg, unsigned long *base, unsigned long *size, mtrr_type * type)