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

MFI_STATE_BOOT_MESSAGE_PENDING also needs to be handed for non-TBOLT 

controllers, from FreeBSD. tested by Hugo Silva against a GEN2 controller.
This commit is contained in:
bouyer 2012-11-09 18:46:54 +00:00
parent 12cc872652
commit 43d500aa17
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/ic/mfi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mfi.c,v 1.47 2012/09/19 21:24:29 bouyer Exp $ */
/* $NetBSD: mfi.c,v 1.48 2012/11/09 18:46:54 bouyer Exp $ */
/* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
/*
@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.47 2012/09/19 21:24:29 bouyer Exp $");
__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.48 2012/11/09 18:46:54 bouyer Exp $");
#include "bio.h"
@ -587,12 +587,14 @@ mfi_transition_firmware(struct mfi_softc *sc)
max_wait = 20;
break;
case MFI_STATE_BOOT_MESSAGE_PENDING:
if (sc->sc_ioptype == MFI_IOP_TBOLT) {
if (sc->sc_ioptype == MFI_IOP_SKINNY ||
sc->sc_ioptype == MFI_IOP_TBOLT) {
mfi_write(sc, MFI_SKINNY_IDB, MFI_INIT_HOTPLUG);
max_wait = 180;
break;
} else {
mfi_write(sc, MFI_IDB, MFI_INIT_HOTPLUG);
}
/* FALLTHROUGH */
max_wait = 180;
break;
default:
aprint_error_dev(sc->sc_dev,
"unknown firmware state %d\n", fw_state);