b43: LP-PHY: Fix setting TX power control mode during RC calibration

PATCH In review Gábor Stefanik 3 participants 7 messages Aug 14, 2009 – Aug 17, 2009 Networking drivers (wireless)

lore

Share & tools

lore

Gábor Stefanik

author

2009-08-14 19:19 UTC #0 lore raw

PATCH 1/1 b43: LP-PHY: Fix setting TX power control mode during RC calibration

Call set_tx_power_control with a LPPHY_TXPCTL rather than an LPPHY_TX_PWR_CTL_CMD_MODE.

Signed-off-by Gábor Stefanik <[email protected]>

---
This should fix the WARN_ON testers were seeing during init.

drivers/net/wireless/b43/phy_lp.c | 2 +-

1 files changed, 1 insertions(+), 1 deletions(-)

drivers/net/wireless/b43/phy_lp.c +0 -0

index adfa7bf..558224b 100644
@@ -1080,7 +1080,7 @@ static void lpphy_rev0_1_rc_calib(struct b43_wldev *dev)

	old_txpctl = b43_phy_read(dev, B43_LPPHY_TX_PWR_CTL_CMD) &
					B43_LPPHY_TX_PWR_CTL_CMD_MODE;

- lpphy_set_tx_power_control(dev, B43_LPPHY_TX_PWR_CTL_CMD_MODE_OFF);

+	lpphy_set_tx_power_control(dev, B43_LPPHY_TXPCTL_OFF);
	lpphy_disable_crs(dev);
	loopback = lpphy_loopback(dev);
	if (loopback == -1)

Signature · 1 line

1.6.2.4

Larry Finger

2009-08-14 20:43 UTC #1 lore raw

Quoted 15 lines · Gábor Stefanik

Call set_tx_power_control with a LPPHY_TXPCTL rather than an LPPHY_TX_PWR_CTL_CMD_MODE.
Signed-off-by Gábor Stefanik <[email protected]>
---
This should fix the WARN_ON testers were seeing during init.
 drivers/net/wireless/b43/phy_lp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/b43/phy_lp.c +0 -0
index adfa7bf..558224b 100644

drivers/net/wireless/b43/phy_lp.c static void lpphy_rev0_1_rc_calib(struct b43_wldev *dev) · line 1086

Quoted 8 lines

drivers/net/wireless/b43/phy_lp.c +1 -1

@@ -1080,7 +1080,7 @@ static void lpphy_rev0_1_rc_calib(struct b43_wldev *dev)
 	old_txpctl = b43_phy_read(dev, B43_LPPHY_TX_PWR_CTL_CMD) &
 					B43_LPPHY_TX_PWR_CTL_CMD_MODE;
 
-	lpphy_set_tx_power_control(dev, B43_LPPHY_TX_PWR_CTL_CMD_MODE_OFF);
+	lpphy_set_tx_power_control(dev, B43_LPPHY_TXPCTL_OFF);
 	lpphy_disable_crs(dev);
 	loopback = lpphy_loopback(dev);
 	if (loopback == -1)

With this one, I still get WARNING: at
drivers/net/wireless/b43/phy_lp.c:1006
lpphy_set_tx_power_control+0xbf/0xdd [b43]().

To get rid of them, I need to modify the enum b43_lpphy_txpctl_mode{} as I wrote earlier.

I'm also seeing the interface stopped and restarted. I'll try to track that down.

Larry

Gábor Stefanik

author

2009-08-14 20:51 UTC #2 lore raw

2009/8/14 Larry Finger <[email protected]>:

Quoted 30 lines

