diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c
index 2b2fec06a06a..55aa5e346daa 100644
--- a/sys/cam/ata/ata_xpt.c
+++ b/sys/cam/ata/ata_xpt.c
@@ -1,2301 +1,2212 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
  * 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,
  *    without modification, immediately at the beginning of the file.
  * 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.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, 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.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/sbuf.h>
 
 #include <sys/eventhandler.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
 #include <cam/cam_queue.h>
 #include <cam/cam_periph.h>
 #include <cam/cam_sim.h>
 #include <cam/cam_xpt.h>
 #include <cam/cam_xpt_sim.h>
 #include <cam/cam_xpt_periph.h>
 #include <cam/cam_xpt_internal.h>
 #include <cam/cam_debug.h>
 
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 #include <cam/ata/ata_all.h>
 #include <machine/stdarg.h>	/* for xpt_print below */
 #include "opt_cam.h"
 
 struct ata_quirk_entry {
 	struct scsi_inquiry_pattern inq_pat;
 	uint8_t quirks;
 #define	CAM_QUIRK_MAXTAGS	0x01
 	u_int mintags;
 	u_int maxtags;
 };
 
 static periph_init_t aprobe_periph_init;
 
 static struct periph_driver aprobe_driver =
 {
 	aprobe_periph_init, "aprobe",
 	TAILQ_HEAD_INITIALIZER(aprobe_driver.units), /* generation */ 0,
 	CAM_PERIPH_DRV_EARLY
 };
 
 PERIPHDRIVER_DECLARE(aprobe, aprobe_driver);
 
 typedef enum {
 	PROBE_RESET,
 	PROBE_IDENTIFY,
 	PROBE_SPINUP,
 	PROBE_SETMODE,
 	PROBE_SETPM,
 	PROBE_SETAPST,
 	PROBE_SETDMAAA,
 	PROBE_SETAN,
 	PROBE_SET_MULTI,
 	PROBE_INQUIRY,
 	PROBE_FULL_INQUIRY,
 	PROBE_PM_PID,
 	PROBE_PM_PRV,
 	PROBE_IDENTIFY_SES,
 	PROBE_IDENTIFY_SAFTE,
 	PROBE_DONE,
 	PROBE_INVALID
 } aprobe_action;
 
 static char *probe_action_text[] = {
 	"PROBE_RESET",
 	"PROBE_IDENTIFY",
 	"PROBE_SPINUP",
 	"PROBE_SETMODE",
 	"PROBE_SETPM",
 	"PROBE_SETAPST",
 	"PROBE_SETDMAAA",
 	"PROBE_SETAN",
 	"PROBE_SET_MULTI",
 	"PROBE_INQUIRY",
 	"PROBE_FULL_INQUIRY",
 	"PROBE_PM_PID",
 	"PROBE_PM_PRV",
 	"PROBE_IDENTIFY_SES",
 	"PROBE_IDENTIFY_SAFTE",
 	"PROBE_DONE",
 	"PROBE_INVALID"
 };
 
 #define PROBE_SET_ACTION(softc, newaction)	\
 do {									\
 	char **text;							\
 	text = probe_action_text;					\
 	CAM_DEBUG((softc)->periph->path, CAM_DEBUG_PROBE,		\
 	    ("Probe %s to %s\n", text[(softc)->action],			\
 	    text[(newaction)]));					\
 	(softc)->action = (newaction);					\
 } while(0)
 
 typedef enum {
 	PROBE_NO_ANNOUNCE	= 0x04
 } aprobe_flags;
 
 typedef struct {
 	TAILQ_HEAD(, ccb_hdr) request_ccbs;
 	struct ata_params	ident_data;
 	aprobe_action	action;
 	aprobe_flags	flags;
 	uint32_t	pm_pid;
 	uint32_t	pm_prv;
 	int		restart;
 	int		spinup;
 	int		faults;
 	u_int		caps;
 	struct cam_periph *periph;
 } aprobe_softc;
 
 static struct ata_quirk_entry ata_quirk_table[] =
 {
 	{
 		/* Default tagged queuing parameters for all devices */
 		{
 		  T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED,
 		  /*vendor*/"*", /*product*/"*", /*revision*/"*"
 		},
 		/*quirks*/0, /*mintags*/0, /*maxtags*/0
 	},
 };
 
 static cam_status	aproberegister(struct cam_periph *periph, void *arg);
 static void	 aprobeschedule(struct cam_periph *probe_periph);
 static void	 aprobestart(struct cam_periph *periph, union ccb *start_ccb);
 static void	 aproberequestdefaultnegotiation(struct cam_periph *periph);
 static void	 aprobedone(struct cam_periph *periph, union ccb *done_ccb);
 static void	 aprobecleanup(struct cam_periph *periph);
 static void	 ata_find_quirk(struct cam_ed *device);
 static void	 ata_scan_bus(struct cam_periph *periph, union ccb *ccb);
 static void	 ata_scan_lun(struct cam_periph *periph,
 			       struct cam_path *path, cam_flags flags,
 			       union ccb *ccb);
 static void	 axptscandone(struct cam_periph *periph, union ccb *done_ccb);
 static struct cam_ed *
 		 ata_alloc_device(struct cam_eb *bus, struct cam_et *target,
 				   lun_id_t lun_id);
 static void	 ata_device_transport(struct cam_path *path);
 static void	 ata_get_transfer_settings(struct ccb_trans_settings *cts);
 static void	 ata_set_transfer_settings(struct ccb_trans_settings *cts,
 					    struct cam_path *path,
 					    int async_update);
 static void	 ata_dev_async(uint32_t async_code,
 				struct cam_eb *bus,
 				struct cam_et *target,
 				struct cam_ed *device,
 				void *async_arg);
 static void	 ata_action(union ccb *start_ccb);
-static void	 ata_announce_periph(struct cam_periph *periph);
 static void	 ata_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb);
-static void	 ata_proto_announce(struct cam_ed *device);
 static void	 ata_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb);
-static void	 ata_proto_denounce(struct cam_ed *device);
 static void	 ata_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb);
 static void	 ata_proto_debug_out(union ccb *ccb);
-static void	 semb_proto_announce(struct cam_ed *device);
 static void	 semb_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb);
