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

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

diff --git a/include/linux/pci.h b/include/linux/pci.h
index a048fba..83ce1cd 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -243,7 +243,7 @@ enum pcie_link_width {
        PCIE_LNK_WIDTH_UNKNOWN  = 0xff,
 };
 
-/* Based on the PCI Hotplug Spec, but some values are made up by us */
+/* See matching string table in pci_speed_string() */
 enum pci_bus_speed {
        PCI_SPEED_33MHz                 = 0x00,
        PCI_SPEED_66MHz                 = 0x01,
@@ -451,6 +451,11 @@ struct pci_dev {
        const struct attribute_group **msi_irq_groups;
 #endif
        struct pci_vpd *vpd;
+#ifdef CONFIG_PCIE_DPC
+       u16             dpc_cap;
+       unsigned int    dpc_rp_extensions:1;
+       u8              dpc_rp_log_size;
+#endif
 #ifdef CONFIG_PCI_ATS
        union {
                struct pci_sriov        *sriov;         /* PF: SR-IOV info */
@@ -517,7 +522,9 @@ struct pci_host_bridge {
        unsigned int    native_shpc_hotplug:1;  /* OS may use SHPC hotplug */
        unsigned int    native_pme:1;           /* OS may use PCIe PME */
        unsigned int    native_ltr:1;           /* OS may use PCIe LTR */
+       unsigned int    native_dpc:1;           /* OS may use PCIe DPC */
        unsigned int    preserve_config:1;      /* Preserve FW resource setup */
+       unsigned int    size_windows:1;         /* Enable root bus sizing */
 
        /* Resource alignment requirements */
        resource_size_t (*align_resource)(struct pci_dev *dev,
@@ -1224,7 +1231,6 @@ int pci_enable_rom(struct pci_dev *pdev);
 void pci_disable_rom(struct pci_dev *pdev);
 void __iomem __must_check *pci_map_rom(struct pci_dev *pdev, size_t *size);
 void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom);
-void __iomem __must_check *pci_platform_rom(struct pci_dev *pdev, size_t *size);
 
 /* Power management related routines */
 int pci_save_state(struct pci_dev *dev);