From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756001AbbBFPVy (ORCPT ); Fri, 6 Feb 2015 10:21:54 -0500 Received: from down.free-electrons.com ([37.187.137.238]:42118 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754626AbbBFPVw (ORCPT ); Fri, 6 Feb 2015 10:21:52 -0500 From: Gregory CLEMENT To: Mathias Nyman , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Thomas Petazzoni , Ezequiel Garcia , Maxime Ripard , Boris BREZILLON , Lior Amsalem , Tawfik Bayouk , Nadav Haklai , Shimmer Huang , Guang Shen , Gregory CLEMENT , Subject: [PATCH] xhci: Fix the lack of support for the Handle Port Configure Error Date: Fri, 6 Feb 2015 16:20:46 +0100 Message-Id: <1423236046-24229-1-git-send-email-gregory.clement@free-electrons.com> X-Mailer: git-send-email 2.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shimmer Huang Linux xHCI driver does not check the CEC bit in register PORTSC when handling port status events. If Port Configure Error for root hub port occurs, CEC bit in PORTSC would be set by xHC and remains 1. This happends when the root port fails to configure its link partner, e.g. the port fails to exchange port capabilities information using Port Capability LMPs. Then the Port Status Change Events will be blocked until all status change bits(CEC is one of the change bits) are cleared('0') (refer to xHCI spec 4.19.2). Otherwise, the port status change event for this root port will not be generated anymore, then root port would look like “dead” for user and can’t be recovered until a Host Controller Reset(HCRST) This patch is to check CEC bit and clear the CEC bit if it's set to 1 in function handle_port_status(). [gregory.clement@free-electrons.com: ported from 3.10 and added more explanations(from Shimmer) in the commit log] Signed-off-by: Guang Shen Signed-off-by: Shimmer Huang Signed-off-by: Nadav Haklai Reviewed-by: Yehuda Yitschak Signed-off-by: Gregory CLEMENT Cc: --- Hi, usually I tried to add a kernel version for the stable team, but for this patch I don't know since when it makes sens to apply it. Gregory drivers/usb/host/xhci-ring.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index e692e769c50c..45d8dd7e07f3 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1541,6 +1541,13 @@ static void handle_port_status(struct xhci_hcd *xhci, port_id); temp = readl(port_array[faked_port_index]); + + if (temp & PORT_CEC) { + xhci_dbg(xhci, "port failed to configure its link partner.\n"); + xhci_test_and_clear_bit(xhci, port_array, + faked_port_index, PORT_CEC); + } + if (hcd->state == HC_STATE_SUSPENDED) { xhci_dbg(xhci, "resume root hub\n"); usb_hcd_resume_root_hub(hcd); -- 2.1.0