Skip to content

Commit 0c64a0d

Browse files
geertuRich Felker
authored andcommitted
sh: landisk: Add missing initialization of sh_io_port_base
The Landisk setup code maps the CF IDE area using ioremap_prot(), and passes the resulting virtual addresses to the pata_platform driver, disguising them as I/O port addresses. Hence the pata_platform driver translates them again using ioport_map(). As CONFIG_GENERIC_IOMAP=n, and CONFIG_HAS_IOPORT_MAP=y, the SuperH-specific mapping code in arch/sh/kernel/ioport.c translates I/O port addresses to virtual addresses by adding sh_io_port_base, which defaults to -1, thus breaking the assumption of an identity mapping. Fix this by setting sh_io_port_base to zero. Fixes: 37b7a97 ("sh: machvec IO death.") Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Rich Felker <[email protected]>
1 parent 03dd061 commit 0c64a0d

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

arch/sh/boards/mach-landisk/setup.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ device_initcall(landisk_devices_setup);
8282

8383
static void __init landisk_setup(char **cmdline_p)
8484
{
85+
/* I/O port identity mapping */
86+
__set_io_port_base(0);
87+
8588
/* LED ON */
8689
__raw_writeb(__raw_readb(PA_LED) | 0x03, PA_LED);
8790

0 commit comments

Comments
 (0)