Skip to content

Commit 51bc2b7

Browse files
committed
Merge branch 'remotes/lorenzo/pci/msi'
- Convert tegra to MSI domains (Marc Zyngier) - Use rcar controller address as MSI doorbell instead of allocating a page (Marc Zyngier) - Convert rcar to MSI domains (Marc Zyngier) - Use xilinx port structure as MSI doorbell instead of allocating a page (Marc Zyngier) - Convert xilinx to MSI domains (Marc Zyngier) - Remove unused Hyper-V msi_controller structure (Marc Zyngier) - Remove unused PCI core msi_controller support (Marc Zyngier) - Remove struct msi_controller (Marc Zyngier) - Remove unused default_teardown_msi_irqs() (Marc Zyngier) - Let host bridges declare their reliance on MSI domains (Marc Zyngier) - Make pci_host_common_probe() declare its reliance on MSI domains (Marc Zyngier) - Advertise mediatek lack of built-in MSI handling (Thomas Gleixner) - Document ways of ending up with NO_MSI (Marc Zyngier) - Refactor HT advertising of NO_MSI flag (Marc Zyngier) * remotes/lorenzo/pci/msi: PCI: Refactor HT advertising of NO_MSI flag PCI/MSI: Document the various ways of ending up with NO_MSI PCI: mediatek: Advertise lack of built-in MSI handling PCI/MSI: Make pci_host_common_probe() declare its reliance on MSI domains PCI/MSI: Let PCI host bridges declare their reliance on MSI domains PCI/MSI: Kill default_teardown_msi_irqs() PCI/MSI: Kill msi_controller structure PCI/MSI: Drop use of msi_controller from core code PCI: hv: Drop msi_controller structure PCI: xilinx: Convert to MSI domains PCI: xilinx: Don't allocate extra memory for the MSI capture address PCI: rcar: Convert to MSI domains PCI: rcar: Don't allocate extra memory for the MSI capture address PCI: tegra: Convert to MSI domains
2 parents 4772ade + 557853f commit 51bc2b7

12 files changed

Lines changed: 489 additions & 558 deletions

File tree

drivers/pci/controller/Kconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ config PCI_TEGRA
4141
bool "NVIDIA Tegra PCIe controller"
4242
depends on ARCH_TEGRA || COMPILE_TEST
4343
depends on PCI_MSI_IRQ_DOMAIN
44-
select PCI_MSI_ARCH_FALLBACKS
4544
help
4645
Say Y here if you want support for the PCIe host controller found
4746
on NVIDIA Tegra SoCs.
@@ -59,7 +58,6 @@ config PCIE_RCAR_HOST
5958
bool "Renesas R-Car PCIe host controller"
6059
depends on ARCH_RENESAS || COMPILE_TEST
6160
depends on PCI_MSI_IRQ_DOMAIN
62-
select PCI_MSI_ARCH_FALLBACKS
6361
help
6462
Say Y here if you want PCIe controller support on R-Car SoCs in host
6563
mode.
@@ -88,7 +86,7 @@ config PCI_HOST_GENERIC
8886
config PCIE_XILINX
8987
bool "Xilinx AXI PCIe host bridge support"
9088
depends on OF || COMPILE_TEST
91-
select PCI_MSI_ARCH_FALLBACKS
89+
depends on PCI_MSI_IRQ_DOMAIN
9290
help
9391
Say 'Y' here if you want kernel to support the Xilinx AXI PCIe
9492
Host Bridge driver.

drivers/pci/controller/pci-host-common.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ int pci_host_common_probe(struct platform_device *pdev)
7979

8080
bridge->sysdata = cfg;
8181
bridge->ops = (struct pci_ops *)&ops->pci_ops;
82+
bridge->msi_domain = true;
8283

8384
return pci_host_probe(bridge);
8485
}

drivers/pci/controller/pci-hyperv.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,6 @@ struct hv_pcibus_device {
473473
struct list_head dr_list;
474474

475475
struct msi_domain_info msi_info;
476-
struct msi_controller msi_chip;
477476
struct irq_domain *irq_domain;
478477

479478
spinlock_t retarget_msi_interrupt_lock;
@@ -1866,9 +1865,6 @@ static int create_root_hv_pci_bus(struct hv_pcibus_device *hbus)
18661865
if (!hbus->pci_bus)
18671866
return -ENODEV;
18681867

1869-
hbus->pci_bus->msi = &hbus->msi_chip;
1870-
hbus->pci_bus->msi->dev = &hbus->hdev->device;
1871-
18721868
pci_lock_rescan_remove();
18731869
pci_scan_child_bus(hbus->pci_bus);
18741870
hv_pci_assign_numa_node(hbus);

0 commit comments

Comments
 (0)