svn commit: r314381 - in stable/11/sys: cam/scsi dev/advansys dev/aha dev/ahci dev/arcmsr dev/ata dev/buslogic dev/hptmv dev/mvs dev/ncr dev/siis dev/sym dev/trm
Alexander Motin
mav at FreeBSD.org
Tue Feb 28 06:46:44 UTC 2017
Author: mav
Date: Tue Feb 28 06:46:41 2017
New Revision: 314381
URL: https://svnweb.freebsd.org/changeset/base/314381
Log:
MFC r313949: Remove dead mentions of CAM target mode APIs from drivers.
This makes grepping kernel for target mode implementation much easier.
Modified:
stable/11/sys/cam/scsi/scsi_low.c
stable/11/sys/dev/advansys/advansys.c
stable/11/sys/dev/aha/aha.c
stable/11/sys/dev/ahci/ahci.c
stable/11/sys/dev/arcmsr/arcmsr.c
stable/11/sys/dev/ata/ata-all.c
stable/11/sys/dev/buslogic/bt.c
stable/11/sys/dev/hptmv/entry.c
stable/11/sys/dev/mvs/mvs.c
stable/11/sys/dev/ncr/ncr.c
stable/11/sys/dev/siis/siis.c
stable/11/sys/dev/sym/sym_hipd.c
stable/11/sys/dev/trm/trm.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/cam/scsi/scsi_low.c
==============================================================================
--- stable/11/sys/cam/scsi/scsi_low.c Tue Feb 28 06:32:01 2017 (r314380)
+++ stable/11/sys/cam/scsi/scsi_low.c Tue Feb 28 06:46:41 2017 (r314381)
@@ -479,15 +479,6 @@ scsi_low_scsi_action_cam(sim, ccb)
#endif /* SCSI_LOW_DEBUG */
break;
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
- /* XXX Implement */
- ccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(ccb);
- break;
-
case XPT_ABORT: /* Abort the specified CCB */
#ifdef SCSI_LOW_DIAGNOSTIC
if (target == CAM_TARGET_WILDCARD || lun == CAM_LUN_WILDCARD)
Modified: stable/11/sys/dev/advansys/advansys.c
==============================================================================
--- stable/11/sys/dev/advansys/advansys.c Tue Feb 28 06:32:01 2017 (r314380)
+++ stable/11/sys/dev/advansys/advansys.c Tue Feb 28 06:46:41 2017 (r314381)
@@ -233,10 +233,6 @@ adv_action(struct cam_sim *sim, union cc
break;
}
case XPT_RESET_DEV: /* Bus Device Reset the specified SCSI device */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
- case XPT_EN_LUN: /* Enable LUN as a target */
case XPT_ABORT: /* Abort the specified CCB */
/* XXX Implement */
ccb->ccb_h.status = CAM_REQ_INVALID;
Modified: stable/11/sys/dev/aha/aha.c
==============================================================================
--- stable/11/sys/dev/aha/aha.c Tue Feb 28 06:32:01 2017 (r314380)
+++ stable/11/sys/dev/aha/aha.c Tue Feb 28 06:46:41 2017 (r314381)
@@ -838,10 +838,6 @@ ahaaction(struct cam_sim *sim, union ccb
}
break;
}
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
case XPT_ABORT: /* Abort the specified CCB */
/* XXX Implement */
ccb->ccb_h.status = CAM_REQ_INVALID;
Modified: stable/11/sys/dev/ahci/ahci.c
==============================================================================
--- stable/11/sys/dev/ahci/ahci.c Tue Feb 28 06:32:01 2017 (r314380)
+++ stable/11/sys/dev/ahci/ahci.c Tue Feb 28 06:46:41 2017 (r314381)
@@ -2570,10 +2570,6 @@ ahciaction(struct cam_sim *sim, union cc
}
ahci_begin_transaction(ch, ccb);
return;
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
case XPT_ABORT: /* Abort the specified CCB */
/* XXX Implement */
ccb->ccb_h.status = CAM_REQ_INVALID;
Modified: stable/11/sys/dev/arcmsr/arcmsr.c
==============================================================================
--- stable/11/sys/dev/arcmsr/arcmsr.c Tue Feb 28 06:32:01 2017 (r314380)
+++ stable/11/sys/dev/arcmsr/arcmsr.c Tue Feb 28 06:46:41 2017 (r314381)
@@ -2883,12 +2883,6 @@ static void arcmsr_action(struct cam_sim
}
break;
}
- case XPT_TARGET_IO: {
- /* target mode not yet support vendor specific commands. */
- pccb->ccb_h.status |= CAM_REQ_CMP;
- xpt_done(pccb);
- break;
- }
case XPT_PATH_INQ: {
struct ccb_pathinq *cpi = &pccb->cpi;
@@ -2938,7 +2932,6 @@ static void arcmsr_action(struct cam_sim
pabort_ccb = pccb->cab.abort_ccb;
switch (pabort_ccb->ccb_h.func_code) {
case XPT_ACCEPT_TARGET_IO:
- case XPT_IMMED_NOTIFY:
case XPT_CONT_TARGET_IO:
if(arcmsr_seek_cmd2abort(pabort_ccb)==TRUE) {
pabort_ccb->ccb_h.status |= CAM_REQ_ABORTED;
Modified: stable/11/sys/dev/ata/ata-all.c
==============================================================================
--- stable/11/sys/dev/ata/ata-all.c Tue Feb 28 06:32:01 2017 (r314380)
+++ stable/11/sys/dev/ata/ata-all.c Tue Feb 28 06:46:41 2017 (r314381)
@@ -1013,10 +1013,6 @@ ataaction(struct cam_sim *sim, union ccb
}
ata_cam_begin_transaction(dev, ccb);
return;
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
case XPT_ABORT: /* Abort the specified CCB */
/* XXX Implement */
ccb->ccb_h.status = CAM_REQ_INVALID;
Modified: stable/11/sys/dev/buslogic/bt.c
==============================================================================
--- stable/11/sys/dev/buslogic/bt.c Tue Feb 28 06:32:01 2017 (r314380)
+++ stable/11/sys/dev/buslogic/bt.c Tue Feb 28 06:46:41 2017 (r314381)
@@ -1233,10 +1233,6 @@ btaction(struct cam_sim *sim, union ccb
}
break;
}
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
case XPT_ABORT: /* Abort the specified CCB */
/* XXX Implement */
ccb->ccb_h.status = CAM_REQ_INVALID;
Modified: stable/11/sys/dev/hptmv/entry.c
==============================================================================
--- stable/11/sys/dev/hptmv/entry.c Tue Feb 28 06:32:01 2017 (r314380)
+++ stable/11/sys/dev/hptmv/entry.c Tue Feb 28 06:46:41 2017 (r314381)
@@ -2289,10 +2289,6 @@ hpt_action(struct cam_sim *sim, union cc
break;
case XPT_RESET_DEV: /* Bus Device Reset the specified SCSI device */
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
case XPT_ABORT: /* Abort the specified CCB */
case XPT_TERM_IO: /* Terminate the I/O process */
/* XXX Implement */
Modified: stable/11/sys/dev/mvs/mvs.c
==============================================================================
--- stable/11/sys/dev/mvs/mvs.c Tue Feb 28 06:32:01 2017 (r314380)
+++ stable/11/sys/dev/mvs/mvs.c Tue Feb 28 06:46:41 2017 (r314381)
@@ -2288,10 +2288,6 @@ mvsaction(struct cam_sim *sim, union ccb
}
mvs_begin_transaction(dev, ccb);
return;
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
case XPT_ABORT: /* Abort the specified CCB */
/* XXX Implement */
ccb->ccb_h.status = CAM_REQ_INVALID;
Modified: stable/11/sys/dev/ncr/ncr.c
==============================================================================
--- stable/11/sys/dev/ncr/ncr.c Tue Feb 28 06:32:01 2017 (r314380)
+++ stable/11/sys/dev/ncr/ncr.c Tue Feb 28 06:46:41 2017 (r314381)
@@ -4152,10 +4152,6 @@ ncr_action (struct cam_sim *sim, union c
break;
}
case XPT_RESET_DEV: /* Bus Device Reset the specified SCSI device */
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
case XPT_ABORT: /* Abort the specified CCB */
/* XXX Implement */
ccb->ccb_h.status = CAM_REQ_INVALID;
Modified: stable/11/sys/dev/siis/siis.c
==============================================================================
--- stable/11/sys/dev/siis/siis.c Tue Feb 28 06:32:01 2017 (r314380)
+++ stable/11/sys/dev/siis/siis.c Tue Feb 28 06:46:41 2017 (r314381)
@@ -1835,10 +1835,6 @@ siisaction(struct cam_sim *sim, union cc
}
siis_begin_transaction(dev, ccb);
return;
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
case XPT_ABORT: /* Abort the specified CCB */
/* XXX Implement */
ccb->ccb_h.status = CAM_REQ_INVALID;
Modified: stable/11/sys/dev/sym/sym_hipd.c
==============================================================================
--- stable/11/sys/dev/sym/sym_hipd.c Tue Feb 28 06:32:01 2017 (r314380)
+++ stable/11/sys/dev/sym/sym_hipd.c Tue Feb 28 06:46:41 2017 (r314381)
@@ -8090,11 +8090,6 @@ static void sym_action2(struct cam_sim *
sym_init (np, 1);
sym_xpt_done2(np, ccb, CAM_REQ_CMP);
break;
- case XPT_ACCEPT_TARGET_IO:
- case XPT_CONT_TARGET_IO:
- case XPT_EN_LUN:
- case XPT_NOTIFY_ACK:
- case XPT_IMMED_NOTIFY:
case XPT_TERM_IO:
default:
sym_xpt_done2(np, ccb, CAM_REQ_INVALID);
Modified: stable/11/sys/dev/trm/trm.c
==============================================================================
--- stable/11/sys/dev/trm/trm.c Tue Feb 28 06:32:01 2017 (r314380)
+++ stable/11/sys/dev/trm/trm.c Tue Feb 28 06:46:41 2017 (r314381)
@@ -543,11 +543,6 @@ trm_action(struct cam_sim *psim, union c
target_lun = pccb->ccb_h.target_lun;
switch (pccb->ccb_h.func_code) {
- case XPT_NOOP:
- TRM_DPRINTF(" XPT_NOOP \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
/*
* Execute the requested I/O operation
*/
@@ -623,16 +618,6 @@ trm_action(struct cam_sim *psim, union c
}
break;
}
- case XPT_GDEV_TYPE:
- TRM_DPRINTF(" XPT_GDEV_TYPE \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- case XPT_GDEVLIST:
- TRM_DPRINTF(" XPT_GDEVLIST \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
/*
* Path routing inquiry
* Path Inquiry CCB
@@ -661,76 +646,33 @@ trm_action(struct cam_sim *psim, union c
cpi->protocol_version = SCSI_REV_2;
cpi->ccb_h.status = CAM_REQ_CMP;
xpt_done(pccb);
- }
break;
+ }
/*
- * Release a frozen SIM queue
- * Release SIM Queue
+ * XPT_ABORT = 0x10, Abort the specified CCB
+ * Abort XPT request CCB
*/
- case XPT_REL_SIMQ:
- TRM_DPRINTF(" XPT_REL_SIMQ \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Set Asynchronous Callback Parameters
- * Set Asynchronous Callback CCB
- */
- case XPT_SASYNC_CB:
- TRM_DPRINTF(" XPT_SASYNC_CB \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Set device type information
- * Set Device Type CCB
- */
- case XPT_SDEV_TYPE:
- TRM_DPRINTF(" XPT_SDEV_TYPE \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Get EDT entries matching the given pattern
- */
- case XPT_DEV_MATCH:
- TRM_DPRINTF(" XPT_DEV_MATCH \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Turn on debugging for a bus, target or lun
- */
- case XPT_DEBUG:
- TRM_DPRINTF(" XPT_DEBUG \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * XPT_ABORT = 0x10, Abort the specified CCB
- * Abort XPT request CCB
- */
case XPT_ABORT:
TRM_DPRINTF(" XPT_ABORT \n");
pccb->ccb_h.status = CAM_REQ_INVALID;
xpt_done(pccb);
break;
/*
- * Reset the specified SCSI bus
- * Reset SCSI Bus CCB
- */
- case XPT_RESET_BUS: {
+ * Reset the specified SCSI bus
+ * Reset SCSI Bus CCB
+ */
+ case XPT_RESET_BUS: {
int i;
TRM_DPRINTF(" XPT_RESET_BUS \n");
- trm_reset(pACB);
+ trm_reset(pACB);
pACB->ACBFlag=0;
for (i=0; i<500; i++)
DELAY(1000);
pccb->ccb_h.status = CAM_REQ_CMP;
xpt_done(pccb);
- }
break;
+ }
/*
* Bus Device Reset the specified SCSI device
* Reset SCSI Device CCB
@@ -929,92 +871,6 @@ trm_action(struct cam_sim *psim, union c
cam_calc_geometry(&pccb->ccg, /*extended*/1);
xpt_done(pccb);
break;
- case XPT_ENG_INQ:
- TRM_DPRINTF(" XPT_ENG_INQ \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * HBA execute engine request
- * This structure must match SCSIIO size
- */
- case XPT_ENG_EXEC:
- TRM_DPRINTF(" XPT_ENG_EXEC \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * XPT_EN_LUN = 0x30, Enable LUN as a target
- * Target mode structures.
- */
- case XPT_EN_LUN:
- /*
- * Don't (yet?) support vendor
- * specific commands.
- */
- TRM_DPRINTF(" XPT_EN_LUN \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Execute target I/O request
- */
- case XPT_TARGET_IO:
- /*
- * Don't (yet?) support vendor
- * specific commands.
- */
- TRM_DPRINTF(" XPT_TARGET_IO \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Accept Host Target Mode CDB
- */
- case XPT_ACCEPT_TARGET_IO:
- /*
- * Don't (yet?) support vendor
- * specific commands.
- */
- TRM_DPRINTF(" XPT_ACCEPT_TARGET_IO \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Continue Host Target I/O Connection
- */
- case XPT_CONT_TARGET_IO:
- /*
- * Don't (yet?) support vendor
- * specific commands.
- */
- TRM_DPRINTF(" XPT_CONT_TARGET_IO \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Notify Host Target driver of event
- */
- case XPT_IMMED_NOTIFY:
- TRM_DPRINTF(" XPT_IMMED_NOTIFY \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Acknowledgement of event
- */
- case XPT_NOTIFY_ACK:
- TRM_DPRINTF(" XPT_NOTIFY_ACK \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * XPT_VUNIQUE = 0x80
- */
- case XPT_VUNIQUE:
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
default:
pccb->ccb_h.status = CAM_REQ_INVALID;
xpt_done(pccb);
More information about the svn-src-all
mailing list