scsi: libfc: Move scsi/fc_encode.h to libfc
authorArnd Bergmann <arnd@arndb.de>
Mon, 26 Oct 2020 16:06:12 +0000 (17:06 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 30 Oct 2020 01:49:25 +0000 (21:49 -0400)
Most of this file is only used inside of libfc, so move it to where it is
actually used, with only fc_fill_fc_hdr() left inside of the header.

Link: https://lore.kernel.org/r/20201026160705.3706396-1-arnd@kernel.org
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
13 files changed:
drivers/scsi/bnx2fc/bnx2fc.h
drivers/scsi/libfc/fc_elsct.c
drivers/scsi/libfc/fc_encode.h [new file with mode: 0644]
drivers/scsi/libfc/fc_exch.c
drivers/scsi/libfc/fc_fcp.c
drivers/scsi/libfc/fc_libfc.c
drivers/scsi/libfc/fc_lport.c
drivers/scsi/libfc/fc_rport.c
drivers/scsi/qedf/qedf.h
drivers/target/tcm_fc/tfc_cmd.c
drivers/target/tcm_fc/tfc_io.c
include/scsi/fc_encode.h [deleted file]
include/scsi/fc_frame.h

index b6e8ed757252afcfa70fd2e4a3385a34007f47e5..b4cea8b06ea1d130181ef1a83b46431887547dab 100644 (file)
@@ -51,7 +51,6 @@
 #include <scsi/scsi_tcq.h>
 #include <scsi/libfc.h>
 #include <scsi/libfcoe.h>
-#include <scsi/fc_encode.h>
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_fc.h>
 #include <scsi/fc/fc_fip.h>
index 13a2e7c33cb12d35104688d4f684919627df94d4..8d3006edbe12835a5a30fa462d582c0ad27ab414 100644 (file)
@@ -15,7 +15,7 @@
 #include <scsi/fc/fc_ns.h>
 #include <scsi/fc/fc_els.h>
 #include <scsi/libfc.h>
-#include <scsi/fc_encode.h>
+#include "fc_encode.h"
 #include "fc_libfc.h"
 
 /**
diff --git a/drivers/scsi/libfc/fc_encode.h b/drivers/scsi/libfc/fc_encode.h
new file mode 100644 (file)
index 0000000..18203ca
--- /dev/null
@@ -0,0 +1,699 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright(c) 2008 Intel Corporation. All rights reserved.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+
+#ifndef _FC_ENCODE_H_
+#define _FC_ENCODE_H_
+#include <asm/unaligned.h>
+#include <linux/utsname.h>
+#include <scsi/fc/fc_ms.h>
+
+/*
+ * F_CTL values for simple requests and responses.
+ */
+#define FC_FCTL_REQ    (FC_FC_FIRST_SEQ | FC_FC_END_SEQ | FC_FC_SEQ_INIT)
+#define FC_FCTL_RESP   (FC_FC_EX_CTX | FC_FC_LAST_SEQ | \
+                       FC_FC_END_SEQ | FC_FC_SEQ_INIT)
+
+struct fc_ns_rft {
+       struct fc_ns_fid fid;   /* port ID object */
+       struct fc_ns_fts fts;   /* FC4-types object */
+};
+
+struct fc_ct_req {
+       struct fc_ct_hdr hdr;
+       union {
+               struct fc_ns_gid_ft gid;
+               struct fc_ns_rn_id  rn;
+               struct fc_ns_rft rft;
+               struct fc_ns_rff_id rff;
+               struct fc_ns_fid fid;
+               struct fc_ns_rsnn snn;
+               struct fc_ns_rspn spn;
+               struct fc_fdmi_rhba rhba;
+               struct fc_fdmi_rpa  rpa;
+               struct fc_fdmi_dprt dprt;
+               struct fc_fdmi_dhba dhba;
+       } payload;
+};
+
+/**
+ * fc_adisc_fill() - Fill in adisc request frame
+ * @lport: local port.
+ * @fp: fc frame where payload will be placed.
+ */
+static inline void fc_adisc_fill(struct fc_lport *lport, struct fc_frame *fp)
+{
+       struct fc_els_adisc *adisc;
+
+       adisc = fc_frame_payload_get(fp, sizeof(*adisc));
+       memset(adisc, 0, sizeof(*adisc));
+       adisc->adisc_cmd = ELS_ADISC;
+       put_unaligned_be64(lport->wwpn, &adisc->adisc_wwpn);
+       put_unaligned_be64(lport->wwnn, &adisc->adisc_wwnn);
+       hton24(adisc->adisc_port_id, lport->port_id);
+}
+
+/**
+ * fc_ct_hdr_fill- fills ct header and reset ct payload
+ * returns pointer to ct request.
+ */
+static inline struct fc_ct_req *fc_ct_hdr_fill(const struct fc_frame *fp,
+                                              unsigned int op, size_t req_size,
+                                              enum fc_ct_fs_type fs_type,
+                                              u8 subtype)
+{
+       struct fc_ct_req *ct;
+       size_t ct_plen;
+
+       ct_plen  = sizeof(struct fc_ct_hdr) + req_size;
+       ct = fc_frame_payload_get(fp, ct_plen);
+       memset(ct, 0, ct_plen);
+       ct->hdr.ct_rev = FC_CT_REV;
+       ct->hdr.ct_fs_type = fs_type;
+       ct->hdr.ct_fs_subtype = subtype;
+       ct->hdr.ct_cmd = htons((u16) op);
+       return ct;
+}
+
+/**
+ * fc_ct_ns_fill() - Fill in a name service request frame
+ * @lport: local port.
+ * @fc_id: FC_ID of non-destination rport for GPN_ID and similar inquiries.
+ * @fp: frame to contain payload.
+ * @op: CT opcode.
+ * @r_ctl: pointer to FC header R_CTL.
+ * @fh_type: pointer to FC-4 type.
+ */
+static inline int fc_ct_ns_fill(struct fc_lport *lport,
+                     u32 fc_id, struct fc_frame *fp,
+                     unsigned int op, enum fc_rctl *r_ctl,
+                     enum fc_fh_type *fh_type)
+{
+       struct fc_ct_req *ct;
+       size_t len;
+
+       switch (op) {
+       case FC_NS_GPN_FT:
+               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_gid_ft),
+                                   FC_FST_DIR, FC_NS_SUBTYPE);
+               ct->payload.gid.fn_fc4_type = FC_TYPE_FCP;
+               break;
+
+       case FC_NS_GPN_ID:
+               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_fid),
+                                   FC_FST_DIR, FC_NS_SUBTYPE);
+               ct->payload.gid.fn_fc4_type = FC_TYPE_FCP;
+               hton24(ct->payload.fid.fp_fid, fc_id);
+               break;
+
+       case FC_NS_RFT_ID:
+               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rft),
+                                   FC_FST_DIR, FC_NS_SUBTYPE);
+               hton24(ct->payload.rft.fid.fp_fid, lport->port_id);
+               ct->payload.rft.fts = lport->fcts;
+               break;
+
+       case FC_NS_RFF_ID:
+               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rff_id),
+                                   FC_FST_DIR, FC_NS_SUBTYPE);
+               hton24(ct->payload.rff.fr_fid.fp_fid, lport->port_id);
+               ct->payload.rff.fr_type = FC_TYPE_FCP;
+               if (lport->service_params & FCP_SPPF_INIT_FCN)
+                       ct->payload.rff.fr_feat = FCP_FEAT_INIT;
+               if (lport->service_params & FCP_SPPF_TARG_FCN)
+                       ct->payload.rff.fr_feat |= FCP_FEAT_TARG;
+               break;
+
+       case FC_NS_RNN_ID:
+               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rn_id),
+                                   FC_FST_DIR, FC_NS_SUBTYPE);
+               hton24(ct->payload.rn.fr_fid.fp_fid, lport->port_id);
+               put_unaligned_be64(lport->wwnn, &ct->payload.rn.fr_wwn);
+               break;
+
+       case FC_NS_RSPN_ID:
+               len = strnlen(fc_host_symbolic_name(lport->host), 255);
+               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rspn) + len,
+                                   FC_FST_DIR, FC_NS_SUBTYPE);
+               hton24(ct->payload.spn.fr_fid.fp_fid, lport->port_id);
+               strncpy(ct->payload.spn.fr_name,
+                       fc_host_symbolic_name(lport->host), len);
+               ct->payload.spn.fr_name_len = len;
+               break;
+
+       case FC_NS_RSNN_NN:
+               len = strnlen(fc_host_symbolic_name(lport->host), 255);
+               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rsnn) + len,
+                                   FC_FST_DIR, FC_NS_SUBTYPE);
+               put_unaligned_be64(lport->wwnn, &ct->payload.snn.fr_wwn);
+               strncpy(ct->payload.snn.fr_name,
+                       fc_host_symbolic_name(lport->host), len);
+               ct->payload.snn.fr_name_len = len;
+               break;
+
+       default:
+               return -EINVAL;
+       }
+       *r_ctl = FC_RCTL_DD_UNSOL_CTL;
+       *fh_type = FC_TYPE_CT;
+       return 0;
+}
+
+/**
+ * fc_ct_ms_fill() - Fill in a mgmt service request frame
+ * @lport: local port.
+ * @fc_id: FC_ID of non-destination rport for GPN_ID and similar inquiries.
+ * @fp: frame to contain payload.
+ * @op: CT opcode.
+ * @r_ctl: pointer to FC header R_CTL.
+ * @fh_type: pointer to FC-4 type.
+ */
+static inline int fc_ct_ms_fill(struct fc_lport *lport,
+                     u32 fc_id, struct fc_frame *fp,
+                     unsigned int op, enum fc_rctl *r_ctl,
+                     enum fc_fh_type *fh_type)
+{
+       struct fc_ct_req *ct;
+       size_t len;
+       struct fc_fdmi_attr_entry *entry;
+       struct fs_fdmi_attrs *hba_attrs;
+       int numattrs = 0;
+
+       switch (op) {
+       case FC_FDMI_RHBA:
+               numattrs = 10;
+               len = sizeof(struct fc_fdmi_rhba);
+               len -= sizeof(struct fc_fdmi_attr_entry);
+               len += (numattrs * FC_FDMI_ATTR_ENTRY_HEADER_LEN);
+               len += FC_FDMI_HBA_ATTR_NODENAME_LEN;
+               len += FC_FDMI_HBA_ATTR_MANUFACTURER_LEN;
+               len += FC_FDMI_HBA_ATTR_SERIALNUMBER_LEN;
+               len += FC_FDMI_HBA_ATTR_MODEL_LEN;
+               len += FC_FDMI_HBA_ATTR_MODELDESCR_LEN;
+               len += FC_FDMI_HBA_ATTR_HARDWAREVERSION_LEN;
+               len += FC_FDMI_HBA_ATTR_DRIVERVERSION_LEN;
+               len += FC_FDMI_HBA_ATTR_OPTIONROMVERSION_LEN;
+               len += FC_FDMI_HBA_ATTR_FIRMWAREVERSION_LEN;
+               len += FC_FDMI_HBA_ATTR_OSNAMEVERSION_LEN;
+               ct = fc_ct_hdr_fill(fp, op, len, FC_FST_MGMT,
+                                   FC_FDMI_SUBTYPE);
+
+               /* HBA Identifier */
+               put_unaligned_be64(lport->wwpn, &ct->payload.rhba.hbaid.id);
+               /* Number of Ports - always 1 */
+               put_unaligned_be32(1, &ct->payload.rhba.port.numport);
+               /* Port Name */
+               put_unaligned_be64(lport->wwpn,
+                                  &ct->payload.rhba.port.port[0].portname);
+
+               /* HBA Attributes */
+               put_unaligned_be32(numattrs,
+                                  &ct->payload.rhba.hba_attrs.numattrs);
+               hba_attrs = &ct->payload.rhba.hba_attrs;
+               entry = (struct fc_fdmi_attr_entry *)hba_attrs->attr;
+               /* NodeName*/
+               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
+               len += FC_FDMI_HBA_ATTR_NODENAME_LEN;
+               put_unaligned_be16(FC_FDMI_HBA_ATTR_NODENAME,
+                                  &entry->type);
+               put_unaligned_be16(len, &entry->len);
+               put_unaligned_be64(lport->wwnn,
+                                  (__be64 *)&entry->value[0]);
+
+               /* Manufacturer */
+               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
+                                       FC_FDMI_HBA_ATTR_NODENAME_LEN);
+               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
+               len += FC_FDMI_HBA_ATTR_MANUFACTURER_LEN;
+               put_unaligned_be16(FC_FDMI_HBA_ATTR_MANUFACTURER,
+                                  &entry->type);
+               put_unaligned_be16(len, &entry->len);
+               strncpy((char *)&entry->value,
+                       fc_host_manufacturer(lport->host),
+                       FC_FDMI_HBA_ATTR_MANUFACTURER_LEN);
+
+               /* SerialNumber */
+               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
+                                       FC_FDMI_HBA_ATTR_MANUFACTURER_LEN);
+               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
+               len += FC_FDMI_HBA_ATTR_SERIALNUMBER_LEN;
+               put_unaligned_be16(FC_FDMI_HBA_ATTR_SERIALNUMBER,
+                                  &entry->type);
+               put_unaligned_be16(len, &entry->len);
+               strncpy((char *)&entry->value,
+                       fc_host_serial_number(lport->host),
+                       FC_FDMI_HBA_ATTR_SERIALNUMBER_LEN);
+
+               /* Model */
+               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
+                                       FC_FDMI_HBA_ATTR_SERIALNUMBER_LEN);
+               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
+               len += FC_FDMI_HBA_ATTR_MODEL_LEN;
+               put_unaligned_be16(FC_FDMI_HBA_ATTR_MODEL,
+                                  &entry->type);
+               put_unaligned_be16(len, &entry->len);
+               strncpy((char *)&entry->value,
+                       fc_host_model(lport->host),
+                       FC_FDMI_HBA_ATTR_MODEL_LEN);
+
+               /* Model Description */
+               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
+                                       FC_FDMI_HBA_ATTR_MODEL_LEN);
+               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
+               len += FC_FDMI_HBA_ATTR_MODELDESCR_LEN;
+               put_unaligned_be16(FC_FDMI_HBA_ATTR_MODELDESCRIPTION,
+                                  &entry->type);
+               put_unaligned_be16(len, &entry->len);
+               strncpy((char *)&entry->value,
+                       fc_host_model_description(lport->host),
+                       FC_FDMI_HBA_ATTR_MODELDESCR_LEN);
+
+               /* Hardware Version */
+               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
+                                       FC_FDMI_HBA_ATTR_MODELDESCR_LEN);
+               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
+               len += FC_FDMI_HBA_ATTR_HARDWAREVERSION_LEN;
+               put_unaligned_be16(FC_FDMI_HBA_ATTR_HARDWAREVERSION,
+                                  &entry->type);
+               put_unaligned_be16(len, &entry->len);
+               strncpy((char *)&entry->value,
+                       fc_host_hardware_version(lport->host),
+                       FC_FDMI_HBA_ATTR_HARDWAREVERSION_LEN);
+
+               /* Driver Version */
+               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
+                                       FC_FDMI_HBA_ATTR_HARDWAREVERSION_LEN);
+               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
+               len += FC_FDMI_HBA_ATTR_DRIVERVERSION_LEN;
+               put_unaligned_be16(FC_FDMI_HBA_ATTR_DRIVERVERSION,
+                                  &entry->type);
+               put_unaligned_be16(len, &entry->len);
+               strncpy((char *)&entry->value,
+                       fc_host_driver_version(lport->host),
+                       FC_FDMI_HBA_ATTR_DRIVERVERSION_LEN);
+
+               /* OptionROM Version */
+               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
+                                       FC_FDMI_HBA_ATTR_DRIVERVERSION_LEN);
+               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
+               len += FC_FDMI_HBA_ATTR_OPTIONROMVERSION_LEN;
+               put_unaligned_be16(FC_FDMI_HBA_ATTR_OPTIONROMVERSION,
+                                  &entry->type);
+               put_unaligned_be16(len, &entry->len);
+               strncpy((char *)&entry->value,
+                       fc_host_optionrom_version(lport->host),
+                       FC_FDMI_HBA_ATTR_OPTIONROMVERSION_LEN);
+
+               /* Firmware Version */
+               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
+                                       FC_FDMI_HBA_ATTR_OPTIONROMVERSION_LEN);
+               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
+               len += FC_FDMI_HBA_ATTR_FIRMWAREVERSION_LEN;
+               put_unaligned_be16(FC_FDMI_HBA_ATTR_FIRMWAREVERSION,
+                                  &entry->type);
+               put_unaligned_be16(len, &entry->len);
+               strncpy((char *)&entry->value,
+                       fc_host_firmware_version(lport->host),
+                       FC_FDMI_HBA_ATTR_FIRMWAREVERSION_LEN);
+
+               /* OS Name and Version */
+               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
+                                       FC_FDMI_HBA_ATTR_FIRMWAREVERSION_LEN);
+               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
+               len += FC_FDMI_HBA_ATTR_OSNAMEVERSION_LEN;
+               put_unaligned_be16(FC_FDMI_HBA_ATTR_OSNAMEVERSION,
+                                  &entry->type);
+               put_unaligned_be16(len, &entry->len);
+               snprintf((char *)&entry->value,
+                       FC_FDMI_HBA_ATTR_OSNAMEVERSION_LEN,
+                       "%s v%s",
+                       init_utsname()->sysname,
+                       init_utsname()->release);
+               break;
+       case FC_FDMI_RPA:
+               numattrs = 6;
+               len = sizeof(struct fc_fdmi_rpa);
+               len -= sizeof(struct fc_fdmi_attr_entry);
+               len += (numattrs * FC_FDMI_ATTR_ENTRY_HEADER_LEN);
+               len += FC_FDMI_PORT_ATTR_FC4TYPES_LEN;
+               len += FC_FDMI_PORT_ATTR_SUPPORTEDSPEED_LEN;
+               len += FC_FDMI_PORT_ATTR_CURRENTPORTSPEED_LEN;
+               len += FC_FDMI_PORT_ATTR_MAXFRAMESIZE_LEN;
+               len += FC_FDMI_PORT_ATTR_OSDEVICENAME_LEN;
+               len += FC_FDMI_PORT_ATTR_HOSTNAME_LEN;
+               ct = fc_ct_hdr_fill(fp, op, len, FC_FST_MGMT,
+                                   FC_FDMI_SUBTYPE);
+
+               /* Port Name */
+               put_unaligned_be64(lport->wwpn,
+                                  &ct->payload.rpa.port.portname);
+
+               /* Port Attributes */
+               put_unaligned_be32(numattrs,
+                                  &ct->payload.rpa.hba_attrs.numattrs);
+
+               hba_attrs = &ct->payload.rpa.hba_attrs;
+               entry = (struct fc_fdmi_attr_entry *)hba_attrs->attr;
+
+               /* FC4 types */
+               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
+               len += FC_FDMI_PORT_ATTR_FC4TYPES_LEN;
+               put_unaligned_be16(FC_FDMI_PORT_ATTR_FC4TYPES,
+                                  &entry->type);
+               put_unaligned_be16(len, &entry->len);
+               memcpy(&entry->value, fc_host_supported_fc4s(lport->host),
+                      FC_FDMI_PORT_ATTR_FC4TYPES_LEN);
+
+               /* Supported Speed */
+               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
+                                       FC_FDMI_PORT_ATTR_FC4TYPES_LEN);
+               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
+               len += FC_FDMI_PORT_ATTR_SUPPORTEDSPEED_LEN;
+               put_unaligned_be16(FC_FDMI_PORT_ATTR_SUPPORTEDSPEED,
+                                  &entry->type);
+               put_unaligned_be16(len, &entry->len);
+
+               put_unaligned_be32(fc_host_supported_speeds(lport->host),
+                                  &entry->value);
+
+               /* Current Port Speed */
+               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
+                                       FC_FDMI_PORT_ATTR_SUPPORTEDSPEED_LEN);
+               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
+               len += FC_FDMI_PORT_ATTR_CURRENTPORTSPEED_LEN;
+               put_unaligned_be16(FC_FDMI_PORT_ATTR_CURRENTPORTSPEED,
+                                  &entry->type);
+               put_unaligned_be16(len, &entry->len);
+               put_unaligned_be32(lport->link_speed,
+                                  &entry->value);
+
+               /* Max Frame Size */
+               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
+                                       FC_FDMI_PORT_ATTR_CURRENTPORTSPEED_LEN);
+               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
+               len += FC_FDMI_PORT_ATTR_MAXFRAMESIZE_LEN;
+               put_unaligned_be16(FC_FDMI_PORT_ATTR_MAXFRAMESIZE,
+                                  &entry->type);
+               put_unaligned_be16(len, &entry->len);
+               put_unaligned_be32(fc_host_maxframe_size(lport->host),
+                                  &entry->value);
+
+               /* OS Device Name */
+               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
+                                       FC_FDMI_PORT_ATTR_MAXFRAMESIZE_LEN);
+               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
+               len += FC_FDMI_PORT_ATTR_OSDEVICENAME_LEN;
+               put_unaligned_be16(FC_FDMI_PORT_ATTR_OSDEVICENAME,
+                                  &entry->type);
+               put_unaligned_be16(len, &entry->len);
+               /* Use the sysfs device name */
+               strncpy((char *)&entry->value,
+                       dev_name(&lport->host->shost_gendev),
+                       strnlen(dev_name(&lport->host->shost_gendev),
+                               FC_FDMI_PORT_ATTR_HOSTNAME_LEN));
+
+               /* Host Name */
+               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
+                                       FC_FDMI_PORT_ATTR_OSDEVICENAME_LEN);
+               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
+               len += FC_FDMI_PORT_ATTR_HOSTNAME_LEN;
+               put_unaligned_be16(FC_FDMI_PORT_ATTR_HOSTNAME,
+                                  &entry->type);
+               put_unaligned_be16(len, &entry->len);
+               if (strlen(fc_host_system_hostname(lport->host)))
+                       strncpy((char *)&entry->value,
+                               fc_host_system_hostname(lport->host),
+                               strnlen(fc_host_system_hostname(lport->host),
+                                       FC_FDMI_PORT_ATTR_HOSTNAME_LEN));
+               else
+                       strncpy((char *)&entry->value,
+                               init_utsname()->nodename,
+                               FC_FDMI_PORT_ATTR_HOSTNAME_LEN);
+               break;
+       case FC_FDMI_DPRT:
+               len = sizeof(struct fc_fdmi_dprt);
+               ct = fc_ct_hdr_fill(fp, op, len, FC_FST_MGMT,
+                                   FC_FDMI_SUBTYPE);
+               /* Port Name */
+               put_unaligned_be64(lport->wwpn,
+                                  &ct->payload.dprt.port.portname);
+               break;
+       case FC_FDMI_DHBA:
+               len = sizeof(struct fc_fdmi_dhba);
+               ct = fc_ct_hdr_fill(fp, op, len, FC_FST_MGMT,
+                                   FC_FDMI_SUBTYPE);
+               /* HBA Identifier */
+               put_unaligned_be64(lport->wwpn, &ct->payload.dhba.hbaid.id);
+               break;
+       default:
+               return -EINVAL;
+       }
+       *r_ctl = FC_RCTL_DD_UNSOL_CTL;
+       *fh_type = FC_TYPE_CT;
+       return 0;
+}
+
+/**
+ * fc_ct_fill() - Fill in a common transport service request frame
+ * @lport: local port.
+ * @fc_id: FC_ID of non-destination rport for GPN_ID and similar inquiries.
+ * @fp: frame to contain payload.
+ * @op: CT opcode.
+ * @r_ctl: pointer to FC header R_CTL.
+ * @fh_type: pointer to FC-4 type.
+ */
+static inline int fc_ct_fill(struct fc_lport *lport,
+                     u32 fc_id, struct fc_frame *fp,
+                     unsigned int op, enum fc_rctl *r_ctl,
+                     enum fc_fh_type *fh_type, u32 *did)
+{
+       int rc = -EINVAL;
+
+       switch (fc_id) {
+       case FC_FID_MGMT_SERV:
+               rc = fc_ct_ms_fill(lport, fc_id, fp, op, r_ctl, fh_type);
+               *did = FC_FID_MGMT_SERV;
+               break;
+       case FC_FID_DIR_SERV:
+       default:
+               rc = fc_ct_ns_fill(lport, fc_id, fp, op, r_ctl, fh_type);
+               *did = FC_FID_DIR_SERV;
+               break;
+       }
+
+       return rc;
+}
+/**
+ * fc_plogi_fill - Fill in plogi request frame
+ */
+static inline void fc_plogi_fill(struct fc_lport *lport, struct fc_frame *fp,
+                                unsigned int op)
+{
+       struct fc_els_flogi *plogi;
+       struct fc_els_csp *csp;
+       struct fc_els_cssp *cp;
+
+       plogi = fc_frame_payload_get(fp, sizeof(*plogi));
+       memset(plogi, 0, sizeof(*plogi));
+       plogi->fl_cmd = (u8) op;
+       put_unaligned_be64(lport->wwpn, &plogi->fl_wwpn);
+       put_unaligned_be64(lport->wwnn, &plogi->fl_wwnn);
+
+       csp = &plogi->fl_csp;
+       csp->sp_hi_ver = 0x20;
+       csp->sp_lo_ver = 0x20;
+       csp->sp_bb_cred = htons(10);    /* this gets set by gateway */
+       csp->sp_bb_data = htons((u16) lport->mfs);
+       cp = &plogi->fl_cssp[3 - 1];    /* class 3 parameters */
+       cp->cp_class = htons(FC_CPC_VALID | FC_CPC_SEQ);
+       csp->sp_features = htons(FC_SP_FT_CIRO);
+       csp->sp_tot_seq = htons(255);   /* seq. we accept */
+       csp->sp_rel_off = htons(0x1f);
+       csp->sp_e_d_tov = htonl(lport->e_d_tov);
+
+       cp->cp_rdfs = htons((u16) lport->mfs);
+       cp->cp_con_seq = htons(255);
+       cp->cp_open_seq = 1;
+}
+
+/**
+ * fc_flogi_fill - Fill in a flogi request frame.
+ */
+static inline void fc_flogi_fill(struct fc_lport *lport, struct fc_frame *fp)
+{
+       struct fc_els_csp *sp;
+       struct fc_els_cssp *cp;
+       struct fc_els_flogi *flogi;
+
+       flogi = fc_frame_payload_get(fp, sizeof(*flogi));
+       memset(flogi, 0, sizeof(*flogi));
+       flogi->fl_cmd = (u8) ELS_FLOGI;
+       put_unaligned_be64(lport->wwpn, &flogi->fl_wwpn);
+       put_unaligned_be64(lport->wwnn, &flogi->fl_wwnn);
+       sp = &flogi->fl_csp;
+       sp->sp_hi_ver = 0x20;
+       sp->sp_lo_ver = 0x20;
+       sp->sp_bb_cred = htons(10);     /* this gets set by gateway */
+       sp->sp_bb_data = htons((u16) lport->mfs);
+       cp = &flogi->fl_cssp[3 - 1];    /* class 3 parameters */
+       cp->cp_class = htons(FC_CPC_VALID | FC_CPC_SEQ);
+       if (lport->does_npiv)
+               sp->sp_features = htons(FC_SP_FT_NPIV);
+}
+
+/**
+ * fc_fdisc_fill - Fill in a fdisc request frame.
+ */
+static inline void fc_fdisc_fill(struct fc_lport *lport, struct fc_frame *fp)
+{
+       struct fc_els_csp *sp;
+       struct fc_els_cssp *cp;
+       struct fc_els_flogi *fdisc;
+
+       fdisc = fc_frame_payload_get(fp, sizeof(*fdisc));
+       memset(fdisc, 0, sizeof(*fdisc));
+       fdisc->fl_cmd = (u8) ELS_FDISC;
+       put_unaligned_be64(lport->wwpn, &fdisc->fl_wwpn);
+       put_unaligned_be64(lport->wwnn, &fdisc->fl_wwnn);
+       sp = &fdisc->fl_csp;
+       sp->sp_hi_ver = 0x20;
+       sp->sp_lo_ver = 0x20;
+       sp->sp_bb_cred = htons(10);     /* this gets set by gateway */
+       sp->sp_bb_data = htons((u16) lport->mfs);
+       cp = &fdisc->fl_cssp[3 - 1];    /* class 3 parameters */
+       cp->cp_class = htons(FC_CPC_VALID | FC_CPC_SEQ);
+}
+
+/**
+ * fc_logo_fill - Fill in a logo request frame.
+ */
+static inline void fc_logo_fill(struct fc_lport *lport, struct fc_frame *fp)
+{
+       struct fc_els_logo *logo;
+
+       logo = fc_frame_payload_get(fp, sizeof(*logo));
+       memset(logo, 0, sizeof(*logo));
+       logo->fl_cmd = ELS_LOGO;
+       hton24(logo->fl_n_port_id, lport->port_id);
+       logo->fl_n_port_wwn = htonll(lport->wwpn);
+}
+
+/**
+ * fc_rtv_fill - Fill in RTV (read timeout value) request frame.
+ */
+static inline void fc_rtv_fill(struct fc_lport *lport, struct fc_frame *fp)
+{
+       struct fc_els_rtv *rtv;
+
+       rtv = fc_frame_payload_get(fp, sizeof(*rtv));
+       memset(rtv, 0, sizeof(*rtv));
+       rtv->rtv_cmd = ELS_RTV;
+}
+
+/**
+ * fc_rec_fill - Fill in rec request frame
+ */
+static inline void fc_rec_fill(struct fc_lport *lport, struct fc_frame *fp)
+{
+       struct fc_els_rec *rec;
+       struct fc_exch *ep = fc_seq_exch(fr_seq(fp));
+
+       rec = fc_frame_payload_get(fp, sizeof(*rec));
+       memset(rec, 0, sizeof(*rec));
+       rec->rec_cmd = ELS_REC;
+       hton24(rec->rec_s_id, lport->port_id);
+       rec->rec_ox_id = htons(ep->oxid);
+       rec->rec_rx_id = htons(ep->rxid);
+}
+
+/**
+ * fc_prli_fill - Fill in prli request frame
+ */
+static inline void fc_prli_fill(struct fc_lport *lport, struct fc_frame *fp)
+{
+       struct {
+               struct fc_els_prli prli;
+               struct fc_els_spp spp;
+       } *pp;
+
+       pp = fc_frame_payload_get(fp, sizeof(*pp));
+       memset(pp, 0, sizeof(*pp));
+       pp->prli.prli_cmd = ELS_PRLI;
+       pp->prli.prli_spp_len = sizeof(struct fc_els_spp);
+       pp->prli.prli_len = htons(sizeof(*pp));
+       pp->spp.spp_type = FC_TYPE_FCP;
+       pp->spp.spp_flags = FC_SPP_EST_IMG_PAIR;
+       pp->spp.spp_params = htonl(lport->service_params);
+}
+
+/**
+ * fc_scr_fill - Fill in a scr request frame.
+ */
+static inline void fc_scr_fill(struct fc_lport *lport, struct fc_frame *fp)
+{
+       struct fc_els_scr *scr;
+
+       scr = fc_frame_payload_get(fp, sizeof(*scr));
+       memset(scr, 0, sizeof(*scr));
+       scr->scr_cmd = ELS_SCR;
+       scr->scr_reg_func = ELS_SCRF_FULL;
+}
+
+/**
+ * fc_els_fill - Fill in an ELS  request frame
+ */
+static inline int fc_els_fill(struct fc_lport *lport,
+                      u32 did,
+                      struct fc_frame *fp, unsigned int op,
+                      enum fc_rctl *r_ctl, enum fc_fh_type *fh_type)
+{
+       switch (op) {
+       case ELS_ADISC:
+               fc_adisc_fill(lport, fp);
+               break;
+
+       case ELS_PLOGI:
+               fc_plogi_fill(lport, fp, ELS_PLOGI);
+               break;
+
+       case ELS_FLOGI:
+               fc_flogi_fill(lport, fp);
+               break;
+
+       case ELS_FDISC:
+               fc_fdisc_fill(lport, fp);
+               break;
+
+       case ELS_LOGO:
+               fc_logo_fill(lport, fp);
+               break;
+
+       case ELS_RTV:
+               fc_rtv_fill(lport, fp);
+               break;
+
+       case ELS_REC:
+               fc_rec_fill(lport, fp);
+               break;
+
+       case ELS_PRLI:
+               fc_prli_fill(lport, fp);
+               break;
+
+       case ELS_SCR:
+               fc_scr_fill(lport, fp);
+               break;
+
+       default:
+               return -EINVAL;
+       }
+
+       *r_ctl = FC_RCTL_ELS_REQ;
+       *fh_type = FC_TYPE_ELS;
+       return 0;
+}
+#endif /* _FC_ENCODE_H_ */
index 96a2952cf626bf1b3bb08c01cac23a9d5c359310..91e680b53523d91877d427909cca6da1e282e41a 100644 (file)
@@ -20,7 +20,6 @@
 #include <scsi/fc/fc_fc2.h>
 
 #include <scsi/libfc.h>
