From patchwork Sat Mar 25 21:38:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 9644851 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 CFBC36020B for ; Sat, 25 Mar 2017 21:39:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C2C6C23E64 for ; Sat, 25 Mar 2017 21:39:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B771C27165; Sat, 25 Mar 2017 21:39:04 +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=ham 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 5FA0723E64 for ; Sat, 25 Mar 2017 21:39:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751371AbdCYVjC (ORCPT ); Sat, 25 Mar 2017 17:39:02 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:37388 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751227AbdCYVi4 (ORCPT ); Sat, 25 Mar 2017 17:38:56 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id DA4B060DE2; Sat, 25 Mar 2017 21:38:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1490477909; bh=Y6Yq6YgS3dIJr7L1gvJhXC4EyvonjuErzACyGZS74wc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fPPzM9IyMopHADx+xv5DYfMWipD7ztE06Txq27fbwDRGCUouFdkNeDJx1mHCD6l2D rLF9I/s6Cu8hTx+xLGJf1JpeLVIorWqeFonKfxqiUr4nJEuuGJ/+7mFCr2tVuyvyWV O2bWoKJXyYAhmwVYMW8VCQ5NGHcdHDLg8sb4vEzE= 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 C2F4C60DD6; Sat, 25 Mar 2017 21:38:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1490477909; bh=Y6Yq6YgS3dIJr7L1gvJhXC4EyvonjuErzACyGZS74wc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fPPzM9IyMopHADx+xv5DYfMWipD7ztE06Txq27fbwDRGCUouFdkNeDJx1mHCD6l2D rLF9I/s6Cu8hTx+xLGJf1JpeLVIorWqeFonKfxqiUr4nJEuuGJ/+7mFCr2tVuyvyWV O2bWoKJXyYAhmwVYMW8VCQ5NGHcdHDLg8sb4vEzE= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org C2F4C60DD6 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 , Julia Lawall , Shawn Lin , David Daney , linux-kernel@vger.kernel.org Subject: [PATCH V5 2/4] PCI/ASPM: add init hook to device_add Date: Sat, 25 Mar 2017 17:38:11 -0400 Message-Id: <1490477893-9517-3-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1490477893-9517-1-git-send-email-okaya@codeaurora.org> References: <1490477893-9517-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 bridges, have pcie_aspm_init_link_state() allocate a link_state, regardless of whether it currently has any children. pcie_aspm_init_link_state(): Called for bridges (upstream end of link) after all children have been enumerated. No longer needs to check aspm_support_enabled or pdev->has_secondary_link or the VIA quirk: pci_aspm_init() already checked that stuff, so we only need to check pdev->link_state here. Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=194895 Signed-off-by: Sinan Kaya --- drivers/pci/pcie/aspm.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 74fd7c5..f5b1fa0 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -834,6 +834,23 @@ static struct pcie_link_state *alloc_pcie_link_state(struct pci_dev *pdev) */ int pci_aspm_init(struct pci_dev *pdev) { + struct pcie_link_state *link; + + if (!aspm_support_enabled) + return 0; + + /* VIA has a strange chipset, root port is under a bridge */ + if (pci_pcie_type(pdev) == PCI_EXP_TYPE_ROOT_PORT && + pdev->bus->self) + return 0; + + if (!pdev->has_secondary_link) + return 0; + + link = alloc_pcie_link_state(pdev); + if (!link) + return -ENOMEM; + return 0; } @@ -847,33 +864,16 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev) struct pcie_link_state *link; int blacklist = !!pcie_aspm_sanity_check(pdev); - if (!aspm_support_enabled) - return; - - if (pdev->link_state) - return; - - /* - * We allocate pcie_link_state for the component on the upstream - * end of a Link, so there's nothing to do unless this device has a - * Link on its secondary side. - */ - if (!pdev->has_secondary_link) - return; - - /* VIA has a strange chipset, root port is under a bridge */ - if (pci_pcie_type(pdev) == PCI_EXP_TYPE_ROOT_PORT && - pdev->bus->self) + if (!pdev->link_state) return; + link = pdev->link_state; down_read(&pci_bus_sem); if (list_empty(&pdev->subordinate->devices)) goto out; mutex_lock(&aspm_lock); - link = alloc_pcie_link_state(pdev); - if (!link) - goto unlock; + /* * Setup initial ASPM state. Note that we need to configure * upstream links also because capable state of them can be @@ -898,7 +898,6 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev) pcie_set_clkpm(link, policy_to_clkpm_state(link)); } -unlock: mutex_unlock(&aspm_lock); out: up_read(&pci_bus_sem);