From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750941AbdGYFMy (ORCPT ); Tue, 25 Jul 2017 01:12:54 -0400 Received: from mga02.intel.com ([134.134.136.20]:24786 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750855AbdGYFMw (ORCPT ); Tue, 25 Jul 2017 01:12:52 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,410,1496127600"; d="scan'208";a="131483608" From: Lu Baolu To: Mathias Nyman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH 1/1] usb: xhci: Handle USB transaction error on address command Date: Tue, 25 Jul 2017 13:09:49 +0800 Message-Id: <1500959389-19099-1-git-send-email-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Xhci driver handles USB transaction errors on transfer events, but transaction errors are possible on address device command completion events as well. The xHCI specification (section 4.6.5) says: A USB Transaction Error Completion Code for an Address Device Command may be due to a Stall response from a device. Software should issue a Disable Slot Command for the Device Slot then an Enable Slot Command to recover from this error. This patch handles USB transaction errors on address command completion events. The related discussion threads can be found through below links. http://marc.info/?l=linux-usb&m=149362010728921&w=2 http://marc.info/?l=linux-usb&m=149252752825755&w=2 Suggested-by: Mathias Nyman Signed-off-by: Lu Baolu --- drivers/usb/host/xhci.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index b2ff1ff..9cc56cd 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -3836,6 +3836,12 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev, ret = -EINVAL; break; case COMP_USB_TRANSACTION_ERROR: + xhci_free_virt_device(xhci, udev->slot_id); + ret = xhci_disable_slot(xhci, command, udev->slot_id); + udev->slot_id = 0; + if (!ret) + xhci_alloc_dev(hcd, udev); + dev_warn(&udev->dev, "Device not responding to setup %s.\n", act); ret = -EPROTO; break; -- 2.7.4