diff for duplicates of <20111011235827.GB2293@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 5ebe6e3..584d76b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,3 +24,10 @@ Sure, thanks, updated version below. Will also update the patch in Russell's patch system. Tony +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: ioremap-exec.patch +Type: text/x-diff +Size: 1937 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111011/a970586f/attachment-0001.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 2081bed..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: inline; filename="ioremap-exec.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 00f11dc..0000000 --- a/a/2.txt +++ /dev/null @@ -1,54 +0,0 @@ -From: Tony Lindgren <tony@atomide.com> -Date: Wed, 5 Oct 2011 15:14:01 -0700 -Subject: [PATCH] ARM: Add __arm_ioremap_exec for mapping external memory as MT_MEMORY - -This allows mapping external memory such as SRAM for use. - -This is needed for some small chunks of code, such as reprogramming -SDRAM memory source clocks that can't be executed in SDRAM. Other -use cases include some PM related code. - -Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org> -Acked-by: Andres Salomon <dilinger@queued.net> -Signed-off-by: Tony Lindgren <tony@atomide.com> - ---- a/arch/arm/include/asm/io.h -+++ b/arch/arm/include/asm/io.h -@@ -80,6 +80,7 @@ extern void __iomem *__arm_ioremap_caller(unsigned long, size_t, unsigned int, - - extern void __iomem *__arm_ioremap_pfn(unsigned long, unsigned long, size_t, unsigned int); - extern void __iomem *__arm_ioremap(unsigned long, size_t, unsigned int); -+extern void __iomem *__arm_ioremap_exec(unsigned long, size_t, bool cached); - extern void __iounmap(volatile void __iomem *addr); - - /* ---- a/arch/arm/mm/ioremap.c -+++ b/arch/arm/mm/ioremap.c -@@ -289,6 +289,27 @@ __arm_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype) - } - EXPORT_SYMBOL(__arm_ioremap); - -+/* -+ * Remap an arbitrary physical address space into the kernel virtual -+ * address space as memory. Needed when the kernel wants to execute -+ * code in external memory. This is needed for reprogramming source -+ * clocks that would affect normal memory for example. Please see -+ * CONFIG_GENERIC_ALLOCATOR for allocating external memory. -+ */ -+void __iomem * -+__arm_ioremap_exec(unsigned long phys_addr, size_t size, bool cached) -+{ -+ unsigned int mtype; -+ -+ if (cached) -+ mtype = MT_MEMORY; -+ else -+ mtype = MT_MEMORY_NONCACHED; -+ -+ return __arm_ioremap_caller(phys_addr, size, mtype, -+ __builtin_return_address(0)); -+} -+ - void __iounmap(volatile void __iomem *io_addr) - { - void *addr = (void *)(PAGE_MASK & (unsigned long)io_addr); diff --git a/a/content_digest b/N1/content_digest index 317497d..86f3f52 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,11 @@ "ref\020111007194242.18205.64009.stgit@kaulin.local\0" "ref\020111007194543.18205.36115.stgit@kaulin.local\0" "ref\020111011134048.28b9b19b@queued.net\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 1/7] ARM: Add __arm_ioremap_exec for mapping external memory as MT_MEMORY\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 1/7] ARM: Add __arm_ioremap_exec for mapping external memory as MT_MEMORY\0" "Date\0Tue, 11 Oct 2011 16:58:27 -0700\0" - "To\0Andres Salomon <dilinger@queued.net>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - " linux-omap@vger.kernel.org\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "* Andres Salomon <dilinger@queued.net> [111011 14:11]:\n" "> On Fri, 07 Oct 2011 12:45:43 -0700\n" @@ -34,63 +32,13 @@ "Sure, thanks, updated version below. Will also update the patch in\n" "Russell's patch system.\n" "\n" - Tony - "\01:2\0" - "fn\0ioremap-exec.patch\0" - "b\0" - "From: Tony Lindgren <tony@atomide.com>\n" - "Date: Wed, 5 Oct 2011 15:14:01 -0700\n" - "Subject: [PATCH] ARM: Add __arm_ioremap_exec for mapping external memory as MT_MEMORY\n" - "\n" - "This allows mapping external memory such as SRAM for use.\n" - "\n" - "This is needed for some small chunks of code, such as reprogramming\n" - "SDRAM memory source clocks that can't be executed in SDRAM. Other\n" - "use cases include some PM related code.\n" - "\n" - "Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>\n" - "Acked-by: Andres Salomon <dilinger@queued.net>\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "--- a/arch/arm/include/asm/io.h\n" - "+++ b/arch/arm/include/asm/io.h\n" - "@@ -80,6 +80,7 @@ extern void __iomem *__arm_ioremap_caller(unsigned long, size_t, unsigned int,\n" - " \n" - " extern void __iomem *__arm_ioremap_pfn(unsigned long, unsigned long, size_t, unsigned int);\n" - " extern void __iomem *__arm_ioremap(unsigned long, size_t, unsigned int);\n" - "+extern void __iomem *__arm_ioremap_exec(unsigned long, size_t, bool cached);\n" - " extern void __iounmap(volatile void __iomem *addr);\n" - " \n" - " /*\n" - "--- a/arch/arm/mm/ioremap.c\n" - "+++ b/arch/arm/mm/ioremap.c\n" - "@@ -289,6 +289,27 @@ __arm_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype)\n" - " }\n" - " EXPORT_SYMBOL(__arm_ioremap);\n" - " \n" - "+/*\n" - "+ * Remap an arbitrary physical address space into the kernel virtual\n" - "+ * address space as memory. Needed when the kernel wants to execute\n" - "+ * code in external memory. This is needed for reprogramming source\n" - "+ * clocks that would affect normal memory for example. Please see\n" - "+ * CONFIG_GENERIC_ALLOCATOR for allocating external memory.\n" - "+ */\n" - "+void __iomem *\n" - "+__arm_ioremap_exec(unsigned long phys_addr, size_t size, bool cached)\n" - "+{\n" - "+\tunsigned int mtype;\n" - "+\n" - "+\tif (cached)\n" - "+\t\tmtype = MT_MEMORY;\n" - "+\telse\n" - "+\t\tmtype = MT_MEMORY_NONCACHED;\n" - "+\n" - "+\treturn __arm_ioremap_caller(phys_addr, size, mtype,\n" - "+\t\t\t__builtin_return_address(0));\n" - "+}\n" - "+\n" - " void __iounmap(volatile void __iomem *io_addr)\n" - " {\n" - " \tvoid *addr = (void *)(PAGE_MASK & (unsigned long)io_addr);" + "Tony\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: ioremap-exec.patch\n" + "Type: text/x-diff\n" + "Size: 1937 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111011/a970586f/attachment-0001.bin> -ca88ff810e7b572fbf06d5a49759a05d0f46fe53b1389c5e3e3e3f39ff061ac1 +ffb51f2c4c9aa2d8a8d5acf7656c0ca3081ead25ea7784837c90ec957da15dbe
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.