| Message ID | 1258927311-4340-2-git-send-email-albert_herranz@yahoo.es (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On Sun, Nov 22, 2009 at 3:01 PM, Albert Herranz <albert_herranz@yahoo.es> wrote: > Add support for using the USB Gecko adapter as a bootwrapper 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> Acked-by: Grant Likely <grant.likely@secretlab.ca> > --- > arch/powerpc/boot/Makefile | 2 +- > arch/powerpc/boot/ugecon.c | 128 ++++++++++++++++++++++++++++++++++++++++++++ > arch/powerpc/boot/ugecon.h | 25 +++++++++ > 3 files changed, 154 insertions(+), 1 deletions(-) > create mode 100644 arch/powerpc/boot/ugecon.c > create mode 100644 arch/powerpc/boot/ugecon.h > > diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile > index 7bfc8ad..44bce21 100644 > --- a/arch/powerpc/boot/Makefile > +++ b/arch/powerpc/boot/Makefile > @@ -66,7 +66,7 @@ src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \ > gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \ > 4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \ > cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \ > - fsl-soc.c mpc8xx.c pq2.c > + fsl-soc.c mpc8xx.c pq2.c ugecon.c > src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \ > cuboot-ebony.c cuboot-hotfoot.c treeboot-ebony.c prpmc2800.c \ > ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \ > diff --git a/arch/powerpc/boot/ugecon.c b/arch/powerpc/boot/ugecon.c > new file mode 100644 > index 0000000..704f374 > --- /dev/null > +++ b/arch/powerpc/boot/ugecon.c > @@ -0,0 +1,128 @@ > +/* > + * arch/powerpc/boot/ugecon.c > + * > + * USB Gecko bootwrapper console. > + * Copyright (C) 2008-2009 The GameCube Linux Team > + * Copyright (C) 2008,2009 Albert Herranz > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * as published by the Free Software Foundation; either version 2 > + * of the License, or (at your option) any later version. > + * > + */ > + > +#include <stddef.h> > +#include "stdio.h" > +#include "types.h" > +#include "io.h" > +#include "ops.h" > + > + > +#define EXI_CLK_32MHZ 5 > + > +#define EXI_CSR 0x00 > +#define EXI_CSR_CLKMASK (0x7<<4) > +#define EXI_CSR_CLK_32MHZ (EXI_CLK_32MHZ<<4) > +#define EXI_CSR_CSMASK (0x7<<7) > +#define EXI_CSR_CS_0 (0x1<<7) /* Chip Select 001 */ > + > +#define EXI_CR 0x0c > +#define EXI_CR_TSTART (1<<0) > +#define EXI_CR_WRITE (1<<2) > +#define EXI_CR_READ_WRITE (2<<2) > +#define EXI_CR_TLEN(len) (((len)-1)<<4) > + > +#define EXI_DATA 0x10 > + > + > +/* virtual address base for input/output, retrieved from device tree */ > +static void *ug_io_base; > + > + > +static u32 ug_io_transaction(u32 in) > +{ > + u32 *csr_reg = ug_io_base + EXI_CSR; > + u32 *data_reg = ug_io_base + EXI_DATA; > + u32 *cr_reg = ug_io_base + EXI_CR; > + u32 csr, data, cr; > + > + /* select */ > + csr = EXI_CSR_CLK_32MHZ | EXI_CSR_CS_0; > + out_be32(csr_reg, csr); > + > + /* read/write */ > + data = in; > + out_be32(data_reg, data); > + cr = EXI_CR_TLEN(2) | EXI_CR_READ_WRITE | EXI_CR_TSTART; > + out_be32(cr_reg, cr); > + > + while (in_be32(cr_reg) & EXI_CR_TSTART) > + barrier(); > + > + /* deselect */ > + out_be32(csr_reg, 0); > + > + data = in_be32(data_reg); > + return data; > +} > + > +static int ug_is_txfifo_ready(void) > +{ > + return ug_io_transaction(0xc0000000) & 0x04000000; > +} > + > +static void ug_raw_putc(char ch) > +{ > + ug_io_transaction(0xb0000000 | (ch << 20)); > +} > + > +static void ug_putc(char ch) > +{ > + int count = 16; > + > + if (!ug_io_base) > + return; > + > + while (!ug_is_txfifo_ready() && count--) > + barrier(); > + if (count) > + ug_raw_putc(ch); > +} > + > +void ug_console_write(const char *buf, int len) > +{ > + char *b = (char *)buf; > + > + while (len--) { > + if (*b == '\n') > + ug_putc('\r'); > + ug_putc(*b++); > + } > +} > + > +int ug_is_adapter_present(void) > +{ > + if (!ug_io_base) > + return 0; > + > + return ug_io_transaction(0x90000000) == 0x04700000; > +} > + > +int ug_grab_io_base(void) > +{ > + u32 v; > + void *devp; > + > + devp = find_node_by_alias("ugecon"); > + if (devp == NULL) > + goto err_out; > + if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v)) > + goto err_out; > + > + ug_io_base = (u8 *)v; > + return 0; > + > +err_out: > + return -1; > +} > diff --git a/arch/powerpc/boot/ugecon.h b/arch/powerpc/boot/ugecon.h > new file mode 100644 > index 0000000..1fdb590 > --- /dev/null > +++ b/arch/powerpc/boot/ugecon.h > @@ -0,0 +1,25 @@ > +/* > + * arch/powerpc/boot/ugecon.h > + * > + * USB Gecko early bootwrapper console. > + * Copyright (C) 2008-2009 The GameCube Linux Team > + * Copyright (C) 2008,2009 Albert Herranz > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * as published by the Free Software Foundation; either version 2 > + * of the License, or (at your option) any later version. > + * > + */ > + > +#ifndef __UGECON_H > +#define __UGECON_H > + > +extern int ug_grab_io_base(void); > +extern int ug_is_adapter_present(void); > + > +extern void ug_putc(char ch); > +extern void ug_console_write(const char *buf, int len); > + > +#endif /* __UGECON_H */ > + > -- > 1.6.3.3 > > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/linuxppc-dev >
On Sun, 2009-11-22 at 23:01 +0100, Albert Herranz wrote: > Add support for using the USB Gecko adapter as a bootwrapper 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. Looks good. Not sure yet when I'll merge these, I might wait a bit for the dust to settle but I may also just stick some of the simple/obvious patches in early like this one to make things easier. Cheers, Ben. > Signed-off-by: Albert Herranz <albert_herranz@yahoo.es> > --- > arch/powerpc/boot/Makefile | 2 +- > arch/powerpc/boot/ugecon.c | 128 ++++++++++++++++++++++++++++++++++++++++++++ > arch/powerpc/boot/ugecon.h | 25 +++++++++ > 3 files changed, 154 insertions(+), 1 deletions(-) > create mode 100644 arch/powerpc/boot/ugecon.c > create mode 100644 arch/powerpc/boot/ugecon.h > > diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile > index 7bfc8ad..44bce21 100644 > --- a/arch/powerpc/boot/Makefile > +++ b/arch/powerpc/boot/Makefile > @@ -66,7 +66,7 @@ src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \ > gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \ > 4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \ > cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \ > - fsl-soc.c mpc8xx.c pq2.c > + fsl-soc.c mpc8xx.c pq2.c ugecon.c > src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \ > cuboot-ebony.c cuboot-hotfoot.c treeboot-ebony.c prpmc2800.c \ > ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \ > diff --git a/arch/powerpc/boot/ugecon.c b/arch/powerpc/boot/ugecon.c > new file mode 100644 > index 0000000..704f374 > --- /dev/null > +++ b/arch/powerpc/boot/ugecon.c > @@ -0,0 +1,128 @@ > +/* > + * arch/powerpc/boot/ugecon.c > + * > + * USB Gecko bootwrapper console. > + * Copyright (C) 2008-2009 The GameCube Linux Team > + * Copyright (C) 2008,2009 Albert Herranz > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * as published by the Free Software Foundation; either version 2 > + * of the License, or (at your option) any later version. > + * > + */ > + > +#include <stddef.h> > +#include "stdio.h" > +#include "types.h" > +#include "io.h" > +#include "ops.h" > + > + > +#define EXI_CLK_32MHZ 5 > + > +#define EXI_CSR 0x00 > +#define EXI_CSR_CLKMASK (0x7<<4) > +#define EXI_CSR_CLK_32MHZ (EXI_CLK_32MHZ<<4) > +#define EXI_CSR_CSMASK (0x7<<7) > +#define EXI_CSR_CS_0 (0x1<<7) /* Chip Select 001 */ > + > +#define EXI_CR 0x0c > +#define EXI_CR_TSTART (1<<0) > +#define EXI_CR_WRITE (1<<2) > +#define EXI_CR_READ_WRITE (2<<2) > +#define EXI_CR_TLEN(len) (((len)-1)<<4) > + > +#define EXI_DATA 0x10 > + > + > +/* virtual address base for input/output, retrieved from device tree */ > +static void *ug_io_base; > + > + > +static u32 ug_io_transaction(u32 in) > +{ > + u32 *csr_reg = ug_io_base + EXI_CSR; > + u32 *data_reg = ug_io_base + EXI_DATA; > + u32 *cr_reg = ug_io_base + EXI_CR; > + u32 csr, data, cr; > + > + /* select */ > + csr = EXI_CSR_CLK_32MHZ | EXI_CSR_CS_0; > + out_be32(csr_reg, csr); > + > + /* read/write */ > + data = in; > + out_be32(data_reg, data); > + cr = EXI_CR_TLEN(2) | EXI_CR_READ_WRITE | EXI_CR_TSTART; > + out_be32(cr_reg, cr); > + > + while (in_be32(cr_reg) & EXI_CR_TSTART) > + barrier(); > + > + /* deselect */ > + out_be32(csr_reg, 0); > + > + data = in_be32(data_reg); > + return data; > +} > + > +static int ug_is_txfifo_ready(void) > +{ > + return ug_io_transaction(0xc0000000) & 0x04000000; > +} > + > +static void ug_raw_putc(char ch) > +{ > + ug_io_transaction(0xb0000000 | (ch << 20)); > +} > + > +static void ug_putc(char ch) > +{ > + int count = 16; > + > + if (!ug_io_base) > + return; > + > + while (!ug_is_txfifo_ready() && count--) > + barrier(); > + if (count) > + ug_raw_putc(ch); > +} > + > +void ug_console_write(const char *buf, int len) > +{ > + char *b = (char *)buf; > + > + while (len--) { > + if (*b == '\n') > + ug_putc('\r'); > + ug_putc(*b++); > + } > +} > + > +int ug_is_adapter_present(void) > +{ > + if (!ug_io_base) > + return 0; > + > + return ug_io_transaction(0x90000000) == 0x04700000; > +} > + > +int ug_grab_io_base(void) > +{ > + u32 v; > + void *devp; > + > + devp = find_node_by_alias("ugecon"); > + if (devp == NULL) > + goto err_out; > + if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v)) > + goto err_out; > + > + ug_io_base = (u8 *)v; > + return 0; > + > +err_out: > + return -1; > +} > diff --git a/arch/powerpc/boot/ugecon.h b/arch/powerpc/boot/ugecon.h > new file mode 100644 > index 0000000..1fdb590 > --- /dev/null > +++ b/arch/powerpc/boot/ugecon.h > @@ -0,0 +1,25 @@ > +/* > + * arch/powerpc/boot/ugecon.h > + * > + * USB Gecko early bootwrapper console. > + * Copyright (C) 2008-2009 The GameCube Linux Team > + * Copyright (C) 2008,2009 Albert Herranz > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * as published by the Free Software Foundation; either version 2 > + * of the License, or (at your option) any later version. > + * > + */ > + > +#ifndef __UGECON_H > +#define __UGECON_H > + > +extern int ug_grab_io_base(void); > +extern int ug_is_adapter_present(void); > + > +extern void ug_putc(char ch); > +extern void ug_console_write(const char *buf, int len); > + > +#endif /* __UGECON_H */ > +
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 7bfc8ad..44bce21 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -66,7 +66,7 @@ src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \ gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \ 4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \ cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \ - fsl-soc.c mpc8xx.c pq2.c + fsl-soc.c mpc8xx.c pq2.c ugecon.c src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \ cuboot-ebony.c cuboot-hotfoot.c treeboot-ebony.c prpmc2800.c \ ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \ diff --git a/arch/powerpc/boot/ugecon.c b/arch/powerpc/boot/ugecon.c new file mode 100644 index 0000000..704f374 --- /dev/null +++ b/arch/powerpc/boot/ugecon.c @@ -0,0 +1,128 @@ +/* + * arch/powerpc/boot/ugecon.c + * + * USB Gecko bootwrapper console. + * Copyright (C) 2008-2009 The GameCube Linux Team + * Copyright (C) 2008,2009 Albert Herranz + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + */ + +#include <stddef.h> +#include "stdio.h" +#include "types.h" +#include "io.h" +#include "ops.h" + + +#define EXI_CLK_32MHZ 5 + +#define EXI_CSR 0x00 +#define EXI_CSR_CLKMASK (0x7<<4) +#define EXI_CSR_CLK_32MHZ (EXI_CLK_32MHZ<<4) +#define EXI_CSR_CSMASK (0x7<<7) +#define EXI_CSR_CS_0 (0x1<<7) /* Chip Select 001 */ + +#define EXI_CR 0x0c +#define EXI_CR_TSTART (1<<0) +#define EXI_CR_WRITE (1<<2) +#define EXI_CR_READ_WRITE (2<<2) +#define EXI_CR_TLEN(len) (((len)-1)<<4) + +#define EXI_DATA 0x10 + + +/* virtual address base for input/output, retrieved from device tree */ +static void *ug_io_base; + + +static u32 ug_io_transaction(u32 in) +{ + u32 *csr_reg = ug_io_base + EXI_CSR; + u32 *data_reg = ug_io_base + EXI_DATA; + u32 *cr_reg = ug_io_base + EXI_CR; + u32 csr, data, cr; + + /* select */ + csr = EXI_CSR_CLK_32MHZ | EXI_CSR_CS_0; + out_be32(csr_reg, csr); + + /* read/write */ + data = in; + out_be32(data_reg, data); + cr = EXI_CR_TLEN(2) | EXI_CR_READ_WRITE | EXI_CR_TSTART; + out_be32(cr_reg, cr); + + while (in_be32(cr_reg) & EXI_CR_TSTART) + barrier(); + + /* deselect */ + out_be32(csr_reg, 0); + + data = in_be32(data_reg); + return data; +} + +static int ug_is_txfifo_ready(void) +{ + return ug_io_transaction(0xc0000000) & 0x04000000; +} + +static void ug_raw_putc(char ch) +{ + ug_io_transaction(0xb0000000 | (ch << 20)); +} + +static void ug_putc(char ch) +{ + int count = 16; + + if (!ug_io_base) + return; + + while (!ug_is_txfifo_ready() && count--) + barrier(); + if (count) + ug_raw_putc(ch); +} + +void ug_console_write(const char *buf, int len) +{ + char *b = (char *)buf; + + while (len--) { + if (*b == '\n') + ug_putc('\r'); + ug_putc(*b++); + } +} + +int ug_is_adapter_present(void) +{ + if (!ug_io_base) + return 0; + + return ug_io_transaction(0x90000000) == 0x04700000; +} + +int ug_grab_io_base(void) +{ + u32 v; + void *devp; + + devp = find_node_by_alias("ugecon"); + if (devp == NULL) + goto err_out; + if (getprop(devp, "virtual-reg", &v, sizeof(v)) != sizeof(v)) + goto err_out; + + ug_io_base = (u8 *)v; + return 0; + +err_out: + return -1; +} diff --git a/arch/powerpc/boot/ugecon.h b/arch/powerpc/boot/ugecon.h new file mode 100644 index 0000000..1fdb590 --- /dev/null +++ b/arch/powerpc/boot/ugecon.h @@ -0,0 +1,25 @@ +/* + * arch/powerpc/boot/ugecon.h + * + * USB Gecko early bootwrapper console. + * Copyright (C) 2008-2009 The GameCube Linux Team + * Copyright (C) 2008,2009 Albert Herranz + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + */ + +#ifndef __UGECON_H +#define __UGECON_H + +extern int ug_grab_io_base(void); +extern int ug_is_adapter_present(void); + +extern void ug_putc(char ch); +extern void ug_console_write(const char *buf, int len); + +#endif /* __UGECON_H */ +
Add support for using the USB Gecko adapter as a bootwrapper 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/boot/Makefile | 2 +- arch/powerpc/boot/ugecon.c | 128 ++++++++++++++++++++++++++++++++++++++++++++ arch/powerpc/boot/ugecon.h | 25 +++++++++ 3 files changed, 154 insertions(+), 1 deletions(-) create mode 100644 arch/powerpc/boot/ugecon.c create mode 100644 arch/powerpc/boot/ugecon.h