[PATCH] compat-drivers: do not disable bcma when selecting brcmsmac

[PATCH] compat-drivers: do not disable bcma when selecting brcmsmac

[Arend van Spriel]

The brcmsmac driver depends on the bcma bus driver these days. However,
the driver-select script disabled bcma when selecting brcmsmac (or
the brcm80211 driver group). This leads to mismatch between kernel
bcma and backport brcmsmac. For the 3.9 backport this result in:

[10298.323094] brcmsmac: Unknown symbol bcma_pmu_spuravoid_pllupdate (err 0)

as this function was added to bcma.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
 scripts/driver-select |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/driver-select b/scripts/driver-select
index 862f43b..c6afdfc 100755
--- a/scripts/driver-select
+++ b/scripts/driver-select
@@ -408,7 +408,10 @@ case $1 in
 		;;
 	brcm80211)
 		disable_staging
-		disable_bt_usb_ethernet_var
+		disable_bt_usb_ethernet
+		disable_ssb
+		disable_eeprom
+		disable_lib80211
 		select_drivers		CONFIG_BRCMUTIL \
 					CONFIG_BRCMFMAC \
 					CONFIG_BRCMSMAC
@@ -465,13 +468,17 @@ case $1 in
 		;;
 	brcmsmac)
 		disable_staging
-		disable_bt_usb_ethernet_var
+		disable_bt_usb_ethernet
+		disable_ssb
+		disable_eeprom
+		disable_lib80211
 		select_drivers		CONFIG_BRCMSMAC
 		select_brcm80211_driver	CONFIG_BRCMSMAC CONFIG_BRCMUTIL
 		;;
 	brcmfmac)
 		disable_staging
 		disable_bt_usb_ethernet_var
+		disable_lib80211
 		select_drivers		CONFIG_BRCMFMAC
 		select_brcm80211_driver	CONFIG_BRCMFMAC CONFIG_BRCMUTIL
 		;;
-- 
1.7.10.4

Re: [PATCH] compat-drivers: do not disable bcma when selecting brcmsmac

[Luis R. Rodriguez]

On Sun, Jun 9, 2013 at 12:37 PM, Arend van Spriel <arend@broadcom.com> wrote:
> The brcmsmac driver depends on the bcma bus driver these days. However,
> the driver-select script disabled bcma when selecting brcmsmac (or
> the brcm80211 driver group). This leads to mismatch between kernel
> bcma and backport brcmsmac. For the 3.9 backport this result in:
>
> [10298.323094] brcmsmac: Unknown symbol bcma_pmu_spuravoid_pllupdate (err 0)
>
> as this function was added to bcma.
>
> Signed-off-by: Arend van Spriel <arend@broadcom.com>

Thanks Arend but we're now using a new tree:

git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/backports.git

  Luis

Re: [PATCH] compat-drivers: do not disable bcma when selecting brcmsmac

[Arend van Spriel]

On 06/13/2013 09:39 PM, Luis R. Rodriguez wrote:
> On Sun, Jun 9, 2013 at 12:37 PM, Arend van Spriel <arend@broadcom.com> wrote:
>> The brcmsmac driver depends on the bcma bus driver these days. However,
>> the driver-select script disabled bcma when selecting brcmsmac (or
>> the brcm80211 driver group). This leads to mismatch between kernel
>> bcma and backport brcmsmac. For the 3.9 backport this result in:
>>
>> [10298.323094] brcmsmac: Unknown symbol bcma_pmu_spuravoid_pllupdate (err 0)
>>
>> as this function was added to bcma.
>>
>> Signed-off-by: Arend van Spriel <arend@broadcom.com>
>
> Thanks Arend but we're now using a new tree:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/backports.git
>
>    Luis
>

I was wondering about those, but the twiki still referred to the ones on 
github. So you mean to say this change is already done in the kernel.org 
repo?

There are a couple of repositories: backports, compat-drivers, and 
compat. I followed the backports twiki and it does not mention the 
backports one or did I overlook?

