Index: share/man/man4/pass.4
===================================================================
--- share/man/man4/pass.4
+++ share/man/man4/pass.4
@@ -82,7 +82,7 @@
 .Xr xpt 4
 device instead.
 Some examples of xpt-only CCBs are XPT_SCAN_BUS,
-XPT_DEV_MATCH, XPT_RESET_BUS, XPT_SCAN_LUN, XPT_ENG_INQ, and XPT_ENG_EXEC.
+XPT_DEV_MATCH, XPT_RESET_BUS, XPT_SCAN_LUN.
 These CCB types have various attributes that make it illogical or
 impossible to service them through the passthrough interface.
 .Pp
@@ -117,7 +117,7 @@
 .Xr xpt 4
 device instead.
 Some examples of xpt-only CCBs are XPT_SCAN_BUS,
-XPT_DEV_MATCH, XPT_RESET_BUS, XPT_SCAN_LUN, XPT_ENG_INQ, and XPT_ENG_EXEC.
+XPT_DEV_MATCH, XPT_RESET_BUS, XPT_SCAN_LUN.
 These CCB types have various attributes that make it illogical or
 impossible to service them through the passthrough interface.
 .Pp
Index: share/man/man4/xpt.4
===================================================================
--- share/man/man4/xpt.4
+++ share/man/man4/xpt.4
@@ -71,8 +71,6 @@
 .It XPT_SCAN_BUS
 .It XPT_RESET_BUS
 .It XPT_SCAN_LUN
-.It XPT_ENG_INQ
-.It XPT_ENG_EXEC
 .It XPT_DEBUG
 .It XPT_DEV_MATCH
 .It XPT_PATH_INQ
Index: sys/cam/cam_ccb.h
===================================================================
--- sys/cam/cam_ccb.h
+++ sys/cam/cam_ccb.h
@@ -221,12 +221,6 @@
 	XPT_NVME_ADMIN		= 0x1f | XPT_FC_DEV_QUEUED,
 				/* Execute the requested NVMe Admin operation */
 
-/* HBA engine commands 0x20->0x2F */
-	XPT_ENG_INQ		= 0x20 | XPT_FC_XPT_ONLY,
-				/* HBA engine feature inquiry */
-	XPT_ENG_EXEC		= 0x21 | XPT_FC_DEV_QUEUED,
-				/* HBA execute engine request */
-
 /* Target mode commands: 0x30->0x3F */
 	XPT_EN_LUN		= 0x30,
 				/* Enable LUN as a target */
@@ -1253,30 +1247,6 @@
 	EAD_LZ2V2	/* Engine algorithm ID: LZ2 var.2 */
 } ei_algo;
 
-struct ccb_eng_inq {
-	struct	  ccb_hdr ccb_h;
-	u_int16_t eng_num;	/* The engine number for this inquiry */
-	ei_type   eng_type;	/* Returned engine type */
-	ei_algo   eng_algo;	/* Returned engine algorithm type */
-	u_int32_t eng_memeory;	/* Returned engine memory size */
-};
-
-struct ccb_eng_exec {	/* This structure must match SCSIIO size */
-	struct	  ccb_hdr ccb_h;
-	u_int8_t  *pdrv_ptr;	/* Ptr used by the peripheral driver */
-	u_int8_t  *req_map;	/* Ptr for mapping info on the req. */
-	u_int8_t  *data_ptr;	/* Pointer to the data buf/SG list */
-	u_int32_t dxfer_len;	/* Data transfer length */
-	u_int8_t  *engdata_ptr;	/* Pointer to the engine buffer data */
-	u_int16_t sglist_cnt;	/* Num of scatter gather list entries */
-	u_int32_t dmax_len;	/* Destination data maximum length */
-	u_int32_t dest_len;	/* Destination data length */
-	int32_t	  src_resid;	/* Source residual length: 2's comp */
-	u_int32_t timeout;	/* Timeout value */
-	u_int16_t eng_num;	/* Engine number for this request */
-	u_int16_t vu_flags;	/* Vendor Unique flags */
-};
-
 /*
  * Definitions for the timeout field in the SCSI I/O CCB.
  */
@@ -1360,8 +1330,6 @@
 	struct	ccb_notify_ack		cna;
 	struct	ccb_immediate_notify	cin1;
 	struct	ccb_notify_acknowledge	cna2;
-	struct	ccb_eng_inq		cei;
-	struct	ccb_eng_exec		cee;
 	struct	ccb_smpio		smpio;
 	struct 	ccb_rescan		crcn;
 	struct  ccb_debug		cdbg;
Index: sys/cam/cam_xpt.c
===================================================================
--- sys/cam/cam_xpt.c
+++ sys/cam/cam_xpt.c
@@ -459,7 +459,6 @@
 		case XPT_SCAN_BUS:
 		case XPT_RESET_BUS:
 		case XPT_PATH_INQ:
-		case XPT_ENG_INQ:
 		case XPT_SCAN_LUN:
 		case XPT_SCAN_TGT:
 
@@ -2690,7 +2689,6 @@
 	case XPT_NVME_ADMIN:
 	case XPT_MMC_IO:
 	case XPT_RESET_DEV:
-	case XPT_ENG_EXEC:
 	case XPT_SMP_IO:
 	{
 		struct cam_devq *devq;
@@ -3152,7 +3150,6 @@
 	default:
 	case XPT_SDEV_TYPE:
 	case XPT_TERM_IO:
-	case XPT_ENG_INQ:
 		/* XXX Implement */
 		xpt_print(start_ccb->ccb_h.path,
 		    "%s: CCB type %#x %s not supported\n", __func__,
@@ -5561,8 +5558,6 @@
 	{ XPT_SMP_IO, "XPT_SMP_IO" },
 	{ XPT_SCAN_TGT, "XPT_SCAN_TGT" },
 	{ XPT_NVME_ADMIN, "XPT_NVME_ADMIN" },
-	{ XPT_ENG_INQ, "XPT_ENG_INQ" },
-	{ XPT_ENG_EXEC, "XPT_ENG_EXEC" },
 	{ XPT_EN_LUN, "XPT_EN_LUN" },
 	{ XPT_TARGET_IO, "XPT_TARGET_IO" },
 	{ XPT_ACCEPT_TARGET_IO, "XPT_ACCEPT_TARGET_IO" },