From: Borislav Petkov <bp@alien8.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Andy Lutomirski <luto@amacapital.net>,
arnd@arndb.de, Elliott@hp.com, hch@lst.de, hmh@hmh.eng.br,
"H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@redhat.com>,
jgross@suse.com, konrad.wilk@oracle.com,
linux-mm <linux-mm@kvack.org>,
linux-nvdimm@lists.01.org, "Luis R. Rodriguez" <mcgrof@suse.com>,
stefan.bader@canonical.com, Thomas Gleixner <tglx@linutronix.de>,
Toshi Kani <toshi.kani@hp.com>, x86-ml <x86@kernel.org>,
yigal@plexistor.com
Subject: [PATCH 2/4] x86/pat: Merge pat_init_cache_modes() into its caller
Date: Sun, 31 May 2015 11:48:04 +0200 [thread overview]
Message-ID: <1433065686-20922-2-git-send-email-bp@alien8.de> (raw)
In-Reply-To: <1433065686-20922-1-git-send-email-bp@alien8.de>
From: Borislav Petkov <bp@suse.de>
This way we can pass pat MSR value directly.
No functionality change.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: arnd@arndb.de
Cc: Elliott@hp.com
Cc: hch@lst.de
Cc: hmh@hmh.eng.br
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: jgross@suse.com
Cc: konrad.wilk@oracle.com
Cc: linux-mm <linux-mm@kvack.org>
Cc: linux-nvdimm@lists.01.org
Cc: Luis R. Rodriguez <mcgrof@suse.com>
Cc: stefan.bader@canonical.com
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Toshi Kani <toshi.kani@hp.com>
Cc: x86-ml <x86@kernel.org>
Cc: yigal@plexistor.com
---
arch/x86/mm/pat.c | 39 ++++++++++++++++-----------------------
1 file changed, 16 insertions(+), 23 deletions(-)
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index 476d0780560f..4d28759f5a1a 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -172,32 +172,14 @@ static enum page_cache_mode pat_get_cache_mode(unsigned pat_val, char *msg)
#undef CM
-/*
- * Update the cache mode to pgprot translation tables according to PAT
- * configuration.
- * Using lower indices is preferred, so we start with highest index.
- */
-void pat_init_cache_modes(void)
-{
- int i;
- enum page_cache_mode cache;
- char pat_msg[33];
- u64 pat;
-
- rdmsrl(MSR_IA32_CR_PAT, pat);
- pat_msg[32] = 0;
- for (i = 7; i >= 0; i--) {
- cache = pat_get_cache_mode((pat >> (i * 8)) & 7,
- pat_msg + 4 * i);
- update_cache_mode_entry(i, cache);
- }
- pr_info("x86/PAT: Configuration [0-7]: %s\n", pat_msg);
-}
-
#define PAT(x, y) ((u64)PAT_ ## y << ((x)*8))
static void pat_bsp_init(u64 pat)
{
+ enum page_cache_mode cache;
+ char pat_msg[33];
+ int i;
+
if (!cpu_has_pat) {
pat_disable("PAT not supported by CPU.");
return;
@@ -211,7 +193,18 @@ static void pat_bsp_init(u64 pat)
wrmsrl(MSR_IA32_CR_PAT, pat);
- pat_init_cache_modes();
+ pat_msg[32] = 0;
+
+ /*
+ * Update the cache mode to pgprot translation tables according to PAT
+ * configuration. Using lower indices is preferred, so we start with
+ * highest index.
+ */
+ for (i = 7; i >= 0; i--) {
+ cache = pat_get_cache_mode((pat >> (i * 8)) & 7, pat_msg + 4 * i);
+ update_cache_mode_entry(i, cache);
+ }
+ pr_info("x86/PAT: Configuration [0-7]: %s\n", pat_msg);
}
static void pat_ap_init(u64 pat)
--
2.3.5
next prev parent reply other threads:[~2015-05-31 9:48 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-29 22:58 [PATCH v11 0/12] Support Write-Through mapping on x86 Toshi Kani
2015-05-29 22:58 ` [PATCH v11 1/12] x86, mm, pat: Cleanup init flags in pat_init() Toshi Kani
2015-05-29 22:59 ` [PATCH v11 2/12] x86, mm, pat: Refactor !pat_enabled handling Toshi Kani
2015-05-31 9:46 ` Borislav Petkov
2015-05-31 9:48 ` [PATCH 1/4] x86/pat: Untangle pat_init() Borislav Petkov
2015-05-31 9:48 ` Borislav Petkov [this message]
2015-05-31 10:15 ` [PATCH 2/4] x86/pat: Merge pat_init_cache_modes() into its caller Juergen Gross
2015-05-31 10:24 ` Borislav Petkov
2015-05-31 10:23 ` Borislav Petkov
2015-05-31 11:02 ` Juergen Gross
2015-06-01 18:15 ` Toshi Kani
2015-05-31 9:48 ` [PATCH 3/4] x86/pat: Emulate PAT when it is disabled Borislav Petkov
2015-05-31 9:48 ` [PATCH 4/4] x86/pat: Remove pat_enabled() checks Borislav Petkov
2015-06-01 18:26 ` Toshi Kani
2015-06-01 18:51 ` Borislav Petkov
2015-06-01 16:17 ` [PATCH 1/4] x86/pat: Untangle pat_init() Toshi Kani
2015-06-01 15:50 ` [PATCH v11 2/12] x86, mm, pat: Refactor !pat_enabled handling Toshi Kani
2015-05-29 22:59 ` [PATCH v11 3/12] x86, mm, pat: Set WT to PA7 slot of PAT MSR Toshi Kani
2015-05-29 22:59 ` [PATCH v11 4/12] x86, mm, pat: Change reserve_memtype() for WT Toshi Kani
2015-05-29 22:59 ` [PATCH v11 5/12] x86, asm: Change is_new_memtype_allowed() " Toshi Kani
2015-05-29 22:59 ` [PATCH v11 6/12] x86, mm, asm-gen: Add ioremap_wt() " Toshi Kani
2015-05-30 9:18 ` Geert Uytterhoeven
2015-05-31 0:58 ` Toshi Kani
2015-05-29 22:59 ` [PATCH v11 7/12] arch/*/asm/io.h: Add ioremap_wt() to all architectures Toshi Kani
2015-05-29 22:59 ` [PATCH v11 8/12] video/fbdev, asm/io.h: Remove ioremap_writethrough() Toshi Kani
2015-05-29 22:59 ` [PATCH v11 9/12] x86, mm, pat: Add pgprot_writethrough() for WT Toshi Kani
2015-05-29 22:59 ` [PATCH v11 10/12] x86, mm, asm: Add WT support to set_page_memtype() Toshi Kani
2015-05-29 22:59 ` [PATCH v11 11/12] x86, mm: Add set_memory_wt() for WT Toshi Kani
2015-05-29 22:59 ` [PATCH v11 12/12] drivers/block/pmem: Map NVDIMM with ioremap_wt() Toshi Kani
2015-05-30 1:18 ` Dan Williams
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1433065686-20922-2-git-send-email-bp@alien8.de \
--to=bp@alien8.de \
--cc=Elliott@hp.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=hch@lst.de \
--cc=hmh@hmh.eng.br \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nvdimm@lists.01.org \
--cc=luto@amacapital.net \
--cc=mcgrof@suse.com \
--cc=mingo@redhat.com \
--cc=stefan.bader@canonical.com \
--cc=tglx@linutronix.de \
--cc=toshi.kani@hp.com \
--cc=x86@kernel.org \
--cc=yigal@plexistor.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).