From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 4 Jun 2025 15:49:59 +0000 (-0500)
Subject: Merge branch 'pci/hotplug'
X-Git-Tag: v6.16-rc1~50^2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb5c909e6a5e37417e988147c705e4df64278b52;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/hotplug'

- Ignore Presence Detect Changed caused by DPC.  pciehp already ignores
  Link Down/Up events caused by DPC, but on slots using in-band presence
  detect, DPC causes a spurious Presence Detect Changed event (Lukas
  Wunner)

- Ignore Link Down/Up caused by Secondary Bus Reset.  On hotplug ports
  using in-band presence detect, the reset causes a Presence Detect Changed
  event, which mistakenly caused teardown and re-enumeration of the device.
  Drivers may need to annotate code that resets their device (Lukas Wunner)

* pci/hotplug:
  PCI: hotplug: Drop superfluous #include directives
  PCI: pciehp: Ignore Link Down/Up caused by Secondary Bus Reset
  PCI: pciehp: Ignore Presence Detect Changed caused by DPC

# Conflicts:
#	drivers/pci/pci.h
---

bb5c909e6a5e37417e988147c705e4df64278b52
diff --cc drivers/pci/pci.h
index aed7affd4b8cd,7db798bdcaaae..fd2fe406e65ad
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@@ -557,8 -558,8 +558,10 @@@ static inline int pci_dev_set_disconnec
  #define PCI_DPC_RECOVERED 1
  #define PCI_DPC_RECOVERING 2
  #define PCI_DEV_REMOVED 3
+ #define PCI_LINK_CHANGED 4
+ #define PCI_LINK_CHANGING 5
 +#define PCI_LINK_LBMS_SEEN	6
 +#define PCI_DEV_ALLOW_BINDING 7
  
  static inline void pci_dev_assign_added(struct pci_dev *dev)
  {