Quoted 18 lines · Gábor Stefanik
Call set_tx_power_control with a LPPHY_TXPCTL rather than an LPPHY_TX_PWR_CTL_CMD_MODE.
Signed-off-by Gábor Stefanik <[email protected]>
---
This should fix the WARN_ON testers were seeing during init.
drivers/net/wireless/b43/phy_lp.c | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/b43/phy_lp.c +0 -0
index adfa7bf..558224b 100644
@@ -1080,7 +1080,7 @@ static void lpphy_rev0_1_rc_calib(struct b43_wldev *dev)
old_txpctl = b43_phy_read(dev, B43_LPPHY_TX_PWR_CTL_CMD) & B43_LPPHY_TX_PWR_CTL_CMD_MODE;
Quoted 5 lines
- lpphy_set_tx_power_control(dev, B43_LPPHY_TX_PWR_CTL_CMD_MODE_OFF);
+ lpphy_set_tx_power_control(dev, B43_LPPHY_TXPCTL_OFF); lpphy_disable_crs(dev);
loopback = lpphy_loopback(dev);
if (loopback == -1)
With this one, I still get WARNING: at
drivers/net/wireless/b43/phy_lp.c:1006
lpphy_set_tx_power_control+0xbf/0xdd [b43]().

Quoted 2 lines

To get rid of them, I need to modify the enum b43_lpphy_txpctl_mode{} as I wrote earlier.

Is ctl still 0? Please check.

Quoted 8 lines

I'm also seeing the interface stopped and restarted. I'll try to track that down.
Larry

Signature · 1 line

Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)

Gábor Stefanik

author

2009-08-17 19:33 UTC #3 lore raw

In reply to Gábor Stefanik

2009/8/14 Gábor Stefanik <[email protected]>:

Quoted 20 lines

Call set_tx_power_control with a LPPHY_TXPCTL rather than an LPPHY_TX_PWR_CTL_CMD_MODE.
Signed-off-by Gábor Stefanik <[email protected]>
---
This should fix the WARN_ON testers were seeing during init.
drivers/net/wireless/b43/phy_lp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/b43/phy_lp.c +0 -0
index adfa7bf..558224b 100644
@@ -1080,7 +1080,7 @@ static void lpphy_rev0_1_rc_calib(struct b43_wldev
 *dev)
old_txpctl = b43_phy_read(dev, B43_LPPHY_TX_PWR_CTL_CMD) & B43_LPPHY_TX_PWR_CTL_CMD_MODE;

Quoted 8 lines

- lpphy_set_tx_power_control(dev, B43_LPPHY_TX_PWR_CTL_CMD_MODE_OFF);
+ lpphy_set_tx_power_control(dev, B43_LPPHY_TXPCTL_OFF); lpphy_disable_crs(dev);
loopback = lpphy_loopback(dev);
if (loopback == -1)
--
1.6.2.4

John, any news on this one? I can't see it in wireless testing.

Signature · 1 line

Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)

John W. Linville

2009-08-17 20:00 UTC #4 lore raw

Quoted 21 lines · Gábor Stefanik

2009/8/14 Gábor Stefanik <[email protected]>:
Quoted 20 lines
Call set_tx_power_control with a LPPHY_TXPCTL rather than an LPPHY_TX_PWR_CTL_CMD_MODE.
Signed-off-by Gábor Stefanik <[email protected]>
---
This should fix the WARN_ON testers were seeing during init.
drivers/net/wireless/b43/phy_lp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/b43/phy_lp.c +0 -0
index adfa7bf..558224b 100644
@@ -1080,7 +1080,7 @@ static void lpphy_rev0_1_rc_calib(struct b43_wldev
 *dev)
old_txpctl = b43_phy_read(dev, B43_LPPHY_TX_PWR_CTL_CMD) & B43_LPPHY_TX_PWR_CTL_CMD_MODE;

Quoted 10 lines

Quoted 8 lines
- lpphy_set_tx_power_control(dev, B43_LPPHY_TX_PWR_CTL_CMD_MODE_OFF);
+ lpphy_set_tx_power_control(dev, B43_LPPHY_TXPCTL_OFF); lpphy_disable_crs(dev);
loopback = lpphy_loopback(dev);
if (loopback == -1)
--
1.6.2.4
John, any news on this one? I can't see it in wireless testing.

Larry said:

With this one, I still get WARNING: at
drivers/net/wireless/b43/phy_lp.c:1006
lpphy_set_tx_power_control+0xbf/0xdd [b43]().

Signature · 2 lines

John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.

Gábor Stefanik

