jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-01 02:03:31 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix for the Intel WiFi Link 1000. The EEPROM image is in the OTPROM block

Browse Source 
before the last block, not in the last block itself.

Approved by:	rpaulo (mentor)
Obtained from:	OpenBSD
MFC after:	3 weeks
This commit is contained in:
Bernhard Schmidt 2010-02-15 19:18:46 +00:00
parent 1480515a8b
commit ae6fd00faf
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=203934
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/iwn/if_iwn.c
View File

@ -972,8 +972,7 @@ iwn_eeprom_unlock(struct iwn_softc *sc)
int
iwn_init_otprom(struct iwn_softc *sc)
{
uint32_t base;
uint16_t next;
uint16_t prev, base, next;
int count, error;
/* Wait for clock stabilization before accessing prph. */
@ -1000,25 +999,26 @@ iwn_init_otprom(struct iwn_softc *sc)
IWN_OTP_GP_ECC_CORR_STTS | IWN_OTP_GP_ECC_UNCORR_STTS);
/*
* Find last valid OTP block (contains the EEPROM image) for HW
* without OTP shadow RAM.
* Find the block before last block (contains the EEPROM image)
* for HW without OTP shadow RAM.
*/
if (sc->hw_type == IWN_HW_REV_TYPE_1000) {
/* Switch to absolute addressing mode. */
IWN_CLRBITS(sc, IWN_OTP_GP, IWN_OTP_GP_RELATIVE_ACCESS);
base = 0;
base = prev = 0;
for (count = 0; count < IWN1000_OTP_NBLOCKS; count++) {
error = iwn_read_prom_data(sc, base, &next, 2);
if (error != 0)
return error;
if (next == 0) /* End of linked-list. */
break;
prev = base;
base = le16toh(next);
}
if (base == 0 || count == IWN1000_OTP_NBLOCKS)
if (count == 0 || count == IWN1000_OTP_NBLOCKS)
return EIO;
/* Skip "next" word. */
sc->prom_base = base + 1;
sc->prom_base = prev + 1;
}
return 0;
}