The first of 3 major steps to move the CAM layer forward to using

the CAM_NEW_TRAN_CODE that has been in the tree for some years now.

This first step consists solely of adding to or correcting
CAM_NEW_TRAN_CODE pieces in the kernel source tree such
that a both a GENERIC (at least on i386) and a LINT build
with CAM_NEW_TRAN_CODE as an option will compile correctly
and run (at least with some the h/w I have).

After a short settle time, the other pieces (making
CAM_NEW_TRAN_CODE the default and updating libcam
and camcontrol) will be brought in.

This will be an incompatible change in that the size of structures
related to XPT_PATH_INQ and XPT_{GET,SET}_TRAN_SETTINGS change
in both size and content. However, basic system operation and
basic system utilities work well enough with this change.

Reviewed by:	freebsd-scsi and specific stakeholders

1 files changed, 39 insertions, 4 deletions

diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index 4d3d987..2afb3b9 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -1004,11 +1004,39 @@ dpt_action(struct cam_sim *sim, union ccb *ccb)
 	case XPT_GET_TRAN_SETTINGS:
 	/* Get default/user set transfer settings for the target */
 	{
-		struct	ccb_trans_settings *cts;
-		u_int	target_mask;
+		struct	ccb_trans_settings *cts = &ccb->cts;
+#ifdef	CAM_NEW_TRAN_CODE
+		struct ccb_trans_settings_scsi *scsi =
+		    &cts->proto_specific.scsi;
+		struct ccb_trans_settings_spi *spi =
+		    &cts->xport_specific.spi;
+
+		cts->protocol = PROTO_SCSI;
+		cts->protocol_version = SCSI_REV_2;
+		cts->transport = XPORT_SPI;
+		cts->transport_version = 2;
  
-		cts = &ccb->cts;
-		target_mask = 0x01 << ccb->ccb_h.target_id;
+		if (cts->type == CTS_TYPE_USER_SETTINGS) {
+			spi->flags = CTS_SPI_FLAGS_DISC_ENB;
+			spi->bus_width = (dpt->max_id > 7)
+				       ? MSG_EXT_WDTR_BUS_8_BIT
+				       : MSG_EXT_WDTR_BUS_16_BIT;
+			spi->sync_period = 25; /* 10MHz */
+			if (spi->sync_period != 0)
+				spi->sync_offset = 15;
+			scsi->flags = CTS_SCSI_FLAGS_TAG_ENB;
+
+			spi->valid = CTS_SPI_VALID_SYNC_RATE
+				| CTS_SPI_VALID_SYNC_OFFSET
+				| CTS_SPI_VALID_SYNC_RATE
+				| CTS_SPI_VALID_BUS_WIDTH
+				| CTS_SPI_VALID_DISC;
+			scsi->valid = CTS_SCSI_VALID_TQ;
+			ccb->ccb_h.status = CAM_REQ_CMP;
+		} else {
+			ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
+		}
+#else
 		if ((cts->flags & CCB_TRANS_USER_SETTINGS) != 0) { 
 			cts->flags = CCB_TRANS_DISC_ENB|CCB_TRANS_TAG_ENB;
 			cts->bus_width = (dpt->max_id > 7)
@@ -1028,6 +1056,7 @@ dpt_action(struct cam_sim *sim, union ccb *ccb)
 		} else {
 			ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
 		}
+#endif
 		xpt_done(ccb);
 		break;
 	}
@@ -1073,6 +1102,12 @@ dpt_action(struct cam_sim *sim, union ccb *ccb)
 		strncpy(cpi->hba_vid, "DPT", HBA_IDLEN);
 		strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
 		cpi->unit_number = cam_sim_unit(sim);
+#ifdef	CAM_NEW_TRAN_CODE
+                cpi->transport = XPORT_SPI;
+                cpi->transport_version = 2;
+                cpi->protocol = PROTO_SCSI;
+                cpi->protocol_version = SCSI_REV_2;
+#endif
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
 		break;