-static void	 semb_proto_denounce(struct cam_ed *device);
 static void	 semb_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb);
 
 static int ata_dma = 1;
 static int atapi_dma = 1;
 
 TUNABLE_INT("hw.ata.ata_dma", &ata_dma);
 TUNABLE_INT("hw.ata.atapi_dma", &atapi_dma);
 
 static struct xpt_xport_ops ata_xport_ops = {
 	.alloc_device = ata_alloc_device,
 	.action = ata_action,
 	.async = ata_dev_async,
-	.announce = ata_announce_periph,
 	.announce_sbuf = ata_announce_periph_sbuf,
 };
 #define ATA_XPT_XPORT(x, X)			\
 static struct xpt_xport ata_xport_ ## x = {	\
 	.xport = XPORT_ ## X,			\
 	.name = #x,				\
 	.ops = &ata_xport_ops,			\
 };						\
 CAM_XPT_XPORT(ata_xport_ ## x);
 
 ATA_XPT_XPORT(ata, ATA);
 ATA_XPT_XPORT(sata, SATA);
 
 #undef ATA_XPORT_XPORT
 
 static struct xpt_proto_ops ata_proto_ops_ata = {
-	.announce = ata_proto_announce,
 	.announce_sbuf = ata_proto_announce_sbuf,
-	.denounce = ata_proto_denounce,
 	.denounce_sbuf = ata_proto_denounce_sbuf,
 	.debug_out = ata_proto_debug_out,
 };
 static struct xpt_proto ata_proto_ata = {
 	.proto = PROTO_ATA,
 	.name = "ata",
 	.ops = &ata_proto_ops_ata,
 };
 
 static struct xpt_proto_ops ata_proto_ops_satapm = {
-	.announce = ata_proto_announce,
 	.announce_sbuf = ata_proto_announce_sbuf,
-	.denounce = ata_proto_denounce,
 	.denounce_sbuf = ata_proto_denounce_sbuf,
 	.debug_out = ata_proto_debug_out,
 };
 static struct xpt_proto ata_proto_satapm = {
 	.proto = PROTO_SATAPM,
 	.name = "satapm",
 	.ops = &ata_proto_ops_satapm,
 };
 
 static struct xpt_proto_ops ata_proto_ops_semb = {
-	.announce = semb_proto_announce,
 	.announce_sbuf = semb_proto_announce_sbuf,
-	.denounce = semb_proto_denounce,
 	.denounce_sbuf = semb_proto_denounce_sbuf,
 	.debug_out = ata_proto_debug_out,
 };
 static struct xpt_proto ata_proto_semb = {
 	.proto = PROTO_SEMB,
 	.name = "semb",
 	.ops = &ata_proto_ops_semb,
 };
 
 CAM_XPT_PROTO(ata_proto_ata);
 CAM_XPT_PROTO(ata_proto_satapm);
 CAM_XPT_PROTO(ata_proto_semb);
 
 static void
 aprobe_periph_init(void)
 {
 }
 
 static cam_status
 aproberegister(struct cam_periph *periph, void *arg)
 {
 	union ccb *request_ccb;	/* CCB representing the probe request */
 	aprobe_softc *softc;
 
 	request_ccb = (union ccb *)arg;
 	if (request_ccb == NULL) {
 		printf("proberegister: no probe CCB, "
 		       "can't register device\n");
 		return(CAM_REQ_CMP_ERR);
 	}
 
 	softc = (aprobe_softc *)malloc(sizeof(*softc), M_CAMXPT, M_ZERO | M_NOWAIT);
 
 	if (softc == NULL) {
 		printf("proberegister: Unable to probe new device. "
 		       "Unable to allocate softc\n");
 		return(CAM_REQ_CMP_ERR);
 	}
 	TAILQ_INIT(&softc->request_ccbs);
 	TAILQ_INSERT_TAIL(&softc->request_ccbs, &request_ccb->ccb_h,
 			  periph_links.tqe);
 	softc->flags = 0;
 	periph->softc = softc;
 	softc->periph = periph;
 	softc->action = PROBE_INVALID;
 	if (cam_periph_acquire(periph) != 0)
 		return (CAM_REQ_CMP_ERR);
 
 	CAM_DEBUG(periph->path, CAM_DEBUG_PROBE, ("Probe started\n"));
 	ata_device_transport(periph->path);
 	aprobeschedule(periph);
 	return(CAM_REQ_CMP);
 }
 
 static void
 aprobeschedule(struct cam_periph *periph)
 {
 	union ccb *ccb;
 	aprobe_softc *softc;
 
 	softc = (aprobe_softc *)periph->softc;
 	ccb = (union ccb *)TAILQ_FIRST(&softc->request_ccbs);
 
 	if ((periph->path->device->flags & CAM_DEV_UNCONFIGURED) ||
 	    periph->path->device->protocol == PROTO_SATAPM ||
 	    periph->path->device->protocol == PROTO_SEMB)
 		PROBE_SET_ACTION(softc, PROBE_RESET);
 	else
 		PROBE_SET_ACTION(softc, PROBE_IDENTIFY);
 
 	if (ccb->crcn.flags & CAM_EXPECT_INQ_CHANGE)
 		softc->flags |= PROBE_NO_ANNOUNCE;
 	else
 		softc->flags &= ~PROBE_NO_ANNOUNCE;
 
 	xpt_schedule(periph, CAM_PRIORITY_XPT);
 }
 
 static void
 aprobestart(struct cam_periph *periph, union ccb *start_ccb)
 {
 	struct ccb_trans_settings cts;
 	struct ccb_ataio *ataio;
 	struct ccb_scsiio *csio;
 	aprobe_softc *softc;
 	struct cam_path *path;
 	struct ata_params *ident_buf;
 	u_int oif;
 
 	CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("aprobestart\n"));
 
 	softc = (aprobe_softc *)periph->softc;
 	path = start_ccb->ccb_h.path;
 	ataio = &start_ccb->ataio;
 	csio = &start_ccb->csio;
 	ident_buf = &periph->path->device->ident_data;
 
 	if (softc->restart) {
 		softc->restart = 0;
 		if ((path->device->flags & CAM_DEV_UNCONFIGURED) ||
 		    path->device->protocol == PROTO_SATAPM ||
 		    path->device->protocol == PROTO_SEMB)
 			softc->action = PROBE_RESET;
 		else
 			softc->action = PROBE_IDENTIFY;
 	}
 	switch (softc->action) {
 	case PROBE_RESET:
 		cam_fill_ataio(ataio,
 		      0,
 		      aprobedone,
 		      /*flags*/CAM_DIR_NONE,
 		      0,
 		      /*data_ptr*/NULL,
 		      /*dxfer_len*/0,
 		      15 * 1000);
 		ata_reset_cmd(ataio);
 		break;
 	case PROBE_IDENTIFY:
 		cam_fill_ataio(ataio,
 		      1,
 		      aprobedone,
 		      /*flags*/CAM_DIR_IN,
 		      0,
 		      /*data_ptr*/(uint8_t *)&softc->ident_data,
 		      /*dxfer_len*/sizeof(softc->ident_data),
 		      30 * 1000);
 		if (path->device->protocol == PROTO_ATA)
 			ata_28bit_cmd(ataio, ATA_ATA_IDENTIFY, 0, 0, 0);
 		else
 			ata_28bit_cmd(ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0);
 		break;
 	case PROBE_SPINUP:
 		if (bootverbose)
 			xpt_print(path, "Spinning up device\n");
 		cam_fill_ataio(ataio,
 		      1,
 		      aprobedone,
 		      /*flags*/CAM_DIR_NONE | CAM_HIGH_POWER,
 		      0,
 		      /*data_ptr*/NULL,
 		      /*dxfer_len*/0,
 		      30 * 1000);
 		ata_28bit_cmd(ataio, ATA_SETFEATURES, ATA_SF_PUIS_SPINUP, 0, 0);
 		break;
 	case PROBE_SETMODE:
 	{
 		int mode, wantmode;
 
 		mode = 0;
 		/* Fetch user modes from SIM. */
 		bzero(&cts, sizeof(cts));
 		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 		cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 		cts.type = CTS_TYPE_USER_SETTINGS;
 		xpt_action((union ccb *)&cts);
 		if (path->device->transport == XPORT_ATA) {
 			if (cts.xport_specific.ata.valid & CTS_ATA_VALID_MODE)
 				mode = cts.xport_specific.ata.mode;
 		} else {
 			if (cts.xport_specific.sata.valid & CTS_SATA_VALID_MODE)
 				mode = cts.xport_specific.sata.mode;
 		}
 		if (path->device->protocol == PROTO_ATA) {
 			if (ata_dma == 0 && (mode == 0 || mode > ATA_PIO_MAX))
 				mode = ATA_PIO_MAX;
 		} else {
 			if (atapi_dma == 0 && (mode == 0 || mode > ATA_PIO_MAX))
 				mode = ATA_PIO_MAX;
 		}
 negotiate:
 		/* Honor device capabilities. */
 		wantmode = mode = ata_max_mode(ident_buf, mode);
 		/* Report modes to SIM. */
 		bzero(&cts, sizeof(cts));
 		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 		cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
 		cts.type = CTS_TYPE_CURRENT_SETTINGS;
 		if (path->device->transport == XPORT_ATA) {
 			cts.xport_specific.ata.mode = mode;
 			cts.xport_specific.ata.valid = CTS_ATA_VALID_MODE;
 		} else {
 			cts.xport_specific.sata.mode = mode;
 			cts.xport_specific.sata.valid = CTS_SATA_VALID_MODE;
 		}
 		xpt_action((union ccb *)&cts);
 		/* Fetch current modes from SIM. */
 		bzero(&cts, sizeof(cts));
 		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 		cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 		cts.type = CTS_TYPE_CURRENT_SETTINGS;
 		xpt_action((union ccb *)&cts);
 		if (path->device->transport == XPORT_ATA) {
 			if (cts.xport_specific.ata.valid & CTS_ATA_VALID_MODE)
 				mode = cts.xport_specific.ata.mode;
 		} else {
 			if (cts.xport_specific.sata.valid & CTS_SATA_VALID_MODE)
 				mode = cts.xport_specific.sata.mode;
 		}
 		/* If SIM disagree - renegotiate. */
 		if (mode != wantmode)
 			goto negotiate;
 		/* Remember what transport thinks about DMA. */
 		oif = path->device->inq_flags;
 		if (mode < ATA_DMA)
 			path->device->inq_flags &= ~SID_DMA;
 		else
 			path->device->inq_flags |= SID_DMA;
 		if (path->device->inq_flags != oif)
 			xpt_async(AC_GETDEV_CHANGED, path, NULL);
 		cam_fill_ataio(ataio,
 		      1,
 		      aprobedone,
 		      /*flags*/CAM_DIR_NONE,
 		      0,
 		      /*data_ptr*/NULL,
 		      /*dxfer_len*/0,
 		      30 * 1000);
 		ata_28bit_cmd(ataio, ATA_SETFEATURES, ATA_SF_SETXFER, 0, mode);
 		break;
 	}
 	case PROBE_SETPM:
 		cam_fill_ataio(ataio,
 		    1,
 		    aprobedone,
 		    CAM_DIR_NONE,
 		    0,
 		    NULL,
 		    0,
 		    30*1000);
 		ata_28bit_cmd(ataio, ATA_SETFEATURES,
 		    (softc->caps & CTS_SATA_CAPS_H_PMREQ) ? 0x10 : 0x90,
 		    0, 0x03);
 		break;
 	case PROBE_SETAPST:
 		cam_fill_ataio(ataio,
 		    1,
 		    aprobedone,
 		    CAM_DIR_NONE,
 		    0,
 		    NULL,
 		    0,
 		    30*1000);
 		ata_28bit_cmd(ataio, ATA_SETFEATURES,
 		    (softc->caps & CTS_SATA_CAPS_H_APST) ? 0x10 : 0x90,
 		    0, 0x07);
 		break;
 	case PROBE_SETDMAAA:
 		cam_fill_ataio(ataio,
 		    1,
 		    aprobedone,
 		    CAM_DIR_NONE,
 		    0,
 		    NULL,
 		    0,
 		    30*1000);
 		ata_28bit_cmd(ataio, ATA_SETFEATURES,
 		    (softc->caps & CTS_SATA_CAPS_H_DMAAA) ? 0x10 : 0x90,
 		    0, 0x02);
 		break;
 	case PROBE_SETAN:
 		/* Remember what transport thinks about AEN. */
 		oif = path->device->inq_flags;
 		if (softc->caps & CTS_SATA_CAPS_H_AN)
 			path->device->inq_flags |= SID_AEN;
 		else
 			path->device->inq_flags &= ~SID_AEN;
 		if (path->device->inq_flags != oif)
 			xpt_async(AC_GETDEV_CHANGED, path, NULL);
 		cam_fill_ataio(ataio,
 		    1,
 		    aprobedone,
 		    CAM_DIR_NONE,
 		    0,
 		    NULL,
 		    0,
 		    30*1000);
 		ata_28bit_cmd(ataio, ATA_SETFEATURES,
 		    (softc->caps & CTS_SATA_CAPS_H_AN) ? 0x10 : 0x90,
 		    0, 0x05);
 		break;
 	case PROBE_SET_MULTI:
 	{
 		u_int sectors, bytecount;
 
 		bytecount = 8192;	/* SATA maximum */
 		/* Fetch user bytecount from SIM. */
 		bzero(&cts, sizeof(cts));
 		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 		cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 		cts.type = CTS_TYPE_USER_SETTINGS;
 		xpt_action((union ccb *)&cts);
 		if (path->device->transport == XPORT_ATA) {
 			if (cts.xport_specific.ata.valid & CTS_ATA_VALID_BYTECOUNT)
 				bytecount = cts.xport_specific.ata.bytecount;
 		} else {
 			if (cts.xport_specific.sata.valid & CTS_SATA_VALID_BYTECOUNT)
 				bytecount = cts.xport_specific.sata.bytecount;
 		}
 		/* Honor device capabilities. */
 		sectors = max(1, min(ident_buf->sectors_intr & 0xff,
 		    bytecount / ata_logical_sector_size(ident_buf)));
 		/* Report bytecount to SIM. */
 		bzero(&cts, sizeof(cts));
 		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 		cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
 		cts.type = CTS_TYPE_CURRENT_SETTINGS;
 		if (path->device->transport == XPORT_ATA) {
 			cts.xport_specific.ata.bytecount = sectors *
 			    ata_logical_sector_size(ident_buf);
 			cts.xport_specific.ata.valid = CTS_ATA_VALID_BYTECOUNT;
 		} else {
 			cts.xport_specific.sata.bytecount = sectors *
 			    ata_logical_sector_size(ident_buf);
 			cts.xport_specific.sata.valid = CTS_SATA_VALID_BYTECOUNT;
 		}
 		xpt_action((union ccb *)&cts);
 		/* Fetch current bytecount from SIM. */
 		bzero(&cts, sizeof(cts));
 		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 		cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 		cts.type = CTS_TYPE_CURRENT_SETTINGS;
 		xpt_action((union ccb *)&cts);
 		if (path->device->transport == XPORT_ATA) {
 			if (cts.xport_specific.ata.valid & CTS_ATA_VALID_BYTECOUNT)
 				bytecount = cts.xport_specific.ata.bytecount;
 		} else {
 			if (cts.xport_specific.sata.valid & CTS_SATA_VALID_BYTECOUNT)
 				bytecount = cts.xport_specific.sata.bytecount;
 		}
 		sectors = bytecount / ata_logical_sector_size(ident_buf);
 
 		cam_fill_ataio(ataio,
 		    1,
 		    aprobedone,
 		    CAM_DIR_NONE,
 		    0,
 		    NULL,
 		    0,
 		    30*1000);
 		ata_28bit_cmd(ataio, ATA_SET_MULTI, 0, 0, sectors);
 		break;
 	}
 	case PROBE_INQUIRY:
 	{
 		u_int bytecount;
 
 		bytecount = 8192;	/* SATA maximum */
 		/* Fetch user bytecount from SIM. */
 		bzero(&cts, sizeof(cts));
 		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 		cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 		cts.type = CTS_TYPE_USER_SETTINGS;
 		xpt_action((union ccb *)&cts);
 		if (path->device->transport == XPORT_ATA) {
 			if (cts.xport_specific.ata.valid & CTS_ATA_VALID_BYTECOUNT)
 				bytecount = cts.xport_specific.ata.bytecount;
 		} else {
 			if (cts.xport_specific.sata.valid & CTS_SATA_VALID_BYTECOUNT)
 				bytecount = cts.xport_specific.sata.bytecount;
 		}
 		/* Honor device capabilities. */
 		bytecount &= ~1;
 		bytecount = max(2, min(65534, bytecount));
 		if (ident_buf->satacapabilities != 0x0000 &&
 		    ident_buf->satacapabilities != 0xffff) {
 			bytecount = min(8192, bytecount);
 		}
 		/* Report bytecount to SIM. */
 		bzero(&cts, sizeof(cts));
 		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 		cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
 		cts.type = CTS_TYPE_CURRENT_SETTINGS;
 		if (path->device->transport == XPORT_ATA) {
 			cts.xport_specific.ata.bytecount = bytecount;
 			cts.xport_specific.ata.valid = CTS_ATA_VALID_BYTECOUNT;
 		} else {
 			cts.xport_specific.sata.bytecount = bytecount;
 			cts.xport_specific.sata.valid = CTS_SATA_VALID_BYTECOUNT;
 		}
 		xpt_action((union ccb *)&cts);
 		/* FALLTHROUGH */
 	}
 	case PROBE_FULL_INQUIRY:
 	{
 		u_int inquiry_len;
 		struct scsi_inquiry_data *inq_buf =
 		    &path->device->inq_data;
 
 		if (softc->action == PROBE_INQUIRY)
 			inquiry_len = SHORT_INQUIRY_LENGTH;
 		else
 			inquiry_len = SID_ADDITIONAL_LENGTH(inq_buf);
 		/*
 		 * Some parallel SCSI devices fail to send an
 		 * ignore wide residue message when dealing with
 		 * odd length inquiry requests.  Round up to be
 		 * safe.
 		 */
 		inquiry_len = roundup2(inquiry_len, 2);
 		scsi_inquiry(csio,
 			     /*retries*/1,
 			     aprobedone,
 			     MSG_SIMPLE_Q_TAG,
 			     (uint8_t *)inq_buf,
 			     inquiry_len,
 			     /*evpd*/FALSE,
 			     /*page_code*/0,
 			     SSD_MIN_SIZE,
 			     /*timeout*/60 * 1000);
 		break;
 	}
 	case PROBE_PM_PID:
 		cam_fill_ataio(ataio,
 		      1,
 		      aprobedone,
 		      /*flags*/CAM_DIR_NONE,
 		      0,
 		      /*data_ptr*/NULL,
 		      /*dxfer_len*/0,
 		      10 * 1000);
 		ata_pm_read_cmd(ataio, 0, 15);
 		break;
 	case PROBE_PM_PRV:
 		cam_fill_ataio(ataio,
 		      1,
 		      aprobedone,
 		      /*flags*/CAM_DIR_NONE,
 		      0,
 		      /*data_ptr*/NULL,
 		      /*dxfer_len*/0,
 		      10 * 1000);
 		ata_pm_read_cmd(ataio, 1, 15);
 		break;
 	case PROBE_IDENTIFY_SES:
 		cam_fill_ataio(ataio,
 		      1,
 		      aprobedone,
 		      /*flags*/CAM_DIR_IN,
 		      0,
 		      /*data_ptr*/(uint8_t *)&softc->ident_data,
 		      /*dxfer_len*/sizeof(softc->ident_data),
 		      30 * 1000);
 		ata_28bit_cmd(ataio, ATA_SEP_ATTN, 0xEC, 0x02,
 		    sizeof(softc->ident_data) / 4);
 		break;
 	case PROBE_IDENTIFY_SAFTE:
 		cam_fill_ataio(ataio,
 		      1,
 		      aprobedone,
 		      /*flags*/CAM_DIR_IN,
 		      0,
 		      /*data_ptr*/(uint8_t *)&softc->ident_data,
 		      /*dxfer_len*/sizeof(softc->ident_data),
 		      30 * 1000);
 		ata_28bit_cmd(ataio, ATA_SEP_ATTN, 0xEC, 0x00,
 		    sizeof(softc->ident_data) / 4);
 		break;
 	default:
 		panic("aprobestart: invalid action state 0x%x\n", softc->action);
 	}
 	start_ccb->ccb_h.flags |= CAM_DEV_QFREEZE;
 	xpt_action(start_ccb);
 }
 
 static void
 aproberequestdefaultnegotiation(struct cam_periph *periph)
 {
 	struct ccb_trans_settings cts;
 
 	bzero(&cts, sizeof(cts));
 	xpt_setup_ccb(&cts.ccb_h, periph->path, CAM_PRIORITY_NONE);
 	cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 	cts.type = CTS_TYPE_USER_SETTINGS;
 	xpt_action((union ccb *)&cts);
 	if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)
 		return;
 	cts.xport_specific.valid = 0;
 	cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
 	cts.type = CTS_TYPE_CURRENT_SETTINGS;
 	xpt_action((union ccb *)&cts);
 }
 
 static void
 aprobedone(struct cam_periph *periph, union ccb *done_ccb)
 {
 	struct ccb_trans_settings cts;
 	struct ata_params *ident_buf;
 	struct scsi_inquiry_data *inq_buf;
 	aprobe_softc *softc;
 	struct cam_path *path;
 	cam_status status;
 	uint32_t  priority;
 	u_int caps, oif;
 	int changed, found = 1;
 	static const uint8_t fake_device_id_hdr[8] =
 	    {0, SVPD_DEVICE_ID, 0, 12,
 	     SVPD_ID_CODESET_BINARY, SVPD_ID_TYPE_NAA, 0, 8};
 
 	CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("aprobedone\n"));
 
 	softc = (aprobe_softc *)periph->softc;
 	path = done_ccb->ccb_h.path;
 	priority = done_ccb->ccb_h.pinfo.priority;
 	ident_buf = &path->device->ident_data;
 	inq_buf = &path->device->inq_data;
 
 	if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
 		if (cam_periph_error(done_ccb,
 			0, softc->restart ? (SF_NO_RECOVERY | SF_NO_RETRY) : 0
 		    ) == ERESTART) {
 out:
 			/* Drop freeze taken due to CAM_DEV_QFREEZE flag set. */
 			cam_release_devq(path, 0, 0, 0, FALSE);
 			return;
 		}
 		if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
 			/* Don't wedge the queue */
 			xpt_release_devq(path, /*count*/1, /*run_queue*/TRUE);
 		}
 		status = done_ccb->ccb_h.status & CAM_STATUS_MASK;
 		if (softc->restart) {
 			softc->faults++;
 			if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) ==
 			    CAM_CMD_TIMEOUT)
 				softc->faults += 4;
 			if (softc->faults < 10)
 				goto done;
 			else
 				softc->restart = 0;
 
 		/* Old PIO2 devices may not support mode setting. */
 		} else if (softc->action == PROBE_SETMODE &&
 		    status == CAM_ATA_STATUS_ERROR &&
 		    ata_max_pmode(ident_buf) <= ATA_PIO2 &&
 		    (ident_buf->capabilities1 & ATA_SUPPORT_IORDY) == 0) {
 			goto noerror;
 
 		/*
 		 * Some old WD SATA disks report supported and enabled
 		 * device-initiated interface power management, but return
 		 * ABORT on attempt to disable it.
 		 */
 		} else if (softc->action == PROBE_SETPM &&
 		    status == CAM_ATA_STATUS_ERROR) {
 			goto noerror;
 
 		/*
 		 * Some old WD SATA disks have broken SPINUP handling.
 		 * If we really fail to spin up the disk, then there will be
 		 * some media access errors later on, but at least we will
 		 * have a device to interact with for recovery attempts.
 		 */
 		} else if (softc->action == PROBE_SPINUP &&
 		    status == CAM_ATA_STATUS_ERROR) {
 			goto noerror;
 
 		/*
 		 * Some HP SATA disks report supported DMA Auto-Activation,
 		 * but return ABORT on attempt to enable it.
 		 */
 		} else if (softc->action == PROBE_SETDMAAA &&
 		    status == CAM_ATA_STATUS_ERROR) {
 			goto noerror;
 
 		/*
 		 * SES and SAF-TE SEPs have different IDENTIFY commands,
 		 * but SATA specification doesn't tell how to identify them.
 		 * Until better way found, just try another if first fail.
 		 */
 		} else if (softc->action == PROBE_IDENTIFY_SES &&
 		    status == CAM_ATA_STATUS_ERROR) {
 			PROBE_SET_ACTION(softc, PROBE_IDENTIFY_SAFTE);
 			xpt_release_ccb(done_ccb);
 			xpt_schedule(periph, priority);
 			goto out;
 		}
 
 		/*
 		 * If we get to this point, we got an error status back
 		 * from the inquiry and the error status doesn't require
 		 * automatically retrying the command.  Therefore, the
 		 * inquiry failed.  If we had inquiry information before
 		 * for this device, but this latest inquiry command failed,
 		 * the device has probably gone away.  If this device isn't
 		 * already marked unconfigured, notify the peripheral
 		 * drivers that this device is no more.
 		 */
 device_fail:	if ((path->device->flags & CAM_DEV_UNCONFIGURED) == 0)
 			xpt_async(AC_LOST_DEVICE, path, NULL);
 		PROBE_SET_ACTION(softc, PROBE_INVALID);
 		found = 0;
 		goto done;
 	}
 noerror:
 	if (softc->restart)
 		goto done;
 	switch (softc->action) {
 	case PROBE_RESET:
 	{
 		int sign = (done_ccb->ataio.res.lba_high << 8) +
 		    done_ccb->ataio.res.lba_mid;
 		CAM_DEBUG(path, CAM_DEBUG_PROBE,
 		    ("SIGNATURE: %04x\n", sign));
 		if (sign == 0x0000 &&
 		    done_ccb->ccb_h.target_id != 15) {
 			path->device->protocol = PROTO_ATA;
 			PROBE_SET_ACTION(softc, PROBE_IDENTIFY);
 		} else if (sign == 0x9669 &&
 		    done_ccb->ccb_h.target_id == 15) {
 			/* Report SIM that PM is present. */
 			bzero(&cts, sizeof(cts));
 			xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 			cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
 			cts.type = CTS_TYPE_CURRENT_SETTINGS;
 			cts.xport_specific.sata.pm_present = 1;
 			cts.xport_specific.sata.valid = CTS_SATA_VALID_PM;
 			xpt_action((union ccb *)&cts);
 			path->device->protocol = PROTO_SATAPM;
 			PROBE_SET_ACTION(softc, PROBE_PM_PID);
 		} else if (sign == 0xc33c &&
 		    done_ccb->ccb_h.target_id != 15) {
 			path->device->protocol = PROTO_SEMB;
 			PROBE_SET_ACTION(softc, PROBE_IDENTIFY_SES);
 		} else if (sign == 0xeb14 &&
 		    done_ccb->ccb_h.target_id != 15) {
 			path->device->protocol = PROTO_SCSI;
 			PROBE_SET_ACTION(softc, PROBE_IDENTIFY);
 		} else {
 			if (done_ccb->ccb_h.target_id != 15) {
 				xpt_print(path,
 				    "Unexpected signature 0x%04x\n", sign);
 			}
 			goto device_fail;
 		}
 		xpt_release_ccb(done_ccb);
 		xpt_schedule(periph, priority);
 		goto out;
 	}
 	case PROBE_IDENTIFY:
 	{
 		struct ccb_pathinq cpi;
 		int veto = 0;
 
 		/*
 		 * Convert to host byte order, and fix the strings.
 		 */
 		ident_buf = &softc->ident_data;
 		ata_param_fixup(ident_buf);
 
 		/*
 		 * Allow others to veto this ATA disk attachment.  This
 		 * is mainly used by VMs, whose disk controllers may
 		 * share the disks with the simulated ATA controllers.
 		 */
 		EVENTHANDLER_INVOKE(ada_probe_veto, path, ident_buf, &veto);
 		if (veto) {
 			goto device_fail;
 		}
 
 		/* Device may need spin-up before IDENTIFY become valid. */
 		if ((ident_buf->specconf == 0x37c8 ||
 		     ident_buf->specconf == 0x738c) &&
 		    ((ident_buf->config & ATA_RESP_INCOMPLETE) ||
 		     softc->spinup == 0)) {
 			PROBE_SET_ACTION(softc, PROBE_SPINUP);
 			xpt_release_ccb(done_ccb);
 			xpt_schedule(periph, priority);
 			goto out;
 		}
 		ident_buf = &path->device->ident_data;
 
 		/* Check that it is the same device as we know. */
 		if ((periph->path->device->flags & CAM_DEV_UNCONFIGURED) == 0) {
 			if (bcmp(softc->ident_data.model, ident_buf->model,
 			     sizeof(ident_buf->model)) ||
 			    bcmp(softc->ident_data.serial, ident_buf->serial,
 			     sizeof(ident_buf->serial))) {
 				/* The device was replaced. */
 				changed = 2;
 				xpt_async(AC_LOST_DEVICE, path, NULL);
 			} else if (bcmp(&softc->ident_data, ident_buf,
 			     sizeof(*ident_buf))) {
 				/* The device is the same, but has changed. */
 				changed = 1;
 			} else {
 				/* Nothing has changed. */
 				changed = 0;
 			}
 		} else {
 			/* This is a new device. */
 			changed = 2;
 		}
 
 		if (changed != 0)
 			bcopy(&softc->ident_data, ident_buf, sizeof(struct ata_params));
 		if (changed == 2) {
 			/* Clean up from previous instance of this device */
 			if (path->device->serial_num != NULL) {
 				free(path->device->serial_num, M_CAMXPT);
 				path->device->serial_num = NULL;
 				path->device->serial_num_len = 0;
 			}
 			if (path->device->device_id != NULL) {
 				free(path->device->device_id, M_CAMXPT);
 				path->device->device_id = NULL;
 				path->device->device_id_len = 0;
 			}
 			path->device->serial_num =
 				(uint8_t *)malloc((sizeof(ident_buf->serial) + 1),
 					   M_CAMXPT, M_NOWAIT);
 			if (path->device->serial_num != NULL) {
 				bcopy(ident_buf->serial,
 				      path->device->serial_num,
 				      sizeof(ident_buf->serial));
 				path->device->serial_num[sizeof(ident_buf->serial)]
 				    = '\0';
 				path->device->serial_num_len =
 				    strlen(path->device->serial_num);
 			}
 			if (ident_buf->enabled.extension &
 			    ATA_SUPPORT_64BITWWN) {
 				path->device->device_id =
 				    malloc(16, M_CAMXPT, M_NOWAIT);
 				if (path->device->device_id != NULL) {
 					path->device->device_id_len = 16;
 					bcopy(&fake_device_id_hdr,
 					    path->device->device_id, 8);
 					bcopy(ident_buf->wwn,
 					    path->device->device_id + 8, 8);
 					ata_bswap(path->device->device_id + 8, 8);
 				}
 			}
 			path->device->flags |= CAM_DEV_IDENTIFY_DATA_VALID;
 		}
 		if (changed == 1)
 			xpt_async(AC_GETDEV_CHANGED, path, NULL);
 		if (ident_buf->satacapabilities & ATA_SUPPORT_NCQ) {
 			path->device->mintags = 2;
 			path->device->maxtags =
 			    ATA_QUEUE_LEN(ident_buf->queue) + 1;
 		}
 		ata_find_quirk(path->device);
 		if (path->device->mintags != 0 &&
 		    path->bus->sim->max_tagged_dev_openings != 0) {
 			/* Check if the SIM does not want queued commands. */
 			xpt_path_inq(&cpi, path);
 			if (cam_ccb_success((union ccb *)&cpi) &&
 			    (cpi.hba_inquiry & PI_TAG_ABLE)) {
 				/* Report SIM which tags are allowed. */
 				bzero(&cts, sizeof(cts));
 				xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 				cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
 				cts.type = CTS_TYPE_CURRENT_SETTINGS;
 				cts.xport_specific.sata.tags = path->device->maxtags;
 				cts.xport_specific.sata.valid = CTS_SATA_VALID_TAGS;
 				xpt_action((union ccb *)&cts);
 			}
 		}
 		ata_device_transport(path);
 		if (changed == 2)
 			aproberequestdefaultnegotiation(periph);
 		PROBE_SET_ACTION(softc, PROBE_SETMODE);
 		xpt_release_ccb(done_ccb);
 		xpt_schedule(periph, priority);
 		goto out;
 	}
 	case PROBE_SPINUP:
 		if (bootverbose)
 			xpt_print(path, "Spin-up done\n");
 		softc->spinup = 1;
 		PROBE_SET_ACTION(softc, PROBE_IDENTIFY);
 		xpt_release_ccb(done_ccb);
 		xpt_schedule(periph, priority);
 		goto out;
 	case PROBE_SETMODE:
 		/* Set supported bits. */
 		bzero(&cts, sizeof(cts));
 		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 		cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 		cts.type = CTS_TYPE_CURRENT_SETTINGS;
 		xpt_action((union ccb *)&cts);
 		if (path->device->transport == XPORT_SATA &&
 		    cts.xport_specific.sata.valid & CTS_SATA_VALID_CAPS)
 			caps = cts.xport_specific.sata.caps & CTS_SATA_CAPS_H;
 		else if (path->device->transport == XPORT_ATA &&
 		    cts.xport_specific.ata.valid & CTS_ATA_VALID_CAPS)
 			caps = cts.xport_specific.ata.caps & CTS_ATA_CAPS_H;
 		else
 			caps = 0;
 		if (path->device->transport == XPORT_SATA &&
 		    ident_buf->satacapabilities != 0xffff) {
 			if (ident_buf->satacapabilities & ATA_SUPPORT_IFPWRMNGTRCV)
 				caps |= CTS_SATA_CAPS_D_PMREQ;
 			if (ident_buf->satacapabilities & ATA_SUPPORT_HAPST)
 				caps |= CTS_SATA_CAPS_D_APST;
 		}
 		/* Mask unwanted bits. */
 		bzero(&cts, sizeof(cts));
 		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 		cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 		cts.type = CTS_TYPE_USER_SETTINGS;
 		xpt_action((union ccb *)&cts);
 		if (path->device->transport == XPORT_SATA &&
 		    cts.xport_specific.sata.valid & CTS_SATA_VALID_CAPS)
 			caps &= cts.xport_specific.sata.caps;
 		else if (path->device->transport == XPORT_ATA &&
 		    cts.xport_specific.ata.valid & CTS_ATA_VALID_CAPS)
 			caps &= cts.xport_specific.ata.caps;
 		else
 			caps = 0;
 		/*
 		 * Remember what transport thinks about 48-bit DMA.  If
 		 * capability information is not provided or transport is
 		 * SATA, we take support for granted.
 		 */
 		oif = path->device->inq_flags;
 		if (!(path->device->inq_flags & SID_DMA) ||
 		    (path->device->transport == XPORT_ATA &&
 		    (cts.xport_specific.ata.valid & CTS_ATA_VALID_CAPS) &&
 		    !(caps & CTS_ATA_CAPS_H_DMA48)))
 			path->device->inq_flags &= ~SID_DMA48;
 		else
 			path->device->inq_flags |= SID_DMA48;
 		if (path->device->inq_flags != oif)
 			xpt_async(AC_GETDEV_CHANGED, path, NULL);
 		/* Store result to SIM. */
 		bzero(&cts, sizeof(cts));
 		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 		cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
 		cts.type = CTS_TYPE_CURRENT_SETTINGS;
 		if (path->device->transport == XPORT_SATA) {
 			cts.xport_specific.sata.caps = caps;
 			cts.xport_specific.sata.valid = CTS_SATA_VALID_CAPS;
 		} else {
 			cts.xport_specific.ata.caps = caps;
 			cts.xport_specific.ata.valid = CTS_ATA_VALID_CAPS;
 		}
 		xpt_action((union ccb *)&cts);
 		softc->caps = caps;
 		if (path->device->transport != XPORT_SATA)
 			goto notsata;
 		if ((ident_buf->satasupport & ATA_SUPPORT_IFPWRMNGT) &&
 		    (!(softc->caps & CTS_SATA_CAPS_H_PMREQ)) !=
 		    (!(ident_buf->sataenabled & ATA_SUPPORT_IFPWRMNGT))) {
 			PROBE_SET_ACTION(softc, PROBE_SETPM);
 			xpt_release_ccb(done_ccb);
 			xpt_schedule(periph, priority);
 			goto out;
 		}
 		/* FALLTHROUGH */
 	case PROBE_SETPM:
 		if (ident_buf->satacapabilities != 0xffff &&
 		    (ident_buf->satacapabilities & ATA_SUPPORT_DAPST) &&
 		    (!(softc->caps & CTS_SATA_CAPS_H_APST)) !=
 		    (!(ident_buf->sataenabled & ATA_ENABLED_DAPST))) {
 			PROBE_SET_ACTION(softc, PROBE_SETAPST);
 			xpt_release_ccb(done_ccb);
 			xpt_schedule(periph, priority);
 			goto out;
 		}
 		/* FALLTHROUGH */
 	case PROBE_SETAPST:
 		if ((ident_buf->satasupport & ATA_SUPPORT_AUTOACTIVATE) &&
 		    (!(softc->caps & CTS_SATA_CAPS_H_DMAAA)) !=
 		    (!(ident_buf->sataenabled & ATA_SUPPORT_AUTOACTIVATE))) {
 			PROBE_SET_ACTION(softc, PROBE_SETDMAAA);
 			xpt_release_ccb(done_ccb);
 			xpt_schedule(periph, priority);
 			goto out;
 		}
 		/* FALLTHROUGH */
 	case PROBE_SETDMAAA:
 		if (path->device->protocol != PROTO_ATA &&
 		    (ident_buf->satasupport & ATA_SUPPORT_ASYNCNOTIF) &&
 		    (!(softc->caps & CTS_SATA_CAPS_H_AN)) !=
 		    (!(ident_buf->sataenabled & ATA_SUPPORT_ASYNCNOTIF))) {
 			PROBE_SET_ACTION(softc, PROBE_SETAN);
 			xpt_release_ccb(done_ccb);
 			xpt_schedule(periph, priority);
 			goto out;
 		}
 		/* FALLTHROUGH */
 	case PROBE_SETAN:
 notsata:
 		if (path->device->protocol == PROTO_ATA) {
 			PROBE_SET_ACTION(softc, PROBE_SET_MULTI);
 		} else {
 			PROBE_SET_ACTION(softc, PROBE_INQUIRY);
 		}
 		xpt_release_ccb(done_ccb);
 		xpt_schedule(periph, priority);
 		goto out;
 	case PROBE_SET_MULTI:
 		if (periph->path->device->flags & CAM_DEV_UNCONFIGURED) {
 			path->device->flags &= ~CAM_DEV_UNCONFIGURED;
 			xpt_acquire_device(path->device);
 			done_ccb->ccb_h.func_code = XPT_GDEV_TYPE;
 			xpt_action(done_ccb);
 			xpt_async(AC_FOUND_DEVICE, path, done_ccb);
 		}
 		PROBE_SET_ACTION(softc, PROBE_DONE);
 		break;
 	case PROBE_INQUIRY:
 	case PROBE_FULL_INQUIRY:
 	{
 		uint8_t periph_qual, len;
 
 		path->device->flags |= CAM_DEV_INQUIRY_DATA_VALID;
 
 		periph_qual = SID_QUAL(inq_buf);
 
 		if (periph_qual != SID_QUAL_LU_CONNECTED &&
 		    periph_qual != SID_QUAL_LU_OFFLINE)
 			break;
 
 		/*
 		 * We conservatively request only
 		 * SHORT_INQUIRY_LEN bytes of inquiry
 		 * information during our first try
 		 * at sending an INQUIRY. If the device
 		 * has more information to give,
 		 * perform a second request specifying
 		 * the amount of information the device
 		 * is willing to give.
 		 */
 		len = inq_buf->additional_length
 		    + offsetof(struct scsi_inquiry_data, additional_length) + 1;
 		if (softc->action == PROBE_INQUIRY
 		    && len > SHORT_INQUIRY_LENGTH) {
 			PROBE_SET_ACTION(softc, PROBE_FULL_INQUIRY);
 			xpt_release_ccb(done_ccb);
 			xpt_schedule(periph, priority);
 			goto out;
 		}
 
 		ata_device_transport(path);
 		if (periph->path->device->flags & CAM_DEV_UNCONFIGURED) {
 			path->device->flags &= ~CAM_DEV_UNCONFIGURED;
 			xpt_acquire_device(path->device);
 			done_ccb->ccb_h.func_code = XPT_GDEV_TYPE;
 			xpt_action(done_ccb);
 			xpt_async(AC_FOUND_DEVICE, path, done_ccb);
 		}
 		PROBE_SET_ACTION(softc, PROBE_DONE);
 		break;
 	}
 	case PROBE_PM_PID:
 		if ((path->device->flags & CAM_DEV_IDENTIFY_DATA_VALID) == 0)
 			bzero(ident_buf, sizeof(*ident_buf));
 		softc->pm_pid = (done_ccb->ataio.res.lba_high << 24) +
 		    (done_ccb->ataio.res.lba_mid << 16) +
 		    (done_ccb->ataio.res.lba_low << 8) +
 		    done_ccb->ataio.res.sector_count;
 		((uint32_t *)ident_buf)[0] = softc->pm_pid;
 		snprintf(ident_buf->model, sizeof(ident_buf->model),
 		    "Port Multiplier %08x", softc->pm_pid);
 		PROBE_SET_ACTION(softc, PROBE_PM_PRV);
 		xpt_release_ccb(done_ccb);
 		xpt_schedule(periph, priority);
 		goto out;
 	case PROBE_PM_PRV:
 		softc->pm_prv = (done_ccb->ataio.res.lba_high << 24) +
 		    (done_ccb->ataio.res.lba_mid << 16) +
 		    (done_ccb->ataio.res.lba_low << 8) +
 		    done_ccb->ataio.res.sector_count;
 		((uint32_t *)ident_buf)[1] = softc->pm_prv;
 		snprintf(ident_buf->revision, sizeof(ident_buf->revision),
 		    "%04x", softc->pm_prv);
 		path->device->flags |= CAM_DEV_IDENTIFY_DATA_VALID;
 		ata_device_transport(path);
 		if (periph->path->device->flags & CAM_DEV_UNCONFIGURED)
 			aproberequestdefaultnegotiation(periph);
 		/* Set supported bits. */
 		bzero(&cts, sizeof(cts));
 		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 		cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 		cts.type = CTS_TYPE_CURRENT_SETTINGS;
 		xpt_action((union ccb *)&cts);
 		if (cts.xport_specific.sata.valid & CTS_SATA_VALID_CAPS)
 			caps = cts.xport_specific.sata.caps & CTS_SATA_CAPS_H;
 		else
 			caps = 0;
 		/* All PMPs must support PM requests. */
 		caps |= CTS_SATA_CAPS_D_PMREQ;
 		/* Mask unwanted bits. */
 		bzero(&cts, sizeof(cts));
 		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 		cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 		cts.type = CTS_TYPE_USER_SETTINGS;
 		xpt_action((union ccb *)&cts);
 		if (cts.xport_specific.sata.valid & CTS_SATA_VALID_CAPS)
 			caps &= cts.xport_specific.sata.caps;
 		else
 			caps = 0;
 		/* Remember what transport thinks about AEN. */
 		oif = path->device->inq_flags;
 		if ((caps & CTS_SATA_CAPS_H_AN) && path->device->protocol != PROTO_ATA)
 			path->device->inq_flags |= SID_AEN;
 		else
 			path->device->inq_flags &= ~SID_AEN;
 		/* Store result to SIM. */
 		bzero(&cts, sizeof(cts));
 		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 		cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
 		cts.type = CTS_TYPE_CURRENT_SETTINGS;
 		cts.xport_specific.sata.caps = caps;
 		cts.xport_specific.sata.valid = CTS_SATA_VALID_CAPS;
 		xpt_action((union ccb *)&cts);
 		softc->caps = caps;
 		if (periph->path->device->flags & CAM_DEV_UNCONFIGURED) {
 			path->device->flags &= ~CAM_DEV_UNCONFIGURED;
 			xpt_acquire_device(path->device);
 			done_ccb->ccb_h.func_code = XPT_GDEV_TYPE;
 			xpt_action(done_ccb);
 			xpt_async(AC_FOUND_DEVICE, path, done_ccb);
 		} else {
 			if (path->device->inq_flags != oif)
 				xpt_async(AC_GETDEV_CHANGED, path, NULL);
 			done_ccb->ccb_h.func_code = XPT_GDEV_TYPE;
 			xpt_action(done_ccb);
 			xpt_async(AC_SCSI_AEN, path, done_ccb);
 		}
 		PROBE_SET_ACTION(softc, PROBE_DONE);
 		break;
 	case PROBE_IDENTIFY_SES:
 	case PROBE_IDENTIFY_SAFTE:
 		if ((periph->path->device->flags & CAM_DEV_UNCONFIGURED) == 0) {
 			/* Check that it is the same device. */
 			if (bcmp(&softc->ident_data, ident_buf, 53)) {
 				/* Device changed. */
 				changed = 2;
 				xpt_async(AC_LOST_DEVICE, path, NULL);
 			} else {
 				bcopy(&softc->ident_data, ident_buf, sizeof(struct ata_params));
 				changed = 0;
 			}
 		} else
 			changed = 2;
 		if (changed) {
 			bcopy(&softc->ident_data, ident_buf, sizeof(struct ata_params));
 			/* Clean up from previous instance of this device */
 			if (path->device->device_id != NULL) {
 				free(path->device->device_id, M_CAMXPT);
 				path->device->device_id = NULL;
 				path->device->device_id_len = 0;
 			}
 			path->device->device_id =
 			    malloc(16, M_CAMXPT, M_NOWAIT);
 			if (path->device->device_id != NULL) {
 				path->device->device_id_len = 16;
 				bcopy(&fake_device_id_hdr,
 				    path->device->device_id, 8);
 				bcopy(((uint8_t*)ident_buf) + 2,
 				    path->device->device_id + 8, 8);
 			}
 
 			path->device->flags |= CAM_DEV_IDENTIFY_DATA_VALID;
 		}
 		ata_device_transport(path);
 		if (changed)
 			aproberequestdefaultnegotiation(periph);
 
 		if (periph->path->device->flags & CAM_DEV_UNCONFIGURED) {
 			path->device->flags &= ~CAM_DEV_UNCONFIGURED;
 			xpt_acquire_device(path->device);
 			done_ccb->ccb_h.func_code = XPT_GDEV_TYPE;
 			xpt_action(done_ccb);
 			xpt_async(AC_FOUND_DEVICE, path, done_ccb);
 		}
 		PROBE_SET_ACTION(softc, PROBE_DONE);
 		break;
 	default:
 		panic("aprobedone: invalid action state 0x%x\n", softc->action);
 	}
 done:
 	if (softc->restart) {
 		softc->restart = 0;
 		xpt_release_ccb(done_ccb);
 		aprobeschedule(periph);
 		goto out;
 	}
 	xpt_release_ccb(done_ccb);
 	CAM_DEBUG(periph->path, CAM_DEBUG_PROBE, ("Probe completed\n"));
 	while ((done_ccb = (union ccb *)TAILQ_FIRST(&softc->request_ccbs))) {
 		TAILQ_REMOVE(&softc->request_ccbs,
 		    &done_ccb->ccb_h, periph_links.tqe);
 		done_ccb->ccb_h.status = found ? CAM_REQ_CMP : CAM_REQ_CMP_ERR;
 		xpt_done(done_ccb);
 	}
 	/* Drop freeze taken due to CAM_DEV_QFREEZE flag set. */
 	cam_release_devq(path, 0, 0, 0, FALSE);
 	cam_periph_invalidate(periph);
 	cam_periph_release_locked(periph);
 }
 
 static void
 aprobecleanup(struct cam_periph *periph)
 {
 	free(periph->softc, M_CAMXPT);
 }
 
 static void
 ata_find_quirk(struct cam_ed *device)
 {
 	struct ata_quirk_entry *quirk;
 	caddr_t	match;
 
 	match = cam_quirkmatch((caddr_t)&device->ident_data,
 			       (caddr_t)ata_quirk_table,
 			       nitems(ata_quirk_table),
 			       sizeof(*ata_quirk_table), ata_identify_match);
 
 	if (match == NULL)
 		panic("xpt_find_quirk: device didn't match wildcard entry!!");
 
 	quirk = (struct ata_quirk_entry *)match;
 	device->quirk = quirk;
 	if (quirk->quirks & CAM_QUIRK_MAXTAGS) {
 		device->mintags = quirk->mintags;
 		device->maxtags = quirk->maxtags;
 	}
 }
 
 typedef struct {
 	union	ccb *request_ccb;
 	struct 	ccb_pathinq *cpi;
 	int	counter;
 } ata_scan_bus_info;
 
 /*
  * To start a scan, request_ccb is an XPT_SCAN_BUS ccb.
  * As the scan progresses, xpt_scan_bus is used as the
  * callback on completion function.
  */
 static void
 ata_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 {
 	struct	cam_path *path;
 	ata_scan_bus_info *scan_info;
 	union	ccb *work_ccb, *reset_ccb;
 	struct mtx *mtx;
 	cam_status status;
 
 	CAM_DEBUG(request_ccb->ccb_h.path, CAM_DEBUG_TRACE,
 		  ("xpt_scan_bus\n"));
 	switch (request_ccb->ccb_h.func_code) {
 	case XPT_SCAN_BUS:
 	case XPT_SCAN_TGT:
 		/* Find out the characteristics of the bus */
 		work_ccb = xpt_alloc_ccb_nowait();
 		if (work_ccb == NULL) {
 			request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
 			xpt_done(request_ccb);
 			return;
 		}
 		xpt_path_inq(&work_ccb->cpi, request_ccb->ccb_h.path);
 		if (work_ccb->ccb_h.status != CAM_REQ_CMP) {
 			request_ccb->ccb_h.status = work_ccb->ccb_h.status;
 			xpt_free_ccb(work_ccb);
 			xpt_done(request_ccb);
 			return;
 		}
 
 		/* We may need to reset bus first, if we haven't done it yet. */
 		if ((work_ccb->cpi.hba_inquiry &
 		    (PI_WIDE_32|PI_WIDE_16|PI_SDTR_ABLE)) &&
 		    !(work_ccb->cpi.hba_misc & PIM_NOBUSRESET) &&
 		    !timevalisset(&request_ccb->ccb_h.path->bus->last_reset)) {
 			reset_ccb = xpt_alloc_ccb_nowait();
 			if (reset_ccb == NULL) {
 				request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
 				xpt_free_ccb(work_ccb);
 				xpt_done(request_ccb);
 				return;
 			}
 			xpt_setup_ccb(&reset_ccb->ccb_h, request_ccb->ccb_h.path,
 			      CAM_PRIORITY_NONE);
 			reset_ccb->ccb_h.func_code = XPT_RESET_BUS;
 			xpt_action(reset_ccb);
 			if (reset_ccb->ccb_h.status != CAM_REQ_CMP) {
 				request_ccb->ccb_h.status = reset_ccb->ccb_h.status;
 				xpt_free_ccb(reset_ccb);
 				xpt_free_ccb(work_ccb);
 				xpt_done(request_ccb);
 				return;
 			}
 			xpt_free_ccb(reset_ccb);
 		}
 
 		/* Save some state for use while we probe for devices */
 		scan_info = (ata_scan_bus_info *)
 		    malloc(sizeof(ata_scan_bus_info), M_CAMXPT, M_NOWAIT);
 		if (scan_info == NULL) {
 			request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
 			xpt_free_ccb(work_ccb);
 			xpt_done(request_ccb);
 			return;
 		}
 		scan_info->request_ccb = request_ccb;
 		scan_info->cpi = &work_ccb->cpi;
 		/* If PM supported, probe it first. */
 		if (scan_info->cpi->hba_inquiry & PI_SATAPM)
 			scan_info->counter = scan_info->cpi->max_target;
 		else
 			scan_info->counter = 0;
 
 		work_ccb = xpt_alloc_ccb_nowait();
 		if (work_ccb == NULL) {
 			free(scan_info, M_CAMXPT);
 			request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
 			xpt_done(request_ccb);
 			break;
 		}
 		mtx = xpt_path_mtx(scan_info->request_ccb->ccb_h.path);
 		goto scan_next;
 	case XPT_SCAN_LUN:
 		work_ccb = request_ccb;
 		/* Reuse the same CCB to query if a device was really found */
 		scan_info = (ata_scan_bus_info *)work_ccb->ccb_h.ppriv_ptr0;
 		mtx = xpt_path_mtx(scan_info->request_ccb->ccb_h.path);
 		mtx_lock(mtx);
 		/* If there is PMP... */
 		if ((scan_info->cpi->hba_inquiry & PI_SATAPM) &&
 		    (scan_info->counter == scan_info->cpi->max_target)) {
 			if (cam_ccb_success(work_ccb)) {
 				/* everything else will be probed by it */
 				/* Free the current request path- we're done with it. */
 				xpt_free_path(work_ccb->ccb_h.path);
 				goto done;
 			} else {
 				struct ccb_trans_settings cts;
 
 				/* Report SIM that PM is absent. */
 				bzero(&cts, sizeof(cts));
 				xpt_setup_ccb(&cts.ccb_h,
 				    work_ccb->ccb_h.path, CAM_PRIORITY_NONE);
 				cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
 				cts.type = CTS_TYPE_CURRENT_SETTINGS;
 				cts.xport_specific.sata.pm_present = 0;
 				cts.xport_specific.sata.valid = CTS_SATA_VALID_PM;
 				xpt_action((union ccb *)&cts);
 			}
 		}
 		/* Free the current request path- we're done with it. */
 		xpt_free_path(work_ccb->ccb_h.path);
 		if (scan_info->counter ==
 		    ((scan_info->cpi->hba_inquiry & PI_SATAPM) ?
 		    0 : scan_info->cpi->max_target)) {
 done:
 			mtx_unlock(mtx);
 			xpt_free_ccb(work_ccb);
 			xpt_free_ccb((union ccb *)scan_info->cpi);
 			request_ccb = scan_info->request_ccb;
 			free(scan_info, M_CAMXPT);
 			request_ccb->ccb_h.status = CAM_REQ_CMP;
 			xpt_done(request_ccb);
 			break;
 		}
 		/* Take next device. Wrap from max (PMP) to 0. */
 		scan_info->counter = (scan_info->counter + 1 ) %
 		    (scan_info->cpi->max_target + 1);
 scan_next:
 		status = xpt_create_path(&path, NULL,
 		    scan_info->request_ccb->ccb_h.path_id,
 		    scan_info->counter, 0);
 		if (status != CAM_REQ_CMP) {
 			if (request_ccb->ccb_h.func_code == XPT_SCAN_LUN)
 				mtx_unlock(mtx);
 			printf("xpt_scan_bus: xpt_create_path failed"
 			    " with status %#x, bus scan halted\n",
 			    status);
 			xpt_free_ccb(work_ccb);
 			xpt_free_ccb((union ccb *)scan_info->cpi);
 			request_ccb = scan_info->request_ccb;
 			free(scan_info, M_CAMXPT);
 			request_ccb->ccb_h.status = status;
 			xpt_done(request_ccb);
 			break;
 		}
 		xpt_setup_ccb(&work_ccb->ccb_h, path,
 		    scan_info->request_ccb->ccb_h.pinfo.priority);
 		work_ccb->ccb_h.func_code = XPT_SCAN_LUN;
 		work_ccb->ccb_h.cbfcnp = ata_scan_bus;
 		work_ccb->ccb_h.flags |= CAM_UNLOCKED;
 		work_ccb->ccb_h.ppriv_ptr0 = scan_info;
 		work_ccb->crcn.flags = scan_info->request_ccb->crcn.flags;
 		mtx_unlock(mtx);
 		if (request_ccb->ccb_h.func_code == XPT_SCAN_LUN)
 			mtx = NULL;
 		xpt_action(work_ccb);
 		if (mtx != NULL)
 			mtx_lock(mtx);
 		break;
 	default:
 		break;
 	}
 }
 
 static void
 ata_scan_lun(struct cam_periph *periph, struct cam_path *path,
 	     cam_flags flags, union ccb *request_ccb)
 {
 	struct ccb_pathinq cpi;
 	cam_status status;
 	struct cam_path *new_path;
 	struct cam_periph *old_periph;
 	int lock;
 
 	CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_scan_lun\n"));
 
 	xpt_path_inq(&cpi, path);
 	if (cpi.ccb_h.status != CAM_REQ_CMP) {
 		if (request_ccb != NULL) {
 			request_ccb->ccb_h.status = cpi.ccb_h.status;
 			xpt_done(request_ccb);
 		}
 		return;
 	}
 
 	if (request_ccb == NULL) {
 		request_ccb = xpt_alloc_ccb_nowait();
 		if (request_ccb == NULL) {
 			xpt_print(path, "xpt_scan_lun: can't allocate CCB, "
 			    "can't continue\n");
 			return;
 		}
 		status = xpt_create_path(&new_path, NULL,
 					  path->bus->path_id,
 					  path->target->target_id,
 					  path->device->lun_id);
 		if (status != CAM_REQ_CMP) {
 			xpt_print(path, "xpt_scan_lun: can't create path, "
 			    "can't continue\n");
 			xpt_free_ccb(request_ccb);
 			return;
 		}
 		xpt_setup_ccb(&request_ccb->ccb_h, new_path, CAM_PRIORITY_XPT);
 		request_ccb->ccb_h.cbfcnp = axptscandone;
 		request_ccb->ccb_h.flags |= CAM_UNLOCKED;
 		request_ccb->ccb_h.func_code = XPT_SCAN_LUN;
 		request_ccb->crcn.flags = flags;
 	}
 
 	lock = (xpt_path_owned(path) == 0);
 	if (lock)
 		xpt_path_lock(path);
 	if ((old_periph = cam_periph_find(path, "aprobe")) != NULL) {
 		if ((old_periph->flags & CAM_PERIPH_INVALID) == 0) {
 			aprobe_softc *softc;
 
 			softc = (aprobe_softc *)old_periph->softc;
 			TAILQ_INSERT_TAIL(&softc->request_ccbs,
 				&request_ccb->ccb_h, periph_links.tqe);
 			softc->restart = 1;
 		} else {
 			request_ccb->ccb_h.status = CAM_REQ_CMP_ERR;
 			xpt_done(request_ccb);
 		}
 	} else {
 		status = cam_periph_alloc(aproberegister, NULL, aprobecleanup,
 					  aprobestart, "aprobe",
 					  CAM_PERIPH_BIO,
 					  request_ccb->ccb_h.path, NULL, 0,
 					  request_ccb);
 
 		if (status != CAM_REQ_CMP) {
 			xpt_print(path, "xpt_scan_lun: cam_alloc_periph "
 			    "returned an error, can't continue probe\n");
 			request_ccb->ccb_h.status = status;
 			xpt_done(request_ccb);
 		}
 	}
 	if (lock)
 		xpt_path_unlock(path);
 }
 
 static void
 axptscandone(struct cam_periph *periph, union ccb *done_ccb)
 {
 
 	xpt_free_path(done_ccb->ccb_h.path);
 	xpt_free_ccb(done_ccb);
 }
 
 static struct cam_ed *
 ata_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id)
 {
 	struct ata_quirk_entry *quirk;
 	struct cam_ed *device;
 
 	device = xpt_alloc_device(bus, target, lun_id);
 	if (device == NULL)
 		return (NULL);
 
 	/*
 	 * Take the default quirk entry until we have inquiry
 	 * data and can determine a better quirk to use.
 	 */
 	quirk = &ata_quirk_table[nitems(ata_quirk_table) - 1];
 	device->quirk = (void *)quirk;
 	device->mintags = 0;
 	device->maxtags = 0;
 	bzero(&device->inq_data, sizeof(device->inq_data));
 	device->inq_flags = 0;
 	device->queue_flags = 0;
 	device->serial_num = NULL;
 	device->serial_num_len = 0;
 	return (device);
 }
 
 static void
 ata_device_transport(struct cam_path *path)
 {
 	struct ccb_pathinq cpi;
 	struct ccb_trans_settings cts;
 	struct scsi_inquiry_data *inq_buf = NULL;
 	struct ata_params *ident_buf = NULL;
 
 	/* Get transport information from the SIM */
 	xpt_path_inq(&cpi, path);
 
 	path->device->transport = cpi.transport;
 	if ((path->device->flags & CAM_DEV_INQUIRY_DATA_VALID) != 0)
 		inq_buf = &path->device->inq_data;
 	if ((path->device->flags & CAM_DEV_IDENTIFY_DATA_VALID) != 0)
 		ident_buf = &path->device->ident_data;
 	if (path->device->protocol == PROTO_ATA) {
 		path->device->protocol_version = ident_buf ?
 		    ata_version(ident_buf->version_major) : cpi.protocol_version;
 	} else if (path->device->protocol == PROTO_SCSI) {
 		path->device->protocol_version = inq_buf ?
 		    SID_ANSI_REV(inq_buf) : cpi.protocol_version;
 	}
 	path->device->transport_version = ident_buf ?
 	    ata_version(ident_buf->version_major) : cpi.transport_version;
 
 	/* Tell the controller what we think */
 	bzero(&cts, sizeof(cts));
 	xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 	cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
 	cts.type = CTS_TYPE_CURRENT_SETTINGS;
 	cts.transport = path->device->transport;
 	cts.transport_version = path->device->transport_version;
 	cts.protocol = path->device->protocol;
 	cts.protocol_version = path->device->protocol_version;
 	cts.proto_specific.valid = 0;
 	if (ident_buf) {
 		if (path->device->transport == XPORT_ATA) {
 			cts.xport_specific.ata.atapi =
 			    (ident_buf->config == ATA_PROTO_CFA) ? 0 :
 			    ((ident_buf->config & ATA_PROTO_MASK) == ATA_PROTO_ATAPI_16) ? 16 :
 			    ((ident_buf->config & ATA_PROTO_MASK) == ATA_PROTO_ATAPI_12) ? 12 : 0;
 			cts.xport_specific.ata.valid = CTS_ATA_VALID_ATAPI;
 		} else {
 			cts.xport_specific.sata.atapi =
 			    (ident_buf->config == ATA_PROTO_CFA) ? 0 :
 			    ((ident_buf->config & ATA_PROTO_MASK) == ATA_PROTO_ATAPI_16) ? 16 :
 			    ((ident_buf->config & ATA_PROTO_MASK) == ATA_PROTO_ATAPI_12) ? 12 : 0;
 			cts.xport_specific.sata.valid = CTS_SATA_VALID_ATAPI;
 		}
 	} else
 		cts.xport_specific.valid = 0;
 	xpt_action((union ccb *)&cts);
 }
 
 static void
 ata_dev_advinfo(union ccb *start_ccb)
 {
 	struct cam_ed *device;
 	struct ccb_dev_advinfo *cdai;
 	off_t amt;
 
 	xpt_path_assert(start_ccb->ccb_h.path, MA_OWNED);
 	start_ccb->ccb_h.status = CAM_REQ_INVALID;
 	device = start_ccb->ccb_h.path->device;
 	cdai = &start_ccb->cdai;
 	switch(cdai->buftype) {
 	case CDAI_TYPE_SCSI_DEVID:
 		if (cdai->flags & CDAI_FLAG_STORE)
 			return;
 		cdai->provsiz = device->device_id_len;
 		if (device->device_id_len == 0)
 			break;
 		amt = device->device_id_len;
 		if (cdai->provsiz > cdai->bufsiz)
 			amt = cdai->bufsiz;
 		memcpy(cdai->buf, device->device_id, amt);
 		break;
 	case CDAI_TYPE_SERIAL_NUM:
 		if (cdai->flags & CDAI_FLAG_STORE)
 			return;
 		cdai->provsiz = device->serial_num_len;
 		if (device->serial_num_len == 0)
 			break;
 		amt = device->serial_num_len;
 		if (cdai->provsiz > cdai->bufsiz)
 			amt = cdai->bufsiz;
 		memcpy(cdai->buf, device->serial_num, amt);
 		break;
 	case CDAI_TYPE_PHYS_PATH:
 		if (cdai->flags & CDAI_FLAG_STORE) {
 			if (device->physpath != NULL) {
 				free(device->physpath, M_CAMXPT);
 				device->physpath = NULL;
 				device->physpath_len = 0;
 			}
 			/* Clear existing buffer if zero length */
 			if (cdai->bufsiz == 0)
 				break;
 			device->physpath = malloc(cdai->bufsiz, M_CAMXPT, M_NOWAIT);
 			if (device->physpath == NULL) {
 				start_ccb->ccb_h.status = CAM_REQ_ABORTED;
 				return;
 			}
 			device->physpath_len = cdai->bufsiz;
 			memcpy(device->physpath, cdai->buf, cdai->bufsiz);
 		} else {
 			cdai->provsiz = device->physpath_len;
 			if (device->physpath_len == 0)
 				break;
 			amt = device->physpath_len;
 			if (cdai->provsiz > cdai->bufsiz)
 				amt = cdai->bufsiz;
 			memcpy(cdai->buf, device->physpath, amt);
 		}
 		break;
 	default:
 		return;
 	}
 	start_ccb->ccb_h.status = CAM_REQ_CMP;
 
 	if (cdai->flags & CDAI_FLAG_STORE) {
 		xpt_async(AC_ADVINFO_CHANGED, start_ccb->ccb_h.path,
 			  (void *)(uintptr_t)cdai->buftype);
 	}
 }
 
 static void
 ata_action(union ccb *start_ccb)
 {
 
 	if (start_ccb->ccb_h.func_code != XPT_ATA_IO) {
 		KASSERT((start_ccb->ccb_h.alloc_flags & CAM_CCB_FROM_UMA) == 0,
 		    ("%s: ccb %p, func_code %#x should not be allocated "
 		    "from UMA zone\n",
 		    __func__, start_ccb, start_ccb->ccb_h.func_code));
 	}
 
 	switch (start_ccb->ccb_h.func_code) {
 	case XPT_SET_TRAN_SETTINGS:
 	{
 		ata_set_transfer_settings(&start_ccb->cts,
 					   start_ccb->ccb_h.path,
 					   /*async_update*/FALSE);
 		break;
 	}
 	case XPT_SCAN_BUS:
 	case XPT_SCAN_TGT:
 		ata_scan_bus(start_ccb->ccb_h.path->periph, start_ccb);
 		break;
 	case XPT_SCAN_LUN:
 		ata_scan_lun(start_ccb->ccb_h.path->periph,
 			      start_ccb->ccb_h.path, start_ccb->crcn.flags,
 			      start_ccb);
 		break;
 	case XPT_GET_TRAN_SETTINGS:
 	{
 		ata_get_transfer_settings(&start_ccb->cts);
 		break;
 	}
 	case XPT_SCSI_IO:
 	{
 		struct cam_ed *device;
 		u_int	maxlen = 0;
 
 		device = start_ccb->ccb_h.path->device;
 		if (device->protocol == PROTO_SCSI &&
 		    (device->flags & CAM_DEV_IDENTIFY_DATA_VALID)) {
 			uint16_t p =
 			    device->ident_data.config & ATA_PROTO_MASK;
 
 			maxlen =
 			    (device->ident_data.config == ATA_PROTO_CFA) ? 0 :
 			    (p == ATA_PROTO_ATAPI_16) ? 16 :
 			    (p == ATA_PROTO_ATAPI_12) ? 12 : 0;
 		}
 		if (start_ccb->csio.cdb_len > maxlen) {
 			start_ccb->ccb_h.status = CAM_REQ_INVALID;
 			xpt_done(start_ccb);
 			break;
 		}
 		xpt_action_default(start_ccb);
 		break;
 	}
 	case XPT_DEV_ADVINFO:
 	{
 		ata_dev_advinfo(start_ccb);
 		break;
 	}
 	default:
 		xpt_action_default(start_ccb);
 		break;
 	}
 }
 
 static void
 ata_get_transfer_settings(struct ccb_trans_settings *cts)
 {
 	struct	ccb_trans_settings_ata *ata;
 	struct	ccb_trans_settings_scsi *scsi;
 	struct	cam_ed *device;
 
 	device = cts->ccb_h.path->device;
 	xpt_action_default((union ccb *)cts);
 
 	if (cts->protocol == PROTO_UNKNOWN ||
 	    cts->protocol == PROTO_UNSPECIFIED) {
 		cts->protocol = device->protocol;
 		cts->protocol_version = device->protocol_version;
 	}
 
 	if (cts->protocol == PROTO_ATA) {
 		ata = &cts->proto_specific.ata;
 		if ((ata->valid & CTS_ATA_VALID_TQ) == 0) {
 			ata->valid |= CTS_ATA_VALID_TQ;
 			if (cts->type == CTS_TYPE_USER_SETTINGS ||
 			    (device->flags & CAM_DEV_TAG_AFTER_COUNT) != 0 ||
 			    (device->inq_flags & SID_CmdQue) != 0)
 				ata->flags |= CTS_ATA_FLAGS_TAG_ENB;
 		}
 	}
 	if (cts->protocol == PROTO_SCSI) {
 		scsi = &cts->proto_specific.scsi;
 		if ((scsi->valid & CTS_SCSI_VALID_TQ) == 0) {
 			scsi->valid |= CTS_SCSI_VALID_TQ;
 			if (cts->type == CTS_TYPE_USER_SETTINGS ||
 			    (device->flags & CAM_DEV_TAG_AFTER_COUNT) != 0 ||
 			    (device->inq_flags & SID_CmdQue) != 0)
 				scsi->flags |= CTS_SCSI_FLAGS_TAG_ENB;
 		}
 	}
 
 	if (cts->transport == XPORT_UNKNOWN ||
 	    cts->transport == XPORT_UNSPECIFIED) {
 		cts->transport = device->transport;
 		cts->transport_version = device->transport_version;
 	}
 }
 
 static void
 ata_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_path *path,
 			   int async_update)
 {
 	struct	ccb_pathinq cpi;
 	struct	ccb_trans_settings_ata *ata;
 	struct	ccb_trans_settings_scsi *scsi;
 	struct	ata_params *ident_data;
 	struct	scsi_inquiry_data *inq_data;
 	struct	cam_ed *device;
 
 	if (path == NULL || (device = path->device) == NULL) {
 		cts->ccb_h.status = CAM_PATH_INVALID;
 		xpt_done((union ccb *)cts);
 		return;
 	}
 
 	if (cts->protocol == PROTO_UNKNOWN
 	 || cts->protocol == PROTO_UNSPECIFIED) {
 		cts->protocol = device->protocol;
 		cts->protocol_version = device->protocol_version;
 	}
 
 	if (cts->protocol_version == PROTO_VERSION_UNKNOWN
 	 || cts->protocol_version == PROTO_VERSION_UNSPECIFIED)
 		cts->protocol_version = device->protocol_version;
 
 	if (cts->protocol != device->protocol) {
 		xpt_print(path, "Uninitialized Protocol %x:%x?\n",
 		       cts->protocol, device->protocol);
 		cts->protocol = device->protocol;
 	}
 
 	if (cts->protocol_version > device->protocol_version) {
 		if (bootverbose) {
 			xpt_print(path, "Down reving Protocol "
 			    "Version from %d to %d?\n", cts->protocol_version,
 			    device->protocol_version);
 		}
 		cts->protocol_version = device->protocol_version;
 	}
 
 	if (cts->transport == XPORT_UNKNOWN
 	 || cts->transport == XPORT_UNSPECIFIED) {
 		cts->transport = device->transport;
 		cts->transport_version = device->transport_version;
 	}
 
 	if (cts->transport_version == XPORT_VERSION_UNKNOWN
 	 || cts->transport_version == XPORT_VERSION_UNSPECIFIED)
 		cts->transport_version = device->transport_version;
 
 	if (cts->transport != device->transport) {
 		xpt_print(path, "Uninitialized Transport %x:%x?\n",
 		    cts->transport, device->transport);
 		cts->transport = device->transport;
 	}
 
 	if (cts->transport_version > device->transport_version) {
 		if (bootverbose) {
 			xpt_print(path, "Down reving Transport "
 			    "Version from %d to %d?\n", cts->transport_version,
 			    device->transport_version);
 		}
 		cts->transport_version = device->transport_version;
 	}
 
 	ident_data = &device->ident_data;
 	inq_data = &device->inq_data;
 	if (cts->protocol == PROTO_ATA)
 		ata = &cts->proto_specific.ata;
 	else
 		ata = NULL;
 	if (cts->protocol == PROTO_SCSI)
 		scsi = &cts->proto_specific.scsi;
 	else
 		scsi = NULL;
 	xpt_path_inq(&cpi, path);
 
 	/* Sanity checking */
 	if ((cpi.hba_inquiry & PI_TAG_ABLE) == 0
 	 || (ata && (ident_data->satacapabilities & ATA_SUPPORT_NCQ) == 0)
 	 || (scsi && (INQ_DATA_TQ_ENABLED(inq_data)) == 0)
 	 || (device->queue_flags & SCP_QUEUE_DQUE) != 0
 	 || (device->mintags == 0)) {
 		/*
 		 * Can't tag on hardware that doesn't support tags,
 		 * doesn't have it enabled, or has broken tag support.
 		 */
 		if (ata)
 			ata->flags &= ~CTS_ATA_FLAGS_TAG_ENB;
 		if (scsi)
 			scsi->flags &= ~CTS_SCSI_FLAGS_TAG_ENB;
 	}
 
 	/* Start/stop tags use. */
 	if (cts->type == CTS_TYPE_CURRENT_SETTINGS &&
 	    ((ata && (ata->valid & CTS_ATA_VALID_TQ) != 0) ||
 	     (scsi && (scsi->valid & CTS_SCSI_VALID_TQ) != 0))) {
 		int nowt, newt = 0;
 
 		nowt = ((device->flags & CAM_DEV_TAG_AFTER_COUNT) != 0 ||
 			(device->inq_flags & SID_CmdQue) != 0);
 		if (ata)
 			newt = (ata->flags & CTS_ATA_FLAGS_TAG_ENB) != 0;
 		if (scsi)
 			newt = (scsi->flags & CTS_SCSI_FLAGS_TAG_ENB) != 0;
 
 		if (newt && !nowt) {
 			/*
 			 * Delay change to use tags until after a
 			 * few commands have gone to this device so
 			 * the controller has time to perform transfer
 			 * negotiations without tagged messages getting
 			 * in the way.
 			 */
 			device->tag_delay_count = CAM_TAG_DELAY_COUNT;
 			device->flags |= CAM_DEV_TAG_AFTER_COUNT;
 		} else if (nowt && !newt)
 			xpt_stop_tags(path);
 	}
 
 	if (async_update == FALSE)
 		xpt_action_default((union ccb *)cts);
 }
 
 /*
  * Handle any per-device event notifications that require action by the XPT.
  */
 static void
 ata_dev_async(uint32_t async_code, struct cam_eb *bus, struct cam_et *target,
 	      struct cam_ed *device, void *async_arg)
 {
 	/*
 	 * We only need to handle events for real devices.
 	 */
 	if (target->target_id == CAM_TARGET_WILDCARD ||
 	    device->lun_id == CAM_LUN_WILDCARD)
 		return;
 
 	switch (async_code) {
 	case AC_SENT_BDR:
 	case AC_BUS_RESET:
 	case AC_INQ_CHANGED: {
 		cam_status status;
 		struct cam_path newpath;
 		cam_flags flags;
 
 		/*
 		 * We need our own path with wildcards expanded to handle these
 		 * events.
 		 */
 		status = xpt_compile_path(&newpath, NULL,
 					  bus->path_id,
 					  target->target_id,
 					  device->lun_id);
 		if (status != CAM_REQ_CMP)
 			break; /* fail safe and just drop it */
 
 		/*
 		 * For AC_INQ_CHANGED, we've sent a start unit command, or
 		 * something similar to a device that may have caused its
 		 * inquiry data to change. So we re-scan the device to refresh
 		 * the inquiry data for it, allowing changes. Otherwise we rescan
 		 * without allowing changes to respond to the reset, not allowing
 		 * changes.
 		 */
 		flags = async_code == AC_INQ_CHANGED ? CAM_EXPECT_INQ_CHANGE : 0;
 		ata_scan_lun(newpath.periph, &newpath, flags, NULL);
 		xpt_release_path(&newpath);
 		break;
 	}
 	case AC_TRANSFER_NEG: {
 		struct ccb_trans_settings *settings;
 		struct cam_path path;
 
 		settings = (struct ccb_trans_settings *)async_arg;
 		xpt_compile_path(&path, NULL, bus->path_id, target->target_id,
 				 device->lun_id);
 		ata_set_transfer_settings(settings, &path,
 					  /*async_update*/TRUE);
 		xpt_release_path(&path);
 		break;
 	}
 	case AC_LOST_DEVICE:
 		if ((device->flags & CAM_DEV_UNCONFIGURED) == 0) {
 			device->flags |= CAM_DEV_UNCONFIGURED;
 			xpt_release_device(device);
 		}
 		break;
 	}
 }
 
 static void
 _ata_announce_periph(struct cam_periph *periph, struct ccb_trans_settings *cts, u_int *speed)
 {
 	struct	ccb_pathinq cpi;
 	struct	cam_path *path = periph->path;
 
 	cam_periph_assert(periph, MA_OWNED);
 
 	xpt_setup_ccb(&cts->ccb_h, path, CAM_PRIORITY_NORMAL);
 	cts->ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 	cts->type = CTS_TYPE_CURRENT_SETTINGS;
 	xpt_action((union ccb*)cts);
 	if ((cts->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)
 		return;
 	/* Ask the SIM for its base transfer speed */
 	xpt_path_inq(&cpi, path);
 	/* Report connection speed */
 	*speed = cpi.base_transfer_speed;
 	if (cts->transport == XPORT_ATA) {
 		struct	ccb_trans_settings_pata *pata =
 		    &cts->xport_specific.ata;
 
 		if (pata->valid & CTS_ATA_VALID_MODE)
 			*speed = ata_mode2speed(pata->mode);
 	}
 	if (cts->transport == XPORT_SATA) {
 		struct	ccb_trans_settings_sata *sata =
 		    &cts->xport_specific.sata;
 
 		if (sata->valid & CTS_SATA_VALID_REVISION)
 			*speed = ata_revision2speed(sata->revision);
 	}
 }
 
-static void
-ata_announce_periph(struct cam_periph *periph)
-{
-	struct ccb_trans_settings cts;
-	u_int speed, mb;
-
-	bzero(&cts, sizeof(cts));
-	_ata_announce_periph(periph, &cts, &speed);
-	if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)
-		return;
-
-	mb = speed / 1000;
-	if (mb > 0)
-		printf("%s%d: %d.%03dMB/s transfers",
-		       periph->periph_name, periph->unit_number,
-		       mb, speed % 1000);
-	else
-		printf("%s%d: %dKB/s transfers", periph->periph_name,
-		       periph->unit_number, speed);
-	/* Report additional information about connection */
-	if (cts.transport == XPORT_ATA) {
-		struct ccb_trans_settings_pata *pata =
-		    &cts.xport_specific.ata;
-
-		printf(" (");
-		if (pata->valid & CTS_ATA_VALID_MODE)
-			printf("%s, ", ata_mode2string(pata->mode));
-		if ((pata->valid & CTS_ATA_VALID_ATAPI) && pata->atapi != 0)
-			printf("ATAPI %dbytes, ", pata->atapi);
-		if (pata->valid & CTS_ATA_VALID_BYTECOUNT)
-			printf("PIO %dbytes", pata->bytecount);
-		printf(")");
-	}
-	if (cts.transport == XPORT_SATA) {
-		struct ccb_trans_settings_sata *sata =
-		    &cts.xport_specific.sata;
-
-		printf(" (");
-		if (sata->valid & CTS_SATA_VALID_REVISION)
-			printf("SATA %d.x, ", sata->revision);
-		else
-			printf("SATA, ");
-		if (sata->valid & CTS_SATA_VALID_MODE)
-			printf("%s, ", ata_mode2string(sata->mode));
-		if ((sata->valid & CTS_ATA_VALID_ATAPI) && sata->atapi != 0)
-			printf("ATAPI %dbytes, ", sata->atapi);
-		if (sata->valid & CTS_SATA_VALID_BYTECOUNT)
-			printf("PIO %dbytes", sata->bytecount);
-		printf(")");
-	}
-	printf("\n");
-}
-
 static void
 ata_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb)
 {
 	struct ccb_trans_settings cts;
 	u_int speed, mb;
 
 	bzero(&cts, sizeof(cts));
 	_ata_announce_periph(periph, &cts, &speed);
 	if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)
 		return;
 
 	mb = speed / 1000;
 	if (mb > 0)
 		sbuf_printf(sb, "%s%d: %d.%03dMB/s transfers",
 		       periph->periph_name, periph->unit_number,
 		       mb, speed % 1000);
 	else
 		sbuf_printf(sb, "%s%d: %dKB/s transfers", periph->periph_name,
 		       periph->unit_number, speed);
 	/* Report additional information about connection */
 	if (cts.transport == XPORT_ATA) {
 		struct ccb_trans_settings_pata *pata =
 		    &cts.xport_specific.ata;
 
 		sbuf_printf(sb, " (");
 		if (pata->valid & CTS_ATA_VALID_MODE)
 			sbuf_printf(sb, "%s, ", ata_mode2string(pata->mode));
 		if ((pata->valid & CTS_ATA_VALID_ATAPI) && pata->atapi != 0)
 			sbuf_printf(sb, "ATAPI %dbytes, ", pata->atapi);
 		if (pata->valid & CTS_ATA_VALID_BYTECOUNT)
 			sbuf_printf(sb, "PIO %dbytes", pata->bytecount);
 		sbuf_printf(sb, ")");
 	}
 	if (cts.transport == XPORT_SATA) {
 		struct ccb_trans_settings_sata *sata =
 		    &cts.xport_specific.sata;
 
 		sbuf_printf(sb, " (");
 		if (sata->valid & CTS_SATA_VALID_REVISION)
 			sbuf_printf(sb, "SATA %d.x, ", sata->revision);
 		else
 			sbuf_printf(sb, "SATA, ");
 		if (sata->valid & CTS_SATA_VALID_MODE)
 			sbuf_printf(sb, "%s, ", ata_mode2string(sata->mode));
 		if ((sata->valid & CTS_ATA_VALID_ATAPI) && sata->atapi != 0)
 			sbuf_printf(sb, "ATAPI %dbytes, ", sata->atapi);
 		if (sata->valid & CTS_SATA_VALID_BYTECOUNT)
 			sbuf_printf(sb, "PIO %dbytes", sata->bytecount);
 		sbuf_printf(sb, ")");
 	}
 	sbuf_printf(sb, "\n");
 }
 
 static void
 ata_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb)
 {
 	ata_print_ident_sbuf(&device->ident_data, sb);
 }
 
