Skip to content

Commit

Permalink
Revert "USB: EHCI: support running URB giveback in tasklet context"
Browse files Browse the repository at this point in the history 
This reverts commit 428aac8.

This isn't quite ready for 3.12, we need some more EHCI driver changes
that are just now showing up.  So revert this for now, and queue it up
later for 3.13.

Reported-by: Alan Stern <stern@rowland.harvard.edu>
Cc: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed Sep 17, 2013
1 parent 272b98c commit 3b8d732
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 13 deletions.
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-fsl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ static const struct hc_driver ehci_fsl_hc_driver = {
* generic hardware linkage
*/
.irq = ehci_irq,
.flags = HCD_USB2 | HCD_MEMORY | HCD_BH,
.flags = HCD_USB2 | HCD_MEMORY,

/*
* basic lifecycle operations
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-grlib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ static const struct hc_driver ehci_grlib_hc_driver = {
* generic hardware linkage
*/
.irq = ehci_irq,
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
.flags = HCD_MEMORY | HCD_USB2,

/*
* basic lifecycle operations
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1158,7 +1158,7 @@ static const struct hc_driver ehci_hc_driver = {
* generic hardware linkage
*/
.irq = ehci_irq,
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
.flags = HCD_MEMORY | HCD_USB2,

/*
* basic lifecycle operations
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-mv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ static const struct hc_driver mv_ehci_hc_driver = {
* generic hardware linkage
*/
.irq = ehci_irq,
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
.flags = HCD_MEMORY | HCD_USB2,

/*
* basic lifecycle operations
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-octeon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ static const struct hc_driver ehci_octeon_hc_driver = {
* generic hardware linkage
*/
.irq = ehci_irq,
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
.flags = HCD_MEMORY | HCD_USB2,

/*
* basic lifecycle operations
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-pmcmsp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ static const struct hc_driver ehci_msp_hc_driver = {
#else
.irq = ehci_irq,
#endif
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
.flags = HCD_MEMORY | HCD_USB2,

/*
* basic lifecycle operations
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-ppc-of.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ static const struct hc_driver ehci_ppc_of_hc_driver = {
* generic hardware linkage
*/
.irq = ehci_irq,
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
.flags = HCD_MEMORY | HCD_USB2,

/*
* basic lifecycle operations
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-ps3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static const struct hc_driver ps3_ehci_hc_driver = {
.product_desc = "PS3 EHCI Host Controller",
.hcd_priv_size = sizeof(struct ehci_hcd),
.irq = ehci_irq,
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
.flags = HCD_MEMORY | HCD_USB2,
.reset = ps3_ehci_hc_reset,
.start = ehci_run,
.stop = ehci_stop,
Expand Down
5 changes: 5 additions & 0 deletions drivers/usb/host/ehci-q.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,8 @@ static int qtd_copy_status (

static void
ehci_urb_done(struct ehci_hcd *ehci, struct urb *urb, int status)
__releases(ehci->lock)
__acquires(ehci->lock)
{
if (usb_pipetype(urb->pipe) == PIPE_INTERRUPT) {
/* ... update hc-wide periodic stats */
Expand All @@ -272,8 +274,11 @@ ehci_urb_done(struct ehci_hcd *ehci, struct urb *urb, int status)
urb->actual_length, urb->transfer_buffer_length);
#endif

/* complete() can reenter this HCD */
usb_hcd_unlink_urb_from_ep(ehci_to_hcd(ehci), urb);
spin_unlock (&ehci->lock);
usb_hcd_giveback_urb(ehci_to_hcd(ehci), urb, status);
spin_lock (&ehci->lock);
}

static int qh_schedule (struct ehci_hcd *ehci, struct ehci_qh *qh);
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-sead3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const struct hc_driver ehci_sead3_hc_driver = {
* generic hardware linkage
*/
.irq = ehci_irq,
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
.flags = HCD_MEMORY | HCD_USB2,

/*
* basic lifecycle operations
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-sh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ static const struct hc_driver ehci_sh_hc_driver = {
* generic hardware linkage
*/
.irq = ehci_irq,
.flags = HCD_USB2 | HCD_MEMORY | HCD_BH,
.flags = HCD_USB2 | HCD_MEMORY,

/*
* basic lifecycle operations
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-tilegx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ static const struct hc_driver ehci_tilegx_hc_driver = {
* Generic hardware linkage.
*/
.irq = ehci_irq,
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
.flags = HCD_MEMORY | HCD_USB2,

/*
* Basic lifecycle operations.
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-w90x900.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ static const struct hc_driver ehci_w90x900_hc_driver = {
* generic hardware linkage
*/
.irq = ehci_irq,
.flags = HCD_USB2|HCD_MEMORY|HCD_BH,
.flags = HCD_USB2|HCD_MEMORY,

/*
* basic lifecycle operations
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-xilinx-of.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ static const struct hc_driver ehci_xilinx_of_hc_driver = {
* generic hardware linkage
*/
.irq = ehci_irq,
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
.flags = HCD_MEMORY | HCD_USB2,

/*
* basic lifecycle operations
Expand Down

0 comments on commit 3b8d732

Please sign in to comment.