diff mbox

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

Message ID 4A85B8DE.3000704@gmail.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Gábor Stefanik Aug. 14, 2009, 7:19 p.m. UTC
Call set_tx_power_control with a LPPHY_TXPCTL rather than an
LPPHY_TX_PWR_CTL_CMD_MODE.

Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
---
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(-)

Comments

Larry Finger Aug. 14, 2009, 8:43 p.m. UTC | #1
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 <netrolller.3d@gmail.com>
> ---
> 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


--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Gábor Stefanik Aug. 14, 2009, 8:50 p.m. UTC | #2
2009/8/14 Larry Finger <Larry.Finger@lwfinger.net>:
> 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 <netrolller.3d@gmail.com>
>> ---
>> 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
>
>
>
Gábor Stefanik Aug. 17, 2009, 7:32 p.m. UTC | #3
2009/8/14 Gábor Stefanik <netrolller.3d@gmail.com>:
> Call set_tx_power_control with a LPPHY_TXPCTL rather than an
> LPPHY_TX_PWR_CTL_CMD_MODE.
>
> Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
> ---
> 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.
John W. Linville Aug. 17, 2009, 7:57 p.m. UTC | #4
On Mon, Aug 17, 2009 at 09:32:42PM +0200, Gábor Stefanik wrote:
> 2009/8/14 Gábor Stefanik <netrolller.3d@gmail.com>:
> > Call set_tx_power_control with a LPPHY_TXPCTL rather than an
> > LPPHY_TX_PWR_CTL_CMD_MODE.
> >
> > Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
> > ---
> > 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]().
Gábor Stefanik Aug. 17, 2009, 8:02 p.m. UTC | #5
2009/8/17 John W. Linville <linville@tuxdriver.com>:
> On Mon, Aug 17, 2009 at 09:32:42PM +0200, Gábor Stefanik wrote:
>> 2009/8/14 Gábor Stefanik <netrolller.3d@gmail.com>:
>> > Call set_tx_power_control with a LPPHY_TXPCTL rather than an
>> > LPPHY_TX_PWR_CTL_CMD_MODE.
>> >
>> > Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
>> > ---
>> > 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
> linville@tuxdriver.com                  might be all we have.  Be ready.
>
Larry Finger Aug. 17, 2009, 9:17 p.m. UTC | #6
Gábor Stefanik wrote:
> 2009/8/17 John W. Linville <linville@tuxdriver.com>:
>> On Mon, Aug 17, 2009 at 09:32:42PM +0200, Gábor Stefanik wrote:
>>> 2009/8/14 Gábor Stefanik <netrolller.3d@gmail.com>:
>>>> Call set_tx_power_control with a LPPHY_TXPCTL rather than an
>>>> LPPHY_TX_PWR_CTL_CMD_MODE.
>>>>
>>>> Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
>>>> ---
>>>> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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)