Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp2350145pxb; Mon, 20 Sep 2021 19:44:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQDc9bkbQCsmeZx6H3Q6LVzBXD741o8SlykDYCosw/OEiFcqweE4yvH79tWuMgo8TmUoot X-Received: by 2002:a17:906:1b42:: with SMTP id p2mr33835499ejg.210.1632192293232; Mon, 20 Sep 2021 19:44:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632192293; cv=none; d=google.com; s=arc-20160816; b=DxmCIvf827HT7keSNiLM6vfoWe6gxJ7dPHAR1BnCC47W2c6wNobpA543RsRtE5/dU5 nr6GkJN3mGlO+94jBbzeOckBdvljSqlxpC90syk0ER2y+ueBfHsPI8BFtAnd0iuoQg2g eswxAQpUFqhE06bzIxMHC6wbDEJzanga7O7PgFMan9bMVvFVPK87uakz/MUJOOmuT5SE IQCgHeBNN8eRT1rhjdfiFHqi9L6X9FBD5n5ONOSaT7bVVpYvBEx/j4zcT/jyA2tecT5H TeFe4PzNkJC6bUg2uhEyx12OOwLwwU+aANeOQCmwXKEno/4Kdpfac7qpLpL+HbQ3qZko ybFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hy1NfizQrwlszpcZ3xK2PuCaFpvVM1E3TzBK96bwRVA=; b=hpAyp0iw3xavPRYbTqxEvL7Y1F7zRyiS3zx0i821TP5ql6Xd+5pq8++mwJl0PeIu1W RGaMDhlvfAk3xTDJ142DVhVSXxcAyn1C5hVy7qT79SSX3VOOfITqE5CcyBCfUL3anYSb EHheuL7E7GMHp4IhvRUqjD5xblapAmgecyXjCMEoK0AgoEQl2dh9xoRZaPFW7Obbp4Lt 9Wk0v5QfIRBYAPWM+3jyyhzDbBdj/kOIVTAuchoAtrcBwDDHL37qFS2YPZYSv4TclHWp /moGfb5QXVjOVpeE7JfQcneboRodB8l9DOLKV1E2GtKY+/aLD7wYbMNyG/iyAYNVtO6i Z0oA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=dfaCuQz2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id os28si12793983ejb.559.2021.09.20.19.44.30; Mon, 20 Sep 2021 19:44:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=dfaCuQz2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378160AbhITSXN (ORCPT + 99 others); Mon, 20 Sep 2021 14:23:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:39460 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377167AbhITSPY (ORCPT ); Mon, 20 Sep 2021 14:15:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A4CEE61A65; Mon, 20 Sep 2021 17:21:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632158510; bh=S9K1QYjCZxHE59FZS1YbNPPOaNzHIP6WAu8aihOolSI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dfaCuQz25ZiwV7Pqwo/iHCpRhkOdB9hMgqjJ88+THN8cl/6ERm3g2tjwJkDwWS4qX EIu3zCOszgrcHJFlSwrDRPXb5/b7g6tYt3kg3rQ7Yks+mBRsDY2Gtn3Rf07REBEygk cRqEzMS3rAgNnCOy0nIjNJ/6N8c75KZyNOGkDCc8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mathias Nyman , Sasha Levin Subject: [PATCH 5.4 157/260] Revert "USB: xhci: fix U1/U2 handling for hardware with XHCI_INTEL_HOST quirk set" Date: Mon, 20 Sep 2021 18:42:55 +0200 Message-Id: <20210920163936.438395883@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163931.123590023@linuxfoundation.org> References: <20210920163931.123590023@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mathias Nyman [ Upstream commit 2847c46c61486fd8bca9136a6e27177212e78c69 ] This reverts commit 5d5323a6f3625f101dbfa94ba3ef7706cce38760. That commit effectively disabled Intel host initiated U1/U2 lpm for devices with periodic endpoints. Before that commit we disabled host initiated U1/U2 lpm if the exit latency was larger than any periodic endpoint service interval, this is according to xhci spec xhci 1.1 specification section 4.23.5.2 After that commit we incorrectly checked that service interval was smaller than U1/U2 inactivity timeout. This is not relevant, and can't happen for Intel hosts as previously set U1/U2 timeout = 105% * service interval. Patch claimed it solved cases where devices can't be enumerated because of bandwidth issues. This might be true but it's a side effect of accidentally turning off lpm. exit latency calculations have been revised since then Signed-off-by: Mathias Nyman Link: https://lore.kernel.org/r/20210820123503.2605901-5-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/host/xhci.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index a3813c75a3de..505da4999e20 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -4662,19 +4662,19 @@ static u16 xhci_calculate_u1_timeout(struct xhci_hcd *xhci, { unsigned long long timeout_ns; - if (xhci->quirks & XHCI_INTEL_HOST) - timeout_ns = xhci_calculate_intel_u1_timeout(udev, desc); - else - timeout_ns = udev->u1_params.sel; - /* Prevent U1 if service interval is shorter than U1 exit latency */ if (usb_endpoint_xfer_int(desc) || usb_endpoint_xfer_isoc(desc)) { - if (xhci_service_interval_to_ns(desc) <= timeout_ns) { + if (xhci_service_interval_to_ns(desc) <= udev->u1_params.mel) { dev_dbg(&udev->dev, "Disable U1, ESIT shorter than exit latency\n"); return USB3_LPM_DISABLED; } } + if (xhci->quirks & XHCI_INTEL_HOST) + timeout_ns = xhci_calculate_intel_u1_timeout(udev, desc); + else + timeout_ns = udev->u1_params.sel; + /* The U1 timeout is encoded in 1us intervals. * Don't return a timeout of zero, because that's USB3_LPM_DISABLED. */ @@ -4726,19 +4726,19 @@ static u16 xhci_calculate_u2_timeout(struct xhci_hcd *xhci, { unsigned long long timeout_ns; - if (xhci->quirks & XHCI_INTEL_HOST) - timeout_ns = xhci_calculate_intel_u2_timeout(udev, desc); - else - timeout_ns = udev->u2_params.sel; - /* Prevent U2 if service interval is shorter than U2 exit latency */ if (usb_endpoint_xfer_int(desc) || usb_endpoint_xfer_isoc(desc)) { - if (xhci_service_interval_to_ns(desc) <= timeout_ns) { + if (xhci_service_interval_to_ns(desc) <= udev->u2_params.mel) { dev_dbg(&udev->dev, "Disable U2, ESIT shorter than exit latency\n"); return USB3_LPM_DISABLED; } } + if (xhci->quirks & XHCI_INTEL_HOST) + timeout_ns = xhci_calculate_intel_u2_timeout(udev, desc); + else + timeout_ns = udev->u2_params.sel; + /* The U2 timeout is encoded in 256us intervals */ timeout_ns = DIV_ROUND_UP_ULL(timeout_ns, 256 * 1000); /* If the necessary timeout value is bigger than what we can set in the -- 2.30.2