- Give ATA/SATA SIMs info about ATAPI packet size, supported by device.

- Make ATA XPT to reject longer SCSI CDBs then supported by device, or
any SCSI CDBs, if device doesn't support ATAPI.

8 files changed, 62 insertions, 4 deletions

diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c
index bff0340..a9d0a87 100644
--- a/sys/cam/ata/ata_xpt.c
+++ b/sys/cam/ata/ata_xpt.c
@@ -1334,7 +1334,20 @@ ata_device_transport(struct cam_path *path)
 	cts.protocol = path->device->protocol;
 	cts.protocol_version = path->device->protocol_version;
 	cts.proto_specific.valid = 0;
-	cts.xport_specific.valid = 0;
+	if (ident_buf) {
+		if (path->device->transport == XPORT_ATA) {
+			cts.xport_specific.ata.atapi = 
+			    ((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_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);
 }
 
@@ -1366,6 +1379,27 @@ ata_action(union ccb *start_ccb)
 		(*(sim->sim_action))(sim, start_ccb);
 		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 = (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;
+		}
+		/* FALLTHROUGH */
+	}
 	default:
 		xpt_action_default(start_ccb);
 		break;
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
index 4c5adba..2810c54 100644
--- a/sys/cam/cam_ccb.h
+++ b/sys/cam/cam_ccb.h
@@ -823,8 +823,10 @@ struct ccb_trans_settings_ata {
 	u_int     	valid;		/* Which fields to honor */
 #define	CTS_ATA_VALID_MODE		0x01
 #define	CTS_ATA_VALID_BYTECOUNT		0x02
+#define	CTS_ATA_VALID_ATAPI		0x20
 	int		mode;		/* Mode */
 	u_int 		bytecount;	/* Length of PIO transaction */
+	u_int 		atapi;		/* Length of ATAPI CDB */
 };
 
 struct ccb_trans_settings_sata {
@@ -834,11 +836,13 @@ struct ccb_trans_settings_sata {
 #define	CTS_SATA_VALID_REVISION		0x04
 #define	CTS_SATA_VALID_PM		0x08
 #define	CTS_SATA_VALID_TAGS		0x10
+#define	CTS_SATA_VALID_ATAPI		0x20
 	int		mode;		/* Legacy PATA mode */
 	u_int 		bytecount;	/* Length of PIO transaction */
 	int		revision;	/* SATA revision */
 	u_int 		pm_present;	/* PM is present (XPT->SIM) */
 	u_int 		tags;		/* Number of allowed tags */
+	u_int 		atapi;		/* Length of ATAPI CDB */
 };
 
 /* Get/Set transfer rate/width/disconnection/tag queueing settings */
diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c
index 8492725..fe3ce09 100644
--- a/sys/dev/ahci/ahci.c
+++ b/sys/dev/ahci/ahci.c
@@ -2358,6 +2358,8 @@ ahciaction(struct cam_sim *sim, union ccb *ccb)
 			d->tags = min(ch->numslots, cts->xport_specific.sata.tags);
 		if (cts->xport_specific.sata.valid & CTS_SATA_VALID_PM)
 			ch->pm_present = cts->xport_specific.sata.pm_present;
+		if (cts->xport_specific.sata.valid & CTS_SATA_VALID_ATAPI)
+			d->atapi = cts->xport_specific.sata.atapi;
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
 		break;
@@ -2401,6 +2403,8 @@ ahciaction(struct cam_sim *sim, union ccb *ccb)
 		cts->xport_specific.sata.valid |= CTS_SATA_VALID_PM;
 		cts->xport_specific.sata.tags = d->tags;
 		cts->xport_specific.sata.valid |= CTS_SATA_VALID_TAGS;
+		cts->xport_specific.sata.atapi = d->atapi;
+		cts->xport_specific.sata.valid |= CTS_SATA_VALID_ATAPI;
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
 		break;
diff --git a/sys/dev/ahci/ahci.h b/sys/dev/ahci/ahci.h
index 5b524ab..a2cc5a0 100644
--- a/sys/dev/ahci/ahci.h
+++ b/sys/dev/ahci/ahci.h
@@ -370,6 +370,7 @@ struct ahci_device {
 	int			revision;
 	int			mode;
 	u_int			bytecount;
+	u_int			atapi;
 	u_int			tags;
 };
 
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index 1ad3c51..6de8fda 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -1348,6 +1348,8 @@ ata_cam_begin_transaction(device_t dev, union ccb *ccb)
 		    ccb->csio.cdb_io.cdb_ptr : ccb->csio.cdb_io.cdb_bytes,
 		    request->u.atapi.ccb, ccb->csio.cdb_len);
 		request->flags |= ATA_R_ATAPI;
+		if (ch->curr[ccb->ccb_h.target_id].atapi == 16)
+			request->flags |= ATA_R_ATAPI16;
 		if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE &&
 		    ch->curr[ccb->ccb_h.target_id].mode >= ATA_DMA)
 			request->flags |= ATA_R_DMA;
@@ -1358,7 +1360,6 @@ ata_cam_begin_transaction(device_t dev, union ccb *ccb)
 	}
 	request->transfersize = min(request->bytecount,
 	    ch->curr[ccb->ccb_h.target_id].bytecount);
