From patchwork Wed Mar 29 23:04:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 9652725 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 8B8F6602BE for ; Wed, 29 Mar 2017 23:05:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E0CA28559 for ; Wed, 29 Mar 2017 23:05:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 72D3F28563; Wed, 29 Mar 2017 23:05:37 +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 37A4328559 for ; Wed, 29 Mar 2017 23:05:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932963AbdC2XEo (ORCPT ); Wed, 29 Mar 2017 19:04:44 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:50444 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932945AbdC2XEl (ORCPT ); Wed, 29 Mar 2017 19:04:41 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 267BC60E07; Wed, 29 Mar 2017 23:04:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1490828680; bh=ZlKhcemafWR+XD1KyplpId4fik8pInxNUvtGWK71lWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=erTlb9hC30pN22Jca6A6YfaKf+QWF3IT25N6LwWCqRXAzQmKlueoENHtJrmBo+TRR Rk2WYGk8d+PcCYlyaTyY6ONECBwdBa8+yJ2W3FQTrKiU/ewi1vJfSJXarOQ+Z6tfRn 09Jmr2e12pfNIrmJ8OlHrWEpZjZYhQT8J6IJuEWI= 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 85E2060DE2; Wed, 29 Mar 2017 23:04:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1490828679; bh=ZlKhcemafWR+XD1KyplpId4fik8pInxNUvtGWK71lWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SmKfh4de7JvHIz/to9sH6mejJ32XKUHcK/2jmPqG8xCCROzvOxqyOSgzXwpNmOocv EVB/e7gTzRAe7rva2a47PNERYDiS+tXW+WR89zu1NNOpKg1Nif1k/quxtI/YrIe06O E48mg5gZcpUpxdds3/YsZbDbHzOtfp98iU3lhDCM= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 85E2060DE2 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 , David Daney , linux-kernel@vger.kernel.org Subject: [PATCH V6 2/5] PCI/ASPM: split pci_aspm_init() into two Date: Wed, 29 Mar 2017 19:04:24 -0400 Message-Id: <1490828667-30973-3-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1490828667-30973-1-git-send-email-okaya@codeaurora.org> References: <1490828667-30973-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 Split pci_aspm_init() body into pci_aspm_init_upstream() and pci_aspm_init_downstream() for bridge and endpoint specific code behavior. Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=194895 Signed-off-by: Sinan Kaya --- drivers/pci/pcie/aspm.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index dc36717..a80d64b 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -826,6 +826,16 @@ static struct pcie_link_state *alloc_pcie_link_state(struct pci_dev *pdev) return link; } +static int pci_aspm_init_downstream(struct pci_dev *pdev) +{ + return 0; +} + +static int pci_aspm_init_upstream(struct pci_dev *pdev) +{ + return 0; +} + /* * pci_aspm_init: Initiate PCI express link state. * It is called from device_add for every single pci device. @@ -833,7 +843,10 @@ static struct pcie_link_state *alloc_pcie_link_state(struct pci_dev *pdev) */ int pci_aspm_init(struct pci_dev *pdev) { - return 0; + if (!pdev->has_secondary_link) + return pci_aspm_init_downstream(pdev); + + return pci_aspm_init_upstream(pdev); } /*