2018-01-26 09:39:10

by Sven Joachim

[permalink] [raw]
Subject: [PATCH] ssb: Do not disable PCI host on non-Mips

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: [email protected]
Signed-off-by: Sven Joachim <[email protected]>
---
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


2018-01-26 17:45:23

by James Hogan

[permalink] [raw]
Subject: Re: [PATCH] ssb: Do not disable PCI host on non-Mips

On Fri, Jan 26, 2018 at 07:01:49PM +0200, Kalle Valo wrote:
> Kalle Valo <[email protected]> writes:
>
> > James Hogan <[email protected]> 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: [email protected]
> >>> Signed-off-by: Sven Joachim <[email protected]>
> >>
> >> 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 <[email protected]>
> >>
> >> 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


Attachments:
(No filename) (1.26 kB)
signature.asc (833.00 B)
Digital signature
Download all attachments

2018-01-26 17:01:54

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH] ssb: Do not disable PCI host on non-Mips

Kalle Valo <[email protected]> writes:

> James Hogan <[email protected]> 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: [email protected]
>>> Signed-off-by: Sven Joachim <[email protected]>
>>
>> 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 <[email protected]>
>>
>> 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.

--
Kalle Valo

2018-01-26 14:56:47

by Kalle Valo

[permalink] [raw]
Subject: Re: ssb: Do not disable PCI host on non-Mips

Sven Joachim <[email protected]> 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: [email protected]
> Signed-off-by: Sven Joachim <[email protected]>
> Reviewed-by: James Hogan <[email protected]>

Patch applied to wireless-drivers.git, thanks.

a9e6d44ddecc ssb: Do not disable PCI host on non-Mips

--
https://patchwork.kernel.org/patch/10185397/

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

2018-01-26 14:37:50

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH] ssb: Do not disable PCI host on non-Mips

James Hogan <[email protected]> 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: [email protected]
>> Signed-off-by: Sven Joachim <[email protected]>
>
> 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 <[email protected]>
>
> 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.

--
Kalle Valo

2018-01-26 10:09:29

by James Hogan

[permalink] [raw]
Subject: Re: [PATCH] ssb: Do not disable PCI host on non-Mips

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: [email protected]
> Signed-off-by: Sven Joachim <[email protected]>

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 <[email protected]>

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
>


Attachments:
(No filename) (1.45 kB)
signature.asc (833.00 B)
Digital signature
Download all attachments