From patchwork Wed May 27 15:19:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Toshi Kani X-Patchwork-Id: 6490611 Return-Path: X-Original-To: patchwork-linux-nvdimm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A2131C0433 for ; Wed, 27 May 2015 15:39:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A071F2065D for ; Wed, 27 May 2015 15:39:11 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A08282062F for ; Wed, 27 May 2015 15:39:10 +0000 (UTC) Received: from ml01.vlan14.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 86F3D1827FA; Wed, 27 May 2015 08:39:10 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from g4t3426.houston.hp.com (g4t3426.houston.hp.com [15.201.208.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7B0CC1827FA for ; Wed, 27 May 2015 08:39:09 -0700 (PDT) Received: from g5t1633.atlanta.hp.com (g5t1633.atlanta.hp.com [16.201.144.132]) by g4t3426.houston.hp.com (Postfix) with ESMTP id 7658CD1; Wed, 27 May 2015 15:39:08 +0000 (UTC) Received: from misato.fc.hp.com (misato.fc.hp.com [16.78.168.61]) by g5t1633.atlanta.hp.com (Postfix) with ESMTP id 7294983; Wed, 27 May 2015 15:39:06 +0000 (UTC) From: Toshi Kani To: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, akpm@linux-foundation.org, arnd@arndb.de Subject: [PATCH v10 10/12] x86, mm, pat: Cleanup init flags in pat_init() Date: Wed, 27 May 2015 09:19:02 -0600 Message-Id: <1432739944-22633-11-git-send-email-toshi.kani@hp.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1432739944-22633-1-git-send-email-toshi.kani@hp.com> References: <1432739944-22633-1-git-send-email-toshi.kani@hp.com> Cc: jgross@suse.com, konrad.wilk@oracle.com, linux-nvdimm@lists.01.org, mcgrof@suse.com, x86@kernel.org, linux-kernel@vger.kernel.org, stefan.bader@canonical.com, luto@amacapital.net, linux-mm@kvack.org, hmh@hmh.eng.br, hch@lst.de X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP pat_init() uses two flags, 'boot_cpu' and 'boot_pat_state', for tracking the boot CPU's initialization status. 'boot_pat_state' is also overloaded to carry the boot PAT value. This patch cleans this up by replacing them with a new single flag, 'boot_cpu_done', to track the boot CPU's initialization status. 'boot_pat_state' is only used to carry the boot PAT value as a result. Suggested-by: Thomas Gleixner Signed-off-by: Toshi Kani --- arch/x86/mm/pat.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index 92fc635..7cfd995 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c @@ -201,26 +201,31 @@ void pat_init_cache_modes(void) void pat_init(void) { u64 pat; - bool boot_cpu = !boot_pat_state; struct cpuinfo_x86 *c = &boot_cpu_data; + static bool boot_cpu_done; if (!pat_enabled) return; - if (!cpu_has_pat) { - if (!boot_pat_state) { + if (!boot_cpu_done) { + if (!cpu_has_pat) { pat_disable("PAT not supported by CPU."); return; - } else { - /* - * If this happens we are on a secondary CPU, but - * switched to PAT on the boot CPU. We have no way to - * undo PAT. - */ - printk(KERN_ERR "PAT enabled, " - "but not supported by secondary CPU\n"); - BUG(); } + + rdmsrl(MSR_IA32_CR_PAT, boot_pat_state); + if (!boot_pat_state) { + pat_disable("PAT read returns always zero, disabled."); + return; + } + } else if (!cpu_has_pat) { + /* + * If this happens we are on a secondary CPU, but + * switched to PAT on the boot CPU. We have no way to + * undo PAT. + */ + pr_err("PAT enabled, but not supported by secondary CPU\n"); + BUG(); } if ((c->x86_vendor == X86_VENDOR_INTEL) && @@ -279,19 +284,12 @@ void pat_init(void) PAT(4, WB) | PAT(5, WC) | PAT(6, UC_MINUS) | PAT(7, WT); } - /* Boot CPU check */ - if (!boot_pat_state) { - rdmsrl(MSR_IA32_CR_PAT, boot_pat_state); - if (!boot_pat_state) { - pat_disable("PAT read returns always zero, disabled."); - return; - } - } - wrmsrl(MSR_IA32_CR_PAT, pat); - if (boot_cpu) + if (!boot_cpu_done) { pat_init_cache_modes(); + boot_cpu_done = true; + } } #undef PAT