summaryrefslogtreecommitdiffstats
path: root/sys/cam
diff options
context:
space:
mode:
Diffstat (limited to 'sys/cam')
-rw-r--r--sys/cam/ata/ata_xpt.c36
-rw-r--r--sys/cam/cam_ccb.h4
2 files changed, 39 insertions, 1 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 */
OpenPOWER on IntegriCloud