Re: [PATCH 4/5] serial: convert early_uart to earlycon for 8250

[Yinghai Lu]

On 5/30/07, Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
> On Tue, 29 May 2007 18:43:59 -0700 Yinghai Lu <Yinghai.Lu@xxxxxxx> wrote:
>
> > [PATCH 4/5] serial: convert early_uart to earlycon for 8250
>
> drivers/serial/8250_early.c: In function 'parse_options':
> drivers/serial/8250_early.c:143: error: 'FIX_EARLYCON_MEM_BASE' undeclared (first use in this function)
> drivers/serial/8250_early.c:143: error: (Each undeclared identifier is reported only once
>
> That was with http://userweb.kernel.org/~akpm/config-sony.txt, but this is
> going to break a whole pile of architectures (alpha, powerpc, others).

alpha, powerpc, others may need sth like ia64, if they do not support fixmap.

diff --git a/include/asm-ia64/io.h b/include/asm-ia64/io.h
index eb17a86..e29eaf8 100644
--- a/include/asm-ia64/io.h
+++ b/include/asm-ia64/io.h
@@ -423,6 +423,10 @@ 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);

+/* for console=uart8250,mmio,0xffe5000,9600n8 */
+#define FIX_EARLYCON_MEM_BASE 1
+#define fix_ioremap(idx, phys) ioremap(phys, 64)
+
/* Use normal IO mappings for DMI */
#define dmi_ioremap ioremap
#define dmi_iounmap(x,l) iounmap(x)


$ find . -name "fixmap.h"
./asm-sh/fixmap.h
./asm-um/fixmap.h
./asm-parisc/fixmap.h
./asm-x86_64/fixmap.h
./asm-sparc/fixmap.h
./asm-i386/fixmap.h
./asm-mips/fixmap.h

they will need
diff --git a/include/asm-x86_64/io.h b/include/asm-x86_64/io.h
index de2cd9a..e2d66de 100644
--- a/include/asm-x86_64/io.h
+++ b/include/asm-x86_64/io.h
@@ -145,6 +145,19 @@ extern void early_iounmap(void *addr, unsigned long size);
extern void __iomem * ioremap_nocache (unsigned long offset, unsigned
long size);
extern void iounmap(volatile void __iomem *addr);

+#include <asm/pgtable.h>
+#include <asm/fixmap.h>
+
+static inline void __iomem * fix_ioremap (unsigned idx, unsigned long phys)
+{
+       void __iomem * vaddr;
+       set_fixmap_nocache(idx, phys & PAGE_MASK);
+       vaddr = (void __iomem *)__fix_to_virt(idx);
+       vaddr += phys & ~PAGE_MASK;
+
+       return vaddr;
+}
+
/*
* ISA I/O bus memory addresses are 1:1 with the physical address.
*/

YH
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/