 @@ -1,14 +1,14 @@
-/* $NetBSD: ispmbox.h,v 1.58 2023/09/21 09:31:50 msaitoh Exp $ */
+/* $NetBSD: ispmbox.h,v 1.59 2024/02/02 22:26:58 andvar Exp $ */
 /*
  * Copyright (C) 1997, 1998, 1999 National Aeronautics & Space Administration
  * All rights reserved.
+ *
  * Additional Copyright (C) 2000-2007 by Matthew Jacob
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -1918,27 +1918,27 @@ typedef struct {
 	uint32_t	na_reserved;
 	uint16_t	na_iid;		/* initiator loop id */
 	uint16_t	na_response;	/* response code */
 	uint16_t	na_flags;
 	uint16_t	na_reserved2;
 	uint16_t	na_status;
 	uint16_t	na_task_flags;
 	uint16_t	na_seqid;	/* sequence id */
 	uint16_t	na_reserved3[NA2_RSVDLEN];
 } na_fcentry_e_t;
 #define	NAFC_RCOUNT	0x80	/* increment resource count */
 #define NAFC_RST_CLRD	0x20	/* Clear LIP Reset */
-#define	NAFC_TVALID	0x10	/* task mangement response code is valid */
+#define	NAFC_TVALID	0x10	/* task management response code is valid */
 /*
  * ISP24XX Notify Acknowledge
  */
 typedef struct {
 	isphdr_t	na_header;
 	uint32_t	na_handle;
 	uint16_t	na_nphdl;
 	uint16_t	na_reserved1;
 	uint16_t	na_flags;
 	uint16_t	na_srr_rxid;
 	uint16_t	na_status;

 @@ -1,14 +1,14 @@
-/* $NetBSD: mfi.c,v 1.79 2022/05/24 20:50:19 andvar Exp $ */
+/* $NetBSD: mfi.c,v 1.80 2024/02/02 22:26:58 andvar Exp $ */
 /* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
 /*
  * Copyright (c) 2012 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -63,27 +63,27 @@
  * EXEMPLARY,OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION)HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * The views and conclusions contained in the software and documentation
  * are those of the authors and should not be interpreted as representing
  * official policies,either expressed or implied, of the FreeBSD Project.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.79 2022/05/24 20:50:19 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.80 2024/02/02 22:26:58 andvar Exp $");
 #include "bio.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/cpu.h>
 #include <sys/conf.h>
 @@ -3364,27 +3364,27 @@ mfi_tbolt_create_sgl(struct mfi_ccb *ccb
+ *
  * Even though this driver doesn't access the disks directly, an
  * AEN like command is used to inform the RAID firmware to "sync"
  * with all LD's via the MFI_DCMD_LD_MAP_GET_INFO command.  This
  * command in write mode will return when the RAID firmware has
  * detected a change to the RAID state.  Examples of this type
  * of change are removing a disk.  Once the command returns then
  * the driver needs to acknowledge this and "sync" all LD's again.
  * This repeats until we shutdown.  Then we need to cancel this
  * pending command.
+ *
  * If this is not done right the RAID firmware will not remove a
  * pulled drive and the RAID won't go degraded etc.  Effectively,
- * stopping any RAID mangement to functions.
+ * stopping any RAID management to functions.
+ *
  * Doing another LD sync, requires the use of an event since the
  * driver needs to do a mfi_wait_command and can't do that in an
  * interrupt thread.
+ *
  * The driver could get the RAID state via the MFI_DCMD_LD_MAP_GET_INFO
  * That requires a bunch of structure and it is simpler to just do
  * the MFI_DCMD_LD_GET_LIST versus walking the RAID map.
  */
 void
 mfi_tbolt_sync_map_info(struct work *w, void *v)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: twe.c,v 1.110 2021/08/07 16:19:14 thorpej Exp $	*/
+/*	$NetBSD: twe.c,v 1.111 2024/02/02 22:26:58 andvar Exp $	*/
 /*-
  * Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran; and by Jason R. Thorpe of Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -53,27 +53,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * from FreeBSD: twe.c,v 1.1 2000/05/24 23:35:23 msmith Exp
  */
 /*
  * Driver for the 3ware Escalade family of RAID controllers.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.110 2021/08/07 16:19:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.111 2024/02/02 22:26:58 andvar Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/endian.h>
 #include <sys/malloc.h>
 #include <sys/conf.h>
 #include <sys/disk.h>
 #include <sys/sysctl.h>
 @@ -1004,27 +1004,27 @@ twe_aen_enqueue(struct twe_softc *sc, ui
 					    device_xname(sc->sc_dev),
 					    str[0] == 'u' ? "unit" : "port",
 					    TWE_AEN_UNIT(aen), msg);
 					break;
 				default:
 					log(level, "%s: %s\n",
 					    device_xname(sc->sc_dev), msg);
+				}
+			}
+		}
+	}
-	/* Now enqueue the AEN for mangement tools. */
+	/* Now enqueue the AEN for management tools. */
 	s = splbio();
 	next = (sc->sc_aen_head + 1) % TWE_AEN_Q_LENGTH;
 	nextnext = (sc->sc_aen_head + 2) % TWE_AEN_Q_LENGTH;
 	/*
 	 * If this is the last free slot, then queue up a "queue
 	 * full" message.
 	 */
 	if (nextnext == sc->sc_aen_tail)
 		aen = TWE_AEN_QUEUE_FULL;
 	if (next != sc->sc_aen_tail) {