Re: [PATCH v2 3/3] rt2x00: rt2800lib: turn on tertiary PAs/LNAs for 3T/3R devices

[Gabor Juhos <juhosg@openwrt.org>]

2013.06.24. 22:40 keltezéssel, Gertjan van Wingerde írta:
> Hi Gabor,
> 
> Sent from my iPad
> 
> On 24 jun. 2013, at 22:32, Gabor Juhos <juhosg@openwrt.org> wrote:
> 
>> The 3T/3R devices are using the tertiary PAs/LNAs
>> however those are never turned on. Fix the code to
>> turn on those on for such devices.
>>
>> Also modify the code to use switch statements to
>> improve readability.
>>
>> Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
> 
> Just one more thing. See below.
> 
>> ---
>> Changes in v2:
>> - use a switch statement to improve readability as suggested
>>   by Gertjan
>> - add detailed commit description
>> ---
>> drivers/net/wireless/rt2x00/rt2800lib.c |   44 +++++++++++++++++++++++--------
>> 1 file changed, 33 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
>> index b7119e3..25f4727 100644
>> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
>> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
>> @@ -2678,29 +2678,51 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
>>
>>    tx_pin = 0;
>>
>> -    if (rt2x00dev->default_ant.tx_chain_num > 1) {
>> -        /* Turn on secondary PAs for 2T and for 3T devices*/
>> +    switch (rt2x00dev->default_ant.tx_chain_num) {
>> +    case 3:
>> +        /* Turn on tertiary PAs */
>> +        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A2_EN,
>> +                   rf->channel > 14);
>> +        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G2_EN,
>> +                   rf->channel <= 14);
>> +        /* fall-through */
>> +    case 2:
>> +        /* Turn on secondary PAs */
>>        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A1_EN,
>>                   rf->channel > 14);
>>        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G1_EN,
>>                   rf->channel <= 14);
>> +        /* fall-through */
>> +    case 1:
>> +        /* Turn on primary PAs */
>> +        if (test_bit(CAPABILITY_BT_COEXIST, &rt2x00dev->cap_flags))
>> +            rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G0_EN, 1);
>> +        else
>> +            rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G0_EN,
>> +                       rf->channel <= 14);
>> +        break;
>>    }
>>
>> -    if (rt2x00dev->default_ant.rx_chain_num > 1) {
>> -        /* Turn on secondary LNAs for 2R and for 3R devices */
>> +    switch (rt2x00dev->default_ant.rx_chain_num) {
>> +    case 3:
>> +        /* Turn on tertiary LNAs */
>> +        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A2_EN, 1);
>> +        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G2_EN, 1);
>> +        /* fall-through */
>> +    case 2:
>> +        /* Turn on secondary LNAs */
>>        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A1_EN, 1);
>>        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G1_EN, 1);
>> +        /* fall-through */
>> +    case 1:
>> +        /* Turn on primary LNAs */
>> +        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A0_EN, 1);
>> +        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G0_EN, 1);
>> +        break;
>>    }
>>
>> -    rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_A0_EN, 1);
>> -    rt2x00_set_field32(&tx_pin, TX_PIN_CFG_LNA_PE_G0_EN, 1);
>>    rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFTR_EN, 1);
>>    rt2x00_set_field32(&tx_pin, TX_PIN_CFG_TRSW_EN, 1);
>> -    if (test_bit(CAPABILITY_BT_COEXIST, &rt2x00dev->cap_flags))
>> -        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G0_EN, 1);
>> -    else
>> -        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_G0_EN,
>> -                   rf->channel <= 14);
>>    rt2x00_set_field32(&tx_pin, TX_PIN_CFG_PA_PE_A0_EN, rf->channel > 14);
> 
> I guess you forgot to move this setting of the primary PA of the 5GHz band inside the switch?

Hm, you are right. Even though it does not change the behaviour, but it should
be moved as well. Will send yet another version.

-Gabor