Attachment 306969 Details for Bug 448777 – Backport from RHEL 5

[patch] Backport from RHEL 5

linux-2.6.9-s390-zfcp_p2p.patch (text/plain), 6.39 KB, created by Brad Hinson on 2008-05-28 18:46:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Hinson

Created: 2008-05-28 18:46:43 UTC

Size: 6.39 KB

patch

obsolete

>--- linux-2.6.9/drivers/s390/scsi/zfcp_aux.c.orig
>+++ linux-2.6.9/drivers/s390/scsi/zfcp_aux.c
>@@ -89,10 +89,10 @@
>     ("FCP (SCSI over Fibre Channel) HBA driver for IBM eServer zSeries");
> MODULE_LICENSE("GPL");
> 
>-module_param(device, charp, 0);
>+module_param(device, charp, 0400);
> MODULE_PARM_DESC(device, "specify initial device");
> 
>-module_param(loglevel, uint, 0);
>+module_param(loglevel, uint, 0400);
> MODULE_PARM_DESC(loglevel,
> 		 "log levels, 8 nibbles: "
> 		 "FC ERP QDIO CIO Config FSF SCSI Other, "
>--- linux-2.6.9/drivers/s390/scsi/zfcp_def.h.orig
>+++ linux-2.6.9/drivers/s390/scsi/zfcp_def.h
>@@ -71,7 +71,7 @@
> /********************* GENERAL DEFINES *********************************/
> 
> /* zfcp version number, it consists of major, minor, and patch-level number */
>-#define ZFCP_VERSION		"4.1.3"
>+#define ZFCP_VERSION		"4.1.4"
> 
> /**
>  * zfcp_sg_to_address - determine kernel address from struct scatterlist
>@@ -913,6 +913,9 @@
> 	wwn_t			wwnn;	           /* WWNN */
> 	wwn_t			wwpn;	           /* WWPN */
> 	fc_id_t			s_id;	           /* N_Port ID */
>+	wwn_t			peer_wwnn;	   /* P2P peer WWNN */
>+	wwn_t			peer_wwpn;	   /* P2P peer WWPN */
>+	fc_id_t			peer_d_id;	   /* P2P peer D_ID */
> 	struct ccw_device       *ccw_device;	   /* S/390 ccw device */
> 	u8			fc_service_class;
> 	u32			fc_topology;	   /* FC topology */
>--- linux-2.6.9/drivers/s390/scsi/zfcp_erp.c.orig
>+++ linux-2.6.9/drivers/s390/scsi/zfcp_erp.c
>@@ -2639,6 +2639,23 @@
> 	case ZFCP_ERP_STEP_UNINITIALIZED:
> 	case ZFCP_ERP_STEP_PHYS_PORT_CLOSING:
> 	case ZFCP_ERP_STEP_PORT_CLOSING:
>+		if (adapter->fc_topology == FSF_TOPO_P2P) {
>+			if (port->wwpn != adapter->peer_wwpn) {
>+				ZFCP_LOG_NORMAL("Failed to open port 0x%016Lx "
>+						"on adapter %s.\nPeer WWPN "
>+						"0x%016Lx does not match\n",
>+						port->wwpn,
>+						zfcp_get_busid_by_adapter(adapter),
>+						adapter->peer_wwpn);
>+				zfcp_erp_port_failed(port);
>+				retval = ZFCP_ERP_FAILED;
>+				break;
>+			}
>+			port->d_id = adapter->peer_d_id;
>+			atomic_set_mask(ZFCP_STATUS_PORT_DID_DID, &port->status);
>+			retval = zfcp_erp_port_strategy_open_port(erp_action);
>+			break;
>+		}
> 		if (!(adapter->nameserver_port)) {
> 			retval = zfcp_nameserver_enqueue(adapter);
> 			if (retval != 0) {
>--- linux-2.6.9/drivers/s390/scsi/zfcp_fsf.c.orig
>+++ linux-2.6.9/drivers/s390/scsi/zfcp_fsf.c
>@@ -2026,6 +2026,9 @@
> 		       bottom->low_qtcb_version, bottom->high_qtcb_version);
> 	adapter->fsf_lic_version = bottom->lic_version;
> 	adapter->supported_features = bottom->supported_features;
>+	adapter->peer_wwpn = 0;
>+	adapter->peer_wwnn = 0;
>+	adapter->peer_d_id = 0;
> 
> 	if (xchg_ok) {
> 		adapter->wwnn = bottom->nport_serv_param.wwnn;
>@@ -2043,13 +2046,19 @@
> 		adapter->hydra_version = 0;
> 	}
> 
>+	if (adapter->fc_topology == FSF_TOPO_P2P) {
>+		adapter->peer_d_id = bottom->peer_d_id & ZFCP_DID_MASK;
>+		adapter->peer_wwpn = bottom->plogi_payload.wwpn;
>+		adapter->peer_wwnn = bottom->plogi_payload.wwnn;
>+	}
>+
> 	if(adapter->supported_features & FSF_FEATURE_HBAAPI_MANAGEMENT){
> 		adapter->hardware_version = bottom->hardware_version;
> 		memcpy(adapter->serial_number, bottom->serial_number, 17);
> 		EBCASC(adapter->serial_number, sizeof(adapter->serial_number));
> 	}
> 
>-	ZFCP_LOG_INFO("The adapter %s reported the following characteristics:\n"
>+	ZFCP_LOG_NORMAL("The adapter %s reported the following characteristics:\n"
> 		      "WWNN 0x%016Lx, "
> 		      "WWPN 0x%016Lx, "
> 		      "S_ID 0x%08x,\n"
>@@ -2113,14 +2122,18 @@
> 		switch (adapter->fc_topology) {
> 		case FSF_TOPO_P2P:
> 			ZFCP_LOG_FLAGS(1, "FSF_TOPO_P2P\n");
>-			ZFCP_LOG_NORMAL("error: Point-to-point fibrechannel "
>-					"configuration detected at adapter %s "
>-					"unsupported, shutting down adapter\n",
>-					zfcp_get_busid_by_adapter(adapter));
>+			ZFCP_LOG_NORMAL("Point-to-Point fibrechannel "
>+					"configuration detected at adapter %s\n"
>+					"Peer WWNN 0x%016llx, "
>+					"peer WWPN 0x%016llx, "
>+					"peer d_id 0x%06x\n",
>+					zfcp_get_busid_by_adapter(adapter),
>+					adapter->peer_wwnn,
>+					adapter->peer_wwpn,
>+					adapter->peer_d_id);
> 			debug_text_event(fsf_req->adapter->erp_dbf, 0,
> 					 "top-p-to-p");
>-			zfcp_erp_adapter_shutdown(adapter, 0);
>-			return -EIO;
>+			break;
> 		case FSF_TOPO_AL:
> 			ZFCP_LOG_FLAGS(1, "FSF_TOPO_AL\n");
> 			ZFCP_LOG_NORMAL("error: Arbitrated loop fibrechannel "
>@@ -2145,6 +2158,7 @@
> 					"of a type known to the zfcp "
> 					"driver, shutting down adapter\n",
> 					zfcp_get_busid_by_adapter(adapter));
>+			adapter->fc_topology = FSF_TOPO_ERROR;
> 			debug_text_exception(fsf_req->adapter->erp_dbf, 0,
> 					     "unknown-topo");
> 			zfcp_erp_adapter_shutdown(adapter, 0);
>@@ -4253,7 +4267,7 @@
> 		 */
> 		scpnt->resid = fcp_rsp_iu->fcp_resid;
> 		if (scpnt->request_bufflen - scpnt->resid < scpnt->underflow)
>-			scpnt->result |= DID_ERROR << 16;
>+			set_host_byte(&scpnt->result, DID_ERROR);
> 	}
> 
>  skip_fsfstatus:
>--- linux-2.6.9/drivers/s390/scsi/zfcp_fsf.h.orig
>+++ linux-2.6.9/drivers/s390/scsi/zfcp_fsf.h
>@@ -354,7 +354,6 @@
> 	u8  class3_serv_param[16];
> 	u8  class4_serv_param[16];
> 	u8  vendor_version_level[16];
>-	u8  res1[16];
> } __attribute__ ((packed));
> 
> struct fsf_plogi {
>@@ -412,11 +411,13 @@
> 	u8 res2[12];
> 	u32 s_id;
> 	struct fsf_nport_serv_param nport_serv_param;
>+	u8 reserved_nport_serv_param[16];
> 	u8 res3[8];
> 	u32 adapter_ports;
> 	u32 hardware_version;
> 	u8 serial_number[32];
>-	u8 res4[272];
>+	struct fsf_nport_serv_param plogi_payload;
>+	u8 res4[160];
> } __attribute__ ((packed));
> 
> struct fsf_qtcb_bottom_port {
>--- linux-2.6.9/drivers/s390/scsi/zfcp_sysfs_adapter.c.orig
>+++ linux-2.6.9/drivers/s390/scsi/zfcp_sysfs_adapter.c
>@@ -64,6 +64,9 @@
> ZFCP_DEFINE_ADAPTER_ATTR(wwnn, "0x%016llx\n", adapter->wwnn);
> ZFCP_DEFINE_ADAPTER_ATTR(wwpn, "0x%016llx\n", adapter->wwpn);
> ZFCP_DEFINE_ADAPTER_ATTR(s_id, "0x%06x\n", adapter->s_id);
>+ZFCP_DEFINE_ADAPTER_ATTR(peer_wwnn, "0x%016llx\n", adapter->peer_wwnn);
>+ZFCP_DEFINE_ADAPTER_ATTR(peer_wwpn, "0x%016llx\n", adapter->peer_wwpn);
>+ZFCP_DEFINE_ADAPTER_ATTR(peer_d_id, "0x%06x\n", adapter->peer_d_id);
> ZFCP_DEFINE_ADAPTER_ATTR(card_version, "0x%04x\n", adapter->hydra_version);
> ZFCP_DEFINE_ADAPTER_ATTR(lic_version, "0x%08x\n", adapter->fsf_lic_version);
> ZFCP_DEFINE_ADAPTER_ATTR(fc_link_speed, "%d Gb/s\n", adapter->fc_link_speed);
>@@ -254,6 +257,9 @@
> 	&dev_attr_wwnn.attr,
> 	&dev_attr_wwpn.attr,
> 	&dev_attr_s_id.attr,
>+	&dev_attr_peer_wwnn.attr,
>+	&dev_attr_peer_wwpn.attr,
>+	&dev_attr_peer_d_id.attr,
> 	&dev_attr_card_version.attr,
> 	&dev_attr_lic_version.attr,
> 	&dev_attr_fc_link_speed.attr,

Actions: View | Diff

Attachments on bug 448777: 306969