-#include <scsi/fc_encode.h>
 
 #include "fc_libfc.h"
 
index 7cfeb6886237c0f44071fccc1ec7480b80679ec3..b43b5f62ee3e3b4baa481a556cf928660538e987 100644 (file)
@@ -26,8 +26,8 @@
 #include <scsi/fc/fc_fc2.h>
 
 #include <scsi/libfc.h>
-#include <scsi/fc_encode.h>
 
+#include "fc_encode.h"
 #include "fc_libfc.h"
 
 static struct kmem_cache *scsi_pkt_cachep;
index 19c4ab4e0f4daa7ff4525d19a792f171e26cc99c..0e6a1355d0200435a952c36866c9824da65f9c2a 100644 (file)
@@ -12,8 +12,8 @@
 #include <linux/module.h>
 
 #include <scsi/libfc.h>
-#include <scsi/fc_encode.h>
 
+#include "fc_encode.h"
 #include "fc_libfc.h"
 
 MODULE_AUTHOR("Open-FCoE.org");
index 6557fda85c5c716c77609c33afc7cc58b5e35267..22826544da7e7495b7efcd171d034e5289504083 100644 (file)
@@ -84,9 +84,9 @@
 #include <scsi/fc/fc_gs.h>
 
 #include <scsi/libfc.h>
