Skip to contentSkip to conversation

compat-drivers: do not disable bcma when selecting brcmsmac

PATCH In review Arend van Spriel 4 participants 11 messages Jun 9, 2013 – Jun 14, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 compat-drivers: do not disable bcma when selecting brcmsmac

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.

---
 scripts/driver-select |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
scripts/driver-select +9 -2
index 862f43b..c6afdfc 100755
@@ -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
 		;;
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 10 lines · 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.

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

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

Luis

#2 lore raw
Quoted 10 lines · Luis R. Rodriguez
Quoted 9 lines · 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.

Quoted 8 lines
Quoted 1 line

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

#3 lore raw
Quoted 22 lines · Arend van Spriel
Quoted 12 lines · Luis R. Rodriguez
Quoted 10 lines · 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.

Quoted 8 lines
Quoted 1 line

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

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

Luis

Quoted 7 lines

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

#4 lore raw
Quoted 7 lines
Quoted 4 lines

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

#5 lore raw
Quoted 11 lines · Johannes Berg
Quoted 7 lines
Quoted 4 lines

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

#6 lore raw
Quoted 3 lines · Arend van Spriel

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

#7 lore raw
Quoted 6 lines · Luis R. Rodriguez
Quoted 3 lines · Arend van Spriel

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

#8 lore raw
In reply to Arend van Spriel
Quoted 27 lines · Arend van Spriel
Quoted 26 lines · Arend van Spriel
Quoted 12 lines · Luis R. Rodriguez
Quoted 10 lines · 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.

Quoted 8 lines
Quoted 1 line

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?

Quoted 6 lines
Quoted 3 lines

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

#9 lore raw
In reply to Arend van Spriel
Quoted 7 lines · Arend van Spriel
Quoted 4 lines · Luis R. Rodriguez

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

Quoted 2 lines

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

#10 lore raw
Quoted 11 lines · Luis R. Rodriguez
Quoted 7 lines · Arend van Spriel
Quoted 4 lines · Luis R. Rodriguez

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

Quoted 9 lines

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