Gr. AvS

Re: [PATCH] compat-drivers: do not disable bcma when selecting brcmsmac

[Arend van Spriel]

On 06/13/2013 10:00 PM, Arend van Spriel wrote:
> On 06/13/2013 09:39 PM, Luis R. Rodriguez wrote:
>> On Sun, Jun 9, 2013 at 12:37 PM, Arend van Spriel <arend@broadcom.com>
>> wrote:
>>> The brcmsmac driver depends on the bcma bus driver these days. However,
>>> the driver-select script disabled bcma when selecting brcmsmac (or
>>> the brcm80211 driver group). This leads to mismatch between kernel
>>> bcma and backport brcmsmac. For the 3.9 backport this result in:
>>>
>>> [10298.323094] brcmsmac: Unknown symbol bcma_pmu_spuravoid_pllupdate
>>> (err 0)
>>>
>>> as this function was added to bcma.
>>>
>>> Signed-off-by: Arend van Spriel <arend@broadcom.com>
>>
>> Thanks Arend but we're now using a new tree:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/backports.git
>>
>>    Luis
>>
>
> I was wondering about those, but the twiki still referred to the ones on
> github. So you mean to say this change is already done in the kernel.org
> repo?
>
> There are a couple of repositories: backports, compat-drivers, and
> compat. I followed the backports twiki and it does not mention the
> backports one or did I overlook?

Yikes. cloned that one and I guess you made a major overhaul, right? Any 
pointers, step-by-step instructions, or how-to article to get me started.

Gr. AvS

Re: [PATCH] compat-drivers: do not disable bcma when selecting brcmsmac

[Johannes Berg]

> > There are a couple of repositories: backports, compat-drivers, and
> > compat. I followed the backports twiki and it does not mention the
> > backports one or did I overlook?
> 
> Yikes. cloned that one and I guess you made a major overhaul, right? Any 
> pointers, step-by-step instructions, or how-to article to get me started.

I made most of the overhaul :-)

./gentree.py /path/to/linux-next/ /tmp/my-output/

johannes

Re: [PATCH] compat-drivers: do not disable bcma when selecting brcmsmac

[Arend van Spriel]

On 06/13/2013 10:09 PM, Johannes Berg wrote:
>
>>> There are a couple of repositories: backports, compat-drivers, and
>>> compat. I followed the backports twiki and it does not mention the
>>> backports one or did I overlook?
>>
>> Yikes. cloned that one and I guess you made a major overhaul, right? Any
>> pointers, step-by-step instructions, or how-to article to get me started.
>
> I made most of the overhaul :-)
>
> ./gentree.py /path/to/linux-next/ /tmp/my-output/

Got it. Like the use of menuconfig. Just might come up with a defconfig 
for the brcm80211 drivers.

Gr. AvS

Re: [PATCH] compat-drivers: do not disable bcma when selecting brcmsmac

[Luis R. Rodriguez]

On Thu, Jun 13, 2013 at 1:34 PM, Arend van Spriel <arend@broadcom.com> wrote:
>
> Got it. Like the use of menuconfig. Just might come up with a defconfig for
> the brcm80211 drivers.

Its already there, the same upstream Kconfig files are used.

  Luis

Re: [PATCH] compat-drivers: do not disable bcma when selecting brcmsmac

[Arend van Spriel]

On 06/13/2013 10:47 PM, Luis R. Rodriguez wrote:
> On Thu, Jun 13, 2013 at 1:34 PM, Arend van Spriel <arend@broadcom.com> wrote:
>>
>> Got it. Like the use of menuconfig. Just might come up with a defconfig for
>> the brcm80211 drivers.
>
> Its already there, the same upstream Kconfig files are used.

You are right. I was looking at the linux-3.10.y branch. Thanks.

Gr. AvS

Re: [PATCH] compat-drivers: do not disable bcma when selecting brcmsmac

