Skip to contentSkip to conversation

PCI: dwc: adjust to recent removal of PCI_MSI_IRQ_DOMAIN

PATCH Applied Lukas Bulwahn 4 participants 4 messages Dec 15, 2022 – Jan 3, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI: dwc: adjust to recent removal of PCI_MSI_IRQ_DOMAIN

Commit a474d3fbe287 ("PCI/MSI: Get rid of PCI_MSI_IRQ_DOMAIN") removes the config PCI_MSI_IRQ_DOMAIN and makes all previous references to that config then refer to PCI_MSI instead.

Commit ba6ed462dcf4 ("PCI: dwc: Add Baikal-T1 PCIe controller support") adds the config PCIE_BT1, which following the previous default pattern depends on the config PCI_MSI_IRQ_DOMAIN.

As these two commits were submitted roughly at the same time, the refactoring did not take of this occurrence and the addition did not yet notice the refactoring.

Take care of the PCI_MSI config refactoring on this latest addition.

---
 drivers/pci/controller/dwc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/dwc/Kconfig +1 -1
index a0d2713f0e88..99ec91e2a5cf 100644
@@ -225,7 +225,7 @@ config PCIE_ARTPEC6_EP
 config PCIE_BT1
 	tristate "Baikal-T1 PCIe controller"
 	depends on MIPS_BAIKAL_T1 || COMPILE_TEST
-	depends on PCI_MSI_IRQ_DOMAIN
+	depends on PCI_MSI
 	select PCIE_DW_HOST
 	help
 	  Enables support for the PCIe controller in the Baikal-T1 SoC to work
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Lukas Bulwahn

Commit a474d3fbe287 ("PCI/MSI: Get rid of PCI_MSI_IRQ_DOMAIN") removes the config PCI_MSI_IRQ_DOMAIN and makes all previous references to that config then refer to PCI_MSI instead.

Commit ba6ed462dcf4 ("PCI: dwc: Add Baikal-T1 PCIe controller support") adds the config PCIE_BT1, which following the previous default pattern depends on the config PCI_MSI_IRQ_DOMAIN.

Quoted 5 lines

As these two commits were submitted roughly at the same time, the refactoring did not take of this occurrence and the addition did not yet notice the refactoring.

Take care of the PCI_MSI config refactoring on this latest addition.

Indeed. I just didn't know about the refactoring. Thanks for submitting a fixup patch.

-Serge(y)

Quoted 23 lines
---
 drivers/pci/controller/dwc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/dwc/Kconfig +1 -1
index a0d2713f0e88..99ec91e2a5cf 100644
@@ -225,7 +225,7 @@ config PCIE_ARTPEC6_EP
 config PCIE_BT1
 	tristate "Baikal-T1 PCIe controller"
 	depends on MIPS_BAIKAL_T1 || COMPILE_TEST
-	depends on PCI_MSI_IRQ_DOMAIN
+	depends on PCI_MSI
 	select PCIE_DW_HOST
 	help
 	  Enables support for the PCIe controller in the Baikal-T1 SoC to work
Signature · 1 line
2.17.1
maintainer Applied
#2 lore raw
In reply to Lukas Bulwahn
Quoted 9 lines · Lukas Bulwahn

Commit a474d3fbe287 ("PCI/MSI: Get rid of PCI_MSI_IRQ_DOMAIN") removes the config PCI_MSI_IRQ_DOMAIN and makes all previous references to that config then refer to PCI_MSI instead.

Commit ba6ed462dcf4 ("PCI: dwc: Add Baikal-T1 PCIe controller support") adds the config PCIE_BT1, which following the previous default pattern depends on the config PCI_MSI_IRQ_DOMAIN.

[...]

Applied to pci/dwc, thanks!

[1/1] PCI: dwc: adjust to recent removal of PCI_MSI_IRQ_DOMAIN

      https://git.kernel.org/lpieralisi/pci/c/3c9686173220

Thanks,
Lorenzo

#3 lore raw
Quoted 9 lines · Lorenzo Pieralisi
Quoted 8 lines · Lukas Bulwahn

Commit a474d3fbe287 ("PCI/MSI: Get rid of PCI_MSI_IRQ_DOMAIN") removes the config PCI_MSI_IRQ_DOMAIN and makes all previous references to that config then refer to PCI_MSI instead.

Commit ba6ed462dcf4 ("PCI: dwc: Add Baikal-T1 PCIe controller support") adds the config PCIE_BT1, which following the previous default pattern depends on the config PCI_MSI_IRQ_DOMAIN.

Quoted 6 lines
Quoted 1 line

[...]

Applied to pci/dwc, thanks!

[1/1] PCI: dwc: adjust to recent removal of PCI_MSI_IRQ_DOMAIN

      https://git.kernel.org/lpieralisi/pci/c/3c9686173220

Since both commits appeared in v6.2-rc1, I cherry-picked the fix to for-linus so we can get it in v6.2.

Lorenzo, can you drop it from your pci/dwc branch so we don't end up with a duplicate?

Bjorn