-#include <scsi/fc_encode.h>
 #include <linux/scatterlist.h>
 
+#include "fc_encode.h"
 #include "fc_libfc.h"
 
 /* Fabric IDs to use for point-to-point mode, chosen on whims. */
index a60b228d13f16b955e6a2d0f10f79cc33cf4ab66..56003208d2e7c63bd4d168ecc0d85d421cecf512 100644 (file)
@@ -58,8 +58,8 @@
 #include <asm/unaligned.h>
 
 #include <scsi/libfc.h>
-#include <scsi/fc_encode.h>
 
+#include "fc_encode.h"
 #include "fc_libfc.h"
 
 static struct workqueue_struct *rport_event_queue;
index 0e2cbb164eeba894a6fc651aef8e2cfbb2461f89..88a592d094335d0d28972bdb853ac9cfd6dc86ed 100644 (file)
@@ -11,7 +11,6 @@
 #include <scsi/fc/fc_fip.h>
 #include <scsi/fc/fc_fc2.h>
 #include <scsi/scsi_tcq.h>
-#include <scsi/fc_encode.h>
 #include <linux/version.h>
 
 
index a7ed56602c6cd20dbd425d915419c6e7abae6ff8..9c8c38a549c6e68a144193eb248e9bb0a1686045 100644 (file)
@@ -19,7 +19,6 @@
 #include <asm/unaligned.h>
 #include <scsi/scsi_tcq.h>
 #include <scsi/libfc.h>
