Message ID | 87vafpq7t2.fsf@turtle.gmx.de (mailing list archive) |
---|---|
State | Accepted |
Commit | a9e6d44ddeccd3522670e641f1ed9b068e746ff7 |
Delegated to: | Kalle Valo |
Headers | show |
On Fri, Jan 26, 2018 at 10:38:01AM +0100, Sven Joachim wrote: > After upgrading an old laptop to 4.15-rc9, I found that the eth0 and > wlan0 interfaces had disappeared. It turns out that the b43 and b44 > drivers require SSB_PCIHOST_POSSIBLE which depends on > PCI_DRIVERS_LEGACY, a config option that only exists on Mips. > > Fixes: 58eae1416b80 ("ssb: Disable PCI host for PCI_DRIVERS_GENERIC") > Cc: stable@vger.org > Signed-off-by: Sven Joachim <svenjoac@gmx.de> Whoops, thats a very good point. I hadn't twigged that PCI_DRIVERS_LEGACY was MIPS specific (one of the disadvantages of using "tig grep" I suppose!). Reviewed-by: James Hogan <jhogan@kernel.org> I think this is obviously correct, so it'd be great to squeeze it into 4.15 final. Fortunately the other related change, commit 664eadd6f44b ("bcma: Fix 'allmodconfig' and BCMA builds on MIPS targets"), already depends on MIPS so doesn't have the same issue. Sorry for the breakage! James > --- > drivers/ssb/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig > index 71c73766ee22..65af12c3bdb2 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) && PCI_DRIVERS_LEGACY > + depends on SSB && (PCI = y || PCI = SSB) && (PCI_DRIVERS_LEGACY || !MIPS) > default y > > config SSB_PCIHOST > -- > 2.15.1 >
James Hogan <jhogan@kernel.org> writes: > On Fri, Jan 26, 2018 at 10:38:01AM +0100, Sven Joachim wrote: >> After upgrading an old laptop to 4.15-rc9, I found that the eth0 and >> wlan0 interfaces had disappeared. It turns out that the b43 and b44 >> drivers require SSB_PCIHOST_POSSIBLE which depends on >> PCI_DRIVERS_LEGACY, a config option that only exists on Mips. >> >> Fixes: 58eae1416b80 ("ssb: Disable PCI host for PCI_DRIVERS_GENERIC") >> Cc: stable@vger.org >> Signed-off-by: Sven Joachim <svenjoac@gmx.de> > > Whoops, thats a very good point. I hadn't twigged that > PCI_DRIVERS_LEGACY was MIPS specific (one of the disadvantages of using > "tig grep" I suppose!). > > Reviewed-by: James Hogan <jhogan@kernel.org> > > I think this is obviously correct, so it'd be great to squeeze it into > 4.15 final. I'm not sure if I'm able to get it to 4.15 as it has go via the net tree, and we have only two days before the (likely) final release, but I'll try.
Sven Joachim <svenjoac@gmx.de> wrote: > After upgrading an old laptop to 4.15-rc9, I found that the eth0 and > wlan0 interfaces had disappeared. It turns out that the b43 and b44 > drivers require SSB_PCIHOST_POSSIBLE which depends on > PCI_DRIVERS_LEGACY, a config option that only exists on Mips. > > Fixes: 58eae1416b80 ("ssb: Disable PCI host for PCI_DRIVERS_GENERIC") > Cc: stable@vger.org > Signed-off-by: Sven Joachim <svenjoac@gmx.de> > Reviewed-by: James Hogan <jhogan@kernel.org> Patch applied to wireless-drivers.git, thanks. a9e6d44ddecc ssb: Do not disable PCI host on non-Mips
Kalle Valo <kvalo@codeaurora.org> writes: > James Hogan <jhogan@kernel.org> writes: > >> On Fri, Jan 26, 2018 at 10:38:01AM +0100, Sven Joachim wrote: >>> After upgrading an old laptop to 4.15-rc9, I found that the eth0 and >>> wlan0 interfaces had disappeared. It turns out that the b43 and b44 >>> drivers require SSB_PCIHOST_POSSIBLE which depends on >>> PCI_DRIVERS_LEGACY, a config option that only exists on Mips. >>> >>> Fixes: 58eae1416b80 ("ssb: Disable PCI host for PCI_DRIVERS_GENERIC") >>> Cc: stable@vger.org >>> Signed-off-by: Sven Joachim <svenjoac@gmx.de> >> >> Whoops, thats a very good point. I hadn't twigged that >> PCI_DRIVERS_LEGACY was MIPS specific (one of the disadvantages of using >> "tig grep" I suppose!). >> >> Reviewed-by: James Hogan <jhogan@kernel.org> >> >> I think this is obviously correct, so it'd be great to squeeze it into >> 4.15 final. > > I'm not sure if I'm able to get it to 4.15 as it has go via the net > tree, and we have only two days before the (likely) final release, but > I'll try. Too late, Dave already sent his last pull request for 4.15. This will be in 4.16.
On Fri, Jan 26, 2018 at 07:01:49PM +0200, Kalle Valo wrote: > Kalle Valo <kvalo@codeaurora.org> writes: > > > James Hogan <jhogan@kernel.org> writes: > > > >> On Fri, Jan 26, 2018 at 10:38:01AM +0100, Sven Joachim wrote: > >>> After upgrading an old laptop to 4.15-rc9, I found that the eth0 and > >>> wlan0 interfaces had disappeared. It turns out that the b43 and b44 > >>> drivers require SSB_PCIHOST_POSSIBLE which depends on > >>> PCI_DRIVERS_LEGACY, a config option that only exists on Mips. > >>> > >>> Fixes: 58eae1416b80 ("ssb: Disable PCI host for PCI_DRIVERS_GENERIC") > >>> Cc: stable@vger.org > >>> Signed-off-by: Sven Joachim <svenjoac@gmx.de> > >> > >> Whoops, thats a very good point. I hadn't twigged that > >> PCI_DRIVERS_LEGACY was MIPS specific (one of the disadvantages of using > >> "tig grep" I suppose!). > >> > >> Reviewed-by: James Hogan <jhogan@kernel.org> > >> > >> I think this is obviously correct, so it'd be great to squeeze it into > >> 4.15 final. > > > > I'm not sure if I'm able to get it to 4.15 as it has go via the net > > tree, and we have only two days before the (likely) final release, but > > I'll try. > > Too late, Dave already sent his last pull request for 4.15. This will be > in 4.16. Okay, thanks anyway (and sorry again!). Cheers James
diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig index 71c73766ee22..65af12c3bdb2 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) && PCI_DRIVERS_LEGACY + depends on SSB && (PCI = y || PCI = SSB) && (PCI_DRIVERS_LEGACY || !MIPS) default y config SSB_PCIHOST
After upgrading an old laptop to 4.15-rc9, I found that the eth0 and wlan0 interfaces had disappeared. It turns out that the b43 and b44 drivers require SSB_PCIHOST_POSSIBLE which depends on PCI_DRIVERS_LEGACY, a config option that only exists on Mips. Fixes: 58eae1416b80 ("ssb: Disable PCI host for PCI_DRIVERS_GENERIC") Cc: stable@vger.org Signed-off-by: Sven Joachim <svenjoac@gmx.de> --- drivers/ssb/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)