rework of usbgecko-based early debug
v4 cover rework of usbgecko-based early debug
This is v4 of the "early debugging using usbgecko" patch.
It tries to implement the ideas suggested by Benjamin Herrenschmidt regarding the use of a set of fixmap entries to provide safe virtual address space for an early mapping.
Albert Herranz (2):
powerpc: reserve fixmap entries for early debug
powerpc: gamecube/wii: early debugging using usbgecko
arch/powerpc/Kconfig.debug | 8 +++ arch/powerpc/include/asm/fixmap.h | 3 + arch/powerpc/include/asm/udbg.h | 1 + arch/powerpc/kernel/head_32.S | 25 +++++++++ arch/powerpc/kernel/udbg.c | 2 + arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c | 56 ++++++++++++++++++++ arch/powerpc/platforms/embedded6xx/usbgecko_udbg.h | 2 + 7 files changed, 97 insertions(+), 0 deletions(-)
RFC PATCH v4 1/2 powerpc: reserve fixmap entries for early debug
Add a set of entries to the fixmap table to allow usage of known reserved virtual address space by early debug code.
The address space reserved is the top 128K of the 32-bit address space. This allows, if required, the use of a BAT to do the mappings.
--- arch/powerpc/include/asm/fixmap.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
arch/powerpc/include/asm/fixmap.h +3 -0
@@ -44,6 +44,9 @@*/ enum fixed_addresses {FIX_HOLE , +/* reserve the top 128K for early debugging purposes */ +FIX_EARLY_DEBUG_TOP =FIX_HOLE , +FIX_EARLY_DEBUG_BASE =FIX_EARLY_DEBUG_TOP +((128 *1024 )/PAGE_SIZE )-1 ,#ifdef CONFIG_HIGHMEM FIX_KMAP_BEGIN ,/* reserved pte's for temporary kernel mappings */ FIX_KMAP_END =FIX_KMAP_BEGIN +(KM_TYPE_NR *NR_CPUS )-1 ,
Signature · 1 line
1.6.3.3
RFC PATCH v4 2/2 powerpc: gamecube/wii: early debugging using usbgecko
In reply to Albert HerranzAdd support for using the USB Gecko adapter as an early debugging console on the Nintendo GameCube and Wii video game consoles. The USB Gecko is a 3rd party memory card interface adapter that provides a EXI (External Interface) to USB serial converter.
--- arch/powerpc/Kconfig.debug | 8 +++ arch/powerpc/include/asm/udbg.h | 1 + arch/powerpc/kernel/head_32.S | 25 +++++++++ arch/powerpc/kernel/udbg.c | 2 + arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c | 56 ++++++++++++++++++++ arch/powerpc/platforms/embedded6xx/usbgecko_udbg.h | 2 + 6 files changed, 94 insertions(+), 0 deletions(-)
arch/powerpc/Kconfig.debug +8 -0
@@ -254,6 +254,14 @@ config PPC_EARLY_DEBUG_CPM using a CPM-based serial port. This assumes that the bootwrapper has run, and set up the CPM in a particular way. +config PPC_EARLY_DEBUG_USBGECKO + bool "Early debugging through the USB Gecko adapter" + depends on GAMECUBE_COMMON + select USBGECKO_UDBG + help + Select this to enable early debugging for Nintendo GameCube/Wii + consoles via an external USB Gecko adapter. + endchoice config PPC_EARLY_DEBUG_44x_PHYSLOW
arch/powerpc/include/asm/udbg.h +1 -0
@@ -51,6 +51,7 @@ extern void __init udbg_init_btext(void);extern void __init udbg_init_44x_as1 (void );extern void __init udbg_init_40x_realmode (void );extern void __init udbg_init_cpm (void ); +extern void __init udbg_init_usbgecko (void );#endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_UDBG_H */
arch/powerpc/kernel/head_32.S +25 -0
@@ -164,6 +164,9 @@ __after_mmu_off: #ifdef CONFIG_PPC_EARLY_DEBUG_CPM bl setup_cpm_bat #endif +#ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO + bl setup_usbgecko_bat +#endif /* * Call setup_cpu for CPU 0 and initialize 6xx Idle
@@ -1203,6 +1206,28 @@ setup_cpm_bat: blr #endif +#ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO +setup_usbgecko_bat: + /* prepare a BAT for early io */ +#if defined(CONFIG_GAMECUBE) + lis r8, 0x0c00 +#elif defined(CONFIG_WII) + lis r8, 0x0d00 +#else +#error Invalid platform for USB Gecko based early debugging. +#endif + /* + * The virtual address used must match the virtual address + * associated to the fixmap entry FIX_EARLY_DEBUG_BASE. + */ + lis r11, 0xfffe /* top 128K */ + ori r8, r8, 0x002a /* uncached, guarded ,rw */ + ori r11, r11, 0x3 /* 128K */ + mtspr SPRN_DBAT1L, r8 + mtspr SPRN_DBAT1U, r11 + blr +#endif + #ifdef CONFIG_8260 /* Jump into the system reset for the rom. * We first disable the MMU, and then jump to the ROM reset address.
arch/powerpc/kernel/udbg.c +2 -0
@@ -60,6 +60,8 @@ void __init udbg_early_init(void)udbg_init_40x_realmode ();#elif defined(CONFIG_PPC_EARLY_DEBUG_CPM )udbg_init_cpm (); +#elif defined(CONFIG_PPC_EARLY_DEBUG_USBGECKO ) +udbg_init_usbgecko ();#endif #ifdef CONFIG_PPC_EARLY_DEBUG
arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c +56 -0
65 lines not on this page · raw message
arch/powerpc/platforms/embedded6xx/usbgecko_udbg.h +2 -0
@@ -27,4 +27,6 @@ static inline void __init ug_udbg_init(void)#endif /* CONFIG_USBGECKO_UDBG */ +void __init udbg_init_usbgecko (void ); +#endif /* __USBGECKO_UDBG_H */
Signature · 1 line
1.6.3.3
Re: [RFC PATCH v4 2/2] powerpc: gamecube/wii: early debugging using usbgecko
arch/powerpc/kernel/head_32.S setup_cpm_bat: · line 1218
Quoted 10 lines
arch/powerpc/kernel/head_32.S +10
-0+#ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO +setup_usbgecko_bat: + /* prepare a BAT for early io */ +#if defined(CONFIG_GAMECUBE) + lis r8, 0x0c00 +#elif defined(CONFIG_WII) + lis r8, 0x0d00 +#else +#error Invalid platform for USB Gecko based early debugging. +#endif
A kernel with both CONFIG_WII and CONFIG_GAMECUBE works fine on either, right? If so, could you please switch the two #ifs? A dual-platform kernel will be used on a Wii much more likely than on a GC.
arch/powerpc/kernel/head_32.S setup_cpm_bat: · line 1225
Quoted 7 lines
arch/powerpc/kernel/head_32.S +7
-0+ /* + * The virtual address used must match the virtual address + * associated to the fixmap entry FIX_EARLY_DEBUG_BASE. + */ + lis r11, 0xfffe /* top 128K */ + ori r8, r8, 0x002a /* uncached, guarded ,rw */ + ori r11, r11, 0x3 /* 128K */
I think you should clear Vp since the BAT mapping can survive until after user space is started; it won't hurt to remove it either way. So 2 instead of 3. And put the meaning in the comment :-)
Looks fine otherwise.
Segher
Re: [RFC PATCH v4 2/2] powerpc: gamecube/wii: early debugging using usbgecko
Quoted 7 lines · Segher Boessenkool
Quoted 7 lines
arch/powerpc/kernel/head_32.S +7
-0+#ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO +setup_usbgecko_bat: + /* prepare a BAT for early io */ +#if defined(CONFIG_GAMECUBE) + lis r8, 0x0c00 +#elif defined(CONFIG_WII) + lis r8, 0x0d00
Quoted 9 lines
arch/powerpc/kernel/head_32.S setup_cpm_bat: · line 1218
Quoted 3 lines
arch/powerpc/kernel/head_32.S +3
-0+#else +#error Invalid platform for USB Gecko based early debugging. +#endifA kernel with both
CONFIG_WIIandCONFIG_GAMECUBEworks fine on either, right? If so, could you please switch the two #ifs? A dual-platform kernel will be used on a Wii much more likely than on a GC.
Nope, a GameCube kernel currently doesn't work on a Wii and the same the other way around.
But I can make that particular check a runtime check.
The idea would be to enclose that snippet in GAMECUBE_COMMON and check the PVR. If it is a Gekko (a fixed value) then we have a GameCube, otherwise we assume a Wii.
Quoted 11 lines
arch/powerpc/kernel/head_32.S setup_cpm_bat: · line 1225
Quoted 7 lines
arch/powerpc/kernel/head_32.S +7
-0+ /* + * The virtual address used must match the virtual address + * associated to the fixmap entry FIX_EARLY_DEBUG_BASE. + */ + lis r11, 0xfffe /* top 128K */ + ori r8, r8, 0x002a /* uncached, guarded ,rw */ + ori r11, r11, 0x3 /* 128K */I think you should clear Vp since the BAT mapping can survive until after user space is started; it won't hurt to remove it either way. So 2 instead of 3. And put the meaning in the comment :-)
This BAT is re-setup again on MMU_init, way before starting userspace. But I'll make it Vs=1, Vp=0 here too :)
Quoted 3 lines
Looks fine otherwise.
Thanks.
Quoted 4 lines
Segher
Cheers,
Albert
Re: [RFC PATCH v4 2/2] powerpc: gamecube/wii: early debugging using usbgecko
Quoted 16 lines
Quoted 7 lines
Quoted 7 lines
arch/powerpc/kernel/head_32.S +7
-0+#ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO +setup_usbgecko_bat: + /* prepare a BAT for early io */ +#if defined(CONFIG_GAMECUBE) + lis r8, 0x0c00 +#elif defined(CONFIG_WII) + lis r8, 0x0d00Quoted 8 lines
arch/powerpc/kernel/head_32.S setup_cpm_bat: · line 1218
Quoted 3 lines
arch/powerpc/kernel/head_32.S +3
-0+#else +#error Invalid platform for USB Gecko based early debugging. +#endifA kernel with both
CONFIG_WIIandCONFIG_GAMECUBEworks fine on either, right? If so, could you please switch the two #ifs? A dual-platform kernel will be used on a Wii much more likely than on a GC.
Quoted 2 lines
Nope, a GameCube kernel currently doesn't work on a Wii and the same the other way around.
What is the problem, just the wrappers?
Quoted 1 line
But I can make that particular check a runtime check.
Nah, don't bother, this is just early debug stuff.
Quoted 2 lines
The idea would be to enclose that snippet in
GAMECUBE_COMMONand check the PVR.
Ugly!
Segher
Re: [RFC PATCH v4 1/2] powerpc: reserve fixmap entries for early debug
In reply to Albert HerranzQuoted 7 lines · Albert Herranz
Add a set of entries to the fixmap table to allow usage of known reserved virtual address space by early debug code.
The address space reserved is the top 128K of the 32-bit address space. This allows, if required, the use of a BAT to do the mappings.
Signed-off-by Albert Herranz <[email protected]>
That will do for now. I have ideas to clean it up a bit but for now it's fine.
Quoted 18 lines
--- arch/powerpc/include/asm/fixmap.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)arch/powerpc/include/asm/fixmap.h +3
-0@@ -44,6 +44,9 @@*/ enum fixed_addresses {FIX_HOLE , +/* reserve the top 128K for early debugging purposes */ +FIX_EARLY_DEBUG_TOP =FIX_HOLE , +FIX_EARLY_DEBUG_BASE =FIX_EARLY_DEBUG_TOP +((128 *1024 )/PAGE_SIZE )-1 ,#ifdef CONFIG_HIGHMEM FIX_KMAP_BEGIN ,/* reserved pte's for temporary kernel mappings */ FIX_KMAP_END =FIX_KMAP_BEGIN +(KM_TYPE_NR *NR_CPUS )-1 ,
Re: [RFC PATCH v4 2/2] powerpc: gamecube/wii: early debugging using usbgecko
In reply to Albert HerranzQuoted 6 lines · Albert Herranz
Add support for using the USB Gecko adapter as an early debugging console on the Nintendo GameCube and Wii video game consoles. The USB Gecko is a 3rd party memory card interface adapter that provides a EXI (External Interface) to USB serial converter.
Signed-off-by Albert Herranz <[email protected]>
Quoted 178 lines
--- arch/powerpc/Kconfig.debug | 8 +++ arch/powerpc/include/asm/udbg.h | 1 + arch/powerpc/kernel/head_32.S | 25 +++++++++ arch/powerpc/kernel/udbg.c | 2 + arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c | 56 ++++++++++++++++++++ arch/powerpc/platforms/embedded6xx/usbgecko_udbg.h | 2 + 6 files changed, 94 insertions(+), 0 deletions(-)arch/powerpc/Kconfig.debug +8
-0@@ -254,6 +254,14 @@ config PPC_EARLY_DEBUG_CPM using a CPM-based serial port. This assumes that the bootwrapper has run, and set up the CPM in a particular way. +config PPC_EARLY_DEBUG_USBGECKO + bool "Early debugging through the USB Gecko adapter" + depends on GAMECUBE_COMMON + select USBGECKO_UDBG + help + Select this to enable early debugging for Nintendo GameCube/Wii + consoles via an external USB Gecko adapter. + endchoice config PPC_EARLY_DEBUG_44x_PHYSLOWarch/powerpc/include/asm/udbg.h +1
-0@@ -51,6 +51,7 @@ extern void __init udbg_init_btext(void);extern void __init udbg_init_44x_as1 (void );extern void __init udbg_init_40x_realmode (void );extern void __init udbg_init_cpm (void ); +extern void __init udbg_init_usbgecko (void );#endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_UDBG_H */ arch/powerpc/kernel/head_32.S +25
-0@@ -164,6 +164,9 @@ __after_mmu_off: #ifdef CONFIG_PPC_EARLY_DEBUG_CPM bl setup_cpm_bat #endif +#ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO + bl setup_usbgecko_bat +#endif /* * Call setup_cpu for CPU 0 and initialize 6xx Idle@@ -1203,6 +1206,28 @@ setup_cpm_bat: blr #endif +#ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO +setup_usbgecko_bat: + /* prepare a BAT for early io */ +#if defined(CONFIG_GAMECUBE) + lis r8, 0x0c00 +#elif defined(CONFIG_WII) + lis r8, 0x0d00 +#else +#error Invalid platform for USB Gecko based early debugging. +#endif + /* + * The virtual address used must match the virtual address + * associated to the fixmap entry FIX_EARLY_DEBUG_BASE. + */ + lis r11, 0xfffe /* top 128K */ + ori r8, r8, 0x002a /* uncached, guarded ,rw */ + ori r11, r11, 0x3 /* 128K */ + mtspr SPRN_DBAT1L, r8 + mtspr SPRN_DBAT1U, r11 + blr +#endif + #ifdef CONFIG_8260 /* Jump into the system reset for the rom. * We first disable the MMU, and then jump to the ROM reset address.arch/powerpc/kernel/udbg.c +2
-0@@ -60,6 +60,8 @@ void __init udbg_early_init(void)udbg_init_40x_realmode ();#elif defined(CONFIG_PPC_EARLY_DEBUG_CPM )udbg_init_cpm (); +#elif defined(CONFIG_PPC_EARLY_DEBUG_USBGECKO ) +udbg_init_usbgecko ();#endif #ifdef CONFIG_PPC_EARLY_DEBUG arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c +56
-0@@ -17,6 +17,7 @@#include <asm/io.h> #include <asm/prom.h> #include <asm/udbg.h> +#include <asm/fixmap.h> #include "usbgecko_udbg.h" @@ -270,3 +271,58 @@ done:of_node_put (np);return ; } + +#ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO + +static phys_addr_t __init ug_early_grab_io_addr (void ) +{ +#if defined(CONFIG_GAMECUBE ) +return 0x0c000000 ; +#elif defined(CONFIG_WII ) +return 0x0d000000 ; +#else +#error Invalid platform for USB Gecko based early debugging. +#endif +} + +/* +* USB Gecko early debug support initialization for udbg. +*/ +void __init udbg_init_usbgecko (void ) +{ +void __iomem *early_debug_area; +void __iomem *exi_io_base; + +/* +* At this point we have a BAT already setup that enables I/O +* to the EXI hardware. +* +* The BAT uses a virtual address range reserved at the fixmap. +* This must match the virtual address configured in +* head_32.S:setup_usbgecko_bat(). +*/ + early_debug_area = (void __iomem *)__fix_to_virt (FIX_EARLY_DEBUG_BASE ); + exi_io_base = early_debug_area +0x00006800 ; + +/* try to detect a USB Gecko */ +if (!ug_udbg_probe (exi_io_base)) +return ; + +/* we found a USB Gecko, load udbg hooks */ + udbg_putc = ug_udbg_putc; + udbg_getc = ug_udbg_getc; + udbg_getc_poll = ug_udbg_getc_poll; + +/* +* Prepare again the same BAT for MMU_init. +* This allows udbg I/O to continue working after the MMU is +* turned on for real. +* It is safe to continue using the same virtual address as it is +* a reserved fixmap area. +*/ +setbat (1 , (unsigned long )early_debug_area, +ug_early_grab_io_addr (),128 *1024 ,PAGE_KERNEL_NCG ); +} + +#endif /* CONFIG_PPC_EARLY_DEBUG_USBGECKO */ +arch/powerpc/platforms/embedded6xx/usbgecko_udbg.h +2
-0@@ -27,4 +27,6 @@ static inline void __init ug_udbg_init(void)#endif /* CONFIG_USBGECKO_UDBG */ +void __init udbg_init_usbgecko (void ); +#endif /* __USBGECKO_UDBG_H */