From patchwork Thu Mar 30 13:30:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 9654213 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2460660113 for ; Thu, 30 Mar 2017 13:31:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17A2927D5E for ; Thu, 30 Mar 2017 13:31:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C71F28433; Thu, 30 Mar 2017 13:31:48 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 974C627D5E for ; Thu, 30 Mar 2017 13:31:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933235AbdC3NbG (ORCPT ); Thu, 30 Mar 2017 09:31:06 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:50408 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933062AbdC3NbD (ORCPT ); Thu, 30 Mar 2017 09:31:03 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3A28B60F32; Thu, 30 Mar 2017 13:30:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1490880657; bh=J+waotxIImLa0ZrFu6ACQeEJDCTBz7YeEVujiTOd0Ng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e7YqyS/WmFlEtweTUkdPvPCYXcnIe5LM8UcmMW+rkCL8o0euQmDVDDQA+Wpmu5VIF UwcCfbmItiJ7I7hFcTqN3IqHobRdjCAx2mDqOCyBAj3It79Bm0MG7HxuRAZ+qXaevq UtYJLvjnO+kmtLXiotQMl6uFchqJx2hTV9iC9KTM= Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 571CD60DAA; Thu, 30 Mar 2017 13:30:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1490880656; bh=J+waotxIImLa0ZrFu6ACQeEJDCTBz7YeEVujiTOd0Ng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mSqyOi6hprH6FQYogTTE3XCKFkx7MuXGKTowJGNU4SryTZ89kU+2Do4g9PY2qq2PO 3wucdZbjXp5Ezghu21xiGywEr2S9ybAYtslP7X0O+AG/WOkBBR4uL31AzYUvN9p+hs 36aIrDpXyHyNjDC2Z//QgPv7AUKnmUEpbNJheMj0= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 571CD60DAA Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: linux-pci@vger.kernel.org, timur@codeaurora.org Cc: mayurkumar.patel@intel.com, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Bjorn Helgaas , Rajat Jain , Yinghai Lu , Julia Lawall , David Daney , linux-kernel@vger.kernel.org Subject: [PATCH V7 5/5] PCI/ASPM: move link_state cleanup to bridge remove Date: Thu, 30 Mar 2017 09:30:36 -0400 Message-Id: <1490880636-30542-6-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1490880636-30542-1-git-send-email-okaya@codeaurora.org> References: <1490880636-30542-1-git-send-email-okaya@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For endpoints, change pcie_aspm_exit_link_state() so it cleans up the device's own state and disables ASPM if necessary, but doesn't remove the parent's link_state. For bridges, change pcie_aspm_exit_link_state() so it frees the bridge's own link_state. Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=194895 Signed-off-by: Sinan Kaya --- drivers/pci/pcie/aspm.c | 20 +++++++++++++++----- drivers/pci/remove.c | 3 +-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index a38602a..e6fd297 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -960,6 +960,21 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev) struct pci_dev *parent = pdev->bus->self; struct pcie_link_state *link, *root, *parent_link; + if (pdev->has_secondary_link) { + link = pdev->link_state; + down_read(&pci_bus_sem); + mutex_lock(&aspm_lock); + + list_del(&link->sibling); + list_del(&link->link); + + /* Clock PM is for endpoint device */ + free_link_state(link); + mutex_unlock(&aspm_lock); + up_read(&pci_bus_sem); + return; + } + if (!parent || !parent->link_state) return; @@ -978,11 +993,6 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev) /* All functions are removed, so just disable ASPM for the link */ pcie_config_aspm_link(link, 0); - list_del(&link->sibling); - list_del(&link->link); - /* Clock PM is for endpoint device */ - free_link_state(link); - /* Recheck latencies and configure upstream links */ if (parent_link) { pcie_update_aspm_capable(root); diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index 73a03d3..7e14ebd 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -25,8 +25,7 @@ static void pci_stop_dev(struct pci_dev *dev) dev->is_added = 0; } - if (dev->bus->self) - pcie_aspm_exit_link_state(dev); + pcie_aspm_exit_link_state(dev); } static void pci_destroy_dev(struct pci_dev *dev)