Re: [PATCH 3.8 1/3] ath9k_hw: fix calibration issues on chainmask that don't include chain 0

[Wojciech Dubowik <Wojciech.Dubowik@neratec.com>]

On 03/15/2013 02:32 AM, Felix Fietkau wrote:
> On 2013-03-15 1:01 AM, Felix Fietkau wrote:
>> On 2013-03-11 10:43 AM, Wojciech Dubowik wrote:
>>> This could be the solution if you are ok with it.
>>> Wojtek
>>>
>>> diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
>>> b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
>>> index 4cc1394..58c6256 100644
>>> --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
>>> +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
>>> @@ -1023,7 +1023,7 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
>>> AR_PHY_AGC_CONTROL_FLTR_CAL   |
>>> AR_PHY_AGC_CONTROL_PKDET_CAL;
>>>
>>> -       ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask,
>>> ah->caps.tx_chainmask);
>>> +       ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
>> I will do some testing, but I think this will probably be equivalent to
>> a revert of the patch.
> Please try this patch instead:
> ---
> --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
> +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
> @@ -1023,6 +1023,7 @@ static bool ar9003_hw_init_cal(struct at
>   					  AR_PHY_AGC_CONTROL_FLTR_CAL   |
>   					  AR_PHY_AGC_CONTROL_PKDET_CAL;
>   
> +	/* Use chip chainmask only for calibration */
>   	ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask);
>   
>   	if (rtt) {
> @@ -1150,6 +1151,9 @@ skip_tx_iqcal:
>   		ar9003_hw_rtt_disable(ah);
>   	}
>   
> +	/* Revert chainmask to runtime parameters */
> +	ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
> +
>   	/* Initialize list pointers */
>   	ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;
>   
It works. Thanks for looking at it.

Wojtek