From patchwork Mon Aug 5 20:52:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 11077775 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6769615AC for ; Mon, 5 Aug 2019 20:52:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BCF5274D1 for ; Mon, 5 Aug 2019 20:52:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 507CF28904; Mon, 5 Aug 2019 20:52:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_WEB autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A6F0274D1 for ; Mon, 5 Aug 2019 20:52:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730749AbfHEUwr (ORCPT ); Mon, 5 Aug 2019 16:52:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:38946 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730600AbfHEUwe (ORCPT ); Mon, 5 Aug 2019 16:52:34 -0400 Received: from localhost (unknown [64.22.228.164]) (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 39E3720C01; Mon, 5 Aug 2019 20:52:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565038353; bh=epBBzigvGgwT7lARsKbxLwOppbEAFmOzIcevnWxXMS4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q4D1Z8jFkVOoB9lCnWIf7NJeAeat3GCb9SNcr13hOplr+02a6/tTQ+4SQT4m3Vjtw FYCdoWqcYeqTjrgke3ZfCHOgcDJJyt62LMuRwZtoibq1THl4CkAPK6FprKeyF4dt49 CU5lpoJILd0jqRQuf6VTAqVGfDqovQALkQRNmabY= From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: Lorenzo Pieralisi , Keith Busch , Greg Kroah-Hartman , "Rafael J . Wysocki" , Mika Westerberg , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 3/5] PCI / PM: Check for error when reading PME status Date: Mon, 5 Aug 2019 15:52:12 -0500 Message-Id: <20190805205214.194981-4-helgaas@kernel.org> X-Mailer: git-send-email 2.22.0.770.g0f2c4a37fd-goog In-Reply-To: <20190805205214.194981-1-helgaas@kernel.org> References: <20190805205214.194981-1-helgaas@kernel.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bjorn Helgaas pci_check_pme_status() reads the Power Management capability to determine whether a device has generated a PME. The capability is in config space, which is accessible in D0, D1, D2, and D3hot, but not in D3cold. If we call pci_check_pme_status() on a device that's in D3cold, config reads fail and return ~0 data, which we erroneously interpreted as "the device has generated a PME". 000dd5316e1c ("PCI: Do not poll for PME if the device is in D3cold") avoided many of these problems by avoiding pci_check_pme_status() if we think the device is in D3cold. However, it is not a complete fix because the device may go to D3cold after we check its power state but before pci_check_pme_status() reads the Power Management Status Register. Return false ("device has not generated a PME") if we get an error response reading the Power Management Status Register. Fixes: 000dd5316e1c ("PCI: Do not poll for PME if the device is in D3cold") Fixes: 71a83bd727cc ("PCI/PM: add runtime PM support to PCIe port") Signed-off-by: Bjorn Helgaas --- drivers/pci/pci.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 984171d40858..af6a97d7012b 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -2008,6 +2008,9 @@ bool pci_check_pme_status(struct pci_dev *dev) pmcsr_pos = dev->pm_cap + PCI_PM_CTRL; pci_read_config_word(dev, pmcsr_pos, &pmcsr); + if (pmcsr == (u16) PCI_ERROR_RESPONSE) + return false; + if (!(pmcsr & PCI_PM_CTRL_PME_STATUS)) return false;