2009-03-31 10:07:10

by Fabio Rossi

Subject: [PATCH] ath5k: fix interpolation with equal power levels

When the EEPROM contains weird values for the power levels we have to
fix the interpolation process.

Signed-off-by: Fabio Rossi <[email protected]>
---
diff --git a/drivers/net/wireless/ath5k/phy.c b/drivers/net/wireless/ath5k/phy.c
index 9e2faae..0e3e0e0 100644
--- a/drivers/net/wireless/ath5k/phy.c
+++ b/drivers/net/wireless/ath5k/phy.c
@@ -1487,28 +1487,35 @@ ath5k_get_linear_pcdac_min(const u8 *stepL, const u8 *stepR,
{
s8 tmp;
s16 min_pwrL, min_pwrR;
- s16 pwr_i = pwrL[0];
-
- do {
- pwr_i--;
- tmp = (s8) ath5k_get_interpolated_value(pwr_i,
- pwrL[0], pwrL[1],
- stepL[0], stepL[1]);
-
- } while (tmp > 1);
-
- min_pwrL = pwr_i;
-
- pwr_i = pwrR[0];
- do {
- pwr_i--;
- tmp = (s8) ath5k_get_interpolated_value(pwr_i,
- pwrR[0], pwrR[1],
- stepR[0], stepR[1]);
-
- } while (tmp > 1);
+ s16 pwr_i;
+
+ if (pwrL[0] == pwrL[1])
+ min_pwrL = pwrL[0];
+ else {
+ pwr_i = pwrL[0];
+ do {
+ pwr_i--;
+ tmp = (s8) ath5k_get_interpolated_value(pwr_i,
+ pwrL[0], pwrL[1],
+ stepL[0], stepL[1]);
+ } while (tmp > 1);
+
+ min_pwrL = pwr_i;
+ }

- min_pwrR = pwr_i;
+ if (pwrR[0] == pwrR[1])
+ min_pwrR = pwrR[0];
+ else {
+ pwr_i = pwrR[0];
+ do {
+ pwr_i--;
+ tmp = (s8) ath5k_get_interpolated_value(pwr_i,
+ pwrR[0], pwrR[1],
+ stepR[0], stepR[1]);
+ } while (tmp > 1);
+
+ min_pwrR = pwr_i;
+ }

/* Keep the right boundary so that it works for both curves */
return max(min_pwrL, min_pwrR);

2009-03-31 17:19:00

by Nick Kossifidis

Subject: Re: [PATCH] ath5k: fix interpolation with equal power levels

MjAwOS8zLzMxIEZhYmlvIFJvc3NpIDxyb3NzaS5mQGlud2luZC5pdD46Cj4gV2hlbiB0aGUgRUVQ
Uk9NIGNvbnRhaW5zIHdlaXJkIHZhbHVlcyBmb3IgdGhlIHBvd2VyIGxldmVscyB3ZSBoYXZlIHRv
Cj4gZml4IHRoZSBpbnRlcnBvbGF0aW9uIHByb2Nlc3MuCj4KPiBTaWduZWQtb2ZmLWJ5OiBGYWJp
byBSb3NzaSA8cm9zc2kuZkBpbndpbmQuaXQ+Cj4gLS0tCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv
bmV0L3dpcmVsZXNzL2F0aDVrL3BoeS5jIGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoNWsvcGh5
LmMKPiBpbmRleCA5ZTJmYWFlLi4wZTNlMGUwIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvbmV0L3dp
cmVsZXNzL2F0aDVrL3BoeS5jCj4gKysrIGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoNWsvcGh5
LmMKPiBAQCAtMTQ4NywyOCArMTQ4NywzNSBAQCBhdGg1a19nZXRfbGluZWFyX3BjZGFjX21pbihj
b25zdCB1OCAqc3RlcEwsIGNvbnN0IHU4ICpzdGVwUiwKPiDCoHsKPiDCoCDCoCDCoCDCoHM4IHRt
cDsKPiDCoCDCoCDCoCDCoHMxNiBtaW5fcHdyTCwgbWluX3B3clI7Cj4gLSDCoCDCoCDCoCBzMTYg
cHdyX2kgPSBwd3JMWzBdOwo+IC0KPiAtIMKgIMKgIMKgIGRvIHsKPiAtIMKgIMKgIMKgIMKgIMKg
IMKgIMKgIHB3cl9pLS07Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCB0bXAgPSAoczgpIGF0aDVr
X2dldF9pbnRlcnBvbGF0ZWRfdmFsdWUocHdyX2ksCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC
oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBwd3JMWzBdLCBw
d3JMWzFdLAo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg
wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgc3RlcExbMF0sIHN0ZXBMWzFdKTsKPiAtCj4gLSDCoCDC
oCDCoCB9IHdoaWxlICh0bXAgPiAxKTsKPiAtCj4gLSDCoCDCoCDCoCBtaW5fcHdyTCA9IHB3cl9p
Owo+IC0KPiAtIMKgIMKgIMKgIHB3cl9pID0gcHdyUlswXTsKPiAtIMKgIMKgIMKgIGRvIHsKPiAt
IMKgIMKgIMKgIMKgIMKgIMKgIMKgIHB3cl9pLS07Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCB0
bXAgPSAoczgpIGF0aDVrX2dldF9pbnRlcnBvbGF0ZWRfdmFsdWUocHdyX2ksCj4gLSDCoCDCoCDC
oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC
oCDCoCBwd3JSWzBdLCBwd3JSWzFdLAo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg
wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgc3RlcFJbMF0sIHN0ZXBSWzFd
KTsKPiAtCj4gLSDCoCDCoCDCoCB9IHdoaWxlICh0bXAgPiAxKTsKPiArIMKgIMKgIMKgIHMxNiBw
d3JfaTsKPiArCj4gKyDCoCDCoCDCoCBpZiAocHdyTFswXSA9PSBwd3JMWzFdKQo+ICsgwqAgwqAg
wqAgwqAgwqAgwqAgwqAgbWluX3B3ckwgPSBwd3JMWzBdOwo+ICsgwqAgwqAgwqAgZWxzZSB7Cj4g
KyDCoCDCoCDCoCDCoCDCoCDCoCDCoCBwd3JfaSA9IHB3ckxbMF07Cj4gKyDCoCDCoCDCoCDCoCDC
oCDCoCDCoCBkbyB7Cj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBwd3JfaS0t
Owo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgdG1wID0gKHM4KSBhdGg1a19n
ZXRfaW50ZXJwb2xhdGVkX3ZhbHVlKHB3cl9pLAo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg
wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg
cHdyTFswXSwgcHdyTFsxXSwKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg
IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHN0ZXBMWzBdLCBz
dGVwTFsxXSk7Cj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCB9IHdoaWxlICh0bXAgPiAxKTsKPiAr
Cj4gKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCBtaW5fcHdyTCA9IHB3cl9pOwo+ICsgwqAgwqAgwqAg
fQo+Cj4gLSDCoCDCoCDCoCBtaW5fcHdyUiA9IHB3cl9pOwo+ICsgwqAgwqAgwqAgaWYgKHB3clJb
MF0gPT0gcHdyUlsxXSkKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIG1pbl9wd3JSID0gcHdyUlsw
XTsKPiArIMKgIMKgIMKgIGVsc2Ugewo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgcHdyX2kgPSBw
d3JSWzBdOwo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgZG8gewo+ICsgwqAgwqAgwqAgwqAgwqAg
wqAgwqAgwqAgwqAgwqAgwqAgcHdyX2ktLTsKPiArIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg
IMKgIMKgIHRtcCA9IChzOCkgYXRoNWtfZ2V0X2ludGVycG9sYXRlZF92YWx1ZShwd3JfaSwKPiAr
IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg
IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHB3clJbMF0sIHB3clJbMV0sCj4gKyDCoCDCoCDCoCDC
oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC
oCDCoCDCoCDCoCDCoCBzdGVwUlswXSwgc3RlcFJbMV0pOwo+ICsgwqAgwqAgwqAgwqAgwqAgwqAg
wqAgfSB3aGlsZSAodG1wID4gMSk7Cj4gKwo+ICsgwqAgwqAgwqAgwqAgwqAgwqAgwqAgbWluX3B3
clIgPSBwd3JfaTsKPiArIMKgIMKgIMKgIH0KPgo+IMKgIMKgIMKgIMKgLyogS2VlcCB0aGUgcmln
aHQgYm91bmRhcnkgc28gdGhhdCBpdCB3b3JrcyBmb3IgYm90aCBjdXJ2ZXMgKi8KPiDCoCDCoCDC
oCDCoHJldHVybiBtYXgobWluX3B3ckwsIG1pbl9wd3JSKTsKPgoKCkFja2VkLWJ5OiBOaWNrIEtv
c3NpZmlkaXMgPG1pY2tmbGVtbUBnbWFpbC5jb20+CgotLSAKR1BHIElEOiAweEQyMURCMkRCCkFz
IHlvdSByZWFkIHRoaXMgcG9zdCBnbG9iYWwgZW50cm9weSByaXNlcy4gSGF2ZSBGdW4gOy0pCk5p
Y2sK

2009-03-31 17:38:44

by Luis R. Rodriguez

Subject: Re: [ath5k-devel] [PATCH] ath5k: fix interpolation with equal power levels

On Tue, Mar 31, 2009 at 10:18 AM, Nick Kossifidis <[email protected]> wrote:
> 2009/3/31 Fabio Rossi <[email protected]>:
>> When the EEPROM contains weird values for the power levels we have to
>> fix the interpolation process.
>>
>> Signed-off-by: Fabio Rossi <[email protected]>

> Acked-by: Nick Kossifidis <[email protected]>

Can this be rebased on top of the ath5k/ath9k/ar9170 merge series?

Luis