 @@ -1,14 +1,14 @@
-/* $NetBSD: mfi.c,v 1.68 2022/04/16 18:15:21 andvar Exp $ */
+/* $NetBSD: mfi.c,v 1.69 2022/05/05 07:18:02 msaitoh 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.68 2022/04/16 18:15:21 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.69 2022/05/05 07:18:02 msaitoh 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>
 @@ -572,27 +572,27 @@ mfi_transition_firmware(struct mfi_softc
 			aprint_error_dev(sc->sc_dev, "firmware fault\n");
 			return 1;
 		case MFI_STATE_WAIT_HANDSHAKE:
 			if (sc->sc_ioptype == MFI_IOP_SKINNY ||
 			    sc->sc_ioptype == MFI_IOP_TBOLT)
 				mfi_write(sc, MFI_SKINNY_IDB, MFI_INIT_CLEAR_HANDSHAKE);
 			else
 				mfi_write(sc, MFI_IDB, MFI_INIT_CLEAR_HANDSHAKE);
 			max_wait = 2;
 			break;
 		case MFI_STATE_OPERATIONAL:
 			if (sc->sc_ioptype == MFI_IOP_SKINNY ||
 			    sc->sc_ioptype == MFI_IOP_TBOLT)
-				mfi_write(sc, MFI_SKINNY_IDB, MFI_INIT_READY);
+				mfi_write(sc, MFI_SKINNY_IDB, MFI_RESET_FLAGS);
 			else
 				mfi_write(sc, MFI_IDB, MFI_INIT_READY);
 			max_wait = 10;
 			break;
 		case MFI_STATE_UNDEFINED:
 		case MFI_STATE_BB_INIT:
 			max_wait = 2;
 			break;
 		case MFI_STATE_FW_INIT:
 		case MFI_STATE_DEVICE_SCAN:
 		case MFI_STATE_FLUSH_CACHE:
 			max_wait = 20;
 			break;
 @@ -1049,26 +1049,28 @@ mfi_attach(struct mfi_softc *sc, enum mf
 	status = mfi_fw_state(sc);
 	sc->sc_max_cmds = status & MFI_STATE_MAXCMD_MASK;
 	max_sgl = (status & MFI_STATE_MAXSGL_MASK) >> 16;
 	if (sc->sc_ioptype == MFI_IOP_TBOLT) {
 		sc->sc_max_sgl = uimin(max_sgl, (128 * 1024) / PAGE_SIZE + 1);
 		sc->sc_sgl_size = sizeof(struct mfi_sg_ieee);
 	} else if (sc->sc_64bit_dma) {
 		sc->sc_max_sgl = uimin(max_sgl, (128 * 1024) / PAGE_SIZE + 1);
 		sc->sc_sgl_size = sizeof(struct mfi_sg64);
 	} else {
 		sc->sc_max_sgl = max_sgl;
 		sc->sc_sgl_size = sizeof(struct mfi_sg32);
+	}
 	if (sc->sc_ioptype == MFI_IOP_SKINNY)
 		sc->sc_sgl_size = sizeof(struct mfi_sg_ieee);
 	DNPRINTF(MFI_D_MISC, "%s: max commands: %u, max sgl: %u\n",
 	    DEVNAME(sc), sc->sc_max_cmds, sc->sc_max_sgl);
 	if (sc->sc_ioptype == MFI_IOP_TBOLT) {
 		uint32_t tb_mem_size;
 		/* for Alignment */
 		tb_mem_size = MEGASAS_THUNDERBOLT_MSG_ALIGNMENT;
 		tb_mem_size +=
 		    MEGASAS_THUNDERBOLT_NEW_MSG_SIZE * (sc->sc_max_cmds + 1);
 		sc->sc_reply_pool_size =
 		    ((sc->sc_max_cmds + 1 + 15) / 16) * 16;
 		tb_mem_size +=
 @@ -1769,27 +1771,28 @@ mfi_create_sgl(struct mfi_ccb *ccb, int
 			aprint_error_dev(sc->sc_dev, "more than %d dma segs\n",
 			    sc->sc_max_sgl);
 		} else {
 			aprint_error_dev(sc->sc_dev,
 			    "error %d loading dma map\n", error);
+		}
 		return 1;
