On Sun, Aug 05, 2018 at 03:51:36PM -0700, Sinan Kaya wrote:
> --- a/drivers/pci/hotplug/pciehp_ctrl.c
> +++ b/drivers/pci/hotplug/pciehp_ctrl.c
> @@ -222,9 +222,28 @@ void pciehp_handle_disable_request(struct slot *slot)
> void pciehp_handle_presence_or_link_change(struct slot *slot, u32 events)
> {
> struct controller *ctrl = slot->ctrl;
> + struct pci_dev *pdev = ctrl->pcie->port;
> bool link_active;
> u8 present;
>
> + /* If a fatal error is pending, wait for AER or DPC to handle it. */
> + if (pcie_fatal_error_pending(pdev, PCI_ERR_UNC_SURPDN)) {
> + bool recovered;
> +
> + recovered = pcie_wait_fatal_error_clear(pdev,
> + PCI_ERR_UNC_SURPDN);
> +
> + /* If the fatal error is gone and the link is up, return */
> + if (recovered && pcie_wait_for_link(pdev, true)) {
> + ctrl_info(ctrl, "Slot(%s): Ignoring Link event due to successful fatal error recovery\n",
> + slot_name(slot));
> + return;
> + }
> +
> + ctrl_info(ctrl, "Slot(%s): Fatal error recovery failed for Link event, tryig hotplug reset\n",
Typo tryig -> trying. Otherwise this is
Reviewed-by: Lukas Wunner <lukas@xxxxxxxxx>