-static void
-ata_proto_announce(struct cam_ed *device)
-{
-	ata_print_ident(&device->ident_data);
-}
-
-static void
-ata_proto_denounce(struct cam_ed *device)
-{
-	ata_print_ident_short(&device->ident_data);
-}
-
 static void
 ata_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb)
 {
 	ata_print_ident_short_sbuf(&device->ident_data, sb);
 }
 
 static void
 semb_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb)
 {
 	semb_print_ident_sbuf((struct sep_identify_data *)&device->ident_data, sb);
 }
 
-static void
-semb_proto_announce(struct cam_ed *device)
-{
-	semb_print_ident((struct sep_identify_data *)&device->ident_data);
-}
-
-static void
-semb_proto_denounce(struct cam_ed *device)
-{
-	semb_print_ident_short((struct sep_identify_data *)&device->ident_data);
-}
-
 static void
 semb_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb)
 {
 	semb_print_ident_short_sbuf((struct sep_identify_data *)&device->ident_data, sb);
 }
 
 static void
 ata_proto_debug_out(union ccb *ccb)
 {
 	char cdb_str[(sizeof(struct ata_cmd) * 3) + 1];
 
 	if (ccb->ccb_h.func_code != XPT_ATA_IO)
 		return;
 
 	CAM_DEBUG(ccb->ccb_h.path,
 	    CAM_DEBUG_CDB,("%s. ACB: %s\n", ata_op_string(&ccb->ataio.cmd),
 		ata_cmd_string(&ccb->ataio.cmd, cdb_str, sizeof(cdb_str))));
 }
diff --git a/sys/cam/cam_xpt_internal.h b/sys/cam/cam_xpt_internal.h
index f30ef2aa81b5..0e8302cb74ed 100644
--- a/sys/cam/cam_xpt_internal.h
+++ b/sys/cam/cam_xpt_internal.h
@@ -1,218 +1,215 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright 2009 Scott Long
  * 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,
  *    without modification, immediately at the beginning of the file.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
  * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 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.
  *
  * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_XPT_INTERNAL_H
 #define _CAM_CAM_XPT_INTERNAL_H 1
 
 #include <sys/taskqueue.h>
 
 /* Forward Declarations */
 struct cam_eb;
 struct cam_et;
 struct cam_ed;
 
 typedef struct cam_ed * (*xpt_alloc_device_func)(struct cam_eb *bus,
 					         struct cam_et *target,
 					         lun_id_t lun_id);
 typedef void (*xpt_release_device_func)(struct cam_ed *device);
 typedef void (*xpt_action_func)(union ccb *start_ccb);
 typedef void (*xpt_dev_async_func)(uint32_t async_code,
 				   struct cam_eb *bus,
 				   struct cam_et *target,
 				   struct cam_ed *device,
 				   void *async_arg);
 typedef void (*xpt_announce_periph_func)(struct cam_periph *periph);
 typedef void (*xpt_announce_periph_sbuf_func)(struct cam_periph *periph, struct sbuf *sbuf);
 
 struct xpt_xport_ops {
 	xpt_alloc_device_func	alloc_device;
 	xpt_release_device_func	reldev;
 	xpt_action_func		action;
 	xpt_dev_async_func	async;
-	xpt_announce_periph_func announce;
 	xpt_announce_periph_sbuf_func announce_sbuf;
 };
 
 struct xpt_xport {
 	cam_xport		xport;
 	const char		*name;
 	struct xpt_xport_ops	*ops;
 };
 
 SET_DECLARE(cam_xpt_xport_set, struct xpt_xport);
 #define CAM_XPT_XPORT(data) 				\
 	DATA_SET(cam_xpt_xport_set, data)
 
 typedef void (*xpt_proto_announce_func)(struct cam_ed *);
 typedef void (*xpt_proto_announce_sbuf_func)(struct cam_ed *, struct sbuf *);
 typedef void (*xpt_proto_debug_out_func)(union ccb *);
 
 struct xpt_proto_ops {
-	xpt_proto_announce_func	announce;
 	xpt_proto_announce_sbuf_func	announce_sbuf;
-	xpt_proto_announce_func	denounce;
 	xpt_proto_announce_sbuf_func	denounce_sbuf;
 	xpt_proto_debug_out_func debug_out;
 };
 
 struct xpt_proto {
 	cam_proto		proto;
 	const char		*name;
 	struct xpt_proto_ops	*ops;
 };
 
 SET_DECLARE(cam_xpt_proto_set, struct xpt_proto);
 #define CAM_XPT_PROTO(data) 				\
 	DATA_SET(cam_xpt_proto_set, data)
 
 /*
  * The CAM EDT (Existing Device Table) contains the device information for
  * all devices for all buses in the system.  The table contains a
  * cam_ed structure for each device on the bus.
  */
 struct cam_ed {
 	cam_pinfo	 devq_entry;
 	TAILQ_ENTRY(cam_ed) links;
 	struct	cam_et	 *target;
 	struct	cam_sim  *sim;
 	lun_id_t	 lun_id;
 	struct	cam_ccbq ccbq;		/* Queue of pending ccbs */
 	struct	async_list asyncs;	/* Async callback info for this B/T/L */
 	struct	periph_list periphs;	/* All attached devices */
 	u_int		 generation;	/* Generation number */
 	void		 *quirk;	/* Oddities about this device */
 	u_int		 maxtags;
 	u_int		 mintags;
 	cam_proto	 protocol;
 	u_int		 protocol_version;
 	cam_xport	 transport;
 	u_int		 transport_version;
 	struct		 scsi_inquiry_data inq_data;
 	uint8_t		 *supported_vpds;
 	uint8_t		 supported_vpds_len;
 	uint32_t	 device_id_len;
 	uint8_t		 *device_id;
 	uint32_t	 ext_inq_len;
 	uint8_t		 *ext_inq;
 	uint8_t		 physpath_len;
 	uint8_t		 *physpath;	/* physical path string form */
 	uint32_t	 rcap_len;
 	uint8_t		 *rcap_buf;
 	struct		 ata_params ident_data;
         struct		 mmc_params mmc_ident_data;
 	uint8_t	 inq_flags;	/*
 					 * Current settings for inquiry flags.
 					 * This allows us to override settings
 					 * like disconnection and tagged
 					 * queuing for a device.
 					 */
 	uint8_t	 queue_flags;	/* Queue flags from the control page */
 	uint8_t	 serial_num_len;
 	uint8_t	*serial_num;
 	uint32_t	 flags;
 #define CAM_DEV_UNCONFIGURED	 	0x01
 #define CAM_DEV_REL_TIMEOUT_PENDING	0x02
 #define CAM_DEV_REL_ON_COMPLETE		0x04
 #define CAM_DEV_REL_ON_QUEUE_EMPTY	0x08
 #define CAM_DEV_TAG_AFTER_COUNT		0x20
 #define CAM_DEV_INQUIRY_DATA_VALID	0x40
 #define	CAM_DEV_IN_DV			0x80
 #define	CAM_DEV_DV_HIT_BOTTOM		0x100
 #define CAM_DEV_IDENTIFY_DATA_VALID	0x200
 	uint32_t	 tag_delay_count;
 #define	CAM_TAG_DELAY_COUNT		5
 	uint32_t	 tag_saved_openings;
 	uint32_t	 refcount;
 	struct callout	 callout;
 	STAILQ_ENTRY(cam_ed) highpowerq_entry;
 	struct mtx	 device_mtx;
 	struct task	 device_destroy_task;
 	struct nvme_controller_data *nvme_cdata;
 	struct nvme_namespace_data *nvme_data;
 };
 
 /*
  * Each target is represented by an ET (Existing Target).  These
  * entries are created when a target is successfully probed with an
  * identify, and removed when a device fails to respond after a number
  * of retries, or a bus rescan finds the device missing.
  */
 struct cam_et {
 	TAILQ_HEAD(, cam_ed) ed_entries;
 	TAILQ_ENTRY(cam_et) links;
 	struct	cam_eb	*bus;
 	target_id_t	target_id;
 	uint32_t	refcount;
 	u_int		generation;
 	struct		timeval last_reset;
 	u_int		rpl_size;
 	struct scsi_report_luns_data *luns;
 	struct mtx	luns_mtx;	/* Protection for luns field. */
 };
 
 /*
  * Each bus is represented by an EB (Existing Bus).  These entries
  * are created by calls to xpt_bus_register and deleted by calls to
  * xpt_bus_deregister.
  */
 struct cam_eb {
 	TAILQ_HEAD(, cam_et) et_entries;
 	TAILQ_ENTRY(cam_eb)  links;
 	path_id_t	     path_id;
 	struct cam_sim	     *sim;
 	struct timeval	     last_reset;
 	uint32_t	     flags;
 #define	CAM_EB_RUNQ_SCHEDULED	0x01
 	uint32_t	     refcount;
 	u_int		     generation;
 	device_t	     parent_dev;
 	struct xpt_xport     *xport;
 	struct mtx	     eb_mtx;	/* Bus topology mutex. */
 };
 
 struct cam_path {
 	struct cam_periph *periph;
 	struct cam_eb	  *bus;
 	struct cam_et	  *target;
 	struct cam_ed	  *device;
 };
 
 struct cam_ed *		xpt_alloc_device(struct cam_eb *bus,
 					 struct cam_et *target,
 					 lun_id_t lun_id);
 void			xpt_acquire_device(struct cam_ed *device);
 void			xpt_release_device(struct cam_ed *device);
 uint32_t		xpt_dev_ccbq_resize(struct cam_path *path, int newopenings);
 void			xpt_start_tags(struct cam_path *path);
 void			xpt_stop_tags(struct cam_path *path);
 
 MALLOC_DECLARE(M_CAMXPT);
 
 #endif
diff --git a/sys/cam/mmc/mmc_xpt.c b/sys/cam/mmc/mmc_xpt.c
index 0930717b0a2a..406b91df2e35 100644
--- a/sys/cam/mmc/mmc_xpt.c
+++ b/sys/cam/mmc/mmc_xpt.c
@@ -1,1280 +1,1232 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2013,2014 Ilya Bakulin <ilya@bakulin.de>
  * 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,
  *    without modification, immediately at the beginning of the file.
  * 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.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, 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.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/interrupt.h>
 #include <sys/sbuf.h>
 
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 #include <sys/condvar.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
 #include <cam/cam_queue.h>
 #include <cam/cam_periph.h>
 #include <cam/cam_sim.h>
 #include <cam/cam_xpt.h>
 #include <cam/cam_xpt_sim.h>
 #include <cam/cam_xpt_periph.h>
 #include <cam/cam_xpt_internal.h>
 #include <cam/cam_debug.h>
 
 #include <cam/mmc/mmc.h>
 #include <cam/mmc/mmc_bus.h>
 
 #include <machine/stdarg.h>	/* for xpt_print below */
 #include <machine/_inttypes.h>  /* for PRIu64 */
 #include "opt_cam.h"
 
 FEATURE(mmccam, "CAM-based MMC/SD/SDIO stack");
 
 static struct cam_ed * mmc_alloc_device(struct cam_eb *bus,
     struct cam_et *target, lun_id_t lun_id);
 static void mmc_dev_async(uint32_t async_code, struct cam_eb *bus,
     struct cam_et *target, struct cam_ed *device, void *async_arg);
 static void	 mmc_action(union ccb *start_ccb);
 static void	 mmc_dev_advinfo(union ccb *start_ccb);
-static void	 mmc_announce_periph(struct cam_periph *periph);
 static void	 mmc_announce_periph_sbuf(struct cam_periph *periph,
     struct sbuf *sb);
 static void	 mmc_scan_lun(struct cam_periph *periph,
     struct cam_path *path, cam_flags flags, union ccb *ccb);
 
 /* mmcprobe methods */
 static cam_status mmcprobe_register(struct cam_periph *periph, void *arg);
 static void	 mmcprobe_start(struct cam_periph *periph, union ccb *start_ccb);
 static void	 mmcprobe_cleanup(struct cam_periph *periph);
 static void	 mmcprobe_done(struct cam_periph *periph, union ccb *done_ccb);
 
-static void mmc_proto_announce(struct cam_ed *device);
 static void mmc_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb);
-static void mmc_proto_denounce(struct cam_ed *device);
 static void mmc_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb);
 static void mmc_proto_debug_out(union ccb *ccb);
 
 typedef enum {
 	PROBE_RESET,
 	PROBE_IDENTIFY,
 	PROBE_POWER_OFF,
 	PROBE_GET_HOST_OCR,
 	PROBE_RESET_BUS,
 	PROBE_SET_ID_FREQ,
 	PROBE_SET_CS,
 	PROBE_GO_IDLE_STATE,
 	PROBE_SDIO_RESET,
 	PROBE_SEND_IF_COND,
 	PROBE_SDIO_INIT,
 	PROBE_MMC_INIT,
 	PROBE_SEND_APP_OP_COND,
 	PROBE_GET_CID,
 	PROBE_GET_CSD,
 	PROBE_SEND_RELATIVE_ADDR,
 	PROBE_MMC_SET_RELATIVE_ADDR,
 	PROBE_SELECT_CARD,
 	PROBE_DONE,
 	PROBE_INVALID
 } probe_action;
 
 static char *probe_action_text[] = {
 	"PROBE_RESET",
 	"PROBE_IDENTIFY",
 	"PROBE_POWER_OFF",
 	"PROBE_GET_HOST_OCR",
 	"PROBE_RESET_BUS",
 	"PROBE_SET_ID_FREQ",
 	"PROBE_SET_CS",
 	"PROBE_GO_IDLE_STATE",
 	"PROBE_SDIO_RESET",
 	"PROBE_SEND_IF_COND",
 	"PROBE_SDIO_INIT",
 	"PROBE_MMC_INIT",
 	"PROBE_SEND_APP_OP_COND",
 	"PROBE_GET_CID",
 	"PROBE_GET_CSD",
 	"PROBE_SEND_RELATIVE_ADDR",
 	"PROBE_MMC_SET_RELATIVE_ADDR",
 	"PROBE_SELECT_CARD",
 	"PROBE_DONE",
 	"PROBE_INVALID"
 };
 
 #define PROBE_SET_ACTION(softc, newaction)	\
 do {									\
 	char **text;							\
 	text = probe_action_text;					\
 	CAM_DEBUG((softc)->periph->path, CAM_DEBUG_PROBE,		\
 	    ("Probe %s to %s\n", text[(softc)->action],			\
 	    text[(newaction)]));					\
 	(softc)->action = (newaction);					\
 } while(0)
 
 static struct xpt_xport_ops mmc_xport_ops = {
 	.alloc_device = mmc_alloc_device,
 	.action = mmc_action,
 	.async = mmc_dev_async,
-	.announce = mmc_announce_periph,
 	.announce_sbuf = mmc_announce_periph_sbuf,
 };
 
 #define MMC_XPT_XPORT(x, X)				\
 	static struct xpt_xport mmc_xport_ ## x = {	\
 		.xport = XPORT_ ## X,			\
 		.name = #x,				\
 		.ops = &mmc_xport_ops,			\
 	};						\
 	CAM_XPT_XPORT(mmc_xport_ ## x);
 
 MMC_XPT_XPORT(mmc, MMCSD);
 
 static struct xpt_proto_ops mmc_proto_ops = {
-	.announce = mmc_proto_announce,
 	.announce_sbuf = mmc_proto_announce_sbuf,
-	.denounce = mmc_proto_denounce,
 	.denounce_sbuf = mmc_proto_denounce_sbuf,
 	.debug_out = mmc_proto_debug_out,
 };
 
 static struct xpt_proto mmc_proto = {
 	.proto = PROTO_MMCSD,
 	.name = "mmcsd",
 	.ops = &mmc_proto_ops,
 };
 CAM_XPT_PROTO(mmc_proto);
 
 typedef struct {
 	probe_action	action;
 	int             restart;
 	uint32_t	host_ocr;
 	uint32_t	flags;
 #define PROBE_FLAG_ACMD_SENT	0x1 /* CMD55 is sent, card expects ACMD */
 #define PROBE_FLAG_HOST_CAN_DO_18V   0x2 /* Host can do 1.8V signaling */
 	uint8_t         acmd41_count; /* how many times ACMD41 has been issued */
 	struct cam_periph *periph;
 } mmcprobe_softc;
 
 /* XPort functions -- an interface to CAM at periph side */
 
 static struct cam_ed *
 mmc_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id)
 {
 	struct cam_ed *device;
 
 	device = xpt_alloc_device(bus, target, lun_id);
 	if (device == NULL)
 		return (NULL);
 
 	device->quirk = NULL;
 	device->mintags = 0;
 	device->maxtags = 0;
 	bzero(&device->inq_data, sizeof(device->inq_data));
 	device->inq_flags = 0;
 	device->queue_flags = 0;
 	device->serial_num = NULL;
 	device->serial_num_len = 0;
 	return (device);
 }
 
 static void
 mmc_dev_async(uint32_t async_code, struct cam_eb *bus, struct cam_et *target,
 	      struct cam_ed *device, void *async_arg)
 {
 
 	/*
 	 * We only need to handle events for real devices.
 	 */
 	if (target->target_id == CAM_TARGET_WILDCARD
             || device->lun_id == CAM_LUN_WILDCARD)
 		return;
 
 	if (async_code == AC_LOST_DEVICE &&
 	    (device->flags & CAM_DEV_UNCONFIGURED) == 0) {
 		device->flags |= CAM_DEV_UNCONFIGURED;
 		xpt_release_device(device);
 	}
 }
 
 /* Taken from nvme_scan_lun, thanks to bsdimp@ */
 static void
 mmc_scan_lun(struct cam_periph *periph, struct cam_path *path,
 	     cam_flags flags, union ccb *request_ccb)
 {
 	struct ccb_pathinq cpi;
 	cam_status status;
 	struct cam_periph *old_periph;
 	int lock;
 
 	CAM_DEBUG(path, CAM_DEBUG_TRACE, ("mmc_scan_lun\n"));
 
 	xpt_path_inq(&cpi, path);
 
 	if (cpi.ccb_h.status != CAM_REQ_CMP) {
 		if (request_ccb != NULL) {
 			request_ccb->ccb_h.status = cpi.ccb_h.status;
 			xpt_done(request_ccb);
 		}
 		return;
 	}
 
 	if (xpt_path_lun_id(path) == CAM_LUN_WILDCARD) {
 		CAM_DEBUG(path, CAM_DEBUG_TRACE, ("mmd_scan_lun ignoring bus\n"));
 		request_ccb->ccb_h.status = CAM_REQ_CMP;	/* XXX signal error ? */
 		xpt_done(request_ccb);
 		return;
 	}
 
 	lock = (xpt_path_owned(path) == 0);
 	if (lock)
 		xpt_path_lock(path);
 
 	if ((old_periph = cam_periph_find(path, "mmcprobe")) != NULL) {
 		if ((old_periph->flags & CAM_PERIPH_INVALID) == 0) {
 //			mmcprobe_softc *softc;
 //			softc = (mmcprobe_softc *)old_periph->softc;
 //                      Not sure if we need request ccb queue for mmc
 //			TAILQ_INSERT_TAIL(&softc->request_ccbs,
 //				&request_ccb->ccb_h, periph_links.tqe);
 //			softc->restart = 1;
                         CAM_DEBUG(path, CAM_DEBUG_INFO,
                                   ("Got scan request, but mmcprobe already exists\n"));
 			request_ccb->ccb_h.status = CAM_REQ_CMP_ERR;
                         xpt_done(request_ccb);
 		} else {
 			request_ccb->ccb_h.status = CAM_REQ_CMP_ERR;
 			xpt_done(request_ccb);
 		}
 	} else {
 		CAM_DEBUG(path, CAM_DEBUG_INFO,
 		    (" Set up the mmcprobe device...\n"));
 
                 status = cam_periph_alloc(mmcprobe_register, NULL,
 					  mmcprobe_cleanup,
 					  mmcprobe_start,
 					  "mmcprobe",
 					  CAM_PERIPH_BIO,
 					  path, NULL, 0,
 					  request_ccb);
                 if (status != CAM_REQ_CMP) {
 			xpt_print(path, "xpt_scan_lun: cam_alloc_periph "
                                   "returned an error, can't continue probe\n");
 		}
 		request_ccb->ccb_h.status = status;
 		xpt_done(request_ccb);
 	}
 
 	if (lock)
 		xpt_path_unlock(path);
 }
 
 static void
 mmc_action(union ccb *start_ccb)
 {
 	CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE,
 		  ("mmc_action! func_code=%x, action %s\n", start_ccb->ccb_h.func_code,
 		   xpt_action_name(start_ccb->ccb_h.func_code)));
 	switch (start_ccb->ccb_h.func_code) {
 	case XPT_SCAN_BUS:
                 /* FALLTHROUGH */
 	case XPT_SCAN_TGT:
                 /* FALLTHROUGH */
 	case XPT_SCAN_LUN:
 		CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_INFO,
 			  ("XPT_SCAN_{BUS,TGT,LUN}\n"));
 		mmc_scan_lun(start_ccb->ccb_h.path->periph,
 			     start_ccb->ccb_h.path, start_ccb->crcn.flags,
 			     start_ccb);
 		break;
 
 	case XPT_DEV_ADVINFO:
 	{
 		mmc_dev_advinfo(start_ccb);
 		break;
 	}
 
 	default:
 		xpt_action_default(start_ccb);
 		break;
 	}
 }
 
 static void
 mmc_dev_advinfo(union ccb *start_ccb)
 {
 	struct cam_ed *device;
 	struct ccb_dev_advinfo *cdai;
 	off_t amt;
 
 	xpt_path_assert(start_ccb->ccb_h.path, MA_OWNED);
 	start_ccb->ccb_h.status = CAM_REQ_INVALID;
 	device = start_ccb->ccb_h.path->device;
 	cdai = &start_ccb->cdai;
 	CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE,
 		  ("%s: request %x\n", __func__, cdai->buftype));
 
         /* We don't support writing any data */
         if (cdai->flags & CDAI_FLAG_STORE)
                 panic("Attempt to store data?!");
 
 	switch(cdai->buftype) {
 	case CDAI_TYPE_SCSI_DEVID:
 		cdai->provsiz = device->device_id_len;
 		if (device->device_id_len == 0)
 			break;
 		amt = MIN(cdai->provsiz, cdai->bufsiz);
 		memcpy(cdai->buf, device->device_id, amt);
 		break;
 	case CDAI_TYPE_SERIAL_NUM:
 		cdai->provsiz = device->serial_num_len;
 		if (device->serial_num_len == 0)
 			break;
 		amt = MIN(cdai->provsiz, cdai->bufsiz);
 		memcpy(cdai->buf, device->serial_num, amt);
 		break;
         case CDAI_TYPE_PHYS_PATH: /* pass(4) wants this */
                 cdai->provsiz = 0;
                 break;
 	case CDAI_TYPE_MMC_PARAMS:
 		cdai->provsiz = sizeof(struct mmc_params);
 		amt = MIN(cdai->provsiz, cdai->bufsiz);
 		memcpy(cdai->buf, &device->mmc_ident_data, amt);
 		break;
 	default:
                 panic("Unknown buftype");
 		return;
 	}
 	start_ccb->ccb_h.status = CAM_REQ_CMP;
 }
 
-static void
-mmc_announce_periph(struct cam_periph *periph)
-{
-	struct	ccb_pathinq cpi;
-	struct	ccb_trans_settings cts;
-	struct	cam_path *path = periph->path;
-
-	cam_periph_assert(periph, MA_OWNED);
-
-	CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("mmc_announce_periph"));
-
-	memset(&cts, 0, sizeof(cts));
-	xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL);
-	cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
-	cts.type = CTS_TYPE_CURRENT_SETTINGS;
-	xpt_action((union ccb*)&cts);
-	if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)
-		return;
-	xpt_path_inq(&cpi, periph->path);
-	CAM_DEBUG(path, CAM_DEBUG_INFO,
-	    ("XPT info: CLK %04d, ...\n", cts.proto_specific.mmc.ios.clock));
-}
-
 static void
 mmc_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb)
 {
 	struct	ccb_pathinq cpi;
 	struct	ccb_trans_settings cts;
 	struct	cam_path *path = periph->path;
 
 	cam_periph_assert(periph, MA_OWNED);
 
 	CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("mmc_announce_periph"));
 
 	memset(&cts, 0, sizeof(cts));
 	xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL);
 	cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 	cts.type = CTS_TYPE_CURRENT_SETTINGS;
 	xpt_action((union ccb*)&cts);
 	if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)
 		return;
 	xpt_path_inq(&cpi, periph->path);
 	CAM_DEBUG(path, CAM_DEBUG_INFO,
 	    ("XPT info: CLK %04d, ...\n", cts.proto_specific.mmc.ios.clock));
 }
 
 void
 mmccam_start_discovery(struct cam_sim *sim)
 {
 	union ccb *ccb;
 	uint32_t pathid;
 
 	pathid = cam_sim_path(sim);
 	ccb = xpt_alloc_ccb();
 
 	/*
 	 * We create a rescan request for BUS:0:0, since the card
 	 * will be at lun 0.
 	 */
 	if (xpt_create_path(&ccb->ccb_h.path, NULL, pathid,
 		/* target */ 0, /* lun */ 0) != CAM_REQ_CMP) {
 		xpt_free_ccb(ccb);
 		return;
 	}
 
 	KASSERT(xpt_path_sim_device(ccb->ccb_h.path) != NULL,
 	    ("%s(%s): device is not initialized on sim's path",
 	    __func__, cam_sim_name(sim)));
 	xpt_rescan(ccb);
 }
 
 /* This func is called per attached device :-( */
 static void
 mmc_print_ident(struct mmc_params *ident_data, struct sbuf *sb)
 {
 	bool space = false;
 
 	sbuf_printf(sb, "Relative addr: %08x\n", ident_data->card_rca);
 	sbuf_printf(sb, "Card features: <");
 	if (ident_data->card_features & CARD_FEATURE_MMC) {
 		sbuf_printf(sb, "MMC");
 		space = true;
 	}
 	if (ident_data->card_features & CARD_FEATURE_MEMORY) {
 		sbuf_printf(sb, "%sMemory", space ? " " : "");
 		space = true;
 	}
 	if (ident_data->card_features & CARD_FEATURE_SDHC) {
 		sbuf_printf(sb, "%sHigh-Capacity", space ? " " : "");
 		space = true;
 	}
 	if (ident_data->card_features & CARD_FEATURE_SD20) {
 		sbuf_printf(sb, "%sSD2.0-Conditions", space ? " " : "");
 		space = true;
 	}
 	if (ident_data->card_features & CARD_FEATURE_SDIO) {
 		sbuf_printf(sb, "%sSDIO", space ? " " : "");
 		space = true;
 	}
 	if (ident_data->card_features & CARD_FEATURE_18V) {
 		sbuf_printf(sb, "%s1.8-Signaling", space ? " " : "");
 	}
 	sbuf_printf(sb, ">\n");
 
 	if (ident_data->card_features & CARD_FEATURE_MEMORY)
 		sbuf_printf(sb, "Card memory OCR: %08x\n",
 		    ident_data->card_ocr);
 
 	if (ident_data->card_features & CARD_FEATURE_SDIO) {
 		sbuf_printf(sb, "Card IO OCR: %08x\n", ident_data->io_ocr);
 		sbuf_printf(sb, "Number of functions: %u\n",
 		    ident_data->sdio_func_count);
 	}
 }
 
