From: Nicolas Pitre <nicolas.pitre@linaro.org>
To: Tyler Baker <tyler.baker@linaro.org>
Cc: Dan Williams <dan.j.williams@intel.com>,
Russell King <linux@arm.linux.org.uk>,
linux-nvdimm@lists.01.org, Boaz Harrosh <boaz@plexistor.com>,
david <david@fromorbit.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Christoph Hellwig <hch@lst.de>, Linux MM <linux-mm@kvack.org>,
"H. Peter Anvin" <hpa@zytor.com>,
Ross Zwisler <ross.zwisler@linux.intel.com>,
Ingo Molnar <mingo@kernel.org>
Subject: Re: [PATCH v2 2/9] mm: move __phys_to_pfn and __pfn_to_phys to asm/generic/memory_model.h
Date: Tue, 29 Sep 2015 15:47:43 -0400 (EDT) [thread overview]
Message-ID: <alpine.LFD.2.20.1509291545460.11346@knanqh.ubzr> (raw)
In-Reply-To: <CANMBJr7Su2Gw_4oUj11grO-GMP-+tP0yp52zYB8KA3s5vo76VA@mail.gmail.com>
On Tue, 29 Sep 2015, Tyler Baker wrote:
> On 29 September 2015 at 12:21, Nicolas Pitre <nicolas.pitre@linaro.org> wrote:
> > On Tue, 25 Aug 2015, Dan Williams wrote:
> >
> >> From: Christoph Hellwig <hch@lst.de>
> >>
> >> Three architectures already define these, and we'll need them genericly
> >> soon.
> >>
> >> Signed-off-by: Christoph Hellwig <hch@lst.de>
> >> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
> >> ---
> >> arch/arm/include/asm/memory.h | 6 ------
> >> arch/arm64/include/asm/memory.h | 6 ------
> >> arch/unicore32/include/asm/memory.h | 6 ------
> >> include/asm-generic/memory_model.h | 6 ++++++
> >> 4 files changed, 6 insertions(+), 18 deletions(-)
> >>
> >> diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
> >> index b7f6fb462ea0..98d58bb04ac5 100644
> >> --- a/arch/arm/include/asm/memory.h
> >> +++ b/arch/arm/include/asm/memory.h
> >> @@ -119,12 +119,6 @@
> >> #endif
> >>
> >> /*
> >> - * Convert a physical address to a Page Frame Number and back
> >> - */
> >> -#define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT))
> >> -#define __pfn_to_phys(pfn) ((phys_addr_t)(pfn) << PAGE_SHIFT)
> >> -
> >> -/*
> >> * Convert a page to/from a physical address
> >> */
> >> #define page_to_phys(page) (__pfn_to_phys(page_to_pfn(page)))
> >
> > [...]
> >
> >> diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h
> >> index 14909b0b9cae..f20f407ce45d 100644
> >> --- a/include/asm-generic/memory_model.h
> >> +++ b/include/asm-generic/memory_model.h
> >> @@ -69,6 +69,12 @@
> >> })
> >> #endif /* CONFIG_FLATMEM/DISCONTIGMEM/SPARSEMEM */
> >>
> >> +/*
> >> + * Convert a physical address to a Page Frame Number and back
> >> + */
> >> +#define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT))
> >> +#define __pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT)
> >> +
> >
> > This patch, currently in mainline as commit 012dcef3f0, breaks LPAE on
> > ARM32 with more than 4GB of RAM. The phys_addr_t cast in the original
> > ARM definition is important when LPAE is enabled as phys_addr_t is 64
> > bits while longs are 32 bits.
>
> Dan sent my fix above to Linus already, which is in mainline as commit
> ae4f97696889.
Excellent. Somehow I was looking at v4.3-rc1 and not the latest.
Nicolas
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2015-09-29 19:47 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-26 1:27 [PATCH v2 0/9] initial struct page support for pmem Dan Williams
2015-08-26 1:27 ` [PATCH v2 1/9] dax: drop size parameter to ->direct_access() Dan Williams
2015-08-26 1:27 ` [PATCH v2 2/9] mm: move __phys_to_pfn and __pfn_to_phys to asm/generic/memory_model.h Dan Williams
2015-09-18 23:42 ` Tyler Baker
2015-09-18 23:59 ` Dan Williams
2015-09-19 6:49 ` Tyler Baker
2015-09-29 19:21 ` Nicolas Pitre
2015-09-29 19:36 ` Tyler Baker
2015-09-29 19:47 ` Nicolas Pitre [this message]
2015-08-26 1:27 ` [PATCH v2 3/9] mm: ZONE_DEVICE for "device memory" Dan Williams
2015-08-26 1:27 ` [PATCH v2 4/9] add devm_memremap_pages Dan Williams
2015-08-26 1:27 ` [PATCH v2 5/9] x86, pmem: push fallback handling to arch code Dan Williams
2015-08-26 12:41 ` Christoph Hellwig
2015-08-26 21:34 ` Williams, Dan J
2015-08-27 7:33 ` hch
2015-08-28 20:22 ` Ross Zwisler
2015-08-28 21:41 ` Toshi Kani
2015-08-28 21:47 ` Dan Williams
2015-08-28 21:48 ` Toshi Kani
2015-08-29 4:04 ` Williams, Dan J
2015-08-29 13:57 ` hch
2015-08-26 1:27 ` [PATCH v2 6/9] libnvdimm, pfn: 'struct page' provider infrastructure Dan Williams
2015-08-26 1:28 ` [PATCH v2 7/9] libnvdimm, pmem: 'struct page' for pmem Dan Williams
2015-08-26 1:28 ` [PATCH v2 8/9] libnvdimm, pmem: direct map legacy pmem by default Dan Williams
2015-08-26 1:28 ` [PATCH v2 9/9] devm_memremap_pages: protect against pmem device unbind Dan Williams
2015-08-26 12:46 ` Christoph Hellwig
2015-08-26 21:39 ` Williams, Dan J
2015-08-27 7:33 ` hch
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=alpine.LFD.2.20.1509291545460.11346@knanqh.ubzr \
--to=nicolas.pitre@linaro.org \
--cc=boaz@plexistor.com \
--cc=dan.j.williams@intel.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nvdimm@lists.01.org \
--cc=linux@arm.linux.org.uk \
--cc=mingo@kernel.org \
--cc=ross.zwisler@linux.intel.com \
--cc=tyler.baker@linaro.org \
/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