Merge tag 'pci-v5.17-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[platform/kernel/linux-rpi.git] / include / linux / pci.h

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 99028ea..8253a54 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -434,7 +434,8 @@ struct pci_dev {
        unsigned int    ats_enabled:1;          /* Address Translation Svc */
        unsigned int    pasid_enabled:1;        /* Process Address Space ID */
        unsigned int    pri_enabled:1;          /* Page Request Interface */
-       unsigned int    is_managed:1;
+       unsigned int    is_managed:1;           /* Managed via devres */
+       unsigned int    is_msi_managed:1;       /* MSI release via devres installed */
        unsigned int    needs_freset:1;         /* Requires fundamental reset */
        unsigned int    state_saved:1;
        unsigned int    is_physfn:1;
@@ -483,7 +484,8 @@ struct pci_dev {
        u8              ptm_granularity;
 #endif
 #ifdef CONFIG_PCI_MSI
-       const struct attribute_group **msi_irq_groups;
+       void __iomem    *msix_base;
+       raw_spinlock_t  msi_lock;
 #endif
        struct pci_vpd  vpd;
 #ifdef CONFIG_PCIE_DPC