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

Merge branch 'pci/aspm' 

  - Clear the correct bits when enabling ASPM L1 substates (Yicong Yang)

  - Reduce severity of ASPM common clock config message (Chris Packham)

* pci/aspm:
  PCI/ASPM: Reduce severity of common clock config message
  PCI/ASPM: Clear the correct bits when enabling L1 substates
parents bb6d3fb3 3b364c65

drivers/pci/pcie/aspm.c

+3 −3
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static void pcie_aspm_configure_common_clock(struct pcie_link_state *link) 
		}

		if (consistent)

			return;

		pci_warn(parent, "ASPM: current common clock configuration is broken, reconfiguring\n");

		pci_info(parent, "ASPM: current common clock configuration is inconsistent, reconfiguring\n");

	}



	/* Configure downstream component, all functions */
@@ -747,9 +747,9 @@ static void pcie_config_aspm_l1ss(struct pcie_link_state *link, u32 state) 


	/* Enable what we need to enable */

	pci_clear_and_set_dword(parent, up_cap_ptr + PCI_L1SS_CTL1,

				PCI_L1SS_CAP_L1_PM_SS, val);

				PCI_L1SS_CTL1_L1SS_MASK, val);

	pci_clear_and_set_dword(child, dw_cap_ptr + PCI_L1SS_CTL1,

				PCI_L1SS_CAP_L1_PM_SS, val);

				PCI_L1SS_CTL1_L1SS_MASK, val);

}



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE