musb_hdrc: remove broken Mentor OTG code

Remove most of the strange OTG-incompatible logic from Mentor, with
its CamelCasing and so forth.  It's better to trigger the transitions
explicitly with relevant operations, like suspend triggering HNP, than
trying to track a subset of the OTG triggers.

Plus some minor cleanups related to previous patches:  better fix
for the "use_dma=n" related compiler warning, pt_regs for omap2430.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

drivers/usb/musb/Makefile

@@ -18,10 +18,6 @@ ifeq ($(CONFIG_ARCH_OMAP243X),y)
 	musb_hdrc-objs	+= omap2430.o
 endif
 
-ifeq ($(CONFIG_USB_MUSB_OTG),y)
-	musb_hdrc-objs	+= otg.o
-endif
-
 ifeq ($(CONFIG_USB_GADGET_MUSB_HDRC),y)
 	musb_hdrc-objs		+= g_ep0.o musb_gadget.o
 endif

drivers/usb/musb/musbdefs.h

@@ -72,7 +72,6 @@ struct musb_ep;
 #include "musb_gadget.h"
 #include "../core/hcd.h"
 #include "musb_host.h"
-#include "otg.h"
 
 
 
@@ -255,24 +254,14 @@ enum musb_g_ep0_state {
 /****************************** FUNCTIONS ********************************/
 
 #define MUSB_HST_MODE(_pthis)\
-	{ (_pthis)->bIsHost=TRUE; (_pthis)->bIsDevice=FALSE; }
+	{ (_pthis)->bIsHost=TRUE; }
 #define MUSB_DEV_MODE(_pthis) \
-	{ (_pthis)->bIsHost=FALSE; (_pthis)->bIsDevice=TRUE; }
-#define MUSB_OTG_MODE(_pthis) \
-	{ (_pthis)->bIsHost=FALSE; (_pthis)->bIsDevice=FALSE; }
-
-#define MUSB_IS_HST(_x) ((_x)->bIsHost && !(_x)->bIsDevice)
-#define MUSB_IS_DEV(_x) (!(_x)->bIsHost && (_x)->bIsDevice)
-#define MUSB_IS_OTG(_x) (!(_x)->bIsHost && !(_x)->bIsDevice)
+	{ (_pthis)->bIsHost=FALSE; }
 
 #define test_devctl_hst_mode(_x) \
 	(musb_readb((_x)->pRegs, MGC_O_HDRC_DEVCTL)&MGC_M_DEVCTL_HM)
 
-/* REVISIT OTG isn't a third non-error mode... */
-#define MUSB_MODE(_x) ( MUSB_IS_HST(_x)?"HOST" \
-		:(MUSB_IS_DEV(_x)?"PERIPHERAL" \
-		:(MUSB_IS_OTG(_x)?"UNCONNECTED" \
-		:"ERROR")) )
+#define MUSB_MODE(musb) ((musb)->bIsHost ? "Host" : "Peripheral")
 
 /************************** Ep Configuration ********************************/
 
@@ -439,7 +428,6 @@ struct musb {
 	unsigned is_active:1;
 
 	unsigned bIsMultipoint:1;
-	unsigned bIsDevice:1;
 	unsigned bIsHost:1;
 	unsigned bIgnoreDisconnect:1;	/* during bus resets */
 
@@ -480,7 +468,7 @@ struct musb {
 #endif
 
 #ifdef CONFIG_USB_MUSB_OTG
-	struct otg_machine	OtgMachine;
+	/* FIXME this can't be OTG-specific ... ? */
 	u8 bDelayPortPowerOff;
 #endif
 
@@ -501,6 +489,13 @@ static inline struct musb *gadget_to_musb(struct usb_gadget *g)
 }
 #endif
 
+#ifdef CONFIG_USB_MUSB_OTG
+/* sysfs flag to seletively force peripheral-only operation */
+extern int musb_otg;
+#else
+#define musb_otg 0
+#endif
+
 
 /***************************** Glue it together *****************************/
 

drivers/usb/musb/musbhsdma.c

@@ -274,8 +274,7 @@ static int MGC_HsDmaAbortChannel(struct dma_channel *pChannel)
 	return 0;
 }
 