author

2009-08-17 20:02 UTC #5 lore raw

2009/8/17 John W. Linville <[email protected]>:

Quoted 33 lines · Gábor Stefanik

Quoted 21 lines
2009/8/14 Gábor Stefanik <[email protected]>:
Quoted 20 lines
Call set_tx_power_control with a LPPHY_TXPCTL rather than an LPPHY_TX_PWR_CTL_CMD_MODE.
Signed-off-by Gábor Stefanik <[email protected]>
---
This should fix the WARN_ON testers were seeing during init.
drivers/net/wireless/b43/phy_lp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/b43/phy_lp.c +0 -0
index adfa7bf..558224b 100644
@@ -1080,7 +1080,7 @@ static void lpphy_rev0_1_rc_calib(struct b43_wldev
 *dev)
old_txpctl = b43_phy_read(dev, B43_LPPHY_TX_PWR_CTL_CMD) & B43_LPPHY_TX_PWR_CTL_CMD_MODE;
Quoted 10 lines
Quoted 8 lines
- lpphy_set_tx_power_control(dev, B43_LPPHY_TX_PWR_CTL_CMD_MODE_OFF);
+ lpphy_set_tx_power_control(dev, B43_LPPHY_TXPCTL_OFF); lpphy_disable_crs(dev);
loopback = lpphy_loopback(dev);
if (loopback == -1)
--
1.6.2.4
John, any news on this one? I can't see it in wireless testing.

Quoted 6 lines

Larry said:
With this one, I still get WARNING: at
drivers/net/wireless/b43/phy_lp.c:1006
lpphy_set_tx_power_control+0xbf/0xdd [b43]().

Previously, he was getting 2 warnings. This fixes one of them, the other one is handled by commit 1181d724fc2897f11f95bf6ebc86ae111390929c ("Fix another TX power control abuse").

Quoted 4 lines

--
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.

Signature · 1 line

Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)

Larry Finger

2009-08-17 21:18 UTC #6 lore raw

Quoted 39 lines · Gábor Stefanik

2009/8/17 John W. Linville <[email protected]>:
Quoted 31 lines · Gábor Stefanik
Quoted 21 lines
2009/8/14 Gábor Stefanik <[email protected]>:
Quoted 20 lines
Call set_tx_power_control with a LPPHY_TXPCTL rather than an LPPHY_TX_PWR_CTL_CMD_MODE.
Signed-off-by Gábor Stefanik <[email protected]>
---
This should fix the WARN_ON testers were seeing during init.
drivers/net/wireless/b43/phy_lp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/b43/phy_lp.c +0 -0
index adfa7bf..558224b 100644
@@ -1080,7 +1080,7 @@ static void lpphy_rev0_1_rc_calib(struct b43_wldev
 *dev)
       old_txpctl = b43_phy_read(dev, B43_LPPHY_TX_PWR_CTL_CMD) &
                                       B43_LPPHY_TX_PWR_CTL_CMD_MODE;
 
Quoted 9 lines
Quoted 8 lines
drivers/net/wireless/b43/phy_lp.c +1 -1
-       lpphy_set_tx_power_control(dev, B43_LPPHY_TX_PWR_CTL_CMD_MODE_OFF);
+       lpphy_set_tx_power_control(dev, B43_LPPHY_TXPCTL_OFF);
       lpphy_disable_crs(dev);
       loopback = lpphy_loopback(dev);
       if (loopback == -1)
--
1.6.2.4
John, any news on this one? I can't see it in wireless testing.
Quoted 6 lines
Larry said:
With this one, I still get WARNING: at
drivers/net/wireless/b43/phy_lp.c:1006
lpphy_set_tx_power_control+0xbf/0xdd [b43]().

Quoted 5 lines

Previously, he was getting 2 warnings. This fixes one of them, the other one is handled by commit 1181d724fc2897f11f95bf6ebc86ae111390929c ("Fix another TX power control abuse").

I need to be more careful with my comments. This pack is needed and OK. Because of my involvement with the RE, I cannot ack any of these LP PHY patches.

Larry