diff options
| author | msaitoh <msaitoh@NetBSD.org> | 2022-05-07 14:14:34 +0000 |
|---|---|---|
| committer | msaitoh <msaitoh@NetBSD.org> | 2022-05-07 14:14:34 +0000 |
| commit | 41b2270fff2484ae054fb137c7692bef07f4b02b (patch) | |
| tree | 5572fed8110f3cd21ce87b0f5fee947c7fe54fe6 /sys/dev | |
| parent | edf08b5a9694c70cfa0a5fd4a77823cd6ac4d927 (diff) | |
Use mlp_bgi for MFI_LD_PROG_BGI. Same as OpenBSD.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/mfi.c | 13 | ||||
| -rw-r--r-- | sys/dev/pci/mfii.c | 13 |
2 files changed, 20 insertions, 6 deletions
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c index a95a387bfbe..d9702f19a68 100644 --- a/sys/dev/ic/mfi.c +++ b/sys/dev/ic/mfi.c @@ -1,4 +1,4 @@ -/* $NetBSD: mfi.c,v 1.70 2022/05/07 04:40:02 msaitoh Exp $ */ +/* $NetBSD: mfi.c,v 1.71 2022/05/07 14:14:34 msaitoh 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.70 2022/05/07 04:40:02 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.71 2022/05/07 14:14:34 msaitoh Exp $"); #include "bio.h" @@ -2085,7 +2085,6 @@ mfi_ioctl_vol(struct mfi_softc *sc, struct bioc_vol *bv) /* additional status can modify MFI status */ switch (sc->sc_ld_details.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.mld_progress.mlp_cc.mp_progress; bv->bv_percent = (per * 100) / 0xffff; @@ -2093,6 +2092,14 @@ mfi_ioctl_vol(struct mfi_softc *sc, struct bioc_vol *bv) sc->sc_ld_details.mld_progress.mlp_cc.mp_elapsed_seconds; break; + case MFI_LD_PROG_BGI: + bv->bv_status = BIOC_SVSCRUB; + per = (int)sc->sc_ld_details.mld_progress.mlp_bgi.mp_progress; + bv->bv_percent = (per * 100) / 0xffff; + bv->bv_seconds = + sc->sc_ld_details.mld_progress.mlp_bgi.mp_elapsed_seconds; + break; + case MFI_LD_PROG_FGI: case MFI_LD_PROG_RECONSTRUCT: /* nothing yet */ diff --git a/sys/dev/pci/mfii.c b/sys/dev/pci/mfii.c index 11e0a6d41b5..3db271fdc22 100644 --- a/sys/dev/pci/mfii.c +++ b/sys/dev/pci/mfii.c @@ -1,4 +1,4 @@ -/* $NetBSD: mfii.c,v 1.10 2022/05/05 09:14:17 msaitoh Exp $ */ +/* $NetBSD: mfii.c,v 1.11 2022/05/07 14:18:25 msaitoh Exp $ */ /* $OpenBSD: mfii.c,v 1.58 2018/08/14 05:22:21 jmatthew Exp $ */ /* @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.10 2022/05/05 09:14:17 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.11 2022/05/07 14:18:25 msaitoh Exp $"); #include "bio.h" @@ -2934,7 +2934,6 @@ mfii_ioctl_vol(struct mfii_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; @@ -2942,6 +2941,14 @@ mfii_ioctl_vol(struct mfii_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 */ |
