d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix target mode compilation issues that arose after a change

Browse Source 
in the sense data structures.

MFC after:	1 week
This commit is contained in:
mjacob 2011-12-27 14:59:24 +00:00
parent cbd2bf6e79
commit e3a2ce835d
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
sys/dev/isp/isp_freebsd.c
View File

@ -3170,10 +3170,10 @@ isptargstart(struct cam_periph *periph, union ccb *iccb)
xpt_print(atio->ccb_h.path, "[0x%x] Non-Zero Lun %d: cdb0=0x%x\n", atio->tag_id, return_lun, cdb[0]);
if (cdb[0] != INQUIRY && cdb[0] != REPORT_LUNS && cdb[0] != REQUEST_SENSE) {
status = SCSI_STATUS_CHECK_COND;
atio->sense_data.error_code = SSD_ERRCODE_VALID|SSD_CURRENT_ERROR|SSD_KEY_ILLEGAL_REQUEST;
atio->sense_data.add_sense_code = 0x25;
atio->sense_data.add_sense_code_qual = 0x0;
atio->sense_len = sizeof (atio->sense_data);
SDFIXED(atio->sense_data)->error_code = SSD_ERRCODE_VALID|SSD_CURRENT_ERROR|SSD_KEY_ILLEGAL_REQUEST;
SDFIXED(atio->sense_data)->add_sense_code = 0x25;
SDFIXED(atio->sense_data)->add_sense_code_qual = 0x0;
atio->sense_len = SSD_MIN_SIZE;
}
return_lun = CAM_LUN_WILDCARD;
}
@ -3197,10 +3197,10 @@ isptargstart(struct cam_periph *periph, union ccb *iccb)
case READ_16:
if (isptarg_rwparm(cdb, disk_data, disk_size, atio->ccb_h.ccb_data_offset, &data_ptr, &data_len, &last)) {
status = SCSI_STATUS_CHECK_COND;
atio->sense_data.error_code = SSD_ERRCODE_VALID|SSD_CURRENT_ERROR|SSD_KEY_UNIT_ATTENTION;
atio->sense_data.add_sense_code = 0x5;
atio->sense_data.add_sense_code_qual = 0x24;
atio->sense_len = sizeof (atio->sense_data);
SDFIXED(atio->sense_data)->error_code = SSD_ERRCODE_VALID|SSD_CURRENT_ERROR|SSD_KEY_UNIT_ATTENTION;
SDFIXED(atio->sense_data)->add_sense_code = 0x5;
SDFIXED(atio->sense_data)->add_sense_code_qual = 0x24;
atio->sense_len = SSD_MIN_SIZE;
} else {
#ifdef ISP_FORCE_TIMEOUT
{
@ -3236,10 +3236,10 @@ isptargstart(struct cam_periph *periph, union ccb *iccb)
case WRITE_16:
if (isptarg_rwparm(cdb, disk_data, disk_size, atio->ccb_h.ccb_data_offset, &data_ptr, &data_len, &last)) {
status = SCSI_STATUS_CHECK_COND;
atio->sense_data.error_code = SSD_ERRCODE_VALID|SSD_CURRENT_ERROR|SSD_KEY_UNIT_ATTENTION;
atio->sense_data.add_sense_code = 0x5;
atio->sense_data.add_sense_code_qual = 0x24;
atio->sense_len = sizeof (atio->sense_data);
SDFIXED(atio->sense_data)->error_code = SSD_ERRCODE_VALID|SSD_CURRENT_ERROR|SSD_KEY_UNIT_ATTENTION;
SDFIXED(atio->sense_data)->add_sense_code = 0x5;
SDFIXED(atio->sense_data)->add_sense_code_qual = 0x24;
atio->sense_len = SSD_MIN_SIZE;
} else {
#ifdef ISP_FORCE_TIMEOUT
{
@ -3273,10 +3273,10 @@ isptargstart(struct cam_periph *periph, union ccb *iccb)
flags |= CAM_DIR_IN;
if (cdb[1] || cdb[2] || cdb[3]) {
status = SCSI_STATUS_CHECK_COND;
atio->sense_data.error_code = SSD_ERRCODE_VALID|SSD_CURRENT_ERROR|SSD_KEY_UNIT_ATTENTION;
atio->sense_data.add_sense_code = 0x5;
atio->sense_data.add_sense_code_qual = 0x20;
atio->sense_len = sizeof (atio->sense_data);
SDFIXED(atio->sense_data)->error_code = SSD_ERRCODE_VALID|SSD_CURRENT_ERROR|SSD_KEY_UNIT_ATTENTION;
SDFIXED(atio->sense_data)->add_sense_code = 0x5;
SDFIXED(atio->sense_data)->add_sense_code_qual = 0x20;
atio->sense_len = SSD_MIN_SIZE;
break;
}
data_len = sizeof (iqd);
@ -3297,10 +3297,10 @@ isptargstart(struct cam_periph *periph, union ccb *iccb)
if (ca) {
ca = 0;
status = SCSI_STATUS_CHECK_COND;
atio->sense_data.error_code = SSD_ERRCODE_VALID|SSD_CURRENT_ERROR|SSD_KEY_UNIT_ATTENTION;
atio->sense_data.add_sense_code = 0x28;
atio->sense_data.add_sense_code_qual = 0x0;
atio->sense_len = sizeof (atio->sense_data);
SDFIXED(atio->sense_data)->error_code = SSD_ERRCODE_VALID|SSD_CURRENT_ERROR|SSD_KEY_UNIT_ATTENTION;
SDFIXED(atio->sense_data)->add_sense_code = 0x28;
SDFIXED(atio->sense_data)->add_sense_code_qual = 0x0;
atio->sense_len = SSD_MIN_SIZE;
}
break;
case SYNCHRONIZE_CACHE:
@ -3315,10 +3315,10 @@ isptargstart(struct cam_periph *periph, union ccb *iccb)
flags |= CAM_DIR_IN;
if (cdb[2] || cdb[3] || cdb[4] || cdb[5]) {
status = SCSI_STATUS_CHECK_COND;
atio->sense_data.error_code = SSD_ERRCODE_VALID|SSD_CURRENT_ERROR|SSD_KEY_UNIT_ATTENTION;
atio->sense_data.add_sense_code = 0x5;
atio->sense_data.add_sense_code_qual = 0x24;
atio->sense_len = sizeof (atio->sense_data);
SDFIXED(atio->sense_data)->error_code = SSD_ERRCODE_VALID|SSD_CURRENT_ERROR|SSD_KEY_UNIT_ATTENTION;
SDFIXED(atio->sense_data)->add_sense_code = 0x5;
SDFIXED(atio->sense_data)->add_sense_code_qual = 0x24;
atio->sense_len = SSD_MIN_SIZE;
break;
}
if (cdb[8] & 0x1) { /* PMI */
@ -3369,10 +3369,10 @@ isptargstart(struct cam_periph *periph, union ccb *iccb)
default:
flags |= CAM_DIR_NONE;
status = SCSI_STATUS_CHECK_COND;
atio->sense_data.error_code = SSD_ERRCODE_VALID|SSD_CURRENT_ERROR|SSD_KEY_UNIT_ATTENTION;
atio->sense_data.add_sense_code = 0x5;
atio->sense_data.add_sense_code_qual = 0x20;
atio->sense_len = sizeof (atio->sense_data);
SDFIXED(atio->sense_data)->error_code = SSD_ERRCODE_VALID|SSD_CURRENT_ERROR|SSD_KEY_UNIT_ATTENTION;
SDFIXED(atio->sense_data)->add_sense_code = 0x5;
SDFIXED(atio->sense_data)->add_sense_code_qual = 0x20;
atio->sense_len = SSD_MIN_SIZE;
break;
}

7
sys/dev/isp/isp_freebsd.h
View File

@ -76,6 +76,13 @@
#define ISP_IFLAGS INTR_TYPE_CAM | INTR_ENTROPY | INTR_MPSAFE
#ifdef ISP_TARGET_MODE
/* Not quite right, but there was no bump for this change */
#if __FreeBSD_version < 225469
#define SDFIXED(x) (&x)
#else
#define SDFIXED(x) ((struct scsi_sense_data_fixed *)(&x))
#endif
#define ISP_TARGET_FUNCTIONS 1
#define ATPDPSIZE 4096