-#include <scsi/fc_encode.h>
 
 #include <target/target_core_base.h>
 #include <target/target_core_fabric.h>
index 6a38ff936389beea89cbbb3cf2cc7f5c9e48ec9d..bbe2e29612fa85d49eff0eea819f3c6cccfee798 100644 (file)
@@ -28,7 +28,6 @@
 #include <linux/ratelimit.h>
 #include <asm/unaligned.h>
 #include <scsi/libfc.h>
-#include <scsi/fc_encode.h>
 
 #include <target/target_core_base.h>
 #include <target/target_core_fabric.h>
diff --git a/include/scsi/fc_encode.h b/include/scsi/fc_encode.h
deleted file mode 100644 (file)
index c666020..0000000
+++ /dev/null
@@ -1,727 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright(c) 2008 Intel Corporation. All rights reserved.
- *
- * Maintained at www.Open-FCoE.org
- */
-
-#ifndef _FC_ENCODE_H_
-#define _FC_ENCODE_H_
-#include <asm/unaligned.h>
-#include <linux/utsname.h>
-
-/*
- * F_CTL values for simple requests and responses.
- */
-#define FC_FCTL_REQ    (FC_FC_FIRST_SEQ | FC_FC_END_SEQ | FC_FC_SEQ_INIT)
-#define FC_FCTL_RESP   (FC_FC_EX_CTX | FC_FC_LAST_SEQ | \
-                       FC_FC_END_SEQ | FC_FC_SEQ_INIT)
-
-struct fc_ns_rft {
-       struct fc_ns_fid fid;   /* port ID object */
-       struct fc_ns_fts fts;   /* FC4-types object */
-};
-
-struct fc_ct_req {
-       struct fc_ct_hdr hdr;
-       union {
-               struct fc_ns_gid_ft gid;
-               struct fc_ns_rn_id  rn;
-               struct fc_ns_rft rft;
-               struct fc_ns_rff_id rff;
-               struct fc_ns_fid fid;
-               struct fc_ns_rsnn snn;
-               struct fc_ns_rspn spn;
-               struct fc_fdmi_rhba rhba;
-               struct fc_fdmi_rpa  rpa;
-               struct fc_fdmi_dprt dprt;
-               struct fc_fdmi_dhba dhba;
-       } payload;
-};
-
-static inline void __fc_fill_fc_hdr(struct fc_frame_header *fh,
-                                   enum fc_rctl r_ctl,
-                                   u32 did, u32 sid, enum fc_fh_type type,
-                                   u32 f_ctl, u32 parm_offset)
-{
-       WARN_ON(r_ctl == 0);
-       fh->fh_r_ctl = r_ctl;
-       hton24(fh->fh_d_id, did);
-       hton24(fh->fh_s_id, sid);
-       fh->fh_type = type;
-       hton24(fh->fh_f_ctl, f_ctl);
-       fh->fh_cs_ctl = 0;
-       fh->fh_df_ctl = 0;
-       fh->fh_parm_offset = htonl(parm_offset);
-}
-
-/**
- * fill FC header fields in specified fc_frame
- */
-static inline void fc_fill_fc_hdr(struct fc_frame *fp, enum fc_rctl r_ctl,
-                                 u32 did, u32 sid, enum fc_fh_type type,
-                                 u32 f_ctl, u32 parm_offset)
-{
-       struct fc_frame_header *fh;
-
-       fh = fc_frame_header_get(fp);
-       __fc_fill_fc_hdr(fh, r_ctl, did, sid, type, f_ctl, parm_offset);
-}
-
-/**
- * fc_adisc_fill() - Fill in adisc request frame
- * @lport: local port.
- * @fp: fc frame where payload will be placed.
- */
-static inline void fc_adisc_fill(struct fc_lport *lport, struct fc_frame *fp)
-{
-       struct fc_els_adisc *adisc;
-
-       adisc = fc_frame_payload_get(fp, sizeof(*adisc));
-       memset(adisc, 0, sizeof(*adisc));
-       adisc->adisc_cmd = ELS_ADISC;
-       put_unaligned_be64(lport->wwpn, &adisc->adisc_wwpn);
-       put_unaligned_be64(lport->wwnn, &adisc->adisc_wwnn);
-       hton24(adisc->adisc_port_id, lport->port_id);
-}
-
-/**
- * fc_ct_hdr_fill- fills ct header and reset ct payload
- * returns pointer to ct request.
- */
-static inline struct fc_ct_req *fc_ct_hdr_fill(const struct fc_frame *fp,
-                                              unsigned int op, size_t req_size,
-                                              enum fc_ct_fs_type fs_type,
-                                              u8 subtype)
-{
-       struct fc_ct_req *ct;
-       size_t ct_plen;
-
-       ct_plen  = sizeof(struct fc_ct_hdr) + req_size;
-       ct = fc_frame_payload_get(fp, ct_plen);
-       memset(ct, 0, ct_plen);
-       ct->hdr.ct_rev = FC_CT_REV;
-       ct->hdr.ct_fs_type = fs_type;
-       ct->hdr.ct_fs_subtype = subtype;
-       ct->hdr.ct_cmd = htons((u16) op);
-       return ct;
-}
-
-/**
- * fc_ct_ns_fill() - Fill in a name service request frame
- * @lport: local port.
- * @fc_id: FC_ID of non-destination rport for GPN_ID and similar inquiries.
- * @fp: frame to contain payload.
- * @op: CT opcode.
- * @r_ctl: pointer to FC header R_CTL.
- * @fh_type: pointer to FC-4 type.
- */
-static inline int fc_ct_ns_fill(struct fc_lport *lport,
-                     u32 fc_id, struct fc_frame *fp,
-                     unsigned int op, enum fc_rctl *r_ctl,
-                     enum fc_fh_type *fh_type)
-{
-       struct fc_ct_req *ct;
-       size_t len;
-
-       switch (op) {
-       case FC_NS_GPN_FT:
-               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_gid_ft),
-                                   FC_FST_DIR, FC_NS_SUBTYPE);
-               ct->payload.gid.fn_fc4_type = FC_TYPE_FCP;
-               break;
-
-       case FC_NS_GPN_ID:
-               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_fid),
-                                   FC_FST_DIR, FC_NS_SUBTYPE);
-               ct->payload.gid.fn_fc4_type = FC_TYPE_FCP;
-               hton24(ct->payload.fid.fp_fid, fc_id);
-               break;
-
-       case FC_NS_RFT_ID:
-               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rft),
-                                   FC_FST_DIR, FC_NS_SUBTYPE);
-               hton24(ct->payload.rft.fid.fp_fid, lport->port_id);
-               ct->payload.rft.fts = lport->fcts;
-               break;
-
-       case FC_NS_RFF_ID:
-               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rff_id),
-                                   FC_FST_DIR, FC_NS_SUBTYPE);
-               hton24(ct->payload.rff.fr_fid.fp_fid, lport->port_id);
-               ct->payload.rff.fr_type = FC_TYPE_FCP;
-               if (lport->service_params & FCP_SPPF_INIT_FCN)
-                       ct->payload.rff.fr_feat = FCP_FEAT_INIT;
-               if (lport->service_params & FCP_SPPF_TARG_FCN)
-                       ct->payload.rff.fr_feat |= FCP_FEAT_TARG;
-               break;
-
-       case FC_NS_RNN_ID:
-               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rn_id),
-                                   FC_FST_DIR, FC_NS_SUBTYPE);
-               hton24(ct->payload.rn.fr_fid.fp_fid, lport->port_id);
-               put_unaligned_be64(lport->wwnn, &ct->payload.rn.fr_wwn);
-               break;
-
-       case FC_NS_RSPN_ID:
-               len = strnlen(fc_host_symbolic_name(lport->host), 255);
-               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rspn) + len,
-                                   FC_FST_DIR, FC_NS_SUBTYPE);
-               hton24(ct->payload.spn.fr_fid.fp_fid, lport->port_id);
-               strncpy(ct->payload.spn.fr_name,
-                       fc_host_symbolic_name(lport->host), len);
-               ct->payload.spn.fr_name_len = len;
-               break;
-
-       case FC_NS_RSNN_NN:
-               len = strnlen(fc_host_symbolic_name(lport->host), 255);
-               ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rsnn) + len,
-                                   FC_FST_DIR, FC_NS_SUBTYPE);
-               put_unaligned_be64(lport->wwnn, &ct->payload.snn.fr_wwn);
-               strncpy(ct->payload.snn.fr_name,
-                       fc_host_symbolic_name(lport->host), len);
-               ct->payload.snn.fr_name_len = len;
-               break;
-
-       default:
-               return -EINVAL;
-       }
-       *r_ctl = FC_RCTL_DD_UNSOL_CTL;
-       *fh_type = FC_TYPE_CT;
-       return 0;
-}
-
-/**
- * fc_ct_ms_fill() - Fill in a mgmt service request frame
- * @lport: local port.
- * @fc_id: FC_ID of non-destination rport for GPN_ID and similar inquiries.
- * @fp: frame to contain payload.
- * @op: CT opcode.
- * @r_ctl: pointer to FC header R_CTL.
- * @fh_type: pointer to FC-4 type.
- */
-static inline int fc_ct_ms_fill(struct fc_lport *lport,
-                     u32 fc_id, struct fc_frame *fp,
-                     unsigned int op, enum fc_rctl *r_ctl,
-                     enum fc_fh_type *fh_type)
-{
-       struct fc_ct_req *ct;
-       size_t len;
-       struct fc_fdmi_attr_entry *entry;
-       struct fs_fdmi_attrs *hba_attrs;
-       int numattrs = 0;
-
-       switch (op) {
-       case FC_FDMI_RHBA:
-               numattrs = 10;
-               len = sizeof(struct fc_fdmi_rhba);
-               len -= sizeof(struct fc_fdmi_attr_entry);
-               len += (numattrs * FC_FDMI_ATTR_ENTRY_HEADER_LEN);
-               len += FC_FDMI_HBA_ATTR_NODENAME_LEN;
-               len += FC_FDMI_HBA_ATTR_MANUFACTURER_LEN;
-               len += FC_FDMI_HBA_ATTR_SERIALNUMBER_LEN;
-               len += FC_FDMI_HBA_ATTR_MODEL_LEN;
-               len += FC_FDMI_HBA_ATTR_MODELDESCR_LEN;
-               len += FC_FDMI_HBA_ATTR_HARDWAREVERSION_LEN;
-               len += FC_FDMI_HBA_ATTR_DRIVERVERSION_LEN;
-               len += FC_FDMI_HBA_ATTR_OPTIONROMVERSION_LEN;
-               len += FC_FDMI_HBA_ATTR_FIRMWAREVERSION_LEN;
-               len += FC_FDMI_HBA_ATTR_OSNAMEVERSION_LEN;
-               ct = fc_ct_hdr_fill(fp, op, len, FC_FST_MGMT,
-                                   FC_FDMI_SUBTYPE);
-
-               /* HBA Identifier */
-               put_unaligned_be64(lport->wwpn, &ct->payload.rhba.hbaid.id);
-               /* Number of Ports - always 1 */
-               put_unaligned_be32(1, &ct->payload.rhba.port.numport);
-               /* Port Name */
-               put_unaligned_be64(lport->wwpn,
-                                  &ct->payload.rhba.port.port[0].portname);
-
-               /* HBA Attributes */
-               put_unaligned_be32(numattrs,
-                                  &ct->payload.rhba.hba_attrs.numattrs);
-               hba_attrs = &ct->payload.rhba.hba_attrs;
-               entry = (struct fc_fdmi_attr_entry *)hba_attrs->attr;
-               /* NodeName*/
-               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
-               len += FC_FDMI_HBA_ATTR_NODENAME_LEN;
-               put_unaligned_be16(FC_FDMI_HBA_ATTR_NODENAME,
-                                  &entry->type);
-               put_unaligned_be16(len, &entry->len);
-               put_unaligned_be64(lport->wwnn,
-                                  (__be64 *)&entry->value[0]);
-
-               /* Manufacturer */
-               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
-                                       FC_FDMI_HBA_ATTR_NODENAME_LEN);
-               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
-               len += FC_FDMI_HBA_ATTR_MANUFACTURER_LEN;
-               put_unaligned_be16(FC_FDMI_HBA_ATTR_MANUFACTURER,
-                                  &entry->type);
-               put_unaligned_be16(len, &entry->len);
-               strncpy((char *)&entry->value,
-                       fc_host_manufacturer(lport->host),
-                       FC_FDMI_HBA_ATTR_MANUFACTURER_LEN);
-
-               /* SerialNumber */
-               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
-                                       FC_FDMI_HBA_ATTR_MANUFACTURER_LEN);
-               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
-               len += FC_FDMI_HBA_ATTR_SERIALNUMBER_LEN;
-               put_unaligned_be16(FC_FDMI_HBA_ATTR_SERIALNUMBER,
-                                  &entry->type);
-               put_unaligned_be16(len, &entry->len);
-               strncpy((char *)&entry->value,
-                       fc_host_serial_number(lport->host),
-                       FC_FDMI_HBA_ATTR_SERIALNUMBER_LEN);
-
-               /* Model */
-               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
-                                       FC_FDMI_HBA_ATTR_SERIALNUMBER_LEN);
-               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
-               len += FC_FDMI_HBA_ATTR_MODEL_LEN;
-               put_unaligned_be16(FC_FDMI_HBA_ATTR_MODEL,
-                                  &entry->type);
-               put_unaligned_be16(len, &entry->len);
-               strncpy((char *)&entry->value,
-                       fc_host_model(lport->host),
-                       FC_FDMI_HBA_ATTR_MODEL_LEN);
-
-               /* Model Description */
-               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
-                                       FC_FDMI_HBA_ATTR_MODEL_LEN);
-               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
-               len += FC_FDMI_HBA_ATTR_MODELDESCR_LEN;
-               put_unaligned_be16(FC_FDMI_HBA_ATTR_MODELDESCRIPTION,
-                                  &entry->type);
-               put_unaligned_be16(len, &entry->len);
-               strncpy((char *)&entry->value,
-                       fc_host_model_description(lport->host),
-                       FC_FDMI_HBA_ATTR_MODELDESCR_LEN);
-
-               /* Hardware Version */
-               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
-                                       FC_FDMI_HBA_ATTR_MODELDESCR_LEN);
-               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
-               len += FC_FDMI_HBA_ATTR_HARDWAREVERSION_LEN;
-               put_unaligned_be16(FC_FDMI_HBA_ATTR_HARDWAREVERSION,
-                                  &entry->type);
-               put_unaligned_be16(len, &entry->len);
-               strncpy((char *)&entry->value,
-                       fc_host_hardware_version(lport->host),
-                       FC_FDMI_HBA_ATTR_HARDWAREVERSION_LEN);
-
-               /* Driver Version */
-               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
-                                       FC_FDMI_HBA_ATTR_HARDWAREVERSION_LEN);
-               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
-               len += FC_FDMI_HBA_ATTR_DRIVERVERSION_LEN;
-               put_unaligned_be16(FC_FDMI_HBA_ATTR_DRIVERVERSION,
-                                  &entry->type);
-               put_unaligned_be16(len, &entry->len);
-               strncpy((char *)&entry->value,
-                       fc_host_driver_version(lport->host),
-                       FC_FDMI_HBA_ATTR_DRIVERVERSION_LEN);
-
-               /* OptionROM Version */
-               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
-                                       FC_FDMI_HBA_ATTR_DRIVERVERSION_LEN);
-               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
-               len += FC_FDMI_HBA_ATTR_OPTIONROMVERSION_LEN;
-               put_unaligned_be16(FC_FDMI_HBA_ATTR_OPTIONROMVERSION,
-                                  &entry->type);
-               put_unaligned_be16(len, &entry->len);
-               strncpy((char *)&entry->value,
-                       fc_host_optionrom_version(lport->host),
-                       FC_FDMI_HBA_ATTR_OPTIONROMVERSION_LEN);
-
-               /* Firmware Version */
-               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
-                                       FC_FDMI_HBA_ATTR_OPTIONROMVERSION_LEN);
-               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
-               len += FC_FDMI_HBA_ATTR_FIRMWAREVERSION_LEN;
-               put_unaligned_be16(FC_FDMI_HBA_ATTR_FIRMWAREVERSION,
-                                  &entry->type);
-               put_unaligned_be16(len, &entry->len);
-               strncpy((char *)&entry->value,
-                       fc_host_firmware_version(lport->host),
-                       FC_FDMI_HBA_ATTR_FIRMWAREVERSION_LEN);
-
-               /* OS Name and Version */
-               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
-                                       FC_FDMI_HBA_ATTR_FIRMWAREVERSION_LEN);
-               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
-               len += FC_FDMI_HBA_ATTR_OSNAMEVERSION_LEN;
-               put_unaligned_be16(FC_FDMI_HBA_ATTR_OSNAMEVERSION,
-                                  &entry->type);
-               put_unaligned_be16(len, &entry->len);
-               snprintf((char *)&entry->value,
-                       FC_FDMI_HBA_ATTR_OSNAMEVERSION_LEN,
-                       "%s v%s",
-                       init_utsname()->sysname,
-                       init_utsname()->release);
-               break;
-       case FC_FDMI_RPA:
-               numattrs = 6;
-               len = sizeof(struct fc_fdmi_rpa);
-               len -= sizeof(struct fc_fdmi_attr_entry);
-               len += (numattrs * FC_FDMI_ATTR_ENTRY_HEADER_LEN);
-               len += FC_FDMI_PORT_ATTR_FC4TYPES_LEN;
-               len += FC_FDMI_PORT_ATTR_SUPPORTEDSPEED_LEN;
-               len += FC_FDMI_PORT_ATTR_CURRENTPORTSPEED_LEN;
-               len += FC_FDMI_PORT_ATTR_MAXFRAMESIZE_LEN;
-               len += FC_FDMI_PORT_ATTR_OSDEVICENAME_LEN;
-               len += FC_FDMI_PORT_ATTR_HOSTNAME_LEN;
-               ct = fc_ct_hdr_fill(fp, op, len, FC_FST_MGMT,
-                                   FC_FDMI_SUBTYPE);
-
-               /* Port Name */
-               put_unaligned_be64(lport->wwpn,
-                                  &ct->payload.rpa.port.portname);
-
-               /* Port Attributes */
-               put_unaligned_be32(numattrs,
-                                  &ct->payload.rpa.hba_attrs.numattrs);
-
-               hba_attrs = &ct->payload.rpa.hba_attrs;
-               entry = (struct fc_fdmi_attr_entry *)hba_attrs->attr;
-
-               /* FC4 types */
-               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
-               len += FC_FDMI_PORT_ATTR_FC4TYPES_LEN;
-               put_unaligned_be16(FC_FDMI_PORT_ATTR_FC4TYPES,
-                                  &entry->type);
-               put_unaligned_be16(len, &entry->len);
-               memcpy(&entry->value, fc_host_supported_fc4s(lport->host),
-                      FC_FDMI_PORT_ATTR_FC4TYPES_LEN);
-
-               /* Supported Speed */
-               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
-                                       FC_FDMI_PORT_ATTR_FC4TYPES_LEN);
-               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
-               len += FC_FDMI_PORT_ATTR_SUPPORTEDSPEED_LEN;
-               put_unaligned_be16(FC_FDMI_PORT_ATTR_SUPPORTEDSPEED,
-                                  &entry->type);
-               put_unaligned_be16(len, &entry->len);
-
-               put_unaligned_be32(fc_host_supported_speeds(lport->host),
-                                  &entry->value);
-
-               /* Current Port Speed */
-               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
-                                       FC_FDMI_PORT_ATTR_SUPPORTEDSPEED_LEN);
-               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
-               len += FC_FDMI_PORT_ATTR_CURRENTPORTSPEED_LEN;
-               put_unaligned_be16(FC_FDMI_PORT_ATTR_CURRENTPORTSPEED,
-                                  &entry->type);
-               put_unaligned_be16(len, &entry->len);
-               put_unaligned_be32(lport->link_speed,
-                                  &entry->value);
-
-               /* Max Frame Size */
-               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
-                                       FC_FDMI_PORT_ATTR_CURRENTPORTSPEED_LEN);
-               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
-               len += FC_FDMI_PORT_ATTR_MAXFRAMESIZE_LEN;
-               put_unaligned_be16(FC_FDMI_PORT_ATTR_MAXFRAMESIZE,
-                                  &entry->type);
-               put_unaligned_be16(len, &entry->len);
-               put_unaligned_be32(fc_host_maxframe_size(lport->host),
-                                  &entry->value);
-
-               /* OS Device Name */
-               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
-                                       FC_FDMI_PORT_ATTR_MAXFRAMESIZE_LEN);
-               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
-               len += FC_FDMI_PORT_ATTR_OSDEVICENAME_LEN;
-               put_unaligned_be16(FC_FDMI_PORT_ATTR_OSDEVICENAME,
-                                  &entry->type);
-               put_unaligned_be16(len, &entry->len);
-               /* Use the sysfs device name */
-               strncpy((char *)&entry->value,
-                       dev_name(&lport->host->shost_gendev),
-                       strnlen(dev_name(&lport->host->shost_gendev),
-                               FC_FDMI_PORT_ATTR_HOSTNAME_LEN));
-
-               /* Host Name */
-               entry = (struct fc_fdmi_attr_entry *)((char *)entry->value +
-                                       FC_FDMI_PORT_ATTR_OSDEVICENAME_LEN);
-               len = FC_FDMI_ATTR_ENTRY_HEADER_LEN;
-               len += FC_FDMI_PORT_ATTR_HOSTNAME_LEN;
-               put_unaligned_be16(FC_FDMI_PORT_ATTR_HOSTNAME,
-                                  &entry->type);
-               put_unaligned_be16(len, &entry->len);
-               if (strlen(fc_host_system_hostname(lport->host)))
-                       strncpy((char *)&entry->value,
-                               fc_host_system_hostname(lport->host),
-                               strnlen(fc_host_system_hostname(lport->host),
-                                       FC_FDMI_PORT_ATTR_HOSTNAME_LEN));
-               else
-                       strncpy((char *)&entry->value,
-                               init_utsname()->nodename,
-                               FC_FDMI_PORT_ATTR_HOSTNAME_LEN);
-               break;
-       case FC_FDMI_DPRT:
-               len = sizeof(struct fc_fdmi_dprt);
-               ct = fc_ct_hdr_fill(fp, op, len, FC_FST_MGMT,
-                                   FC_FDMI_SUBTYPE);
-               /* Port Name */
-               put_unaligned_be64(lport->wwpn,
-                                  &ct->payload.dprt.port.portname);
-               break;
-       case FC_FDMI_DHBA:
-               len = sizeof(struct fc_fdmi_dhba);
-               ct = fc_ct_hdr_fill(fp, op, len, FC_FST_MGMT,
-                                   FC_FDMI_SUBTYPE);
-               /* HBA Identifier */
-               put_unaligned_be64(lport->wwpn, &ct->payload.dhba.hbaid.id);
-               break;
-       default:
-               return -EINVAL;
-       }
-       *r_ctl = FC_RCTL_DD_UNSOL_CTL;
-       *fh_type = FC_TYPE_CT;
-       return 0;
-}
-
-/**
- * fc_ct_fill() - Fill in a common transport service request frame
- * @lport: local port.
- * @fc_id: FC_ID of non-destination rport for GPN_ID and similar inquiries.
- * @fp: frame to contain payload.
- * @op: CT opcode.
- * @r_ctl: pointer to FC header R_CTL.
- * @fh_type: pointer to FC-4 type.
- */
-static inline int fc_ct_fill(struct fc_lport *lport,
-                     u32 fc_id, struct fc_frame *fp,
-                     unsigned int op, enum fc_rctl *r_ctl,
-                     enum fc_fh_type *fh_type, u32 *did)
-{
-       int rc = -EINVAL;
-
-       switch (fc_id) {
-       case FC_FID_MGMT_SERV:
-               rc = fc_ct_ms_fill(lport, fc_id, fp, op, r_ctl, fh_type);
-               *did = FC_FID_MGMT_SERV;
-               break;
-       case FC_FID_DIR_SERV:
-       default:
-               rc = fc_ct_ns_fill(lport, fc_id, fp, op, r_ctl, fh_type);
-               *did = FC_FID_DIR_SERV;
-               break;
-       }
-
-       return rc;
-}
-/**
- * fc_plogi_fill - Fill in plogi request frame
- */
-static inline void fc_plogi_fill(struct fc_lport *lport, struct fc_frame *fp,
-                                unsigned int op)
-{
-       struct fc_els_flogi *plogi;
-       struct fc_els_csp *csp;
-       struct fc_els_cssp *cp;
-
-       plogi = fc_frame_payload_get(fp, sizeof(*plogi));
-       memset(plogi, 0, sizeof(*plogi));
-       plogi->fl_cmd = (u8) op;
-       put_unaligned_be64(lport->wwpn, &plogi->fl_wwpn);
-       put_unaligned_be64(lport->wwnn, &plogi->fl_wwnn);
-
-       csp = &plogi->fl_csp;
-       csp->sp_hi_ver = 0x20;
-       csp->sp_lo_ver = 0x20;
-       csp->sp_bb_cred = htons(10);    /* this gets set by gateway */
-       csp->sp_bb_data = htons((u16) lport->mfs);
-       cp = &plogi->fl_cssp[3 - 1];    /* class 3 parameters */
-       cp->cp_class = htons(FC_CPC_VALID | FC_CPC_SEQ);
-       csp->sp_features = htons(FC_SP_FT_CIRO);
-       csp->sp_tot_seq = htons(255);   /* seq. we accept */
-       csp->sp_rel_off = htons(0x1f);
-       csp->sp_e_d_tov = htonl(lport->e_d_tov);
-
-       cp->cp_rdfs = htons((u16) lport->mfs);
-       cp->cp_con_seq = htons(255);
-       cp->cp_open_seq = 1;
-}
-
-/**
- * fc_flogi_fill - Fill in a flogi request frame.
- */
-static inline void fc_flogi_fill(struct fc_lport *lport, struct fc_frame *fp)
-{
-       struct fc_els_csp *sp;
-       struct fc_els_cssp *cp;
-       struct fc_els_flogi *flogi;
-
-       flogi = fc_frame_payload_get(fp, sizeof(*flogi));
-       memset(flogi, 0, sizeof(*flogi));
-       flogi->fl_cmd = (u8) ELS_FLOGI;
-       put_unaligned_be64(lport->wwpn, &flogi->fl_wwpn);
-       put_unaligned_be64(lport->wwnn, &flogi->fl_wwnn);
-       sp = &flogi->fl_csp;
-       sp->sp_hi_ver = 0x20;
-       sp->sp_lo_ver = 0x20;
-       sp->sp_bb_cred = htons(10);     /* this gets set by gateway */
-       sp->sp_bb_data = htons((u16) lport->mfs);
-       cp = &flogi->fl_cssp[3 - 1];    /* class 3 parameters */
-       cp->cp_class = htons(FC_CPC_VALID | FC_CPC_SEQ);
-       if (lport->does_npiv)
-               sp->sp_features = htons(FC_SP_FT_NPIV);
-}
-
-/**
- * fc_fdisc_fill - Fill in a fdisc request frame.
- */
-static inline void fc_fdisc_fill(struct fc_lport *lport, struct fc_frame *fp)
-{
-       struct fc_els_csp *sp;
-       struct fc_els_cssp *cp;
-       struct fc_els_flogi *fdisc;
-
-       fdisc = fc_frame_payload_get(fp, sizeof(*fdisc));
-       memset(fdisc, 0, sizeof(*fdisc));
-       fdisc->fl_cmd = (u8) ELS_FDISC;
-       put_unaligned_be64(lport->wwpn, &fdisc->fl_wwpn);
-       put_unaligned_be64(lport->wwnn, &fdisc->fl_wwnn);
-       sp = &fdisc->fl_csp;
-       sp->sp_hi_ver = 0x20;
-       sp->sp_lo_ver = 0x20;
-       sp->sp_bb_cred = htons(10);     /* this gets set by gateway */
-       sp->sp_bb_data = htons((u16) lport->mfs);
-       cp = &fdisc->fl_cssp[3 - 1];    /* class 3 parameters */
-       cp->cp_class = htons(FC_CPC_VALID | FC_CPC_SEQ);
-}
-
-/**
- * fc_logo_fill - Fill in a logo request frame.
- */
-static inline void fc_logo_fill(struct fc_lport *lport, struct fc_frame *fp)
-{
-       struct fc_els_logo *logo;
-
-       logo = fc_frame_payload_get(fp, sizeof(*logo));
-       memset(logo, 0, sizeof(*logo));
-       logo->fl_cmd = ELS_LOGO;
-       hton24(logo->fl_n_port_id, lport->port_id);
-       logo->fl_n_port_wwn = htonll(lport->wwpn);
-}
-
-/**
- * fc_rtv_fill - Fill in RTV (read timeout value) request frame.
- */
-static inline void fc_rtv_fill(struct fc_lport *lport, struct fc_frame *fp)
-{
-       struct fc_els_rtv *rtv;
-
-       rtv = fc_frame_payload_get(fp, sizeof(*rtv));
-       memset(rtv, 0, sizeof(*rtv));
-       rtv->rtv_cmd = ELS_RTV;
-}
-
-/**
- * fc_rec_fill - Fill in rec request frame
- */
-static inline void fc_rec_fill(struct fc_lport *lport, struct fc_frame *fp)
-{
-       struct fc_els_rec *rec;
-       struct fc_exch *ep = fc_seq_exch(fr_seq(fp));
-
-       rec = fc_frame_payload_get(fp, sizeof(*rec));
-       memset(rec, 0, sizeof(*rec));
-       rec->rec_cmd = ELS_REC;
-       hton24(rec->rec_s_id, lport->port_id);
-       rec->rec_ox_id = htons(ep->oxid);
-       rec->rec_rx_id = htons(ep->rxid);
-}
-
-/**
- * fc_prli_fill - Fill in prli request frame
- */
-static inline void fc_prli_fill(struct fc_lport *lport, struct fc_frame *fp)
-{
-       struct {
-               struct fc_els_prli prli;
-               struct fc_els_spp spp;
-       } *pp;
-
-       pp = fc_frame_payload_get(fp, sizeof(*pp));
-       memset(pp, 0, sizeof(*pp));
-       pp->prli.prli_cmd = ELS_PRLI;
-       pp->prli.prli_spp_len = sizeof(struct fc_els_spp);
-       pp->prli.prli_len = htons(sizeof(*pp));
-       pp->spp.spp_type = FC_TYPE_FCP;
-       pp->spp.spp_flags = FC_SPP_EST_IMG_PAIR;
-       pp->spp.spp_params = htonl(lport->service_params);
-}
-
-/**
- * fc_scr_fill - Fill in a scr request frame.
- */
-static inline void fc_scr_fill(struct fc_lport *lport, struct fc_frame *fp)
-{
-       struct fc_els_scr *scr;
-
-       scr = fc_frame_payload_get(fp, sizeof(*scr));
-       memset(scr, 0, sizeof(*scr));
-       scr->scr_cmd = ELS_SCR;
-       scr->scr_reg_func = ELS_SCRF_FULL;
-}
-
-/**
- * fc_els_fill - Fill in an ELS  request frame
- */
-static inline int fc_els_fill(struct fc_lport *lport,
-                      u32 did,
-                      struct fc_frame *fp, unsigned int op,
-                      enum fc_rctl *r_ctl, enum fc_fh_type *fh_type)
-{
-       switch (op) {
-       case ELS_ADISC:
-               fc_adisc_fill(lport, fp);
-               break;
-
-       case ELS_PLOGI:
-               fc_plogi_fill(lport, fp, ELS_PLOGI);
-               break;
-
-       case ELS_FLOGI:
-               fc_flogi_fill(lport, fp);
-               break;
-
-       case ELS_FDISC:
-               fc_fdisc_fill(lport, fp);
-               break;
-
-       case ELS_LOGO:
-               fc_logo_fill(lport, fp);
-               break;
-
-       case ELS_RTV:
-               fc_rtv_fill(lport, fp);
-               break;
-
-       case ELS_REC:
-               fc_rec_fill(lport, fp);
-               break;
-
-       case ELS_PRLI:
-               fc_prli_fill(lport, fp);
-               break;
-
-       case ELS_SCR:
-               fc_scr_fill(lport, fp);
-               break;
-
-       default:
-               return -EINVAL;
-       }
-
-       *r_ctl = FC_RCTL_ELS_REQ;
-       *fh_type = FC_TYPE_ELS;
-       return 0;
-}
-#endif /* _FC_ENCODE_H_ */
index 41df2ba9dbaa18b7be87fcc0e3cbfe0b0343fa7d..d544dc5057fc67b7ac44bbdcfa0a16f821a72e88 100644 (file)
@@ -246,4 +246,34 @@ static inline bool fc_frame_is_cmd(const struct fc_frame *fp)
  */
 void fc_frame_leak_check(void);
 
