From patchwork Wed Sep 23 23:15:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Saheed O. Bolarinwa" X-Patchwork-Id: 11795813 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 20707112E for ; Thu, 24 Sep 2020 00:14:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0656921D91 for ; Thu, 24 Sep 2020 00:14:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sJz4BUfB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726662AbgIXAOz (ORCPT ); Wed, 23 Sep 2020 20:14:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726419AbgIXAOz (ORCPT ); Wed, 23 Sep 2020 20:14:55 -0400 Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3854C0613CE for ; Wed, 23 Sep 2020 17:14:54 -0700 (PDT) Received: by mail-ej1-x642.google.com with SMTP id e23so2049299eja.3 for ; Wed, 23 Sep 2020 17:14:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=K97YsgNj5X1wCsM2C3sfK5CfB6Twz8gI9Kolu+4q0zg=; b=sJz4BUfB8kNZ+sHNb/0q3JsZHAwIKZr90x9hjHwvv0A6J5iOWuIMzNp3CKgtxx6jSG lgg3FZOVTOvxAxI+gtJavCpg1pkHWIYHv/vCNifBIrUqFREwROXYh1MYIQMJV2XIW0hP bjN/om3Awe+H+R5BKQ1SHp9g01KehqPLM0LecW7u09Ef3WwvVoxYXYC8fSuWGJglXAxF WRqgPoBhOV9yLEWE0Osz8FcwsyRjwGAMynMUxitGllml+fUiNpHC1J9ViU7UKvPEyhcu aMjepQD2wFcHqldf5rwZXHgKyufdqml2Qv3hH+hFteQvL5cPg5s0Rw6ZiRLntZCL4YEQ Nn2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=K97YsgNj5X1wCsM2C3sfK5CfB6Twz8gI9Kolu+4q0zg=; b=LzxfrWsNivoDuleH9lJYJR442v58lL+Ega4aWC8wmyVuqhvfbG2HIEqlDlMYXH+pzB GY6OJ3g8ETBacs/ObkKtpZBqThxRsfmm6mNtOv6C4ODZ0IleIqYCd6qKPHWIL5JfRu7F 61PX7kvDPMuJ0QPHMLomjNu1ysN/VqSQozhknQoXHFNjdg42hRFXnPBzfHqgtTf9GtZZ 5a/r6gIcoPit0mci/IiYXuYdqvjB6e2AEnZfASt5bkypqkpa3D6urmUvpO1sKnlPY1Q8 hwvecKWtjSHX8eL3nCZKlzLG6q1vr0PbqqcVOzIODlczxDaYSQ5d3xQZ72ygxHg2LafX CfgQ== X-Gm-Message-State: AOAM532RGfANHuqK3luOzIaaPRxwXSkweipRQFMh36qbER9duxFWLu5y yrgpu3JPPDIliVyKvjSPzw8= X-Google-Smtp-Source: ABdhPJwA2hnUIb7VfQAfW7n7EKAOypS0bDTfiWSRoX/ahhS8t6zJBF6+DoBlE3n9Qbfs/yJoMsuUfg== X-Received: by 2002:a17:906:249b:: with SMTP id e27mr2041936ejb.105.1600906493608; Wed, 23 Sep 2020 17:14:53 -0700 (PDT) Received: from net.saheed (5402C65D.dsl.pool.telekom.hu. [84.2.198.93]) by smtp.gmail.com with ESMTPSA id r9sm1026559ejc.102.2020.09.23.17.14.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 17:14:53 -0700 (PDT) From: "Saheed O. Bolarinwa" To: helgaas@kernel.org Cc: "Saheed O. Bolarinwa" , linux-pci@vger.kernel.org Subject: [PATCH 4/8] PCI/ASPM: Replace aspm_register_info.l1ss_cap* with pci_dev.l1ss_cap* Date: Thu, 24 Sep 2020 01:15:13 +0200 Message-Id: <20200923231517.221310-5-refactormyself@gmail.com> X-Mailer: git-send-email 2.18.4 In-Reply-To: <20200923231517.221310-1-refactormyself@gmail.com> References: <20200923231517.221310-1-refactormyself@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org - Add l1ss_cap and l1ss_cap_ptr to struct pci_dev - In pci_configure_ltr(), compute the value of pci_dev.l1ss_cap and pci_dev.l1ss_cap_ptr - Replace all references to aspm_register_info.(l1ss_cap && l1ss_cap_ptr) with pci_dev.(l1ss_cap && l1ss_cap_ptr) - In pcie_get_aspm_reg() remove reference to aspm_register_info.l1ss_cap* - In pcie_get_aspm_reg() remove reading of l1ss_cap_ptr and l1ss_cap - Remove aspm_register_info.(l1ss_cap && l1ss_cap_ptr) Signed-off-by: Saheed O. Bolarinwa --- drivers/pci/pcie/aspm.c | 56 +++++++++++++---------------------------- drivers/pci/probe.c | 6 +++++ include/linux/pci.h | 2 ++ 3 files changed, 26 insertions(+), 38 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 321b328347c1..d3ad31a230b5 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -386,8 +386,6 @@ struct aspm_register_info { u32 enabled:2; /* L1 substates */ - u32 l1ss_cap_ptr; - u32 l1ss_cap; u32 l1ss_ctl1; u32 l1ss_ctl2; }; @@ -400,26 +398,6 @@ static void pcie_get_aspm_reg(struct pci_dev *pdev, pcie_capability_read_word(pdev, PCI_EXP_LNKCTL, &ctl); info->enabled = ctl & PCI_EXP_LNKCTL_ASPMC; - /* Read L1 PM substate capabilities */ - info->l1ss_cap = info->l1ss_ctl1 = info->l1ss_ctl2 = 0; - info->l1ss_cap_ptr = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_L1SS); - if (!info->l1ss_cap_ptr) - return; - pci_read_config_dword(pdev, info->l1ss_cap_ptr + PCI_L1SS_CAP, - &info->l1ss_cap); - if (!(info->l1ss_cap & PCI_L1SS_CAP_L1_PM_SS)) { - info->l1ss_cap = 0; - return; - } - - /* - * If we don't have LTR for the entire path from the Root Complex - * to this device, we can't use ASPM L1.2 because it relies on the - * LTR_L1.2_THRESHOLD. See PCIe r4.0, secs 5.5.4, 6.18. - */ - if (!pdev->ltr_path) - info->l1ss_cap &= ~PCI_L1SS_CAP_ASPM_L1_2; - pci_read_config_dword(pdev, info->l1ss_cap_ptr + PCI_L1SS_CTL1, &info->l1ss_ctl1); pci_read_config_dword(pdev, info->l1ss_cap_ptr + PCI_L1SS_CTL2, @@ -494,32 +472,34 @@ static void aspm_calc_l1ss_info(struct pcie_link_state *link, { u32 val1, val2, scale1, scale2; u32 t_common_mode, t_power_on, l1_2_threshold, scale, value; + struct pci_dev *dw_pdev = link->downstream; + struct pci_dev *up_pdev = link->pdev; - link->l1ss.up_cap_ptr = upreg->l1ss_cap_ptr; - link->l1ss.dw_cap_ptr = dwreg->l1ss_cap_ptr; + link->l1ss.up_cap_ptr = up_pdev->l1ss_cap_ptr; + link->l1ss.dw_cap_ptr = dw_pdev->l1ss_cap_ptr; link->l1ss.ctl1 = link->l1ss.ctl2 = 0; if (!(link->aspm_support & ASPM_STATE_L1_2_MASK)) return; /* Choose the greater of the two Port Common_Mode_Restore_Times */ - val1 = (upreg->l1ss_cap & PCI_L1SS_CAP_CM_RESTORE_TIME) >> 8; - val2 = (dwreg->l1ss_cap & PCI_L1SS_CAP_CM_RESTORE_TIME) >> 8; + val1 = (up_pdev->l1ss_cap & PCI_L1SS_CAP_CM_RESTORE_TIME) >> 8; + val2 = (dw_pdev->l1ss_cap & PCI_L1SS_CAP_CM_RESTORE_TIME) >> 8; t_common_mode = max(val1, val2); /* Choose the greater of the two Port T_POWER_ON times */ - val1 = (upreg->l1ss_cap & PCI_L1SS_CAP_P_PWR_ON_VALUE) >> 19; - scale1 = (upreg->l1ss_cap & PCI_L1SS_CAP_P_PWR_ON_SCALE) >> 16; - val2 = (dwreg->l1ss_cap & PCI_L1SS_CAP_P_PWR_ON_VALUE) >> 19; - scale2 = (dwreg->l1ss_cap & PCI_L1SS_CAP_P_PWR_ON_SCALE) >> 16; + val1 = (up_pdev->l1ss_cap & PCI_L1SS_CAP_P_PWR_ON_VALUE) >> 19; + scale1 = (up_pdev->l1ss_cap & PCI_L1SS_CAP_P_PWR_ON_SCALE) >> 16; + val2 = (dw_pdev->l1ss_cap & PCI_L1SS_CAP_P_PWR_ON_VALUE) >> 19; + scale2 = (dw_pdev->l1ss_cap & PCI_L1SS_CAP_P_PWR_ON_SCALE) >> 16; - if (calc_l1ss_pwron(link->pdev, scale1, val1) > - calc_l1ss_pwron(link->downstream, scale2, val2)) { + if (calc_l1ss_pwron(up_pdev, scale1, val1) > + calc_l1ss_pwron(dw_pdev, scale2, val2)) { link->l1ss.ctl2 |= scale1 | (val1 << 3); - t_power_on = calc_l1ss_pwron(link->pdev, scale1, val1); + t_power_on = calc_l1ss_pwron(up_pdev, scale1, val1); } else { link->l1ss.ctl2 |= scale2 | (val2 << 3); - t_power_on = calc_l1ss_pwron(link->downstream, scale2, val2); + t_power_on = calc_l1ss_pwron(dw_pdev, scale2, val2); } /* @@ -603,13 +583,13 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist) link->latency_dw.l1 = calc_l1_latency(child); /* Setup L1 substate */ - if (upreg.l1ss_cap & dwreg.l1ss_cap & PCI_L1SS_CAP_ASPM_L1_1) + if (parent->l1ss_cap & child->l1ss_cap & PCI_L1SS_CAP_ASPM_L1_1) link->aspm_support |= ASPM_STATE_L1_1; - if (upreg.l1ss_cap & dwreg.l1ss_cap & PCI_L1SS_CAP_ASPM_L1_2) + if (parent->l1ss_cap & child->l1ss_cap & PCI_L1SS_CAP_ASPM_L1_2) link->aspm_support |= ASPM_STATE_L1_2; - if (upreg.l1ss_cap & dwreg.l1ss_cap & PCI_L1SS_CAP_PCIPM_L1_1) + if (parent->l1ss_cap & child->l1ss_cap & PCI_L1SS_CAP_PCIPM_L1_1) link->aspm_support |= ASPM_STATE_L1_1_PCIPM; - if (upreg.l1ss_cap & dwreg.l1ss_cap & PCI_L1SS_CAP_PCIPM_L1_2) + if (parent->l1ss_cap & child->l1ss_cap & PCI_L1SS_CAP_PCIPM_L1_2) link->aspm_support |= ASPM_STATE_L1_2_PCIPM; if (upreg.l1ss_ctl1 & dwreg.l1ss_ctl1 & PCI_L1SS_CTL1_ASPM_L1_1) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 2d5898f05f89..71a714065e14 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2107,6 +2107,12 @@ static void pci_configure_ltr(struct pci_dev *dev) if (!pci_is_pcie(dev)) return; + /* Read L1 PM substate capabilities */ + dev->l1ss_cap_ptr = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_L1SS); + if (dev->l1ss_cap_ptr) + pci_read_config_dword(dev, dev->l1ss_cap_ptr + PCI_L1SS_CAP, + &dev->l1ss_cap); + pcie_capability_read_dword(dev, PCI_EXP_DEVCAP2, &cap); if (!(cap & PCI_EXP_DEVCAP2_LTR)) return; diff --git a/include/linux/pci.h b/include/linux/pci.h index 5b305cfeb1dc..60b82e255738 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -381,6 +381,8 @@ struct pci_dev { struct pcie_link_state *link_state; /* ASPM link state */ unsigned int ltr_path:1; /* Latency Tolerance Reporting supported from root to here */ + int l1ss_cap_ptr; /* L1SS cap ptr, 0 if not supported */ + u32 l1ss_cap; /* L1 PM substate Capabilities */ #endif unsigned int eetlp_prefix_path:1; /* End-to-End TLP Prefix */