From: Toshi Kani <toshi.kani@hp.com>
To: bp@alien8.de, hpa@zytor.com, tglx@linutronix.de,
mingo@redhat.com, akpm@linux-foundation.org, arnd@arndb.de
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org,
linux-nvdimm@ml01.01.org, jgross@suse.com,
stefan.bader@canonical.com, luto@amacapital.net, hmh@hmh.eng.br,
yigal@plexistor.com, konrad.wilk@oracle.com, Elliott@hp.com,
mcgrof@suse.com, hch@lst.de, Toshi Kani <toshi.kani@hp.com>
Subject: [PATCH v12 3/10] x86, asm: Change is_new_memtype_allowed() for WT
Date: Mon, 1 Jun 2015 13:36:26 -0600 [thread overview]
Message-ID: <1433187393-22688-4-git-send-email-toshi.kani@hp.com> (raw)
In-Reply-To: <1433187393-22688-1-git-send-email-toshi.kani@hp.com>
__ioremap_caller() calls reserve_memtype() to set new_pcm
(existing map type if any), and then calls
is_new_memtype_allowed() to verify if converting to new_pcm
is allowed when pcm (request type) is different from new_pcm.
When WT is requested, the caller expects that writes are
ordered and uncached. Therefore, this patch changes
is_new_memtype_allowed() to disallow the following cases.
- If the request is WT, mapping type cannot be WB
- If the request is WT, mapping type cannot be WC
Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/include/asm/pgtable.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index fe57e7a..2562e30 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -398,11 +398,17 @@ static inline int is_new_memtype_allowed(u64 paddr, unsigned long size,
* requested memtype:
* - request is uncached, return cannot be write-back
* - request is write-combine, return cannot be write-back
+ * - request is write-through, return cannot be write-back
+ * - request is write-through, return cannot be write-combine
*/
if ((pcm == _PAGE_CACHE_MODE_UC_MINUS &&
new_pcm == _PAGE_CACHE_MODE_WB) ||
(pcm == _PAGE_CACHE_MODE_WC &&
- new_pcm == _PAGE_CACHE_MODE_WB)) {
+ new_pcm == _PAGE_CACHE_MODE_WB) ||
+ (pcm == _PAGE_CACHE_MODE_WT &&
+ new_pcm == _PAGE_CACHE_MODE_WB) ||
+ (pcm == _PAGE_CACHE_MODE_WT &&
+ new_pcm == _PAGE_CACHE_MODE_WC)) {
return 0;
}
next prev parent reply other threads:[~2015-06-01 19:56 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-01 19:36 [PATCH v12 0/10] Support Write-Through mapping on x86 Toshi Kani
2015-06-01 19:36 ` [PATCH v12 1/10] x86, mm, pat: Set WT to PA7 slot of PAT MSR Toshi Kani
2015-06-01 19:36 ` [PATCH v12 2/10] x86, mm, pat: Change reserve_memtype() for WT Toshi Kani
2015-06-01 19:36 ` Toshi Kani [this message]
2015-06-01 19:36 ` [PATCH v12 4/10] x86, mm, asm-gen: Add ioremap_wt() " Toshi Kani
2015-06-01 19:36 ` [PATCH v12 5/10] arch/*/asm/io.h: Add ioremap_wt() to all architectures Toshi Kani
2015-06-01 19:36 ` [PATCH v12 6/10] video/fbdev, asm/io.h: Remove ioremap_writethrough() Toshi Kani
2015-06-02 7:06 ` Geert Uytterhoeven
2015-06-01 19:36 ` [PATCH v12 7/10] x86, mm, pat: Add pgprot_writethrough() for WT Toshi Kani
2015-06-01 19:36 ` [PATCH v12 08/10] x86, mm, asm: Add WT support to set_page_memtype() Toshi Kani
2015-06-01 19:36 ` [PATCH v12 09/10] x86, mm: Add set_memory_wt() for WT Toshi Kani
2015-06-01 19:36 ` [PATCH v12 10/10] drivers/block/pmem: Map NVDIMM with ioremap_wt() Toshi Kani
2015-06-02 16:21 ` [PATCH v12 0/10] Support Write-Through mapping on x86 Luis R. Rodriguez
2015-06-02 18:46 ` Toshi Kani
2015-06-02 19:43 ` Luis R. Rodriguez
2015-06-02 19:50 ` Andy Lutomirski
2015-06-02 20:01 ` Luis R. Rodriguez
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=1433187393-22688-4-git-send-email-toshi.kani@hp.com \
--to=toshi.kani@hp.com \
--cc=Elliott@hp.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=bp@alien8.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@ml01.01.org \
--cc=luto@amacapital.net \
--cc=mcgrof@suse.com \
--cc=mingo@redhat.com \
--cc=stefan.bader@canonical.com \
--cc=tglx@linutronix.de \
--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).