Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

On 8254[17] with SPI ROM, wm_nvm_set_addrbits_size_eecd() calls wm_nvm_read(),

Browse Source 
so it's required to set flags and functions before calling it. It was broken
again in if_wm.c rev. 1.530 (see also 1.313). Tested with Dell Power Edge 1850.
This commit is contained in:
msaitoh 2017-07-26 08:09:59 +00:00
parent 9a55b3ffdd
commit 03a9e76b73
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/pci/if_wm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_wm.c,v 1.531 2017/07/26 06:48:49 msaitoh Exp $ */
/* $NetBSD: if_wm.c,v 1.532 2017/07/26 08:09:59 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.531 2017/07/26 06:48:49 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.532 2017/07/26 08:09:59 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@ -2078,6 +2078,13 @@ alloc_retry:
case WM_T_82547:
case WM_T_82547_2:
reg = CSR_READ(sc, WMREG_EECD);
/*
* wm_nvm_set_addrbits_size_eecd() accesses SPI in it only
* on 8254[17], so set flags and functios before calling it.
*/
sc->sc_flags |= WM_F_LOCK_EECD;
sc->nvm.acquire = wm_get_eecd;
sc->nvm.release = wm_put_eecd;
if (reg & EECD_EE_TYPE) {
/* SPI */
sc->nvm.read = wm_nvm_read_spi;
@ -2094,9 +2101,6 @@ alloc_retry:
sc->sc_nvm_addrbits = 6;
}
}
sc->sc_flags |= WM_F_LOCK_EECD;
sc->nvm.acquire = wm_get_eecd;
sc->nvm.release = wm_put_eecd;
break;
case WM_T_82571:
case WM_T_82572: