diff for duplicates of <20110822190838.3e03c3ec@debxo> diff --git a/a/1.txt b/N1/1.txt index f08764f..3c3e4ca 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,15 +4,15 @@ Eric Miao <eric.y.miao@gmail.com> wrote: > On Tue, Aug 23, 2011 at 7:47 AM, Andres Salomon <dilinger@queued.net> > wrote: > > The sram code allocates memory with ioremap, which assumes MT_DEVICE -> > for memory protections. ?This explodes when we map sram for power +> > for memory protections. This explodes when we map sram for power > > management purposes and then attempt to execute it (jump_to_lp_sram) -> > on the OLPC XO-1.75. ?Instead, we want to specify MT_MEMORY, which +> > on the OLPC XO-1.75. Instead, we want to specify MT_MEMORY, which > > doesn't set the L_PTE_XN bit. > > > > Signed-off-by: Andres Salomon <dilinger@queued.net> > > --- -> > ?arch/arm/mach-mmp/sram.c | ? ?4 +++- -> > ?1 files changed, 3 insertions(+), 1 deletions(-) +> > arch/arm/mach-mmp/sram.c | 4 +++- +> > 1 files changed, 3 insertions(+), 1 deletions(-) > > > > Eric, this patch is against the devel branch of your pxa tree. > > @@ -21,23 +21,23 @@ Eric Miao <eric.y.miao@gmail.com> wrote: > > --- a/arch/arm/mach-mmp/sram.c > > +++ b/arch/arm/mach-mmp/sram.c > > @@ -21,6 +21,7 @@ -> > ?#include <linux/err.h> -> > ?#include <linux/slab.h> -> > ?#include <linux/genalloc.h> +> > #include <linux/err.h> +> > #include <linux/slab.h> +> > #include <linux/genalloc.h> > > +#include <asm/mach/map.h> > > -> > ?#include <mach/sram.h> +> > #include <mach/sram.h> > > > > @@ -87,7 +88,8 @@ static int __devinit sram_probe(struct > > platform_device *pdev) > > -> > ? ? ? ?info->sram_phys ? = (phys_addr_t)res->start; -> > ? ? ? ?info->sram_size ? = resource_size(res); -> > - ? ? ? info->sram_virt ? = ioremap(info->sram_phys, +> > info->sram_phys = (phys_addr_t)res->start; +> > info->sram_size = resource_size(res); +> > - info->sram_virt = ioremap(info->sram_phys, > > info->sram_size); -> > + ? ? ? info->sram_virt ? = __arm_ioremap(info->sram_phys, +> > + info->sram_virt = __arm_ioremap(info->sram_phys, > > info->sram_size, -> > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? MT_MEMORY); +> > + MT_MEMORY); > > I doubt MT_MEMORY is intended for use with __arm_ioremap(). There > could be other way around to the L_PTE_XN bit. diff --git a/a/content_digest b/N1/content_digest index 7951ee7..9a31f67 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,10 +2,17 @@ "ref\01313377794-26721-2-git-send-email-leoy@marvell.com\0" "ref\020110822164740.5682541b@queued.net\0" "ref\0CAMPhdO-cttCzdm_gh=KdNqqPYQOgPBNS57DtPduPahpkP2rk0g@mail.gmail.com\0" - "From\0dilinger@queued.net (Andres Salomon)\0" - "Subject\0[PATCH] ARM: mmp: map sram as MT_MEMORY rather than MT_DEVICE\0" + "From\0Andres Salomon <dilinger@queued.net>\0" + "Subject\0Re: [PATCH] ARM: mmp: map sram as MT_MEMORY rather than MT_DEVICE\0" "Date\0Mon, 22 Aug 2011 19:08:38 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Eric Miao <eric.y.miao@gmail.com>\0" + "Cc\0Leo Yan <leoy@marvell.com>" + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + Nicolas Pitre <nicolas.pitre@linaro.org> + Russell King <linux@arm.linux.org.uk> + Haojian Zhuang <hzhuang1@marvell.com> + " Jon Nettleton <jon.nettleton@gmail.com>\0" "\00:1\0" "b\0" "On Tue, 23 Aug 2011 08:07:41 +0800\n" @@ -14,15 +21,15 @@ "> On Tue, Aug 23, 2011 at 7:47 AM, Andres Salomon <dilinger@queued.net>\n" "> wrote:\n" "> > The sram code allocates memory with ioremap, which assumes MT_DEVICE\n" - "> > for memory protections. ?This explodes when we map sram for power\n" + "> > for memory protections. \302\240This explodes when we map sram for power\n" "> > management purposes and then attempt to execute it (jump_to_lp_sram)\n" - "> > on the OLPC XO-1.75. ?Instead, we want to specify MT_MEMORY, which\n" + "> > on the OLPC XO-1.75. \302\240Instead, we want to specify MT_MEMORY, which\n" "> > doesn't set the L_PTE_XN bit.\n" "> >\n" "> > Signed-off-by: Andres Salomon <dilinger@queued.net>\n" "> > ---\n" - "> > ?arch/arm/mach-mmp/sram.c | ? ?4 +++-\n" - "> > ?1 files changed, 3 insertions(+), 1 deletions(-)\n" + "> > \302\240arch/arm/mach-mmp/sram.c | \302\240 \302\2404 +++-\n" + "> > \302\2401 files changed, 3 insertions(+), 1 deletions(-)\n" "> >\n" "> > Eric, this patch is against the devel branch of your pxa tree.\n" "> >\n" @@ -31,23 +38,23 @@ "> > --- a/arch/arm/mach-mmp/sram.c\n" "> > +++ b/arch/arm/mach-mmp/sram.c\n" "> > @@ -21,6 +21,7 @@\n" - "> > ?#include <linux/err.h>\n" - "> > ?#include <linux/slab.h>\n" - "> > ?#include <linux/genalloc.h>\n" + "> > \302\240#include <linux/err.h>\n" + "> > \302\240#include <linux/slab.h>\n" + "> > \302\240#include <linux/genalloc.h>\n" "> > +#include <asm/mach/map.h>\n" "> >\n" - "> > ?#include <mach/sram.h>\n" + "> > \302\240#include <mach/sram.h>\n" "> >\n" "> > @@ -87,7 +88,8 @@ static int __devinit sram_probe(struct\n" "> > platform_device *pdev)\n" "> >\n" - "> > ? ? ? ?info->sram_phys ? = (phys_addr_t)res->start;\n" - "> > ? ? ? ?info->sram_size ? = resource_size(res);\n" - "> > - ? ? ? info->sram_virt ? = ioremap(info->sram_phys,\n" + "> > \302\240 \302\240 \302\240 \302\240info->sram_phys \302\240 = (phys_addr_t)res->start;\n" + "> > \302\240 \302\240 \302\240 \302\240info->sram_size \302\240 = resource_size(res);\n" + "> > - \302\240 \302\240 \302\240 info->sram_virt \302\240 = ioremap(info->sram_phys,\n" "> > info->sram_size);\n" - "> > + ? ? ? info->sram_virt ? = __arm_ioremap(info->sram_phys,\n" + "> > + \302\240 \302\240 \302\240 info->sram_virt \302\240 = __arm_ioremap(info->sram_phys,\n" "> > info->sram_size,\n" - "> > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? MT_MEMORY);\n" + "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 MT_MEMORY);\n" "> \n" "> I doubt MT_MEMORY is intended for use with __arm_ioremap(). There\n" "> could be other way around to the L_PTE_XN bit.\n" @@ -62,4 +69,4 @@ "standard_io_desc array, but that would require having it pre-mapped and\n" knowing the virtual address. Or were you planning to ioremap it? -d9bc5798fe4dbc3aa0958f319ed776f03fd35223393ae6f801b3995a46ec4e59 +4c99604fe5ed8fd3df62ff5535d1a0dd3945febd66a0ed38ea4249aeef7148b2
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.