[Hauke Mehrtens]

On 06/13/2013 10:05 PM, Arend van Spriel wrote:
> On 06/13/2013 10:00 PM, Arend van Spriel wrote:
>> On 06/13/2013 09:39 PM, Luis R. Rodriguez wrote:
>>> On Sun, Jun 9, 2013 at 12:37 PM, Arend van Spriel <arend@broadcom.com>
>>> wrote:
>>>> The brcmsmac driver depends on the bcma bus driver these days. However,
>>>> the driver-select script disabled bcma when selecting brcmsmac (or
>>>> the brcm80211 driver group). This leads to mismatch between kernel
>>>> bcma and backport brcmsmac. For the 3.9 backport this result in:
>>>>
>>>> [10298.323094] brcmsmac: Unknown symbol bcma_pmu_spuravoid_pllupdate
>>>> (err 0)
>>>>
>>>> as this function was added to bcma.
>>>>
>>>> Signed-off-by: Arend van Spriel <arend@broadcom.com>
>>>
>>> Thanks Arend but we're now using a new tree:
>>>
>>> git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/backports.git
>>>
>>>    Luis
>>>
>>
>> I was wondering about those, but the twiki still referred to the ones on
>> github. So you mean to say this change is already done in the kernel.org
>> repo?
>>
>> There are a couple of repositories: backports, compat-drivers, and
>> compat. I followed the backports twiki and it does not mention the
>> backports one or did I overlook?
> 
> Yikes. cloned that one and I guess you made a major overhaul, right? Any
> pointers, step-by-step instructions, or how-to article to get me started.

I just wrote a wiki page for backports based on an old one for
compat-drivers.

https://backports.wiki.kernel.org/index.php/Documentation/backports/hacking

Feel free to fix or extend it.

Hauke

Re: [PATCH] compat-drivers: do not disable bcma when selecting brcmsmac

[Luis R. Rodriguez]

On Thu, Jun 13, 2013 at 1:00 PM, Arend van Spriel <arend@broadcom.com> wrote:
> On 06/13/2013 09:39 PM, Luis R. Rodriguez wrote:
>> Thanks Arend but we're now using a new tree:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/backports.git
>>
> I was wondering about those, but the twiki still referred to the ones on
> github.

Which twiki ? You mean

https://backports.wiki.kernel.org/index.php/Main_Page

If so then yes, I've only had a chance to update the main page, the
rest need tons of updates and I haven't had time to update them, this
week I'm also incapacitated due to an injury [0] so just accepting
patches.

[0] http://bit.ly/190zMAT

> So you mean to say this change is already done in the kernel.org
> repo?

The compat-drivers tree is left stale, I considered doing a linear
update but Johannes had a boat load of updates and it was easier to
just work out of a new tree. Leaving the old data out also means we
get to leave behind older git pack data therefore trimming the tree
size. I'll keep the older trees around for reference.

  Luis

Re: [PATCH] compat-drivers: do not disable bcma when selecting brcmsmac

[Arend van Spriel]

On 06/13/2013 10:06 PM, Luis R. Rodriguez wrote:
> On Thu, Jun 13, 2013 at 1:00 PM, Arend van Spriel <arend@broadcom.com> wrote:
>> On 06/13/2013 09:39 PM, Luis R. Rodriguez wrote:
>>> Thanks Arend but we're now using a new tree:
>>>
>>> git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/backports.git
>>>
>> I was wondering about those, but the twiki still referred to the ones on
>> github.
>
> Which twiki ? You mean
>
> https://backports.wiki.kernel.org/index.php/Main_Page
>
> If so then yes, I've only had a chance to update the main page, the
> rest need tons of updates and I haven't had time to update them, this
> week I'm also incapacitated due to an injury [0] so just accepting
> patches.
>
> [0] http://bit.ly/190zMAT
>

Geez. You made look. Was it before or after hitting some bars ;-) ?

Hope you recover quickly, man.

Gr. AvS