Commit adddc0d2 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville

ath9k: Fix magnitude/phase calculation

Incorrect values are programmed in the registers
containing the IQ correction coefficients by the IQ-CAL
post-processing code. Fix this.
Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8c221387
...@@ -888,6 +888,7 @@ static void ar9003_hw_tx_iq_cal_outlier_detection(struct ath_hw *ah, ...@@ -888,6 +888,7 @@ static void ar9003_hw_tx_iq_cal_outlier_detection(struct ath_hw *ah,
bool is_reusable) bool is_reusable)
{ {
int i, im, nmeasurement; int i, im, nmeasurement;
int magnitude, phase;
u32 tx_corr_coeff[MAX_MEASUREMENT][AR9300_MAX_CHAINS]; u32 tx_corr_coeff[MAX_MEASUREMENT][AR9300_MAX_CHAINS];
struct ath9k_hw_cal_data *caldata = ah->caldata; struct ath9k_hw_cal_data *caldata = ah->caldata;
...@@ -929,9 +930,11 @@ static void ar9003_hw_tx_iq_cal_outlier_detection(struct ath_hw *ah, ...@@ -929,9 +930,11 @@ static void ar9003_hw_tx_iq_cal_outlier_detection(struct ath_hw *ah,
} }
for (im = 0; im < nmeasurement; im++) { for (im = 0; im < nmeasurement; im++) {
magnitude = coeff->mag_coeff[i][im];
phase = coeff->phs_coeff[i][im];
coeff->iqc_coeff[0] = (coeff->mag_coeff[i][im] & 0x7f) | coeff->iqc_coeff[0] =
((coeff->phs_coeff[i][im] & 0x7f) << 7); (phase & 0x7f) | ((magnitude & 0x7f) << 7);
if ((im % 2) == 0) if ((im % 2) == 0)
REG_RMW_FIELD(ah, tx_corr_coeff[im][i], REG_RMW_FIELD(ah, tx_corr_coeff[im][i],
...@@ -1062,8 +1065,9 @@ static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah, bool is_reusable) ...@@ -1062,8 +1065,9 @@ static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah, bool is_reusable)
goto tx_iqcal_fail; goto tx_iqcal_fail;
} }
coeff.mag_coeff[i][im] = coeff.iqc_coeff[0] & 0x7f;
coeff.phs_coeff[i][im] = coeff.phs_coeff[i][im] =
coeff.iqc_coeff[0] & 0x7f;
coeff.mag_coeff[i][im] =
(coeff.iqc_coeff[0] >> 7) & 0x7f; (coeff.iqc_coeff[0] >> 7) & 0x7f;
if (coeff.mag_coeff[i][im] > 63) if (coeff.mag_coeff[i][im] > 63)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment