diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-20 14:56:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-20 14:56:02 -0800 |
| commit | c66fbc6c3df9ccefbb896695cfc4db279d517ff1 (patch) | |
| tree | 03d5f5d70005dd7e28c584dbf26721b2af435301 /arch/openrisc/include/asm | |
| parent | Merge tag 'microblaze-v6.13' of git://git.monstr.eu/linux-2.6-microblaze (diff) | |
| parent | openrisc: Implement fixmap to fix earlycon (diff) | |
| download | linux-c66fbc6c3df9ccefbb896695cfc4db279d517ff1.tar.gz linux-c66fbc6c3df9ccefbb896695cfc4db279d517ff1.zip | |
Merge tag 'for-linus' of https://github.com/openrisc/linux
Pull OpenRISC update from Stafford Horne:
"A single fixup from me: Fix bug with earlycon being broken due to
removal of early_ioremap"
* tag 'for-linus' of https://github.com/openrisc/linux:
openrisc: Implement fixmap to fix earlycon
Diffstat (limited to 'arch/openrisc/include/asm')
| -rw-r--r-- | arch/openrisc/include/asm/fixmap.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/arch/openrisc/include/asm/fixmap.h b/arch/openrisc/include/asm/fixmap.h index ecdb98a5839f..aaa6a26a3e92 100644 --- a/arch/openrisc/include/asm/fixmap.h +++ b/arch/openrisc/include/asm/fixmap.h @@ -26,29 +26,18 @@ #include <linux/bug.h> #include <asm/page.h> -/* - * On OpenRISC we use these special fixed_addresses for doing ioremap - * early in the boot process before memory initialization is complete. - * This is used, in particular, by the early serial console code. - * - * It's not really 'fixmap', per se, but fits loosely into the same - * paradigm. - */ enum fixed_addresses { - /* - * FIX_IOREMAP entries are useful for mapping physical address - * space before ioremap() is useable, e.g. really early in boot - * before kmalloc() is working. - */ -#define FIX_N_IOREMAPS 32 - FIX_IOREMAP_BEGIN, - FIX_IOREMAP_END = FIX_IOREMAP_BEGIN + FIX_N_IOREMAPS - 1, + FIX_EARLYCON_MEM_BASE, __end_of_fixed_addresses }; #define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT) /* FIXADDR_BOTTOM might be a better name here... */ #define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) +#define FIXMAP_PAGE_IO PAGE_KERNEL_NOCACHE + +extern void __set_fixmap(enum fixed_addresses idx, + phys_addr_t phys, pgprot_t flags); #include <asm-generic/fixmap.h> |