Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp235781ybg; Thu, 17 Oct 2019 22:07:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqz7AiD9jHu4xb5RtqOGXRBX2NnjPWQ4pNiKr5BuEnVlGMbQQ6X+d9OYIeqDDsTXb5FZpR7/ X-Received: by 2002:aa7:c751:: with SMTP id c17mr7694901eds.29.1571375239470; Thu, 17 Oct 2019 22:07:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571375239; cv=none; d=google.com; s=arc-20160816; b=S75V8qOIAKoLpC89tqKnWSYWW/ZGhs3iKTrkYeKJcHUTHdyemIkOUIF/PpRQ41Qpkw Tpp8isSdtJZeca9PXz2yf1mp3JFGK/FiQSE41vRBn2H3ReneNG+TpvyCTDRPDRc74O7u Ah++VCDmWxinhGZVcPodiK4lXyAshhTrsIiF4e/cwjEHMF6DkcU+e1RBut6BYp8r1XH/ cn/U5MhnY7VexfnPxqjcR1jLl9+DrjbQCM1GIwm82naoCsuK4QNAoFWt3+zxL7Fv9JnM U8jqLDfgPgLOhYcGloY1pjqQeHXQ8w+R06VbEd8J1g38mQ733xtn9xILLJP8Cd1F80jU eWfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=m8TBT4RFPOxBIh3+y7fWmIIOWZpM2JjH5PtnGpYf4t0=; b=u7nszf7Wpe5r/tJTUyUfH4z8deOQzO5+h7n0BWRJjtNwxt65KCOiNsTBd1iwoWJx0i tCqg/c6BtDmaHQ3jJAwXv9lf+wBD42BR5znEyX5bTCZOiipKhkTyOIugOLNSRBsBgDkd jE0CzpXmYbqUz8bpll4Q2DOf1DfhzipLYu0+qvk3a43VbF8+kqgXVNnelNOkh+H8zQSH CDiXFH7VvnsQROQ7BXss+0FlbenJjBz6oFN0sk9trnpigh9iTrihz5czV36X9CVRCcVh mLAq4CUuMk1pWo8juhMrQaK3sakPewu/Gr1hwWc2buqY7jyW1tvROOajTkqK4zbgyd0z Y72w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ED7UrVTo; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b4si3601450edk.331.2019.10.17.22.06.56; Thu, 17 Oct 2019 22:07:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ED7UrVTo; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407645AbfJPWW3 (ORCPT + 99 others); Wed, 16 Oct 2019 18:22:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:41956 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437460AbfJPVxP (ORCPT ); Wed, 16 Oct 2019 17:53:15 -0400 Received: from localhost (unknown [192.55.54.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0FEEC21A49; Wed, 16 Oct 2019 21:53:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262795; bh=rw7PZVuCdsh//bzGeslxpHN6eG+PUEXUS7gZAtJ2DAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ED7UrVTouiSjkuA2BiyFkRXzGkifxmc5kySnVTrN0+WMyiFURrmrskRAzxfC7E+Kt lYmv4YCVE3uc958Z18VmR97n/nwEXRQm7ZGWciP5St4MzX2hnU+KpuXdQz8XRqDTjE GCf6MVJwW+w12NxddnO1hVK+5dgGmobxAIUfHhI4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jan Schmidt , Mathias Nyman Subject: [PATCH 4.4 34/79] xhci: Prevent device initiated U1/U2 link pm if exit latency is too long Date: Wed, 16 Oct 2019 14:50:09 -0700 Message-Id: <20191016214758.692831955@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214729.758892904@linuxfoundation.org> References: <20191016214729.758892904@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mathias Nyman commit cd9d9491e835a845c1a98b8471f88d26285e0bb9 upstream. If host/hub initiated link pm is prevented by a driver flag we still must ensure that periodic endpoints have longer service intervals than link pm exit latency before allowing device initiated link pm. Fix this by continue walking and checking endpoint service interval if xhci_get_timeout_no_hub_lpm() returns anything else than USB3_LPM_DISABLED While at it fix the split line error message Tested-by: Jan Schmidt Cc: Signed-off-by: Mathias Nyman Link: https://lore.kernel.org/r/1570190373-30684-3-git-send-email-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/xhci.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -4645,10 +4645,12 @@ static u16 xhci_calculate_lpm_timeout(st if (intf->dev.driver) { driver = to_usb_driver(intf->dev.driver); if (driver && driver->disable_hub_initiated_lpm) { - dev_dbg(&udev->dev, "Hub-initiated %s disabled " - "at request of driver %s\n", - state_name, driver->name); - return xhci_get_timeout_no_hub_lpm(udev, state); + dev_dbg(&udev->dev, "Hub-initiated %s disabled at request of driver %s\n", + state_name, driver->name); + timeout = xhci_get_timeout_no_hub_lpm(udev, + state); + if (timeout == USB3_LPM_DISABLED) + return timeout; } }