Skip to contentSkip to conversation

PCI: dwc: Clean up Kconfig dependencies (PCIE_DW_HOST)

PATCH Applied Andy Shevchenko 2 participants 9 messages Jun 23, 2021 – Oct 5, 2021

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

PATCH 1/2 PCI: dwc: Clean up Kconfig dependencies (PCIE_DW_HOST)

First of all, the "depends on" is no-op in the selectable options. Second, no need to repeat menu dependencies (PCI).

Clean up the users of PCIE_DW_HOST and introduce idiom

depends on PCI_MSI_IRQ_DOMAIN
select PCIE_DW_HOST

for all of them.

---
 drivers/pci/controller/dwc/Kconfig | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/pci/controller/dwc/Kconfig +4 -5
index 423d35872ce4..9bfd41eadd5e 100644
@@ -8,7 +8,6 @@ config PCIE_DW
 
 config PCIE_DW_HOST
 	bool
-	depends on PCI_MSI_IRQ_DOMAIN
 	select PCIE_DW
 
 config PCIE_DW_EP
@@ -22,8 +21,8 @@ config PCI_DRA7XX
 config PCI_DRA7XX_HOST
 	bool "TI DRA7xx PCIe controller Host Mode"
 	depends on SOC_DRA7XX || COMPILE_TEST
-	depends on PCI_MSI_IRQ_DOMAIN
 	depends on OF && HAS_IOMEM && TI_PIPE3
+	depends on PCI_MSI_IRQ_DOMAIN
 	select PCIE_DW_HOST
 	select PCI_DRA7XX
 	default y if SOC_DRA7XX
@@ -55,7 +54,7 @@ config PCIE_DW_PLAT
 
 config PCIE_DW_PLAT_HOST
 	bool "Platform bus based DesignWare PCIe Controller - Host mode"
-	depends on PCI && PCI_MSI_IRQ_DOMAIN
+	depends on PCI_MSI_IRQ_DOMAIN
 	select PCIE_DW_HOST
 	select PCIE_DW_PLAT
 	help
@@ -138,8 +137,8 @@ config PCI_LAYERSCAPE
 	bool "Freescale Layerscape PCIe controller - Host mode"
 	depends on OF && (ARM || ARCH_LAYERSCAPE || COMPILE_TEST)
 	depends on PCI_MSI_IRQ_DOMAIN
-	select MFD_SYSCON
 	select PCIE_DW_HOST
+	select MFD_SYSCON
 	help
 	  Say Y here if you want to enable PCIe controller support on Layerscape
 	  SoCs to work in Host mode.
@@ -244,8 +243,8 @@ config PCIE_HISI_STB
 
 config PCI_MESON
 	tristate "MESON PCIe controller"
-	depends on PCI_MSI_IRQ_DOMAIN
 	default m if ARCH_MESON
+	depends on PCI_MSI_IRQ_DOMAIN
 	select PCIE_DW_HOST
 	help
 	  Say Y here if you want to enable PCI controller support on Amlogic
Signature · 1 line
2.30.2
#1 lore raw

PATCH 2/2 PCI: dwc: Clean up Kconfig dependencies (PCIE_DW_EP)

The "depends on" is no-op in the selectable options.

Clean up the users of PCIE_DW_EP and introduce idiom

depends on PCI_ENDPOINT
select PCIE_DW_EP

for all of them.

---
 drivers/pci/controller/dwc/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/pci/controller/dwc/Kconfig +1 -2
index 9bfd41eadd5e..ca5de4e40fbe 100644
@@ -12,7 +12,6 @@ config PCIE_DW_HOST
 
 config PCIE_DW_EP
 	bool
-	depends on PCI_ENDPOINT
 	select PCIE_DW
 
 config PCI_DRA7XX
@@ -37,8 +36,8 @@ config PCI_DRA7XX_HOST
 config PCI_DRA7XX_EP
 	bool "TI DRA7xx PCIe controller Endpoint Mode"
 	depends on SOC_DRA7XX || COMPILE_TEST
