Skip to contentSkip to conversation

ath5k: Fixes for mesh operation

PATCH In review Javier Cardona 4 participants 15 messages Dec 1, 2010 – Dec 7, 2010 Atheros ATH5K wireless driver

lore
Share & tools
lore
#0 lore raw

After applying these fixes we were able to successfully bring up mesh interfaces and establish peer links with ath9k devices.

One issue still looms with both athX drivers: you have to issue a scan to get mesh beaconing started. Keep that in mind if you try and test these fixes.

#1 lore raw

PATCH 1/3 ath5k: Fix beaconing in mesh mode

This patch fixes the oops below when attempting to bring up a mesh interface on ath5k hardware.

[  128.933099] kernel BUG at drivers/net/wireless/ath/ath5k/base.c:197!
[  128.933099] invalid opcode: 0000 [#1]
(...)
[  128.933099] Call Trace:
[  128.933099]  [<c83b77fa>] ? ath5k_beacon_update+0x57/0x1f8 [ath5k]
[  128.933099]  [<c02d9a40>] ? __sysfs_add_one+0x28/0x76
[  128.933099]  [<c83b830e>] ? ath5k_bss_info_changed+0x13f/0x173
[ath5k]
[  128.933099]  [<c82ff629>] ? ieee80211_config_beacon+0xc0/0x17e
[mac80211]
[  128.933099]  [<c82f073e>] ?
ieee80211_bss_info_change_notify+0x182/0x18b [mac80211]
[  128.933099]  [<c83b81cf>] ? ath5k_bss_info_changed+0x0/0x173 [ath5k]
[  128.933099]  [<c82ff6d6>] ? ieee80211_config_beacon+0x16d/0x17e
[mac80211]
[  128.933099]  [<c82ff753>] ? ieee80211_add_beacon+0x34/0x39 [mac80211]
[  128.933099]  [<c830a4ed>] ? ieee80211s_init+0xf8/0x10f [mac80211]
[  128.933099]  [<c830a5df>] ? ieee80211_mesh_init_sdata+0xdb/0x154 [mac80211]
---
 drivers/net/wireless/ath/ath5k/base.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +5 -3
index a8d380a..73c7118 100644
@@ -1921,8 +1921,9 @@ ath5k_beacon_send(struct ath5k_softc *sc)
 		/* NB: hw still stops DMA, so proceed */
 	}
 
-	/* refresh the beacon for AP mode */
-	if (sc->opmode == NL80211_IFTYPE_AP)
+	/* refresh the beacon for AP or MESH mode */
+	if (sc->opmode == NL80211_IFTYPE_AP ||
+			sc->opmode == NL80211_IFTYPE_MESH_POINT)
 		ath5k_beacon_update(sc->hw, vif);
 
 	ath5k_hw_set_txdp(ah, sc->bhalq, bf->daddr);