-static irqreturn_t
-hsdma_irq(int irq, void *pPrivateData, struct pt_regs *regs)
+static irqreturn_t hsdma_irq(int irq, void *pPrivateData)
 {
 	u8 bChannel;
 	u16 wCsr;

drivers/usb/musb/otg.h

-/******************************************************************
- * Copyright 2005 Mentor Graphics Corporation
- * Copyright (C) 2005-2006 by Texas Instruments
- *
- * This file is part of the Inventra Controller Driver for Linux.
- *
- * The Inventra Controller Driver for Linux is free software; you
- * can redistribute it and/or modify it under the terms of the GNU
- * General Public License version 2 as published by the Free Software
- * Foundation.
- *
- * The Inventra Controller Driver for Linux is distributed in
- * the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
- * License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with The Inventra Controller Driver for Linux ; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place,
- * Suite 330, Boston, MA  02111-1307  USA
- *
- * ANY DOWNLOAD, USE, REPRODUCTION, MODIFICATION OR DISTRIBUTION
- * OF THIS DRIVER INDICATES YOUR COMPLETE AND UNCONDITIONAL ACCEPTANCE
- * OF THOSE TERMS.THIS DRIVER IS PROVIDED "AS IS" AND MENTOR GRAPHICS
- * MAKES NO WARRANTIES, EXPRESS OR IMPLIED, RELATED TO THIS DRIVER.
- * MENTOR GRAPHICS SPECIFICALLY DISCLAIMS ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY; FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT.  MENTOR GRAPHICS DOES NOT PROVIDE SUPPORT
- * SERVICES OR UPDATES FOR THIS DRIVER, EVEN IF YOU ARE A MENTOR
- * GRAPHICS SUPPORT CUSTOMER.
- ******************************************************************/
-
-/*
- * Interface to a generic OTG state machine for use by an OTG controller.
- *
- * FIXME most of this must vanish; usbcore handles some of it, and
- * the OTG parts of a peripheral controller (and its driver) handle
- * other things.  Package it as an "otg transceiver".
- */
-
-#ifndef __MUSB_LINUX_OTG_H__
-#define __MUSB_LINUX_OTG_H__
-
-#include <linux/spinlock.h>
-#include <linux/timer.h>
-
-/**
- * Introduction.
- * An OTG state machine for use by a controller driver for an OTG controller
- * that wishes to be OTG-aware.
- * The state machine requires relevant inputs and a couple of services
- * from the controller driver, and calls the controller driver to inform
- * it of the current state and errors.
- * Finally, it provides the necessary bus control service.
- */
-
-/* sysfs flag to seletively force peripheral-only operation */
-extern int musb_otg;
-
-/****************************** CONSTANTS ********************************/
-
-/*
- * Define this (in milliseconds) to a target-specific value to override default.
- * The OTG-spec minimum is 5000, and maximum is 6000 (see OTG spec errata).
- */
-#ifndef MGC_OTG_T_B_SRP_FAIL
-#define MGC_OTG_T_B_SRP_FAIL	5000
-#endif
-
-/*
- * Define this (in milliseconds) to a target-specific value to override default.
- * This is the time an A-device should wait for a B-device to connect.
- * The OTG-spec minimum is 1000.
- * As a special case, for normal host-like behavior, you can set this to 0.
- */
-#ifndef MGC_OTG_T_A_WAIT_BCON
-#define MGC_OTG_T_A_WAIT_BCON	1000
-#endif
-
-/*
- * Define this (in milliseconds) to a target-specific value to override default.
- * The OTG-spec minimum is 250.
- */
-#ifndef MGC_OTG_T_AIDL_BDIS
-#define MGC_OTG_T_AIDL_BDIS	250
-#endif
-
-//#define MGC_OTG_T_B_ASE0_BRST 4
-#define MGC_OTG_T_B_ASE0_BRST	100
-
-/*
- * MGC_OtgRequest.
- * A software request for the OTG state machine
- */
-typedef enum {
-	MGC_OTG_REQUEST_UNKNOWN,
-    /** Request the bus */
-	MGC_OTG_REQUEST_START_BUS,
-    /** Drop the bus */
-	MGC_OTG_REQUEST_DROP_BUS,
-    /** Suspend the bus */
-	MGC_OTG_REQUEST_SUSPEND_BUS,
-    /** Reset the state machine */
-	MGC_OTG_REQUEST_RESET
-} MGC_OtgRequest;
-
-
-/******************************** TYPES **********************************/
-
-/*
- * MGC_OtgMachineInputs.
- * The set of inputs which drives the state machine
- * @field bSession TRUE when a session is in progress; FALSE when not
- * @field bConnectorId TRUE for B-device; FALSE for A-device
- * (assumed valid only when a bSession is TRUE)
- * @field bReset TRUE when reset is detected (peripheral role only)
- * @field bConnection TRUE when connection is detected (host role only)
- * @field bSuspend TRUE when bus suspend is detected
- * @field bVbusError TRUE when a Vbus error is detected
- */
-typedef struct {
-	u8 bSession;
-	u8 bConnectorId;
-	u8 bReset;
-	u8 bConnection;
-	u8 bSuspend;
-	u8 bVbusError;
-} MGC_OtgMachineInputs;
-
-/*
- * OTG state machine instance data.
- * @field Lock spinlock
- * @field bState current state (one of the OTG_STATE_* constants)
- * @field pOtgServices pointer to OTG services
- * @field Timer interval timer for status change interrupts
- * @field bState current state
- * @field bRequest current pending request
- */
-struct otg_machine {
-	spinlock_t Lock;
-	struct musb		*musb;
-	enum usb_otg_state	bState;
-	struct timer_list Timer;
-	MGC_OtgRequest bRequest;
-
-	/* FIXME standard Linux-USB host and peripheral code includes
-	 * OTG support ... most of this "otg machine" must vanish
-	 */
-
-};
-
-/****************************** FUNCTIONS ********************************/
-
-/*
- * Initialize an OTG state machine.
- */
-extern void MGC_OtgMachineInit(struct otg_machine * pMachine,
-			     struct musb *musb);
-
-/*
- * Destroy an OTG state machine
- * @param pMachine machine pointer
- * @see #MGC_OtgMachineInit
- */
-extern void MGC_OtgMachineDestroy(struct otg_machine * pMachine);
-
-/*
- * OTG inputs have changed.
- * A controller driver calls this when anything in the
- * MGC_OtgMachineInputs has changed
- * @param pMachine machine pointer
- * @param pInputs current inputs
- * @see #MGC_OtgMachineInit
- */
-extern void MGC_OtgMachineInputsChanged(struct otg_machine * pMachine,
-					const MGC_OtgMachineInputs * pInputs);
-
-#endif				/* multiple inclusion protection */

drivers/usb/musb/plat_uds.c

@@ -77,10 +77,6 @@
  *        At the other extreme, the bandwidth capabilities which do
  *        exist tend to be severely undercommitted.  You can't yet hook
  *        up both a keyboard and a mouse to an external USB hub.
- *
- *  - Provides its own OTG bits.  These are untested, and many of them
- *    seem to be superfluous code bloat given what usbcore does.  (They
- *    have now been partially removed.)
  */
 
 /*
@@ -161,7 +157,7 @@ MODULE_LICENSE("GPL");
  */
 int musb_otg = 1;
 
-module_param(musb_otg, bool, 0600);
+module_param(musb_otg, bool, 0);
 MODULE_PARM_DESC(musb_otg, "enable/disable OTG capabilities");
 #endif
 
@@ -175,51 +171,6 @@ static inline struct musb *dev_to_musb(struct device *dev)
 #endif
 }
 
