From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org,
alan@lxorguk.ukuu.org.uk, Hans de Goede <hdegoede@redhat.com>,
Sarah Sharp <sarah.a.sharp@linux.intel.com>
Subject: [29/40] xhci: Properly handle COMP_2ND_BW_ERR
Date: Tue, 10 Jan 2012 13:45:42 -0800 [thread overview]
Message-ID: <20120110214620.733732252@clark.kroah.org> (raw)
In-Reply-To: <20120110214630.GA14384@kroah.com>
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <hdegoede@redhat.com>
commit 71d85724bdd947a3b42a88d08af79f290a1a767b upstream.
I encountered a result of COMP_2ND_BW_ERR while improving how the pwc
webcam driver handles not having the full usb1 bandwidth available to
itself.
I created the following test setup, a NEC xhci controller with a
single TT USB 2 hub plugged into it, with a usb keyboard and a pwc webcam
plugged into the usb2 hub. This caused the following to show up in dmesg
when trying to stream from the pwc camera at its highest alt setting:
xhci_hcd 0000:01:00.0: ERROR: unexpected command completion code 0x23.
usb 6-2.1: Not enough bandwidth for altsetting 9
And usb_set_interface returned -EINVAL, which caused my pwc code to not
do the right thing as it expected -ENOSPC.
This patch makes the xhci driver properly handle COMP_2ND_BW_ERR and makes
usb_set_interface return -ENOSPC as expected.
This should be backported to stable kernels as old as 2.6.32.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/usb/host/xhci.c | 1 +
drivers/usb/host/xhci.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1568,6 +1568,7 @@ static int xhci_configure_endpoint_resul
/* FIXME: can we allocate more resources for the HC? */
break;
case COMP_BW_ERR:
+ case COMP_2ND_BW_ERR:
dev_warn(&udev->dev, "Not enough bandwidth "
"for new device state.\n");
ret = -ENOSPC;
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -900,7 +900,6 @@ struct xhci_transfer_event {
/* Invalid Stream ID Error */
#define COMP_STRID_ERR 34
/* Secondary Bandwidth Error - may be returned by a Configure Endpoint cmd */
-/* FIXME - check for this */
#define COMP_2ND_BW_ERR 35
/* Split Transaction Error */
#define COMP_SPLIT_ERR 36
next prev parent reply other threads:[~2012-01-10 22:58 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-10 21:46 [00/40] 3.0.17-stable review Greg KH
2012-01-10 21:45 ` [01/40] MAINTAINERS: stable: Update address Greg KH
2012-01-10 21:45 ` [02/40] Documentation: Update stable address Greg KH
2012-01-10 21:45 ` [03/40] firmware: Fix an oops on reading fw_priv->fw in sysfs loading file Greg KH
2012-01-10 21:45 ` [04/40] rt2800usb: Move ID out of unknown Greg KH
2012-01-10 21:45 ` [05/40] offb: Fix setting of the pseudo-palette for >8bpp Greg KH
2012-01-10 21:45 ` [06/40] offb: Fix bug in calculating requested vram size Greg KH
2012-01-10 21:45 ` [07/40] wl12xx: Validate FEM index from ini file and FW Greg KH
2012-01-10 21:45 ` [08/40] wl12xx: Check buffer bound when processing nvs data Greg KH
2012-01-10 21:45 ` [09/40] powerpc/time: Handle wrapping of decrementer Greg KH
2012-01-10 21:45 ` [10/40] powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit Greg KH
2012-01-10 21:45 ` [11/40] asix: new device id Greg KH
2012-01-10 21:45 ` [12/40] IB/qib: Fix a possible data corruption when receiving packets Greg KH
2012-01-10 21:45 ` [13/40] perf: Fix parsing of __print_flags() in TP_printk() Greg KH
2012-01-10 21:45 ` [14/40] reiserfs: Fix quota mount option parsing Greg KH
2012-01-10 21:45 ` [15/40] reiserfs: Force inode evictions before umount to avoid crash Greg KH
2012-01-10 21:45 ` [16/40] ext3: Dont warn from writepage when readonly inode is spotted after error Greg KH
2012-01-10 21:45 ` [17/40] USB: update documentation for usbmon Greg KH
2012-01-10 21:45 ` [18/40] atmel_serial: fix spinlock lockup in RS485 code Greg KH
2012-01-10 21:45 ` [19/40] cgroup: fix to allow mounting a hierarchy by name Greg KH
2012-01-10 21:45 ` [20/40] udf: Fix deadlock when converting file from in-ICB one to normal one Greg KH
2012-01-10 21:45 ` [21/40] drivers/usb/class/cdc-acm.c: clear dangling pointer Greg KH
2012-01-10 21:45 ` [22/40] USB: isight: fix kernel bug when loading firmware Greg KH
2012-01-10 21:45 ` [23/40] usb: usb-storage doesnt support dynamic id currently, the patch disables the feature to fix an oops Greg KH
2012-01-10 21:45 ` [24/40] USB: add quirk for another camera Greg KH
2012-01-10 21:45 ` [25/40] usb: musb: fix pm_runtime mismatch Greg KH
2012-01-10 21:45 ` [26/40] USB: omninet: fix write_room Greg KH
2012-01-10 21:45 ` [27/40] USB: Add USB-ID for Multiplex RC serial adapter to cp210x.c Greg KH
2012-01-10 21:45 ` [28/40] usb: fix number of mapped SG DMA entries Greg KH
2012-01-10 21:45 ` Greg KH [this message]
2012-01-10 21:45 ` [30/40] USB: option: add id for 3G dongle Model VT1000 of Viettel Greg KH
2012-01-10 21:45 ` [31/40] usb: option: add ZD Incorporated HSPA modem Greg KH
2012-01-10 21:45 ` [32/40] usb: ch9: fix up MaxStreams helper Greg KH
2012-01-10 21:45 ` [33/40] OHCI: final fix for NVIDIA problems (I hope) Greg KH
2012-01-10 21:45 ` [34/40] igmp: Avoid zero delay when receiving odd mixture of IGMP queries Greg KH
2012-01-10 21:45 ` [35/40] asix: fix infinite loop in rx_fixup() Greg KH
2012-01-10 21:45 ` [36/40] bonding: fix error handling if slave is busy (v2) Greg KH
2012-01-10 21:45 ` [37/40] PM / Sleep: Fix race between CPU hotplug and freezer Greg KH
2012-01-10 21:45 ` [38/40] SCSI: mpt2sas: Added missing mpt2sas_base_detach call from scsih_remove context Greg KH
2012-01-10 21:45 ` [39/40] usb: cdc-acm: Fix acm_tty_hangup() vs. acm_tty_close() race Greg KH
2012-01-10 21:45 ` [40/40] xfs: fix acl count validation in xfs_acl_from_disk() Greg KH
2012-01-11 22:21 ` [00/40] 3.0.17-stable review Nick Bowler
2012-01-12 23:01 ` Greg KH
2012-01-12 23:15 ` David Miller
2012-01-17 17:47 ` Greg KH
2012-01-26 18:35 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120110214620.733732252@clark.kroah.org \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sarah.a.sharp@linux.intel.com \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®