+	}
 	hdr = &ccb->ccb_frame->mfr_header;
 	sgl = ccb->ccb_sgl;
 	sgd = ccb->ccb_dmamap->dm_segs;
 	for (i = 0; i < ccb->ccb_dmamap->dm_nsegs; i++) {
-		if (sc->sc_ioptype == MFI_IOP_TBOLT &&
+		if (((sc->sc_ioptype == MFI_IOP_SKINNY) ||
 			(sc->sc_ioptype == MFI_IOP_TBOLT)) &&
 		    (hdr->mfh_cmd == MFI_CMD_PD_SCSI_IO ||
 		     hdr->mfh_cmd == MFI_CMD_LD_READ ||
 		     hdr->mfh_cmd == MFI_CMD_LD_WRITE)) {
 			sgl->sg_ieee[i].addr = htole64(sgd[i].ds_addr);
 			sgl->sg_ieee[i].len = htole32(sgd[i].ds_len);
 			sgl->sg_ieee[i].flags = 0;
 			DNPRINTF(MFI_D_DMA, "%s: addr: %#" PRIx64 " len: %#"
 			    PRIx32 "\n",
 			    DEVNAME(sc), sgl->sg64[i].addr, sgl->sg64[i].len);
 			hdr->mfh_flags |= MFI_FRAME_IEEE_SGL | MFI_FRAME_SGL64;
 		} else if (sc->sc_64bit_dma) {
 			sgl->sg64[i].addr = htole64(sgd[i].ds_addr);
 			sgl->sg64[i].len = htole32(sgd[i].ds_len);

 @@ -1,14 +1,14 @@
-/* $NetBSD: mfireg.h,v 1.14 2022/03/23 11:08:27 andvar Exp $ */
+/* $NetBSD: mfireg.h,v 1.15 2022/05/05 07:18:02 msaitoh Exp $ */
 /* $OpenBSD: mfireg.h,v 1.24 2006/06/19 19:05:45 marco Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 @@ -115,31 +115,32 @@
 #define MFI_STATE_MAXCMD_MASK		0x0000ffff
 #define MFI_STATE_HOSTMEMREQD_MASK	0x08000000
 #define MFI_STATE_BOOT_MESSAGE_PENDING	0x90000000
 #define MFI_RESET_REQUIRED		0x00000001
 /* ThunderBolt Support */
 #define MFI_STATE_TB_MASK		0xf0000000
 #define MFI_STATE_TB_RESET		0x00000000
 #define MFI_STATE_TB_READY		0x10000000
 #define MFI_STATE_TB_OPERATIONAL	0x20000000
 #define MFI_STATE_TB_FAULT		0x40000000
 /* command reset register */
-#define MFI_INIT_ABORT			0x00000000
+#define MFI_INIT_ABORT			0x00000001
 #define MFI_INIT_READY			0x00000002
 #define MFI_INIT_MFIMODE		0x00000004
 #define MFI_INIT_CLEAR_HANDSHAKE	0x00000008
-#define MFI_RESET_FLAGS			MFI_INIT_READY|MFI_INIT_MFIMODE
+#define MFI_RESET_FLAGS			MFI_INIT_READY | MFI_INIT_MFIMODE | \
 					MFI_INIT_ABORT
 #define MFI_INIT_HOTPLUG		0x00000010
 /* ADP reset flags */
 #define MFI_STOP_ADP			0x00000020
 #define MFI_ADP_RESET			0x00000040
 #define DIAG_WRITE_ENABLE		0x00000080
 #define DIAG_RESET_ADAPTER		0x00000004
 /* mfi Frame flags */
 #define MFI_FRAME_POST_IN_REPLY_QUEUE		0x0000
 #define MFI_FRAME_DONT_POST_IN_REPLY_QUEUE	0x0001
 #define MFI_FRAME_SGL32				0x0000
 #define MFI_FRAME_SGL64				0x0002

 @@ -1,33 +1,33 @@
-/* $NetBSD: mfi_pci.c,v 1.20 2018/12/09 11:14:02 jdolecek Exp $ */
+/* $NetBSD: mfi_pci.c,v 1.21 2022/05/05 07:18:03 msaitoh Exp $ */
 /* $OpenBSD: mfi_pci.c,v 1.11 2006/08/06 04:40:08 brad Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.20 2018/12/09 11:14:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.21 2022/05/05 07:18:03 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcivar.h>
 #include <sys/bus.h>
 #include <dev/scsipi/scsipi_all.h>
 @@ -89,26 +89,27 @@ static const struct mfi_pci_subtype mfi_
 	{ PCI_VENDOR_IBM,	0x03c7,		"IBM ServeRAID M5014 SAS/SATA" },
 	{ PCI_VENDOR_DELL,	0x1f15,		"Dell PERC H800 Adapter" },
 	{ PCI_VENDOR_DELL,	0x1f16,		"Dell PERC H700 Adapter" },
 	{ PCI_VENDOR_DELL,	0x1f17,		"Dell PERC H700 Integrated" },
 	{ PCI_VENDOR_DELL,	0x1f18,		"Dell PERC H700 Modular" },
 	{ PCI_VENDOR_DELL,	0x1f19,		"Dell PERC H700" },
 	{ PCI_VENDOR_DELL,	0x1f1a,		"Dell PERC H800 Proto Adapter" },
 	{ PCI_VENDOR_DELL,	0x1f1b,		"Dell PERC H800" },
 	{ 0x0,			0,		"" }
 };
 static const struct mfi_pci_subtype mfi_skinny_subtypes[] = {
 	{ PCI_VENDOR_IBM,	0x03b1,		"IBM ServeRAID M1015 SAS/SATA" },
 	{ PCI_VENDOR_DELL,	0x1f78,		"Dell PERC H310" },
 	{ 0x0,			0,		"" }
 };
 static const struct mfi_pci_subtype mfi_tbolt_subtypes[] = {
 	{ PCI_VENDOR_SYMBIOS,	0x9265,		"SAS 9265-8i" },
 	{ PCI_VENDOR_DELL,	0x1f2d,		"Dell PERC H810 Adapter" },
 	{ PCI_VENDOR_DELL,	0x1f30,		"Dell PERC H710 Embedded" },
 	{ PCI_VENDOR_DELL,	0x1f31,		"Dell PERC H710P Adapter" },
 	{ PCI_VENDOR_DELL,	0x1f33,		"Dell PERC H710P Mini (blades)" },
 	{ PCI_VENDOR_DELL,	0x1f34,		"Dell PERC H710P Mini (blades)" },
 	{ PCI_VENDOR_DELL,	0x1f35,		"Dell PERC H710 Adapter" },
 	{ PCI_VENDOR_DELL,	0x1f37,		"Dell PERC H710 Mini (blades)" },
 	{ PCI_VENDOR_DELL,	0x1f38,		"Dell PERC H710 Mini (monolithics)" },