-	depends on PCI_ENDPOINT
 	depends on OF && HAS_IOMEM && TI_PIPE3
+	depends on PCI_ENDPOINT
 	select PCIE_DW_EP
 	select PCI_DRA7XX
 	help
Signature · 1 line
2.30.2
#2 lore raw

Re: [PATCH v1 2/2] PCI: dwc: Clean up Kconfig dependencies (PCIE_DW_EP)

Quoted 1 line · Andy Shevchenko

The "depends on" is no-op in the selectable options.

Same as in patch one, spell out what "depends on" you are referring to - please make this log more descriptive.

Thanks,
Lorenzo

Quoted 38 lines

Clean up the users of PCIE_DW_EP and introduce idiom

depends on PCI_ENDPOINT
select PCIE_DW_EP

for all of them.

---
 drivers/pci/controller/dwc/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/pci/controller/dwc/Kconfig +1 -2
index 9bfd41eadd5e..ca5de4e40fbe 100644
@@ -12,7 +12,6 @@ config PCIE_DW_HOST
 
 config PCIE_DW_EP
 	bool
-	depends on PCI_ENDPOINT
 	select PCIE_DW
 
 config PCI_DRA7XX
@@ -37,8 +36,8 @@ config PCI_DRA7XX_HOST
 config PCI_DRA7XX_EP
 	bool "TI DRA7xx PCIe controller Endpoint Mode"
 	depends on SOC_DRA7XX || COMPILE_TEST
-	depends on PCI_ENDPOINT
 	depends on OF && HAS_IOMEM && TI_PIPE3
+	depends on PCI_ENDPOINT
 	select PCIE_DW_EP
 	select PCI_DRA7XX
 	help
Signature · 1 line
2.30.2
#3 lore raw
In reply to Andy Shevchenko
Quoted 9 lines · Andy Shevchenko

First of all, the "depends on" is no-op in the selectable options. Second, no need to repeat menu dependencies (PCI).

Clean up the users of PCIE_DW_HOST and introduce idiom

depends on PCI_MSI_IRQ_DOMAIN
select PCIE_DW_HOST

for all of them.

Any comments on the series?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#4 lore raw
In reply to Andy Shevchenko
Quoted 2 lines · Andy Shevchenko

First of all, the "depends on" is no-op in the selectable options. Second, no need to repeat menu dependencies (PCI).

I believe you need to rewrite the commit log in a more descriptive way - as it is it is not very descriptive.

Define which specific "depends on" you are referring to.

I appreciate the intent and I believe the patch is sound.

Quoted 6 lines

Clean up the users of PCIE_DW_HOST and introduce idiom

depends on PCI_MSI_IRQ_DOMAIN
select PCIE_DW_HOST

for all of them.

"All of them" ? We need something more explicit for this log to be useful, it took me a while to understand the end result you are achieving.

Thanks,
Lorenzo

Quoted 60 lines
---
 drivers/pci/controller/dwc/Kconfig | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/pci/controller/dwc/Kconfig +4 -5
index 423d35872ce4..9bfd41eadd5e 100644
@@ -8,7 +8,6 @@ config PCIE_DW
 
 config PCIE_DW_HOST
 	bool
-	depends on PCI_MSI_IRQ_DOMAIN
 	select PCIE_DW
 
 config PCIE_DW_EP
@@ -22,8 +21,8 @@ config PCI_DRA7XX
 config PCI_DRA7XX_HOST
 	bool "TI DRA7xx PCIe controller Host Mode"
 	depends on SOC_DRA7XX || COMPILE_TEST
-	depends on PCI_MSI_IRQ_DOMAIN
 	depends on OF && HAS_IOMEM && TI_PIPE3
+	depends on PCI_MSI_IRQ_DOMAIN
 	select PCIE_DW_HOST
 	select PCI_DRA7XX
 	default y if SOC_DRA7XX