@@ -2826,7 +2827,8 @@ static int ath5k_add_interface(struct ieee80211_hw *hw,
 
 	/* Assign the vap/adhoc to a beacon xmit slot. */
 	if ((avf->opmode == NL80211_IFTYPE_AP) ||
-	    (avf->opmode == NL80211_IFTYPE_ADHOC)) {
+	    (avf->opmode == NL80211_IFTYPE_ADHOC) ||
+	    (avf->opmode == NL80211_IFTYPE_MESH_POINT)) {
 		int slot;
 
 		WARN_ON(list_empty(&sc->bcbuf));
Signature · 1 line
1.7.1
#2 lore raw

Re: [PATCH 1/3] ath5k: Fix beaconing in mesh mode

Quoted 30 lines · Javier Cardona

This patch fixes the oops below when attempting to bring up a mesh interface on ath5k hardware.

[  128.933099] kernel BUG at drivers/net/wireless/ath/ath5k/base.c:197! [  128.933099] invalid opcode: 0000 [#1]
(...)
[  128.933099] Call Trace:
[  128.933099]  [<c83b77fa>] ? ath5k_beacon_update+0x57/0x1f8 [ath5k] [  128.933099]  [<c02d9a40>] ? __sysfs_add_one+0x28/0x76
[  128.933099]  [<c83b830e>] ? ath5k_bss_info_changed+0x13f/0x173 [ath5k]
[  128.933099]  [<c82ff629>] ? ieee80211_config_beacon+0xc0/0x17e [mac80211]
[  128.933099]  [<c82f073e>] ?

ieee80211_bss_info_change_notify+0x182/0x18b [mac80211]
[  128.933099]  [<c83b81cf>] ? ath5k_bss_info_changed+0x0/0x173 [ath5k]
[  128.933099]  [<c82ff6d6>] ? ieee80211_config_beacon+0x16d/0x17e

[mac80211]
[  128.933099]  [<c82ff753>] ? ieee80211_add_beacon+0x34/0x39 [mac80211] [  128.933099]  [<c830a4ed>] ? ieee80211s_init+0xf8/0x10f [mac80211] [  128.933099]  [<c830a5df>] ? ieee80211_mesh_init_sdata+0xdb/0x154 [mac80211]
---
 drivers/net/wireless/ath/ath5k/base.c |    8 +++++---

 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +0 -0
index a8d380a..73c7118 100644

drivers/net/wireless/ath/ath5k/base.c ath5k_beacon_send(struct ath5k_softc *sc) · line 1927

Quoted 9 lines
drivers/net/wireless/ath/ath5k/base.c +3 -2
@@ -1921,8 +1921,9 @@ ath5k_beacon_send(struct ath5k_softc *sc)
                /* NB: hw still stops DMA, so proceed */
        }
 
-       /* refresh the beacon for AP mode */
-       if (sc->opmode == NL80211_IFTYPE_AP)
+       /* refresh the beacon for AP or MESH mode */
+       if (sc->opmode == NL80211_IFTYPE_AP ||
+                       sc->opmode == NL80211_IFTYPE_MESH_POINT)
                ath5k_beacon_update(sc->hw, vif);

Do you need to update the beacon this often or just once? Adhoc doesn't need to do this, for example, because it doesn't need the TIM; I don't know about mesh.

Signature · 1 line
Bob Copeland %% www.bobcopeland.com
#3 lore raw

Re: [PATCH 1/3] ath5k: Fix beaconing in mesh mode

Bob,

Quoted 34 lines · Bob Copeland
Quoted 33 lines · Javier Cardona

This patch fixes the oops below when attempting to bring up a mesh interface on ath5k hardware.

[  128.933099] kernel BUG at drivers/net/wireless/ath/ath5k/base.c:197! [  128.933099] invalid opcode: 0000 [#1]
(...)
[  128.933099] Call Trace:
[  128.933099]  [<c83b77fa>] ? ath5k_beacon_update+0x57/0x1f8 [ath5k] [  128.933099]  [<c02d9a40>] ? __sysfs_add_one+0x28/0x76
[  128.933099]  [<c83b830e>] ? ath5k_bss_info_changed+0x13f/0x173 [ath5k]
[  128.933099]  [<c82ff629>] ? ieee80211_config_beacon+0xc0/0x17e [mac80211]
[  128.933099]  [<c82f073e>] ?

ieee80211_bss_info_change_notify+0x182/0x18b [mac80211]
[  128.933099]  [<c83b81cf>] ? ath5k_bss_info_changed+0x0/0x173 [ath5k]
[  128.933099]  [<c82ff6d6>] ? ieee80211_config_beacon+0x16d/0x17e

[mac80211]
[  128.933099]  [<c82ff753>] ? ieee80211_add_beacon+0x34/0x39 [mac80211] [  128.933099]  [<c830a4ed>] ? ieee80211s_init+0xf8/0x10f [mac80211] [  128.933099]  [<c830a5df>] ? ieee80211_mesh_init_sdata+0xdb/0x154 [mac80211]
---
 drivers/net/wireless/ath/ath5k/base.c |    8 +++++---

 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +0 -0
index a8d380a..73c7118 100644
@@ -1921,8 +1921,9 @@ ath5k_beacon_send(struct ath5k_softc *sc)
                /* NB: hw still stops DMA, so proceed */
        }
 
Quoted 10 lines

drivers/net/wireless/ath/ath5k/base.c ath5k_beacon_send(struct ath5k_softc *sc) · line 1927

Quoted 6 lines
drivers/net/wireless/ath/ath5k/base.c +3 -2
-       /* refresh the beacon for AP mode */
-       if (sc->opmode == NL80211_IFTYPE_AP)
+       /* refresh the beacon for AP or MESH mode */
+       if (sc->opmode == NL80211_IFTYPE_AP ||
+                       sc->opmode == NL80211_IFTYPE_MESH_POINT)
                ath5k_beacon_update(sc->hw, vif);

Do you need to update the beacon this often or just once? Adhoc doesn't need to do this, for example, because it doesn't need the TIM; I don't know about mesh.

Currently power save mode is not implemented for mesh interfaces, so the TIM is not really updated or used. But yes, in principle mesh beacons should include the TIM. So it's better to use AP style beaconing to pave the way for someone implementing proper traffic info maps and power save for mesh.

Thanks for reviewing.

Cheers,

Javier

Signature · 3 lines
Javier Cardona
cozybit Inc.
http://www.cozybit.com
#4 lore raw

Re: [PATCH 1/3] ath5k: Fix beaconing in mesh mode

Quoted 9 lines · On Thu December 2 2010 03:23:07 Javier Cardona wrote:
Quoted 3 lines

Do you need to update the beacon this often or just once? Adhoc doesn't need to do this, for example, because it doesn't need the TIM; I don't know about mesh.

Currently power save mode is not implemented for mesh interfaces, so the TIM is not really updated or used. But yes, in principle mesh beacons should include the TIM. So it's better to use AP style beaconing to pave the way for someone implementing proper traffic info maps and power save for mesh.

I have been thinking the same. Using the same style beaconing for AP, ad-hoc and mesh mode could simplify the code, and make it easier to implement TIM or DFS later.

bruno

#5 lore raw

Re: [PATCH 1/3] ath5k: Fix beaconing in mesh mode

In reply to Javier Cardona

Missing Signed-off-by...

Quoted 59 lines · Javier Cardona

This patch fixes the oops below when attempting to bring up a mesh interface on ath5k hardware.

[  128.933099] kernel BUG at drivers/net/wireless/ath/ath5k/base.c:197!
[  128.933099] invalid opcode: 0000 [#1]
(...)
[  128.933099] Call Trace:
[  128.933099]  [<c83b77fa>] ? ath5k_beacon_update+0x57/0x1f8 [ath5k]
[  128.933099]  [<c02d9a40>] ? __sysfs_add_one+0x28/0x76
[  128.933099]  [<c83b830e>] ? ath5k_bss_info_changed+0x13f/0x173
[ath5k]
[  128.933099]  [<c82ff629>] ? ieee80211_config_beacon+0xc0/0x17e
[mac80211]
[  128.933099]  [<c82f073e>] ?
ieee80211_bss_info_change_notify+0x182/0x18b [mac80211]
[  128.933099]  [<c83b81cf>] ? ath5k_bss_info_changed+0x0/0x173 [ath5k]
[  128.933099]  [<c82ff6d6>] ? ieee80211_config_beacon+0x16d/0x17e
[mac80211]
[  128.933099]  [<c82ff753>] ? ieee80211_add_beacon+0x34/0x39 [mac80211]
[  128.933099]  [<c830a4ed>] ? ieee80211s_init+0xf8/0x10f [mac80211]
[  128.933099]  [<c830a5df>] ? ieee80211_mesh_init_sdata+0xdb/0x154 [mac80211]
---
 drivers/net/wireless/ath/ath5k/base.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +5 -3
index a8d380a..73c7118 100644
@@ -1921,8 +1921,9 @@ ath5k_beacon_send(struct ath5k_softc *sc)
 		/* NB: hw still stops DMA, so proceed */
 	}
 
-	/* refresh the beacon for AP mode */
-	if (sc->opmode == NL80211_IFTYPE_AP)
+	/* refresh the beacon for AP or MESH mode */
+	if (sc->opmode == NL80211_IFTYPE_AP ||
+			sc->opmode == NL80211_IFTYPE_MESH_POINT)
 		ath5k_beacon_update(sc->hw, vif);
 
 	ath5k_hw_set_txdp(ah, sc->bhalq, bf->daddr);
@@ -2826,7 +2827,8 @@ static int ath5k_add_interface(struct ieee80211_hw *hw,
 
 	/* Assign the vap/adhoc to a beacon xmit slot. */
 	if ((avf->opmode == NL80211_IFTYPE_AP) ||
-	    (avf->opmode == NL80211_IFTYPE_ADHOC)) {
+	    (avf->opmode == NL80211_IFTYPE_ADHOC) ||
+	    (avf->opmode == NL80211_IFTYPE_MESH_POINT)) {
 		int slot;
 
 		WARN_ON(list_empty(&sc->bcbuf));
Signature · 6 lines
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.
#6 lore raw

PATCH 1/3 ath5k: Fix beaconing in mesh mode

This patch fixes the oops below when attempting to bring up a mesh interface on ath5k hardware.

[  128.933099] kernel BUG at drivers/net/wireless/ath/ath5k/base.c:197!
[  128.933099] invalid opcode: 0000 [#1]
(...)
[  128.933099] Call Trace:
[  128.933099]  [<c83b77fa>] ? ath5k_beacon_update+0x57/0x1f8 [ath5k]
[  128.933099]  [<c02d9a40>] ? __sysfs_add_one+0x28/0x76
[  128.933099]  [<c83b830e>] ? ath5k_bss_info_changed+0x13f/0x173
[ath5k]
[  128.933099]  [<c82ff629>] ? ieee80211_config_beacon+0xc0/0x17e
[mac80211]
[  128.933099]  [<c82f073e>] ?
ieee80211_bss_info_change_notify+0x182/0x18b [mac80211]
[  128.933099]  [<c83b81cf>] ? ath5k_bss_info_changed+0x0/0x173 [ath5k]
[  128.933099]  [<c82ff6d6>] ? ieee80211_config_beacon+0x16d/0x17e
[mac80211]
[  128.933099]  [<c82ff753>] ? ieee80211_add_beacon+0x34/0x39 [mac80211]
[  128.933099]  [<c830a4ed>] ? ieee80211s_init+0xf8/0x10f [mac80211]
[  128.933099]  [<c830a5df>] ? ieee80211_mesh_init_sdata+0xdb/0x154 [mac80211]
---
 drivers/net/wireless/ath/ath5k/base.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +5 -3
index 0a7071a..6c35730 100644
@@ -1913,8 +1913,9 @@ ath5k_beacon_send(struct ath5k_softc *sc)
 		/* NB: hw still stops DMA, so proceed */
 	}
 
-	/* refresh the beacon for AP mode */
-	if (sc->opmode == NL80211_IFTYPE_AP)
+	/* refresh the beacon for AP or MESH mode */
+	if (sc->opmode == NL80211_IFTYPE_AP ||
+			sc->opmode == NL80211_IFTYPE_MESH_POINT)
 		ath5k_beacon_update(sc->hw, vif);
 
 	ath5k_hw_set_txdp(ah, sc->bhalq, bf->daddr);
@@ -2977,7 +2978,8 @@ static int ath5k_add_interface(struct ieee80211_hw *hw,
 
 	/* Assign the vap/adhoc to a beacon xmit slot. */
 	if ((avf->opmode == NL80211_IFTYPE_AP) ||
-	    (avf->opmode == NL80211_IFTYPE_ADHOC)) {
+	    (avf->opmode == NL80211_IFTYPE_ADHOC) ||
+	    (avf->opmode == NL80211_IFTYPE_MESH_POINT)) {
 		int slot;
 
 		WARN_ON(list_empty(&sc->bcbuf));
Signature · 1 line
1.7.1
#7 lore raw

PATCH 2/3 ath5k: Prevent mesh interfaces from being counted as ad-hoc

In reply to Javier Cardona

This results in an erroneus num_adhoc_vifs count, as the this counter was incremented but not decremented for mesh interfaces.

---
 drivers/net/wireless/ath/ath5k/base.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +1 -1
index 73c7118..44f3050 100644
@@ -2847,7 +2847,7 @@ static int ath5k_add_interface(struct ieee80211_hw *hw,
 		sc->bslot[avf->bslot] = vif;
 		if (avf->opmode == NL80211_IFTYPE_AP)
 			sc->num_ap_vifs++;
-		else
+		else if (avf->opmode == NL80211_IFTYPE_ADHOC)
 			sc->num_adhoc_vifs++;
 	}
 
Signature · 1 line
1.7.1
#8 lore raw

Re: [PATCH 2/3] ath5k: Prevent mesh interfaces from being counted as ad-hoc

Missing Signed-off-by...

Quoted 27 lines · Javier Cardona

This results in an erroneus num_adhoc_vifs count, as the this counter was incremented but not decremented for mesh interfaces.

---
 drivers/net/wireless/ath/ath5k/base.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +1 -1
index 73c7118..44f3050 100644
@@ -2847,7 +2847,7 @@ static int ath5k_add_interface(struct ieee80211_hw *hw,
 		sc->bslot[avf->bslot] = vif;
 		if (avf->opmode == NL80211_IFTYPE_AP)
 			sc->num_ap_vifs++;
-		else
+		else if (avf->opmode == NL80211_IFTYPE_ADHOC)
 			sc->num_adhoc_vifs++;
 	}
 
Signature · 6 lines
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.
#9 lore raw

PATCH 2/3 ath5k: Prevent mesh interfaces from being counted as ad-hoc

This results in an erroneus num_adhoc_vifs count, as the this counter was incremented but not decremented for mesh interfaces.

---
 drivers/net/wireless/ath/ath5k/base.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +1 -1
index 6c35730..2bf2e28 100644
@@ -2998,7 +2998,7 @@ static int ath5k_add_interface(struct ieee80211_hw *hw,
 		sc->bslot[avf->bslot] = vif;
 		if (avf->opmode == NL80211_IFTYPE_AP)
 			sc->num_ap_vifs++;
-		else
+		else if (avf->opmode == NL80211_IFTYPE_ADHOC)
 			sc->num_adhoc_vifs++;
 	}
 
Signature · 1 line
1.7.1
#10 lore raw

PATCH 3/3 ath5k: Put the right tsf value in mesh beacons

In reply to Javier Cardona
---
 drivers/net/wireless/ath/ath5k/base.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +2 -1
index 44f3050..6b06754 100644
@@ -1889,7 +1889,8 @@ ath5k_beacon_send(struct ath5k_softc *sc)
 		sc->bmisscount = 0;
 	}
 
-	if (sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs > 1) {
+	if ((sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs > 1) ||
+			sc->opmode == NL80211_IFTYPE_MESH_POINT) {
 		u64 tsf = ath5k_hw_get_tsf64(ah);
 		u32 tsftu = TSF_TO_TU(tsf);
 		int slot = ((tsftu % sc->bintval) * ATH_BCBUF) / sc->bintval;
Signature · 1 line
1.7.1
#11 lore raw

Re: [PATCH 3/3] ath5k: Put the right tsf value in mesh beacons

Missing Signed-off-by...

Quoted 22 lines · Javier Cardona
---
 drivers/net/wireless/ath/ath5k/base.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +2 -1
index 44f3050..6b06754 100644
@@ -1889,7 +1889,8 @@ ath5k_beacon_send(struct ath5k_softc *sc)
 		sc->bmisscount = 0;
 	}
 
-	if (sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs > 1) {
+	if ((sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs > 1) ||
+			sc->opmode == NL80211_IFTYPE_MESH_POINT) {
 		u64 tsf = ath5k_hw_get_tsf64(ah);
 		u32 tsftu = TSF_TO_TU(tsf);
 		int slot = ((tsftu % sc->bintval) * ATH_BCBUF) / sc->bintval;
Signature · 1 line
1.7.1
Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.
#12 lore raw

PATCH 3/3 ath5k: Put the right tsf value in mesh beacons

---
 drivers/net/wireless/ath/ath5k/base.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +2 -1
index 2bf2e28..ac7da50 100644
@@ -1881,7 +1881,8 @@ ath5k_beacon_send(struct ath5k_softc *sc)
 		sc->bmisscount = 0;
 	}
 
-	if (sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs > 1) {
+	if ((sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs > 1) ||
+			sc->opmode == NL80211_IFTYPE_MESH_POINT) {
 		u64 tsf = ath5k_hw_get_tsf64(ah);
 		u32 tsftu = TSF_TO_TU(tsf);
 		int slot = ((tsftu % sc->bintval) * ATH_BCBUF) / sc->bintval;
Signature · 1 line
1.7.1
#13 lore raw
In reply to Javier Cardona

John,

Are you waiting for acks from ath5k maintainers to apply this series?

https://patchwork.kernel.org/patch/369461/
https://patchwork.kernel.org/patch/369471/
https://patchwork.kernel.org/patch/369481/

Thanks!

Javier

Quoted 7 lines · Javier Cardona

After applying these fixes we were able to successfully bring up mesh interfaces and establish peer links with ath9k devices.

One issue still looms with both athX drivers:  you have to issue a scan to get mesh beaconing started.  Keep that in mind if you try and test these fixes.

Signature · 3 lines
Javier Cardona
cozybit Inc.
http://www.cozybit.com
#14 lore raw

Waiting on davem to process my last pull request...

Quoted 32 lines · Javier Cardona

John,

Are you waiting for acks from ath5k maintainers to apply this series?

https://patchwork.kernel.org/patch/369461/
https://patchwork.kernel.org/patch/369471/
https://patchwork.kernel.org/patch/369481/

Thanks!

Javier

Quoted 7 lines · Javier Cardona

After applying these fixes we were able to successfully bring up mesh interfaces and establish peer links with ath9k devices.

One issue still looms with both athX drivers:  you have to issue a scan to get mesh beaconing started.  Keep that in mind if you try and test these fixes.

Signature · 7 lines
Javier Cardona
cozybit Inc.
http://www.cozybit.com
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.