svn commit: r196354 - in stable/8/sys: . amd64/include/xen cam cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/iscsi/initiator dev/ppbus dev/xen/xenpci

[Alexander Motin]

Author: mav
Date: Tue Aug 18 09:31:00 2009
New Revision: 196354
URL: http://svn.freebsd.org/changeset/base/196354

Log:
  MFC r196352:
  Fix iSCSI initiator and vpo driver operation, broken by CAM changes.
  
  Reviewed by:	scottl, Danny Braniss
  Approved by:	re (rwatson)

Modified:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cam/cam_ccb.h
  stable/8/sys/cam/cam_xpt.c
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/iscsi/initiator/isc_cam.c
  stable/8/sys/dev/ppbus/vpo.c
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/cam/cam_ccb.h
==============================================================================
--- stable/8/sys/cam/cam_ccb.h	Tue Aug 18 09:27:17 2009	(r196353)
+++ stable/8/sys/cam/cam_ccb.h	Tue Aug 18 09:31:00 2009	(r196354)
@@ -243,6 +243,7 @@ typedef enum {
 	XPORT_ATA,	/* AT Attachment */
 	XPORT_SAS,	/* Serial Attached SCSI */
 	XPORT_SATA,	/* Serial AT Attachment */
+	XPORT_ISCSI,	/* iSCSI */
 } cam_xport;
 
 #define PROTO_VERSION_UNKNOWN (UINT_MAX - 1)

Modified: stable/8/sys/cam/cam_xpt.c
==============================================================================
--- stable/8/sys/cam/cam_xpt.c	Tue Aug 18 09:27:17 2009	(r196353)
+++ stable/8/sys/cam/cam_xpt.c	Tue Aug 18 09:31:00 2009	(r196354)
@@ -3803,6 +3803,8 @@ xpt_bus_register(struct cam_sim *sim, de
 		case XPORT_SAS:
 		case XPORT_FC:
 		case XPORT_USB:
+		case XPORT_ISCSI:
+		case XPORT_PPB:
 			new_bus->xport = scsi_get_xport();
 			break;
 		case XPORT_ATA:

Modified: stable/8/sys/dev/iscsi/initiator/isc_cam.c
==============================================================================
--- stable/8/sys/dev/iscsi/initiator/isc_cam.c	Tue Aug 18 09:27:17 2009	(r196353)
+++ stable/8/sys/dev/iscsi/initiator/isc_cam.c	Tue Aug 18 09:31:00 2009	(r196354)
@@ -190,6 +190,8 @@ _inq(struct cam_sim *sim, union ccb *ccb
      strncpy(cpi->hba_vid, "iSCSI", HBA_IDLEN);
      strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
      cpi->unit_number = cam_sim_unit(sim);
+     cpi->transport = XPORT_ISCSI;
+     cpi->transport_version = 0;
      cpi->ccb_h.status = CAM_REQ_CMP;
 }
 

Modified: stable/8/sys/dev/ppbus/vpo.c
==============================================================================
--- stable/8/sys/dev/ppbus/vpo.c	Tue Aug 18 09:27:17 2009	(r196353)
+++ stable/8/sys/dev/ppbus/vpo.c	Tue Aug 18 09:31:00 2009	(r196354)
@@ -427,6 +427,8 @@ vpo_action(struct cam_sim *sim, union cc
 		strncpy(cpi->hba_vid, "Iomega", HBA_IDLEN);
 		strncpy(cpi->dev_name, sim->sim_name, DEV_IDLEN);
 		cpi->unit_number = sim->unit_number;
+		cpi->transport = XPORT_PPB;
+		cpi->transport_version = 0;
 
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);