Module Name: src
Committed By: msaitoh
Date: Sat May 7 14:14:34 UTC 2022
Modified Files:
src/sys/dev/ic: mfi.c
Log Message:
Use mlp_bgi for MFI_LD_PROG_BGI. Same as OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/ic/mfi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/mfi.c
diff -u src/sys/dev/ic/mfi.c:1.70 src/sys/dev/ic/mfi.c:1.71
--- src/sys/dev/ic/mfi.c:1.70 Sat May 7 04:40:02 2022
+++ src/sys/dev/ic/mfi.c Sat May 7 14:14:34 2022
@@ -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, stru
/* 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, stru
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 */
