parent
458716389c
commit
0e40c19b45
@ -1,16 +0,0 @@ |
|||||||
--- a/drivers/usb/host/ehci-hub.c
|
|
||||||
+++ b/drivers/usb/host/ehci-hub.c
|
|
||||||
@@ -883,11 +883,13 @@ static int ehci_hub_control (
|
|
||||||
* power switching; they're allowed to just limit the
|
|
||||||
* current. khubd will turn the power back on.
|
|
||||||
*/
|
|
||||||
+#ifndef CONFIG_BCM63XX
|
|
||||||
if (HCS_PPC (ehci->hcs_params)){
|
|
||||||
ehci_writel(ehci,
|
|
||||||
temp & ~(PORT_RWC_BITS | PORT_POWER),
|
|
||||||
status_reg);
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/* whoever resumes must GetPortStatus to complete it!! */
|
|
@ -1,16 +0,0 @@ |
|||||||
--- a/drivers/usb/host/ehci-hub.c
|
|
||||||
+++ b/drivers/usb/host/ehci-hub.c
|
|
||||||
@@ -891,11 +891,13 @@ static int ehci_hub_control (
|
|
||||||
* power switching; they're allowed to just limit the
|
|
||||||
* current. khubd will turn the power back on.
|
|
||||||
*/
|
|
||||||
+#ifndef CONFIG_BCM63XX
|
|
||||||
if (HCS_PPC (ehci->hcs_params)){
|
|
||||||
ehci_writel(ehci,
|
|
||||||
temp & ~(PORT_RWC_BITS | PORT_POWER),
|
|
||||||
status_reg);
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/* whoever resumes must GetPortStatus to complete it!! */
|
|
@ -1,17 +0,0 @@ |
|||||||
--- a/drivers/usb/host/ehci-hub.c
|
|
||||||
+++ b/drivers/usb/host/ehci-hub.c
|
|
||||||
@@ -816,12 +816,14 @@ static int ehci_hub_control (
|
|
||||||
* power switching; they're allowed to just limit the
|
|
||||||
* current. khubd will turn the power back on.
|
|
||||||
*/
|
|
||||||
+#ifndef CONFIG_BCM63XX
|
|
||||||
if ((temp & PORT_OC) && HCS_PPC(ehci->hcs_params)) {
|
|
||||||
ehci_writel(ehci,
|
|
||||||
temp & ~(PORT_RWC_BITS | PORT_POWER),
|
|
||||||
status_reg);
|
|
||||||
temp = ehci_readl(ehci, status_reg);
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/* whoever resumes must GetPortStatus to complete it!! */
|
|
@ -0,0 +1,41 @@ |
|||||||
|
--- a/drivers/usb/host/ehci-hcd.c
|
||||||
|
+++ b/drivers/usb/host/ehci-hcd.c
|
||||||
|
@@ -744,7 +744,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->ignore_oc) ? ", overcurrent ignored" : "");
|
||||||
|
|
||||||
|
ehci_writel(ehci, INTR_MASK,
|
||||||
|
&ehci->regs->intr_enable); /* Turn On Interrupts */
|
||||||
|
--- a/drivers/usb/host/ehci-hub.c
|
||||||
|
+++ b/drivers/usb/host/ehci-hub.c
|
||||||
|
@@ -655,7 +655,7 @@ ehci_hub_status_data (struct usb_hcd *hc
|
||||||
|
* 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->ignore_oc)
|
||||||
|
mask = PORT_CSC | PORT_PEC | PORT_OCC;
|
||||||
|
else
|
||||||
|
mask = PORT_CSC | PORT_PEC;
|
||||||
|
@@ -873,7 +873,7 @@ static 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->ignore_oc)){
|
||||||
|
status |= USB_PORT_STAT_C_OVERCURRENT << 16;
|
||||||
|
|
||||||
|
/*
|
||||||
|
--- a/drivers/usb/host/ehci.h
|
||||||
|
+++ b/drivers/usb/host/ehci.h
|
||||||
|
@@ -134,6 +134,7 @@ struct ehci_hcd { /* one per controlle
|
||||||
|
unsigned amd_pll_fix:1;
|
||||||
|
unsigned fs_i_thresh:1; /* Intel iso scheduling */
|
||||||
|
unsigned use_dummy_qh:1; /* AMD Frame List table quirk*/
|
||||||
|
+ unsigned ignore_oc:1;
|
||||||
|
|
||||||
|
/* required for usb32 quirk */
|
||||||
|
#define OHCI_CTRL_HCFS (3 << 6)
|
@ -0,0 +1,41 @@ |
|||||||
|
--- a/drivers/usb/host/ehci-hcd.c
|
||||||
|
+++ b/drivers/usb/host/ehci-hcd.c
|
||||||
|
@@ -746,7 +746,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->ignore_oc) ? ", overcurrent ignored" : "");
|
||||||
|
|
||||||
|
ehci_writel(ehci, INTR_MASK,
|
||||||
|
&ehci->regs->intr_enable); /* Turn On Interrupts */
|
||||||
|
--- a/drivers/usb/host/ehci-hub.c
|
||||||
|
+++ b/drivers/usb/host/ehci-hub.c
|
||||||
|
@@ -656,7 +656,7 @@ ehci_hub_status_data (struct usb_hcd *hc
|
||||||
|
* 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->ignore_oc)
|
||||||
|
mask = PORT_CSC | PORT_PEC | PORT_OCC;
|
||||||
|
else
|
||||||
|
mask = PORT_CSC | PORT_PEC;
|
||||||
|
@@ -881,7 +881,7 @@ static 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->ignore_oc)){
|
||||||
|
status |= USB_PORT_STAT_C_OVERCURRENT << 16;
|
||||||
|
|
||||||
|
/*
|
||||||
|
--- a/drivers/usb/host/ehci.h
|
||||||
|
+++ b/drivers/usb/host/ehci.h
|
||||||
|
@@ -137,6 +137,7 @@ struct ehci_hcd { /* one per controlle
|
||||||
|
unsigned fs_i_thresh:1; /* Intel iso scheduling */
|
||||||
|
unsigned use_dummy_qh:1; /* AMD Frame List table quirk*/
|
||||||
|
unsigned has_synopsys_hc_bug:1; /* Synopsys HC */
|
||||||
|
+ unsigned ignore_oc:1;
|
||||||
|
|
||||||
|
/* required for usb32 quirk */
|
||||||
|
#define OHCI_CTRL_HCFS (3 << 6)
|
@ -0,0 +1,41 @@ |
|||||||
|
--- a/drivers/usb/host/ehci-hcd.c
|
||||||
|
+++ b/drivers/usb/host/ehci-hcd.c
|
||||||
|
@@ -753,7 +753,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->ignore_oc) ? ", overcurrent ignored" : "");
|
||||||
|
|
||||||
|
ehci_writel(ehci, INTR_MASK,
|
||||||
|
&ehci->regs->intr_enable); /* Turn On Interrupts */
|
||||||
|
--- a/drivers/usb/host/ehci-hub.c
|
||||||
|
+++ b/drivers/usb/host/ehci-hub.c
|
||||||
|
@@ -581,7 +581,7 @@ ehci_hub_status_data (struct usb_hcd *hc
|
||||||
|
* 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->ignore_oc)
|
||||||
|
mask = PORT_CSC | PORT_PEC | PORT_OCC;
|
||||||
|
else
|
||||||
|
mask = PORT_CSC | PORT_PEC;
|
||||||
|
@@ -806,7 +806,7 @@ static 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->ignore_oc)){
|
||||||
|
status |= USB_PORT_STAT_C_OVERCURRENT << 16;
|
||||||
|
|
||||||
|
/*
|
||||||
|
--- a/drivers/usb/host/ehci.h
|
||||||
|
+++ b/drivers/usb/host/ehci.h
|
||||||
|
@@ -139,6 +139,7 @@ struct ehci_hcd { /* one per controlle
|
||||||
|
unsigned fs_i_thresh:1; /* Intel iso scheduling */
|
||||||
|
unsigned use_dummy_qh:1; /* AMD Frame List table quirk*/
|
||||||
|
unsigned has_synopsys_hc_bug:1; /* Synopsys HC */
|
||||||
|
+ unsigned ignore_oc:1;
|
||||||
|
|
||||||
|
/* required for usb32 quirk */
|
||||||
|
#define OHCI_CTRL_HCFS (3 << 6)
|
Loading…
Reference in new issue