Skip to content

Commit

Permalink
sh: landisk: Add missing initialization of sh_io_port_base
Browse files Browse the repository at this point in the history
[ Upstream commit 0c64a0d ]

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 <geert+renesas@glider.be>
Signed-off-by: Rich Felker <dalias@libc.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Geert Uytterhoeven authored and Greg Kroah-Hartman committed Aug 21, 2020
1 parent df8caaf commit 014ec97
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/sh/boards/mach-landisk/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 014ec97

Please sign in to comment.