The comments are indicating the TXMIXER_GAIN_BG and
the TXMIXED_GAIN_A entries are overlapping with the
RSSI_BG2 and RSSI_A2 entries in the extended EEPROM
map. This is not correct, becuase the upper byte of
the RSSI_BG2 and RSSI_A2 entries are reserved. There
are no TX mixer gain values are stored at all in the
extended EEPROM.
Remove the initialization of these entries from the
extended EEPROM map to reflect this.
Signed-off-by: Gabor Juhos <[email protected]>
---
drivers/net/wireless/rt2x00/rt2800lib.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index c706ddc..c979bb7 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -280,10 +280,8 @@ static const unsigned int rt2800_eeprom_map_ext[EEPROM_WORD_COUNT] = {
[EEPROM_RSSI_BG] = 0x0028,
[EEPROM_TXPOWER_DELTA] = 0x0028, /* Overlaps with RSSI_BG */
[EEPROM_RSSI_BG2] = 0x0029,
- [EEPROM_TXMIXER_GAIN_BG] = 0x0029, /* Overlaps with RSSI_BG2 */
[EEPROM_RSSI_A] = 0x002a,
[EEPROM_RSSI_A2] = 0x002b,
- [EEPROM_TXMIXER_GAIN_A] = 0x002b, /* Overlaps with RSSI_A2 */
[EEPROM_TXPOWER_BG1] = 0x0030,
[EEPROM_TXPOWER_BG2] = 0x0037,
[EEPROM_EXT_TXPOWER_BG3] = 0x003e,
--
1.7.10
Am Mittwoch, den 02.10.2013, 21:41 +0200 schrieb Gabor Juhos:
> The TXPOWER_DELTA field of the regular EEPROM
> stores the TX power compensation value for HT40.
> The extended EEPROM has no such field, it stores
> separate TX power values for HT20 and for HT40.
>
> Signed-off-by: Gabor Juhos <[email protected]>
> ---
> drivers/net/wireless/rt2x00/rt2800lib.c | 1 -
> 1 file changed, 1 deletion(-)
[…]
Acked-by: Paul Menzel <[email protected]>
Dear Paul,
<...>
>> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
>> index c706ddc..c979bb7 100644
>> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
>> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
>> @@ -280,10 +280,8 @@ static const unsigned int rt2800_eeprom_map_ext[EEPROM_WORD_COUNT] = {
>> [EEPROM_RSSI_BG] = 0x0028,
>> [EEPROM_TXPOWER_DELTA] = 0x0028, /* Overlaps with RSSI_BG */
>> [EEPROM_RSSI_BG2] = 0x0029,
>> - [EEPROM_TXMIXER_GAIN_BG] = 0x0029, /* Overlaps with RSSI_BG2 */
>> [EEPROM_RSSI_A] = 0x002a,
>> [EEPROM_RSSI_A2] = 0x002b,
>> - [EEPROM_TXMIXER_GAIN_A] = 0x002b, /* Overlaps with RSSI_A2 */
>> [EEPROM_TXPOWER_BG1] = 0x0030,
>> [EEPROM_TXPOWER_BG2] = 0x0037,
>> [EEPROM_EXT_TXPOWER_BG3] = 0x003e,
>
> Do you know if this fixes any problems and should be backported to
> stable?
This is a cleanup patch, it does not fix any problem. The removed entries are
not used by the code at all.
> If any testing can be done on
>
> idVendor 0x148f Ralink Technology, Corp.
> idProduct 0x2870 RT2870 Wireless Adapter
>
> please tell me.
The extended EEPROM map is used only for the RT3593 chipset, it does not affect
RT2870 in any way.
>
> With the fixes above,
>
> Acked-by: Paul Menzel <[email protected]>
Thank you for the review! I will send an updated version.
-Gabor
Dear Gabor,
thank you for the patch!
Am Mittwoch, den 02.10.2013, 21:41 +0200 schrieb Gabor Juhos:
> The comments are indicating the TXMIXER_GAIN_BG and
> the TXMIXED_GAIN_A entries are overlapping with the
(I think if you use »the« twice, it is just singular »entry«.)
> RSSI_BG2 and RSSI_A2 entries in the extended EEPROM
> map. This is not correct, becuase the upper byte of
bec*au*se
> the RSSI_BG2 and RSSI_A2 entries are reserved. There
> are no TX mixer gain values are stored at all in the
> extended EEPROM.
>
> Remove the initialization of these entries from the
> extended EEPROM map to reflect this.
>
> Signed-off-by: Gabor Juhos <[email protected]>
> ---
> drivers/net/wireless/rt2x00/rt2800lib.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
> index c706ddc..c979bb7 100644
> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> @@ -280,10 +280,8 @@ static const unsigned int rt2800_eeprom_map_ext[EEPROM_WORD_COUNT] = {
> [EEPROM_RSSI_BG] = 0x0028,
> [EEPROM_TXPOWER_DELTA] = 0x0028, /* Overlaps with RSSI_BG */
> [EEPROM_RSSI_BG2] = 0x0029,
> - [EEPROM_TXMIXER_GAIN_BG] = 0x0029, /* Overlaps with RSSI_BG2 */
> [EEPROM_RSSI_A] = 0x002a,
> [EEPROM_RSSI_A2] = 0x002b,
> - [EEPROM_TXMIXER_GAIN_A] = 0x002b, /* Overlaps with RSSI_A2 */
> [EEPROM_TXPOWER_BG1] = 0x0030,
> [EEPROM_TXPOWER_BG2] = 0x0037,
> [EEPROM_EXT_TXPOWER_BG3] = 0x003e,
Do you know if this fixes any problems and should be backported to
stable? If any testing can be done on
idVendor 0x148f Ralink Technology, Corp.
idProduct 0x2870 RT2870 Wireless Adapter
please tell me.
With the fixes above,
Acked-by: Paul Menzel <[email protected]>
Thanks,
Paul
The TXPOWER_DELTA field of the regular EEPROM
stores the TX power compensation value for HT40.
The extended EEPROM has no such field, it stores
separate TX power values for HT20 and for HT40.
Signed-off-by: Gabor Juhos <[email protected]>
---
drivers/net/wireless/rt2x00/rt2800lib.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index c979bb7..315f4af 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -278,7 +278,6 @@ static const unsigned int rt2800_eeprom_map_ext[EEPROM_WORD_COUNT] = {
[EEPROM_LNA] = 0x0026,
[EEPROM_EXT_LNA2] = 0x0027,
[EEPROM_RSSI_BG] = 0x0028,
- [EEPROM_TXPOWER_DELTA] = 0x0028, /* Overlaps with RSSI_BG */
[EEPROM_RSSI_BG2] = 0x0029,
[EEPROM_RSSI_A] = 0x002a,
[EEPROM_RSSI_A2] = 0x002b,
--
1.7.10