| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20231011193206.GA1039708@bhelgaas>
Date: Wed, 11 Oct 2023 14:32:06 -0500
From: Bjorn Helgaas <helgaas@...nel.org>
To: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
Cc: linux-pci@...r.kernel.org,
Lorenzo Pieralisi <lorenzo.pieralisi@....com>,
Rob Herring <robh@...nel.org>,
Krzysztof Wilczyński <kw@...ux.com>,
Lukas Wunner <lukas@...ner.de>,
"Rafael J . Wysocki" <rafael@...nel.org>,
Heiner Kallweit <hkallweit1@...il.com>,
Emmanuel Grumbach <emmanuel.grumbach@...el.com>,
linux-kernel@...r.kernel.org, Bjorn Helgaas <bhelgaas@...gle.com>,
ath10k@...ts.infradead.org, ath11k@...ts.infradead.org,
ath12k@...ts.infradead.org, intel-wired-lan@...ts.osuosl.org,
linux-arm-kernel@...ts.infradead.org,
linux-bluetooth@...r.kernel.org,
linux-mediatek@...ts.infradead.org, linux-rdma@...r.kernel.org,
linux-wireless@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: [PATCH v2 04/13] PCI/ASPM: Move L0S/L1/sub states mask
calculation into a helper
On Mon, Sep 18, 2023 at 04:10:54PM +0300, Ilpo Järvinen wrote:
> ASPM service driver does the same L0S / L1S / sub states allowed
> calculation in __pci_disable_link_state() and
> pci_set_default_link_state().
Is there a typo or something here? This patch only adds a call to
__pci_disable_link_state(), not to pci_set_default_link_state().
> Create a helper to calculate the mask for the allowed states.
>
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
> ---
> drivers/pci/pcie/aspm.c | 33 +++++++++++++++++++++------------
> 1 file changed, 21 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
> index ec6d7a092ac1..91dc95aca90f 100644
> --- a/drivers/pci/pcie/aspm.c
> +++ b/drivers/pci/pcie/aspm.c
> @@ -1034,6 +1034,26 @@ static struct pcie_link_state *pcie_aspm_get_link(struct pci_dev *pdev)
> return bridge->link_state;
> }
>
> +static u8 pci_link_state_mask(int state)
> +{
> + u8 result = 0;
> +
> + if (state & PCIE_LINK_STATE_L0S)
> + result |= ASPM_STATE_L0S;
> + if (state & PCIE_LINK_STATE_L1)
> + result |= ASPM_STATE_L1;
> + if (state & PCIE_LINK_STATE_L1_1)
> + result |= ASPM_STATE_L1_1;
> + if (state & PCIE_LINK_STATE_L1_2)
> + result |= ASPM_STATE_L1_2;
> + if (state & PCIE_LINK_STATE_L1_1_PCIPM)
> + result |= ASPM_STATE_L1_1_PCIPM;
> + if (state & PCIE_LINK_STATE_L1_2_PCIPM)
> + result |= ASPM_STATE_L1_2_PCIPM;
> +
> + return result;
> +}
> +
> static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem)
> {
> struct pcie_link_state *link = pcie_aspm_get_link(pdev);
> @@ -1063,18 +1083,7 @@ static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem)
> if (sem)
> down_read(&pci_bus_sem);
> mutex_lock(&aspm_lock);
> - if (state & PCIE_LINK_STATE_L0S)
> - link->aspm_disable |= ASPM_STATE_L0S;
> - if (state & PCIE_LINK_STATE_L1)
> - link->aspm_disable |= ASPM_STATE_L1;
> - if (state & PCIE_LINK_STATE_L1_1)
> - link->aspm_disable |= ASPM_STATE_L1_1;
> - if (state & PCIE_LINK_STATE_L1_2)
> - link->aspm_disable |= ASPM_STATE_L1_2;
> - if (state & PCIE_LINK_STATE_L1_1_PCIPM)
> - link->aspm_disable |= ASPM_STATE_L1_1_PCIPM;
> - if (state & PCIE_LINK_STATE_L1_2_PCIPM)
> - link->aspm_disable |= ASPM_STATE_L1_2_PCIPM;
> + link->aspm_disable |= pci_link_state_mask(state);
> pcie_config_aspm_link(link, policy_to_aspm_state(link));
>
> if (state & PCIE_LINK_STATE_CLKPM)
> --
> 2.30.2
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@...ts.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Powered by blists - more mailing lists