ohci0 interrupt will be thrown - hooray++ \o/
authortheStack <sebastian.falbesoner@gmail.com>
Mon, 31 Aug 2009 16:44:55 +0000 (18:44 +0200)
committertheStack <sebastian.falbesoner@gmail.com>
Mon, 31 Aug 2009 16:44:55 +0000 (18:44 +0200)
Makefile
main.c
ohci.c [new file with mode: 0644]
ohci.h [new file with mode: 0644]

index 87ff1fc5a68371113cb463f71798ff738bc2be46..7d89ec9b81e6578366ac590c546b85fb4be5793e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,8 @@ TARGET = ppcboot.elf
 
 OBJS = realmode.o crt0.o main.o string.o sync.o time.o printf.o input.o \
        exception.o exception_2200.o malloc.o gecko.o video_low.o \
-       ipc.o mini_ipc.o nandfs.o ff.o diskio.o fat.o font.o console.o
+       ipc.o mini_ipc.o nandfs.o ff.o diskio.o fat.o font.o console.o \
+       ohci.o
 
 include common.mk
 
diff --git a/main.c b/main.c
index 4303241a7430baad434e3d21f297ed5b464043ab..c75712b16c569ba6bec2987d87471b307f0d8e94 100644 (file)
--- a/main.c
+++ b/main.c
@@ -24,6 +24,7 @@ Copyright (C) 2009              John Kelley <wiidev@kelley.ca>
 #include "video_low.h"
 #include "input.h"
 #include "console.h"
+#include "ohci.h"
 
 #define MINIMUM_MINI_VERSION 0x00010001
 
@@ -91,6 +92,7 @@ int main(void)
        gecko_init();
     input_init();
        init_fb(vmode);
+       ohci_init();
 
        VIDEO_Init(vmode);
        VIDEO_SetFrameBuffer(get_xfb());
@@ -115,8 +117,13 @@ int main(void)
 
        printf("bye, world!\n");
 
