| Message ID | 20221215103452.23131-1-lukas.bulwahn@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Lorenzo Pieralisi |
| Headers | show |
| Series | PCI: dwc: adjust to recent removal of PCI_MSI_IRQ_DOMAIN | expand |
On Thu, Dec 15, 2022 at 11:34:52AM +0100, Lukas Bulwahn wrote: > 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. Indeed. I just didn't know about the refactoring. Thanks for submitting a fixup patch. Reviewed-by: Serge Semin <fancer.lancer@gmail.com> -Serge(y) > > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> > --- > drivers/pci/controller/dwc/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig > index a0d2713f0e88..99ec91e2a5cf 100644 > --- a/drivers/pci/controller/dwc/Kconfig > +++ b/drivers/pci/controller/dwc/Kconfig > @@ -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 > -- > 2.17.1 > >
On Thu, 15 Dec 2022 11:34:52 +0100, Lukas Bulwahn wrote: > 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
On Fri, Dec 30, 2022 at 02:23:38PM +0100, Lorenzo Pieralisi wrote: > On Thu, 15 Dec 2022 11:34:52 +0100, Lukas Bulwahn wrote: > > 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 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
diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig index a0d2713f0e88..99ec91e2a5cf 100644 --- a/drivers/pci/controller/dwc/Kconfig +++ b/drivers/pci/controller/dwc/Kconfig @@ -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
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. Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> --- drivers/pci/controller/dwc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)