Commit 2d5ba374 authored by Florian Fainelli's avatar Florian Fainelli Committed by Greg Kroah-Hartman
Browse files

usb: ehci: add spurious flag to disable overcurrent checking 



This patch adds an ignore_oc flag which can be set by EHCI controller
not supporting or wanting to disable overcurrent checking. The EHCI
platform data in include/linux/usb/ehci_pdriver.h is also augmented to
take advantage of this new flag.

Signed-off-by: default avatarFlorian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarÁlvaro Fernández Rojas <noltari@gmail.com>
Link: https://lore.kernel.org/r/20210223174455.1378-2-noltari@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 729979e1

drivers/usb/host/ehci-hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ static int ehci_run (struct usb_hcd *hcd) 
		"USB %x.%x started, EHCI %x.%02x%s\n",

		((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f),

		temp >> 8, temp & 0xff,

		ignore_oc ? ", overcurrent ignored" : "");

		(ignore_oc || ehci->spurious_oc) ? ", overcurrent ignored" : "");



	ehci_writel(ehci, INTR_MASK,

		    &ehci->regs->intr_enable); /* Turn On Interrupts */

drivers/usb/host/ehci-hub.c

+2 −2
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf) 
	 * always set, seem to clear PORT_OCC and PORT_CSC when writing to

	 * PORT_POWER; that's surprising, but maybe within-spec.

	 */

	if (!ignore_oc)

	if (!ignore_oc && !ehci->spurious_oc)

		mask = PORT_CSC | PORT_PEC | PORT_OCC;

	else

		mask = PORT_CSC | PORT_PEC;
@@ -1013,7 +1013,7 @@ int ehci_hub_control( 
		if (temp & PORT_PEC)

			status |= USB_PORT_STAT_C_ENABLE << 16;



		if ((temp & PORT_OCC) && !ignore_oc){

		if ((temp & PORT_OCC) && (!ignore_oc && !ehci->spurious_oc)){

			status |= USB_PORT_STAT_C_OVERCURRENT << 16;



			/*

drivers/usb/host/ehci-platform.c

+2 −0
Original line number Diff line number Diff line
@@ -327,6 +327,8 @@ static int ehci_platform_probe(struct platform_device *dev) 
		hcd->has_tt = 1;

	if (pdata->reset_on_resume)

		priv->reset_on_resume = true;

	if (pdata->spurious_oc)

		ehci->spurious_oc = 1;



#ifndef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO

	if (ehci->big_endian_mmio) {

drivers/usb/host/ehci.h

+1 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ struct ehci_hcd { /* one per controller */ 
	unsigned		frame_index_bug:1; /* MosChip (AKA NetMos) */

	unsigned		need_oc_pp_cycle:1; /* MPC834X port power */

	unsigned		imx28_write_fix:1; /* For Freescale i.MX28 */

	unsigned		spurious_oc:1;



	/* required for usb32 quirk */

	#define OHCI_CTRL_HCFS          (3 << 6)

include/linux/usb/ehci_pdriver.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ struct usb_ehci_pdata { 
	unsigned	no_io_watchdog:1;

	unsigned	reset_on_resume:1;

	unsigned	dma_mask_64:1;

	unsigned	spurious_oc:1;



	/* Turn on all power and clocks */

	int (*power_on)(struct platform_device *pdev);