[PATCH v2 1/2] ia64: split off early_ioremap() declarations into asm/early_ioremap.h

[PATCH v2 1/2] ia64: split off early_ioremap() declarations into asm/early_ioremap.h

[Ard Biesheuvel]

Unlike x86, arm64 and ARM, ia64 does not declare its implementations
of early_ioremap/early_iounmap/early_memremap/early_memunmap in a header
file called <asm/early_ioremap.h>

This complicates the use of these functions in generic code, since the
header cannot be included directly, and we have to rely on transitive
includes, which is fragile.

So create a <asm/early_ioremap.h> for ia64, and move the existing
definitions into it.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 arch/ia64/include/asm/early_ioremap.h | 10 ++++++++++
 arch/ia64/include/asm/io.h            |  5 +----
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 arch/ia64/include/asm/early_ioremap.h

diff --git a/arch/ia64/include/asm/early_ioremap.h b/arch/ia64/include/asm/early_ioremap.h
new file mode 100644
index 000000000000..eec9e1d1b833
--- /dev/null
+++ b/arch/ia64/include/asm/early_ioremap.h
@@ -0,0 +1,10 @@
+#ifndef _ASM_IA64_EARLY_IOREMAP_H
+#define _ASM_IA64_EARLY_IOREMAP_H
+
+extern void __iomem * early_ioremap (unsigned long phys_addr, unsigned long size);
+#define early_memremap(phys_addr, size)        early_ioremap(phys_addr, size)
+
+extern void early_iounmap (volatile void __iomem *addr, unsigned long size);
+#define early_memunmap(addr, size)             early_iounmap(addr, size)
+
+#endif
diff --git a/arch/ia64/include/asm/io.h b/arch/ia64/include/asm/io.h
index 9041bbe2b7b4..a865d2a04f75 100644
--- a/arch/ia64/include/asm/io.h
+++ b/arch/ia64/include/asm/io.h
@@ -20,6 +20,7 @@
  */
 
 #include <asm/unaligned.h>
+#include <asm/early_ioremap.h>
 
 /* We don't use IO slowdowns on the ia64, but.. */
 #define __SLOW_DOWN_IO	do { } while (0)
@@ -427,10 +428,6 @@ __writeq (unsigned long val, volatile void __iomem *addr)
 extern void __iomem * ioremap(unsigned long offset, unsigned long size);
 extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size);
 extern void iounmap (volatile void __iomem *addr);
-extern void __iomem * early_ioremap (unsigned long phys_addr, unsigned long size);
-#define early_memremap(phys_addr, size)        early_ioremap(phys_addr, size)
-extern void early_iounmap (volatile void __iomem *addr, unsigned long size);
-#define early_memunmap(addr, size)             early_iounmap(addr, size)
 static inline void __iomem * ioremap_cache (unsigned long phys_addr, unsigned long size)
 {
 	return ioremap(phys_addr, size);
-- 
2.5.0

[PATCH v2 2/2] efi: include asm/early_ioremap.h not asm/efi.h to get early_memremap

[Ard Biesheuvel]

The code in efi.c uses early_memremap(), but relies on a transitive
include rather than including asm/early_ioremap.h directly, since
this header did not exist on ia64.

Commit f7d924894265 ("arm64/efi: refactor EFI init and runtime code
for reuse by 32-bit ARM") attempted to work around this by including
asm/efi.h, which transitively includes asm/early_ioremap.h on most
architectures. However, since asm/efi.h does not exist on ia64 either,
this is not much of an improvement.

Now that we have created an asm/early_ioremap.h for ia64, we can just
include it directly.

Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 drivers/firmware/efi/efi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index cffa89b3317b..2cd37dad67a6 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -25,7 +25,7 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 
-#include <asm/efi.h>
+#include <asm/early_ioremap.h>
 
 struct efi __read_mostly efi = {
 	.mps			= EFI_INVALID_TABLE_ADDR,
-- 
2.5.0

RE: [PATCH v2 1/2] ia64: split off early_ioremap() declarations into asm/early_ioremap.h

[Luck, Tony]

> So create a <asm/early_ioremap.h> for ia64, and move the existing
> definitions into it.

These look OK.

Acked-by: Tony Luck <toy.luck@intel.com>


Can you put them into the same tree where the pending breakage is sitting?
Then I don't have to worry about coordinating pull requests from the ia64
tree.

-Tony

Re: [PATCH v2 1/2] ia64: split off early_ioremap() declarations into asm/early_ioremap.h

[Will Deacon]

On Tue, Jan 12, 2016 at 09:33:46PM +0000, Luck, Tony wrote:
> > So create a <asm/early_ioremap.h> for ia64, and move the existing
> > definitions into it.
> 
> These look OK.
> 
> Acked-by: Tony Luck <toy.luck@intel.com>

s/toy/tony/ ;)

> Can you put them into the same tree where the pending breakage is sitting?
> Then I don't have to worry about coordinating pull requests from the ia64
> tree.

The arm trees have already been pulled, so the breakage is in mainline.

I think it makes the most sense to fix this either via the ia64 or the
efi tree, but I'll queue something at -rc1 if it's still not resolved by
then.

Will

RE: [PATCH v2 1/2] ia64: split off early_ioremap() declarations into asm/early_ioremap.h

[Luck, Tony]

> The arm trees have already been pulled, so the breakage is in mainline.
>
> I think it makes the most sense to fix this either via the ia64 or the
> efi tree, but I'll queue something at -rc1 if it's still not resolved by
> then.

I put the two patches in the ia64 tree and sent a pull request to Linus.

-Tony

Re: [PATCH v2 1/2] ia64: split off early_ioremap() declarations into asm/early_ioremap.h

[Ard Biesheuvel]

On 13 January 2016 at 22:36, Luck, Tony <tony.luck@intel.com> wrote:
>> The arm trees have already been pulled, so the breakage is in mainline.
>>
>> I think it makes the most sense to fix this either via the ia64 or the
>> efi tree, but I'll queue something at -rc1 if it's still not resolved by
>> then.
>
> I put the two patches in the ia64 tree and sent a pull request to Linus.
>

Thanks Tony