| Message ID | 20180115211714.24009-1-jhogan@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 58eae1416b804d900014d84feadda7195007cc30 |
| Delegated to: | Kalle Valo |
| Headers | show |
On 01/15/2018 01:17 PM, James Hogan wrote: > 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 <jhogan@kernel.org> > Cc: Michael Buesch <m@bues.ch> > Cc: Ralf Baechle <ralf@linux-mips.org> > Cc: Paul Burton <paul.burton@mips.com> > Cc: Matt Redfearn <matt.redfearn@imgtec.com> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: linux-wireless@vger.kernel.org > Cc: linux-mips@linux-mips.org Tested-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/ssb/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig > index d8e4219c2324..71c73766ee22 100644 > --- a/drivers/ssb/Kconfig > +++ b/drivers/ssb/Kconfig > @@ -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 >
James Hogan <jhogan@kernel.org> wrote: > 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 <jhogan@kernel.org> > Cc: Michael Buesch <m@bues.ch> > Cc: Ralf Baechle <ralf@linux-mips.org> > Cc: Paul Burton <paul.burton@mips.com> > Cc: Matt Redfearn <matt.redfearn@imgtec.com> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: linux-wireless@vger.kernel.org > Cc: linux-mips@linux-mips.org > Tested-by: Guenter Roeck <linux@roeck-us.net> I'm planning to push this to 4.15 but not sure if there's enough time.
James Hogan <jhogan@kernel.org> wrote: > 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 <jhogan@kernel.org> > Cc: Michael Buesch <m@bues.ch> > Cc: Ralf Baechle <ralf@linux-mips.org> > Cc: Paul Burton <paul.burton@mips.com> > Cc: Matt Redfearn <matt.redfearn@imgtec.com> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: linux-wireless@vger.kernel.org > Cc: linux-mips@linux-mips.org > Tested-by: Guenter Roeck <linux@roeck-us.net> Patch applied to wireless-drivers.git, thanks. 58eae1416b80 ssb: Disable PCI host for PCI_DRIVERS_GENERIC
On Jan 16 2018, Kalle Valo <kvalo@codeaurora.org> wrote:
> 58eae1416b80 ssb: Disable PCI host for PCI_DRIVERS_GENERIC
That breaks wireless on PowerMac! There is nothing MIPS-specific about
SSB.
Andreas.
On Sat, Jan 27, 2018 at 10:08:56AM +0100, Andreas Schwab wrote: > On Jan 16 2018, Kalle Valo <kvalo@codeaurora.org> wrote: > > > 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
diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig index d8e4219c2324..71c73766ee22 100644 --- a/drivers/ssb/Kconfig +++ b/drivers/ssb/Kconfig @@ -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
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 <jhogan@kernel.org> Cc: Michael Buesch <m@bues.ch> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Paul Burton <paul.burton@mips.com> Cc: Matt Redfearn <matt.redfearn@imgtec.com> Cc: Guenter Roeck <linux@roeck-us.net> Cc: linux-wireless@vger.kernel.org Cc: linux-mips@linux-mips.org --- drivers/ssb/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)