Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp151224pxb; Mon, 13 Sep 2021 15:36:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9/t0wMJp97mAd5J5dRFjZ/h2jUTtSjdPfzhKKj8tur4WDllwG0GuHwNS3HWTT++hVOn41 X-Received: by 2002:a17:906:1454:: with SMTP id q20mr15828925ejc.446.1631572586951; Mon, 13 Sep 2021 15:36:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631572586; cv=none; d=google.com; s=arc-20160816; b=TZe9jJ+nDPTaFEtRoI9DcTvWk1O7KhNeVg03uXsoyXbFtnyfpSKU4Y7sVubQFNTdM0 g5deTqxHPRtEATf0dYRas0daotHh8SVj1FbkcPC6Jvo1RqpX03wT3sYKG/LTKeyuTw/A DKmgFtP8/dt/S25fv2f7Ccv93yfRDHXRj0oDnt2uvzY78N4LZde1nGIUjgGPQgjlLOh9 ZNpJF81EiqlRLlm+QiqXRoxwmH47VRKP2/vg43o4FCCxQ0iV+eS35XVPpa+ho9FZyKih ZdkK4bQwavWLDUfc5OpMe/7SMliqYulM3PoydEgy9BWrHVwJSTDtGxt16xNdh2OtEs6k 1iyg== 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=xox6faMcnnQylytck9mN2ssMSN9AYKMA6HbM98U/5pU=; b=dda6FeurKHpgbHS6UaZgAwPMUdtcsDBCgSedsBRJtDVnPLaUTmRALbTQcHm2L+fwNJ qZzHXB4qfs+xGsgAKgag/tBdkgMHQO4Zx2tDMnnMKLaEnicYVKyEtSe8CBZY9HklNAdc SqXjPEKbdmy3yjX2S/UVMRK4NE0E0GA4d2rO+XBrltZiXS4B6S7xJDqGKi8lAqQwbrP8 tgrCDJVbJ4Uq1rgRdqCp3WFbaN+UcCeHE1YItim705fw00VTkyNmgophpYPUaXHSVj83 OjTC81m4RiK92AZilOgNk7nnNr5uasVyh8gnwP/beBBRBg2Myw1pUHeVbvOP0+13oV/S Te6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TvDzcIuY; 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 hs3si10008710ejc.368.2021.09.13.15.36.02; Mon, 13 Sep 2021 15:36:26 -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=TvDzcIuY; 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 S1343928AbhIMOHE (ORCPT + 99 others); Mon, 13 Sep 2021 10:07:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:53798 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343858AbhIMODr (ORCPT ); Mon, 13 Sep 2021 10:03:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A755461213; Mon, 13 Sep 2021 13:38:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631540337; bh=4lNStKHAZ5/2npc1m5PB5MYuuO/RRRqAN+uYexo6khE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TvDzcIuY9IfQUYckKgIv0Q6ZWIf2vuzeeHIhnbXPts13XW1NY8Bc8RdCc6fhIMAPj JpQv2hF5Z2Az/aPIPbA1/TBfE427OhDnqExMUeQE1YTC2D4VFAPk1iW558qnrjFHTs MF3rdtse3ZKCNkWcPXkUu3EgmwT3QW4dGMTnDn/M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mika Westerberg , Utkarsh H Patel , Koba Ko , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 5.13 151/300] PCI: PM: Avoid forcing PCI_D0 for wakeup reasons inconsistently Date: Mon, 13 Sep 2021 15:13:32 +0200 Message-Id: <20210913131114.500214240@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131109.253835823@linuxfoundation.org> References: <20210913131109.253835823@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: Rafael J. Wysocki [ Upstream commit da9f2150684ea684a7ddd6d7f0e38b2bdf43dcd8 ] It is inconsistent to return PCI_D0 from pci_target_state() instead of the original target state if 'wakeup' is true and the device cannot signal PME from D0. This only happens when the device cannot signal PME from the original target state and any shallower power states (including D0) and that case is effectively equivalent to the one in which PME singaling is not supported at all. Since the original target state is returned in the latter case, make the function do that in the former one too. Link: https://lore.kernel.org/linux-pm/3149540.aeNJFYEL58@kreacher/ Fixes: 666ff6f83e1d ("PCI/PM: Avoid using device_may_wakeup() for runtime PM") Reported-by: Mika Westerberg Reported-by: Utkarsh H Patel Reported-by: Koba Ko Signed-off-by: Rafael J. Wysocki Reviewed-by: Mika Westerberg Tested-by: Mika Westerberg Signed-off-by: Sasha Levin --- drivers/pci/pci.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 8d4ebe095d0c..75cab0142373 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -2599,16 +2599,20 @@ static pci_power_t pci_target_state(struct pci_dev *dev, bool wakeup) if (dev->current_state == PCI_D3cold) target_state = PCI_D3cold; - if (wakeup) { + if (wakeup && dev->pme_support) { + pci_power_t state = target_state; + /* * Find the deepest state from which the device can generate * PME#. */ - if (dev->pme_support) { - while (target_state - && !(dev->pme_support & (1 << target_state))) - target_state--; - } + while (state && !(dev->pme_support & (1 << state))) + state--; + + if (state) + return state; + else if (dev->pme_support & 1) + return PCI_D0; } return target_state; -- 2.30.2