Commit 0fce6e5c authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Bjorn Helgaas
Browse files

PCI: Simplify pcie_capability_clear_and_set_word() to ..._clear_word() 

When using pcie_capability_clear_and_set_word() but not actually *setting*
anything, use pcie_capability_clear_word() instead.

Link: https://lore.kernel.org/r/20231026121924.2164-1-ilpo.jarvinen@linux.intel.com
Link: https://lore.kernel.org/r/20231026121924.2164-2-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
[bhelgaas: squash]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent c9501d26

drivers/pci/pcie/aspm.c

+4 −4
Original line number Diff line number Diff line
@@ -689,10 +689,10 @@ static void pcie_config_aspm_l1ss(struct pcie_link_state *link, u32 state) 
	 * in pcie_config_aspm_link().

	 */

	if (enable_req & (ASPM_STATE_L1_1 | ASPM_STATE_L1_2)) {

		pcie_capability_clear_and_set_word(child, PCI_EXP_LNKCTL,

						   PCI_EXP_LNKCTL_ASPM_L1, 0);

		pcie_capability_clear_and_set_word(parent, PCI_EXP_LNKCTL,

						   PCI_EXP_LNKCTL_ASPM_L1, 0);

		pcie_capability_clear_word(child, PCI_EXP_LNKCTL,

					   PCI_EXP_LNKCTL_ASPM_L1);

		pcie_capability_clear_word(parent, PCI_EXP_LNKCTL,

					   PCI_EXP_LNKCTL_ASPM_L1);

	}



	val = 0;

drivers/pci/quirks.c

+3 −3
Original line number Diff line number Diff line
@@ -4555,9 +4555,9 @@ static void quirk_disable_root_port_attributes(struct pci_dev *pdev) 


	pci_info(root_port, "Disabling No Snoop/Relaxed Ordering Attributes to avoid PCIe Completion erratum in %s\n",

		 dev_name(&pdev->dev));

	pcie_capability_clear_and_set_word(root_port, PCI_EXP_DEVCTL,

	pcie_capability_clear_word(root_port, PCI_EXP_DEVCTL,

				   PCI_EXP_DEVCTL_RELAX_EN |

					   PCI_EXP_DEVCTL_NOSNOOP_EN, 0);

				   PCI_EXP_DEVCTL_NOSNOOP_EN);

}



/*