-static void
-mmc_proto_announce(struct cam_ed *device)
-{
-	struct sbuf	sb;
-	char		buffer[256];
-
-	sbuf_new(&sb, buffer, sizeof(buffer), SBUF_FIXEDLEN);
-	mmc_print_ident(&device->mmc_ident_data, &sb);
-	sbuf_finish(&sb);
-	sbuf_putbuf(&sb);
-}
-
 static void
 mmc_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb)
 {
 	mmc_print_ident(&device->mmc_ident_data, sb);
 }
 
-static void
-mmc_proto_denounce(struct cam_ed *device)
-{
-
-	mmc_proto_announce(device);
-}
-
 static void
 mmc_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb)
 {
 	mmc_proto_announce_sbuf(device, sb);
 }
 
 static void
 mmc_proto_debug_out(union ccb *ccb)
 {
 	if (ccb->ccb_h.func_code != XPT_MMC_IO)
 		return;
 
 	CAM_DEBUG(ccb->ccb_h.path,
 	    CAM_DEBUG_CDB,("mmc_proto_debug_out\n"));
 }
 
 static periph_init_t probe_periph_init;
 
 static struct periph_driver probe_driver =
 {
 	probe_periph_init, "mmcprobe",
 	TAILQ_HEAD_INITIALIZER(probe_driver.units), /* generation */ 0,
 	CAM_PERIPH_DRV_EARLY
 };
 
 PERIPHDRIVER_DECLARE(mmcprobe, probe_driver);
 
 #define	CARD_ID_FREQUENCY 400000 /* Spec requires 400kHz max during ID phase. */
 
 static void
 probe_periph_init(void)
 {
 }
 
 static cam_status
 mmcprobe_register(struct cam_periph *periph, void *arg)
 {
 	mmcprobe_softc *softc;
 	union ccb *request_ccb;	/* CCB representing the probe request */
 	int status;
 
 	CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("mmcprobe_register\n"));
 
 	request_ccb = (union ccb *)arg;
 	if (request_ccb == NULL) {
 		printf("mmcprobe_register: no probe CCB, "
 		       "can't register device\n");
 		return(CAM_REQ_CMP_ERR);
 	}
 
 	softc = (mmcprobe_softc *)malloc(sizeof(*softc), M_CAMXPT, M_NOWAIT);
 
 	if (softc == NULL) {
 		printf("proberegister: Unable to probe new device. "
 		       "Unable to allocate softc\n");
 		return(CAM_REQ_CMP_ERR);
 	}
 
 	softc->flags = 0;
 	softc->acmd41_count = 0;
 	periph->softc = softc;
 	softc->periph = periph;
 	softc->action = PROBE_INVALID;
         softc->restart = 0;
 	status = cam_periph_acquire(periph);
 
         memset(&periph->path->device->mmc_ident_data, 0, sizeof(struct mmc_params));
 	if (status != 0) {
 		printf("proberegister: cam_periph_acquire failed (status=%d)\n",
 			status);
 		return (CAM_REQ_CMP_ERR);
 	}
 	CAM_DEBUG(periph->path, CAM_DEBUG_PROBE, ("Probe started\n"));
 
 	if (periph->path->device->flags & CAM_DEV_UNCONFIGURED)
 		PROBE_SET_ACTION(softc, PROBE_RESET);
 	else
 		PROBE_SET_ACTION(softc, PROBE_IDENTIFY);
 
 	/* This will kick the ball */
 	xpt_schedule(periph, CAM_PRIORITY_XPT);
 
 	return(CAM_REQ_CMP);
 }
 
 static int
 mmc_highest_voltage(uint32_t ocr)
 {
 	int i;
 
 	for (i = MMC_OCR_MAX_VOLTAGE_SHIFT;
 	    i >= MMC_OCR_MIN_VOLTAGE_SHIFT; i--)
 		if (ocr & (1 << i))
 			return (i);
 	return (-1);
 }
 
 static inline void
 init_standard_ccb(union ccb *ccb, uint32_t cmd)
 {
 	ccb->ccb_h.func_code = cmd;
 	ccb->ccb_h.flags = CAM_DIR_OUT;
 	ccb->ccb_h.retry_count = 0;
 	ccb->ccb_h.timeout = 15 * 1000;
 	ccb->ccb_h.cbfcnp = mmcprobe_done;
 }
 
 static void
 mmcprobe_start(struct cam_periph *periph, union ccb *start_ccb)
 {
 	mmcprobe_softc *softc;
 	struct cam_path *path;
 	struct ccb_mmcio *mmcio;
 	struct ccb_trans_settings_mmc *cts;
 
 	CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("mmcprobe_start\n"));
 	softc = (mmcprobe_softc *)periph->softc;
 	path = start_ccb->ccb_h.path;
 	mmcio = &start_ccb->mmcio;
 	cts = &start_ccb->cts.proto_specific.mmc;
 	struct mmc_params *mmcp = &path->device->mmc_ident_data;
 
 	memset(&mmcio->cmd, 0, sizeof(struct mmc_command));
 
 	if (softc->restart) {
 		softc->restart = 0;
 		if (path->device->flags & CAM_DEV_UNCONFIGURED)
 			softc->action = PROBE_RESET;
 		else
 			softc->action = PROBE_IDENTIFY;
 	}
 
 	/* Here is the place where the identify fun begins */
 	switch (softc->action) {
 	case PROBE_RESET:
 		CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("Start with PROBE_RESET\n"));
 		/* FALLTHROUGH */
 	case PROBE_IDENTIFY:
 		xpt_path_inq(&start_ccb->cpi, periph->path);
 		CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("Start with PROBE_IDENTIFY\n"));
 		init_standard_ccb(start_ccb, XPT_MMC_GET_TRAN_SETTINGS);
 		break;
 
 	case PROBE_POWER_OFF:
 		CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("power off the card\n"));
 		init_standard_ccb(start_ccb, XPT_MMC_SET_TRAN_SETTINGS);
 		cts->ios.power_mode = power_off;
 		cts->ios_valid = MMC_PM;
 		break;
 
 	case PROBE_GET_HOST_OCR:
 		CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("get the host ocr\n"));
 		init_standard_ccb(start_ccb, XPT_MMC_GET_TRAN_SETTINGS);
 		break;
 
 	case PROBE_RESET_BUS:
 	{
 		uint32_t host_caps = cts->host_caps;
 		if (host_caps & MMC_CAP_SIGNALING_180)
 			softc->flags |= PROBE_FLAG_HOST_CAN_DO_18V;
 		uint32_t hv = mmc_highest_voltage(softc->host_ocr);
 		CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("reseting the bus\n"));
 		init_standard_ccb(start_ccb, XPT_MMC_SET_TRAN_SETTINGS);
 		cts->ios.vdd = hv;
 		cts->ios.bus_mode = opendrain;
 		cts->ios.chip_select = cs_dontcare;
 		cts->ios.power_mode = power_up;
 		cts->ios.bus_width = bus_width_1;
 		cts->ios.clock = 0;
 		cts->ios_valid = MMC_VDD | MMC_PM | MMC_BM |
 			MMC_CS | MMC_BW | MMC_CLK;
 		break;
 	}
 
 	case PROBE_SET_ID_FREQ:
 		CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("setting the ID freq\n"));
 		init_standard_ccb(start_ccb, XPT_MMC_SET_TRAN_SETTINGS);
 		cts->ios.power_mode = power_on;
 		cts->ios.clock = CARD_ID_FREQUENCY;
 		cts->ios.timing = bus_timing_normal;
 		cts->ios_valid = MMC_PM | MMC_CLK | MMC_BT;
 		break;
 
 	case PROBE_SET_CS:
 		/* Begin mmc_idle_cards() */
 		init_standard_ccb(start_ccb, XPT_MMC_SET_TRAN_SETTINGS);
 		cts->ios.chip_select = cs_high;
 		cts->ios_valid = MMC_CS;
 		break;
 
 	case PROBE_GO_IDLE_STATE:
 		CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("Send first XPT_MMC_IO\n"));
 		init_standard_ccb(start_ccb, XPT_MMC_IO);
 		mmcio->cmd.opcode = MMC_GO_IDLE_STATE; /* CMD 0 */
 		mmcio->cmd.arg = 0;
 		mmcio->cmd.flags = MMC_RSP_NONE | MMC_CMD_BC;
 		mmcio->cmd.data = NULL;
 		mmcio->stop.opcode = 0;
 
 		/* XXX Reset I/O portion as well */
 		break;
 
 	case PROBE_SDIO_RESET:
 		CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 			  ("Start with PROBE_SDIO_RESET\n"));
 		uint32_t mmc_arg = SD_IO_RW_ADR(SD_IO_CCCR_CTL)
 			| SD_IO_RW_DAT(CCCR_CTL_RES) | SD_IO_RW_WR | SD_IO_RW_RAW;
 		cam_fill_mmcio(&start_ccb->mmcio,
 			       /*retries*/ 0,
 			       /*cbfcnp*/ mmcprobe_done,
 			       /*flags*/ CAM_DIR_NONE,
 			       /*mmc_opcode*/ SD_IO_RW_DIRECT,
 			       /*mmc_arg*/ mmc_arg,
 			       /*mmc_flags*/ MMC_RSP_R5 | MMC_CMD_AC,
 			       /*mmc_data*/ NULL,
 			       /*timeout*/ 1000);
 		break;
 	case PROBE_SEND_IF_COND:
 		CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 			  ("Start with PROBE_SEND_IF_COND\n"));
 		init_standard_ccb(start_ccb, XPT_MMC_IO);
 		mmcio->cmd.opcode = SD_SEND_IF_COND; /* CMD 8 */
 		mmcio->cmd.arg = (1 << 8) + 0xAA;
 		mmcio->cmd.flags = MMC_RSP_R7 | MMC_CMD_BCR;
 		mmcio->stop.opcode = 0;
 		break;
 
 	case PROBE_SDIO_INIT:
 		CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 			  ("Start with PROBE_SDIO_INIT\n"));
 		init_standard_ccb(start_ccb, XPT_MMC_IO);
 		mmcio->cmd.opcode = IO_SEND_OP_COND; /* CMD 5 */
 		mmcio->cmd.arg = mmcp->io_ocr;
 		mmcio->cmd.flags = MMC_RSP_R4;
 		mmcio->stop.opcode = 0;
 		break;
 
 	case PROBE_MMC_INIT:
 		CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 			  ("Start with PROBE_MMC_INIT\n"));
 		init_standard_ccb(start_ccb, XPT_MMC_IO);
 		mmcio->cmd.opcode = MMC_SEND_OP_COND; /* CMD 1 */
 		mmcio->cmd.arg = MMC_OCR_CCS | mmcp->card_ocr; /* CCS + ocr */;
 		mmcio->cmd.flags = MMC_RSP_R3 | MMC_CMD_BCR;
 		mmcio->stop.opcode = 0;
 		break;
 
 	case PROBE_SEND_APP_OP_COND:
 		init_standard_ccb(start_ccb, XPT_MMC_IO);
 		if (softc->flags & PROBE_FLAG_ACMD_SENT) {
 			mmcio->cmd.opcode = ACMD_SD_SEND_OP_COND; /* CMD 41 */
 			/*
 			 * We set CCS bit because we do support SDHC cards.
 			 * XXX: Don't set CCS if no response to CMD8.
 			 */
 			uint32_t cmd_arg = MMC_OCR_CCS | mmcp->card_ocr; /* CCS + ocr */
 			if (softc->acmd41_count < 10 && mmcp->card_ocr != 0 )
 				cmd_arg |= MMC_OCR_S18R;
 			mmcio->cmd.arg = cmd_arg;
 			mmcio->cmd.flags = MMC_RSP_R3 | MMC_CMD_BCR;
 			softc->acmd41_count++;
 		} else {
 			mmcio->cmd.opcode = MMC_APP_CMD; /* CMD 55 */
 			mmcio->cmd.arg = 0; /* rca << 16 */
 			mmcio->cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
 		}
 		mmcio->stop.opcode = 0;
 		break;
 
 	case PROBE_GET_CID: /* XXX move to mmc_da */
 		init_standard_ccb(start_ccb, XPT_MMC_IO);
 		mmcio->cmd.opcode = MMC_ALL_SEND_CID;
 		mmcio->cmd.arg = 0;
 		mmcio->cmd.flags = MMC_RSP_R2 | MMC_CMD_BCR;
 		mmcio->stop.opcode = 0;
 		break;
 	case PROBE_SEND_RELATIVE_ADDR:
 		init_standard_ccb(start_ccb, XPT_MMC_IO);
 		mmcio->cmd.opcode = SD_SEND_RELATIVE_ADDR;
 		mmcio->cmd.arg = 0;
 		mmcio->cmd.flags = MMC_RSP_R6 | MMC_CMD_BCR;
 		mmcio->stop.opcode = 0;
 		break;
 	case PROBE_MMC_SET_RELATIVE_ADDR:
 		init_standard_ccb(start_ccb, XPT_MMC_IO);
 		mmcio->cmd.opcode = MMC_SET_RELATIVE_ADDR;
 		mmcio->cmd.arg = MMC_PROPOSED_RCA << 16;
 		mmcio->cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
 		mmcio->stop.opcode = 0;
 		break;
 	case PROBE_SELECT_CARD:
 		init_standard_ccb(start_ccb, XPT_MMC_IO);
 		mmcio->cmd.opcode = MMC_SELECT_CARD;
 		mmcio->cmd.arg = (uint32_t)path->device->mmc_ident_data.card_rca << 16;
 		mmcio->cmd.flags = MMC_RSP_R1B | MMC_CMD_AC;
 		mmcio->stop.opcode = 0;
 		break;
 	case PROBE_GET_CSD: /* XXX move to mmc_da */
 		init_standard_ccb(start_ccb, XPT_MMC_IO);
 		mmcio->cmd.opcode = MMC_SEND_CSD;
 		mmcio->cmd.arg = (uint32_t)path->device->mmc_ident_data.card_rca << 16;
 		mmcio->cmd.flags = MMC_RSP_R2 | MMC_CMD_BCR;
 		mmcio->stop.opcode = 0;
 		break;
 	case PROBE_DONE:
 		CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("Start with PROBE_DONE\n"));
 		init_standard_ccb(start_ccb, XPT_SET_TRAN_SETTINGS);
 		cts->ios.bus_mode = pushpull;
 		cts->ios_valid = MMC_BM;
 		xpt_action(start_ccb);
 		return;
 		/* NOTREACHED */
 		break;
 	case PROBE_INVALID:
 		break;
 	default:
 		CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("probestart: invalid action state 0x%x\n", softc->action));
 		panic("default: case in mmc_probe_start()");
 	}
 
 	start_ccb->ccb_h.flags |= CAM_DEV_QFREEZE;
 	xpt_action(start_ccb);
 }
 
 static void mmcprobe_cleanup(struct cam_periph *periph)
 {
 	free(periph->softc, M_CAMXPT);
 }
 
 static void
 mmcprobe_done(struct cam_periph *periph, union ccb *done_ccb)
 {
 	mmcprobe_softc *softc;
 	struct cam_path *path;
 
 	int err;
 	struct ccb_mmcio *mmcio;
 	uint32_t  priority;
 
 	CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("mmcprobe_done\n"));
 	softc = (mmcprobe_softc *)periph->softc;
 	path = done_ccb->ccb_h.path;
 	priority = done_ccb->ccb_h.pinfo.priority;
 
 	switch (softc->action) {
 	case PROBE_RESET:
 		/* FALLTHROUGH */
 	case PROBE_IDENTIFY:
 	{
 		CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("done with PROBE_RESET\n"));
 		PROBE_SET_ACTION(softc, PROBE_POWER_OFF);
 		break;
 	}
 	case PROBE_POWER_OFF:
 	{
 		CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("done with PROBE_POWER_OFF\n"));
 		PROBE_SET_ACTION(softc, PROBE_GET_HOST_OCR);
 		break;
 	}
 	case PROBE_GET_HOST_OCR:
 	{
 		struct ccb_trans_settings_mmc *cts;
 		cts = &done_ccb->cts.proto_specific.mmc;
 		softc->host_ocr = cts->host_ocr;
 		CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("done with PROBE_GET_HOST_OCR (Got OCR=%x\n", softc->host_ocr));
 		PROBE_SET_ACTION(softc, PROBE_RESET_BUS);
 		break;
 	}
 	case PROBE_RESET_BUS:
 	{
 		CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("done with PROBE_RESET_BUS\n"));
 		PROBE_SET_ACTION(softc, PROBE_SET_ID_FREQ);
 		break;
 	}
 	case PROBE_SET_ID_FREQ:
 	{
 		CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("done with PROBE_SET_ID_FREQ\n"));
 		PROBE_SET_ACTION(softc, PROBE_SET_CS);
 		break;
 	}
 	case PROBE_SET_CS:
 	{
 		CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("done with PROBE_SET_CS\n"));
 		PROBE_SET_ACTION(softc, PROBE_GO_IDLE_STATE);
 		break;
 	}
 	case PROBE_GO_IDLE_STATE:
 	{
 		CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("done with PROBE_GO_IDLE_STATE\n"));
 		mmcio = &done_ccb->mmcio;
 		err = mmcio->cmd.error;
 
 		if (err != MMC_ERR_NONE) {
 			CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 				  ("GO_IDLE_STATE failed with error %d\n",
 				   err));
 
 			/* There was a device there, but now it's gone... */
 			if ((path->device->flags & CAM_DEV_UNCONFIGURED) == 0) {
 				CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 				  ("Device lost!\n"));
 
 				xpt_async(AC_LOST_DEVICE, path, NULL);
 			}
 			PROBE_SET_ACTION(softc, PROBE_INVALID);
 			break;
 		}
 		path->device->protocol = PROTO_MMCSD;
 		PROBE_SET_ACTION(softc, PROBE_SEND_IF_COND);
 		break;
 	}
 	case PROBE_SEND_IF_COND:
 	{
 		mmcio = &done_ccb->mmcio;
 		err = mmcio->cmd.error;
 		struct mmc_params *mmcp = &path->device->mmc_ident_data;
 
 		if (err != MMC_ERR_NONE || mmcio->cmd.resp[0] != 0x1AA) {
 			CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 				  ("IF_COND: error %d, pattern %08x\n",
 				   err, mmcio->cmd.resp[0]));
 		} else {
 			mmcp->card_features |= CARD_FEATURE_SD20;
 			CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 				  ("SD 2.0 interface conditions: OK\n"));
 		}
                 PROBE_SET_ACTION(softc, PROBE_SDIO_RESET);
 		break;
 	}
 	case PROBE_SDIO_RESET:
 	{
 		mmcio = &done_ccb->mmcio;
 		err = mmcio->cmd.error;
 
 		CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 		    ("SDIO_RESET: error %d, CCCR CTL register: %08x\n",
 		    err, mmcio->cmd.resp[0]));
 		PROBE_SET_ACTION(softc, PROBE_SDIO_INIT);
 		break;
 	}
 	case PROBE_SDIO_INIT:
 	{
 		mmcio = &done_ccb->mmcio;
 		err = mmcio->cmd.error;
 		struct mmc_params *mmcp = &path->device->mmc_ident_data;
 
 		CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 		    ("SDIO_INIT: error %d, %08x %08x %08x %08x\n",
 		    err, mmcio->cmd.resp[0],
 		    mmcio->cmd.resp[1],
 		    mmcio->cmd.resp[2],
 		    mmcio->cmd.resp[3]));
 
 		/*
 		 * Error here means that this card is not SDIO,
 		 * so proceed with memory init as if nothing has happened
 		 */
 		if (err != MMC_ERR_NONE) {
 			PROBE_SET_ACTION(softc, PROBE_SEND_APP_OP_COND);
 			break;
 		}
 		mmcp->card_features |= CARD_FEATURE_SDIO;
 		uint32_t ioifcond = mmcio->cmd.resp[0];
 		uint32_t io_ocr = ioifcond & R4_IO_OCR_MASK;
 
 		mmcp->sdio_func_count = R4_IO_NUM_FUNCTIONS(ioifcond);
 		CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 		    ("SDIO card: %d functions\n", mmcp->sdio_func_count));
 		if (io_ocr == 0) {
 			CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 			  ("SDIO OCR invalid, retrying\n"));
 			break; /* Retry */
 		}
 
 		if (io_ocr != 0 && mmcp->io_ocr == 0) {
 			mmcp->io_ocr = io_ocr;
 			break; /* Retry, this time with non-0 OCR */
 		}
 		CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 		    ("SDIO OCR: %08x\n", mmcp->io_ocr));
 
 		if (ioifcond & R4_IO_MEM_PRESENT) {
 			/* Combo card -- proceed to memory initialization */
 			PROBE_SET_ACTION(softc, PROBE_SEND_APP_OP_COND);
 		} else {
 			/* No memory portion -- get RCA and select card */
 			PROBE_SET_ACTION(softc, PROBE_SEND_RELATIVE_ADDR);
 		}
 		break;
 	}
 	case PROBE_MMC_INIT:
 	{
 		mmcio = &done_ccb->mmcio;
 		err = mmcio->cmd.error;
 		struct mmc_params *mmcp = &path->device->mmc_ident_data;
 
 		if (err != MMC_ERR_NONE) {
 			CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 				  ("MMC_INIT: error %d, resp %08x\n",
 				   err, mmcio->cmd.resp[0]));
 			PROBE_SET_ACTION(softc, PROBE_INVALID);
 			break;
 		}
 		CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 		    ("MMC card, OCR %08x\n", mmcio->cmd.resp[0]));
 
 		if (mmcp->card_ocr == 0) {
 			/* We haven't sent the OCR to the card yet -- do it */
 			mmcp->card_ocr = mmcio->cmd.resp[0];
 			CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 			    ("-> sending OCR to card\n"));
 			break;
 		}
 
 		if (!(mmcio->cmd.resp[0] & MMC_OCR_CARD_BUSY)) {
 			CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 			    ("Card is still powering up\n"));
 			break;
 		}
 
 		mmcp->card_features |= CARD_FEATURE_MMC | CARD_FEATURE_MEMORY;
 		PROBE_SET_ACTION(softc, PROBE_GET_CID);
 		break;
 	}
 	case PROBE_SEND_APP_OP_COND:
 	{
 		mmcio = &done_ccb->mmcio;
 		err = mmcio->cmd.error;
 
 		if (err != MMC_ERR_NONE) {
 			CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 				  ("APP_OP_COND: error %d, resp %08x\n",
 				   err, mmcio->cmd.resp[0]));
 			PROBE_SET_ACTION(softc, PROBE_MMC_INIT);
 			break;
 		}
 
 		if (!(softc->flags & PROBE_FLAG_ACMD_SENT)) {
 			/* Don't change the state */
 			softc->flags |= PROBE_FLAG_ACMD_SENT;
 			break;
 		}
 
 		softc->flags &= ~PROBE_FLAG_ACMD_SENT;
 		if ((mmcio->cmd.resp[0] & MMC_OCR_CARD_BUSY) ||
 		    (mmcio->cmd.arg & MMC_OCR_VOLTAGE) == 0) {
 			struct mmc_params *mmcp = &path->device->mmc_ident_data;
 			CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 			    ("Card OCR: %08x\n",  mmcio->cmd.resp[0]));
 			if (mmcp->card_ocr == 0) {
 				mmcp->card_ocr = mmcio->cmd.resp[0];
 				/* Now when we know OCR that we want -- send it to card */
 				CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 				    ("-> sending OCR to card\n"));
 			} else {
 				/* We already know the OCR and despite of that we
 				 * are processing the answer to ACMD41 -> move on
 				 */
 				PROBE_SET_ACTION(softc, PROBE_GET_CID);
 			}
 			/* Getting an answer to ACMD41 means the card has memory */
 			mmcp->card_features |= CARD_FEATURE_MEMORY;
 
 			/* Standard capacity vs High Capacity memory card */
 			if (mmcio->cmd.resp[0] & MMC_OCR_CCS) {
 				CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 				    ("Card is SDHC\n"));
 				mmcp->card_features |= CARD_FEATURE_SDHC;
 			}
 
 			/* Whether the card supports 1.8V signaling */
 			if (mmcio->cmd.resp[0] & MMC_OCR_S18A) {
 				CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 					  ("Card supports 1.8V signaling\n"));
 				mmcp->card_features |= CARD_FEATURE_18V;
 				if (softc->flags & PROBE_FLAG_HOST_CAN_DO_18V) {
 					CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 						  ("Host supports 1.8V signaling. Switch voltage!\n"));
 					done_ccb->ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
 					done_ccb->ccb_h.flags = CAM_DIR_NONE;
 					done_ccb->ccb_h.retry_count = 0;
 					done_ccb->ccb_h.timeout = 100;
 					done_ccb->ccb_h.cbfcnp = NULL;
 					done_ccb->cts.proto_specific.mmc.ios.vccq = vccq_180;
 					done_ccb->cts.proto_specific.mmc.ios_valid = MMC_VCCQ;
 					xpt_action(done_ccb);
 				}
 			}
 		} else {
 			CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 				  ("Card not ready: %08x\n",  mmcio->cmd.resp[0]));
 			/* Send CMD55+ACMD41 once again  */
 			PROBE_SET_ACTION(softc, PROBE_SEND_APP_OP_COND);
 		}
 
 		break;
 	}
 	case PROBE_GET_CID: /* XXX move to mmc_da */
 	{
 		mmcio = &done_ccb->mmcio;
 		err = mmcio->cmd.error;
 
 		if (err != MMC_ERR_NONE) {
 			CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 				  ("PROBE_GET_CID: error %d\n", err));
 			PROBE_SET_ACTION(softc, PROBE_INVALID);
 			break;
 		}
 
 		struct mmc_params *mmcp = &path->device->mmc_ident_data;
 		memcpy(mmcp->card_cid, mmcio->cmd.resp, 4 * sizeof(uint32_t));
 		CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 		    ("CID %08x%08x%08x%08x\n",
 		      mmcp->card_cid[0],
 		      mmcp->card_cid[1],
 		      mmcp->card_cid[2],
 		      mmcp->card_cid[3]));
 		if (mmcp->card_features & CARD_FEATURE_MMC)
 			PROBE_SET_ACTION(softc, PROBE_MMC_SET_RELATIVE_ADDR);
 		else
 			PROBE_SET_ACTION(softc, PROBE_SEND_RELATIVE_ADDR);
 		break;
 	}
 	case PROBE_SEND_RELATIVE_ADDR: {
 		mmcio = &done_ccb->mmcio;
 		err = mmcio->cmd.error;
 		struct mmc_params *mmcp = &path->device->mmc_ident_data;
 		uint16_t rca = mmcio->cmd.resp[0] >> 16;
 		CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 		    ("Card published RCA: %u\n", rca));
 		path->device->mmc_ident_data.card_rca = rca;
 		if (err != MMC_ERR_NONE) {
 			CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 				  ("PROBE_SEND_RELATIVE_ADDR: error %d\n", err));
 			PROBE_SET_ACTION(softc, PROBE_INVALID);
 			break;
 		}
 
 		/* If memory is present, get CSD, otherwise select card */
 		if (mmcp->card_features & CARD_FEATURE_MEMORY)
 			PROBE_SET_ACTION(softc, PROBE_GET_CSD);
 		else
 			PROBE_SET_ACTION(softc, PROBE_SELECT_CARD);
 		break;
 	}
 	case PROBE_MMC_SET_RELATIVE_ADDR:
 		mmcio = &done_ccb->mmcio;
 		err = mmcio->cmd.error;
 		if (err != MMC_ERR_NONE) {
 			CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 			    ("PROBE_MMC_SET_RELATIVE_ADDR: error %d\n", err));
 			PROBE_SET_ACTION(softc, PROBE_INVALID);
 			break;
 		}
 		path->device->mmc_ident_data.card_rca = MMC_PROPOSED_RCA;
 		PROBE_SET_ACTION(softc, PROBE_GET_CSD);
 		break;
 	case PROBE_GET_CSD: {
 		mmcio = &done_ccb->mmcio;
 		err = mmcio->cmd.error;
 
 		if (err != MMC_ERR_NONE) {
 			CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 				  ("PROBE_GET_CSD: error %d\n", err));
 			PROBE_SET_ACTION(softc, PROBE_INVALID);
 			break;
 		}
 
 		struct mmc_params *mmcp = &path->device->mmc_ident_data;
 		memcpy(mmcp->card_csd, mmcio->cmd.resp, 4 * sizeof(uint32_t));
 		CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 		    ("CSD %08x%08x%08x%08x\n",
 		      mmcp->card_csd[0],
 		      mmcp->card_csd[1],
 		      mmcp->card_csd[2],
 		      mmcp->card_csd[3]));
 		PROBE_SET_ACTION(softc, PROBE_SELECT_CARD);
 		break;
 	}
 	case PROBE_SELECT_CARD: {
 		mmcio = &done_ccb->mmcio;
 		err = mmcio->cmd.error;
 		if (err != MMC_ERR_NONE) {
 			CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 				  ("PROBE_SEND_RELATIVE_ADDR: error %d\n", err));
 			PROBE_SET_ACTION(softc, PROBE_INVALID);
 			break;
 		}
 
 		PROBE_SET_ACTION(softc, PROBE_DONE);
 		break;
 	}
 	default:
 		CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 			  ("mmcprobe_done: invalid action state 0x%x\n", softc->action));
 		panic("default: case in mmc_probe_done()");
 	}
 
 	if (softc->action == PROBE_INVALID &&
 	  (path->device->flags & CAM_DEV_UNCONFIGURED) == 0) {
 		xpt_async(AC_LOST_DEVICE, path, NULL);
 	}
 
 	if (softc->action != PROBE_INVALID)
 		xpt_schedule(periph, priority);
 	/* Drop freeze taken due to CAM_DEV_QFREEZE flag set. */
 	int frozen = cam_release_devq(path, 0, 0, 0, FALSE);
 	CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 	  ("mmcprobe_done: remaining freeze count %d\n", frozen));
 
 	if (softc->action == PROBE_DONE) {
                 /* Notify the system that the device is found! */
 		if (periph->path->device->flags & CAM_DEV_UNCONFIGURED) {
 			path->device->flags &= ~CAM_DEV_UNCONFIGURED;
 			xpt_acquire_device(path->device);
 			done_ccb->ccb_h.func_code = XPT_GDEV_TYPE;
 			xpt_action(done_ccb);
 			xpt_async(AC_FOUND_DEVICE, path, done_ccb);
 		}
 	}
 	xpt_release_ccb(done_ccb);
 	if (softc->action == PROBE_DONE || softc->action == PROBE_INVALID) {
 		cam_periph_invalidate(periph);
 		cam_periph_release_locked(periph);
 	}
 }
 
 void
 mmc_path_inq(struct ccb_pathinq *cpi, const char *hba,
     const struct cam_sim *sim, size_t maxio)
 {
 
 	cpi->version_num = 1;
 	cpi->hba_inquiry = 0;
 	cpi->target_sprt = 0;
 	cpi->hba_misc = PIM_NOBUSRESET | PIM_SEQSCAN;
 	cpi->hba_eng_cnt = 0;
 	cpi->max_target = 0;
 	cpi->max_lun = 0;
 	cpi->initiator_id = 1;
 	cpi->maxio = maxio;
 	strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
 	strncpy(cpi->hba_vid, hba, HBA_IDLEN);
 	strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
 	cpi->unit_number = cam_sim_unit(sim);
 	cpi->bus_id = cam_sim_bus(sim);
 	cpi->protocol = PROTO_MMCSD;
 	cpi->protocol_version = SCSI_REV_0;
 	cpi->transport = XPORT_MMCSD;
 	cpi->transport_version = 1;
 
 	cpi->base_transfer_speed = 100; /* XXX WTF? */
 
 	cpi->ccb_h.status = CAM_REQ_CMP;
 }
diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c
index d2968d1019d1..ad0718bfcf3b 100644
--- a/sys/cam/nvme/nvme_xpt.c
+++ b/sys/cam/nvme/nvme_xpt.c
@@ -1,891 +1,849 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2015 Netflix, 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.
  * 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.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 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.
  *
  * derived from ata_xpt.c: Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/sbuf.h>
 
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
 #include <cam/cam_queue.h>
 #include <cam/cam_periph.h>
 #include <cam/cam_sim.h>
 #include <cam/cam_xpt.h>
 #include <cam/cam_xpt_sim.h>
 #include <cam/cam_xpt_periph.h>
 #include <cam/cam_xpt_internal.h>
 #include <cam/cam_debug.h>
 
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 #include <cam/nvme/nvme_all.h>
 #include <machine/stdarg.h>	/* for xpt_print below */
 #include "opt_cam.h"
 
 struct nvme_quirk_entry {
 	u_int quirks;
 #define CAM_QUIRK_MAXTAGS 1
 	u_int mintags;
 	u_int maxtags;
 };
 
 /* Not even sure why we need this */
 static periph_init_t nvme_probe_periph_init;
 
 static struct periph_driver nvme_probe_driver =
 {
 	nvme_probe_periph_init, "nvme_probe",
 	TAILQ_HEAD_INITIALIZER(nvme_probe_driver.units), /* generation */ 0,
 	CAM_PERIPH_DRV_EARLY
 };
 
 PERIPHDRIVER_DECLARE(nvme_probe, nvme_probe_driver);
 
 typedef enum {
 	NVME_PROBE_IDENTIFY_CD,
 	NVME_PROBE_IDENTIFY_NS,
 	NVME_PROBE_DONE,
 	NVME_PROBE_INVALID
 } nvme_probe_action;
 
 static char *nvme_probe_action_text[] = {
 	"NVME_PROBE_IDENTIFY_CD",
 	"NVME_PROBE_IDENTIFY_NS",
 	"NVME_PROBE_DONE",
 	"NVME_PROBE_INVALID"
 };
 
 #define NVME_PROBE_SET_ACTION(softc, newaction)	\
 do {									\
 	char **text;							\
 	text = nvme_probe_action_text;					\
 	CAM_DEBUG((softc)->periph->path, CAM_DEBUG_PROBE,		\
 	    ("Probe %s to %s\n", text[(softc)->action],			\
 	    text[(newaction)]));					\
 	(softc)->action = (newaction);					\
 } while(0)
 
 typedef enum {
 	NVME_PROBE_NO_ANNOUNCE	= 0x04
 } nvme_probe_flags;
 
 typedef struct {
 	TAILQ_HEAD(, ccb_hdr) request_ccbs;
 	union {
 		struct nvme_controller_data	cd;
 		struct nvme_namespace_data	ns;
 	};
 	nvme_probe_action	action;
 	nvme_probe_flags	flags;
 	int		restart;
 	struct cam_periph *periph;
 } nvme_probe_softc;
 
 static struct nvme_quirk_entry nvme_quirk_table[] =
 {
 	{
 //		{
 //		  T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED,
 //		  /*vendor*/"*", /*product*/"*", /*revision*/"*"
 //		},
 		.quirks = 0, .mintags = 0, .maxtags = 0
 	},
 };
 
 static const int nvme_quirk_table_size =
 	sizeof(nvme_quirk_table) / sizeof(*nvme_quirk_table);
 
 static cam_status	nvme_probe_register(struct cam_periph *periph,
 				      void *arg);
 static void	 nvme_probe_schedule(struct cam_periph *nvme_probe_periph);
 static void	 nvme_probe_start(struct cam_periph *periph, union ccb *start_ccb);
 static void	 nvme_probe_done(struct cam_periph *periph, union ccb *done_ccb);
 static void	 nvme_probe_cleanup(struct cam_periph *periph);
 //static void	 nvme_find_quirk(struct cam_ed *device);
 static void	 nvme_scan_lun(struct cam_periph *periph,
 			       struct cam_path *path, cam_flags flags,
 			       union ccb *ccb);
 static struct cam_ed *
 		 nvme_alloc_device(struct cam_eb *bus, struct cam_et *target,
 				   lun_id_t lun_id);
 static void	 nvme_device_transport(struct cam_path *path);
 static void	 nvme_dev_async(uint32_t async_code,
 				struct cam_eb *bus,
 				struct cam_et *target,
 				struct cam_ed *device,
 				void *async_arg);
 static void	 nvme_action(union ccb *start_ccb);
-static void	 nvme_announce_periph(struct cam_periph *periph);
 static void	 nvme_announce_periph_sbuf(struct cam_periph *periph,
     struct sbuf *sb);
-static void	 nvme_proto_announce(struct cam_ed *device);
 static void	 nvme_proto_announce_sbuf(struct cam_ed *device,
     struct sbuf *sb);
