Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75083206 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI: Add standard PCIe Capability Link ASPM field names 



Add standard #defines for ASPM fields in PCI Express Link Capability and
Link Control registers.

Previously we used PCIE_LINK_STATE_L0S and PCIE_LINK_STATE_L1 directly, but
these are defined for the Linux ASPM interfaces, e.g.,
pci_disable_link_state(), and only coincidentally match the actual register
bits.  PCIE_LINK_STATE_CLKPM, also part of that interface, does not match
the register bit.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Acked-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
parent 33e8b34f

drivers/pci/pcie/aspm.c

+6 −5
Original line number Diff line number Diff line
@@ -427,7 +427,8 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist) 


static void pcie_config_aspm_dev(struct pci_dev *pdev, u32 val)

{

	pcie_capability_clear_and_set_word(pdev, PCI_EXP_LNKCTL, 0x3, val);

	pcie_capability_clear_and_set_word(pdev, PCI_EXP_LNKCTL,

					   PCI_EXP_LNKCTL_ASPMC, val);

}



static void pcie_config_aspm_link(struct pcie_link_state *link, u32 state)
@@ -442,12 +443,12 @@ static void pcie_config_aspm_link(struct pcie_link_state *link, u32 state) 
		return;

	/* Convert ASPM state to upstream/downstream ASPM register state */

	if (state & ASPM_STATE_L0S_UP)

		dwstream |= PCIE_LINK_STATE_L0S;

		dwstream |= PCI_EXP_LNKCTL_ASPM_L0S;

	if (state & ASPM_STATE_L0S_DW)

		upstream |= PCIE_LINK_STATE_L0S;

		upstream |= PCI_EXP_LNKCTL_ASPM_L0S;

	if (state & ASPM_STATE_L1) {

		upstream |= PCIE_LINK_STATE_L1;

		dwstream |= PCIE_LINK_STATE_L1;

		upstream |= PCI_EXP_LNKCTL_ASPM_L1;

		dwstream |= PCI_EXP_LNKCTL_ASPM_L1;

	}

	/*

	 * Spec 2.0 suggests all functions should be configured the

include/uapi/linux/pci_regs.h

+2 −0
Original line number Diff line number Diff line
@@ -469,6 +469,8 @@ 
#define  PCI_EXP_LNKCAP_PN	0xff000000 /* Port Number */

#define PCI_EXP_LNKCTL		16	/* Link Control */

#define  PCI_EXP_LNKCTL_ASPMC	0x0003	/* ASPM Control */

#define  PCI_EXP_LNKCTL_ASPM_L0S  0x01	/* L0s Enable */

#define  PCI_EXP_LNKCTL_ASPM_L1   0x02	/* L1 Enable */

#define  PCI_EXP_LNKCTL_RCB	0x0008	/* Read Completion Boundary */

#define  PCI_EXP_LNKCTL_LD	0x0010	/* Link Disable */

#define  PCI_EXP_LNKCTL_RL	0x0020	/* Retrain Link */