Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a31155c authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: EHCI: suppress unwanted error messages 



This patch (as1096) fixes an annoying problem: When a full-speed or
low-speed device is plugged into an EHCI controller, it fails to
enumerate at high speed and then is handed over to the companion
controller.  But usbcore logs a misleading and unwanted error message
when the high-speed enumeration fails.

The patch adds a new HCD method, port_handed_over, which asks whether
a port has been handed over to a companion controller.  If it has, the
error message is suppressed.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
CC: David Brownell <david-b@pacbell.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a8e51775

drivers/usb/core/hcd.h

+2 −0
Original line number Diff line number Diff line
@@ -213,6 +213,8 @@ struct hc_driver { 


		/* force handover of high-speed port to full-speed companion */

	void	(*relinquish_port)(struct usb_hcd *, int);

		/* has a port been handed over to a companion? */

	int	(*port_handed_over)(struct usb_hcd *, int);

};



extern int usb_hcd_link_urb_to_ep(struct usb_hcd *hcd, struct urb *urb);

drivers/usb/core/hub.c

+5 −1
Original line number Diff line number Diff line
@@ -2753,7 +2753,11 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, 
		if ((status == -ENOTCONN) || (status == -ENOTSUPP))

			break;

	}

	dev_err(hub_dev, "unable to enumerate USB device on port %d\n", port1);

	if (hub->hdev->parent ||

			!hcd->driver->port_handed_over ||

			!(hcd->driver->port_handed_over)(hcd, port1))

		dev_err(hub_dev, "unable to enumerate USB device on port %d\n",

				port1);

 

done:

	hub_port_disable(hub, port1, 1);

drivers/usb/host/ehci-au1xxx.c

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ static const struct hc_driver ehci_au1xxx_hc_driver = { 
	.bus_suspend = ehci_bus_suspend,

	.bus_resume = ehci_bus_resume,

	.relinquish_port = ehci_relinquish_port,

	.port_handed_over = ehci_port_handed_over,

};



/*-------------------------------------------------------------------------*/

drivers/usb/host/ehci-fsl.c

+1 −0
Original line number Diff line number Diff line
@@ -318,6 +318,7 @@ static const struct hc_driver ehci_fsl_hc_driver = { 
	.bus_suspend = ehci_bus_suspend,

	.bus_resume = ehci_bus_resume,

	.relinquish_port = ehci_relinquish_port,

	.port_handed_over = ehci_port_handed_over,

};



static int ehci_fsl_drv_probe(struct platform_device *pdev)

drivers/usb/host/ehci-hub.c

+10 −0
Original line number Diff line number Diff line
@@ -875,3 +875,13 @@ static void ehci_relinquish_port(struct usb_hcd *hcd, int portnum) 
	set_owner(ehci, --portnum, PORT_OWNER);

}



static int ehci_port_handed_over(struct usb_hcd *hcd, int portnum)

{

	struct ehci_hcd		*ehci = hcd_to_ehci(hcd);

	u32 __iomem		*reg;



	if (ehci_is_TDI(ehci))

		return 0;

	reg = &ehci->regs->port_status[portnum - 1];

	return ehci_readl(ehci, reg) & PORT_OWNER;

}