-static void	 nvme_proto_denounce(struct cam_ed *device);
 static void	 nvme_proto_denounce_sbuf(struct cam_ed *device,
     struct sbuf *sb);
 static void	 nvme_proto_debug_out(union ccb *ccb);
 
 static struct xpt_xport_ops nvme_xport_ops = {
 	.alloc_device = nvme_alloc_device,
 	.action = nvme_action,
 	.async = nvme_dev_async,
-	.announce = nvme_announce_periph,
 	.announce_sbuf = nvme_announce_periph_sbuf,
 };
 #define NVME_XPT_XPORT(x, X)			\
 static struct xpt_xport nvme_xport_ ## x = {	\
 	.xport = XPORT_ ## X,			\
 	.name = #x,				\
 	.ops = &nvme_xport_ops,			\
 };						\
 CAM_XPT_XPORT(nvme_xport_ ## x);
 
 NVME_XPT_XPORT(nvme, NVME);
 
 #undef NVME_XPT_XPORT
 
 static struct xpt_proto_ops nvme_proto_ops = {
-	.announce = nvme_proto_announce,
 	.announce_sbuf = nvme_proto_announce_sbuf,
-	.denounce = nvme_proto_denounce,
 	.denounce_sbuf = nvme_proto_denounce_sbuf,
 	.debug_out = nvme_proto_debug_out,
 };
 static struct xpt_proto nvme_proto = {
 	.proto = PROTO_NVME,
 	.name = "nvme",
 	.ops = &nvme_proto_ops,
 };
 CAM_XPT_PROTO(nvme_proto);
 
 static void
 nvme_probe_periph_init(void)
 {
 }
 
 static cam_status
 nvme_probe_register(struct cam_periph *periph, void *arg)
 {
 	union ccb *request_ccb;	/* CCB representing the probe request */
 	nvme_probe_softc *softc;
 
 	request_ccb = (union ccb *)arg;
 	if (request_ccb == NULL) {
 		printf("nvme_probe_register: no probe CCB, "
 		       "can't register device\n");
 		return(CAM_REQ_CMP_ERR);
 	}
 
 	softc = (nvme_probe_softc *)malloc(sizeof(*softc), M_CAMXPT, M_ZERO | M_NOWAIT);
 
 	if (softc == NULL) {
 		printf("nvme_probe_register: Unable to probe new device. "
 		       "Unable to allocate softc\n");
 		return(CAM_REQ_CMP_ERR);
 	}
 	TAILQ_INIT(&softc->request_ccbs);
 	TAILQ_INSERT_TAIL(&softc->request_ccbs, &request_ccb->ccb_h,
 			  periph_links.tqe);
 	softc->flags = 0;
 	periph->softc = softc;
 	softc->periph = periph;
 	softc->action = NVME_PROBE_INVALID;
 	if (cam_periph_acquire(periph) != 0)
 		return (CAM_REQ_CMP_ERR);
 
 	CAM_DEBUG(periph->path, CAM_DEBUG_PROBE, ("Probe started\n"));
 
 //	nvme_device_transport(periph->path);
 	nvme_probe_schedule(periph);
 
 	return(CAM_REQ_CMP);
 }
 
 static void
 nvme_probe_schedule(struct cam_periph *periph)
 {
 	union ccb *ccb;
 	nvme_probe_softc *softc;
 
 	softc = (nvme_probe_softc *)periph->softc;
 	ccb = (union ccb *)TAILQ_FIRST(&softc->request_ccbs);
 
 	NVME_PROBE_SET_ACTION(softc, NVME_PROBE_IDENTIFY_CD);
 
 	if (ccb->crcn.flags & CAM_EXPECT_INQ_CHANGE)
 		softc->flags |= NVME_PROBE_NO_ANNOUNCE;
 	else
 		softc->flags &= ~NVME_PROBE_NO_ANNOUNCE;
 
 	xpt_schedule(periph, CAM_PRIORITY_XPT);
 }
 
 static void
 nvme_probe_start(struct cam_periph *periph, union ccb *start_ccb)
 {
 	struct ccb_nvmeio *nvmeio;
 	nvme_probe_softc *softc;
 	lun_id_t lun;
 
 	CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("nvme_probe_start\n"));
 
 	softc = (nvme_probe_softc *)periph->softc;
 	nvmeio = &start_ccb->nvmeio;
 	lun = xpt_path_lun_id(periph->path);
 
 	if (softc->restart) {
 		softc->restart = 0;
 		NVME_PROBE_SET_ACTION(softc, NVME_PROBE_IDENTIFY_CD);
 	}
 
 	switch (softc->action) {
 	case NVME_PROBE_IDENTIFY_CD:
 		cam_fill_nvmeadmin(nvmeio,
 		    0,			/* retries */
 		    nvme_probe_done,	/* cbfcnp */
 		    CAM_DIR_IN,		/* flags */
 		    (uint8_t *)&softc->cd,	/* data_ptr */
 		    sizeof(softc->cd),		/* dxfer_len */
 		    30 * 1000); /* timeout 30s */
 		nvme_ns_cmd(nvmeio, NVME_OPC_IDENTIFY, 0,
 		    1, 0, 0, 0, 0, 0);
 		break;
 	case NVME_PROBE_IDENTIFY_NS:
 		cam_fill_nvmeadmin(nvmeio,
 		    0,			/* retries */
 		    nvme_probe_done,	/* cbfcnp */
 		    CAM_DIR_IN,		/* flags */
 		    (uint8_t *)&softc->ns,	/* data_ptr */
 		    sizeof(softc->ns),		/* dxfer_len */
 		    30 * 1000); /* timeout 30s */
 		nvme_ns_cmd(nvmeio, NVME_OPC_IDENTIFY, lun,
 		    0, 0, 0, 0, 0, 0);
 		break;
 	default:
 		panic("nvme_probe_start: invalid action state 0x%x\n", softc->action);
 	}
 	start_ccb->ccb_h.flags |= CAM_DEV_QFREEZE;
 	xpt_action(start_ccb);
 }
 
 static void
 nvme_probe_done(struct cam_periph *periph, union ccb *done_ccb)
 {
 	struct nvme_namespace_data *nvme_data;
 	struct nvme_controller_data *nvme_cdata;
 	nvme_probe_softc *softc;
 	struct cam_path *path;
 	struct scsi_vpd_device_id *did;
 	struct scsi_vpd_id_descriptor *idd;
 	uint32_t  priority;
 	int found = 1, e, g, len;
 
 	CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("nvme_probe_done\n"));
 
 	softc = (nvme_probe_softc *)periph->softc;
 	path = done_ccb->ccb_h.path;
 	priority = done_ccb->ccb_h.pinfo.priority;
 
 	if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
 		if (cam_periph_error(done_ccb,
 			0, softc->restart ? (SF_NO_RECOVERY | SF_NO_RETRY) : 0
 		    ) == ERESTART) {
 out:
 			/* Drop freeze taken due to CAM_DEV_QFREEZE flag set. */
 			cam_release_devq(path, 0, 0, 0, FALSE);
 			return;
 		}
 		if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
 			/* Don't wedge the queue */
 			xpt_release_devq(path, /*count*/1, /*run_queue*/TRUE);
 		}
 
 		/*
 		 * If we get to this point, we got an error status back
 		 * from the inquiry and the error status doesn't require
 		 * automatically retrying the command.  Therefore, the
 		 * inquiry failed.  If we had inquiry information before
 		 * for this device, but this latest inquiry command failed,
 		 * the device has probably gone away.  If this device isn't
 		 * already marked unconfigured, notify the peripheral
 		 * drivers that this device is no more.
 		 */
 device_fail:	if ((path->device->flags & CAM_DEV_UNCONFIGURED) == 0)
 			xpt_async(AC_LOST_DEVICE, path, NULL);
 		NVME_PROBE_SET_ACTION(softc, NVME_PROBE_INVALID);
 		found = 0;
 		goto done;
 	}
 	if (softc->restart)
 		goto done;
 	switch (softc->action) {
 	case NVME_PROBE_IDENTIFY_CD:
 		nvme_controller_data_swapbytes(&softc->cd);
 
 		nvme_cdata = path->device->nvme_cdata;
 		if (nvme_cdata == NULL) {
 			nvme_cdata = malloc(sizeof(*nvme_cdata), M_CAMXPT,
 			    M_NOWAIT);
 			if (nvme_cdata == NULL) {
 				xpt_print(path, "Can't allocate memory");
 				goto device_fail;
 			}
 		}
 		bcopy(&softc->cd, nvme_cdata, sizeof(*nvme_cdata));
 		path->device->nvme_cdata = nvme_cdata;
 
 		/* Save/update serial number. */
 		if (path->device->serial_num != NULL) {
 			free(path->device->serial_num, M_CAMXPT);
 			path->device->serial_num = NULL;
 			path->device->serial_num_len = 0;
 		}
 		path->device->serial_num = (uint8_t *)
 		    malloc(NVME_SERIAL_NUMBER_LENGTH + 1, M_CAMXPT, M_NOWAIT);
 		if (path->device->serial_num != NULL) {
 			cam_strvis_flag(path->device->serial_num,
 			    nvme_cdata->sn, sizeof(nvme_cdata->sn),
 			    NVME_SERIAL_NUMBER_LENGTH + 1,
 			    CAM_STRVIS_FLAG_NONASCII_SPC);
 
 			path->device->serial_num_len =
 			    strlen(path->device->serial_num);
 		}
 
 //		nvme_find_quirk(path->device);
 		nvme_device_transport(path);
 		NVME_PROBE_SET_ACTION(softc, NVME_PROBE_IDENTIFY_NS);
 		xpt_release_ccb(done_ccb);
 		xpt_schedule(periph, priority);
 		goto out;
 	case NVME_PROBE_IDENTIFY_NS:
 		nvme_namespace_data_swapbytes(&softc->ns);
 
 		/* Check that the namespace exists. */
 		if (softc->ns.nsze == 0)
 			goto device_fail;
 
 		nvme_data = path->device->nvme_data;
 		if (nvme_data == NULL) {
 			nvme_data = malloc(sizeof(*nvme_data), M_CAMXPT,
 			    M_NOWAIT);
 			if (nvme_data == NULL) {
 				xpt_print(path, "Can't allocate memory");
 				goto device_fail;
 			}
 		}
 		bcopy(&softc->ns, nvme_data, sizeof(*nvme_data));
 		path->device->nvme_data = nvme_data;
 
 		/* Save/update device_id based on NGUID and/or EUI64. */
 		if (path->device->device_id != NULL) {
 			free(path->device->device_id, M_CAMXPT);
 			path->device->device_id = NULL;
 			path->device->device_id_len = 0;
 		}
 		len = 0;
 		for (g = 0; g < sizeof(nvme_data->nguid); g++) {
 			if (nvme_data->nguid[g] != 0)
 				break;
 		}
 		if (g < sizeof(nvme_data->nguid))
 			len += sizeof(struct scsi_vpd_id_descriptor) + 16;
 		for (e = 0; e < sizeof(nvme_data->eui64); e++) {
 			if (nvme_data->eui64[e] != 0)
 				break;
 		}
 		if (e < sizeof(nvme_data->eui64))
 			len += sizeof(struct scsi_vpd_id_descriptor) + 8;
 		if (len > 0) {
 			path->device->device_id = (uint8_t *)
 			    malloc(SVPD_DEVICE_ID_HDR_LEN + len,
 			    M_CAMXPT, M_NOWAIT);
 		}
 		if (path->device->device_id != NULL) {
 			did = (struct scsi_vpd_device_id *)path->device->device_id;
 			did->device = SID_QUAL_LU_CONNECTED | T_DIRECT;
 			did->page_code = SVPD_DEVICE_ID;
 			scsi_ulto2b(len, did->length);
 			idd = (struct scsi_vpd_id_descriptor *)(did + 1);
 			if (g < sizeof(nvme_data->nguid)) {
 				idd->proto_codeset = SVPD_ID_CODESET_BINARY;
 				idd->id_type = SVPD_ID_ASSOC_LUN | SVPD_ID_TYPE_EUI64;
 				idd->length = 16;
 				bcopy(nvme_data->nguid, idd->identifier, 16);
 				idd = (struct scsi_vpd_id_descriptor *)
 				    &idd->identifier[16];
 			}
 			if (e < sizeof(nvme_data->eui64)) {
 				idd->proto_codeset = SVPD_ID_CODESET_BINARY;
 				idd->id_type = SVPD_ID_ASSOC_LUN | SVPD_ID_TYPE_EUI64;
 				idd->length = 8;
 				bcopy(nvme_data->eui64, idd->identifier, 8);
 			}
 			path->device->device_id_len = SVPD_DEVICE_ID_HDR_LEN + len;
 		}
 
 		if (periph->path->device->flags & CAM_DEV_UNCONFIGURED) {
 			path->device->flags &= ~CAM_DEV_UNCONFIGURED;
 			xpt_acquire_device(path->device);
 			done_ccb->ccb_h.func_code = XPT_GDEV_TYPE;
 			xpt_action(done_ccb);
 			xpt_async(AC_FOUND_DEVICE, path, done_ccb);
 		}
 		NVME_PROBE_SET_ACTION(softc, NVME_PROBE_DONE);
 		break;
 	default:
 		panic("nvme_probe_done: invalid action state 0x%x\n", softc->action);
 	}
 done:
 	if (softc->restart) {
 		softc->restart = 0;
 		xpt_release_ccb(done_ccb);
 		nvme_probe_schedule(periph);
 		goto out;
 	}
 	xpt_release_ccb(done_ccb);
 	CAM_DEBUG(periph->path, CAM_DEBUG_PROBE, ("Probe completed\n"));
 	while ((done_ccb = (union ccb *)TAILQ_FIRST(&softc->request_ccbs))) {
 		TAILQ_REMOVE(&softc->request_ccbs,
 		    &done_ccb->ccb_h, periph_links.tqe);
 		done_ccb->ccb_h.status = found ? CAM_REQ_CMP : CAM_REQ_CMP_ERR;
 		xpt_done(done_ccb);
 	}
 	/* Drop freeze taken due to CAM_DEV_QFREEZE flag set. */
 	cam_release_devq(path, 0, 0, 0, FALSE);
 	cam_periph_invalidate(periph);
 	cam_periph_release_locked(periph);
 }
 
 static void
 nvme_probe_cleanup(struct cam_periph *periph)
 {
 
 	free(periph->softc, M_CAMXPT);
 }
 
 #if 0
 /* XXX should be used, don't delete */
 static void
 nvme_find_quirk(struct cam_ed *device)
 {
 	struct nvme_quirk_entry *quirk;
 	caddr_t	match;
 
 	match = cam_quirkmatch((caddr_t)&device->nvme_data,
 			       (caddr_t)nvme_quirk_table,
 			       nvme_quirk_table_size,
 			       sizeof(*nvme_quirk_table), nvme_identify_match);
 
 	if (match == NULL)
 		panic("xpt_find_quirk: device didn't match wildcard entry!!");
 
 	quirk = (struct nvme_quirk_entry *)match;
 	device->quirk = quirk;
 	if (quirk->quirks & CAM_QUIRK_MAXTAGS) {
 		device->mintags = quirk->mintags;
 		device->maxtags = quirk->maxtags;
 	}
 }
 #endif
 
 static void
 nvme_scan_lun(struct cam_periph *periph, struct cam_path *path,
 	     cam_flags flags, union ccb *request_ccb)
 {
 	struct ccb_pathinq cpi;
 	cam_status status;
 	struct cam_periph *old_periph;
 	int lock;
 
 	CAM_DEBUG(path, CAM_DEBUG_TRACE, ("nvme_scan_lun\n"));
 
 	xpt_path_inq(&cpi, path);
 
 	if (cpi.ccb_h.status != CAM_REQ_CMP) {
 		if (request_ccb != NULL) {
 			request_ccb->ccb_h.status = cpi.ccb_h.status;
 			xpt_done(request_ccb);
 		}
 		return;
 	}
 
 	if (xpt_path_lun_id(path) == CAM_LUN_WILDCARD) {
 		CAM_DEBUG(path, CAM_DEBUG_TRACE, ("nvme_scan_lun ignoring bus\n"));
 		request_ccb->ccb_h.status = CAM_REQ_CMP;	/* XXX signal error ? */
 		xpt_done(request_ccb);
 		return;
 	}
 
 	lock = (xpt_path_owned(path) == 0);
 	if (lock)
 		xpt_path_lock(path);
 	if ((old_periph = cam_periph_find(path, "nvme_probe")) != NULL) {
 		if ((old_periph->flags & CAM_PERIPH_INVALID) == 0) {
 			nvme_probe_softc *softc;
 
 			softc = (nvme_probe_softc *)old_periph->softc;
 			TAILQ_INSERT_TAIL(&softc->request_ccbs,
 				&request_ccb->ccb_h, periph_links.tqe);
 			softc->restart = 1;
 			CAM_DEBUG(path, CAM_DEBUG_TRACE,
 			    ("restarting nvme_probe device\n"));
 		} else {
 			request_ccb->ccb_h.status = CAM_REQ_CMP_ERR;
 			CAM_DEBUG(path, CAM_DEBUG_TRACE,
 			    ("Failing to restart nvme_probe device\n"));
 			xpt_done(request_ccb);
 		}
 	} else {
 		CAM_DEBUG(path, CAM_DEBUG_TRACE,
 		    ("Adding nvme_probe device\n"));
 		status = cam_periph_alloc(nvme_probe_register, NULL, nvme_probe_cleanup,
 					  nvme_probe_start, "nvme_probe",
 					  CAM_PERIPH_BIO,
 					  request_ccb->ccb_h.path, NULL, 0,
 					  request_ccb);
 
 		if (status != CAM_REQ_CMP) {
 			xpt_print(path, "xpt_scan_lun: cam_alloc_periph "
 			    "returned an error, can't continue probe\n");
 			request_ccb->ccb_h.status = status;
 			xpt_done(request_ccb);
 		}
 	}
 	if (lock)
 		xpt_path_unlock(path);
 }
 
 static struct cam_ed *
 nvme_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id)
 {
 	struct nvme_quirk_entry *quirk;
 	struct cam_ed *device;
 
 	device = xpt_alloc_device(bus, target, lun_id);
 	if (device == NULL)
 		return (NULL);
 
 	/*
 	 * Take the default quirk entry until we have inquiry
 	 * data from nvme and can determine a better quirk to use.
 	 */
 	quirk = &nvme_quirk_table[nvme_quirk_table_size - 1];
 	device->quirk = (void *)quirk;
 	device->mintags = 0;
 	device->maxtags = 0;
 	device->inq_flags = 0;
 	device->queue_flags = 0;
 	device->device_id = NULL;
 	device->device_id_len = 0;
 	device->serial_num = NULL;
 	device->serial_num_len = 0;
 	return (device);
 }
 
 static void
 nvme_device_transport(struct cam_path *path)
 {
 	struct ccb_pathinq cpi;
 	struct ccb_trans_settings cts;
 	/* XXX get data from nvme namespace and other info ??? */
 
 	/* Get transport information from the SIM */
 	xpt_path_inq(&cpi, path);
 
 	path->device->transport = cpi.transport;
 	path->device->transport_version = cpi.transport_version;
 
 	path->device->protocol = cpi.protocol;
 	path->device->protocol_version = cpi.protocol_version;
 
 	/* Tell the controller what we think */
 	memset(&cts, 0, sizeof(cts));
 	xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 	cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
 	cts.type = CTS_TYPE_CURRENT_SETTINGS;
 	cts.transport = path->device->transport;
 	cts.transport_version = path->device->transport_version;
 	cts.protocol = path->device->protocol;
 	cts.protocol_version = path->device->protocol_version;
 	cts.proto_specific.valid = 0;
 	cts.xport_specific.valid = 0;
 	xpt_action((union ccb *)&cts);
 }
 
 static void
 nvme_dev_advinfo(union ccb *start_ccb)
 {
 	struct cam_ed *device;
 	struct ccb_dev_advinfo *cdai;
 	off_t amt;
 
 	xpt_path_assert(start_ccb->ccb_h.path, MA_OWNED);
 	start_ccb->ccb_h.status = CAM_REQ_INVALID;
 	device = start_ccb->ccb_h.path->device;
 	cdai = &start_ccb->cdai;
 	switch(cdai->buftype) {
 	case CDAI_TYPE_SCSI_DEVID:
 		if (cdai->flags & CDAI_FLAG_STORE)
 			return;
 		cdai->provsiz = device->device_id_len;
 		if (device->device_id_len == 0)
 			break;
 		amt = device->device_id_len;
 		if (cdai->provsiz > cdai->bufsiz)
 			amt = cdai->bufsiz;
 		memcpy(cdai->buf, device->device_id, amt);
 		break;
 	case CDAI_TYPE_SERIAL_NUM:
 		if (cdai->flags & CDAI_FLAG_STORE)
 			return;
 		cdai->provsiz = device->serial_num_len;
 		if (device->serial_num_len == 0)
 			break;
 		amt = device->serial_num_len;
 		if (cdai->provsiz > cdai->bufsiz)
 			amt = cdai->bufsiz;
 		memcpy(cdai->buf, device->serial_num, amt);
 		break;
 	case CDAI_TYPE_PHYS_PATH:
 		if (cdai->flags & CDAI_FLAG_STORE) {
 			if (device->physpath != NULL) {
 				free(device->physpath, M_CAMXPT);
 				device->physpath = NULL;
 				device->physpath_len = 0;
 			}
 			/* Clear existing buffer if zero length */
 			if (cdai->bufsiz == 0)
 				break;
 			device->physpath = malloc(cdai->bufsiz, M_CAMXPT, M_NOWAIT);
 			if (device->physpath == NULL) {
 				start_ccb->ccb_h.status = CAM_REQ_ABORTED;
 				return;
 			}
 			device->physpath_len = cdai->bufsiz;
 			memcpy(device->physpath, cdai->buf, cdai->bufsiz);
 		} else {
 			cdai->provsiz = device->physpath_len;
 			if (device->physpath_len == 0)
 				break;
 			amt = device->physpath_len;
 			if (cdai->provsiz > cdai->bufsiz)
 				amt = cdai->bufsiz;
 			memcpy(cdai->buf, device->physpath, amt);
 		}
 		break;
 	case CDAI_TYPE_NVME_CNTRL:
 		if (cdai->flags & CDAI_FLAG_STORE)
 			return;
 		amt = sizeof(struct nvme_controller_data);
 		cdai->provsiz = amt;
 		if (amt > cdai->bufsiz)
 			amt = cdai->bufsiz;
 		memcpy(cdai->buf, device->nvme_cdata, amt);
 		break;
 	case CDAI_TYPE_NVME_NS:
 		if (cdai->flags & CDAI_FLAG_STORE)
 			return;
 		amt = sizeof(struct nvme_namespace_data);
 		cdai->provsiz = amt;
 		if (amt > cdai->bufsiz)
 			amt = cdai->bufsiz;
 		memcpy(cdai->buf, device->nvme_data, amt);
 		break;
 	default:
 		return;
 	}
 	start_ccb->ccb_h.status = CAM_REQ_CMP;
 
 	if (cdai->flags & CDAI_FLAG_STORE) {
 		xpt_async(AC_ADVINFO_CHANGED, start_ccb->ccb_h.path,
 			  (void *)(uintptr_t)cdai->buftype);
 	}
 }
 
 static void
 nvme_action(union ccb *start_ccb)
 {
 	CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE,
 	    ("nvme_action: func= %#x\n", start_ccb->ccb_h.func_code));
 
 	switch (start_ccb->ccb_h.func_code) {
 	case XPT_SCAN_BUS:
 	case XPT_SCAN_TGT:
 	case XPT_SCAN_LUN:
 		nvme_scan_lun(start_ccb->ccb_h.path->periph,
 			      start_ccb->ccb_h.path, start_ccb->crcn.flags,
 			      start_ccb);
 		break;
 	case XPT_DEV_ADVINFO:
 		nvme_dev_advinfo(start_ccb);
 		break;
 
 	default:
 		xpt_action_default(start_ccb);
 		break;
 	}
 }
 
 /*
  * Handle any per-device event notifications that require action by the XPT.
  */
 static void
 nvme_dev_async(uint32_t async_code, struct cam_eb *bus, struct cam_et *target,
 	      struct cam_ed *device, void *async_arg)
 {
 
 	/*
 	 * We only need to handle events for real devices.
 	 */
 	if (target->target_id == CAM_TARGET_WILDCARD
 	 || device->lun_id == CAM_LUN_WILDCARD)
 		return;
 
 	if (async_code == AC_LOST_DEVICE &&
 	    (device->flags & CAM_DEV_UNCONFIGURED) == 0) {
 		device->flags |= CAM_DEV_UNCONFIGURED;
 		xpt_release_device(device);
 	}
 }
 
 static void
 nvme_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb)
 {
 	struct	ccb_pathinq cpi;
 	struct	ccb_trans_settings cts;
 	struct	cam_path *path = periph->path;
 	struct ccb_trans_settings_nvme	*nvmex;
 
 	cam_periph_assert(periph, MA_OWNED);
 
 	/* Ask the SIM for connection details */
 	memset(&cts, 0, sizeof(cts));
 	xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL);
 	cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 	cts.type = CTS_TYPE_CURRENT_SETTINGS;
 	xpt_action((union ccb*)&cts);
 	if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)
 		return;
 
 	/* Ask the SIM for its base transfer speed */
 	xpt_path_inq(&cpi, periph->path);
 	sbuf_printf(sb, "%s%d: nvme version %d.%d",
 	    periph->periph_name, periph->unit_number,
 	    NVME_MAJOR(cts.protocol_version),
 	    NVME_MINOR(cts.protocol_version));
 	if (cts.transport == XPORT_NVME) {
 		nvmex = &cts.proto_specific.nvme;
 		if (nvmex->valid & CTS_NVME_VALID_LINK)
 			sbuf_printf(sb,
 			    " x%d (max x%d) lanes PCIe Gen%d (max Gen%d) link",
 			    nvmex->lanes, nvmex->max_lanes,
 			    nvmex->speed, nvmex->max_speed);
 	}
 	sbuf_printf(sb, "\n");
 }
 
-static void
-nvme_announce_periph(struct cam_periph *periph)
-{
-	struct sbuf	sb;
-	char		buffer[120];
-
-	sbuf_new(&sb, buffer, sizeof(buffer), SBUF_FIXEDLEN);
-	nvme_announce_periph_sbuf(periph, &sb);
-	sbuf_finish(&sb);
-	sbuf_putbuf(&sb);
-}
-
-static void
-nvme_proto_announce(struct cam_ed *device)
-{
-	struct sbuf	sb;
-	char		buffer[120];
-
-	sbuf_new(&sb, buffer, sizeof(buffer), SBUF_FIXEDLEN);
-	nvme_print_ident(device->nvme_cdata, device->nvme_data, &sb);
-	sbuf_finish(&sb);
-	sbuf_putbuf(&sb);
-}
-
 static void
 nvme_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb)
 {
 	nvme_print_ident(device->nvme_cdata, device->nvme_data, sb);
 }
 
-static void
-nvme_proto_denounce(struct cam_ed *device)
-{
-	struct sbuf	sb;
-	char		buffer[120];
-
-	sbuf_new(&sb, buffer, sizeof(buffer), SBUF_FIXEDLEN);
-	nvme_print_ident_short(device->nvme_cdata, device->nvme_data, &sb);
-	sbuf_finish(&sb);
-	sbuf_putbuf(&sb);
-}
-
 static void
 nvme_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb)
 {
 	nvme_print_ident_short(device->nvme_cdata, device->nvme_data, sb);
 }
 
 static void
 nvme_proto_debug_out(union ccb *ccb)
 {
 	char cdb_str[(sizeof(struct nvme_command) * 3) + 1];
 
 	if (ccb->ccb_h.func_code != XPT_NVME_IO &&
 	    ccb->ccb_h.func_code != XPT_NVME_ADMIN)
 		return;
 
 	CAM_DEBUG(ccb->ccb_h.path,
 	    CAM_DEBUG_CDB,("%s. NCB: %s\n", nvme_op_string(&ccb->nvmeio.cmd,
 		ccb->ccb_h.func_code == XPT_NVME_ADMIN),
 		nvme_cmd_string(&ccb->nvmeio.cmd, cdb_str, sizeof(cdb_str))));
 }
diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c
index 619841720bb3..734668995299 100644
--- a/sys/cam/scsi/scsi_xpt.c
+++ b/sys/cam/scsi/scsi_xpt.c
@@ -1,3248 +1,3173 @@
 /*-
  * Implementation of the SCSI Transport
  *
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.
  * Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
  * 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,
  *    without modification, immediately at the beginning of the file.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
  * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 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.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/md5.h>
 #include <sys/sbuf.h>
 
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
 #include <cam/cam_queue.h>
 #include <cam/cam_periph.h>
 #include <cam/cam_sim.h>
 #include <cam/cam_xpt.h>
 #include <cam/cam_xpt_sim.h>
 #include <cam/cam_xpt_periph.h>
 #include <cam/cam_xpt_internal.h>
 #include <cam/cam_debug.h>
 
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 #include <cam/scsi/scsi_pass.h>
 #include <machine/stdarg.h>	/* for xpt_print below */
 #include "opt_cam.h"
 
 struct scsi_quirk_entry {
 	struct scsi_inquiry_pattern inq_pat;
 	uint8_t quirks;
 #define	CAM_QUIRK_NOLUNS	0x01
 #define	CAM_QUIRK_NOVPDS	0x02
 #define	CAM_QUIRK_HILUNS	0x04
 #define	CAM_QUIRK_NOHILUNS	0x08
 #define	CAM_QUIRK_NORPTLUNS	0x10
 	u_int mintags;
 	u_int maxtags;
 };
 #define SCSI_QUIRK(dev)	((struct scsi_quirk_entry *)((dev)->quirk))
 
 static int cam_srch_hi = 0;
 SYSCTL_INT(_kern_cam, OID_AUTO, cam_srch_hi, CTLFLAG_RWTUN,
     &cam_srch_hi, 0, "Search above LUN 7 for SCSI3 and greater devices");
 
 #define	CAM_SCSI2_MAXLUN	8
 #define	CAM_CAN_GET_SIMPLE_LUN(x, i)				\
 	((((x)->luns[i].lundata[0] & RPL_LUNDATA_ATYP_MASK) ==	\
 	RPL_LUNDATA_ATYP_PERIPH) ||				\
 	(((x)->luns[i].lundata[0] & RPL_LUNDATA_ATYP_MASK) ==	\
 	RPL_LUNDATA_ATYP_FLAT))
 #define	CAM_GET_SIMPLE_LUN(lp, i, lval)					\
 	if (((lp)->luns[(i)].lundata[0] & RPL_LUNDATA_ATYP_MASK) == 	\
 	    RPL_LUNDATA_ATYP_PERIPH) {					\
 		(lval) = (lp)->luns[(i)].lundata[1];			\
 	} else {							\
 		(lval) = (lp)->luns[(i)].lundata[0];			\
 		(lval) &= RPL_LUNDATA_FLAT_LUN_MASK;			\
 		(lval) <<= 8;						\
 		(lval) |=  (lp)->luns[(i)].lundata[1];			\
 	}
 #define	CAM_GET_LUN(lp, i, lval)					\
 	(lval) = scsi_8btou64((lp)->luns[(i)].lundata);			\
 	(lval) = CAM_EXTLUN_BYTE_SWIZZLE(lval);
 
 /*
  * If we're not quirked to search <= the first 8 luns
  * and we are either quirked to search above lun 8,
  * or we're > SCSI-2 and we've enabled hilun searching,
  * or we're > SCSI-2 and the last lun was a success,
  * we can look for luns above lun 8.
  */
 #define	CAN_SRCH_HI_SPARSE(dv)					\
   (((SCSI_QUIRK(dv)->quirks & CAM_QUIRK_NOHILUNS) == 0) 	\
   && ((SCSI_QUIRK(dv)->quirks & CAM_QUIRK_HILUNS)		\
   || (SID_ANSI_REV(&dv->inq_data) > SCSI_REV_2 && cam_srch_hi)))
 
 #define	CAN_SRCH_HI_DENSE(dv)					\
   (((SCSI_QUIRK(dv)->quirks & CAM_QUIRK_NOHILUNS) == 0) 	\
   && ((SCSI_QUIRK(dv)->quirks & CAM_QUIRK_HILUNS)		\
   || (SID_ANSI_REV(&dv->inq_data) > SCSI_REV_2)))
 
 static periph_init_t probe_periph_init;
 
 static struct periph_driver probe_driver =
 {
 	probe_periph_init, "probe",
 	TAILQ_HEAD_INITIALIZER(probe_driver.units), /* generation */ 0,
 	CAM_PERIPH_DRV_EARLY
 };
 
 PERIPHDRIVER_DECLARE(probe, probe_driver);
 
 typedef enum {
 	PROBE_TUR,
 	PROBE_INQUIRY,	/* this counts as DV0 for Basic Domain Validation */
 	PROBE_FULL_INQUIRY,
 	PROBE_REPORT_LUNS,
 	PROBE_MODE_SENSE,
 	PROBE_SUPPORTED_VPD_LIST,
 	PROBE_DEVICE_ID,
 	PROBE_EXTENDED_INQUIRY,
 	PROBE_SERIAL_NUM,
 	PROBE_TUR_FOR_NEGOTIATION,
 	PROBE_INQUIRY_BASIC_DV1,
 	PROBE_INQUIRY_BASIC_DV2,
 	PROBE_DV_EXIT,
 	PROBE_DONE,
 	PROBE_INVALID
 } probe_action;
 
 static char *probe_action_text[] = {
 	"PROBE_TUR",
 	"PROBE_INQUIRY",
 	"PROBE_FULL_INQUIRY",
 	"PROBE_REPORT_LUNS",
 	"PROBE_MODE_SENSE",
 	"PROBE_SUPPORTED_VPD_LIST",
 	"PROBE_DEVICE_ID",
 	"PROBE_EXTENDED_INQUIRY",
 	"PROBE_SERIAL_NUM",
 	"PROBE_TUR_FOR_NEGOTIATION",
 	"PROBE_INQUIRY_BASIC_DV1",
 	"PROBE_INQUIRY_BASIC_DV2",
 	"PROBE_DV_EXIT",
 	"PROBE_DONE",
 	"PROBE_INVALID"
 };
 
 #define PROBE_SET_ACTION(softc, newaction)	\
 do {									\
 	char **text;							\
 	text = probe_action_text;					\
 	CAM_DEBUG((softc)->periph->path, CAM_DEBUG_PROBE,		\
 	    ("Probe %s to %s\n", text[(softc)->action],			\
 	    text[(newaction)]));					\
 	(softc)->action = (newaction);					\
 } while(0)
 
 typedef enum {
 	PROBE_INQUIRY_CKSUM	= 0x01,
 	PROBE_NO_ANNOUNCE	= 0x04,
 	PROBE_EXTLUN		= 0x08
 } probe_flags;
 
 typedef struct {
 	TAILQ_HEAD(, ccb_hdr) request_ccbs;
 	probe_action	action;
 	probe_flags	flags;
 	MD5_CTX		context;
 	uint8_t	digest[16];
 	struct cam_periph *periph;
 } probe_softc;
 
 static const char quantum[] = "QUANTUM";
 static const char sony[] = "SONY";
 static const char west_digital[] = "WDIGTL";
 static const char samsung[] = "SAMSUNG";
 static const char seagate[] = "SEAGATE";
 static const char microp[] = "MICROP";
 
 static struct scsi_quirk_entry scsi_quirk_table[] =
 {
 	{
 		/* Reports QUEUE FULL for temporary resource shortages */
 		{ T_DIRECT, SIP_MEDIA_FIXED, quantum, "XP39100*", "*" },
 		/*quirks*/0, /*mintags*/24, /*maxtags*/32
 	},
 	{
 		/* Reports QUEUE FULL for temporary resource shortages */
 		{ T_DIRECT, SIP_MEDIA_FIXED, quantum, "XP34550*", "*" },
 		/*quirks*/0, /*mintags*/24, /*maxtags*/32
 	},
 	{
 		/* Reports QUEUE FULL for temporary resource shortages */
 		{ T_DIRECT, SIP_MEDIA_FIXED, quantum, "XP32275*", "*" },
 		/*quirks*/0, /*mintags*/24, /*maxtags*/32
 	},
 	{
 		/* Broken tagged queuing drive */
 		{ T_DIRECT, SIP_MEDIA_FIXED, microp, "4421-07*", "*" },
 		/*quirks*/0, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/* Broken tagged queuing drive */
 		{ T_DIRECT, SIP_MEDIA_FIXED, "HP", "C372*", "*" },
 		/*quirks*/0, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/* Broken tagged queuing drive */
 		{ T_DIRECT, SIP_MEDIA_FIXED, microp, "3391*", "x43h" },
 		/*quirks*/0, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/*
 		 * Unfortunately, the Quantum Atlas III has the same
 		 * problem as the Atlas II drives above.
 		 * Reported by: "Johan Granlund" <johan@granlund.nu>
 		 *
 		 * For future reference, the drive with the problem was:
 		 * QUANTUM QM39100TD-SW N1B0
 		 *
 		 * It's possible that Quantum will fix the problem in later
 		 * firmware revisions.  If that happens, the quirk entry
 		 * will need to be made specific to the firmware revisions
 		 * with the problem.
 		 *
 		 */
 		/* Reports QUEUE FULL for temporary resource shortages */
 		{ T_DIRECT, SIP_MEDIA_FIXED, quantum, "QM39100*", "*" },
 		/*quirks*/0, /*mintags*/24, /*maxtags*/32
 	},
 	{
 		/*
 		 * 18 Gig Atlas III, same problem as the 9G version.
 		 * Reported by: Andre Albsmeier
 		 *		<andre.albsmeier@mchp.siemens.de>
 		 *
 		 * For future reference, the drive with the problem was:
 		 * QUANTUM QM318000TD-S N491
 		 */
 		/* Reports QUEUE FULL for temporary resource shortages */
 		{ T_DIRECT, SIP_MEDIA_FIXED, quantum, "QM318000*", "*" },
 		/*quirks*/0, /*mintags*/24, /*maxtags*/32
 	},
 	{
 		/*
 		 * Broken tagged queuing drive
 		 * Reported by: Bret Ford <bford@uop.cs.uop.edu>
 		 *         and: Martin Renters <martin@tdc.on.ca>
 		 */
 		{ T_DIRECT, SIP_MEDIA_FIXED, seagate, "ST410800*", "71*" },
 		/*quirks*/0, /*mintags*/0, /*maxtags*/0
 	},
 		/*
 		 * The Seagate Medalist Pro drives have very poor write
 		 * performance with anything more than 2 tags.
 		 *
 		 * Reported by:  Paul van der Zwan <paulz@trantor.xs4all.nl>
 		 * Drive:  <SEAGATE ST36530N 1444>
 		 *
 		 * Reported by:  Jeremy Lea <reg@shale.csir.co.za>
 		 * Drive:  <SEAGATE ST34520W 1281>
 		 *
 		 * No one has actually reported that the 9G version
 		 * (ST39140*) of the Medalist Pro has the same problem, but
 		 * we're assuming that it does because the 4G and 6.5G
 		 * versions of the drive are broken.
 		 */
 	{
 		{ T_DIRECT, SIP_MEDIA_FIXED, seagate, "ST34520*", "*"},
 		/*quirks*/0, /*mintags*/2, /*maxtags*/2
 	},
 	{
 		{ T_DIRECT, SIP_MEDIA_FIXED, seagate, "ST36530*", "*"},
 		/*quirks*/0, /*mintags*/2, /*maxtags*/2
 	},
 	{
 		{ T_DIRECT, SIP_MEDIA_FIXED, seagate, "ST39140*", "*"},
 		/*quirks*/0, /*mintags*/2, /*maxtags*/2
 	},
 	{
 		/*
 		 * Experiences command timeouts under load with a
 		 * tag count higher than 55.
 		 */
 		{ T_DIRECT, SIP_MEDIA_FIXED, seagate, "ST3146855LW", "*"},
 		/*quirks*/0, /*mintags*/2, /*maxtags*/55
 	},
 	{
 		/*
 		 * Slow when tagged queueing is enabled.  Write performance
 		 * steadily drops off with more and more concurrent
 		 * transactions.  Best sequential write performance with
 		 * tagged queueing turned off and write caching turned on.
 		 *
 		 * PR:  kern/10398
 		 * Submitted by:  Hideaki Okada <hokada@isl.melco.co.jp>
 		 * Drive:  DCAS-34330 w/ "S65A" firmware.
 		 *
 		 * The drive with the problem had the "S65A" firmware
 		 * revision, and has also been reported (by Stephen J.
 		 * Roznowski <sjr@home.net>) for a drive with the "S61A"
 		 * firmware revision.
 		 *
 		 * Although no one has reported problems with the 2 gig
 		 * version of the DCAS drive, the assumption is that it
 		 * has the same problems as the 4 gig version.  Therefore
 		 * this quirk entries disables tagged queueing for all
 		 * DCAS drives.
 		 */
 		{ T_DIRECT, SIP_MEDIA_FIXED, "IBM", "DCAS*", "*" },
 		/*quirks*/0, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/* Broken tagged queuing drive */
 		{ T_DIRECT, SIP_MEDIA_REMOVABLE, "iomega", "jaz*", "*" },
 		/*quirks*/0, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/* Broken tagged queuing drive */
 		{ T_DIRECT, SIP_MEDIA_FIXED, "CONNER", "CFP2107*", "*" },
 		/*quirks*/0, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/* This does not support other than LUN 0 */
 		{ T_DIRECT, SIP_MEDIA_FIXED, "VMware*", "*", "*" },
 		CAM_QUIRK_NOLUNS, /*mintags*/2, /*maxtags*/255
 	},
 	{
 		/*
 		 * Broken tagged queuing drive.
 		 * Submitted by:
 		 * NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp>
 		 * in PR kern/9535
 		 */
 		{ T_DIRECT, SIP_MEDIA_FIXED, samsung, "WN34324U*", "*" },
 		/*quirks*/0, /*mintags*/0, /*maxtags*/0
 	},
         {
 		/*
 		 * Slow when tagged queueing is enabled. (1.5MB/sec versus
 		 * 8MB/sec.)
 		 * Submitted by: Andrew Gallatin <gallatin@cs.duke.edu>
 		 * Best performance with these drives is achieved with
 		 * tagged queueing turned off, and write caching turned on.
 		 */
 		{ T_DIRECT, SIP_MEDIA_FIXED, west_digital, "WDE*", "*" },
 		/*quirks*/0, /*mintags*/0, /*maxtags*/0
         },
         {
 		/*
 		 * Slow when tagged queueing is enabled. (1.5MB/sec versus
 		 * 8MB/sec.)
 		 * Submitted by: Andrew Gallatin <gallatin@cs.duke.edu>
 		 * Best performance with these drives is achieved with
 		 * tagged queueing turned off, and write caching turned on.
 		 */
 		{ T_DIRECT, SIP_MEDIA_FIXED, west_digital, "ENTERPRISE", "*" },
 		/*quirks*/0, /*mintags*/0, /*maxtags*/0
         },
 	{
 		/*
 		 * Doesn't handle queue full condition correctly,
 		 * so we need to limit maxtags to what the device
 		 * can handle instead of determining this automatically.
 		 */
 		{ T_DIRECT, SIP_MEDIA_FIXED, samsung, "WN321010S*", "*" },
 		/*quirks*/0, /*mintags*/2, /*maxtags*/32
 	},
 	{
 		/* Really only one LUN */
 		{ T_ENCLOSURE, SIP_MEDIA_FIXED, "SUN", "SENA", "*" },
 		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/* I can't believe we need a quirk for DPT volumes. */
 		{ T_ANY, SIP_MEDIA_FIXED|SIP_MEDIA_REMOVABLE, "DPT", "*", "*" },
 		CAM_QUIRK_NOLUNS,
 		/*mintags*/0, /*maxtags*/255
 	},
 	{
 		/*
 		 * Many Sony CDROM drives don't like multi-LUN probing.
 		 */
 		{ T_CDROM, SIP_MEDIA_REMOVABLE, sony, "CD-ROM CDU*", "*" },
 		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/*
 		 * This drive doesn't like multiple LUN probing.
 		 * Submitted by:  Parag Patel <parag@cgt.com>
 		 */
 		{ T_WORM, SIP_MEDIA_REMOVABLE, sony, "CD-R   CDU9*", "*" },
 		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		{ T_WORM, SIP_MEDIA_REMOVABLE, "YAMAHA", "CDR100*", "*" },
 		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/*
 		 * The 8200 doesn't like multi-lun probing, and probably
 		 * don't like serial number requests either.
 		 */
 		{
 			T_SEQUENTIAL, SIP_MEDIA_REMOVABLE, "EXABYTE",
 			"EXB-8200*", "*"
 		},
 		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/*
 		 * Let's try the same as above, but for a drive that says
 		 * it's an IPL-6860 but is actually an EXB 8200.
 		 */
 		{
 			T_SEQUENTIAL, SIP_MEDIA_REMOVABLE, "EXABYTE",
 			"IPL-6860*", "*"
 		},
 		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/*
 		 * These Hitachi drives don't like multi-lun probing.
 		 * The PR submitter has a DK319H, but says that the Linux
 		 * kernel has a similar work-around for the DK312 and DK314,
 		 * so all DK31* drives are quirked here.
 		 * PR:            misc/18793
 		 * Submitted by:  Paul Haddad <paul@pth.com>
 		 */
 		{ T_DIRECT, SIP_MEDIA_FIXED, "HITACHI", "DK31*", "*" },
 		CAM_QUIRK_NOLUNS, /*mintags*/2, /*maxtags*/255
 	},
 	{
 		/*
 		 * The Hitachi CJ series with J8A8 firmware apparently has
 		 * problems with tagged commands.
 		 * PR: 23536
 		 * Reported by: amagai@nue.org
 		 */
 		{ T_DIRECT, SIP_MEDIA_FIXED, "HITACHI", "DK32CJ*", "J8A8" },
 		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/*
 		 * These are the large storage arrays.
 		 * Submitted by:  William Carrel <william.carrel@infospace.com>
 		 */
 		{ T_DIRECT, SIP_MEDIA_FIXED, "HITACHI", "OPEN*", "*" },
 		CAM_QUIRK_HILUNS, 2, 1024
 	},
 	{
 		/*
 		 * This old revision of the TDC3600 is also SCSI-1, and
 		 * hangs upon serial number probing.
 		 */
 		{
 			T_SEQUENTIAL, SIP_MEDIA_REMOVABLE, "TANDBERG",
 			" TDC 3600", "U07:"
 		},
 		CAM_QUIRK_NOVPDS, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/*
 		 * Would repond to all LUNs if asked for.
 		 */
 		{
 			T_SEQUENTIAL, SIP_MEDIA_REMOVABLE, "CALIPER",
 			"CP150", "*"
 		},
 		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/*
 		 * Would repond to all LUNs if asked for.
 		 */
 		{
 			T_SEQUENTIAL, SIP_MEDIA_REMOVABLE, "KENNEDY",
 			"96X2*", "*"
 		},
 		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/* Submitted by: Matthew Dodd <winter@jurai.net> */
 		{ T_PROCESSOR, SIP_MEDIA_FIXED, "Cabletrn", "EA41*", "*" },
 		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/* Submitted by: Matthew Dodd <winter@jurai.net> */
 		{ T_PROCESSOR, SIP_MEDIA_FIXED, "CABLETRN", "EA41*", "*" },
 		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/* TeraSolutions special settings for TRC-22 RAID */
 		{ T_DIRECT, SIP_MEDIA_FIXED, "TERASOLU", "TRC-22", "*" },
 		  /*quirks*/0, /*mintags*/55, /*maxtags*/255
 	},
 	{
 		/* Veritas Storage Appliance */
 		{ T_DIRECT, SIP_MEDIA_FIXED, "VERITAS", "*", "*" },
 		  CAM_QUIRK_HILUNS, /*mintags*/2, /*maxtags*/1024
 	},
 	{
 		/*
 		 * Would respond to all LUNs.  Device type and removable
 		 * flag are jumper-selectable.
 		 */
 		{ T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED, "MaxOptix",
 		  "Tahiti 1", "*"
 		},
 		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		/* EasyRAID E5A aka. areca ARC-6010 */
 		{ T_DIRECT, SIP_MEDIA_FIXED, "easyRAID", "*", "*" },
 		  CAM_QUIRK_NOHILUNS, /*mintags*/2, /*maxtags*/255
 	},
 	{
 		{ T_ENCLOSURE, SIP_MEDIA_FIXED, "DP", "BACKPLANE", "*" },
 		CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0
 	},
 	{
 		{ T_DIRECT, SIP_MEDIA_REMOVABLE, "Garmin", "*", "*" },
 		CAM_QUIRK_NORPTLUNS, /*mintags*/2, /*maxtags*/255
 	},
 	{
 		{ T_DIRECT, SIP_MEDIA_REMOVABLE, "Generic", "STORAGE DEVICE*", "120?" },
 		CAM_QUIRK_NORPTLUNS, /*mintags*/2, /*maxtags*/255
 	},
 	{
 		{ T_DIRECT, SIP_MEDIA_REMOVABLE, "Generic", "MassStorageClass", "1533" },
 		CAM_QUIRK_NORPTLUNS, /*mintags*/2, /*maxtags*/255
 	},
 	{
 		/* Default tagged queuing parameters for all devices */
 		{
 		  T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED,
 		  /*vendor*/"*", /*product*/"*", /*revision*/"*"
 		},
 		/*quirks*/0, /*mintags*/2, /*maxtags*/255
 	},
 };
 
 static cam_status	proberegister(struct cam_periph *periph,
 				      void *arg);
 static void	 probeschedule(struct cam_periph *probe_periph);
 static void	 probestart(struct cam_periph *periph, union ccb *start_ccb);
 static void	 proberequestdefaultnegotiation(struct cam_periph *periph);
 static int       proberequestbackoff(struct cam_periph *periph,
 				     struct cam_ed *device);
 static void	 probedone(struct cam_periph *periph, union ccb *done_ccb);
 static void	 probe_purge_old(struct cam_path *path,
 				 struct scsi_report_luns_data *new,
 				 probe_flags flags);
 static void	 probecleanup(struct cam_periph *periph);
 static void	 scsi_find_quirk(struct cam_ed *device);
 static void	 scsi_scan_bus(struct cam_periph *periph, union ccb *ccb);
 static void	 scsi_scan_lun(struct cam_periph *periph,
 			       struct cam_path *path, cam_flags flags,
 			       union ccb *ccb);
 static void	 xptscandone(struct cam_periph *periph, union ccb *done_ccb);
 static struct cam_ed *
 		 scsi_alloc_device(struct cam_eb *bus, struct cam_et *target,
 				   lun_id_t lun_id);
 static void	 scsi_devise_transport(struct cam_path *path);
 static void	 scsi_set_transfer_settings(struct ccb_trans_settings *cts,
 					    struct cam_path *path,
 					    int async_update);
 static void	 scsi_toggle_tags(struct cam_path *path);
 static void	 scsi_dev_async(uint32_t async_code,
 				struct cam_eb *bus,
 				struct cam_et *target,
 				struct cam_ed *device,
 				void *async_arg);
 static void	 scsi_action(union ccb *start_ccb);
-static void	 scsi_announce_periph(struct cam_periph *periph);
 static void	 scsi_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb);
-static void	 scsi_proto_announce(struct cam_ed *device);
 static void	 scsi_proto_announce_sbuf(struct cam_ed *device,
 					  struct sbuf *sb);
