Module Name: src Committed By: jmcneill Date: Sat Sep 13 17:42:49 UTC 2014
Modified Files: src/sys/dev/usb: motg.c motgreg.h Added Files: src/sys/arch/arm/allwinner: awin_otgreg.h Log Message: Instead of polluting motgreg.h with AllWinner specific registers (things were getting out of hand), move the AllWinner reg definitions to arch/arm/allwinner/awin_otgreg.h and include that instead of dev/usb/motgreg.h when MOTG_ALLWINNER is defined. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/allwinner/awin_otgreg.h cvs rdiff -u -r1.9 -r1.10 src/sys/dev/usb/motg.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/motgreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/usb/motg.c diff -u src/sys/dev/usb/motg.c:1.9 src/sys/dev/usb/motg.c:1.10 --- src/sys/dev/usb/motg.c:1.9 Sat Sep 13 14:46:50 2014 +++ src/sys/dev/usb/motg.c Sat Sep 13 17:42:48 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: motg.c,v 1.9 2014/09/13 14:46:50 jmcneill Exp $ */ +/* $NetBSD: motg.c,v 1.10 2014/09/13 17:42:48 jmcneill Exp $ */ /* * Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc. @@ -39,8 +39,10 @@ * NOTE: The current implementation only supports Device Side Mode! */ +#include "opt_motg.h" + #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.9 2014/09/13 14:46:50 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.10 2014/09/13 17:42:48 jmcneill Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -62,7 +64,12 @@ __KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.9 #include <dev/usb/usb_mem.h> #include <dev/usb/usb_quirks.h> +#ifdef MOTG_ALLWINNER +#include <arch/arm/allwinner/awin_otgreg.h> +#else #include <dev/usb/motgreg.h> +#endif + #include <dev/usb/motgvar.h> #include <dev/usb/usbroothub_subr.h> @@ -261,9 +268,11 @@ motg_init(struct motg_softc *sc) musbotg_pull_common(sc, 0); +#ifdef MUSB2_REG_RXDBDIS /* disable double packet buffering XXX what's this ? */ UWRITE2(sc, MUSB2_REG_RXDBDIS, 0xFFFF); UWRITE2(sc, MUSB2_REG_TXDBDIS, 0xFFFF); +#endif /* enable HighSpeed and ISO Update flags */ @@ -288,9 +297,11 @@ motg_init(struct motg_softc *sc) UWRITE1(sc, MUSB2_REG_TESTMODE, 0); +#ifdef MUSB2_REG_MISC /* set default value */ UWRITE1(sc, MUSB2_REG_MISC, 0); +#endif /* select endpoint index 0 */ @@ -647,7 +658,7 @@ motg_softintr(void *v) tx_status |= UREAD2(sc, MUSB2_REG_INTTX); if (rx_status & 0x01) - panic("ctrl_rx"); + panic("ctrl_rx %08x", rx_status); if (tx_status & 0x01) motg_device_ctrl_intr_tx(sc); for (i = 1; i <= sc->sc_ep_max; i++) { Index: src/sys/dev/usb/motgreg.h diff -u src/sys/dev/usb/motgreg.h:1.2 src/sys/dev/usb/motgreg.h:1.3 --- src/sys/dev/usb/motgreg.h:1.2 Sat Sep 13 14:47:35 2014 +++ src/sys/dev/usb/motgreg.h Sat Sep 13 17:42:48 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: motgreg.h,v 1.2 2014/09/13 14:47:35 jmcneill Exp $ */ +/* $NetBSD: motgreg.h,v 1.3 2014/09/13 17:42:48 jmcneill Exp $ */ /* FreeBSD: head/sys/dev/usb/controller/musb_otg.h 267122 2014-06-05 18:23:51Z hselasky */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. @@ -33,8 +33,6 @@ #ifndef _MUSB2_OTG_H_ #define _MUSB2_OTG_H_ -#include "opt_motg.h" - #define MUSB2_MAX_DEVICES USB_MAX_DEVICES /* Common registers */ @@ -285,55 +283,4 @@ #define MUSB2_EP_MAX 16 /* maximum number of endpoints */ -#ifdef MOTG_ALLWINNER -/* - * AllWinner SoCs have an MOTG with shuffled registers - */ -#undef MUSB2_REG_FADDR -#define MUSB2_REG_FADDR 0x0098 - -#undef MUSB2_REG_POWER -#define MUSB2_REG_POWER 0x0040 - -#undef MUSB2_REG_DEVCTL -#define MUSB2_REG_DEVCTL 0x0041 - -#undef MUSB2_REG_EPINDEX -#define MUSB2_REG_EPINDEX 0x0042 - -#undef MUSB2_REG_INTTX -#define MUSB2_REG_INTTX 0x0044 - -#undef MUSB2_REG_INTRX -#define MUSB2_REG_INTRX 0x0046 - -#undef MUSB2_REG_INTTXE -#define MUSB2_REG_INTTXE 0x0048 - -#undef MUSB2_REG_INTRXE -#define MUSB2_REG_INTRXE 0x004a - -#undef MUSB2_REG_INTUSB -#define MUSB2_REG_INTUSB 0x004c - -#undef MUSB2_REG_INTUSBE -#define MUSB2_REG_INTUSBE 0x0050 - -#undef MUSB2_REG_FRAME -#define MUSB2_REG_FRAME 0x0054 - -#undef MUSB2_REG_TXFIFOSZ -#define MUSB2_REG_TXFIFOSZ 0x0090 - -#undef MUSB2_REG_RXFIFOSZ -#define MUSB2_REG_RXFIFOSZ 0x0094 - -#undef MUSB2_REG_TXFIFOADD -#define MUSB2_REG_TXFIFOADD 0x0064 - -#undef MUSB2_REG_RXFIFOADD -#define MUSB2_REG_RXFIFOADD 0x0066 - -#endif /* !MOTG_ALLWINNER */ - #endif /* _MUSB2_OTG_H_ */ Added files: Index: src/sys/arch/arm/allwinner/awin_otgreg.h diff -u /dev/null src/sys/arch/arm/allwinner/awin_otgreg.h:1.1 --- /dev/null Sat Sep 13 17:42:49 2014 +++ src/sys/arch/arm/allwinner/awin_otgreg.h Sat Sep 13 17:42:48 2014 @@ -0,0 +1,290 @@ +/* $NetBSD: awin_otgreg.h,v 1.1 2014/09/13 17:42:48 jmcneill Exp $ */ +/* FreeBSD: head/sys/dev/usb/controller/musb_otg.h 267122 2014-06-05 18:23:51Z hselasky */ +/*- + * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * This header file defines the registers of the Mentor Graphics USB OnTheGo + * Inventra chip (AllWinner specific). + */ + +#ifndef _MUSB2_OTG_H_ +#define _MUSB2_OTG_H_ + +#define MUSB2_MAX_DEVICES USB_MAX_DEVICES + +/* Common registers */ + +#define MUSB2_REG_FADDR 0x0098 /* function address register */ +#define MUSB2_MASK_FADDR 0x7F + +#define MUSB2_REG_POWER 0x0040 /* power register */ +#define MUSB2_MASK_SUSPM_ENA 0x01 +#define MUSB2_MASK_SUSPMODE 0x02 +#define MUSB2_MASK_RESUME 0x04 +#define MUSB2_MASK_RESET 0x08 +#define MUSB2_MASK_HSMODE 0x10 +#define MUSB2_MASK_HSENAB 0x20 +#define MUSB2_MASK_SOFTC 0x40 +#define MUSB2_MASK_ISOUPD 0x80 + +/* Endpoint interrupt handling */ + +#define MUSB2_REG_INTTX 0x0044 /* transmit interrupt register */ +#define MUSB2_REG_INTRX 0x0046 /* receive interrupt register */ +#define MUSB2_REG_INTTXE 0x0048 /* transmit interrupt enable register */ +#define MUSB2_REG_INTRXE 0x004A /* receive interrupt enable register */ +#define MUSB2_MASK_EPINT(epn) (1 << (epn)) /* epn = [0..15] */ + +/* Common interrupt handling */ + +#define MUSB2_REG_INTUSB 0x004C /* USB interrupt register */ +#define MUSB2_MASK_ISUSP 0x01 +#define MUSB2_MASK_IRESUME 0x02 +#define MUSB2_MASK_IRESET 0x04 +#define MUSB2_MASK_IBABBLE 0x04 +#define MUSB2_MASK_ISOF 0x08 +#define MUSB2_MASK_ICONN 0x10 +#define MUSB2_MASK_IDISC 0x20 +#define MUSB2_MASK_ISESSRQ 0x40 +#define MUSB2_MASK_IVBUSERR 0x80 + +#define MUSB2_REG_INTUSBE 0x0050 /* USB interrupt enable register */ +#define MUSB2_REG_FRAME 0x0054 /* USB frame register */ +#define MUSB2_MASK_FRAME 0x3FF /* 0..1023 */ + +#define MUSB2_REG_EPINDEX 0x0042 /* endpoint index register */ +#define MUSB2_MASK_EPINDEX 0x0F + +#define MUSB2_REG_TESTMODE 0x007C /* test mode register */ +#define MUSB2_MASK_TSE0_NAK 0x01 +#define MUSB2_MASK_TJ 0x02 +#define MUSB2_MASK_TK 0x04 +#define MUSB2_MASK_TPACKET 0x08 +#define MUSB2_MASK_TFORCE_HS 0x10 +#define MUSB2_MASK_TFORCE_LS 0x20 +#define MUSB2_MASK_TFIFO_ACC 0x40 +#define MUSB2_MASK_TFORCE_HC 0x80 + +#define MUSB2_REG_INDEXED_CSR 0x0080 /* EP control status register offset */ + +#define MUSB2_REG_TXMAXP (0x0000 + MUSB2_REG_INDEXED_CSR) +#define MUSB2_REG_RXMAXP (0x0004 + MUSB2_REG_INDEXED_CSR) +#define MUSB2_MASK_PKTSIZE 0x03FF /* in bytes, should be even */ +#define MUSB2_MASK_PKTMULT 0xFC00 /* HS packet multiplier: 0..2 */ + +#define MUSB2_REG_TXCSRL (0x0002 + MUSB2_REG_INDEXED_CSR) +#define MUSB2_MASK_CSRL_TXPKTRDY 0x01 +#define MUSB2_MASK_CSRL_TXFIFONEMPTY 0x02 +#define MUSB2_MASK_CSRL_TXUNDERRUN 0x04 /* Device Mode */ +#define MUSB2_MASK_CSRL_TXERROR 0x04 /* Host Mode */ +#define MUSB2_MASK_CSRL_TXFFLUSH 0x08 +#define MUSB2_MASK_CSRL_TXSENDSTALL 0x10/* Device Mode */ +#define MUSB2_MASK_CSRL_TXSETUPPKT 0x10 /* Host Mode */ +#define MUSB2_MASK_CSRL_TXSENTSTALL 0x20/* Device Mode */ +#define MUSB2_MASK_CSRL_TXSTALLED 0x20 /* Host Mode */ +#define MUSB2_MASK_CSRL_TXDT_CLR 0x40 +#define MUSB2_MASK_CSRL_TXINCOMP 0x80 /* Device mode */ +#define MUSB2_MASK_CSRL_TXNAKTO 0x80 /* Host mode */ + +/* Device Side Mode */ +#define MUSB2_MASK_CSR0L_RXPKTRDY 0x01 +#define MUSB2_MASK_CSR0L_TXPKTRDY 0x02 +#define MUSB2_MASK_CSR0L_SENTSTALL 0x04 +#define MUSB2_MASK_CSR0L_DATAEND 0x08 +#define MUSB2_MASK_CSR0L_SETUPEND 0x10 +#define MUSB2_MASK_CSR0L_SENDSTALL 0x20 +#define MUSB2_MASK_CSR0L_RXPKTRDY_CLR 0x40 +#define MUSB2_MASK_CSR0L_SETUPEND_CLR 0x80 + +/* Host Side Mode */ +#define MUSB2_MASK_CSR0L_TXFIFONEMPTY 0x02 +#define MUSB2_MASK_CSR0L_RXSTALL 0x04 +#define MUSB2_MASK_CSR0L_SETUPPKT 0x08 +#define MUSB2_MASK_CSR0L_ERROR 0x10 +#define MUSB2_MASK_CSR0L_REQPKT 0x20 +#define MUSB2_MASK_CSR0L_STATUSPKT 0x40 +#define MUSB2_MASK_CSR0L_NAKTIMO 0x80 + +#define MUSB2_REG_TXCSRH (0x0003 + MUSB2_REG_INDEXED_CSR) +#define MUSB2_MASK_CSRH_TXDT_VAL 0x01 /* Host Mode */ +#define MUSB2_MASK_CSRH_TXDT_WREN 0x02 /* Host Mode */ +#define MUSB2_MASK_CSRH_TXDMAREQMODE 0x04 +#define MUSB2_MASK_CSRH_TXDT_SWITCH 0x08 +#define MUSB2_MASK_CSRH_TXDMAREQENA 0x10 +#define MUSB2_MASK_CSRH_RXMODE 0x00 +#define MUSB2_MASK_CSRH_TXMODE 0x20 +#define MUSB2_MASK_CSRH_TXISO 0x40 /* Device Mode */ +#define MUSB2_MASK_CSRH_TXAUTOSET 0x80 + +#define MUSB2_MASK_CSR0H_FFLUSH 0x01 /* Device Side flush FIFO */ +#define MUSB2_MASK_CSR0H_DT 0x02 /* Host Side data toggle */ +#define MUSB2_MASK_CSR0H_DT_WREN 0x04 /* Host Side */ +#define MUSB2_MASK_CSR0H_PING_DIS 0x08 /* Host Side */ + +#define MUSB2_REG_RXCSRL (0x0006 + MUSB2_REG_INDEXED_CSR) +#define MUSB2_MASK_CSRL_RXPKTRDY 0x01 +#define MUSB2_MASK_CSRL_RXFIFOFULL 0x02 +#define MUSB2_MASK_CSRL_RXOVERRUN 0x04 /* Device Mode */ +#define MUSB2_MASK_CSRL_RXERROR 0x04 /* Host Mode */ +#define MUSB2_MASK_CSRL_RXDATAERR 0x08 /* Device Mode */ +#define MUSB2_MASK_CSRL_RXNAKTO 0x08 /* Host Mode */ +#define MUSB2_MASK_CSRL_RXFFLUSH 0x10 +#define MUSB2_MASK_CSRL_RXSENDSTALL 0x20/* Device Mode */ +#define MUSB2_MASK_CSRL_RXREQPKT 0x20 /* Host Mode */ +#define MUSB2_MASK_CSRL_RXSENTSTALL 0x40/* Device Mode */ +#define MUSB2_MASK_CSRL_RXSTALL 0x40 /* Host Mode */ +#define MUSB2_MASK_CSRL_RXDT_CLR 0x80 + +#define MUSB2_REG_RXCSRH (0x0007 + MUSB2_REG_INDEXED_CSR) +#define MUSB2_MASK_CSRH_RXINCOMP 0x01 +#define MUSB2_MASK_CSRH_RXDT_VAL 0x02 /* Host Mode */ +#define MUSB2_MASK_CSRH_RXDT_WREN 0x04 /* Host Mode */ +#define MUSB2_MASK_CSRH_RXDMAREQMODE 0x08 +#define MUSB2_MASK_CSRH_RXNYET 0x10 +#define MUSB2_MASK_CSRH_RXDMAREQENA 0x20 +#define MUSB2_MASK_CSRH_RXISO 0x40 /* Device Mode */ +#define MUSB2_MASK_CSRH_RXAUTOREQ 0x40 /* Host Mode */ +#define MUSB2_MASK_CSRH_RXAUTOCLEAR 0x80 + +#define MUSB2_REG_RXCOUNT (0x0008 + MUSB2_REG_INDEXED_CSR) +#define MUSB2_MASK_RXCOUNT 0xFFFF + +#define MUSB2_REG_TXTI (0x000C + MUSB2_REG_INDEXED_CSR) +#define MUSB2_REG_RXTI (0x000E + MUSB2_REG_INDEXED_CSR) + +/* Host Mode */ +#define MUSB2_MASK_TI_SPEED 0xC0 +#define MUSB2_MASK_TI_SPEED_LO 0xC0 +#define MUSB2_MASK_TI_SPEED_FS 0x80 +#define MUSB2_MASK_TI_SPEED_HS 0x40 +#define MUSB2_MASK_TI_PROTO_CTRL 0x00 +#define MUSB2_MASK_TI_PROTO_ISOC 0x10 +#define MUSB2_MASK_TI_PROTO_BULK 0x20 +#define MUSB2_MASK_TI_PROTO_INTR 0x30 +#define MUSB2_MASK_TI_EP_NUM 0x0F + +#define MUSB2_REG_TXNAKLIMIT (0x000D /* EPN=0 */ + MUSB2_REG_INDEXED_CSR) +#define MUSB2_REG_RXNAKLIMIT (0x000D /* EPN=0 */ + MUSB2_REG_INDEXED_CSR) +#define MUSB2_MASK_NAKLIMIT 0xFF + +#define MUSB2_REG_FSIZE (0x0010 + MUSB2_REG_INDEXED_CSR) +#define MUSB2_MASK_RX_FSIZE 0xF0 /* 3..13, 2**n bytes */ +#define MUSB2_MASK_TX_FSIZE 0x0F /* 3..13, 2**n bytes */ + +#define MUSB2_REG_EPFIFO(n) (0x0000 + (4*(n))) + +#define MUSB2_REG_CONFDATA (0x0040 + MUSB2_REG_INDEXED_CSR) /* EPN=0 */ +#define MUSB2_MASK_CD_UTMI_DW 0x01 +#define MUSB2_MASK_CD_SOFTCONE 0x02 +#define MUSB2_MASK_CD_DYNFIFOSZ 0x04 +#define MUSB2_MASK_CD_HBTXE 0x08 +#define MUSB2_MASK_CD_HBRXE 0x10 +#define MUSB2_MASK_CD_BIGEND 0x20 +#define MUSB2_MASK_CD_MPTXE 0x40 +#define MUSB2_MASK_CD_MPRXE 0x80 + +/* Various registers */ + +#define MUSB2_REG_DEVCTL 0x0041 +#define MUSB2_MASK_SESS 0x01 +#define MUSB2_MASK_HOSTREQ 0x02 +#define MUSB2_MASK_HOSTMD 0x04 +#define MUSB2_MASK_VBUS0 0x08 +#define MUSB2_MASK_VBUS1 0x10 +#define MUSB2_MASK_LSDEV 0x20 +#define MUSB2_MASK_FSDEV 0x40 +#define MUSB2_MASK_BDEV 0x80 + +#if 0 +#define MUSB2_REG_MISC 0x0061 +#define MUSB2_MASK_RXEDMA 0x01 +#define MUSB2_MASK_TXEDMA 0x02 +#endif + +#define MUSB2_REG_TXFIFOSZ 0x0090 +#define MUSB2_REG_RXFIFOSZ 0x0094 +#define MUSB2_MASK_FIFODB 0x10 /* set if double buffering, r/w */ +#define MUSB2_MASK_FIFOSZ 0x0F +#define MUSB2_VAL_FIFOSZ(logx) ((logx) - 3) +#define MUSB2_VAL_FIFOSZ_8 0 +#define MUSB2_VAL_FIFOSZ_16 1 +#define MUSB2_VAL_FIFOSZ_32 2 +#define MUSB2_VAL_FIFOSZ_64 3 +#define MUSB2_VAL_FIFOSZ_128 4 +#define MUSB2_VAL_FIFOSZ_256 5 +#define MUSB2_VAL_FIFOSZ_512 6 +#define MUSB2_VAL_FIFOSZ_1024 7 +#define MUSB2_VAL_FIFOSZ_2048 8 +#define MUSB2_VAL_FIFOSZ_4096 9 + +#define MUSB2_REG_TXFIFOADD 0x0092 +#define MUSB2_REG_RXFIFOADD 0x0096 +#define MUSB2_MASK_FIFOADD 0xFFF /* unit is 8-bytes */ + +#define MUSB2_REG_VSTATUS 0x0068 +#define MUSB2_REG_VCONTROL 0x0068 +#define MUSB2_REG_HWVERS 0x006C +#define MUSB2_REG_ULPI_BASE 0x0070 + +#define MUSB2_REG_EPINFO 0x0078 +#define MUSB2_MASK_NRXEP 0xF0 +#define MUSB2_MASK_NTXEP 0x0F + +#define MUSB2_REG_RAMINFO 0x0079 +#define MUSB2_REG_LINKINFO 0x007A + +#define MUSB2_REG_VPLEN 0x007B +#define MUSB2_MASK_VPLEN 0xFF + +#define MUSB2_REG_HS_EOF1 0x007C +#define MUSB2_REG_FS_EOF1 0x007D +#define MUSB2_REG_LS_EOF1 0x007E +#define MUSB2_REG_SOFT_RST 0x007F +#define MUSB2_MASK_SRST 0x01 +#define MUSB2_MASK_SRSTX 0x02 + +#if 0 +#define MUSB2_REG_RQPKTCOUNT(n) (0x0300 + (4*(n)) +#define MUSB2_REG_RXDBDIS 0x0340 +#define MUSB2_REG_TXDBDIS 0x0342 +#define MUSB2_MASK_DB(n) (1 << (n)) /* disable double buffer, n = [0..15] */ + +#define MUSB2_REG_CHIRPTO 0x0344 +#define MUSB2_REG_HSRESUM 0x0346 +#endif + +/* Host Mode only registers */ + +#define MUSB2_REG_TXFADDR(n) (0x0098 + (8*(n))) +#define MUSB2_REG_TXHADDR(n) (0x009a + (8*(n))) +#define MUSB2_REG_TXHUBPORT(n) (0x009b + (8*(n))) +#define MUSB2_REG_RXFADDR(n) (0x009c + (8*(n))) +#define MUSB2_REG_RXHADDR(n) (0x009e + (8*(n))) +#define MUSB2_REG_RXHUBPORT(n) (0x009f + (8*(n))) + +#define MUSB2_EP_MAX 16 /* maximum number of endpoints */ + +#endif /* _MUSB2_OTG_H_ */