sh: dreamcast: Fix GAPS PCI bridge addressing

zear · glaubitz · commit 10c88ca5c9ae · 2024-05-13T09:13:26.000+02:00
The G2-to-PCI bridge chip found in SEGA Dreamcast assumes P2 area relative addresses. Set the appropriate IOPORT base offset. Tested-by: Paul Cercueil <paul@crapouillou.net> Signed-off-by: Artur Rojek <contact@artur-rojek.eu> Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Link: https://lore.kernel.org/r/20240511191614.68561-2-contact@artur-rojek.eu Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
@@ -125,7 +125,8 @@ config ARCH_HAS_ILOG2_U64
 
 config NO_IOPORT_MAP
 	def_bool !PCI
-	depends on !SH_SHMIN && !SH_HP6XX && !SH_SOLUTION_ENGINE
+	depends on !SH_SHMIN && !SH_HP6XX && !SH_SOLUTION_ENGINE && \
+		   !SH_DREAMCAST
 
 config IO_TRAPPED
 	bool
diff --git a/arch/sh/boards/mach-dreamcast/setup.c b/arch/sh/boards/mach-dreamcast/setup.c
@@ -25,10 +25,13 @@
 #include <asm/irq.h>
 #include <asm/rtc.h>
 #include <asm/machvec.h>
+#include <cpu/addrspace.h>
 #include <mach/sysasic.h>
 
 static void __init dreamcast_setup(char **cmdline_p)
 {
+	/* GAPS PCI bridge assumes P2 area relative addresses. */
+	__set_io_port_base(P2SEG);
 }
 
 static struct sh_machine_vector mv_dreamcast __initmv = {

Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,13 @@`
`25`	`25`	`#include <asm/irq.h>`
`26`	`26`	`#include <asm/rtc.h>`
`27`	`27`	`#include <asm/machvec.h>`
	`28`	`+#include <cpu/addrspace.h>`
`28`	`29`	`#include <mach/sysasic.h>`
`29`	`30`
`30`	`31`	`static void __init dreamcast_setup(char **cmdline_p)`
`31`	`32`	`{`
	`33`	`+ /* GAPS PCI bridge assumes P2 area relative addresses. */`
	`34`	`+ __set_io_port_base(P2SEG);`
`32`	`35`	`}`
`33`	`36`
`34`	`37`	`static struct sh_machine_vector mv_dreamcast __initmv = {`