@@ -55,7 +54,7 @@ config PCIE_DW_PLAT
 
 config PCIE_DW_PLAT_HOST
 	bool "Platform bus based DesignWare PCIe Controller - Host mode"
-	depends on PCI && PCI_MSI_IRQ_DOMAIN
+	depends on PCI_MSI_IRQ_DOMAIN
 	select PCIE_DW_HOST
 	select PCIE_DW_PLAT
 	help
@@ -138,8 +137,8 @@ config PCI_LAYERSCAPE
 	bool "Freescale Layerscape PCIe controller - Host mode"
 	depends on OF && (ARM || ARCH_LAYERSCAPE || COMPILE_TEST)
 	depends on PCI_MSI_IRQ_DOMAIN
-	select MFD_SYSCON
 	select PCIE_DW_HOST
+	select MFD_SYSCON
 	help
 	  Say Y here if you want to enable PCIe controller support on Layerscape
 	  SoCs to work in Host mode.
@@ -244,8 +243,8 @@ config PCIE_HISI_STB
 
 config PCI_MESON
 	tristate "MESON PCIe controller"
-	depends on PCI_MSI_IRQ_DOMAIN
 	default m if ARCH_MESON
+	depends on PCI_MSI_IRQ_DOMAIN
 	select PCIE_DW_HOST
 	help
 	  Say Y here if you want to enable PCI controller support on Amlogic
Signature · 1 line
2.30.2
#5 lore raw
Quoted 5 lines · Lorenzo Pieralisi
Quoted 2 lines · Andy Shevchenko

First of all, the "depends on" is no-op in the selectable options. Second, no need to repeat menu dependencies (PCI).

Define which specific "depends on" you are referring to.

I didn't get this because it stands right. It's in general. I can be more specific since it's in align with the code, though.

All the rest I agree with.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#6 lore raw
Quoted 8 lines · Andy Shevchenko
Quoted 5 lines · Lorenzo Pieralisi
Quoted 2 lines · Andy Shevchenko

First of all, the "depends on" is no-op in the selectable options. Second, no need to repeat menu dependencies (PCI).

Define which specific "depends on" you are referring to.

I didn't get this because it stands right. It's in general.

Ok, understood what you meant now - I read it as if you were referring to a specific Kconfig entry that this patch is fixing.

Maybe:

"The "depends on" Kconfig construct is a no-op in options that are selected and therefore has no effect. Remove it.".

Quoted 10 lines

I can be more specific since it's in align with the code, though.

All the rest I agree with.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#7 lore raw
In reply to Andy Shevchenko
Quoted 9 lines · Andy Shevchenko

First of all, the "depends on" is no-op in the selectable options. Second, no need to repeat menu dependencies (PCI).

Clean up the users of PCIE_DW_HOST and introduce idiom

depends on PCI_MSI_IRQ_DOMAIN
select PCIE_DW_HOST

[...]

Applied to pci/dwc, thanks!

[1/2] PCI: dwc: Clean up Kconfig dependencies (PCIE_DW_HOST)

      https://git.kernel.org/lpieralisi/pci/c/a0ac7ee069
[2/2] PCI: dwc: Clean up Kconfig dependencies (PCIE_DW_EP)
      https://git.kernel.org/lpieralisi/pci/c/2d614eea21

Thanks,
Lorenzo

#8 lore raw
Quoted 4 lines · Lorenzo Pieralisi
Quoted 3 lines · Andy Shevchenko

First of all, the "depends on" is no-op in the selectable options. Second, no need to repeat menu dependencies (PCI).

Quoted 8 lines
Quoted 6 lines

Clean up the users of PCIE_DW_HOST and introduce idiom

depends on PCI_MSI_IRQ_DOMAIN
select PCIE_DW_HOST

[...]

Applied to pci/dwc, thanks!

Sorry I have had no time to address your comments, but it seems you did it for me, thank you!

Signature · 2 lines
With Best Regards,
Andy Shevchenko