-static void	 scsi_proto_denounce(struct cam_ed *device);
 static void	 scsi_proto_denounce_sbuf(struct cam_ed *device,
 					  struct sbuf *sb);
 static void	 scsi_proto_debug_out(union ccb *ccb);
 static void	 _scsi_announce_periph(struct cam_periph *, u_int *, u_int *, struct ccb_trans_settings *);
 
 static struct xpt_xport_ops scsi_xport_ops = {
 	.alloc_device = scsi_alloc_device,
 	.action = scsi_action,
 	.async = scsi_dev_async,
-	.announce = scsi_announce_periph,
 	.announce_sbuf = scsi_announce_periph_sbuf,
 };
 #define SCSI_XPT_XPORT(x, X)			\
 static struct xpt_xport scsi_xport_ ## x = {	\
 	.xport = XPORT_ ## X,			\
 	.name = #x,				\
 	.ops = &scsi_xport_ops,			\
 };						\
 CAM_XPT_XPORT(scsi_xport_ ## x);
 
 SCSI_XPT_XPORT(spi, SPI);
 SCSI_XPT_XPORT(sas, SAS);
 SCSI_XPT_XPORT(fc, FC);
 SCSI_XPT_XPORT(usb, USB);
 SCSI_XPT_XPORT(iscsi, ISCSI);
 SCSI_XPT_XPORT(srp, SRP);
 SCSI_XPT_XPORT(ppb, PPB);
 
 #undef SCSI_XPORT_XPORT
 
 static struct xpt_proto_ops scsi_proto_ops = {
-	.announce = scsi_proto_announce,
 	.announce_sbuf = scsi_proto_announce_sbuf,
-	.denounce = scsi_proto_denounce,
 	.denounce_sbuf = scsi_proto_denounce_sbuf,
 	.debug_out = scsi_proto_debug_out,
 };
 static struct xpt_proto scsi_proto = {
 	.proto = PROTO_SCSI,
 	.name = "scsi",
 	.ops = &scsi_proto_ops,
 };
 CAM_XPT_PROTO(scsi_proto);
 
 static void
 probe_periph_init(void)
 {
 }
 
 static cam_status
 proberegister(struct cam_periph *periph, void *arg)
 {
 	union ccb *request_ccb;	/* CCB representing the probe request */
 	probe_softc *softc;
 
 	request_ccb = (union ccb *)arg;
 	if (request_ccb == NULL) {
 		printf("proberegister: no probe CCB, "
 		       "can't register device\n");
 		return(CAM_REQ_CMP_ERR);
 	}
 
 	softc = (probe_softc *)malloc(sizeof(*softc), M_CAMXPT, M_NOWAIT);
 
 	if (softc == NULL) {
 		printf("proberegister: Unable to probe new device. "
 		       "Unable to allocate softc\n");
 		return(CAM_REQ_CMP_ERR);
 	}
 	TAILQ_INIT(&softc->request_ccbs);
 	TAILQ_INSERT_TAIL(&softc->request_ccbs, &request_ccb->ccb_h,
 			  periph_links.tqe);
 	softc->flags = 0;
 	periph->softc = softc;
 	softc->periph = periph;
 	softc->action = PROBE_INVALID;
 	if (cam_periph_acquire(periph) != 0)
 		return (CAM_REQ_CMP_ERR);
 
 	CAM_DEBUG(periph->path, CAM_DEBUG_PROBE, ("Probe started\n"));
 	scsi_devise_transport(periph->path);
 
 	/*
 	 * Ensure we've waited at least a bus settle
 	 * delay before attempting to probe the device.
 	 * For HBAs that don't do bus resets, this won't make a difference.
 	 */
 	cam_periph_freeze_after_event(periph, &periph->path->bus->last_reset,
 				      scsi_delay);
 	probeschedule(periph);
 	return(CAM_REQ_CMP);
 }
 
 static void
 probeschedule(struct cam_periph *periph)
 {
 	struct ccb_pathinq cpi;
 	union ccb *ccb;
 	probe_softc *softc;
 
 	softc = (probe_softc *)periph->softc;
 	ccb = (union ccb *)TAILQ_FIRST(&softc->request_ccbs);
 
 	xpt_path_inq(&cpi, periph->path);
 
 	/*
 	 * If a device has gone away and another device, or the same one,
 	 * is back in the same place, it should have a unit attention
 	 * condition pending.  It will not report the unit attention in
 	 * response to an inquiry, which may leave invalid transfer
 	 * negotiations in effect.  The TUR will reveal the unit attention
 	 * condition.  Only send the TUR for lun 0, since some devices
 	 * will get confused by commands other than inquiry to non-existent
 	 * luns.  If you think a device has gone away start your scan from
 	 * lun 0.  This will insure that any bogus transfer settings are
 	 * invalidated.
 	 *
 	 * If we haven't seen the device before and the controller supports
 	 * some kind of transfer negotiation, negotiate with the first
 	 * sent command if no bus reset was performed at startup.  This
 	 * ensures that the device is not confused by transfer negotiation
 	 * settings left over by loader or BIOS action.
 	 */
 	if (((ccb->ccb_h.path->device->flags & CAM_DEV_UNCONFIGURED) == 0)
 	 && (ccb->ccb_h.target_lun == 0)) {
 		PROBE_SET_ACTION(softc, PROBE_TUR);
 	} else if ((cpi.hba_inquiry & (PI_WIDE_32|PI_WIDE_16|PI_SDTR_ABLE)) != 0
 	      && (cpi.hba_misc & PIM_NOBUSRESET) != 0) {
 		proberequestdefaultnegotiation(periph);
 		PROBE_SET_ACTION(softc, PROBE_INQUIRY);
 	} else {
 		PROBE_SET_ACTION(softc, PROBE_INQUIRY);
 	}
 
 	if (ccb->crcn.flags & CAM_EXPECT_INQ_CHANGE)
 		softc->flags |= PROBE_NO_ANNOUNCE;
 	else
 		softc->flags &= ~PROBE_NO_ANNOUNCE;
 
 	if (cpi.hba_misc & PIM_EXTLUNS)
 		softc->flags |= PROBE_EXTLUN;
 	else
 		softc->flags &= ~PROBE_EXTLUN;
 
 	xpt_schedule(periph, CAM_PRIORITY_XPT);
 }
 
 static void
 probestart(struct cam_periph *periph, union ccb *start_ccb)
 {
 	/* Probe the device that our peripheral driver points to */
 	struct ccb_scsiio *csio;
 	probe_softc *softc;
 
 	CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("probestart\n"));
 
 	softc = (probe_softc *)periph->softc;
 	csio = &start_ccb->csio;
 again:
 
 	switch (softc->action) {
 	case PROBE_TUR:
 	case PROBE_TUR_FOR_NEGOTIATION:
 	case PROBE_DV_EXIT:
 	{
 		scsi_test_unit_ready(csio,
 				     /*retries*/4,
 				     probedone,
 				     MSG_SIMPLE_Q_TAG,
 				     SSD_FULL_SIZE,
 				     /*timeout*/60000);
 		break;
 	}
 	case PROBE_INQUIRY:
 	case PROBE_FULL_INQUIRY:
 	{
 		u_int inquiry_len;
 		struct scsi_inquiry_data *inq_buf;
 
 		inq_buf = &periph->path->device->inq_data;
 
 		/*
 		 * If the device is currently configured, we calculate an
 		 * MD5 checksum of the inquiry data, and if the serial number
 		 * length is greater than 0, add the serial number data
 		 * into the checksum as well.  Once the inquiry and the
 		 * serial number check finish, we attempt to figure out
 		 * whether we still have the same device.
 		 */
 		if (periph->path->device->flags & CAM_DEV_UNCONFIGURED) {
 			softc->flags &= ~PROBE_INQUIRY_CKSUM;
 		} else if ((softc->flags & PROBE_INQUIRY_CKSUM) == 0) {
 			MD5Init(&softc->context);
 			MD5Update(&softc->context, (unsigned char *)inq_buf,
 				  sizeof(struct scsi_inquiry_data));
 			if (periph->path->device->serial_num_len > 0) {
 				MD5Update(&softc->context,
 					  periph->path->device->serial_num,
 					  periph->path->device->serial_num_len);
 			}
 			MD5Final(softc->digest, &softc->context);
 			softc->flags |= PROBE_INQUIRY_CKSUM;
 		}
 
 		if (softc->action == PROBE_INQUIRY)
 			inquiry_len = SHORT_INQUIRY_LENGTH;
 		else
 			inquiry_len = SID_ADDITIONAL_LENGTH(inq_buf);
 
 		/*
 		 * Some parallel SCSI devices fail to send an
 		 * ignore wide residue message when dealing with
 		 * odd length inquiry requests.  Round up to be
 		 * safe.
 		 */
 		inquiry_len = roundup2(inquiry_len, 2);
 
 		scsi_inquiry(csio,
 			     /*retries*/4,
 			     probedone,
 			     MSG_SIMPLE_Q_TAG,
 			     (uint8_t *)inq_buf,
 			     inquiry_len,
 			     /*evpd*/FALSE,
 			     /*page_code*/0,
 			     SSD_MIN_SIZE,
 			     /*timeout*/60 * 1000);
 		break;
 	}
 	case PROBE_REPORT_LUNS:
 	{
 		void *rp;
 
 		rp = malloc(periph->path->target->rpl_size,
 		    M_CAMXPT, M_NOWAIT | M_ZERO);
 		if (rp == NULL) {
 			struct scsi_inquiry_data *inq_buf;
 			inq_buf = &periph->path->device->inq_data;
 			xpt_print(periph->path,
 			    "Unable to alloc report luns storage\n");
 			if (INQ_DATA_TQ_ENABLED(inq_buf))
 				PROBE_SET_ACTION(softc, PROBE_MODE_SENSE);
 			else
 				PROBE_SET_ACTION(softc,
 				    PROBE_SUPPORTED_VPD_LIST);
 			goto again;
 		}
 		scsi_report_luns(csio, 5, probedone, MSG_SIMPLE_Q_TAG,
 		    RPL_REPORT_DEFAULT, rp, periph->path->target->rpl_size,
 		    SSD_FULL_SIZE, 60000); break;
 		break;
 	}
 	case PROBE_MODE_SENSE:
 	{
 		void  *mode_buf;
 		int    mode_buf_len;
 
 		mode_buf_len = sizeof(struct scsi_mode_header_6)
 			     + sizeof(struct scsi_mode_blk_desc)
 			     + sizeof(struct scsi_control_page);
 		mode_buf = malloc(mode_buf_len, M_CAMXPT, M_NOWAIT);
 		if (mode_buf != NULL) {
 	                scsi_mode_sense(csio,
 					/*retries*/4,
 					probedone,
 					MSG_SIMPLE_Q_TAG,
 					/*dbd*/FALSE,
 					SMS_PAGE_CTRL_CURRENT,
 					SMS_CONTROL_MODE_PAGE,
 					mode_buf,
 					mode_buf_len,
 					SSD_FULL_SIZE,
 					/*timeout*/60000);
 			break;
 		}
 		xpt_print(periph->path, "Unable to mode sense control page - "
 		    "malloc failure\n");
 		PROBE_SET_ACTION(softc, PROBE_SUPPORTED_VPD_LIST);
 	}
 	/* FALLTHROUGH */
 	case PROBE_SUPPORTED_VPD_LIST:
 	{
 		struct scsi_vpd_supported_page_list *vpd_list;
 		struct cam_ed *device;
 
 		vpd_list = NULL;
 		device = periph->path->device;
 
 		if ((SCSI_QUIRK(device)->quirks & CAM_QUIRK_NOVPDS) == 0)
 			vpd_list = malloc(sizeof(*vpd_list), M_CAMXPT,
 			    M_NOWAIT | M_ZERO);
 
 		if (vpd_list != NULL) {
 			scsi_inquiry(csio,
 				     /*retries*/4,
 				     probedone,
 				     MSG_SIMPLE_Q_TAG,
 				     (uint8_t *)vpd_list,
 				     sizeof(*vpd_list),
 				     /*evpd*/TRUE,
 				     SVPD_SUPPORTED_PAGE_LIST,
 				     SSD_MIN_SIZE,
 				     /*timeout*/60 * 1000);
 			break;
 		}
 done:
 		/*
 		 * We'll have to do without, let our probedone
 		 * routine finish up for us.
 		 */
 		start_ccb->csio.data_ptr = NULL;
 		cam_freeze_devq(periph->path);
 		cam_periph_doacquire(periph);
 		probedone(periph, start_ccb);
 		return;
 	}
 	case PROBE_DEVICE_ID:
 	{
 		struct scsi_vpd_device_id *devid;
 
 		devid = NULL;
 		if (scsi_vpd_supported_page(periph, SVPD_DEVICE_ID))
 			devid = malloc(SVPD_DEVICE_ID_MAX_SIZE, M_CAMXPT,
 			    M_NOWAIT | M_ZERO);
 
 		if (devid != NULL) {
 			scsi_inquiry(csio,
 				     /*retries*/4,
 				     probedone,
 				     MSG_SIMPLE_Q_TAG,
 				     (uint8_t *)devid,
 				     SVPD_DEVICE_ID_MAX_SIZE,
 				     /*evpd*/TRUE,
 				     SVPD_DEVICE_ID,
 				     SSD_MIN_SIZE,
 				     /*timeout*/60 * 1000);
 			break;
 		}
 		goto done;
 	}
 	case PROBE_EXTENDED_INQUIRY:
 	{
 		struct scsi_vpd_extended_inquiry_data *ext_inq;
 
 		ext_inq = NULL;
 		if (scsi_vpd_supported_page(periph, SVPD_EXTENDED_INQUIRY_DATA))
 			ext_inq = malloc(sizeof(*ext_inq), M_CAMXPT,
 			    M_NOWAIT | M_ZERO);
 
 		if (ext_inq != NULL) {
 			scsi_inquiry(csio,
 				     /*retries*/4,
 				     probedone,
 				     MSG_SIMPLE_Q_TAG,
 				     (uint8_t *)ext_inq,
 				     sizeof(*ext_inq),
 				     /*evpd*/TRUE,
 				     SVPD_EXTENDED_INQUIRY_DATA,
 				     SSD_MIN_SIZE,
 				     /*timeout*/60 * 1000);
 			break;
 		}
 		/*
 		 * We'll have to do without, let our probedone
 		 * routine finish up for us.
 		 */
 		goto done;
 	}
 	case PROBE_SERIAL_NUM:
 	{
 		struct scsi_vpd_unit_serial_number *serial_buf;
 		struct cam_ed* device;
 
 		serial_buf = NULL;
 		device = periph->path->device;
 		if (device->serial_num != NULL) {
 			free(device->serial_num, M_CAMXPT);
 			device->serial_num = NULL;
 			device->serial_num_len = 0;
 		}
 
 		if (scsi_vpd_supported_page(periph, SVPD_UNIT_SERIAL_NUMBER))
 			serial_buf = (struct scsi_vpd_unit_serial_number *)
 				malloc(sizeof(*serial_buf), M_CAMXPT,
 				    M_NOWAIT|M_ZERO);
 
 		if (serial_buf != NULL) {
 			scsi_inquiry(csio,
 				     /*retries*/4,
 				     probedone,
 				     MSG_SIMPLE_Q_TAG,
 				     (uint8_t *)serial_buf,
 				     sizeof(*serial_buf),
 				     /*evpd*/TRUE,
 				     SVPD_UNIT_SERIAL_NUMBER,
 				     SSD_MIN_SIZE,
 				     /*timeout*/60 * 1000);
 			break;
 		}
 		goto done;
 	}
 	case PROBE_INQUIRY_BASIC_DV1:
 	case PROBE_INQUIRY_BASIC_DV2:
 	{
 		u_int inquiry_len;
 		struct scsi_inquiry_data *inq_buf;
 
 		inq_buf = &periph->path->device->inq_data;
 		inquiry_len = roundup2(SID_ADDITIONAL_LENGTH(inq_buf), 2);
 		inq_buf = malloc(inquiry_len, M_CAMXPT, M_NOWAIT);
 		if (inq_buf == NULL) {
 			xpt_print(periph->path, "malloc failure- skipping Basic"
 			    "Domain Validation\n");
 			PROBE_SET_ACTION(softc, PROBE_DV_EXIT);
 			scsi_test_unit_ready(csio,
 					     /*retries*/4,
 					     probedone,
 					     MSG_SIMPLE_Q_TAG,
 					     SSD_FULL_SIZE,
 					     /*timeout*/60000);
 			break;
 		}
 
 		scsi_inquiry(csio,
 			     /*retries*/4,
 			     probedone,
 			     MSG_SIMPLE_Q_TAG,
 			     (uint8_t *)inq_buf,
 			     inquiry_len,
 			     /*evpd*/FALSE,
 			     /*page_code*/0,
 			     SSD_MIN_SIZE,
 			     /*timeout*/60 * 1000);
 		break;
 	}
 	default:
 		panic("probestart: invalid action state 0x%x\n", softc->action);
 	}
 	start_ccb->ccb_h.flags |= CAM_DEV_QFREEZE;
 	cam_periph_doacquire(periph);
 	xpt_action(start_ccb);
 }
 
 static void
 proberequestdefaultnegotiation(struct cam_periph *periph)
 {
 	struct ccb_trans_settings cts;
 
 	memset(&cts, 0, sizeof(cts));
 	xpt_setup_ccb(&cts.ccb_h, periph->path, CAM_PRIORITY_NONE);
 	cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 	cts.type = CTS_TYPE_USER_SETTINGS;
 	xpt_action((union ccb *)&cts);
 	if (cam_ccb_status((union ccb *)&cts) != CAM_REQ_CMP) {
 		return;
 	}
 	cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
 	cts.type = CTS_TYPE_CURRENT_SETTINGS;
 	xpt_action((union ccb *)&cts);
 }
 
 /*
  * Backoff Negotiation Code- only pertinent for SPI devices.
  */
 static int
 proberequestbackoff(struct cam_periph *periph, struct cam_ed *device)
 {
 	struct ccb_trans_settings cts;
 	struct ccb_trans_settings_spi *spi;
 
 	memset(&cts, 0, sizeof (cts));
 	xpt_setup_ccb(&cts.ccb_h, periph->path, CAM_PRIORITY_NONE);
 	cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 	cts.type = CTS_TYPE_CURRENT_SETTINGS;
 	xpt_action((union ccb *)&cts);
 	if (cam_ccb_status((union ccb *)&cts) != CAM_REQ_CMP) {
 		if (bootverbose) {
 			xpt_print(periph->path,
 			    "failed to get current device settings\n");
 		}
 		return (0);
 	}
 	if (cts.transport != XPORT_SPI) {
 		if (bootverbose) {
 			xpt_print(periph->path, "not SPI transport\n");
 		}
 		return (0);
 	}
 	spi = &cts.xport_specific.spi;
 
 	/*
 	 * We cannot renegotiate sync rate if we don't have one.
 	 */
 	if ((spi->valid & CTS_SPI_VALID_SYNC_RATE) == 0) {
 		if (bootverbose) {
 			xpt_print(periph->path, "no sync rate known\n");
 		}
 		return (0);
 	}
 
 	/*
 	 * We'll assert that we don't have to touch PPR options- the
 	 * SIM will see what we do with period and offset and adjust
 	 * the PPR options as appropriate.
 	 */
 
 	/*
 	 * A sync rate with unknown or zero offset is nonsensical.
 	 * A sync period of zero means Async.
 	 */
 	if ((spi->valid & CTS_SPI_VALID_SYNC_OFFSET) == 0
 	 || spi->sync_offset == 0 || spi->sync_period == 0) {
 		if (bootverbose) {
 			xpt_print(periph->path, "no sync rate available\n");
 		}
 		return (0);
 	}
 
 	if (device->flags & CAM_DEV_DV_HIT_BOTTOM) {
 		CAM_DEBUG(periph->path, CAM_DEBUG_PROBE,
 		    ("hit async: giving up on DV\n"));
 		return (0);
 	}
 
 	/*
 	 * Jump sync_period up by one, but stop at 5MHz and fall back to Async.
 	 * We don't try to remember 'last' settings to see if the SIM actually
 	 * gets into the speed we want to set. We check on the SIM telling
 	 * us that a requested speed is bad, but otherwise don't try and
 	 * check the speed due to the asynchronous and handshake nature
 	 * of speed setting.
 	 */
 	spi->valid = CTS_SPI_VALID_SYNC_RATE | CTS_SPI_VALID_SYNC_OFFSET;
 	for (;;) {
 		spi->sync_period++;
 		if (spi->sync_period >= 0xf) {
 			spi->sync_period = 0;
 			spi->sync_offset = 0;
 			CAM_DEBUG(periph->path, CAM_DEBUG_PROBE,
 			    ("setting to async for DV\n"));
 			/*
 			 * Once we hit async, we don't want to try
 			 * any more settings.
 			 */
 			device->flags |= CAM_DEV_DV_HIT_BOTTOM;
 		} else if (bootverbose) {
 			CAM_DEBUG(periph->path, CAM_DEBUG_PROBE,
 			    ("DV: period 0x%x\n", spi->sync_period));
 			printf("setting period to 0x%x\n", spi->sync_period);
 		}
 		cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
 		cts.type = CTS_TYPE_CURRENT_SETTINGS;
 		xpt_action((union ccb *)&cts);
 		if (cam_ccb_status((union ccb *)&cts) != CAM_REQ_CMP) {
 			break;
 		}
 		CAM_DEBUG(periph->path, CAM_DEBUG_PROBE,
 		    ("DV: failed to set period 0x%x\n", spi->sync_period));
 		if (spi->sync_period == 0) {
 			return (0);
 		}
 	}
 	return (1);
 }
 
 #define CCB_COMPLETED_OK(ccb) (((ccb).status & CAM_STATUS_MASK) == CAM_REQ_CMP)
 
 static void
 probedone(struct cam_periph *periph, union ccb *done_ccb)
 {
 	probe_softc *softc;
 	struct cam_path *path;
 	struct scsi_inquiry_data *inq_buf;
 	uint32_t  priority;
 
 	CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("probedone\n"));
 
 	softc = (probe_softc *)periph->softc;
 	path = done_ccb->ccb_h.path;
 	priority = done_ccb->ccb_h.pinfo.priority;
 	cam_periph_assert(periph, MA_OWNED);
 
 	switch (softc->action) {
 	case PROBE_TUR:
 	{
 		if (cam_ccb_status(done_ccb) != CAM_REQ_CMP) {
 			if (cam_periph_error(done_ccb, 0, SF_NO_PRINT) ==
 			    ERESTART) {
 outr:
 				/* Drop freeze taken due to CAM_DEV_QFREEZE */
 				cam_release_devq(path, 0, 0, 0, FALSE);
 				return;
 			}
 			else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0)
 				/* Don't wedge the queue */
 				xpt_release_devq(done_ccb->ccb_h.path,
 						 /*count*/1,
 						 /*run_queue*/TRUE);
 		}
 		PROBE_SET_ACTION(softc, PROBE_INQUIRY);
 		xpt_release_ccb(done_ccb);
 		xpt_schedule(periph, priority);
 out:
 		/* Drop freeze taken due to CAM_DEV_QFREEZE and release. */
 		cam_release_devq(path, 0, 0, 0, FALSE);
 		cam_periph_release_locked(periph);
 		return;
 	}
 	case PROBE_INQUIRY:
 	case PROBE_FULL_INQUIRY:
 	{
 		if (cam_ccb_status(done_ccb) == CAM_REQ_CMP) {
 			uint8_t periph_qual;
 
 			path->device->flags |= CAM_DEV_INQUIRY_DATA_VALID;
 			scsi_find_quirk(path->device);
 			inq_buf = &path->device->inq_data;
 
 			periph_qual = SID_QUAL(inq_buf);
 
 			if (periph_qual == SID_QUAL_LU_CONNECTED ||
 			    periph_qual == SID_QUAL_LU_OFFLINE) {
 				/*
 				 * We conservatively request only
 				 * SHORT_INQUIRY_LEN bytes of inquiry
 				 * information during our first try
 				 * at sending an INQUIRY. If the device
 				 * has more information to give,
 				 * perform a second request specifying
 				 * the amount of information the device
 				 * is willing to give.
 				 */
 				if (softc->action == PROBE_INQUIRY
 				    && SID_ADDITIONAL_LENGTH(inq_buf)
 				    > SHORT_INQUIRY_LENGTH) {
 					PROBE_SET_ACTION(softc, PROBE_FULL_INQUIRY);
 					xpt_release_ccb(done_ccb);
 					xpt_schedule(periph, priority);
 					goto out;
 				}
 
 				scsi_devise_transport(path);
 
 				if (path->device->lun_id == 0 &&
 				    SID_ANSI_REV(inq_buf) > SCSI_REV_SPC2 &&
 				    (SCSI_QUIRK(path->device)->quirks &
 				     CAM_QUIRK_NORPTLUNS) == 0) {
 					PROBE_SET_ACTION(softc,
 					    PROBE_REPORT_LUNS);
 					/*
 					 * Start with room for *one* lun.
 					 */
 					periph->path->target->rpl_size = 16;
 				} else if (INQ_DATA_TQ_ENABLED(inq_buf))
 					PROBE_SET_ACTION(softc,
 					    PROBE_MODE_SENSE);
 				else
 					PROBE_SET_ACTION(softc,
 					    PROBE_SUPPORTED_VPD_LIST);
 
 				if (path->device->flags & CAM_DEV_UNCONFIGURED) {
 					path->device->flags &= ~CAM_DEV_UNCONFIGURED;
 					xpt_acquire_device(path->device);
 				}
 				xpt_release_ccb(done_ccb);
 				xpt_schedule(periph, priority);
 				goto out;
 			} else if (path->device->lun_id == 0 &&
 			    SID_ANSI_REV(inq_buf) >= SCSI_REV_SPC2 &&
 			    (SCSI_QUIRK(path->device)->quirks &
 			     CAM_QUIRK_NORPTLUNS) == 0) {
 				PROBE_SET_ACTION(softc, PROBE_REPORT_LUNS);
 				periph->path->target->rpl_size = 16;
 				xpt_release_ccb(done_ccb);
 				xpt_schedule(periph, priority);
 				goto out;
 			}
 		} else if (cam_periph_error(done_ccb, 0,
 					    done_ccb->ccb_h.target_lun > 0
 					    ? SF_RETRY_UA|SF_QUIET_IR
 					    : SF_RETRY_UA) == ERESTART) {
 			goto outr;
 		} else {
 			if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
 				/* Don't wedge the queue */
 				xpt_release_devq(done_ccb->ccb_h.path,
 				    /*count*/1, /*run_queue*/TRUE);
 			}
 			path->device->flags &= ~CAM_DEV_INQUIRY_DATA_VALID;
 		}
 		/*
 		 * If we get to this point, we got an error status back
 		 * from the inquiry and the error status doesn't require
 		 * automatically retrying the command.  Therefore, the
 		 * inquiry failed.  If we had inquiry information before
 		 * for this device, but this latest inquiry command failed,
 		 * the device has probably gone away.  If this device isn't
 		 * already marked unconfigured, notify the peripheral
 		 * drivers that this device is no more.
 		 */
 		if ((path->device->flags & CAM_DEV_UNCONFIGURED) == 0)
 			/* Send the async notification. */
 			xpt_async(AC_LOST_DEVICE, path, NULL);
 		PROBE_SET_ACTION(softc, PROBE_INVALID);
 
 		xpt_release_ccb(done_ccb);
 		break;
 	}
 	case PROBE_REPORT_LUNS:
 	{
 		struct ccb_scsiio *csio;
 		struct scsi_report_luns_data *lp;
 		u_int nlun, maxlun;
 
 		csio = &done_ccb->csio;
 
 		lp = (struct scsi_report_luns_data *)csio->data_ptr;
 		nlun = scsi_4btoul(lp->length) / 8;
 		maxlun = (csio->dxfer_len / 8) - 1;
 
 		if (cam_ccb_status(done_ccb) != CAM_REQ_CMP) {
 			if (cam_periph_error(done_ccb, 0,
 				done_ccb->ccb_h.target_lun > 0 ?
 				SF_RETRY_UA|SF_QUIET_IR : SF_RETRY_UA) ==
 			    ERESTART) {
 				goto outr;
 			}
 			if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
 				xpt_release_devq(done_ccb->ccb_h.path, 1,
 				    TRUE);
 			}
 			free(lp, M_CAMXPT);
 			lp = NULL;
 		} else if (nlun > maxlun) {
 			/*
 			 * Reallocate and retry to cover all luns
 			 */
 			CAM_DEBUG(path, CAM_DEBUG_PROBE,
 			    ("Probe: reallocating REPORT_LUNS for %u luns\n",
 			     nlun));
 			free(lp, M_CAMXPT);
 			path->target->rpl_size = (nlun << 3) + 8;
 			xpt_release_ccb(done_ccb);
 			xpt_schedule(periph, priority);
 			goto out;
 		} else if (nlun == 0) {
 			/*
 			 * If there don't appear to be any luns, bail.
 			 */
 			free(lp, M_CAMXPT);
 			lp = NULL;
 		} else {
 			lun_id_t lun;
 			int idx;
 
 			CAM_DEBUG(path, CAM_DEBUG_PROBE,
 			   ("Probe: %u lun(s) reported\n", nlun));
 
 			CAM_GET_LUN(lp, 0, lun);
 			/*
 			 * If the first lun is not lun 0, then either there
 			 * is no lun 0 in the list, or the list is unsorted.
 			 */
 			if (lun != 0) {
 				for (idx = 0; idx < nlun; idx++) {
 					CAM_GET_LUN(lp, idx, lun);
 					if (lun == 0) {
 						break;
 					}
 				}
 				if (idx != nlun) {
 					uint8_t tlun[8];
 					memcpy(tlun,
 					    lp->luns[0].lundata, 8);
 					memcpy(lp->luns[0].lundata,
 					    lp->luns[idx].lundata, 8);
 					memcpy(lp->luns[idx].lundata,
 					    tlun, 8);
 					CAM_DEBUG(path, CAM_DEBUG_PROBE,
 					    ("lun 0 in position %u\n", idx));
 				}
 			}
 			/*
 			 * If we have an old lun list, We can either
 			 * retest luns that appear to have been dropped,
 			 * or just nuke them.  We'll opt for the latter.
 			 * This function will also install the new list
 			 * in the target structure.
 			 */
 			probe_purge_old(path, lp, softc->flags);
 			lp = NULL;
 		}
 		/* The processing above should either exit via a `goto
 		 * out` or leave the `lp` variable `NULL` and (if
 		 * applicable) `free()` the storage to which it had
 		 * pointed. Assert here that is the case.
 		 */
 		KASSERT(lp == NULL, ("%s: lp is not NULL", __func__));
 		inq_buf = &path->device->inq_data;
 		if (path->device->flags & CAM_DEV_INQUIRY_DATA_VALID &&
 		    (SID_QUAL(inq_buf) == SID_QUAL_LU_CONNECTED ||
 		    SID_QUAL(inq_buf) == SID_QUAL_LU_OFFLINE)) {
 			if (INQ_DATA_TQ_ENABLED(inq_buf))
 				PROBE_SET_ACTION(softc, PROBE_MODE_SENSE);
 			else
 				PROBE_SET_ACTION(softc,
 				    PROBE_SUPPORTED_VPD_LIST);
 			xpt_release_ccb(done_ccb);
 			xpt_schedule(periph, priority);
 			goto out;
 		}
 		PROBE_SET_ACTION(softc, PROBE_INVALID);
 		xpt_release_ccb(done_ccb);
 		break;
 	}
 	case PROBE_MODE_SENSE:
 	{
 		struct ccb_scsiio *csio;
 		struct scsi_mode_header_6 *mode_hdr;
 
 		csio = &done_ccb->csio;
 		mode_hdr = (struct scsi_mode_header_6 *)csio->data_ptr;
 		if (cam_ccb_status(done_ccb) == CAM_REQ_CMP) {
 			struct scsi_control_page *page;
 			uint8_t *offset;
 
 			offset = ((uint8_t *)&mode_hdr[1])
 			    + mode_hdr->blk_desc_len;
 			page = (struct scsi_control_page *)offset;
 			path->device->queue_flags = page->queue_flags;
 		} else if (cam_periph_error(done_ccb, 0,
 			SF_RETRY_UA|SF_NO_PRINT) == ERESTART) {
 			goto outr;
 		} else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
 			/* Don't wedge the queue */
 			xpt_release_devq(done_ccb->ccb_h.path,
 					 /*count*/1, /*run_queue*/TRUE);
 		}
 		xpt_release_ccb(done_ccb);
 		free(mode_hdr, M_CAMXPT);
 		PROBE_SET_ACTION(softc, PROBE_SUPPORTED_VPD_LIST);
 		xpt_schedule(periph, priority);
 		goto out;
 	}
 	case PROBE_SUPPORTED_VPD_LIST:
 	{
 		struct ccb_scsiio *csio;
 		struct scsi_vpd_supported_page_list *page_list;
 
 		csio = &done_ccb->csio;
 		page_list =
 		    (struct scsi_vpd_supported_page_list *)csio->data_ptr;
 
 		if (path->device->supported_vpds != NULL) {
 			free(path->device->supported_vpds, M_CAMXPT);
 			path->device->supported_vpds = NULL;
 			path->device->supported_vpds_len = 0;
 		}
 
 		if (page_list == NULL) {
 			/*
 			 * Don't process the command as it was never sent
 			 */
 		} else if (CCB_COMPLETED_OK(csio->ccb_h)) {
 			/* Got vpd list */
 			path->device->supported_vpds_len = page_list->length +
 			    SVPD_SUPPORTED_PAGES_HDR_LEN;
 			path->device->supported_vpds = (uint8_t *)page_list;
 			xpt_release_ccb(done_ccb);
 			PROBE_SET_ACTION(softc, PROBE_DEVICE_ID);
 			xpt_schedule(periph, priority);
 			goto out;
 		} else if (cam_periph_error(done_ccb, 0,
 			SF_RETRY_UA|SF_NO_PRINT) == ERESTART) {
 			goto outr;
 		} else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
 			/* Don't wedge the queue */
 			xpt_release_devq(done_ccb->ccb_h.path, /*count*/1,
 					 /*run_queue*/TRUE);
 		}
 
 		if (page_list)
 			free(page_list, M_CAMXPT);
 		/* No VPDs available, skip to device check. */
 		csio->data_ptr = NULL;
 		goto probe_device_check;
 	}
 	case PROBE_DEVICE_ID:
 	{
 		struct scsi_vpd_device_id *devid;
 		struct ccb_scsiio *csio;
 		uint32_t length = 0;
 
 		csio = &done_ccb->csio;
 		devid = (struct scsi_vpd_device_id *)csio->data_ptr;
 
 		/* Clean up from previous instance of this device */
 		if (path->device->device_id != NULL) {
 			path->device->device_id_len = 0;
 			free(path->device->device_id, M_CAMXPT);
 			path->device->device_id = NULL;
 		}
 
 		if (devid == NULL) {
 			/* Don't process the command as it was never sent */
 		} else if (CCB_COMPLETED_OK(csio->ccb_h)) {
 			length = scsi_2btoul(devid->length);
 			if (length != 0) {
 				/*
 				 * NB: device_id_len is actual response
 				 * size, not buffer size.
 				 */
 				path->device->device_id_len = length +
 				    SVPD_DEVICE_ID_HDR_LEN;
 				path->device->device_id = (uint8_t *)devid;
 			}
 		} else if (cam_periph_error(done_ccb, 0,
 			SF_RETRY_UA) == ERESTART) {
 			goto outr;
 		} else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
 			/* Don't wedge the queue */
 			xpt_release_devq(done_ccb->ccb_h.path, /*count*/1,
 					 /*run_queue*/TRUE);
 		}
 
 		/* Free the device id space if we don't use it */
 		if (devid && length == 0)
 			free(devid, M_CAMXPT);
 		xpt_release_ccb(done_ccb);
 		PROBE_SET_ACTION(softc, PROBE_EXTENDED_INQUIRY);
 		xpt_schedule(periph, priority);
 		goto out;
 	}
 	case PROBE_EXTENDED_INQUIRY: {
 		struct scsi_vpd_extended_inquiry_data *ext_inq;
 		struct ccb_scsiio *csio;
 		int32_t length = 0;
 
 		csio = &done_ccb->csio;
 		ext_inq = (struct scsi_vpd_extended_inquiry_data *)
 		    csio->data_ptr;
 		if (path->device->ext_inq != NULL) {
 			path->device->ext_inq_len = 0;
 			free(path->device->ext_inq, M_CAMXPT);
 			path->device->ext_inq = NULL;
 		}
 
 		if (ext_inq == NULL) {
 			/* Don't process the command as it was never sent */
 		} else if (CCB_COMPLETED_OK(csio->ccb_h)) {
 			length = scsi_2btoul(ext_inq->page_length) +
 			    __offsetof(struct scsi_vpd_extended_inquiry_data,
 			    flags1);
 			length = min(length, sizeof(*ext_inq));
 			length -= csio->resid;
 			if (length > 0) {
 				path->device->ext_inq_len = length;
 				path->device->ext_inq = (uint8_t *)ext_inq;
 			}
 		} else if (cam_periph_error(done_ccb, 0, SF_RETRY_UA) ==
 		    ERESTART) {
 			goto outr;
 		} else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
 			/* Don't wedge the queue */
 			xpt_release_devq(done_ccb->ccb_h.path, /*count*/1,
 					 /*run_queue*/TRUE);
 		}
 
 		/* Free the device id space if we don't use it */
 		if (ext_inq && length <= 0)
 			free(ext_inq, M_CAMXPT);
 		xpt_release_ccb(done_ccb);
 		PROBE_SET_ACTION(softc, PROBE_SERIAL_NUM);
 		xpt_schedule(periph, priority);
 		goto out;
 	}
 
 probe_device_check:
 	case PROBE_SERIAL_NUM:
 	{
 		struct ccb_scsiio *csio;
 		struct scsi_vpd_unit_serial_number *serial_buf;
 		uint32_t  priority;
 		int changed;
 		int have_serialnum;
 
 		changed = 1;
 		have_serialnum = 0;
 		csio = &done_ccb->csio;
 		priority = done_ccb->ccb_h.pinfo.priority;
 		serial_buf =
 		    (struct scsi_vpd_unit_serial_number *)csio->data_ptr;
 
 		if (serial_buf == NULL) {
 			/*
 			 * Don't process the command as it was never sent
 			 */
 		} else if (cam_ccb_status(done_ccb) == CAM_REQ_CMP
 			&& (serial_buf->length > 0)) {
 			have_serialnum = 1;
 			path->device->serial_num =
 				(uint8_t *)malloc((serial_buf->length + 1),
 						   M_CAMXPT, M_NOWAIT);
 			if (path->device->serial_num != NULL) {
 				int start, slen;
 
 				start = strspn(serial_buf->serial_num, " ");
 				slen = serial_buf->length - start;
 				if (slen <= 0) {
 					/*
 					 * SPC5r05 says that an all-space serial
 					 * number means no product serial number
 					 * is available
 					 */
 					slen = 0;
 				}
 				/*
 				 * In apparent violation of the spec, some
 				 * devices pad their serial numbers with
 				 * trailing spaces. Remove them.
 				 */
 				while (slen > 0 &&
 				    serial_buf->serial_num[start + slen - 1] == ' ')
 					slen--;
 				memcpy(path->device->serial_num,
 				       &serial_buf->serial_num[start], slen);
 				path->device->serial_num_len = slen;
 				path->device->serial_num[slen] = '\0';
 			}
 		} else if (cam_periph_error(done_ccb, 0,
 			SF_RETRY_UA|SF_NO_PRINT) == ERESTART) {
 			goto outr;
 		} else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
 			/* Don't wedge the queue */
 			xpt_release_devq(done_ccb->ccb_h.path, /*count*/1,
 					 /*run_queue*/TRUE);
 		}
 
 		/*
 		 * Let's see if we have seen this device before.
 		 */
 		if ((softc->flags & PROBE_INQUIRY_CKSUM) != 0) {
 			MD5_CTX context;
 			uint8_t digest[16];
 
 			MD5Init(&context);
 
 			MD5Update(&context,
 				  (unsigned char *)&path->device->inq_data,
 				  sizeof(struct scsi_inquiry_data));
 
 			if (have_serialnum)
 				MD5Update(&context, path->device->serial_num,
 					  path->device->serial_num_len);
 
 			MD5Final(digest, &context);
 			if (bcmp(softc->digest, digest, 16) == 0)
 				changed = 0;
 
 			/*
 			 * XXX Do we need to do a TUR in order to ensure
 			 *     that the device really hasn't changed???
 			 */
 			if ((changed != 0)
 			 && ((softc->flags & PROBE_NO_ANNOUNCE) == 0))
 				xpt_async(AC_LOST_DEVICE, path, NULL);
 		}
 		if (serial_buf != NULL)
 			free(serial_buf, M_CAMXPT);
 
 		if (changed != 0) {
 			/*
 			 * Now that we have all the necessary
 			 * information to safely perform transfer
 			 * negotiations... Controllers don't perform
 			 * any negotiation or tagged queuing until
 			 * after the first XPT_SET_TRAN_SETTINGS ccb is
 			 * received.  So, on a new device, just retrieve
 			 * the user settings, and set them as the current
 			 * settings to set the device up.
 			 */
 			proberequestdefaultnegotiation(periph);
 			xpt_release_ccb(done_ccb);
 
 			/*
 			 * Perform a TUR to allow the controller to
 			 * perform any necessary transfer negotiation.
 			 */
 			PROBE_SET_ACTION(softc, PROBE_TUR_FOR_NEGOTIATION);
 			xpt_schedule(periph, priority);
 			goto out;
 		}
 		xpt_release_ccb(done_ccb);
 		break;
 	}
 	case PROBE_TUR_FOR_NEGOTIATION:
 	case PROBE_DV_EXIT:
 		if (cam_ccb_status(done_ccb) != CAM_REQ_CMP) {
 			if (cam_periph_error(done_ccb, 0, SF_NO_PRINT |
 			    SF_NO_RECOVERY | SF_NO_RETRY) == ERESTART)
 				goto outr;
 		}
 		if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
 			/* Don't wedge the queue */
 			xpt_release_devq(done_ccb->ccb_h.path, /*count*/1,
 					 /*run_queue*/TRUE);
 		}
 		/*
 		 * Do Domain Validation for lun 0 on devices that claim
 		 * to support Synchronous Transfer modes.
 		 */
 	 	if (softc->action == PROBE_TUR_FOR_NEGOTIATION
 		 && done_ccb->ccb_h.target_lun == 0
 		 && (path->device->inq_data.flags & SID_Sync) != 0
                  && (path->device->flags & CAM_DEV_IN_DV) == 0) {
 			CAM_DEBUG(periph->path, CAM_DEBUG_PROBE,
 			    ("Begin Domain Validation\n"));
 			path->device->flags |= CAM_DEV_IN_DV;
 			xpt_release_ccb(done_ccb);
 			PROBE_SET_ACTION(softc, PROBE_INQUIRY_BASIC_DV1);
 			xpt_schedule(periph, priority);
 			goto out;
 		}
 		if (softc->action == PROBE_DV_EXIT) {
 			CAM_DEBUG(periph->path, CAM_DEBUG_PROBE,
 			    ("Leave Domain Validation\n"));
 		}
 		if (path->device->flags & CAM_DEV_UNCONFIGURED) {
 			path->device->flags &= ~CAM_DEV_UNCONFIGURED;
 			xpt_acquire_device(path->device);
 		}
 		path->device->flags &=
 		    ~(CAM_DEV_IN_DV|CAM_DEV_DV_HIT_BOTTOM);
 		if ((softc->flags & PROBE_NO_ANNOUNCE) == 0) {
 			/* Inform the XPT that a new device has been found */
 			done_ccb->ccb_h.func_code = XPT_GDEV_TYPE;
 			xpt_action(done_ccb);
 			xpt_async(AC_FOUND_DEVICE, done_ccb->ccb_h.path,
 				  done_ccb);
 		}
 		PROBE_SET_ACTION(softc, PROBE_DONE);
 		xpt_release_ccb(done_ccb);
 		break;
 	case PROBE_INQUIRY_BASIC_DV1:
 	case PROBE_INQUIRY_BASIC_DV2:
 	{
 		struct scsi_inquiry_data *nbuf;
 		struct ccb_scsiio *csio;
 
 		if (cam_ccb_status(done_ccb) != CAM_REQ_CMP) {
 			if (cam_periph_error(done_ccb, 0, SF_NO_PRINT |
 			    SF_NO_RECOVERY | SF_NO_RETRY) == ERESTART)
 				goto outr;
 		}
 		if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
 			/* Don't wedge the queue */
 			xpt_release_devq(done_ccb->ccb_h.path, /*count*/1,
 					 /*run_queue*/TRUE);
 		}
 		csio = &done_ccb->csio;
 		nbuf = (struct scsi_inquiry_data *)csio->data_ptr;
 		if (bcmp(nbuf, &path->device->inq_data, SHORT_INQUIRY_LENGTH)) {
 			xpt_print(path,
 			    "inquiry data fails comparison at DV%d step\n",
 			    softc->action == PROBE_INQUIRY_BASIC_DV1 ? 1 : 2);
 			if (proberequestbackoff(periph, path->device)) {
 				path->device->flags &= ~CAM_DEV_IN_DV;
 				PROBE_SET_ACTION(softc, PROBE_TUR_FOR_NEGOTIATION);
 			} else {
 				/* give up */
 				PROBE_SET_ACTION(softc, PROBE_DV_EXIT);
 			}
 			free(nbuf, M_CAMXPT);
 			xpt_release_ccb(done_ccb);
 			xpt_schedule(periph, priority);
 			goto out;
 		}
 		free(nbuf, M_CAMXPT);
 		if (softc->action == PROBE_INQUIRY_BASIC_DV1) {
 			PROBE_SET_ACTION(softc, PROBE_INQUIRY_BASIC_DV2);
 			xpt_release_ccb(done_ccb);
 			xpt_schedule(periph, priority);
 			goto out;
 		}
 		if (softc->action == PROBE_INQUIRY_BASIC_DV2) {
 			CAM_DEBUG(periph->path, CAM_DEBUG_PROBE,
 			    ("Leave Domain Validation Successfully\n"));
 		}
 		if (path->device->flags & CAM_DEV_UNCONFIGURED) {
 			path->device->flags &= ~CAM_DEV_UNCONFIGURED;
 			xpt_acquire_device(path->device);
 		}
 		path->device->flags &=
 		    ~(CAM_DEV_IN_DV|CAM_DEV_DV_HIT_BOTTOM);
 		if ((softc->flags & PROBE_NO_ANNOUNCE) == 0) {
 			/* Inform the XPT that a new device has been found */
 			done_ccb->ccb_h.func_code = XPT_GDEV_TYPE;
 			xpt_action(done_ccb);
 			xpt_async(AC_FOUND_DEVICE, done_ccb->ccb_h.path,
 				  done_ccb);
 		}
 		PROBE_SET_ACTION(softc, PROBE_DONE);
 		xpt_release_ccb(done_ccb);
 		break;
 	}
 	default:
 		panic("probedone: invalid action state 0x%x\n", softc->action);
 	}
 	done_ccb = (union ccb *)TAILQ_FIRST(&softc->request_ccbs);
 	TAILQ_REMOVE(&softc->request_ccbs, &done_ccb->ccb_h, periph_links.tqe);
 	done_ccb->ccb_h.status = CAM_REQ_CMP;
 	xpt_done(done_ccb);
 	if (TAILQ_FIRST(&softc->request_ccbs) == NULL) {
 		CAM_DEBUG(periph->path, CAM_DEBUG_PROBE, ("Probe completed\n"));
 		/* Drop freeze taken due to CAM_DEV_QFREEZE flag set. */
 		cam_release_devq(path, 0, 0, 0, FALSE);
 		cam_periph_release_locked(periph);
 		cam_periph_invalidate(periph);
 		cam_periph_release_locked(periph);
 	} else {
 		probeschedule(periph);
 		goto out;
 	}
 }
 
 static void
 probe_purge_old(struct cam_path *path, struct scsi_report_luns_data *new,
     probe_flags flags)
 {
 	struct cam_path *tp;
 	struct scsi_report_luns_data *old;
 	u_int idx1, idx2, nlun_old, nlun_new;
 	lun_id_t this_lun;
 	uint8_t *ol, *nl;
 
 	if (path->target == NULL) {
 		return;
 	}
 	mtx_lock(&path->target->luns_mtx);
 	old = path->target->luns;
 	path->target->luns = new;
 	mtx_unlock(&path->target->luns_mtx);
 	if (old == NULL)
 		return;
 	nlun_old = scsi_4btoul(old->length) / 8;
 	nlun_new = scsi_4btoul(new->length) / 8;
 
 	/*
 	 * We are not going to assume sorted lists. Deal.
 	 */
 	for (idx1 = 0; idx1 < nlun_old; idx1++) {
 		ol = old->luns[idx1].lundata;
 		for (idx2 = 0; idx2 < nlun_new; idx2++) {
 			nl = new->luns[idx2].lundata;
 			if (memcmp(nl, ol, 8) == 0) {
 				break;
 			}
 		}
 		if (idx2 < nlun_new) {
 			continue;
 		}
 		/*
 		 * An 'old' item not in the 'new' list.
 		 * Nuke it. Except that if it is lun 0,
 		 * that would be what the probe state
 		 * machine is currently working on,
 		 * so we won't do that.
 		 */
 		CAM_GET_LUN(old, idx1, this_lun);
 		if (this_lun == 0) {
 			continue;
 		}
 
 		/*
 		 * We also cannot nuke it if it is
 		 * not in a lun format we understand
 		 * and replace the LUN with a "simple" LUN
 		 * if that is all the HBA supports.
 		 */
 		if (!(flags & PROBE_EXTLUN)) {
 			if (!CAM_CAN_GET_SIMPLE_LUN(old, idx1))
 				continue;
 			CAM_GET_SIMPLE_LUN(old, idx1, this_lun);
 		}
 
 		if (xpt_create_path(&tp, NULL, xpt_path_path_id(path),
 		    xpt_path_target_id(path), this_lun) == CAM_REQ_CMP) {
 			xpt_async(AC_LOST_DEVICE, tp, NULL);
 			xpt_free_path(tp);
 		}
 	}
 	free(old, M_CAMXPT);
 }
 
 static void
 probecleanup(struct cam_periph *periph)
 {
 	free(periph->softc, M_CAMXPT);
 }
 
 static void
 scsi_find_quirk(struct cam_ed *device)
 {
 	struct scsi_quirk_entry *quirk;
 	caddr_t	match;
 
 	match = cam_quirkmatch((caddr_t)&device->inq_data,
 			       (caddr_t)scsi_quirk_table,
 			       nitems(scsi_quirk_table),
 			       sizeof(*scsi_quirk_table), scsi_inquiry_match);
 
 	if (match == NULL)
 		panic("xpt_find_quirk: device didn't match wildcard entry!!");
 
 	quirk = (struct scsi_quirk_entry *)match;
 	device->quirk = quirk;
 	device->mintags = quirk->mintags;
 	device->maxtags = quirk->maxtags;
 }
 
 typedef struct {
 	union	ccb *request_ccb;
 	struct 	ccb_pathinq *cpi;
 	int	counter;
 	int	lunindex[0];
 } scsi_scan_bus_info;
 
 /*
  * To start a scan, request_ccb is an XPT_SCAN_BUS ccb.
  * As the scan progresses, scsi_scan_bus is used as the
  * callback on completion function.
  */
 static void
 scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 {
 	struct mtx *mtx;
 
 	CAM_DEBUG(request_ccb->ccb_h.path, CAM_DEBUG_TRACE,
 		  ("scsi_scan_bus\n"));
 	switch (request_ccb->ccb_h.func_code) {
 	case XPT_SCAN_BUS:
 	case XPT_SCAN_TGT:
 	{
 		scsi_scan_bus_info *scan_info;
 		union	ccb *work_ccb, *reset_ccb;
 		struct	cam_path *path;
 		u_int	i;
 		u_int	low_target, max_target;
 		u_int	initiator_id;
 
 		/* Find out the characteristics of the bus */
 		work_ccb = xpt_alloc_ccb_nowait();
 		if (work_ccb == NULL) {
 			request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
 			xpt_done(request_ccb);
 			return;
 		}
 		xpt_setup_ccb(&work_ccb->ccb_h, request_ccb->ccb_h.path,
 			      request_ccb->ccb_h.pinfo.priority);
 		work_ccb->ccb_h.func_code = XPT_PATH_INQ;
 		xpt_action(work_ccb);
 		if (work_ccb->ccb_h.status != CAM_REQ_CMP) {
 			request_ccb->ccb_h.status = work_ccb->ccb_h.status;
 			xpt_free_ccb(work_ccb);
 			xpt_done(request_ccb);
 			return;
 		}
 
 		if ((work_ccb->cpi.hba_misc & PIM_NOINITIATOR) != 0) {
 			/*
 			 * Can't scan the bus on an adapter that
 			 * cannot perform the initiator role.
 			 */
 			request_ccb->ccb_h.status = CAM_REQ_CMP;
 			xpt_free_ccb(work_ccb);
 			xpt_done(request_ccb);
 			return;
 		}
 
 		/* We may need to reset bus first, if we haven't done it yet. */
 		if ((work_ccb->cpi.hba_inquiry &
 		    (PI_WIDE_32|PI_WIDE_16|PI_SDTR_ABLE)) &&
 		    !(work_ccb->cpi.hba_misc & PIM_NOBUSRESET) &&
 		    !timevalisset(&request_ccb->ccb_h.path->bus->last_reset) &&
 		    (reset_ccb = xpt_alloc_ccb_nowait()) != NULL) {
 			xpt_setup_ccb(&reset_ccb->ccb_h, request_ccb->ccb_h.path,
 			      CAM_PRIORITY_NONE);
 			reset_ccb->ccb_h.func_code = XPT_RESET_BUS;
 			xpt_action(reset_ccb);
 			if (reset_ccb->ccb_h.status != CAM_REQ_CMP) {
 				request_ccb->ccb_h.status = reset_ccb->ccb_h.status;
 				xpt_free_ccb(reset_ccb);
 				xpt_free_ccb(work_ccb);
 				xpt_done(request_ccb);
 				return;
 			}
 			xpt_free_ccb(reset_ccb);
 		}
 
 		/* Save some state for use while we probe for devices */
 		scan_info = (scsi_scan_bus_info *) malloc(sizeof(scsi_scan_bus_info) +
 		    (work_ccb->cpi.max_target * sizeof (u_int)), M_CAMXPT, M_ZERO|M_NOWAIT);
 		if (scan_info == NULL) {
 			request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
 			xpt_free_ccb(work_ccb);
 			xpt_done(request_ccb);
 			return;
 		}
 		CAM_DEBUG(request_ccb->ccb_h.path, CAM_DEBUG_TRACE,
 		   ("SCAN start for %p\n", scan_info));
 		scan_info->request_ccb = request_ccb;
 		scan_info->cpi = &work_ccb->cpi;
 
 		/* Cache on our stack so we can work asynchronously */
 		max_target = scan_info->cpi->max_target;
 		low_target = 0;
 		initiator_id = scan_info->cpi->initiator_id;
 
 		/*
 		 * We can scan all targets in parallel, or do it sequentially.
 		 */
 
 		if (request_ccb->ccb_h.func_code == XPT_SCAN_TGT) {
 			max_target = low_target = request_ccb->ccb_h.target_id;
 			scan_info->counter = 0;
 		} else if (scan_info->cpi->hba_misc & PIM_SEQSCAN) {
 			max_target = 0;
 			scan_info->counter = 0;
 		} else {
 			scan_info->counter = scan_info->cpi->max_target + 1;
 			if (scan_info->cpi->initiator_id < scan_info->counter) {
 				scan_info->counter--;
 			}
 		}
 		mtx = xpt_path_mtx(scan_info->request_ccb->ccb_h.path);
 		mtx_unlock(mtx);
 
 		for (i = low_target; i <= max_target; i++) {
 			cam_status status;
 			if (i == initiator_id)
 				continue;
 
 			status = xpt_create_path(&path, NULL,
 						 request_ccb->ccb_h.path_id,
 						 i, 0);
 			if (status != CAM_REQ_CMP) {
 				printf("scsi_scan_bus: xpt_create_path failed"
 				       " with status %#x, bus scan halted\n",
 				       status);
 				free(scan_info, M_CAMXPT);
 				request_ccb->ccb_h.status = status;
 				xpt_free_ccb(work_ccb);
 				xpt_done(request_ccb);
 				break;
 			}
 			work_ccb = xpt_alloc_ccb_nowait();
 			if (work_ccb == NULL) {
 				xpt_free_ccb((union ccb *)scan_info->cpi);
 				free(scan_info, M_CAMXPT);
 				xpt_free_path(path);
 				request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
 				xpt_done(request_ccb);
 				break;
 			}
 			xpt_setup_ccb(&work_ccb->ccb_h, path,
 				      request_ccb->ccb_h.pinfo.priority);
 			work_ccb->ccb_h.func_code = XPT_SCAN_LUN;
 			work_ccb->ccb_h.cbfcnp = scsi_scan_bus;
 			work_ccb->ccb_h.flags |= CAM_UNLOCKED;
 			work_ccb->ccb_h.ppriv_ptr0 = scan_info;
 			work_ccb->crcn.flags = request_ccb->crcn.flags;
 			xpt_action(work_ccb);
 		}
 
 		mtx_lock(mtx);
 		break;
 	}
 	case XPT_SCAN_LUN:
 	{
 		cam_status status;
 		struct cam_path *path, *oldpath;
 		scsi_scan_bus_info *scan_info;
 		struct cam_et *target;
 		struct cam_ed *device, *nextdev;
 		int next_target;
 		path_id_t path_id;
 		target_id_t target_id;
 		lun_id_t lun_id;
 
 		oldpath = request_ccb->ccb_h.path;
 
 		status = cam_ccb_status(request_ccb);
 		scan_info = (scsi_scan_bus_info *)request_ccb->ccb_h.ppriv_ptr0;
 		path_id = request_ccb->ccb_h.path_id;
 		target_id = request_ccb->ccb_h.target_id;
 		lun_id = request_ccb->ccb_h.target_lun;
 		target = request_ccb->ccb_h.path->target;
 		next_target = 1;
 
 		mtx = xpt_path_mtx(scan_info->request_ccb->ccb_h.path);
 		mtx_lock(mtx);
 		mtx_lock(&target->luns_mtx);
 		if (target->luns) {
 			lun_id_t first;
 			u_int nluns = scsi_4btoul(target->luns->length) / 8;
 
 			/*
 			 * Make sure we skip over lun 0 if it's the first member
 			 * of the list as we've actually just finished probing
 			 * it.
 			 */
 			CAM_GET_LUN(target->luns, 0, first);
 			if (first == 0 && scan_info->lunindex[target_id] == 0) {
 				scan_info->lunindex[target_id]++;
 			}
 
 			/*
 			 * Skip any LUNs that the HBA can't deal with.
 			 */
 			while (scan_info->lunindex[target_id] < nluns) {
 				if (scan_info->cpi->hba_misc & PIM_EXTLUNS) {
 					CAM_GET_LUN(target->luns,
 					    scan_info->lunindex[target_id],
 					    lun_id);
 					break;
 				}
 
 				if (CAM_CAN_GET_SIMPLE_LUN(target->luns,
 				    scan_info->lunindex[target_id])) {
 					CAM_GET_SIMPLE_LUN(target->luns,
 					    scan_info->lunindex[target_id],
 					    lun_id);
 					break;
 				}
 					
 				scan_info->lunindex[target_id]++;
 			}
 
 			if (scan_info->lunindex[target_id] < nluns) {
 				mtx_unlock(&target->luns_mtx);
 				next_target = 0;
 				CAM_DEBUG(request_ccb->ccb_h.path,
 				    CAM_DEBUG_PROBE,
 				   ("next lun to try at index %u is %jx\n",
 				   scan_info->lunindex[target_id],
 				   (uintmax_t)lun_id));
 				scan_info->lunindex[target_id]++;
 			} else {
 				mtx_unlock(&target->luns_mtx);
 				/* We're done with scanning all luns. */
 			}
 		} else {
 			mtx_unlock(&target->luns_mtx);
 			device = request_ccb->ccb_h.path->device;
 			/* Continue sequential LUN scan if: */
 			/*  -- we have more LUNs that need recheck */
 			mtx_lock(&target->bus->eb_mtx);
 			nextdev = device;
 			while ((nextdev = TAILQ_NEXT(nextdev, links)) != NULL)
 				if ((nextdev->flags & CAM_DEV_UNCONFIGURED) == 0)
 					break;
 			mtx_unlock(&target->bus->eb_mtx);
 			if (nextdev != NULL) {
 				next_target = 0;
 			/*  -- stop if CAM_QUIRK_NOLUNS is set. */
 			} else if (SCSI_QUIRK(device)->quirks & CAM_QUIRK_NOLUNS) {
 				next_target = 1;
 			/*  -- this LUN is connected and its SCSI version
 			 *     allows more LUNs. */
 			} else if ((device->flags & CAM_DEV_UNCONFIGURED) == 0) {
 				if (lun_id < (CAM_SCSI2_MAXLUN-1) ||
 				    CAN_SRCH_HI_DENSE(device))
 					next_target = 0;
 			/*  -- this LUN is disconnected, its SCSI version
 			 *     allows more LUNs and we guess they may be. */
 			} else if ((device->flags & CAM_DEV_INQUIRY_DATA_VALID) != 0) {
 				if (lun_id < (CAM_SCSI2_MAXLUN-1) ||
 				    CAN_SRCH_HI_SPARSE(device))
 					next_target = 0;
 			}
 			if (next_target == 0) {
 				lun_id++;
 				if (lun_id > scan_info->cpi->max_lun)
 					next_target = 1;
 			}
 		}
 
 		/*
 		 * Check to see if we scan any further luns.
 		 */
 		if (next_target) {
 			int done;
 
 			/*
 			 * Free the current request path- we're done with it.
 			 */
 			xpt_free_path(oldpath);
  hop_again:
 			done = 0;
 			if (scan_info->request_ccb->ccb_h.func_code == XPT_SCAN_TGT) {
 				done = 1;
 			} else if (scan_info->cpi->hba_misc & PIM_SEQSCAN) {
 				scan_info->counter++;
 				if (scan_info->counter ==
 				    scan_info->cpi->initiator_id) {
 					scan_info->counter++;
 				}
 				if (scan_info->counter >=
 				    scan_info->cpi->max_target+1) {
 					done = 1;
 				}
 			} else {
 				scan_info->counter--;
 				if (scan_info->counter == 0) {
 					done = 1;
 				}
 			}
 			if (done) {
 				mtx_unlock(mtx);
 				xpt_free_ccb(request_ccb);
 				xpt_free_ccb((union ccb *)scan_info->cpi);
 				request_ccb = scan_info->request_ccb;
 				CAM_DEBUG(request_ccb->ccb_h.path,
 				    CAM_DEBUG_TRACE,
 				   ("SCAN done for %p\n", scan_info));
 				free(scan_info, M_CAMXPT);
 				request_ccb->ccb_h.status = CAM_REQ_CMP;
 				xpt_done(request_ccb);
 				break;
 			}
 
 			if ((scan_info->cpi->hba_misc & PIM_SEQSCAN) == 0) {
 				mtx_unlock(mtx);
 				xpt_free_ccb(request_ccb);
 				break;
 			}
 			status = xpt_create_path(&path, NULL,
 			    scan_info->request_ccb->ccb_h.path_id,
 			    scan_info->counter, 0);
 			if (status != CAM_REQ_CMP) {
 				mtx_unlock(mtx);
 				printf("scsi_scan_bus: xpt_create_path failed"
 				    " with status %#x, bus scan halted\n",
 			       	    status);
 				xpt_free_ccb(request_ccb);
 				xpt_free_ccb((union ccb *)scan_info->cpi);
 				request_ccb = scan_info->request_ccb;
 				free(scan_info, M_CAMXPT);
 				request_ccb->ccb_h.status = status;
 				xpt_done(request_ccb);
 				break;
 			}
 			xpt_setup_ccb(&request_ccb->ccb_h, path,
 			    request_ccb->ccb_h.pinfo.priority);
 			request_ccb->ccb_h.func_code = XPT_SCAN_LUN;
 			request_ccb->ccb_h.cbfcnp = scsi_scan_bus;
 			request_ccb->ccb_h.flags |= CAM_UNLOCKED;
 			request_ccb->ccb_h.ppriv_ptr0 = scan_info;
 			request_ccb->crcn.flags =
 			    scan_info->request_ccb->crcn.flags;
 		} else {
 			status = xpt_create_path(&path, NULL,
 						 path_id, target_id, lun_id);
 			/*
 			 * Free the old request path- we're done with it. We
 			 * do this *after* creating the new path so that
 			 * we don't remove a target that has our lun list
 			 * in the case that lun 0 is not present.
 			 */
 			xpt_free_path(oldpath);
 			if (status != CAM_REQ_CMP) {
 				printf("scsi_scan_bus: xpt_create_path failed "
 				       "with status %#x, halting LUN scan\n",
 			 	       status);
 				goto hop_again;
 			}
 			xpt_setup_ccb(&request_ccb->ccb_h, path,
 				      request_ccb->ccb_h.pinfo.priority);
 			request_ccb->ccb_h.func_code = XPT_SCAN_LUN;
 			request_ccb->ccb_h.cbfcnp = scsi_scan_bus;
 			request_ccb->ccb_h.flags |= CAM_UNLOCKED;
 			request_ccb->ccb_h.ppriv_ptr0 = scan_info;
 			request_ccb->crcn.flags =
 				scan_info->request_ccb->crcn.flags;
 		}
 		mtx_unlock(mtx);
 		xpt_action(request_ccb);
 		break;
 	}
 	default:
 		break;
 	}
 }
 
 static void
 scsi_scan_lun(struct cam_periph *periph, struct cam_path *path,
 	     cam_flags flags, union ccb *request_ccb)
 {
 	struct ccb_pathinq cpi;
 	cam_status status;
 	struct cam_path *new_path;
 	struct cam_periph *old_periph;
 	int lock;
 
 	CAM_DEBUG(path, CAM_DEBUG_TRACE, ("scsi_scan_lun\n"));
 
 	memset(&cpi, 0, sizeof(cpi));
 	xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NONE);
 	cpi.ccb_h.func_code = XPT_PATH_INQ;
 	xpt_action((union ccb *)&cpi);
 
 	if (cpi.ccb_h.status != CAM_REQ_CMP) {
 		if (request_ccb != NULL) {
 			request_ccb->ccb_h.status = cpi.ccb_h.status;
 			xpt_done(request_ccb);
 		}
 		return;
 	}
 
 	if ((cpi.hba_misc & PIM_NOINITIATOR) != 0) {
 		/*
 		 * Can't scan the bus on an adapter that
 		 * cannot perform the initiator role.
 		 */
 		if (request_ccb != NULL) {
 			request_ccb->ccb_h.status = CAM_REQ_CMP;
 			xpt_done(request_ccb);
 		}
 		return;
 	}
 
 	if (request_ccb == NULL) {
 		request_ccb = xpt_alloc_ccb_nowait();
 		if (request_ccb == NULL) {
 			xpt_print(path, "scsi_scan_lun: can't allocate CCB, "
 			    "can't continue\n");
 			return;
 		}
 		status = xpt_create_path(&new_path, NULL,
 					  path->bus->path_id,
 					  path->target->target_id,
 					  path->device->lun_id);
 		if (status != CAM_REQ_CMP) {
 			xpt_print(path, "scsi_scan_lun: can't create path, "
 			    "can't continue\n");
 			xpt_free_ccb(request_ccb);
 			return;
 		}
 		xpt_setup_ccb(&request_ccb->ccb_h, new_path, CAM_PRIORITY_XPT);
 		request_ccb->ccb_h.cbfcnp = xptscandone;
 		request_ccb->ccb_h.func_code = XPT_SCAN_LUN;
 		request_ccb->ccb_h.flags |= CAM_UNLOCKED;
 		request_ccb->crcn.flags = flags;
 	}
 
 	lock = (xpt_path_owned(path) == 0);
 	if (lock)
 		xpt_path_lock(path);
 	if ((old_periph = cam_periph_find(path, "probe")) != NULL) {
 		if ((old_periph->flags & CAM_PERIPH_INVALID) == 0) {
 			probe_softc *softc;
 
 			softc = (probe_softc *)old_periph->softc;
 			TAILQ_INSERT_TAIL(&softc->request_ccbs,
 			    &request_ccb->ccb_h, periph_links.tqe);
 		} else {
 			request_ccb->ccb_h.status = CAM_REQ_CMP_ERR;
 			xpt_done(request_ccb);
 		}
 	} else {
 		status = cam_periph_alloc(proberegister, NULL, probecleanup,
 					  probestart, "probe",
 					  CAM_PERIPH_BIO,
 					  request_ccb->ccb_h.path, NULL, 0,
 					  request_ccb);
 
 		if (status != CAM_REQ_CMP) {
 			xpt_print(path, "scsi_scan_lun: cam_alloc_periph "
 			    "returned an error, can't continue probe\n");
 			request_ccb->ccb_h.status = status;
 			xpt_done(request_ccb);
 		}
 	}
 	if (lock)
 		xpt_path_unlock(path);
 }
 
 static void
 xptscandone(struct cam_periph *periph, union ccb *done_ccb)
 {
 
 	xpt_free_path(done_ccb->ccb_h.path);
 	xpt_free_ccb(done_ccb);
 }
 
 static struct cam_ed *
 scsi_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id)
 {
 	struct scsi_quirk_entry *quirk;
 	struct cam_ed *device;
 
 	device = xpt_alloc_device(bus, target, lun_id);
 	if (device == NULL)
 		return (NULL);
 
 	/*
 	 * Take the default quirk entry until we have inquiry
 	 * data and can determine a better quirk to use.
 	 */
 	quirk = &scsi_quirk_table[nitems(scsi_quirk_table) - 1];
 	device->quirk = (void *)quirk;
 	device->mintags = quirk->mintags;
 	device->maxtags = quirk->maxtags;
 	bzero(&device->inq_data, sizeof(device->inq_data));
 	device->inq_flags = 0;
 	device->queue_flags = 0;
 	device->serial_num = NULL;
 	device->serial_num_len = 0;
 	device->device_id = NULL;
 	device->device_id_len = 0;
 	device->supported_vpds = NULL;
 	device->supported_vpds_len = 0;
 	return (device);
 }
 
 static void
 scsi_devise_transport(struct cam_path *path)
 {
 	struct ccb_pathinq cpi;
 	struct ccb_trans_settings cts;
 	struct scsi_inquiry_data *inq_buf;
 
 	/* Get transport information from the SIM */
 	memset(&cpi, 0, sizeof(cpi));
 	xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NONE);
 	cpi.ccb_h.func_code = XPT_PATH_INQ;
 	xpt_action((union ccb *)&cpi);
 
 	inq_buf = NULL;
 	if ((path->device->flags & CAM_DEV_INQUIRY_DATA_VALID) != 0)
 		inq_buf = &path->device->inq_data;
 	path->device->protocol = PROTO_SCSI;
 	path->device->protocol_version =
 	    inq_buf != NULL ? SID_ANSI_REV(inq_buf) : cpi.protocol_version;
 	path->device->transport = cpi.transport;
 	path->device->transport_version = cpi.transport_version;
 
 	/*
 	 * Any device not using SPI3 features should
 	 * be considered SPI2 or lower.
 	 */
 	if (inq_buf != NULL) {
 		if (path->device->transport == XPORT_SPI
 		 && (inq_buf->spi3data & SID_SPI_MASK) == 0
 		 && path->device->transport_version > 2)
 			path->device->transport_version = 2;
 	} else {
 		struct cam_ed* otherdev;
 
 		for (otherdev = TAILQ_FIRST(&path->target->ed_entries);
 		     otherdev != NULL;
 		     otherdev = TAILQ_NEXT(otherdev, links)) {
 			if (otherdev != path->device)
 				break;
 		}
 
 		if (otherdev != NULL) {
 			/*
 			 * Initially assume the same versioning as
 			 * prior luns for this target.
 			 */
 			path->device->protocol_version =
 			    otherdev->protocol_version;
 			path->device->transport_version =
 			    otherdev->transport_version;
 		} else {
 			/* Until we know better, opt for safety */
 			path->device->protocol_version = 2;
 			if (path->device->transport == XPORT_SPI)
 				path->device->transport_version = 2;
 			else
 				path->device->transport_version = 0;
 		}
 	}
 
 	/*
 	 * XXX
 	 * For a device compliant with SPC-2 we should be able
 	 * to determine the transport version supported by
 	 * scrutinizing the version descriptors in the
 	 * inquiry buffer.
 	 */
 
 	/* Tell the controller what we think */
 	memset(&cts, 0, sizeof(cts));
 	xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 	cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
 	cts.type = CTS_TYPE_CURRENT_SETTINGS;
 	cts.transport = path->device->transport;
 	cts.transport_version = path->device->transport_version;
 	cts.protocol = path->device->protocol;
 	cts.protocol_version = path->device->protocol_version;
 	cts.proto_specific.valid = 0;
 	cts.xport_specific.valid = 0;
 	xpt_action((union ccb *)&cts);
 }
 
 static void
 scsi_dev_advinfo(union ccb *start_ccb)
 {
 	struct cam_ed *device;
 	struct ccb_dev_advinfo *cdai;
 	off_t amt;
 
 	xpt_path_assert(start_ccb->ccb_h.path, MA_OWNED);
 	start_ccb->ccb_h.status = CAM_REQ_INVALID;
 	device = start_ccb->ccb_h.path->device;
 	cdai = &start_ccb->cdai;
 	switch(cdai->buftype) {
 	case CDAI_TYPE_SCSI_DEVID:
 		if (cdai->flags & CDAI_FLAG_STORE)
 			return;
 		cdai->provsiz = device->device_id_len;
 		if (device->device_id_len == 0)
 			break;
 		amt = device->device_id_len;
 		if (cdai->provsiz > cdai->bufsiz)
 			amt = cdai->bufsiz;
 		memcpy(cdai->buf, device->device_id, amt);
 		break;
 	case CDAI_TYPE_SERIAL_NUM:
 		if (cdai->flags & CDAI_FLAG_STORE)
 			return;
 		cdai->provsiz = device->serial_num_len;
 		if (device->serial_num_len == 0)
 			break;
 		amt = device->serial_num_len;
 		if (cdai->provsiz > cdai->bufsiz)
 			amt = cdai->bufsiz;
 		memcpy(cdai->buf, device->serial_num, amt);
 		break;
 	case CDAI_TYPE_PHYS_PATH:
 		if (cdai->flags & CDAI_FLAG_STORE) {
 			if (device->physpath != NULL) {
 				free(device->physpath, M_CAMXPT);
 				device->physpath = NULL;
 				device->physpath_len = 0;
 			}
 			/* Clear existing buffer if zero length */
 			if (cdai->bufsiz == 0)
 				break;
 			device->physpath = malloc(cdai->bufsiz, M_CAMXPT, M_NOWAIT);
 			if (device->physpath == NULL) {
 				start_ccb->ccb_h.status = CAM_REQ_ABORTED;
 				return;
 			}
 			device->physpath_len = cdai->bufsiz;
 			memcpy(device->physpath, cdai->buf, cdai->bufsiz);
 		} else {
 			cdai->provsiz = device->physpath_len;
 			if (device->physpath_len == 0)
 				break;
 			amt = device->physpath_len;
 			if (cdai->provsiz > cdai->bufsiz)
 				amt = cdai->bufsiz;
 			memcpy(cdai->buf, device->physpath, amt);
 		}
 		break;
 	case CDAI_TYPE_RCAPLONG:
 		if (cdai->flags & CDAI_FLAG_STORE) {
 			if (device->rcap_buf != NULL) {
 				free(device->rcap_buf, M_CAMXPT);
 				device->rcap_buf = NULL;
 			}
 
 			device->rcap_len = cdai->bufsiz;
 			/* Clear existing buffer if zero length */
 			if (cdai->bufsiz == 0)
 				break;
 
 			device->rcap_buf = malloc(cdai->bufsiz, M_CAMXPT,
 						  M_NOWAIT);
 			if (device->rcap_buf == NULL) {
 				start_ccb->ccb_h.status = CAM_REQ_ABORTED;
 				return;
 			}
 
 			memcpy(device->rcap_buf, cdai->buf, cdai->bufsiz);
 		} else {
 			cdai->provsiz = device->rcap_len;
 			if (device->rcap_len == 0)
 				break;
 			amt = device->rcap_len;
 			if (cdai->provsiz > cdai->bufsiz)
 				amt = cdai->bufsiz;
 			memcpy(cdai->buf, device->rcap_buf, amt);
 		}
 		break;
 	case CDAI_TYPE_EXT_INQ:
 		/*
 		 * We fetch extended inquiry data during probe, if
 		 * available.  We don't allow changing it.
 		 */
 		if (cdai->flags & CDAI_FLAG_STORE)
 			return;
 		cdai->provsiz = device->ext_inq_len;
 		if (device->ext_inq_len == 0)
 			break;
 		amt = device->ext_inq_len;
 		if (cdai->provsiz > cdai->bufsiz)
 			amt = cdai->bufsiz;
 		memcpy(cdai->buf, device->ext_inq, amt);
 		break;
 	default:
 		return;
 	}
 	start_ccb->ccb_h.status = CAM_REQ_CMP;
 
 	if (cdai->flags & CDAI_FLAG_STORE) {
 		xpt_async(AC_ADVINFO_CHANGED, start_ccb->ccb_h.path,
 			  (void *)(uintptr_t)cdai->buftype);
 	}
 }
 
 static void
 scsi_action(union ccb *start_ccb)
 {
 
 	if (start_ccb->ccb_h.func_code != XPT_SCSI_IO) {
 		KASSERT((start_ccb->ccb_h.alloc_flags & CAM_CCB_FROM_UMA) == 0,
 		    ("%s: ccb %p, func_code %#x should not be allocated "
 		    "from UMA zone\n",
 		    __func__, start_ccb, start_ccb->ccb_h.func_code));
 	}
 
 	switch (start_ccb->ccb_h.func_code) {
 	case XPT_SET_TRAN_SETTINGS:
 	{
 		scsi_set_transfer_settings(&start_ccb->cts,
 					   start_ccb->ccb_h.path,
 					   /*async_update*/FALSE);
 		break;
 	}
 	case XPT_SCAN_BUS:
 	case XPT_SCAN_TGT:
 		scsi_scan_bus(start_ccb->ccb_h.path->periph, start_ccb);
 		break;
 	case XPT_SCAN_LUN:
 		scsi_scan_lun(start_ccb->ccb_h.path->periph,
 			      start_ccb->ccb_h.path, start_ccb->crcn.flags,
 			      start_ccb);
 		break;
 	case XPT_DEV_ADVINFO:
 	{
 		scsi_dev_advinfo(start_ccb);
 		break;
 	}
 	default:
 		xpt_action_default(start_ccb);
 		break;
 	}
 }
 
 static void
 scsi_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_path *path,
 			   int async_update)
 {
 	struct	ccb_pathinq cpi;
 	struct	ccb_trans_settings cur_cts;
 	struct	ccb_trans_settings_scsi *scsi;
 	struct	ccb_trans_settings_scsi *cur_scsi;
 	struct	scsi_inquiry_data *inq_data;
 	struct	cam_ed *device;
 
 	if (path == NULL || (device = path->device) == NULL) {
 		cts->ccb_h.status = CAM_PATH_INVALID;
 		xpt_done((union ccb *)cts);
 		return;
 	}
 
 	if (cts->protocol == PROTO_UNKNOWN
 	 || cts->protocol == PROTO_UNSPECIFIED) {
 		cts->protocol = device->protocol;
 		cts->protocol_version = device->protocol_version;
 	}
 
 	if (cts->protocol_version == PROTO_VERSION_UNKNOWN
 	 || cts->protocol_version == PROTO_VERSION_UNSPECIFIED)
 		cts->protocol_version = device->protocol_version;
 
 	if (cts->protocol != device->protocol) {
 		xpt_print(path, "Uninitialized Protocol %x:%x?\n",
 		       cts->protocol, device->protocol);
 		cts->protocol = device->protocol;
 	}
 
 	if (cts->protocol_version > device->protocol_version) {
 		if (bootverbose) {
 			xpt_print(path, "Down reving Protocol "
 			    "Version from %d to %d?\n", cts->protocol_version,
 			    device->protocol_version);
 		}
 		cts->protocol_version = device->protocol_version;
 	}
 
 	if (cts->transport == XPORT_UNKNOWN
 	 || cts->transport == XPORT_UNSPECIFIED) {
 		cts->transport = device->transport;
 		cts->transport_version = device->transport_version;
 	}
 
 	if (cts->transport_version == XPORT_VERSION_UNKNOWN
 	 || cts->transport_version == XPORT_VERSION_UNSPECIFIED)
 		cts->transport_version = device->transport_version;
 
 	if (cts->transport != device->transport) {
 		xpt_print(path, "Uninitialized Transport %x:%x?\n",
 		    cts->transport, device->transport);
 		cts->transport = device->transport;
 	}
 
 	if (cts->transport_version > device->transport_version) {
 		if (bootverbose) {
 			xpt_print(path, "Down reving Transport "
 			    "Version from %d to %d?\n", cts->transport_version,
 			    device->transport_version);
 		}
 		cts->transport_version = device->transport_version;
 	}
 
 	/*
 	 * Nothing more of interest to do unless
 	 * this is a device connected via the
 	 * SCSI protocol.
 	 */
 	if (cts->protocol != PROTO_SCSI) {
 		if (async_update == FALSE)
 			xpt_action_default((union ccb *)cts);
 		return;
 	}
 
 	inq_data = &device->inq_data;
 	scsi = &cts->proto_specific.scsi;
 	memset(&cpi, 0, sizeof(cpi));
 	xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NONE);
 	cpi.ccb_h.func_code = XPT_PATH_INQ;
 	xpt_action((union ccb *)&cpi);
 
 	/* SCSI specific sanity checking */
 	if ((cpi.hba_inquiry & PI_TAG_ABLE) == 0
 	 || (INQ_DATA_TQ_ENABLED(inq_data)) == 0
 	 || (device->queue_flags & SCP_QUEUE_DQUE) != 0
 	 || (device->mintags == 0)) {
 		/*
 		 * Can't tag on hardware that doesn't support tags,
 		 * doesn't have it enabled, or has broken tag support.
 		 */
 		scsi->flags &= ~CTS_SCSI_FLAGS_TAG_ENB;
 	}
 
 	if (async_update == FALSE) {
 		/*
 		 * Perform sanity checking against what the
 		 * controller and device can do.
 		 */
 		memset(&cur_cts, 0, sizeof(cur_cts));
 		xpt_setup_ccb(&cur_cts.ccb_h, path, CAM_PRIORITY_NONE);
 		cur_cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 		cur_cts.type = cts->type;
 		xpt_action((union ccb *)&cur_cts);
 		if (cam_ccb_status((union ccb *)&cur_cts) != CAM_REQ_CMP) {
 			return;
 		}
 		cur_scsi = &cur_cts.proto_specific.scsi;
 		if ((scsi->valid & CTS_SCSI_VALID_TQ) == 0) {
 			scsi->flags &= ~CTS_SCSI_FLAGS_TAG_ENB;
 			scsi->flags |= cur_scsi->flags & CTS_SCSI_FLAGS_TAG_ENB;
 		}
 		if ((cur_scsi->valid & CTS_SCSI_VALID_TQ) == 0)
 			scsi->flags &= ~CTS_SCSI_FLAGS_TAG_ENB;
 	}
 
 	/* SPI specific sanity checking */
 	if (cts->transport == XPORT_SPI && async_update == FALSE) {
 		u_int spi3caps;
 		struct ccb_trans_settings_spi *spi;
 		struct ccb_trans_settings_spi *cur_spi;
 
 		spi = &cts->xport_specific.spi;
 
 		cur_spi = &cur_cts.xport_specific.spi;
 
 		/* Fill in any gaps in what the user gave us */
 		if ((spi->valid & CTS_SPI_VALID_SYNC_RATE) == 0)
 			spi->sync_period = cur_spi->sync_period;
 		if ((cur_spi->valid & CTS_SPI_VALID_SYNC_RATE) == 0)
 			spi->sync_period = 0;
 		if ((spi->valid & CTS_SPI_VALID_SYNC_OFFSET) == 0)
 			spi->sync_offset = cur_spi->sync_offset;
 		if ((cur_spi->valid & CTS_SPI_VALID_SYNC_OFFSET) == 0)
 			spi->sync_offset = 0;
 		if ((spi->valid & CTS_SPI_VALID_PPR_OPTIONS) == 0)
 			spi->ppr_options = cur_spi->ppr_options;
 		if ((cur_spi->valid & CTS_SPI_VALID_PPR_OPTIONS) == 0)
 			spi->ppr_options = 0;
 		if ((spi->valid & CTS_SPI_VALID_BUS_WIDTH) == 0)
 			spi->bus_width = cur_spi->bus_width;
 		if ((cur_spi->valid & CTS_SPI_VALID_BUS_WIDTH) == 0)
 			spi->bus_width = 0;
 		if ((spi->valid & CTS_SPI_VALID_DISC) == 0) {
 			spi->flags &= ~CTS_SPI_FLAGS_DISC_ENB;
 			spi->flags |= cur_spi->flags & CTS_SPI_FLAGS_DISC_ENB;
 		}
 		if ((cur_spi->valid & CTS_SPI_VALID_DISC) == 0)
 			spi->flags &= ~CTS_SPI_FLAGS_DISC_ENB;
 		if (((device->flags & CAM_DEV_INQUIRY_DATA_VALID) != 0
 		  && (inq_data->flags & SID_Sync) == 0
 		  && cts->type == CTS_TYPE_CURRENT_SETTINGS)
 		 || ((cpi.hba_inquiry & PI_SDTR_ABLE) == 0)) {
 			/* Force async */
 			spi->sync_period = 0;
 			spi->sync_offset = 0;
 		}
 
 		switch (spi->bus_width) {
 		case MSG_EXT_WDTR_BUS_32_BIT:
 			if (((device->flags & CAM_DEV_INQUIRY_DATA_VALID) == 0
 			  || (inq_data->flags & SID_WBus32) != 0
 			  || cts->type == CTS_TYPE_USER_SETTINGS)
 			 && (cpi.hba_inquiry & PI_WIDE_32) != 0)
 				break;
 			/* Fall Through to 16-bit */
 		case MSG_EXT_WDTR_BUS_16_BIT:
 			if (((device->flags & CAM_DEV_INQUIRY_DATA_VALID) == 0
 			  || (inq_data->flags & SID_WBus16) != 0
 			  || cts->type == CTS_TYPE_USER_SETTINGS)
 			 && (cpi.hba_inquiry & PI_WIDE_16) != 0) {
 				spi->bus_width = MSG_EXT_WDTR_BUS_16_BIT;
 				break;
 			}
 			/* Fall Through to 8-bit */
 		default: /* New bus width?? */
 		case MSG_EXT_WDTR_BUS_8_BIT:
 			/* All targets can do this */
 			spi->bus_width = MSG_EXT_WDTR_BUS_8_BIT;
 			break;
 		}
 
 		spi3caps = cpi.xport_specific.spi.ppr_options;
 		if ((device->flags & CAM_DEV_INQUIRY_DATA_VALID) != 0
 		 && cts->type == CTS_TYPE_CURRENT_SETTINGS)
 			spi3caps &= inq_data->spi3data;
 
 		if ((spi3caps & SID_SPI_CLOCK_DT) == 0)
 			spi->ppr_options &= ~MSG_EXT_PPR_DT_REQ;
 
 		if ((spi3caps & SID_SPI_IUS) == 0)
 			spi->ppr_options &= ~MSG_EXT_PPR_IU_REQ;
 
 		if ((spi3caps & SID_SPI_QAS) == 0)
 			spi->ppr_options &= ~MSG_EXT_PPR_QAS_REQ;
 
 		/* No SPI Transfer settings are allowed unless we are wide */
 		if (spi->bus_width == 0)
 			spi->ppr_options = 0;
 
 		if ((spi->valid & CTS_SPI_VALID_DISC)
 		 && ((spi->flags & CTS_SPI_FLAGS_DISC_ENB) == 0)) {
 			/*
 			 * Can't tag queue without disconnection.
 			 */
 			scsi->flags &= ~CTS_SCSI_FLAGS_TAG_ENB;
 			scsi->valid |= CTS_SCSI_VALID_TQ;
 		}
 
 		/*
 		 * If we are currently performing tagged transactions to
 		 * this device and want to change its negotiation parameters,
 		 * go non-tagged for a bit to give the controller a chance to
 		 * negotiate unhampered by tag messages.
 		 */
 		if (cts->type == CTS_TYPE_CURRENT_SETTINGS
 		 && (device->inq_flags & SID_CmdQue) != 0
 		 && (scsi->flags & CTS_SCSI_FLAGS_TAG_ENB) != 0
 		 && (spi->flags & (CTS_SPI_VALID_SYNC_RATE|
 				   CTS_SPI_VALID_SYNC_OFFSET|
 				   CTS_SPI_VALID_BUS_WIDTH)) != 0)
 			scsi_toggle_tags(path);
 	}
 
 	if (cts->type == CTS_TYPE_CURRENT_SETTINGS
 	 && (scsi->valid & CTS_SCSI_VALID_TQ) != 0) {
 		int device_tagenb;
 
 		/*
 		 * If we are transitioning from tags to no-tags or
 		 * vice-versa, we need to carefully freeze and restart
 		 * the queue so that we don't overlap tagged and non-tagged
 		 * commands.  We also temporarily stop tags if there is
 		 * a change in transfer negotiation settings to allow
 		 * "tag-less" negotiation.
 		 */
 		if ((device->flags & CAM_DEV_TAG_AFTER_COUNT) != 0
 		 || (device->inq_flags & SID_CmdQue) != 0)
 			device_tagenb = TRUE;
 		else
 			device_tagenb = FALSE;
 
 		if (((scsi->flags & CTS_SCSI_FLAGS_TAG_ENB) != 0
 		  && device_tagenb == FALSE)
 		 || ((scsi->flags & CTS_SCSI_FLAGS_TAG_ENB) == 0
 		  && device_tagenb == TRUE)) {
 			if ((scsi->flags & CTS_SCSI_FLAGS_TAG_ENB) != 0) {
 				/*
 				 * Delay change to use tags until after a
 				 * few commands have gone to this device so
 				 * the controller has time to perform transfer
 				 * negotiations without tagged messages getting
 				 * in the way.
 				 */
 				device->tag_delay_count = CAM_TAG_DELAY_COUNT;
 				device->flags |= CAM_DEV_TAG_AFTER_COUNT;
 			} else {
 				xpt_stop_tags(path);
 			}
 		}
 	}
 	if (async_update == FALSE)
 		xpt_action_default((union ccb *)cts);
 }
 
 static void
 scsi_toggle_tags(struct cam_path *path)
 {
 	struct cam_ed *dev;
 
 	/*
 	 * Give controllers a chance to renegotiate
 	 * before starting tag operations.  We
 	 * "toggle" tagged queuing off then on
 	 * which causes the tag enable command delay
 	 * counter to come into effect.
 	 */
 	dev = path->device;
 	if ((dev->flags & CAM_DEV_TAG_AFTER_COUNT) != 0
 	 || ((dev->inq_flags & SID_CmdQue) != 0
  	  && (dev->inq_flags & (SID_Sync|SID_WBus16|SID_WBus32)) != 0)) {
 		struct ccb_trans_settings cts;
 
 		memset(&cts, 0, sizeof(cts));
 		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NONE);
 		cts.protocol = PROTO_SCSI;
 		cts.protocol_version = PROTO_VERSION_UNSPECIFIED;
 		cts.transport = XPORT_UNSPECIFIED;
 		cts.transport_version = XPORT_VERSION_UNSPECIFIED;
 		cts.proto_specific.scsi.flags = 0;
 		cts.proto_specific.scsi.valid = CTS_SCSI_VALID_TQ;
 		scsi_set_transfer_settings(&cts, path,
 					  /*async_update*/TRUE);
 		cts.proto_specific.scsi.flags = CTS_SCSI_FLAGS_TAG_ENB;
 		scsi_set_transfer_settings(&cts, path,
 					  /*async_update*/TRUE);
 	}
 }
 
 /*
  * Handle any per-device event notifications that require action by the XPT.
  */
 static void
 scsi_dev_async(uint32_t async_code, struct cam_eb *bus, struct cam_et *target,
 	      struct cam_ed *device, void *async_arg)
 {
 	cam_status status;
 	struct cam_path newpath;
 
 	/*
 	 * We only need to handle events for real devices.
 	 */
 	if (target->target_id == CAM_TARGET_WILDCARD
 	 || device->lun_id == CAM_LUN_WILDCARD)
 		return;
 
 	/*
 	 * We need our own path with wildcards expanded to
 	 * handle certain types of events.
 	 */
 	if ((async_code == AC_SENT_BDR)
 	 || (async_code == AC_BUS_RESET)
 	 || (async_code == AC_INQ_CHANGED))
 		status = xpt_compile_path(&newpath, NULL,
 					  bus->path_id,
 					  target->target_id,
 					  device->lun_id);
 	else
 		status = CAM_REQ_CMP_ERR;
 
 	if (status == CAM_REQ_CMP) {
 		/*
 		 * Allow transfer negotiation to occur in a
 		 * tag free environment and after settle delay.
 		 */
 		if (async_code == AC_SENT_BDR
 		 || async_code == AC_BUS_RESET) {
 			cam_freeze_devq(&newpath);
 			cam_release_devq(&newpath,
 				RELSIM_RELEASE_AFTER_TIMEOUT,
 				/*reduction*/0,
 				/*timeout*/scsi_delay,
 				/*getcount_only*/0);
 			scsi_toggle_tags(&newpath);
 		}
 
 		if (async_code == AC_INQ_CHANGED) {
 			/*
 			 * We've sent a start unit command, or
 			 * something similar to a device that
 			 * may have caused its inquiry data to
 			 * change. So we re-scan the device to
 			 * refresh the inquiry data for it.
 			 */
 			scsi_scan_lun(newpath.periph, &newpath,
 				     CAM_EXPECT_INQ_CHANGE, NULL);
 		}
 		xpt_release_path(&newpath);
 	} else if (async_code == AC_LOST_DEVICE &&
 	    (device->flags & CAM_DEV_UNCONFIGURED) == 0) {
 		device->flags |= CAM_DEV_UNCONFIGURED;
 		xpt_release_device(device);
 	} else if (async_code == AC_TRANSFER_NEG) {
 		struct ccb_trans_settings *settings;
 		struct cam_path path;
 
 		settings = (struct ccb_trans_settings *)async_arg;
 		xpt_compile_path(&path, NULL, bus->path_id, target->target_id,
 				 device->lun_id);
 		scsi_set_transfer_settings(settings, &path,
 					  /*async_update*/TRUE);
 		xpt_release_path(&path);
 	}
 }
 
 static void
 _scsi_announce_periph(struct cam_periph *periph, u_int *speed, u_int *freq, struct ccb_trans_settings *cts)
 {
 	struct	ccb_pathinq cpi;
 	struct	cam_path *path = periph->path;
 
 	cam_periph_assert(periph, MA_OWNED);
 
 	xpt_setup_ccb(&cts->ccb_h, path, CAM_PRIORITY_NORMAL);
 	cts->ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 	cts->type = CTS_TYPE_CURRENT_SETTINGS;
 	xpt_action((union ccb*)cts);
 	if (cam_ccb_status((union ccb *)cts) != CAM_REQ_CMP)
 		return;
 
 	/* Ask the SIM for its base transfer speed */
 	memset(&cpi, 0, sizeof(cpi));
 	xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NORMAL);
 	cpi.ccb_h.func_code = XPT_PATH_INQ;
 	xpt_action((union ccb *)&cpi);
 
 	/* Report connection speed */
 	*speed = cpi.base_transfer_speed;
 	*freq = 0;
 
 	if (cts->ccb_h.status == CAM_REQ_CMP && cts->transport == XPORT_SPI) {
 		struct	ccb_trans_settings_spi *spi =
 		    &cts->xport_specific.spi;
 
 		if ((spi->valid & CTS_SPI_VALID_SYNC_OFFSET) != 0
 		  && spi->sync_offset != 0) {
 			*freq = scsi_calc_syncsrate(spi->sync_period);
 			*speed = *freq;
 		}
 		if ((spi->valid & CTS_SPI_VALID_BUS_WIDTH) != 0)
 			*speed *= (0x01 << spi->bus_width);
 	}
 	if (cts->ccb_h.status == CAM_REQ_CMP && cts->transport == XPORT_FC) {
 		struct	ccb_trans_settings_fc *fc =
 		    &cts->xport_specific.fc;
 
 		if (fc->valid & CTS_FC_VALID_SPEED)
 			*speed = fc->bitrate;
 	}
 	if (cts->ccb_h.status == CAM_REQ_CMP && cts->transport == XPORT_SAS) {
 		struct	ccb_trans_settings_sas *sas =
 		    &cts->xport_specific.sas;
 
 		if (sas->valid & CTS_SAS_VALID_SPEED)
 			*speed = sas->bitrate;
 	}
 }
 
 static void
 scsi_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb)
 {
 	struct	ccb_trans_settings cts;
 	u_int speed, freq, mb;
 
 	memset(&cts, 0, sizeof(cts));
 	_scsi_announce_periph(periph, &speed, &freq, &cts);
 	if (cam_ccb_status((union ccb *)&cts) != CAM_REQ_CMP)
 		return;
 
 	mb = speed / 1000;
 	if (mb > 0)
 		sbuf_printf(sb, "%s%d: %d.%03dMB/s transfers",
 		       periph->periph_name, periph->unit_number,
 		       mb, speed % 1000);
 	else
 		sbuf_printf(sb, "%s%d: %dKB/s transfers", periph->periph_name,
 		       periph->unit_number, speed);
 	/* Report additional information about SPI connections */
 	if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SPI) {
 		struct	ccb_trans_settings_spi *spi;
 
 		spi = &cts.xport_specific.spi;
 		if (freq != 0) {
 			sbuf_printf(sb, " (%d.%03dMHz%s, offset %d", freq / 1000,
 			       freq % 1000,
 			       (spi->ppr_options & MSG_EXT_PPR_DT_REQ) != 0
 			     ? " DT" : "",
 			       spi->sync_offset);
 		}
 		if ((spi->valid & CTS_SPI_VALID_BUS_WIDTH) != 0
 		 && spi->bus_width > 0) {
 			if (freq != 0) {
 				sbuf_printf(sb, ", ");
 			} else {
 				sbuf_printf(sb, " (");
 			}
 			sbuf_printf(sb, "%dbit)", 8 * (0x01 << spi->bus_width));
 		} else if (freq != 0) {
 			sbuf_printf(sb, ")");
 		}
 	}
 	if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_FC) {
 		struct	ccb_trans_settings_fc *fc;
 
 		fc = &cts.xport_specific.fc;
 		if (fc->valid & CTS_FC_VALID_WWNN)
 			sbuf_printf(sb, " WWNN 0x%llx", (long long) fc->wwnn);
 		if (fc->valid & CTS_FC_VALID_WWPN)
 			sbuf_printf(sb, " WWPN 0x%llx", (long long) fc->wwpn);
 		if (fc->valid & CTS_FC_VALID_PORT)
 			sbuf_printf(sb, " PortID 0x%x", fc->port);
 	}
 	sbuf_printf(sb, "\n");
 }
 