-static void otg_input_changed(struct musb * pThis, u8 devctl, u8 reset,
-			u8 connection, u8 suspend)
-{
-#ifdef CONFIG_USB_MUSB_OTG
-	struct otg_machine	*otgm = &pThis->OtgMachine;
-	MGC_OtgMachineInputs Inputs;
-
-	/* reading suspend state from Power register does NOT work */
-	memset(&Inputs, 0, sizeof(Inputs));
-
-	Inputs.bSession = (devctl & MGC_M_DEVCTL_SESSION) ? TRUE : FALSE;
-	Inputs.bSuspend = suspend;
-	Inputs.bConnection = connection;
-	Inputs.bReset = reset;
-	Inputs.bConnectorId = (devctl & MGC_M_DEVCTL_BDEVICE) ? TRUE : FALSE;
-
-	MGC_OtgMachineInputsChanged(otgm, &Inputs);
-#endif
-}
-
-static void otg_input_changed_X(struct musb * pThis, u8 bVbusError, u8 bConnect)
-{
-#ifdef CONFIG_USB_MUSB_OTG
-	MGC_OtgMachineInputs Inputs;
-	void __iomem *pBase = pThis->pRegs;
-	u8 devctl = musb_readb(pBase, MGC_O_HDRC_DEVCTL);
-	u8 power = musb_readb(pBase, MGC_O_HDRC_POWER);
-
-	DBG(2, "<== power %02x, devctl %02x%s%s\n", power, devctl,
-			bConnect ? ", bcon" : "",
-			bVbusError ? ", vbus_error" : "");
-
-	/* speculative */
-	memset(&Inputs, 0, sizeof(Inputs));
-	Inputs.bSession = (devctl & MGC_M_DEVCTL_SESSION) ? TRUE : FALSE;
-	Inputs.bConnectorId = (devctl & MGC_M_DEVCTL_BDEVICE) ? TRUE : FALSE;
-	Inputs.bReset = (power & MGC_M_POWER_RESET) ? TRUE : FALSE;
-	Inputs.bConnection = bConnect;
-	Inputs.bVbusError = bVbusError;
-	Inputs.bSuspend = (power & MGC_M_POWER_SUSPENDM) ? TRUE : FALSE;
-	MGC_OtgMachineInputsChanged(&(pThis->OtgMachine), &Inputs);
-#endif				/* CONFIG_USB_MUSB_OTG */
-}
-
-
 /*-------------------------------------------------------------------------*/
 
 #ifndef CONFIG_USB_TUSB6010
