Skip to contentSkip to conversation

zfcp: use fc_host attributes physical_port_name and physical_port_id

PATCH New Andreas Herrmann 1 participant 1 message Jan 5, 2006

Subsystems (3)
SCSI s390 s390 zfcp driver
lore
Share & tools
lore

Andreas Herrmann

author
#0 lore raw

PATCH 1/1 zfcp: use fc_host attributes physical_port_name and physical_port_id

From: Andreas Herrmann <[email protected]>

(This patch makes sense only if the previous patch of adding physical_port_name and physical_port_id to fc transport is accepted.)

[PATCH] zfcp: use fc_host attributes physical_port_name and physical_port_id

Make use of fc_host attributes physical_port_name and physical_port_id instead of using zfcp specific attributes.

Signed-off-by Andreas Herrmann <[email protected]>

---

 drivers/s390/scsi/zfcp_def.h           |    2 --
 drivers/s390/scsi/zfcp_fsf.c           |   20 ++++++++++++--------
 drivers/s390/scsi/zfcp_scsi.c          |    2 ++
 drivers/s390/scsi/zfcp_sysfs_adapter.c |    4 ----
 4 files changed, 14 insertions(+), 14 deletions(-)

a74bf07f0b9b8c5c304b2e52cf03f4007e56e86b

drivers/s390/scsi/zfcp_def.h +0 -2
index 3785b3c..31abc23 100644
@@ -917,8 +917,6 @@ struct zfcp_adapter {
 	wwn_t			peer_wwnn;	   /* P2P peer WWNN */
 	wwn_t			peer_wwpn;	   /* P2P peer WWPN */
 	u32			peer_d_id;	   /* P2P peer D_ID */
-	wwn_t			physical_wwpn;     /* WWPN of physical port */
-	u32			physical_s_id;     /* local FC port ID */
 	struct ccw_device       *ccw_device;	   /* S/390 ccw device */
 	u8			fc_service_class;
 	u32			fc_topology;	   /* FC topology */
drivers/s390/scsi/zfcp_fsf.c +12 -8
index bf859c9..25370db 100644
@@ -2045,10 +2045,12 @@ zfcp_fsf_exchange_config_evaluate(struct
 		fc_host_supported_classes(shost) = FC_COS_CLASS2 | FC_COS_CLASS3;
 		adapter->fc_topology = bottom->fc_topology;
 		adapter->hydra_version = bottom->adapter_type;
-		if (adapter->physical_wwpn == 0)
-			adapter->physical_wwpn = fc_host_port_name(shost);
-		if (adapter->physical_s_id == 0)
-			adapter->physical_s_id = fc_host_port_id(shost);
+		if (fc_host_physical_port_name(shost) == -1)
+			fc_host_physical_port_name(shost) =
+				fc_host_port_name(shost);
+		if (fc_host_physical_port_id(shost) == -1)
+			fc_host_physical_port_id(shost) =
+				fc_host_port_id(shost);
 	} else {
 		fc_host_node_name(shost) = 0;
 		fc_host_port_name(shost) = 0;

@@ -2329,11 +2331,13 @@ zfcp_fsf_exchange_port_data_handler(stru
 		if (data)
 			memcpy(data, bottom, sizeof(struct fsf_qtcb_bottom_port));
 		if (adapter->connection_features & FSF_FEATURE_NPIV_MODE) {
-			adapter->physical_wwpn = bottom->wwpn;
-			adapter->physical_s_id = bottom->fc_port_id;
+			fc_host_physical_port_name(shost) = bottom->wwpn;
+			fc_host_physical_port_id(shost) = bottom->fc_port_id;
 		} else {
-			adapter->physical_wwpn = fc_host_port_name(shost);
-			adapter->physical_s_id = fc_host_port_id(shost);
+			fc_host_physical_port_name(shost) =
+				fc_host_port_name(shost);
+			fc_host_physical_port_id(shost) =
+				fc_host_port_id(shost);
 		}
 		fc_host_maxframe_size(shost) = bottom->maximum_frame_size;
 		break;
drivers/s390/scsi/zfcp_scsi.c +2 -0
index 5ca0992..dc3b083 100644
@@ -865,6 +865,7 @@ struct fc_function_template zfcp_transpo
 	.show_rport_supported_classes = 1,
 	.show_host_node_name = 1,
 	.show_host_port_name = 1,
+ 	.show_host_physical_port_name = 1,
 	.show_host_supported_classes = 1,
 	.show_host_maxframe_size = 1,
 	.show_host_serial_number = 1,

@@ -874,6 +875,7 @@ struct fc_function_template zfcp_transpo
 	   directly set by LLDD */
 	.show_host_speed = 1,
 	.show_host_port_id = 1,
+ 	.show_host_physical_port_id = 1,
 };
 
 /**
drivers/s390/scsi/zfcp_sysfs_adapter.c +0 -4
index c85df9c..da5b56f 100644
@@ -65,8 +65,6 @@ ZFCP_DEFINE_ADAPTER_ATTR(status, "0x%08x
 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(physical_wwpn, "0x%016llx\n", adapter->physical_wwpn);
-ZFCP_DEFINE_ADAPTER_ATTR(physical_s_id, "0x%06x\n", adapter->physical_s_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_topology, "%s\n",

@@ -253,8 +251,6 @@ static struct attribute *zfcp_adapter_at
 	&dev_attr_peer_wwnn.attr,
 	&dev_attr_peer_wwpn.attr,
 	&dev_attr_peer_d_id.attr,
-	&dev_attr_physical_wwpn.attr,
-	&dev_attr_physical_s_id.attr,
 	&dev_attr_card_version.attr,
 	&dev_attr_lic_version.attr,
 	&dev_attr_fc_topology.attr,
Signature · 1 line
0.99.9n-g58e3