-       // enable RESET interrupt 
-       write32(0x0c003004, 1<<1);
+       // enable OHCI0 interrupt on hollywood-pic
+#define HW_PPCIRQFLAG (0x0d800030)
+#define HW_PPCIRQMASK (0x0d800034)
+       write32(HW_PPCIRQFLAG, ~0);
+       write32(HW_PPCIRQMASK, 1<<5);
+       // enable RESET and PIC (#14) interrupts on processor interface
+       write32(0x0c003004, (1<<1) | (1<<14));
 #define _CPU_ISR_Enable() \
        { register u32 _val = 0; \
          __asm__ __volatile__ ( \
diff --git a/ohci.c b/ohci.c
new file mode 100644 (file)
index 0000000..4c09c59
--- /dev/null
+++ b/ohci.c
@@ -0,0 +1,144 @@
+/*
+       mini - a Free Software replacement for the Nintendo/BroadOn IOS.
+       ohci hardware support
+
+Copyright (C) 2009     Bernhard Urban <lewurm@gmx.net>
+Copyright (C) 2009     Sebastian Falbesoner <sebastian.falbesoner@gmail.com>
+
+# This code is licensed to you under the terms of the GNU GPL, version 2;
+# see file COPYING or http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+*/
+
+#include "bootmii_ppc.h"
+#include "ohci.h"
+
+#define gecko_printf printf
+#define set32(address, flags) write32(address, read32(address) | flags)
+#define dma_addr(address) (u32)address
+
+/* stolen from libogc - gc/ogc/machine/processor.h */
+#define _CPU_ISR_Disable( _isr_cookie ) \
+  { register u32 _disable_mask = 0; \
+       _isr_cookie = 0; \
+    __asm__ __volatile__ ( \
+         "mfmsr %0\n" \
+         "rlwinm %1,%0,0,17,15\n" \
+         "mtmsr %1\n" \
+         "extrwi %0,%0,1,16" \
+         : "=&r" ((_isr_cookie)), "=&r" ((_disable_mask)) \
+         : "0" ((_isr_cookie)), "1" ((_disable_mask)) \
+       ); \
+  }
+
+#define _CPU_ISR_Restore( _isr_cookie )  \
+  { register u32 _enable_mask = 0; \
+       __asm__ __volatile__ ( \
+    "    cmpwi %0,0\n" \
+       "    beq 1f\n" \
+       "    mfmsr %1\n" \
+       "    ori %1,%1,0x8000\n" \
+       "    mtmsr %1\n" \
+       "1:" \
+       : "=r"((_isr_cookie)),"=&r" ((_enable_mask)) \
+       : "0"((_isr_cookie)),"1" ((_enable_mask)) \
+       ); \
+  }
+
+
+static struct ohci_hcca hcca_oh0;
+
+static void dbg_op_state() {
+       switch (read32(OHCI0_HC_CONTROL) & OHCI_CTRL_HCFS) {
+               case OHCI_USB_SUSPEND:
+                       gecko_printf("ohci-- OHCI_USB_SUSPEND\n");
+                       break;
+               case OHCI_USB_RESET:
+                       gecko_printf("ohci-- OHCI_USB_RESET\n");
+                       break;
+               case OHCI_USB_OPER:
+                       gecko_printf("ohci-- OHCI_USB_OPER\n");
+                       break;
+               case OHCI_USB_RESUME:
+                       gecko_printf("ohci-- OHCI_USB_RESUME\n");
+                       break;
+       }
+}
+
+void ohci_init() {
+       gecko_printf("ohci-- init\n");
+       dbg_op_state();
+       /*
+       u32 i = 0;
+       for(; i <= 0x200; i+=4) {
+               gecko_printf("0x0d050000 + %X: %X\n", i, read32(0x0d050000+i));
+               udelay(10000); //'cause usb gecko is lame
+       }
+       * see output in ohci.default
+       */
+
+       /* enable interrupts of both usb host controllers */
+       set32(EHCI_CTL, EHCI_CTL_OH0INTE | EHCI_CTL_OH1INTE | 0xe0000);
+
+       /* reset HC */
+       set32(OHCI0_HC_COMMAND_STATUS, OHCI_HCR);
+
+       /* wait max. 30us */
+       u32 ts = 30;
+       while ((read32(OHCI0_HC_COMMAND_STATUS) & OHCI_HCR) != 0) {
+               if(--ts == 0) {
+                       gecko_printf("ohci-- FAILED");
+                       return;
+               }
+               udelay(1);
+       }
+
+       /* disable interrupts; 2ms timelimit here! 
+          now we're in the SUSPEND state ... must go OPERATIONAL
+          within 2msec else HC enters RESUME */
+
+
+       //u32 cookie = irq_kill();
+       u32 cookie;
+       _CPU_ISR_Disable(cookie);
+
+
+       /* Tell the controller where the control and bulk lists are
+        * The lists are empty now. */
+       write32(OHCI0_HC_CTRL_HEAD_ED, 0);
+       write32(OHCI0_HC_BULK_HEAD_ED, 0);
+
+       /* set hcca adress */
+       write32(OHCI0_HC_HCCA, dma_addr(&hcca_oh0));
+
+       /* set periodicstart */
+#define FIT (1<<31)
+       u32 fmInterval = read32(OHCI0_HC_FM_INTERVAL) &0x3fff;
+       u32 fit = read32(OHCI0_HC_FM_INTERVAL) & FIT;
+
+       write32(OHCI0_HC_FM_INTERVAL, read32(OHCI0_HC_FM_INTERVAL) | (fit ^ FIT));
+       write32(OHCI0_HC_PERIODIC_START, ((9*fmInterval)/10)&0x3fff);
+
+       /* testing bla */
+       if ((read32(OHCI0_HC_FM_INTERVAL) & 0x3fff0000) == 0 || !read32(OHCI0_HC_PERIODIC_START)) {
+               gecko_printf("ohci-- w00t, fail!! see ohci-hcd.c:669\n");
+       }
+       
+       /* start HC operations */
+       set32(OHCI0_HC_CONTROL, OHCI_CONTROL_INIT | OHCI_USB_OPER);
+
+       /* wake on ConnectStatusChange, matching external hubs */
+       set32(OHCI0_HC_RH_STATUS, RH_HS_DRWE);
+
+       /* Choose the interrupts we care about now, others later on demand */
+       write32(OHCI0_HC_INT_STATUS, ~0);
+       write32(OHCI0_HC_INT_ENABLE, OHCI_INTR_INIT);
+
+
+       //irq_restore(cookie);
+       _CPU_ISR_Restore(cookie);
+
+
+       dbg_op_state();
+
+}
+
diff --git a/ohci.h b/ohci.h
new file mode 100644 (file)
index 0000000..50af699
--- /dev/null
+++ b/ohci.h
@@ -0,0 +1,201 @@
+#ifndef __OHCI_H__
+#define __OHCI_H__
+
+#include "types.h"
+
+/* OHCI0 Registers */
+
+#define        OHCI0_REG_BASE          0xd050000
+
+#define        OHCI0_HC_REVISION                       (OHCI0_REG_BASE + 0x00)
+#define        OHCI0_HC_CONTROL                        (OHCI0_REG_BASE + 0x04)
+#define        OHCI0_HC_COMMAND_STATUS         (OHCI0_REG_BASE + 0x08)
+#define        OHCI0_HC_INT_STATUS             (OHCI0_REG_BASE + 0x0C)
+
+#define        OHCI0_HC_INT_ENABLE             (OHCI0_REG_BASE + 0x10)
+#define        OHCI0_HC_INT_DISABLE            (OHCI0_REG_BASE + 0x14)
+#define        OHCI0_HC_HCCA                           (OHCI0_REG_BASE + 0x18)
+#define        OHCI0_HC_PERIOD_CURRENT_ED      (OHCI0_REG_BASE + 0x1C)
+
+#define        OHCI0_HC_CTRL_HEAD_ED           (OHCI0_REG_BASE + 0x20)
+#define        OHCI0_HC_CTRL_CURRENT_ED        (OHCI0_REG_BASE + 0x24)
+#define        OHCI0_HC_BULK_HEAD_ED           (OHCI0_REG_BASE + 0x28)
+#define        OHCI0_HC_BULK_CURRENT_ED        (OHCI0_REG_BASE + 0x2C)
+
+#define        OHCI0_HC_DONE_HEAD                      (OHCI0_REG_BASE + 0x30)
+#define        OHCI0_HC_FM_INTERVAL            (OHCI0_REG_BASE + 0x34)
+#define        OHCI0_HC_FM_REMAINING           (OHCI0_REG_BASE + 0x38)
+#define        OHCI0_HC_FM_NUMBER                      (OHCI0_REG_BASE + 0x3C)
+
+#define        OHCI0_HC_PERIODIC_START         (OHCI0_REG_BASE + 0x40)
+#define        OHCI0_HC_LS_THRESHOLD           (OHCI0_REG_BASE + 0x44)
+#define        OHCI0_HC_RH_DESCRIPTOR_A        (OHCI0_REG_BASE + 0x48)
+#define        OHCI0_HC_RH_DESCRIPTOR_B        (OHCI0_REG_BASE + 0x4C)
+
+#define        OHCI0_HC_RH_STATUS                      (OHCI0_REG_BASE + 0x50)
+
+
+/* OHCI1 Registers */
+
+#define        OHCI1_REG_BASE          0xd060000
+
+#define        OHCI1_HC_REVISION                       (OHCI1_REG_BASE + 0x00)
+#define        OHCI1_HC_CONTROL                        (OHCI1_REG_BASE + 0x04)
+#define        OHCI1_HC_COMMAND_STATUS         (OHCI1_REG_BASE + 0x08)
+#define        OHCI1_HC_INT_STATUS             (OHCI1_REG_BASE + 0x0C)
+
+#define        OHCI1_HC_INT_ENABLE             (OHCI1_REG_BASE + 0x10)
+#define        OHCI1_HC_INT_DISABLE            (OHCI1_REG_BASE + 0x14)
+#define        OHCI1_HC_HCCA                           (OHCI1_REG_BASE + 0x18)
+#define        OHCI1_HC_PERIOD_CURRENT_ED      (OHCI1_REG_BASE + 0x1C)
+
+#define        OHCI1_HC_CTRL_HEAD_ED           (OHCI1_REG_BASE + 0x20)
+#define        OHCI1_HC_CTRL_CURRENT_ED        (OHCI1_REG_BASE + 0x24)
+#define        OHCI1_HC_BULK_HEAD_ED           (OHCI1_REG_BASE + 0x28)
+#define        OHCI1_HC_BULK_CURRENT_ED        (OHCI1_REG_BASE + 0x2C)
+
+#define        OHCI1_HC_DONE_HEAD                      (OHCI1_REG_BASE + 0x30)
+#define        OHCI1_HC_FM_INTERVAL            (OHCI1_REG_BASE + 0x34)
+#define        OHCI1_HC_FM_REMAINING           (OHCI1_REG_BASE + 0x38)
+#define        OHCI1_HC_FM_NUMBER                      (OHCI1_REG_BASE + 0x3C)
+
+#define        OHCI1_HC_PERIODIC_START         (OHCI1_REG_BASE + 0x40)
+#define        OHCI1_HC_LS_THRESHOLD           (OHCI1_REG_BASE + 0x44)
+#define        OHCI1_HC_RH_DESCRIPTOR_A        (OHCI1_REG_BASE + 0x48)
+#define        OHCI1_HC_RH_DESCRIPTOR_B        (OHCI1_REG_BASE + 0x4C)
+
+#define        OHCI1_HC_RH_STATUS                      (OHCI1_REG_BASE + 0x50)
+
+/* EHCI Registers */
+#define        EHCI_REG_BASE           0xd040000
+
+/* stolen from mikep2 patched linux kernel: drivers/usb/host/ohci-mipc.c */
+#define        EHCI_CTL                        (EHCI_REG_BASE + 0xCC)
+#define        EHCI_CTL_OH0INTE                (1<<11) /* oh0 interrupt enable */
+#define        EHCI_CTL_OH1INTE                (1<<12) /* oh1 interrupt enable */
+
+/* stolen from drivers/usb/host/ohci.h (linux-kernel) :) */
+
+/* OHCI CONTROL AND STATUS REGISTER MASKS */
+
+/*
+ * HcControl (control) register masks
+ */
+#define OHCI_CTRL_CBSR (3 << 0)        /* control/bulk service ratio */
+#define OHCI_CTRL_PLE  (1 << 2)        /* periodic list enable */
+#define OHCI_CTRL_IE   (1 << 3)        /* isochronous enable */
+#define OHCI_CTRL_CLE  (1 << 4)        /* control list enable */
+#define OHCI_CTRL_BLE  (1 << 5)        /* bulk list enable */
+#define OHCI_CTRL_HCFS (3 << 6)        /* host controller functional state */
+#define OHCI_CTRL_IR   (1 << 8)        /* interrupt routing */
+#define OHCI_CTRL_RWC  (1 << 9)        /* remote wakeup connected */
+#define OHCI_CTRL_RWE  (1 << 10)       /* remote wakeup enable */
+
+/* pre-shifted values for HCFS */
+#define OHCI_USB_RESET (0 << 6)
+#define OHCI_USB_RESUME        (1 << 6)
+#define OHCI_USB_OPER  (2 << 6)
+#define OHCI_USB_SUSPEND       (3 << 6)
+
+/*
+ * HcCommandStatus (cmdstatus) register masks
+ */
+#define OHCI_HCR       (1 << 0)        /* host controller reset */
+#define OHCI_CLF       (1 << 1)        /* control list filled */
+#define OHCI_BLF       (1 << 2)        /* bulk list filled */
+#define OHCI_OCR       (1 << 3)        /* ownership change request */
+#define OHCI_SOC       (3 << 16)       /* scheduling overrun count */
+
+/*
+ * masks used with interrupt registers:
+ * HcInterruptStatus (intrstatus)
+ * HcInterruptEnable (intrenable)
+ * HcInterruptDisable (intrdisable)
+ */
+#define OHCI_INTR_SO   (1 << 0)        /* scheduling overrun */
+#define OHCI_INTR_WDH  (1 << 1)        /* writeback of done_head */
+#define OHCI_INTR_SF   (1 << 2)        /* start frame */
+#define OHCI_INTR_RD   (1 << 3)        /* resume detect */
+#define OHCI_INTR_UE   (1 << 4)        /* unrecoverable error */
+#define OHCI_INTR_FNO  (1 << 5)        /* frame number overflow */
+#define OHCI_INTR_RHSC (1 << 6)        /* root hub status change */
+#define OHCI_INTR_OC   (1 << 30)       /* ownership change */
+#define OHCI_INTR_MIE  (1 << 31)       /* master interrupt enable */
+
+/*
+ * masks used with interrupt registers:
+ * HcInterruptStatus (intrstatus)
+ * HcInterruptEnable (intrenable)
+ * HcInterruptDisable (intrdisable)
+ */
+#define OHCI_INTR_SO   (1 << 0)        /* scheduling overrun */
+#define OHCI_INTR_WDH  (1 << 1)        /* writeback of done_head */
+#define OHCI_INTR_SF   (1 << 2)        /* start frame */
+#define OHCI_INTR_RD   (1 << 3)        /* resume detect */
+#define OHCI_INTR_UE   (1 << 4)        /* unrecoverable error */
+#define OHCI_INTR_FNO  (1 << 5)        /* frame number overflow */
+#define OHCI_INTR_RHSC (1 << 6)        /* root hub status change */
+#define OHCI_INTR_OC   (1 << 30)       /* ownership change */
+#define OHCI_INTR_MIE  (1 << 31)       /* master interrupt enable */
+
+
+/* For initializing controller (mask in an HCFS mode too) */
+#define OHCI_CONTROL_INIT      (3 << 0)
+#define        OHCI_INTR_INIT \
+               (OHCI_INTR_MIE | OHCI_INTR_RHSC | OHCI_INTR_UE \
+               | OHCI_INTR_RD | OHCI_INTR_WDH)
+
+/* OHCI ROOT HUB REGISTER MASKS */
+
+/* roothub.portstatus [i] bits */
+#define RH_PS_CCS            0x00000001                /* current connect status */
+#define RH_PS_PES            0x00000002                /* port enable status*/
+#define RH_PS_PSS            0x00000004                /* port suspend status */
+#define RH_PS_POCI           0x00000008                /* port over current indicator */
+#define RH_PS_PRS            0x00000010                /* port reset status */
+#define RH_PS_PPS            0x00000100                /* port power status */
+#define RH_PS_LSDA           0x00000200                /* low speed device attached */
+#define RH_PS_CSC            0x00010000                /* connect status change */
+#define RH_PS_PESC           0x00020000                /* port enable status change */
+#define RH_PS_PSSC           0x00040000                /* port suspend status change */
+#define RH_PS_OCIC           0x00080000                /* over current indicator change */
+#define RH_PS_PRSC           0x00100000                /* port reset status change */
+
+/* roothub.status bits */
+#define RH_HS_LPS           0x00000001         /* local power status */
+#define RH_HS_OCI           0x00000002         /* over current indicator */
+#define RH_HS_DRWE          0x00008000         /* device remote wakeup enable */
+#define RH_HS_LPSC          0x00010000         /* local power status change */
+#define RH_HS_OCIC          0x00020000         /* over current indicator change */
+#define RH_HS_CRWE          0x80000000         /* clear remote wakeup enable */
+
+/* roothub.b masks */
+#define RH_B_DR                0x0000ffff              /* device removable flags */
+#define RH_B_PPCM      0xffff0000              /* port power control mask */
+
+/* roothub.a masks */
+#define        RH_A_NDP        (0xff << 0)             /* number of downstream ports */
+#define        RH_A_PSM        (1 << 8)                /* power switching mode */
+#define        RH_A_NPS        (1 << 9)                /* no power switching */
+#define        RH_A_DT         (1 << 10)               /* device type (mbz) */
+#define        RH_A_OCPM       (1 << 11)               /* over current protection mode */
+#define        RH_A_NOCP       (1 << 12)               /* no over current protection */
+#define        RH_A_POTPGT     (0xff << 24)            /* power on to power good time */
+
+struct ohci_hcca {
+#define NUM_INITS 32
+       u32 int_table[NUM_INITS]; /* periodic schedule */
+       /*
+        * OHCI defines u16 frame_no, followed by u16 zero pad.
+        * Since some processors can't do 16 bit bus accesses,
+        * portable access must be a 32 bits wide.
+        */
+       u32     frame_no;               /* current frame number */
+       u32     done_head;              /* info returned for an interrupt */
+       u8 reserved_for_hc [116];
+       u8 what [4];            /* spec only identifies 252 bytes :) */
+} ALIGNED(256);
+
+void ohci_init(void);
+
+#endif