Commit 5f75f96c authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Bjorn Helgaas
Browse files

PCI: pciehp: Use RMW accessors for changing LNKCTL 



As hotplug is not the only driver touching LNKCTL, use the RMW capability
accessor which handles concurrent changes correctly.

Suggested-by: default avatarLukas Wunner <lukas@wunner.de>
Fixes: 7f822999 ("PCI: pciehp: Add Disable/enable link functions")
Link: https://lore.kernel.org/r/20230717120503.15276-4-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatar"Rafael J. Wysocki" <rafael@kernel.org>
parent fb0171a4

drivers/pci/hotplug/pciehp_hpc.c

+3 −9
Original line number Diff line number Diff line
@@ -332,17 +332,11 @@ int pciehp_check_link_status(struct controller *ctrl) 
static int __pciehp_link_set(struct controller *ctrl, bool enable)

{

	struct pci_dev *pdev = ctrl_dev(ctrl);

	u16 lnk_ctrl;



	pcie_capability_read_word(pdev, PCI_EXP_LNKCTL, &lnk_ctrl);

	pcie_capability_clear_and_set_word(pdev, PCI_EXP_LNKCTL,

					   PCI_EXP_LNKCTL_LD,

					   enable ? 0 : PCI_EXP_LNKCTL_LD);



	if (enable)

		lnk_ctrl &= ~PCI_EXP_LNKCTL_LD;

	else

		lnk_ctrl |= PCI_EXP_LNKCTL_LD;



	pcie_capability_write_word(pdev, PCI_EXP_LNKCTL, lnk_ctrl);

	ctrl_dbg(ctrl, "%s: lnk_ctrl = %x\n", __func__, lnk_ctrl);

	return 0;

}