ath9k_hw: restore mac address reading logic
Once upon a time the AR_EEPROM_MAC macro was added to let us add a random attribute to the three 4-bytes of MAC addresses entries we read from the EEPROM. This was good while a random high-enough value was used which did not conflict with any of the already existing enum eeprom_param values. With AR9003 support the enums overlap and it means we either increment the random offset or just restore the reading logic to match what the HAL has. I choose to do the later to synchronize the logic on both code bases. This should fix reading the MAC address from the EEPROM on AR9003 hardware. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
0b8f6f2b1b
commit
49101676b2
5 changed files with 11 additions and 11 deletions
|
@ -93,7 +93,6 @@
|
||||||
*/
|
*/
|
||||||
#define AR9285_RDEXT_DEFAULT 0x1F
|
#define AR9285_RDEXT_DEFAULT 0x1F
|
||||||
|
|
||||||
#define AR_EEPROM_MAC(i) (0x1d+(i))
|
|
||||||
#define ATH9K_POW_SM(_r, _s) (((_r) & 0x3f) << (_s))
|
#define ATH9K_POW_SM(_r, _s) (((_r) & 0x3f) << (_s))
|
||||||
#define FREQ2FBIN(x, y) ((y) ? ((x) - 2300) : (((x) - 4800) / 5))
|
#define FREQ2FBIN(x, y) ((y) ? ((x) - 2300) : (((x) - 4800) / 5))
|
||||||
#define ath9k_hw_use_flash(_ah) (!(_ah->ah_flags & AH_USE_EEPROM))
|
#define ath9k_hw_use_flash(_ah) (!(_ah->ah_flags & AH_USE_EEPROM))
|
||||||
|
|
|
@ -183,11 +183,11 @@ static u32 ath9k_hw_4k_get_eeprom(struct ath_hw *ah,
|
||||||
switch (param) {
|
switch (param) {
|
||||||
case EEP_NFTHRESH_2:
|
case EEP_NFTHRESH_2:
|
||||||
return pModal->noiseFloorThreshCh[0];
|
return pModal->noiseFloorThreshCh[0];
|
||||||
case AR_EEPROM_MAC(0):
|
case EEP_MAC_LSW:
|
||||||
return pBase->macAddr[0] << 8 | pBase->macAddr[1];
|
return pBase->macAddr[0] << 8 | pBase->macAddr[1];
|
||||||
case AR_EEPROM_MAC(1):
|
case EEP_MAC_MID:
|
||||||
return pBase->macAddr[2] << 8 | pBase->macAddr[3];
|
return pBase->macAddr[2] << 8 | pBase->macAddr[3];
|
||||||
case AR_EEPROM_MAC(2):
|
case EEP_MAC_MSW:
|
||||||
return pBase->macAddr[4] << 8 | pBase->macAddr[5];
|
return pBase->macAddr[4] << 8 | pBase->macAddr[5];
|
||||||
case EEP_REG_0:
|
case EEP_REG_0:
|
||||||
return pBase->regDmn[0];
|
return pBase->regDmn[0];
|
||||||
|
|
|
@ -173,11 +173,11 @@ static u32 ath9k_hw_AR9287_get_eeprom(struct ath_hw *ah,
|
||||||
switch (param) {
|
switch (param) {
|
||||||
case EEP_NFTHRESH_2:
|
case EEP_NFTHRESH_2:
|
||||||
return pModal->noiseFloorThreshCh[0];
|
return pModal->noiseFloorThreshCh[0];
|
||||||
case AR_EEPROM_MAC(0):
|
case EEP_MAC_LSW:
|
||||||
return pBase->macAddr[0] << 8 | pBase->macAddr[1];
|
return pBase->macAddr[0] << 8 | pBase->macAddr[1];
|
||||||
case AR_EEPROM_MAC(1):
|
case EEP_MAC_MID:
|
||||||
return pBase->macAddr[2] << 8 | pBase->macAddr[3];
|
return pBase->macAddr[2] << 8 | pBase->macAddr[3];
|
||||||
case AR_EEPROM_MAC(2):
|
case EEP_MAC_MSW:
|
||||||
return pBase->macAddr[4] << 8 | pBase->macAddr[5];
|
return pBase->macAddr[4] << 8 | pBase->macAddr[5];
|
||||||
case EEP_REG_0:
|
case EEP_REG_0:
|
||||||
return pBase->regDmn[0];
|
return pBase->regDmn[0];
|
||||||
|
|
|
@ -238,11 +238,11 @@ static u32 ath9k_hw_def_get_eeprom(struct ath_hw *ah,
|
||||||
return pModal[0].noiseFloorThreshCh[0];
|
return pModal[0].noiseFloorThreshCh[0];
|
||||||
case EEP_NFTHRESH_2:
|
case EEP_NFTHRESH_2:
|
||||||
return pModal[1].noiseFloorThreshCh[0];
|
return pModal[1].noiseFloorThreshCh[0];
|
||||||
case AR_EEPROM_MAC(0):
|
case EEP_MAC_LSW:
|
||||||
return pBase->macAddr[0] << 8 | pBase->macAddr[1];
|
return pBase->macAddr[0] << 8 | pBase->macAddr[1];
|
||||||
case AR_EEPROM_MAC(1):
|
case EEP_MAC_MID:
|
||||||
return pBase->macAddr[2] << 8 | pBase->macAddr[3];
|
return pBase->macAddr[2] << 8 | pBase->macAddr[3];
|
||||||
case AR_EEPROM_MAC(2):
|
case EEP_MAC_MSW:
|
||||||
return pBase->macAddr[4] << 8 | pBase->macAddr[5];
|
return pBase->macAddr[4] << 8 | pBase->macAddr[5];
|
||||||
case EEP_REG_0:
|
case EEP_REG_0:
|
||||||
return pBase->regDmn[0];
|
return pBase->regDmn[0];
|
||||||
|
|
|
@ -472,10 +472,11 @@ static int ath9k_hw_init_macaddr(struct ath_hw *ah)
|
||||||
u32 sum;
|
u32 sum;
|
||||||
int i;
|
int i;
|
||||||
u16 eeval;
|
u16 eeval;
|
||||||
|
u32 EEP_MAC[] = { EEP_MAC_LSW, EEP_MAC_MID, EEP_MAC_MSW };
|
||||||
|
|
||||||
sum = 0;
|
sum = 0;
|
||||||
for (i = 0; i < 3; i++) {
|
for (i = 0; i < 3; i++) {
|
||||||
eeval = ah->eep_ops->get_eeprom(ah, AR_EEPROM_MAC(i));
|
eeval = ah->eep_ops->get_eeprom(ah, EEP_MAC[i]);
|
||||||
sum += eeval;
|
sum += eeval;
|
||||||
common->macaddr[2 * i] = eeval >> 8;
|
common->macaddr[2 * i] = eeval >> 8;
|
||||||
common->macaddr[2 * i + 1] = eeval & 0xff;
|
common->macaddr[2 * i + 1] = eeval & 0xff;
|
||||||
|
|
Reference in a new issue