diff options
| author | Jonathan Matthew <jmatthew@cvs.openbsd.org> | 2019-03-05 01:40:21 +0000 |
|---|---|---|
| committer | Jonathan Matthew <jmatthew@cvs.openbsd.org> | 2019-03-05 01:40:21 +0000 |
| commit | 74954c352846c98cc7b1047adc946cecc202be96 (patch) | |
| tree | bbfcc1cf7dd280e29f15ce7f2c3996107cc07955 /sys/dev/ic | |
| parent | d932e2640e457a6e6cdb1ada8ce79edb53fc1844 (diff) | |
apply background init progress fix from r1.59 of mfii.c
(reverting most of r1.60 of mfi.c, oddly enough)
ok dlg@
tested on a SAS2008 (perc h310)
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/mfi.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c index 905005d9707..a67ba33cfb3 100644 --- a/sys/dev/ic/mfi.c +++ b/sys/dev/ic/mfi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfi.c,v 1.169 2018/08/14 05:22:21 jmatthew Exp $ */ +/* $OpenBSD: mfi.c,v 1.170 2019/03/05 01:40:20 jmatthew Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -1745,7 +1745,6 @@ mfi_ioctl_vol(struct mfi_softc *sc, struct bioc_vol *bv) /* additional status can modify MFI status */ switch (sc->sc_ld_details[i].mld_progress.mlp_in_prog) { case MFI_LD_PROG_CC: - case MFI_LD_PROG_BGI: bv->bv_status = BIOC_SVSCRUB; per = (int)sc->sc_ld_details[i].mld_progress.mlp_cc.mp_progress; bv->bv_percent = (per * 100) / 0xffff; @@ -1753,6 +1752,14 @@ mfi_ioctl_vol(struct mfi_softc *sc, struct bioc_vol *bv) sc->sc_ld_details[i].mld_progress.mlp_cc.mp_elapsed_seconds; break; + case MFI_LD_PROG_BGI: + bv->bv_status = BIOC_SVSCRUB; + per = (int)sc->sc_ld_details[i].mld_progress.mlp_bgi.mp_progress; + bv->bv_percent = (per * 100) / 0xffff; + bv->bv_seconds = + sc->sc_ld_details[i].mld_progress.mlp_bgi.mp_elapsed_seconds; + break; + case MFI_LD_PROG_FGI: case MFI_LD_PROG_RECONSTRUCT: /* nothing yet */ |