2009-08-14 19:19:58

by Gábor Stefanik

[permalink] [raw]
Subject: [PATCH] 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(-)

diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
index adfa7bf..558224b 100644
--- a/drivers/net/wireless/b43/phy_lp.c
+++ b/drivers/net/wireless/b43/phy_lp.c
@@ -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)
--
1.6.2.4





2009-08-17 20:02:33

by Gábor Stefanik

[permalink] [raw]
Subject: Re: [PATCH] b43: LP-PHY: Fix setting TX power control mode during RC calibration

2009/8/17 John W. Linville <[email protected]>:
> On Mon, Aug 17, 2009 at 09:32:42PM +0200, G?bor Stefanik wrote:
>> 2009/8/14 G?bor Stefanik <[email protected]>:
>> > 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(-)
>> >
>> > diff --git a/drivers/net/wireless/b43/phy_lp.c
>> > b/drivers/net/wireless/b43/phy_lp.c
>> > index adfa7bf..558224b 100644
>> > --- a/drivers/net/wireless/b43/phy_lp.c
>> > +++ b/drivers/net/wireless/b43/phy_lp.c
>> > @@ -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)
>> > --
>> > 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]().
>

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").

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



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

2009-08-17 21:18:25

by Larry Finger

[permalink] [raw]
Subject: Re: [PATCH] b43: LP-PHY: Fix setting TX power control mode during RC calibration

G?bor Stefanik wrote:
> 2009/8/17 John W. Linville <[email protected]>:
>> On Mon, Aug 17, 2009 at 09:32:42PM +0200, G?bor Stefanik wrote:
>>> 2009/8/14 G?bor Stefanik <[email protected]>:
>>>> 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(-)
>>>>
>>>> diff --git a/drivers/net/wireless/b43/phy_lp.c
>>>> b/drivers/net/wireless/b43/phy_lp.c
>>>> index adfa7bf..558224b 100644
>>>> --- a/drivers/net/wireless/b43/phy_lp.c
>>>> +++ b/drivers/net/wireless/b43/phy_lp.c
>>>> @@ -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)
>>>> --
>>>> 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]().
>>
>
> 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

2009-08-17 20:00:15

by John W. Linville

[permalink] [raw]
Subject: Re: [PATCH] b43: LP-PHY: Fix setting TX power control mode during RC calibration

On Mon, Aug 17, 2009 at 09:32:42PM +0200, G?bor Stefanik wrote:
> 2009/8/14 G?bor Stefanik <[email protected]>:
> > 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(-)
> >
> > diff --git a/drivers/net/wireless/b43/phy_lp.c
> > b/drivers/net/wireless/b43/phy_lp.c
> > index adfa7bf..558224b 100644
> > --- a/drivers/net/wireless/b43/phy_lp.c
> > +++ b/drivers/net/wireless/b43/phy_lp.c
> > @@ -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)
> > --
> > 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]().

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

2009-08-14 20:51:00

by Gábor Stefanik

[permalink] [raw]
Subject: Re: [PATCH] b43: LP-PHY: Fix setting TX power control mode during RC calibration

2009/8/14 Larry Finger <[email protected]>:
> G?bor Stefanik wrote:
>> 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(-)
>>
>> diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
>> index adfa7bf..558224b 100644
>> --- a/drivers/net/wireless/b43/phy_lp.c
>> +++ b/drivers/net/wireless/b43/phy_lp.c
>> @@ -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.

Is ctl still 0? Please check.

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



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

2009-08-14 20:43:27

by Larry Finger

[permalink] [raw]
Subject: Re: [PATCH] b43: LP-PHY: Fix setting TX power control mode during RC calibration

Gábor Stefanik wrote:
> 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(-)
>
> diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
> index adfa7bf..558224b 100644
> --- a/drivers/net/wireless/b43/phy_lp.c
> +++ b/drivers/net/wireless/b43/phy_lp.c
> @@ -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



2009-08-17 19:33:01

by Gábor Stefanik

[permalink] [raw]
Subject: Re: [PATCH] b43: LP-PHY: Fix setting TX power control mode during RC calibration

2009/8/14 G?bor Stefanik <[email protected]>:
> 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(-)
>
> diff --git a/drivers/net/wireless/b43/phy_lp.c
> b/drivers/net/wireless/b43/phy_lp.c
> index adfa7bf..558224b 100644
> --- a/drivers/net/wireless/b43/phy_lp.c
> +++ b/drivers/net/wireless/b43/phy_lp.c
> @@ -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)
> --
> 1.6.2.4
>

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

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