-//	request->callback = ad_done;
 	request->retries = 0;
 	request->timeout = (ccb->ccb_h.timeout + 999) / 1000;
 	callout_init_mtx(&request->callout, &ch->state_mtx, CALLOUT_RETURNUNLOCKED);
@@ -1491,7 +1492,7 @@ ataaction(struct cam_sim *sim, union ccb *ccb)
 		if (ch->flags & ATA_SATA) {
 			if (cts->xport_specific.sata.valid & CTS_SATA_VALID_REVISION)
 				d->revision = cts->xport_specific.sata.revision;
-			if (cts->xport_specific.ata.valid & CTS_SATA_VALID_MODE) {
+			if (cts->xport_specific.sata.valid & CTS_SATA_VALID_MODE) {
 				if (cts->type == CTS_TYPE_CURRENT_SETTINGS) {
 					d->mode = ATA_SETMODE(ch->dev,
 					    ccb->ccb_h.target_id,
@@ -1499,8 +1500,10 @@ ataaction(struct cam_sim *sim, union ccb *ccb)
 				} else
 					d->mode = cts->xport_specific.sata.mode;
 			}
-			if (cts->xport_specific.ata.valid & CTS_SATA_VALID_BYTECOUNT)
+			if (cts->xport_specific.sata.valid & CTS_SATA_VALID_BYTECOUNT)
 				d->bytecount = min(8192, cts->xport_specific.sata.bytecount);
+			if (cts->xport_specific.sata.valid & CTS_SATA_VALID_ATAPI)
+				d->atapi = cts->xport_specific.sata.atapi;
 		} else {
 			if (cts->xport_specific.ata.valid & CTS_ATA_VALID_MODE) {
 				if (cts->type == CTS_TYPE_CURRENT_SETTINGS) {
@@ -1512,6 +1515,8 @@ ataaction(struct cam_sim *sim, union ccb *ccb)
 			}
 			if (cts->xport_specific.ata.valid & CTS_ATA_VALID_BYTECOUNT)
 				d->bytecount = cts->xport_specific.ata.bytecount;
+			if (cts->xport_specific.ata.valid & CTS_ATA_VALID_ATAPI)
+				d->atapi = cts->xport_specific.ata.atapi;
 		}
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
@@ -1541,6 +1546,8 @@ ataaction(struct cam_sim *sim, union ccb *ccb)
 			} else
 				cts->xport_specific.sata.revision = d->revision;
 			cts->xport_specific.sata.valid |= CTS_SATA_VALID_REVISION;
+			cts->xport_specific.sata.atapi = d->atapi;
+			cts->xport_specific.sata.valid |= CTS_SATA_VALID_ATAPI;
 		} else {
 			cts->transport = XPORT_ATA;
 			cts->transport_version = XPORT_VERSION_UNSPECIFIED;
@@ -1548,6 +1555,8 @@ ataaction(struct cam_sim *sim, union ccb *ccb)
 			cts->xport_specific.ata.valid |= CTS_ATA_VALID_MODE;
 			cts->xport_specific.ata.bytecount = d->bytecount;
 			cts->xport_specific.ata.valid |= CTS_ATA_VALID_BYTECOUNT;
+			cts->xport_specific.ata.atapi = d->atapi;
+			cts->xport_specific.ata.valid |= CTS_ATA_VALID_ATAPI;
 		}
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h
index 23dc458..3d5d36e 100644
--- a/sys/dev/ata/ata-all.h
+++ b/sys/dev/ata/ata-all.h
@@ -539,6 +539,7 @@ struct ata_cam_device {
 	u_int			revision;
 	int			mode;
 	u_int			bytecount;
+	u_int			atapi;
 };
 #endif
 
diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c
index 5298c18..dc24c6c 100644
--- a/sys/dev/siis/siis.c
+++ b/sys/dev/siis/siis.c
@@ -1659,6 +1659,8 @@ siisaction(struct cam_sim *sim, union ccb *ccb)
 			else
 				ATA_OUTL(ch->r_mem, SIIS_P_CTLCLR, SIIS_P_CTL_PME);
 		}
+		if (cts->xport_specific.sata.valid & CTS_SATA_VALID_TAGS)
+			d->atapi = cts->xport_specific.sata.atapi;
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
 		break;
@@ -1702,6 +1704,8 @@ siisaction(struct cam_sim *sim, union ccb *ccb)
 		cts->xport_specific.sata.valid |= CTS_SATA_VALID_PM;
 		cts->xport_specific.sata.tags = d->tags;
 		cts->xport_specific.sata.valid |= CTS_SATA_VALID_TAGS;
+		cts->xport_specific.sata.atapi = d->atapi;
+		cts->xport_specific.sata.valid |= CTS_SATA_VALID_ATAPI;
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
 		break;
diff --git a/sys/dev/siis/siis.h b/sys/dev/siis/siis.h
index f98d204..92b4e26 100644
--- a/sys/dev/siis/siis.h
+++ b/sys/dev/siis/siis.h
@@ -356,6 +356,7 @@ struct siis_device {
 	int			revision;
 	int			mode;
 	u_int			bytecount;
+	u_int			atapi;
 	u_int			tags;
 };