+static inline void __fc_fill_fc_hdr(struct fc_frame_header *fh,
+                                   enum fc_rctl r_ctl,
+                                   u32 did, u32 sid, enum fc_fh_type type,
+                                   u32 f_ctl, u32 parm_offset)
+{
+       WARN_ON(r_ctl == 0);
+       fh->fh_r_ctl = r_ctl;
+       hton24(fh->fh_d_id, did);
+       hton24(fh->fh_s_id, sid);
+       fh->fh_type = type;
+       hton24(fh->fh_f_ctl, f_ctl);
+       fh->fh_cs_ctl = 0;
+       fh->fh_df_ctl = 0;
+       fh->fh_parm_offset = htonl(parm_offset);
+}
+
+/**
+ * fill FC header fields in specified fc_frame
+ */
+static inline void fc_fill_fc_hdr(struct fc_frame *fp, enum fc_rctl r_ctl,
+                                 u32 did, u32 sid, enum fc_fh_type type,
+                                 u32 f_ctl, u32 parm_offset)
+{
+       struct fc_frame_header *fh;
+
+       fh = fc_frame_header_get(fp);
+       __fc_fill_fc_hdr(fh, r_ctl, did, sid, type, f_ctl, parm_offset);
+}
+
+
 #endif /* _FC_FRAME_H_ */