diff options
author | Lukas Wunner <lukas@wunner.de> | 2018-07-20 01:27:53 +0300 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-07-31 19:07:59 +0300 |
commit | 7903782460ee1813d6779c968b28d0ac71b9b3ae (patch) | |
tree | c546ddf42c07930455290c41d12cd338160e15af /drivers/pci/hotplug/pciehp_core.c | |
parent | 6ccb127ba6dff251b75fa72e8c7777eaf12d9675 (diff) | |
download | linux-7903782460ee1813d6779c968b28d0ac71b9b3ae.tar.xz |
PCI: pciehp: Clear spurious events earlier on resume
Thunderbolt hotplug ports that were occupied before system sleep resume
with their downstream link in "off" state. Only after the Thunderbolt
controller has reestablished the PCIe tunnels does the link go up.
As a result, a spurious Presence Detect Changed and/or Data Link Layer
State Changed event occurs.
The events are not immediately acted upon because tunnel reestablishment
happens in the ->resume_noirq phase, when interrupts are still disabled.
Also, notification of events may initially be disabled in the Slot
Control register when coming out of system sleep and is reenabled in the
->resume_noirq phase through:
pci_pm_resume_noirq()
pci_pm_default_resume_early()
pci_restore_state()
pci_restore_pcie_state()
It is not guaranteed that the events are acted upon at all: PCIe r4.0,
sec 6.7.3.4 says that "a port may optionally send an MSI when there are
hot-plug events that occur while interrupt generation is disabled, and
interrupt generation is subsequently enabled." Note the "optionally".
If an MSI is sent, pciehp will gratuitously turn the slot off and back
on once the ->resume_early phase has commenced.
If an MSI is not sent, the extant, unacknowledged events in the Slot
Status register will prevent future notification of presence or link
changes.
Commit 13c65840feab ("PCI: pciehp: Clear Presence Detect and Data Link
Layer Status Changed on resume") fixed the latter by clearing the events
in the ->resume phase. Move this to the ->resume_noirq phase to also
fix the gratuitous disable/enablement of the slot.
The commit further restored the Slot Control register in the ->resume
phase, but that's dispensable because as shown above it's already been
done in the ->resume_noirq phase.
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Diffstat (limited to 'drivers/pci/hotplug/pciehp_core.c')
-rw-r--r-- | drivers/pci/hotplug/pciehp_core.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 1be8871e7439..a5bd3b055c0e 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c @@ -279,6 +279,18 @@ static int pciehp_suspend(struct pcie_device *dev) return 0; } +static int pciehp_resume_noirq(struct pcie_device *dev) +{ + struct controller *ctrl = get_service_data(dev); + struct slot *slot = ctrl->slot; + + /* clear spurious events from rediscovery of inserted card */ + if (slot->state == ON_STATE || slot->state == BLINKINGOFF_STATE) + pcie_clear_hotplug_events(ctrl); + + return 0; +} + static int pciehp_resume(struct pcie_device *dev) { struct controller *ctrl; @@ -286,10 +298,6 @@ static int pciehp_resume(struct pcie_device *dev) u8 status; ctrl = get_service_data(dev); - - /* reinitialize the chipset's event detection logic */ - pcie_reenable_notification(ctrl); - slot = ctrl->slot; /* Check if slot is occupied */ @@ -316,6 +324,7 @@ static struct pcie_port_service_driver hpdriver_portdrv = { #ifdef CONFIG_PM .suspend = pciehp_suspend, + .resume_noirq = pciehp_resume_noirq, .resume = pciehp_resume, #endif /* PM */ }; |