ssb: Disable PCI host for PCI_DRIVERS_GENERIC

PATCH In review James Hogan 5 participants 8 messages Jan 15, 2018 – Jan 27, 2018

Subsystems (2)

MIPS Sonics silicon backplane driver (ssb)

lore

Share & tools

lore

James Hogan

author

2018-01-15 21:19 UTC #0 lore raw

PATCH 1/1 ssb: Disable PCI host for PCI_DRIVERS_GENERIC

Since commit d41e6858ba58 ("MIPS: Kconfig: Set default MIPS system type as generic") changed the default MIPS platform to the "generic" platform, which uses PCI_DRIVERS_GENERIC instead of PCI_DRIVERS_LEGACY, various files in drivers/ssb/ have failed to build.

This is particularly due to the existence of struct pci_controller being dependent on PCI_DRIVERS_LEGACY since commit c5611df96804 ("MIPS: PCI:
Introduce CONFIG_PCI_DRIVERS_LEGACY"), so add that dependency to Kconfig to prevent these files being built for the "generic" platform including all{yes,mod}config builds.

Fixes c5611df96804 ("MIPS: PCI: Introduce CONFIG_PCI_DRIVERS_LEGACY")

Signed-off-by James Hogan <[email protected]>

Cc Michael Buesch <[email protected]>

Cc Ralf Baechle <[email protected]>

Cc Paul Burton <[email protected]>

Cc Matt Redfearn <[email protected]>

Cc Guenter Roeck <[email protected]>

Cc [email protected]

---
 drivers/ssb/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/ssb/Kconfig +1 -1

index d8e4219c2324..71c73766ee22 100644
@@ -32,7 +32,7 @@ config SSB_BLOCKIO
 
 config SSB_PCIHOST_POSSIBLE
 	bool
-	depends on SSB && (PCI = y || PCI = SSB)
+	depends on SSB && (PCI = y || PCI = SSB) && PCI_DRIVERS_LEGACY
 	default y
 
 config SSB_PCIHOST

Signature · 1 line

2.13.6

Guenter Roeck

Tested-by on v1 1/1

2018-01-16 03:11 UTC #1 lore raw

Quoted 11 lines · James Hogan

Since commit d41e6858ba58 ("MIPS: Kconfig: Set default MIPS system type as generic") changed the default MIPS platform to the "generic" platform, which uses PCI_DRIVERS_GENERIC instead of PCI_DRIVERS_LEGACY, various files in drivers/ssb/ have failed to build.
This is particularly due to the existence of struct pci_controller being dependent on PCI_DRIVERS_LEGACY since commit c5611df96804 ("MIPS: PCI:
Introduce CONFIG_PCI_DRIVERS_LEGACY"), so add that dependency to Kconfig to prevent these files being built for the "generic" platform including all{yes,mod}config builds.

Quoted 9 lines

Fixes c5611df96804 ("MIPS: PCI: Introduce CONFIG_PCI_DRIVERS_LEGACY")
Signed-off-by James Hogan <[email protected]>
Cc Michael Buesch <[email protected]>
Cc Ralf Baechle <[email protected]>
Cc Paul Burton <[email protected]>
Cc Matt Redfearn <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc [email protected]
Cc [email protected]

Tested-by Guenter Roeck <[email protected]>

Quoted 18 lines

---
  drivers/ssb/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

drivers/ssb/Kconfig +1 -1

index d8e4219c2324..71c73766ee22 100644
@@ -32,7 +32,7 @@ config SSB_BLOCKIO
 
  config SSB_PCIHOST_POSSIBLE
  	bool
-	depends on SSB && (PCI = y || PCI = SSB)
+	depends on SSB && (PCI = y || PCI = SSB) && PCI_DRIVERS_LEGACY
  	default y
 
  config SSB_PCIHOST

Kalle Valo

2018-01-16 15:22 UTC #2 lore raw

In reply to James Hogan

Quoted 11 lines · James Hogan

Since commit d41e6858ba58 ("MIPS: Kconfig: Set default MIPS system type as generic") changed the default MIPS platform to the "generic" platform, which uses PCI_DRIVERS_GENERIC instead of PCI_DRIVERS_LEGACY, various files in drivers/ssb/ have failed to build.
This is particularly due to the existence of struct pci_controller being dependent on PCI_DRIVERS_LEGACY since commit c5611df96804 ("MIPS: PCI:
Introduce CONFIG_PCI_DRIVERS_LEGACY"), so add that dependency to Kconfig to prevent these files being built for the "generic" platform including all{yes,mod}config builds.

Quoted 10 lines

Fixes c5611df96804 ("MIPS: PCI: Introduce CONFIG_PCI_DRIVERS_LEGACY")
Signed-off-by James Hogan <[email protected]>
Cc Michael Buesch <[email protected]>
Cc Ralf Baechle <[email protected]>
Cc Paul Burton <[email protected]>
Cc Matt Redfearn <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc [email protected]
Cc [email protected]
Tested-by Guenter Roeck <[email protected]>

I'm planning to push this to 4.15 but not sure if there's enough time.

Signature · 3 lines

https://patchwork.kernel.org/patch/10165371/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Kalle Valo

2018-01-16 15:22 UTC #3 lore raw

In reply to James Hogan

Quoted 11 lines · James Hogan

Since commit d41e6858ba58 ("MIPS: Kconfig: Set default MIPS system type as generic") changed the default MIPS platform to the "generic" platform, which uses PCI_DRIVERS_GENERIC instead of PCI_DRIVERS_LEGACY, various files in drivers/ssb/ have failed to build.
This is particularly due to the existence of struct pci_controller being dependent on PCI_DRIVERS_LEGACY since commit c5611df96804 ("MIPS: PCI:
Introduce CONFIG_PCI_DRIVERS_LEGACY"), so add that dependency to Kconfig to prevent these files being built for the "generic" platform including all{yes,mod}config builds.

Quoted 10 lines

Fixes c5611df96804 ("MIPS: PCI: Introduce CONFIG_PCI_DRIVERS_LEGACY")
Signed-off-by James Hogan <[email protected]>
Cc Michael Buesch <[email protected]>
Cc Ralf Baechle <[email protected]>
Cc Paul Burton <[email protected]>
Cc Matt Redfearn <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc [email protected]
Cc [email protected]
Tested-by Guenter Roeck <[email protected]>

I'm planning to push this to 4.15 but not sure if there's enough time.

Signature · 3 lines

https://patchwork.kernel.org/patch/10165371/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Kalle Valo

2018-01-16 19:16 UTC #4 lore raw

In reply to James Hogan

Quoted 11 lines · James Hogan

Since commit d41e6858ba58 ("MIPS: Kconfig: Set default MIPS system type as generic") changed the default MIPS platform to the "generic" platform, which uses PCI_DRIVERS_GENERIC instead of PCI_DRIVERS_LEGACY, various files in drivers/ssb/ have failed to build.
This is particularly due to the existence of struct pci_controller being dependent on PCI_DRIVERS_LEGACY since commit c5611df96804 ("MIPS: PCI:
Introduce CONFIG_PCI_DRIVERS_LEGACY"), so add that dependency to Kconfig to prevent these files being built for the "generic" platform including all{yes,mod}config builds.

Quoted 10 lines

Fixes c5611df96804 ("MIPS: PCI: Introduce CONFIG_PCI_DRIVERS_LEGACY")
Signed-off-by James Hogan <[email protected]>
Cc Michael Buesch <[email protected]>
Cc Ralf Baechle <[email protected]>
Cc Paul Burton <[email protected]>
Cc Matt Redfearn <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc [email protected]
Cc [email protected]
Tested-by Guenter Roeck <[email protected]>

Patch applied to wireless-drivers.git, thanks.

58eae1416b80 ssb: Disable PCI host for PCI_DRIVERS_GENERIC

Signature · 3 lines

https://patchwork.kernel.org/patch/10165371/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Kalle Valo

2018-01-16 19:16 UTC #5 lore raw

In reply to James Hogan

Quoted 11 lines · James Hogan

Since commit d41e6858ba58 ("MIPS: Kconfig: Set default MIPS system type as generic") changed the default MIPS platform to the "generic" platform, which uses PCI_DRIVERS_GENERIC instead of PCI_DRIVERS_LEGACY, various files in drivers/ssb/ have failed to build.
This is particularly due to the existence of struct pci_controller being dependent on PCI_DRIVERS_LEGACY since commit c5611df96804 ("MIPS: PCI:
Introduce CONFIG_PCI_DRIVERS_LEGACY"), so add that dependency to Kconfig to prevent these files being built for the "generic" platform including all{yes,mod}config builds.

Quoted 10 lines

Fixes c5611df96804 ("MIPS: PCI: Introduce CONFIG_PCI_DRIVERS_LEGACY")
Signed-off-by James Hogan <[email protected]>
Cc Michael Buesch <[email protected]>
Cc Ralf Baechle <[email protected]>
Cc Paul Burton <[email protected]>
Cc Matt Redfearn <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc [email protected]
Cc [email protected]
Tested-by Guenter Roeck <[email protected]>

Patch applied to wireless-drivers.git, thanks.

58eae1416b80 ssb: Disable PCI host for PCI_DRIVERS_GENERIC

Signature · 3 lines

https://patchwork.kernel.org/patch/10165371/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Andreas Schwab

2018-01-27 09:09 UTC #6 lore raw

Quoted 1 line · Kalle Valo

58eae1416b80 ssb: Disable PCI host for PCI_DRIVERS_GENERIC

That breaks wireless on PowerMac! There is nothing MIPS-specific about SSB.

Andreas.

Signature · 3 lines

Andreas Schwab, [email protected]
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

James Hogan

2018-01-27 09:18 UTC #7 lore raw

Quoted 6 lines · Andreas Schwab

Quoted 1 line · Kalle Valo
58eae1416b80 ssb: Disable PCI host for PCI_DRIVERS_GENERIC
That breaks wireless on PowerMac! There is nothing MIPS-specific about SSB.

Yes, really sorry about that. There is a patch here:
https://patchwork.kernel.org/patch/10185397/

Cheers
James