e1000e: Use standard #defines for PCIe Capability ASPM fields

Use the standard #defines for PCIe Capability ASPM fields.

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: Bjorn Helgaas <bhelgaas@google.com>
CC: e1000-devel@lists.sourceforge.net
Acked-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 05538e66c809a53fe94f3c452262efe86b1e00a4..bf2c84cf250f05a1b56d49c789a6df5b2b9768bc 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5548,14 +5548,21 @@ static void __e1000e_disable_aspm(struct pci_dev *pdev, u16 state)
 #else
 static void __e1000e_disable_aspm(struct pci_dev *pdev, u16 state)
 {
+       u16 aspm_ctl = 0;
+
+       if (state & PCIE_LINK_STATE_L0S)
+               aspm_ctl |= PCI_EXP_LNKCTL_ASPM_L0S;
+       if (state & PCIE_LINK_STATE_L1)
+               aspm_ctl |= PCI_EXP_LNKCTL_ASPM_L1;
+
        /* Both device and parent should have the same ASPM setting.
         * Disable ASPM in downstream component first and then upstream.
         */
-       pcie_capability_clear_word(pdev, PCI_EXP_LNKCTL, state);
+       pcie_capability_clear_word(pdev, PCI_EXP_LNKCTL, aspm_ctl);
 
        if (pdev->bus->self)
                pcie_capability_clear_word(pdev->bus->self, PCI_EXP_LNKCTL,
-                                          state);
+                                          aspm_ctl);
 }
 #endif
 static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state)