-static void
-scsi_announce_periph(struct cam_periph *periph)
-{
-	struct	ccb_trans_settings cts;
-	u_int speed, freq, mb;
-
-	memset(&cts, 0, sizeof(cts));
-	_scsi_announce_periph(periph, &speed, &freq, &cts);
-	if (cam_ccb_status((union ccb *)&cts) != CAM_REQ_CMP)
-		return;
-
-	mb = speed / 1000;
-	if (mb > 0)
-		printf("%s%d: %d.%03dMB/s transfers",
-		       periph->periph_name, periph->unit_number,
-		       mb, speed % 1000);
-	else
-		printf("%s%d: %dKB/s transfers", periph->periph_name,
-		       periph->unit_number, speed);
-	/* Report additional information about SPI connections */
-	if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SPI) {
-		struct	ccb_trans_settings_spi *spi;
-
-		spi = &cts.xport_specific.spi;
-		if (freq != 0) {
-			printf(" (%d.%03dMHz%s, offset %d", freq / 1000,
-			       freq % 1000,
-			       (spi->ppr_options & MSG_EXT_PPR_DT_REQ) != 0
-			     ? " DT" : "",
-			       spi->sync_offset);
-		}
-		if ((spi->valid & CTS_SPI_VALID_BUS_WIDTH) != 0
-		 && spi->bus_width > 0) {
-			if (freq != 0) {
-				printf(", ");
-			} else {
-				printf(" (");
-			}
-			printf("%dbit)", 8 * (0x01 << spi->bus_width));
-		} else if (freq != 0) {
-			printf(")");
-		}
-	}
-	if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_FC) {
-		struct	ccb_trans_settings_fc *fc;
-
-		fc = &cts.xport_specific.fc;
-		if (fc->valid & CTS_FC_VALID_WWNN)
-			printf(" WWNN 0x%llx", (long long) fc->wwnn);
-		if (fc->valid & CTS_FC_VALID_WWPN)
-			printf(" WWPN 0x%llx", (long long) fc->wwpn);
-		if (fc->valid & CTS_FC_VALID_PORT)
-			printf(" PortID 0x%x", fc->port);
-	}
-	printf("\n");
-}
-
 static void
 scsi_proto_announce_sbuf(struct cam_ed *device, struct sbuf *sb)
 {
 	scsi_print_inquiry_sbuf(sb, &device->inq_data);
 }
 
-static void
-scsi_proto_announce(struct cam_ed *device)
-{
-	scsi_print_inquiry(&device->inq_data);
-}
-
 static void
 scsi_proto_denounce_sbuf(struct cam_ed *device, struct sbuf *sb)
 {
 	scsi_print_inquiry_short_sbuf(sb, &device->inq_data);
 }
 
-static void
-scsi_proto_denounce(struct cam_ed *device)
-{
-	scsi_print_inquiry_short(&device->inq_data);
-}
-
 static void
 scsi_proto_debug_out(union ccb *ccb)
 {
 	char cdb_str[(SCSI_MAX_CDBLEN * 3) + 1];
 	struct cam_ed *device;
 
 	if (ccb->ccb_h.func_code != XPT_SCSI_IO)
 		return;
 
 	device = ccb->ccb_h.path->device;
 	CAM_DEBUG(ccb->ccb_h.path,
 	    CAM_DEBUG_CDB,("%s. CDB: %s\n",
 		scsi_op_desc(scsiio_cdb_ptr(&ccb->csio)[0], &device->inq_data),
 		scsi_cdb_string(scsiio_cdb_ptr(&ccb->csio), cdb_str, sizeof(cdb_str))));
 }