diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2011-09-16 17:47:12 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2011-09-16 17:47:12 +0000 |
| commit | 647d5dc36f84c8d383b13879b781b412a783c7f5 (patch) | |
| tree | 9183ea044ccec72923e1b0ac31458a1686927b9d | |
| parent | 1f7f84d23d7ce1416fc99dc36621c613ed5e3ebc (diff) | |
Notes
| -rw-r--r-- | sys/dev/mfi/mfi.c | 8 | ||||
| -rw-r--r-- | sys/dev/mfi/mfireg.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index 78dc92ba0ff7..f9bfffe8786d 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -260,8 +260,12 @@ mfi_transition_firmware(struct mfi_softc *sc) case MFI_FWSTATE_FLUSH_CACHE: max_wait = 20; break; + case MFI_FWSTATE_BOOT_MESSAGE_PENDING: + MFI_WRITE4(sc, MFI_IDB, MFI_FWINIT_HOTPLUG); + max_wait = 10; + break; default: - device_printf(sc->mfi_dev,"Unknown firmware state %d\n", + device_printf(sc->mfi_dev,"Unknown firmware state %#x\n", fw_state); return (ENXIO); } @@ -273,7 +277,7 @@ mfi_transition_firmware(struct mfi_softc *sc) break; } if (fw_state == cur_state) { - device_printf(sc->mfi_dev, "firmware stuck in state " + device_printf(sc->mfi_dev, "Firmware stuck in state " "%#x\n", fw_state); return (ENXIO); } diff --git a/sys/dev/mfi/mfireg.h b/sys/dev/mfi/mfireg.h index efee82781170..f005c370d70f 100644 --- a/sys/dev/mfi/mfireg.h +++ b/sys/dev/mfi/mfireg.h @@ -112,6 +112,7 @@ __FBSDID("$FreeBSD$"); #define MFI_FWSTATE_WAIT_HANDSHAKE 0x60000000 #define MFI_FWSTATE_FW_INIT_2 0x70000000 #define MFI_FWSTATE_DEVICE_SCAN 0x80000000 +#define MFI_FWSTATE_BOOT_MESSAGE_PENDING 0x90000000 #define MFI_FWSTATE_FLUSH_CACHE 0xa0000000 #define MFI_FWSTATE_READY 0xb0000000 #define MFI_FWSTATE_OPERATIONAL 0xc0000000 @@ -127,6 +128,7 @@ __FBSDID("$FreeBSD$"); #define MFI_FWINIT_READY 0x00000002 /* Move from operational to ready */ #define MFI_FWINIT_MFIMODE 0x00000004 /* unknown */ #define MFI_FWINIT_CLEAR_HANDSHAKE 0x00000008 /* Respond to WAIT_HANDSHAKE */ +#define MFI_FWINIT_HOTPLUG 0x00000010 /* MFI Commands */ typedef enum { |