From: Albert Herranz <albert_herranz@yahoo.es>
To: linuxppc-dev@lists.ozlabs.org
Cc: Albert Herranz <albert_herranz@yahoo.es>
Subject: [RFC PATCH 10/19] powerpc: gamecube/wii: early debugging using usbgecko
Date: Sun, 22 Nov 2009 23:01:41 +0100 [thread overview]
Message-ID: <1258927311-4340-11-git-send-email-albert_herranz@yahoo.es> (raw)
In-Reply-To: <1258927311-4340-10-git-send-email-albert_herranz@yahoo.es>
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 <albert_herranz@yahoo.es>
---
arch/powerpc/Kconfig.debug | 8 +++++
arch/powerpc/include/asm/udbg.h | 1 +
arch/powerpc/kernel/head_32.S | 21 ++++++++++++
arch/powerpc/kernel/udbg.c | 2 +
arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c | 33 ++++++++++++++++++++
arch/powerpc/platforms/embedded6xx/usbgecko_udbg.h | 6 +++
6 files changed, 71 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 3b10051..11e385b 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -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
diff --git a/arch/powerpc/include/asm/udbg.h b/arch/powerpc/include/asm/udbg.h
index cd21e5e..11ae699 100644
--- a/arch/powerpc/include/asm/udbg.h
+++ b/arch/powerpc/include/asm/udbg.h
@@ -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 */
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 829c3fe..83a0b79 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -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,24 @@ setup_cpm_bat:
blr
#endif
+#ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO
+setup_usbgecko_bat:
+ /* prepare a BAT for early io */
+ lis r8, 0x0c00
+ ori r8, r8, 0x002a /* uncached, guarded ,rw */
+ lis r11, 0xcc00
+ ori r11, r11, 0x3 /* 128K */
+#ifdef CONFIG_WII
+ oris r8, r8, 0x0100
+ oris r11, r11, 0x0100
+#endif
+ mtspr SPRN_DBAT1L, r8
+ mtspr SPRN_DBAT1U, r11
+ sync
+ isync
+ 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.
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c
index fc9af47..e39cad8 100644
--- a/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
@@ -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
diff --git a/arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c b/arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c
index 49f86e8..9f5e7ed 100644
--- a/arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c
+++ b/arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c
@@ -234,6 +234,9 @@ void __init ug_udbg_init(void)
struct device_node *stdout;
const char *path;
+ if (ug_io_base)
+ udbg_printf("%s: early -> final\n", __func__);
+
if (!of_chosen) {
udbg_printf("%s: missing of_chosen\n", __func__);
goto done;
@@ -283,3 +286,33 @@ done:
of_node_put(np);
return;
}
+
+#ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO
+
+/*
+ * USB Gecko early debug support initialization for udbg.
+ *
+ */
+void __init udbg_init_usbgecko(void)
+{
+ unsigned long vaddr, paddr;
+
+#if defined(CONFIG_GAMECUBE)
+ paddr = 0x0c000000;
+#elif defined(CONFIG_WII)
+ paddr = 0x0d000000;
+#else
+#error Invalid platform for USB Gecko based early debugging.
+#endif
+
+ vaddr = 0xc0000000 | paddr;
+ setbat(1, vaddr, paddr, 128*1024, PAGE_KERNEL_NCG);
+
+ ug_io_base = (void __iomem *)(vaddr | 0x6814);
+
+ udbg_putc = ug_udbg_putc;
+ udbg_getc = ug_udbg_getc;
+ udbg_getc_poll = ug_udbg_getc_poll;
+}
+
+#endif /* CONFIG_PPC_EARLY_DEBUG_USBGECKO */
diff --git a/arch/powerpc/platforms/embedded6xx/usbgecko_udbg.h b/arch/powerpc/platforms/embedded6xx/usbgecko_udbg.h
index 3929de3..98034ee 100644
--- a/arch/powerpc/platforms/embedded6xx/usbgecko_udbg.h
+++ b/arch/powerpc/platforms/embedded6xx/usbgecko_udbg.h
@@ -27,4 +27,10 @@ static inline void __init ug_udbg_init(void)
#endif /* CONFIG_USBGECKO_UDBG */
+#ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO
+
+void __init udbg_init_usbgecko(void);
+
+#endif /* CONFIG_PPC_EARLY_DEBUG_USBGECKO */
+
#endif /* __USBGECKO_UDBG_H */
--
1.6.3.3
next prev parent reply other threads:[~2009-11-22 22:02 UTC|newest]
Thread overview: 181+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-22 22:01 [RFC PATCH 00/19] powerpc: nintendo gamecube and wii support Albert Herranz
2009-11-22 22:01 ` [RFC PATCH 01/19] powerpc: gamecube/wii: usbgecko bootwrapper console support Albert Herranz
2009-11-22 22:01 ` [RFC PATCH 02/19] powerpc: gamecube: device tree Albert Herranz
2009-11-22 22:01 ` [RFC PATCH 03/19] powerpc: gamecube: bootwrapper bits Albert Herranz
2009-11-22 22:01 ` [RFC PATCH 04/19] powerpc: wii: device tree Albert Herranz
2009-11-22 22:01 ` [RFC PATCH 05/19] powerpc: wii: bootwrapper bits Albert Herranz
2009-11-22 22:01 ` [RFC PATCH 06/19] powerpc: gamecube/wii: introduce GAMECUBE_COMMON Albert Herranz
2009-11-22 22:01 ` [RFC PATCH 07/19] powerpc: gamecube/wii: declare as non-coherent platforms Albert Herranz
2009-11-22 22:01 ` [RFC PATCH 08/19] powerpc: gamecube/wii: do not include PCI support Albert Herranz
2009-11-22 22:01 ` [RFC PATCH 09/19] powerpc: gamecube/wii: udbg support for usbgecko Albert Herranz
2009-11-22 22:01 ` Albert Herranz [this message]
2009-11-22 22:01 ` [RFC PATCH 11/19] powerpc: gamecube/wii: flipper interrupt controller support Albert Herranz
2009-11-22 22:01 ` [RFC PATCH 12/19] powerpc: gamecube: platform support Albert Herranz
2009-11-22 22:01 ` [RFC PATCH 13/19] powerpc: gamecube: default config Albert Herranz
2009-11-22 22:01 ` [RFC PATCH 14/19] powerpc: allow ioremap within reserved fake ram regions Albert Herranz
2009-11-22 22:01 ` [RFC PATCH 15/19] powerpc: broadway processor support Albert Herranz
2009-11-22 22:01 ` [RFC PATCH 16/19] powerpc: wii: hollywood interrupt controller support Albert Herranz
2009-11-22 22:01 ` [RFC PATCH 17/19] powerpc: wii: bootmii starlet 'mini' firmware support Albert Herranz
2009-11-22 22:01 ` [RFC PATCH 18/19] powerpc: wii: platform support Albert Herranz
2009-11-22 22:01 ` [RFC PATCH 19/19] powerpc: wii: default config Albert Herranz
2009-11-22 23:45 ` [RFC PATCH 18/19] powerpc: wii: platform support Grant Likely
2009-11-23 20:21 ` Albert Herranz
2009-11-24 22:24 ` Segher Boessenkool
2009-11-25 17:58 ` Albert Herranz
2009-11-26 22:05 ` Segher Boessenkool
2009-11-22 22:48 ` [RFC PATCH 17/19] powerpc: wii: bootmii starlet 'mini' firmware support Arnd Bergmann
2009-11-23 19:21 ` Albert Herranz
2009-11-24 22:13 ` Segher Boessenkool
2009-11-25 17:47 ` Albert Herranz
2009-11-26 22:00 ` Segher Boessenkool
2009-11-22 23:40 ` [RFC PATCH 16/19] powerpc: wii: hollywood interrupt controller support Grant Likely
2009-11-23 20:18 ` Albert Herranz
2009-11-24 21:54 ` Segher Boessenkool
2009-11-25 17:27 ` Albert Herranz
2009-11-26 5:23 ` Benjamin Herrenschmidt
2009-11-26 15:42 ` Albert Herranz
2009-11-26 21:13 ` Benjamin Herrenschmidt
2009-11-26 23:03 ` Segher Boessenkool
2009-11-22 23:38 ` [RFC PATCH 15/19] powerpc: broadway processor support Grant Likely
2009-11-23 20:16 ` Albert Herranz
2009-11-22 23:36 ` [RFC PATCH 14/19] powerpc: allow ioremap within reserved fake ram regions Grant Likely
2009-11-23 20:16 ` Albert Herranz
2009-11-23 20:41 ` Grant Likely
2009-11-23 23:45 ` Michael Ellerman
2009-11-24 17:09 ` Albert Herranz
2009-11-25 0:38 ` Michael Ellerman
2009-11-26 5:22 ` Benjamin Herrenschmidt
2009-11-26 15:35 ` Albert Herranz
2009-11-26 21:13 ` Benjamin Herrenschmidt
2009-11-22 23:34 ` [RFC PATCH 12/19] powerpc: gamecube: platform support Grant Likely
2009-11-23 20:02 ` Albert Herranz
2009-11-24 21:39 ` Segher Boessenkool
2009-11-25 17:24 ` Albert Herranz
2009-11-26 21:53 ` Segher Boessenkool
2009-11-26 22:07 ` Albert Herranz
2009-11-27 0:09 ` Segher Boessenkool
2009-11-27 21:35 ` Benjamin Herrenschmidt
2009-11-28 3:56 ` Grant Likely
2009-11-28 3:56 ` Grant Likely
2009-11-22 23:28 ` [RFC PATCH 11/19] powerpc: gamecube/wii: flipper interrupt controller support Grant Likely
2009-11-23 19:59 ` Albert Herranz
2009-11-26 5:18 ` Benjamin Herrenschmidt
2009-11-26 15:33 ` Albert Herranz
2009-11-26 21:12 ` Benjamin Herrenschmidt
2009-11-26 23:00 ` Segher Boessenkool
2009-11-26 23:38 ` Benjamin Herrenschmidt
2009-11-24 21:30 ` Segher Boessenkool
2009-11-25 17:13 ` Albert Herranz
2009-11-26 21:52 ` Segher Boessenkool
2009-11-26 22:05 ` Albert Herranz
2009-11-27 0:06 ` Segher Boessenkool
2009-11-27 12:17 ` Segher Boessenkool
2009-11-27 17:27 ` Albert Herranz
2009-11-27 21:34 ` Benjamin Herrenschmidt
2009-11-28 2:04 ` Segher Boessenkool
2009-11-28 2:26 ` Benjamin Herrenschmidt
2009-11-26 5:18 ` Benjamin Herrenschmidt
2009-11-26 15:30 ` Albert Herranz
2009-11-26 21:10 ` Benjamin Herrenschmidt
2009-11-22 22:27 ` [RFC PATCH 10/19] powerpc: gamecube/wii: early debugging using usbgecko Arnd Bergmann
2009-11-23 19:10 ` Albert Herranz
2009-11-23 22:13 ` Arnd Bergmann
2009-11-26 5:14 ` Benjamin Herrenschmidt
2009-11-26 22:54 ` Segher Boessenkool
2009-11-26 23:27 ` Benjamin Herrenschmidt
2009-11-24 0:54 ` Segher Boessenkool
2009-11-24 18:19 ` Albert Herranz
2009-11-22 23:22 ` [RFC PATCH 09/19] powerpc: gamecube/wii: udbg support for usbgecko Grant Likely
2009-11-24 0:49 ` Segher Boessenkool
2009-11-24 18:08 ` Albert Herranz
2009-11-24 21:19 ` Segher Boessenkool
2009-11-25 17:07 ` Albert Herranz
2009-11-26 5:12 ` Benjamin Herrenschmidt
2009-11-26 15:28 ` Albert Herranz
2009-11-26 21:02 ` Benjamin Herrenschmidt
2009-11-26 23:12 ` Segher Boessenkool
2009-11-22 23:21 ` [RFC PATCH 08/19] powerpc: gamecube/wii: do not include PCI support Grant Likely
2009-11-26 5:10 ` Benjamin Herrenschmidt
2009-11-22 22:20 ` [RFC PATCH 07/19] powerpc: gamecube/wii: declare as non-coherent platforms Arnd Bergmann
2009-11-23 19:06 ` Albert Herranz
2009-11-26 5:09 ` Benjamin Herrenschmidt
2009-11-22 23:20 ` [RFC PATCH 06/19] powerpc: gamecube/wii: introduce GAMECUBE_COMMON Grant Likely
2009-11-23 19:56 ` Albert Herranz
2009-11-24 0:35 ` Segher Boessenkool
2009-11-24 18:03 ` Albert Herranz
2009-11-24 21:15 ` Segher Boessenkool
2009-11-24 22:33 ` Arnd Bergmann
2009-11-25 17:06 ` Albert Herranz
2009-11-26 5:08 ` Benjamin Herrenschmidt
2009-11-26 15:22 ` Albert Herranz
2009-11-27 12:12 ` Segher Boessenkool
2009-11-22 23:19 ` [RFC PATCH 05/19] powerpc: wii: bootwrapper bits Grant Likely
2009-11-24 0:33 ` Segher Boessenkool
2009-11-24 17:56 ` Albert Herranz
2009-11-24 21:13 ` Segher Boessenkool
2009-11-22 23:18 ` [RFC PATCH 04/19] powerpc: wii: device tree Grant Likely
2009-11-23 19:54 ` Albert Herranz
2009-11-23 20:36 ` Grant Likely
2009-11-23 21:55 ` Albert Herranz
2009-11-25 16:57 ` Segher Boessenkool
2009-11-25 18:09 ` Albert Herranz
2009-11-25 17:49 ` Segher Boessenkool
2009-11-25 18:34 ` Albert Herranz
2009-11-26 4:58 ` Benjamin Herrenschmidt
2009-11-26 15:19 ` Albert Herranz
2009-11-26 4:51 ` Benjamin Herrenschmidt
2009-11-26 15:18 ` Albert Herranz
2009-11-26 21:01 ` Benjamin Herrenschmidt
2009-11-26 21:38 ` Albert Herranz
2009-11-26 22:37 ` Benjamin Herrenschmidt
2009-11-27 0:16 ` Segher Boessenkool
2009-11-27 0:15 ` Benjamin Herrenschmidt
2009-11-26 23:25 ` Segher Boessenkool
2009-11-26 22:50 ` Segher Boessenkool
2009-11-26 23:02 ` Albert Herranz
2009-11-26 4:45 ` Benjamin Herrenschmidt
2009-11-26 15:09 ` Albert Herranz
2009-11-26 20:48 ` Benjamin Herrenschmidt
2009-11-26 21:20 ` Albert Herranz
2009-11-26 23:17 ` Segher Boessenkool
2009-11-26 22:45 ` Segher Boessenkool
2009-11-22 23:11 ` [RFC PATCH 03/19] powerpc: gamecube: bootwrapper bits Grant Likely
2009-11-24 0:08 ` Segher Boessenkool
2009-11-24 17:38 ` Albert Herranz
2009-11-24 21:00 ` Segher Boessenkool
2009-11-24 23:45 ` Albert Herranz
2009-11-25 16:53 ` Segher Boessenkool
2009-11-26 4:36 ` Benjamin Herrenschmidt
2009-11-26 8:17 ` Gabriel Paubert
2009-11-26 8:46 ` Benjamin Herrenschmidt
2009-11-26 23:06 ` Segher Boessenkool
2009-11-26 4:35 ` Benjamin Herrenschmidt
2009-11-26 22:23 ` Segher Boessenkool
2009-11-22 23:02 ` [RFC PATCH 02/19] powerpc: gamecube: device tree Grant Likely
2009-11-23 19:44 ` Albert Herranz
2009-11-23 20:19 ` Grant Likely
2009-11-23 20:25 ` Albert Herranz
2009-11-24 22:53 ` Segher Boessenkool
2009-11-26 4:23 ` Benjamin Herrenschmidt
2009-11-27 12:09 ` Segher Boessenkool
2009-11-24 22:36 ` Segher Boessenkool
2009-11-26 4:23 ` Benjamin Herrenschmidt
2009-11-26 22:15 ` Segher Boessenkool
2009-11-26 22:38 ` Benjamin Herrenschmidt
2009-11-27 0:18 ` Segher Boessenkool
2009-11-26 4:21 ` Benjamin Herrenschmidt
2009-11-26 4:38 ` Grant Likely
2009-11-26 5:29 ` Benjamin Herrenschmidt
2009-11-26 5:51 ` Grant Likely
2009-11-26 22:30 ` Segher Boessenkool
2009-11-25 18:00 ` Segher Boessenkool
2009-11-25 18:43 ` Albert Herranz
2009-11-27 12:07 ` Segher Boessenkool
2009-11-26 4:27 ` Benjamin Herrenschmidt
2009-11-26 22:19 ` Segher Boessenkool
2009-11-22 22:50 ` [RFC PATCH 01/19] powerpc: gamecube/wii: usbgecko bootwrapper console support Grant Likely
2009-11-26 4:12 ` Benjamin Herrenschmidt
2009-11-22 22:48 ` [RFC PATCH 00/19] powerpc: nintendo gamecube and wii support Grant Likely
2009-11-22 22:49 ` Arnd Bergmann
2009-11-23 19:22 ` Albert Herranz
2009-11-23 5:13 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1258927311-4340-11-git-send-email-albert_herranz@yahoo.es \
--to=albert_herranz@yahoo.es \
--cc=linuxppc-dev@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).