Commit 1a49e2ac authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

EHCI: centralize controller initialization 



This patch (as1564c) converts the EHCI platform drivers to use the
central ehci_setup() routine for generic controller initialization
rather than each having its own idiosyncratic approach.

The major point of difficulty lies in ehci-pci's many vendor- and
device-specific workarounds.  Some of them have to be applied before
calling ehci_setup() and some after, which necessitates a fair amount
of code motion.  The other platform drivers require much smaller
changes.

One point not addressed by the patch is whether ports should be
powered on or off following initialization.  The different drivers
appear to handle this pretty much at random.  In fact it shouldn't
matter, because the hub driver turns on power to all ports when it
binds to the root hub.  Straightening that out will be left for
another day.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 15302800

drivers/usb/host/ehci-atmel.c

+2 −17
Original line number Diff line number Diff line
@@ -53,30 +53,15 @@ static void atmel_stop_ehci(struct platform_device *pdev) 
static int ehci_atmel_setup(struct usb_hcd *hcd)

{

	struct ehci_hcd *ehci = hcd_to_ehci(hcd);

	int retval = 0;

	int retval;



	/* registers start at offset 0x0 */

	ehci->caps = hcd->regs;

	ehci->regs = hcd->regs +

		HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase));

	dbg_hcs_params(ehci, "reset");

	dbg_hcc_params(ehci, "reset");



	/* cache this readonly data; minimize chip reads */

	ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);



	retval = ehci_halt(ehci);

	if (retval)

		return retval;



	/* data structure init */

	retval = ehci_init(hcd);

	retval = ehci_setup(hcd);

	if (retval)

		return retval;



	ehci->sbrn = 0x20;



	ehci_reset(ehci);

	ehci_port_power(ehci, 0);



	return retval;

drivers/usb/host/ehci-au1xxx.c

+4 −10
Original line number Diff line number Diff line
@@ -20,10 +20,12 @@ extern int usb_disabled(void); 
static int au1xxx_ehci_setup(struct usb_hcd *hcd)

{

	struct ehci_hcd *ehci = hcd_to_ehci(hcd);

	int ret = ehci_init(hcd);

	int ret;



	ehci->caps = hcd->regs;

	ret = ehci_setup(hcd);



	ehci->need_io_watchdog = 0;

	ehci_reset(ehci);

	return ret;

}
@@ -78,7 +80,6 @@ static const struct hc_driver ehci_au1xxx_hc_driver = { 
static int ehci_hcd_au1xxx_drv_probe(struct platform_device *pdev)

{

	struct usb_hcd *hcd;

	struct ehci_hcd *ehci;

	struct resource *res;

	int ret;
@@ -116,13 +117,6 @@ static int ehci_hcd_au1xxx_drv_probe(struct platform_device *pdev) 
		goto err3;

	}



	ehci = hcd_to_ehci(hcd);

	ehci->caps = hcd->regs;

	ehci->regs = hcd->regs +

		HC_LENGTH(ehci, readl(&ehci->caps->hc_capbase));

	/* cache this readonly data; minimize chip reads */

	ehci->hcs_params = readl(&ehci->caps->hcs_params);



	ret = usb_add_hcd(hcd, pdev->resource[1].start,

			  IRQF_SHARED);

	if (ret == 0) {

drivers/usb/host/ehci-cns3xxx.c

+1 −5
Original line number Diff line number Diff line
@@ -33,14 +33,10 @@ static int cns3xxx_ehci_init(struct usb_hcd *hcd) 
	}



	ehci->caps = hcd->regs;

	ehci->regs = hcd->regs

		+ HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase));

	ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);



	hcd->has_tt = 0;

	ehci_reset(ehci);



	retval = ehci_init(hcd);

	retval = ehci_setup(hcd);

	if (retval)

		return retval;

drivers/usb/host/ehci-fsl.c

+1 −17
Original line number Diff line number Diff line
@@ -348,29 +348,13 @@ static int ehci_fsl_setup(struct usb_hcd *hcd) 


	/* EHCI registers start at offset 0x100 */

	ehci->caps = hcd->regs + 0x100;

	ehci->regs = hcd->regs + 0x100 +

		HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase));

	dbg_hcs_params(ehci, "reset");

	dbg_hcc_params(ehci, "reset");



	/* cache this readonly data; minimize chip reads */

	ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);



	hcd->has_tt = 1;



	retval = ehci_halt(ehci);

	if (retval)

		return retval;



	/* data structure init */

	retval = ehci_init(hcd);

	retval = ehci_setup(hcd);

	if (retval)

		return retval;



	ehci->sbrn = 0x20;



	ehci_reset(ehci);



	if (of_device_is_compatible(dev->parent->of_node,

				    "fsl,mpc5121-usb2-dr")) {

		/*

drivers/usb/host/ehci-grlib.c

+2 −13
Original line number Diff line number Diff line
@@ -40,18 +40,13 @@ static int ehci_grlib_setup(struct usb_hcd *hcd) 
	struct ehci_hcd	*ehci = hcd_to_ehci(hcd);

	int		retval;



	retval = ehci_halt(ehci);

	retval = ehci_setup(hcd);

	if (retval)

		return retval;



	retval = ehci_init(hcd);

	if (retval)

		return retval;



	ehci->sbrn = 0x20;

	ehci_port_power(ehci, 1);



	return ehci_reset(ehci);

	return retval;

}
@@ -164,12 +159,6 @@ static int __devinit ehci_hcd_grlib_probe(struct platform_device *op) 
		ehci->big_endian_capbase = 1;

	}



	ehci->regs = hcd->regs +

		HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase));



	/* cache this readonly data; minimize chip reads */

	ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);



	rv = usb_add_hcd(hcd, irq, 0);

	if (rv)

		goto err_ehci;

CRA Git | Maintained and supported by SUSTech CRA and CCSE