Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp229258ybg; Thu, 17 Oct 2019 22:00:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqy+45zaeYBV5kJiybwv+fmrGvxLQ6C2NfvTKaBB+lxCi8mGnu2GHucF8bIJJIkRf2giQZUc X-Received: by 2002:a50:e445:: with SMTP id e5mr7493793edm.257.1571374847125; Thu, 17 Oct 2019 22:00:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571374847; cv=none; d=google.com; s=arc-20160816; b=Nudz0UUfFtGhXi1cbiqW5v25es7mpAgBmEwqUfSHY0Vl2xsOR/Ka5Pk0mm2LQ0qW80 WjWjMLbtbjkRUjoEKzCu8M7U7gp6m2eNEViGSkWdGxeLKlzP8+MNOfM3x5mAk2q1khiY CYAiiFDMqSmd5zmaNu2hL+MqgSiBcNsQxK98pwXwWbjl/Hu5ZA54KOT9hwe9EgJT8sq0 Yej5PIejbXCai+6Q0lN6uNx+B/UokkfsYkcpTW/m3s5Axk7/kp5ttt2tggZPizFEFThn ghp6oAXLLTt60PsgDzjRhq3bWNSrpy6i6YnDghaVL/1tlyDYhI6kGxP9+YjdiSJmGs91 3Flw== 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=BgmOnVa7uWuyO8TDJajAChVM7QCL1rrgldZJJPMVD0c=; b=IRvgDyivGxLS8E8DLZaSjPeA8FtQDon1pLdF2IF0U9Hnqu/3ulRAl1qMCT2T8fZRaq Al1GjxYzcvTjY8TwoZ28gqhZc/YzRWF8xBFr5qv2m8nyU+916qShh7RgpnOe8zFtvBbO X0OpZwmorSazfk/Ngpky/1ZOTK6XfWZPeNdBCvBPnTvZ7fghBV6ZPQ2h8ITuTUHrZjmw rlRb6KguxqZx3utv8v/sp0dx9OtN5sU3O2FPDFPaR69aEIC+lg7JL218PGkDfYwXg355 f85RntAaO/k8UdOSM0WvaOD1tDJPZaSRUda3eJazUEULeOK3+5wom8nTO0tFSUTtQiZH 4ktg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RP3bAEII; 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 e43si3592774eda.296.2019.10.17.22.00.23; Thu, 17 Oct 2019 22:00:47 -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=RP3bAEII; 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 S2388300AbfJPWRi (ORCPT + 99 others); Wed, 16 Oct 2019 18:17:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:44810 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395062AbfJPVyq (ORCPT ); Wed, 16 Oct 2019 17:54:46 -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 9D5A621925; Wed, 16 Oct 2019 21:54:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262885; bh=Wt1tv7tNjiydPZE6IRAofNZlC4bnZvtw4Ze1u8coRqA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RP3bAEII3jfOI5LltwV4FdG/gGoeaDo0EbP+ns1/TvfRitewW61H89WxIZzZ4u6Vu yeUjpPJCT4/JdzjD7bZPvMiL5PR1ZYGp+j4aS56i34JHk8WNafr5QmMxdvRvgpe5rw 60pkhFNnr9i1dhhyAuYy4iur5uP20V3EBH7JMqSM= 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.9 43/92] xhci: Prevent device initiated U1/U2 link pm if exit latency is too long Date: Wed, 16 Oct 2019 14:50:16 -0700 Message-Id: <20191016214833.342835213@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214759.600329427@linuxfoundation.org> References: <20191016214759.600329427@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 @@ -4626,10 +4626,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; } }