From patchwork Sat Mar 25 21:38:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 743511 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vrDGT5Pc0z9s7K for ; Sun, 26 Mar 2017 08:40:01 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="M0YaO0jr"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="M0YaO0jr"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751192AbdCYVi5 (ORCPT ); Sat, 25 Mar 2017 17:38:57 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:37486 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751205AbdCYVi4 (ORCPT ); Sat, 25 Mar 2017 17:38:56 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id D0B5760DEA; Sat, 25 Mar 2017 21:38:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1490477912; bh=QK1yt5dosJ1jIPIgE8x0KoIv0XIpvauVoNg4gV1zP9k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M0YaO0jrrNbMm1JgoNJ8z2fcz0ysOHodHhEMelGjs2s2i3qpHzzM3uLPNUbC9EBol GSu18zXNyF0NKu7kkCJpGbV9qL7iDc0fNej6rkfPkStJ2SrBtUGw48D1rHzuNfRMKV dJOi1ymnH4MXIQbUYD1X32EF7Md9FzgOzcUIkCLw= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 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 BBD5460DEA; Sat, 25 Mar 2017 21:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1490477912; bh=QK1yt5dosJ1jIPIgE8x0KoIv0XIpvauVoNg4gV1zP9k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M0YaO0jrrNbMm1JgoNJ8z2fcz0ysOHodHhEMelGjs2s2i3qpHzzM3uLPNUbC9EBol GSu18zXNyF0NKu7kkCJpGbV9qL7iDc0fNej6rkfPkStJ2SrBtUGw48D1rHzuNfRMKV dJOi1ymnH4MXIQbUYD1X32EF7Md9FzgOzcUIkCLw= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org BBD5460DEA 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 , Shawn Lin , linux-kernel@vger.kernel.org Subject: [PATCH V5 3/4] PCI/ASPM: save power on values during bridge init Date: Sat, 25 Mar 2017 17:38:12 -0400 Message-Id: <1490477893-9517-4-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 Now that we added a hook to be called from device_add, save the default values from the HW registers early in the boot for further reuse during hot device add/remove operations. Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=194895 Signed-off-by: Sinan Kaya --- drivers/pci/pcie/aspm.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index f5b1fa0..f48bb29 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -521,8 +521,10 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist) */ if (dwreg.support & upreg.support & PCIE_LINK_STATE_L0S) link->aspm_support |= ASPM_STATE_L0S; - if (dwreg.enabled & PCIE_LINK_STATE_L0S) + if (dwreg.enabled & PCIE_LINK_STATE_L0S) { link->aspm_enabled |= ASPM_STATE_L0S_UP; + link->aspm_default |= ASPM_STATE_L0S_UP; + } if (upreg.enabled & PCIE_LINK_STATE_L0S) link->aspm_enabled |= ASPM_STATE_L0S_DW; link->latency_up.l0s = calc_l0s_latency(upreg.latency_encoding_l0s); @@ -558,9 +560,6 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist) if (link->aspm_support & ASPM_STATE_L1SS) aspm_calc_l1ss_info(link, &upreg, &dwreg); - /* Save default state */ - link->aspm_default = link->aspm_enabled; - /* Setup initial capable state. Will be updated later */ link->aspm_capable = link->aspm_support; /* @@ -835,6 +834,7 @@ 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; + struct aspm_register_info upreg; if (!aspm_support_enabled) return 0; @@ -851,6 +851,20 @@ int pci_aspm_init(struct pci_dev *pdev) if (!link) return -ENOMEM; + pcie_get_aspm_reg(pdev, &upreg); + if (upreg.enabled & PCIE_LINK_STATE_L0S) + link->aspm_default |= ASPM_STATE_L0S_DW; + if (upreg.enabled & PCIE_LINK_STATE_L1) + link->aspm_default |= ASPM_STATE_L1; + if (upreg.l1ss_ctl1 & PCI_L1SS_CTL1_ASPM_L1_1) + link->aspm_default |= ASPM_STATE_L1_1; + if (upreg.l1ss_ctl1 & PCI_L1SS_CTL1_ASPM_L1_2) + link->aspm_default |= ASPM_STATE_L1_2; + if (upreg.l1ss_ctl1 & PCI_L1SS_CTL1_PCIPM_L1_1) + link->aspm_default |= ASPM_STATE_L1_1_PCIPM; + if (upreg.l1ss_ctl1 & PCI_L1SS_CTL1_PCIPM_L1_2) + link->aspm_default |= ASPM_STATE_L1_2_PCIPM; + return 0; }