Commit 1f087398 authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Bjorn Helgaas
Browse files

PCI: pciehp: Rely on dev->link_active_reporting 

Use dev->link_active_reporting to determine whether Data Link Layer Link
Active Reporting is available rather than re-retrieving the capability.

Link: https://lore.kernel.org/r/alpine.DEB.2.21.2305310028150.59226@angie.orcam.me.uk


Signed-off-by: default avatarMaciej W. Rozycki <macro@orcam.me.uk>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarLukas Wunner <lukas@wunner.de>
parent 42adbdc7

drivers/pci/hotplug/pciehp_hpc.c

+2 −5
Original line number Diff line number Diff line
@@ -984,7 +984,7 @@ static inline int pcie_hotplug_depth(struct pci_dev *dev) 
struct controller *pcie_init(struct pcie_device *dev)

{

	struct controller *ctrl;

	u32 slot_cap, slot_cap2, link_cap;

	u32 slot_cap, slot_cap2;

	u8 poweron;

	struct pci_dev *pdev = dev->port;

	struct pci_bus *subordinate = pdev->subordinate;
@@ -1030,9 +1030,6 @@ struct controller *pcie_init(struct pcie_device *dev) 
	if (dmi_first_match(inband_presence_disabled_dmi_table))

		ctrl->inband_presence_disabled = 1;



	/* Check if Data Link Layer Link Active Reporting is implemented */

	pcie_capability_read_dword(pdev, PCI_EXP_LNKCAP, &link_cap);



	/* Clear all remaining event bits in Slot Status register. */

	pcie_capability_write_word(pdev, PCI_EXP_SLTSTA,

		PCI_EXP_SLTSTA_ABP | PCI_EXP_SLTSTA_PFD |
@@ -1051,7 +1048,7 @@ struct controller *pcie_init(struct pcie_device *dev) 
		FLAG(slot_cap, PCI_EXP_SLTCAP_EIP),

		FLAG(slot_cap, PCI_EXP_SLTCAP_NCCS),

		FLAG(slot_cap2, PCI_EXP_SLTCAP2_IBPD),

		FLAG(link_cap, PCI_EXP_LNKCAP_DLLLARC),

		FLAG(pdev->link_active_reporting, true),

		pdev->broken_cmd_compl ? " (with Cmd Compl erratum)" : "");



	/*