@@ -426,27 +377,10 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB,
 		musb_set_vbus(pThis, 1);
 
 		handled = IRQ_HANDLED;
-
-#ifdef CONFIG_USB_MUSB_OTG
-		{
-		MGC_OtgMachineInputs Inputs;
-		memset(&Inputs, 0, sizeof(Inputs));
-		Inputs.bSession = TRUE;
-		Inputs.bConnectorId = FALSE;
-		Inputs.bReset = FALSE;
-		Inputs.bConnection = FALSE;
-		Inputs.bSuspend = FALSE;
-		MGC_OtgMachineInputsChanged(&(pThis->OtgMachine), &Inputs);
-		}
-#endif
 	}
 
 	if (bIntrUSB & MGC_M_INTR_VBUSERROR) {
 
-		// MGC_OtgMachineInputsChanged(otgm, &Inputs);
-		// otg_input_changed_X(pThis, TRUE, TRUE);
-		// ... may need to abort otg timer ...
-
 		DBG(1, "VBUS_ERROR (%02x, %s), retry #%d\n", devctl,
 				({ char *s;
 				switch (devctl & MGC_M_DEVCTL_VBUS) {
@@ -507,7 +441,6 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB,
 			break;
 		}
 		DBG(1, "CONNECT (%s)\n", otg_state_string(pThis));
-		otg_input_changed(pThis, devctl, FALSE, TRUE, FALSE);
 	}
 #endif	/* CONFIG_USB_MUSB_HDRC_HCD */
 
@@ -533,12 +466,6 @@ static irqreturn_t musb_stage0_irq(struct musb * pThis, u8 bIntrUSB,
 			DBG(1, "BUS RESET\n");
 
 			musb_g_reset(pThis);
-
-			/* reading state from Power register doesn't work */
-			otg_input_changed(pThis, devctl, TRUE, FALSE,
-						(power & MGC_M_POWER_SUSPENDM)
-						? TRUE : FALSE);
-
 			schedule_work(&pThis->irq_work);
 		}
 
@@ -621,9 +548,6 @@ static irqreturn_t musb_stage2_irq(struct musb * pThis, u8 bIntrUSB,
 		else
 			musb_g_disconnect(pThis);
 
-		/* REVISIT all OTG state machine transitions */
-		otg_input_changed_X(pThis, FALSE, FALSE);
-
 		schedule_work(&pThis->irq_work);
 	}
 
@@ -636,7 +560,6 @@ static irqreturn_t musb_stage2_irq(struct musb * pThis, u8 bIntrUSB,
 			musb_g_suspend(pThis);
 			pThis->is_active = is_otg_enabled(pThis)
 					&& pThis->xceiv.gadget->b_hnp_enable;
-			otg_input_changed(pThis, devctl, FALSE, FALSE, TRUE);
 		} else
 			pThis->is_active = 0;
 	}
@@ -734,11 +657,6 @@ void musb_stop(struct musb * pThis)
 	musb_generic_disable(pThis);
 	DBG(3, "HDRC disabled\n");
 
-#ifdef CONFIG_USB_MUSB_OTG
-	if (is_otg_enabled(pThis))
-		MGC_OtgMachineDestroy(&pThis->OtgMachine);
-#endif
-
 	/* FIXME
 	 *  - mark host and/or peripheral drivers unusable/inactive
 	 *  - disable DMA (and enable it in HdrcStart)
@@ -1763,26 +1681,15 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
 #endif				/* CONFIG_USB_MUSB_HDRC_HCD */
 
 #ifdef CONFIG_USB_MUSB_OTG
-	/* if present, this gets used even on non-otg boards */
-	MGC_OtgMachineInit(&pThis->OtgMachine, pThis);
+	if (!is_otg_enabled(pThis))
+		musb_otg = 0;
 #endif
 
 	/* For the host-only role, we can activate right away.
 	 * (We expect the ID pin to be forcibly grounded!!)
 	 * Otherwise, wait till the gadget driver hooks up.
 	 */
-	pThis->xceiv.state = OTG_STATE_B_IDLE;
-	pThis->xceiv.default_a = 0;
-
-	if (is_otg_enabled(pThis)) {
-		MUSB_OTG_MODE(pThis);
-		status = musb_gadget_setup(pThis);
-
-		DBG(1, "%s mode, status %d, dev%02x\n",
-			"OTG", status,
-			musb_readb(pThis->pRegs, MGC_O_HDRC_DEVCTL));
-
-	} else if (is_host_enabled(pThis)) {
+	if (!is_otg_enabled(pThis) && is_host_enabled(pThis)) {
 		MUSB_HST_MODE(pThis);
 		pThis->xceiv.default_a = 1;
 		pThis->xceiv.state = OTG_STATE_A_IDLE;
@@ -1798,10 +1705,14 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
 
 	} else /* peripheral is enabled */ {
 		MUSB_DEV_MODE(pThis);
+		pThis->xceiv.default_a = 0;
+		pThis->xceiv.state = OTG_STATE_B_IDLE;
+
 		status = musb_gadget_setup(pThis);
 
 		DBG(1, "%s mode, status %d, dev%02x\n",
-			"PERIPHERAL", status,
+			is_otg_enabled(pThis) ? "OTG" : "PERIPHERAL",
+			status,
 			musb_readb(pThis->pRegs, MGC_O_HDRC_DEVCTL));
 
 	}
@@ -1866,7 +1777,6 @@ static int __devinit musb_probe(struct platform_device *pdev)
 
 static int __devexit musb_remove(struct platform_device *pdev)
 {
-	struct device	*dev = &pdev->dev;
 	struct musb	*musb = dev_to_musb(&pdev->dev);
 	void __iomem	*ctrl_base = musb->ctrl_base;
 
@@ -1885,7 +1795,7 @@ static int __devexit musb_remove(struct platform_device *pdev)
 	iounmap(ctrl_base);
 	device_init_wakeup(&pdev->dev, 0);
 #ifndef CONFIG_USB_INVENTRA_FIFO
-	dev->dma_mask = orig_dma_mask;
+	pdev->dev.dma_mask = orig_dma_mask;
 #endif
 	return 0;
 }