On Wed, Sep 05, 2018 at 02:35:39PM -0600, Keith Busch wrote:
> --- a/drivers/pci/hotplug/pciehp.h
> +++ b/drivers/pci/hotplug/pciehp.h
> @@ -121,7 +121,6 @@ struct controller {
> struct task_struct *poll_thread;
> unsigned long cmd_started; /* jiffies */
> unsigned int cmd_busy:1;
> - unsigned int link_active_reporting:1;
> unsigned int notification_enabled:1;
> unsigned int power_fault_detected;
> atomic_t pending_events;
Please also remove the kerneldoc for this attribute further up in the file.
> @@ -256,18 +249,9 @@ int pciehp_check_link_status(struct controller *ctrl)
> bool found;
> u16 lnk_status;
>
> - /*
> - * Data Link Layer Link Active Reporting must be capable for
> - * hot-plug capable downstream port. But old controller might
> - * not implement it. In this case, we wait for 1000 ms.
> - */
> - if (ctrl->link_active_reporting)
> - pcie_wait_link_active(ctrl);
> - else
> - msleep(1000);
> + if (!pcie_wait_for_link(pdev, true))
> + return -1;
>
> - /* wait 100ms before read pci conf, and try in 1s */
> - msleep(100);
Aha, so this addresses the second objection I've just raised for
patch [03/20]. Okay.
> + /*
> + * Some controllers might not implement link active reporting. In this
> + * case, we wait for 1000 + 100 ms.
> + */
> + if (!pdev->link_active_reporting) {
> + msleep(1100);
> + return true;
> + }
> +
More specifically, the Data Link Layer Link Active Reporting Capable bit
in the Link Capabilities register was added in PCIe r1.1 (2005-03-28).
The bit was marked reserved in PCIe r1.0 (2002-04-29).
So this is perfectly legal for old devices adhering only to PCIe r1.0.
Thanks,
Lukas
