]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
sh: landisk: Add missing initialization of sh_io_port_base
authorGeert Uytterhoeven <geert+renesas@glider.be>
Fri, 14 Aug 2020 12:42:45 +0000 (14:42 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Aug 2020 07:48:23 +0000 (09:48 +0200)
[ Upstream commit 0c64a0dce51faa9c706fdf1f957d6f19878f4b81 ]

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: 37b7a97884ba64bf ("sh: machvec IO death.")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rich Felker <dalias@libc.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/sh/boards/mach-landisk/setup.c

index f1147caebacf020e6933b1069b962f1bc2a0cfca..af69fb7fef7c7373dc86da09039291f1a4e2545a 100644 (file)
@@ -85,6 +85,9 @@ device_initcall(landisk_devices_setup);
 
 static void __init landisk_setup(char **cmdline_p)
 {
+       /* I/O port identity mapping */
+       __set_io_port_base(0);
+
        /* LED ON */
        __raw_writeb(__raw_readb(PA_LED) | 0x03, PA_LED);