Commit aff5d055 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Bjorn Helgaas
Browse files

PCI/ASPM: Add L1 PM substate support to pci_disable_link_state() 

Add support for disabling states L1.1 and L1.2 to pci_disable_link_state().
Allow separate control of ASPM and PCI PM L1 substates.

Link: https://lore.kernel.org/r/d81f8036-c236-6463-48e7-ebcdcda85bba@gmail.com


Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 5e0c21c7

drivers/pci/pcie/aspm.c

+10 −1
Original line number Diff line number Diff line
@@ -1094,7 +1094,16 @@ static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem) 
	if (state & PCIE_LINK_STATE_L0S)

		link->aspm_disable |= ASPM_STATE_L0S;

	if (state & PCIE_LINK_STATE_L1)

		link->aspm_disable |= ASPM_STATE_L1;

		/* L1 PM substates require L1 */

		link->aspm_disable |= ASPM_STATE_L1 | ASPM_STATE_L1SS;

	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;

	pcie_config_aspm_link(link, policy_to_aspm_state(link));



	if (state & PCIE_LINK_STATE_CLKPM) {

include/linux/pci.h

+7 −3
Original line number Diff line number Diff line
@@ -1544,9 +1544,13 @@ extern bool pcie_ports_native; 
#define pcie_ports_native	false

#endif



#define PCIE_LINK_STATE_L0S	1

#define PCIE_LINK_STATE_L1	2

#define PCIE_LINK_STATE_CLKPM	4

#define PCIE_LINK_STATE_L0S		BIT(0)

#define PCIE_LINK_STATE_L1		BIT(1)

#define PCIE_LINK_STATE_CLKPM		BIT(2)

#define PCIE_LINK_STATE_L1_1		BIT(3)

#define PCIE_LINK_STATE_L1_2		BIT(4)

#define PCIE_LINK_STATE_L1_1_PCIPM	BIT(5)

#define PCIE_LINK_STATE_L1_2_PCIPM	BIT(6)



#ifdef CONFIG_PCIEASPM

int pci_disable_link_state(struct pci_dev *pdev, int state);