1 files changed, 21 insertions, 19 deletions

diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c
index 205a0f3f343e..24255770a618 100644
--- a/sys/dev/bce/if_bce.c
+++ b/sys/dev/bce/if_bce.c
@@ -535,7 +535,8 @@ MODULE_PNP_INFO("U16:vendor;U16:device;U16:#;U16:#;D:#", pci, bce,
 /****************************************************************************/
 /* Tunable device values                                                    */
 /****************************************************************************/
-static SYSCTL_NODE(_hw, OID_AUTO, bce, CTLFLAG_RD, 0, "bce driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, bce, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
+    "bce driver parameters");
 
 /* Allowable values are TRUE or FALSE */
 static int bce_verbose = TRUE;
@@ -9299,13 +9300,13 @@ bce_add_sysctls(struct bce_softc *sc)
 	}
 
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-	    "nvram_dump", CTLTYPE_OPAQUE | CTLFLAG_RD,
+	    "nvram_dump", CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_NEEDGIANT,
 	    (void *)sc, 0,
 	    bce_sysctl_nvram_dump, "S", "");
 
 #ifdef BCE_NVRAM_WRITE_SUPPORT
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-	    "nvram_write", CTLTYPE_OPAQUE | CTLFLAG_WR,
+	    "nvram_write", CTLTYPE_OPAQUE | CTLFLAG_WR | CTLFLAG_NEEDGIANT,
 	    (void *)sc, 0,
 	    bce_sysctl_nvram_write, "S", "");
 #endif
@@ -9590,84 +9591,85 @@ bce_add_sysctls(struct bce_softc *sc)
 
 #ifdef BCE_DEBUG
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-	    "driver_state", CTLTYPE_INT | CTLFLAG_RW,
+	    "driver_state", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
 	    (void *)sc, 0,
 	    bce_sysctl_driver_state, "I", "Drive state information");
 
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-	    "hw_state", CTLTYPE_INT | CTLFLAG_RW,
+	    "hw_state", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
 	    (void *)sc, 0,
 	    bce_sysctl_hw_state, "I", "Hardware state information");
 
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-	    "status_block", CTLTYPE_INT | CTLFLAG_RW,
+	    "status_block", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
 	    (void *)sc, 0,
 	    bce_sysctl_status_block, "I", "Dump status block");
 
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-	    "stats_block", CTLTYPE_INT | CTLFLAG_RW,
+	    "stats_block", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
 	    (void *)sc, 0,
 	    bce_sysctl_stats_block, "I", "Dump statistics block");
 
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-	    "stats_clear", CTLTYPE_INT | CTLFLAG_RW,
+	    "stats_clear", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
 	    (void *)sc, 0,
 	    bce_sysctl_stats_clear, "I", "Clear statistics block");
 
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-	    "shmem_state", CTLTYPE_INT | CTLFLAG_RW,
+	    "shmem_state", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
 	    (void *)sc, 0,
 	    bce_sysctl_shmem_state, "I", "Shared memory state information");
 
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-	    "bc_state", CTLTYPE_INT | CTLFLAG_RW,
+	    "bc_state", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
 	    (void *)sc, 0,
 	    bce_sysctl_bc_state, "I", "Bootcode state information");
 
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-	    "dump_rx_bd_chain", CTLTYPE_INT | CTLFLAG_RW,
+	    "dump_rx_bd_chain", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
 	    (void *)sc, 0,
 	    bce_sysctl_dump_rx_bd_chain, "I", "Dump RX BD chain");
 
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-	    "dump_rx_mbuf_chain", CTLTYPE_INT | CTLFLAG_RW,
+	    "dump_rx_mbuf_chain", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
 	    (void *)sc, 0,
 	    bce_sysctl_dump_rx_mbuf_chain, "I", "Dump RX MBUF chain");
 
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-	    "dump_tx_chain", CTLTYPE_INT | CTLFLAG_RW,
+	    "dump_tx_chain", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
 	    (void *)sc, 0,
 	    bce_sysctl_dump_tx_chain, "I", "Dump tx_bd chain");
 
 	if (bce_hdr_split == TRUE) {
 		SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-		    "dump_pg_chain", CTLTYPE_INT | CTLFLAG_RW,
+		    "dump_pg_chain",
+		    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
 		    (void *)sc, 0,
 		    bce_sysctl_dump_pg_chain, "I", "Dump page chain");
 	}
 
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-	    "dump_ctx", CTLTYPE_INT | CTLFLAG_RW,
+	    "dump_ctx", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
 	    (void *)sc, 0,
 	    bce_sysctl_dump_ctx, "I", "Dump context memory");
 
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-	    "breakpoint", CTLTYPE_INT | CTLFLAG_RW,
+	    "breakpoint", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
 	    (void *)sc, 0,
 	    bce_sysctl_breakpoint, "I", "Driver breakpoint");
 
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-	    "reg_read", CTLTYPE_INT | CTLFLAG_RW,
+	    "reg_read", CTLTYPE_INT | CTLFLAG_RW| CTLFLAG_NEEDGIANT,
 	    (void *)sc, 0,
 	    bce_sysctl_reg_read, "I", "Register read");
 
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-	    "nvram_read", CTLTYPE_INT | CTLFLAG_RW,
+	    "nvram_read", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
 	    (void *)sc, 0,
 	    bce_sysctl_nvram_read, "I", "NVRAM read");
 
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO,
-	    "phy_read", CTLTYPE_INT | CTLFLAG_RW,
+	    "phy_read", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
 	    (void *)sc, 0,
 	    bce_sysctl_phy_read, "I", "PHY register read");