static void fc_lport_enter_scr(struct fc_lport *);
 static void fc_lport_enter_ready(struct fc_lport *);
 static void fc_lport_enter_logo(struct fc_lport *);
+static void fc_lport_enter_fdmi(struct fc_lport *lport);
+static void fc_lport_enter_ms(struct fc_lport *, enum fc_lport_state);
 
 static const char *fc_lport_state_names[] = {
        [LPORT_ST_DISABLED] = "disabled",
        [LPORT_ST_RSPN_ID] =  "RSPN_ID",
        [LPORT_ST_RFT_ID] =   "RFT_ID",
        [LPORT_ST_RFF_ID] =   "RFF_ID",
+       [LPORT_ST_FDMI] =     "FDMI",
+       [LPORT_ST_RHBA] =     "RHBA",
+       [LPORT_ST_RPA] =      "RPA",
+       [LPORT_ST_DHBA] =     "DHBA",
+       [LPORT_ST_DPRT] =     "DPRT",
        [LPORT_ST_SCR] =      "SCR",
        [LPORT_ST_READY] =    "Ready",
        [LPORT_ST_LOGO] =     "LOGO",
                if (lport->state == LPORT_ST_DNS) {
                        lport->dns_rdata = rdata;
                        fc_lport_enter_ns(lport, LPORT_ST_RNN_ID);
+               } else if (lport->state == LPORT_ST_FDMI) {
+                       lport->ms_rdata = rdata;
+                       fc_lport_enter_ms(lport, LPORT_ST_DHBA);
                } else {
                        FC_LPORT_DBG(lport, "Received an READY event "
                                     "on port (%6.6x) for the directory "
                                     "server, but the lport is not "
-                                    "in the DNS state, it's in the "
+                                    "in the DNS or FDMI state, it's in the "
                                     "%d state", rdata->ids.port_id,
                                     lport->state);
                        lport->tt.rport_logoff(rdata);
        case RPORT_EV_LOGO:
        case RPORT_EV_FAILED:
        case RPORT_EV_STOP:
-               lport->dns_rdata = NULL;
+               if (rdata->ids.port_id == FC_FID_DIR_SERV)
+                       lport->dns_rdata = NULL;
+               else if (rdata->ids.port_id == FC_FID_MGMT_SERV)
+                       lport->ms_rdata = NULL;
                break;
        case RPORT_EV_NONE:
                break;
                        fc_lport_enter_ns(lport, LPORT_ST_RFF_ID);
                        break;
                case LPORT_ST_RFF_ID:
-                       fc_lport_enter_scr(lport);
+                       if (lport->fdmi_enabled)
+                               fc_lport_enter_fdmi(lport);
+                       else
+                               fc_lport_enter_scr(lport);
                        break;
                default:
                        /* should have already been caught by state checks */
        mutex_unlock(&lport->lp_mutex);
 }
 
+/**
+ * fc_lport_ms_resp() - Handle response to a management server
+ *                     exchange
+ * @sp:            current sequence in exchange
+ * @fp:            response frame
+ * @lp_arg: Fibre Channel host port instance
+ *
+ * Locking Note: This function will be called without the lport lock
+ * held, but it will lock, call an _enter_* function or fc_lport_error()
+ * and then unlock the lport.
+ */
+static void fc_lport_ms_resp(struct fc_seq *sp, struct fc_frame *fp,
+                            void *lp_arg)
+{
+       struct fc_lport *lport = lp_arg;
+       struct fc_frame_header *fh;
+       struct fc_ct_hdr *ct;
+
+       FC_LPORT_DBG(lport, "Received a ms %s\n", fc_els_resp_type(fp));
+
+       if (fp == ERR_PTR(-FC_EX_CLOSED))
+               return;
+
+       mutex_lock(&lport->lp_mutex);
+
+       if (lport->state < LPORT_ST_RHBA || lport->state > LPORT_ST_DPRT) {
+               FC_LPORT_DBG(lport, "Received a management server response, "
+                            "but in state %s\n", fc_lport_state(lport));
+               if (IS_ERR(fp))
+                       goto err;
+               goto out;
+       }
+
+       if (IS_ERR(fp)) {
+               fc_lport_error(lport, fp);
+               goto err;
+       }
+
+       fh = fc_frame_header_get(fp);
+       ct = fc_frame_payload_get(fp, sizeof(*ct));
+
+       if (fh && ct && fh->fh_type == FC_TYPE_CT &&
+           ct->ct_fs_type == FC_FST_MGMT &&
+           ct->ct_fs_subtype == FC_FDMI_SUBTYPE) {
+               FC_LPORT_DBG(lport, "Received a management server response, "
+                                   "reason=%d explain=%d\n",
+                                   ct->ct_reason,
+                                   ct->ct_explan);
+
+               switch (lport->state) {
+               case LPORT_ST_RHBA:
+                       if (ntohs(ct->ct_cmd) == FC_FS_ACC)
+                               fc_lport_enter_ms(lport, LPORT_ST_RPA);
+                       else /* Error Skip RPA */
+                               fc_lport_enter_scr(lport);
+                       break;
+               case LPORT_ST_RPA:
+                       fc_lport_enter_scr(lport);
+                       break;
+               case LPORT_ST_DPRT:
+                       fc_lport_enter_ms(lport, LPORT_ST_RHBA);
+                       break;
+               case LPORT_ST_DHBA:
+                       fc_lport_enter_ms(lport, LPORT_ST_DPRT);
+                       break;
+               default:
+                       /* should have already been caught by state checks */
+                       break;
+               }
+       } else {
+               /* Invalid Frame? */
+               fc_lport_error(lport, fp);
+       }
+out:
+       fc_frame_free(fp);
+err:
+       mutex_unlock(&lport->lp_mutex);
+}
+
 /**
  * fc_lport_scr_resp() - Handle response to State Change Register (SCR) request
  * @sp:            current sequence in SCR exchange
        fc_lport_error(lport, NULL);
 }
 
+/**
+ * fc_lport_enter_ms() - management server commands
+ * @lport: Fibre Channel local port to register
+ *
+ * Locking Note: The lport lock is expected to be held before calling
+ * this routine.
+ */
+static void fc_lport_enter_ms(struct fc_lport *lport, enum fc_lport_state state)
+{
+       struct fc_frame *fp;
+       enum fc_fdmi_req cmd;
+       int size = sizeof(struct fc_ct_hdr);
+       size_t len;
+       int numattrs;
+
+       FC_LPORT_DBG(lport, "Entered %s state from %s state\n",
+                    fc_lport_state_names[state],
+                    fc_lport_state(lport));
+
+       fc_lport_state_enter(lport, state);
+
+       switch (state) {
+       case LPORT_ST_RHBA:
+               cmd = FC_FDMI_RHBA;
+               /* Number of HBA Attributes */
+               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;
+
+               size += len;
+               break;
+       case LPORT_ST_RPA:
+               cmd = FC_FDMI_RPA;
+               /* Number of Port Attributes */
+               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;
+
+               size += len;
+               break;
+       case LPORT_ST_DPRT:
+               cmd = FC_FDMI_DPRT;
+               len = sizeof(struct fc_fdmi_dprt);
+               size += len;
+               break;
+       case LPORT_ST_DHBA:
+               cmd = FC_FDMI_DHBA;
+               len = sizeof(struct fc_fdmi_dhba);
+               size += len;
+               break;
+       default:
+               fc_lport_error(lport, NULL);
+               return;
+       }
+
+       FC_LPORT_DBG(lport, "Cmd=0x%x Len %d size %d\n",
+                            cmd, (int)len, size);
+       fp = fc_frame_alloc(lport, size);
+       if (!fp) {
+               fc_lport_error(lport, fp);
+               return;
+       }
+
+       if (!lport->tt.elsct_send(lport, FC_FID_MGMT_SERV, fp, cmd,
+                                 fc_lport_ms_resp,
+                                 lport, 3 * lport->r_a_tov))
+               fc_lport_error(lport, fp);
+}
+
+/**
+ * fc_rport_enter_fdmi() - Create a fc_rport for the management server
+ * @lport: The local port requesting a remote port for the management server
+ *
+ * Locking Note: The lport lock is expected to be held before calling
+ * this routine.
+ */
+static void fc_lport_enter_fdmi(struct fc_lport *lport)
+{
+       struct fc_rport_priv *rdata;
+
+       FC_LPORT_DBG(lport, "Entered FDMI state from %s state\n",
+                    fc_lport_state(lport));
+
+       fc_lport_state_enter(lport, LPORT_ST_FDMI);
+
+       mutex_lock(&lport->disc.disc_mutex);
+       rdata = lport->tt.rport_create(lport, FC_FID_MGMT_SERV);
+       mutex_unlock(&lport->disc.disc_mutex);
+       if (!rdata)
+               goto err;
+
+       rdata->ops = &fc_lport_rport_ops;
+       lport->tt.rport_login(rdata);
+       return;
+
+err:
+       fc_lport_error(lport, NULL);
+}
+
 /**
  * fc_lport_timeout() - Handler for the retry_work timer
  * @work: The work struct of the local port
        case LPORT_ST_RFF_ID:
                fc_lport_enter_ns(lport, lport->state);
                break;
+       case LPORT_ST_FDMI:
+               fc_lport_enter_fdmi(lport);
+               break;
+       case LPORT_ST_RHBA:
+       case LPORT_ST_RPA:
+       case LPORT_ST_DHBA:
+       case LPORT_ST_DPRT:
+               fc_lport_enter_ms(lport, lport->state);
+               break;
        case LPORT_ST_SCR:
                fc_lport_enter_scr(lport);
                break;
 
--- /dev/null
+/* * Copyright(c) 2011 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+
+#ifndef _FC_MS_H_
+#define        _FC_MS_H_
+
+#include <linux/types.h>
+
+/*
+ * Fibre Channel Services - Management Service (MS)
+ * From T11.org FC-GS-4 Rev 7.91 February 4, 2004
+ */
+
+/*
+ * Fabric Device Management Interface
+ */
+
+/*
+ * Common-transport sub-type for FDMI
+ */
+#define        FC_FDMI_SUBTYPE     0x10 /* fs_ct_hdr.ct_fs_subtype */
+
+/*
+ * Management server FDMI Requests.
+ */
+enum fc_fdmi_req {
+       FC_FDMI_GRHL = 0x0100,  /* Get Registered HBA List */
+       FC_FDMI_GHAT = 0x0101,  /* Get HBA Attributes */
+       FC_FDMI_GRPL = 0x0102,  /* Get Registered Port List */
+       FC_FDMI_GPAT = 0x0110,  /* Get Port Attributes */
+       FC_FDMI_RHBA = 0x0200,  /* Register HBA */
+       FC_FDMI_RHAT = 0x0201,  /* Register HBA Attributes */
+       FC_FDMI_RPRT = 0x0210,  /* Register Port */
+       FC_FDMI_RPA = 0x0211,   /* Register Port Attributes */
+       FC_FDMI_DHBA = 0x0300,  /* Deregister HBA */
+       FC_FDMI_DHAT = 0x0301,  /* Deregister HBA Attributes */
+       FC_FDMI_DPRT = 0x0310,  /* Deregister Port */
+       FC_FDMI_DPA = 0x0311,   /* Deregister Port Attributes */
+};
+
+/*
+ * HBA Attribute Entry Type
+ */
+enum fc_fdmi_hba_attr_type {
+       FC_FDMI_HBA_ATTR_NODENAME = 0x0001,
+       FC_FDMI_HBA_ATTR_MANUFACTURER = 0x0002,
+       FC_FDMI_HBA_ATTR_SERIALNUMBER = 0x0003,
+       FC_FDMI_HBA_ATTR_MODEL = 0x0004,
+       FC_FDMI_HBA_ATTR_MODELDESCRIPTION = 0x0005,
+       FC_FDMI_HBA_ATTR_HARDWAREVERSION = 0x0006,
+       FC_FDMI_HBA_ATTR_DRIVERVERSION = 0x0007,
+       FC_FDMI_HBA_ATTR_OPTIONROMVERSION = 0x0008,
+       FC_FDMI_HBA_ATTR_FIRMWAREVERSION = 0x0009,
+       FC_FDMI_HBA_ATTR_OSNAMEVERSION = 0x000A,
+       FC_FDMI_HBA_ATTR_MAXCTPAYLOAD = 0x000B,
+};
+
+/*
+ * HBA Attribute Length
+ */
+#define FC_FDMI_HBA_ATTR_NODENAME_LEN          8
+#define FC_FDMI_HBA_ATTR_MANUFACTURER_LEN      64
+#define FC_FDMI_HBA_ATTR_SERIALNUMBER_LEN      64
+#define FC_FDMI_HBA_ATTR_MODEL_LEN             256
+#define FC_FDMI_HBA_ATTR_MODELDESCR_LEN                256
+#define FC_FDMI_HBA_ATTR_HARDWAREVERSION_LEN   256
+#define FC_FDMI_HBA_ATTR_DRIVERVERSION_LEN     256
+#define FC_FDMI_HBA_ATTR_OPTIONROMVERSION_LEN  256
+#define FC_FDMI_HBA_ATTR_FIRMWAREVERSION_LEN   256
+#define FC_FDMI_HBA_ATTR_OSNAMEVERSION_LEN     256
+#define FC_FDMI_HBA_ATTR_MAXCTPAYLOAD_LEN      4
+
+/*
+ * Port Attribute Type
+ */
+enum fc_fdmi_port_attr_type {
+       FC_FDMI_PORT_ATTR_FC4TYPES = 0x0001,
+       FC_FDMI_PORT_ATTR_SUPPORTEDSPEED = 0x0002,
+       FC_FDMI_PORT_ATTR_CURRENTPORTSPEED = 0x0003,
+       FC_FDMI_PORT_ATTR_MAXFRAMESIZE = 0x0004,
+       FC_FDMI_PORT_ATTR_OSDEVICENAME = 0x0005,
+       FC_FDMI_PORT_ATTR_HOSTNAME = 0x0006,
+};
+
+/*
+ * Port Attribute Length
+ */
+#define FC_FDMI_PORT_ATTR_FC4TYPES_LEN         32
+#define FC_FDMI_PORT_ATTR_SUPPORTEDSPEED_LEN   4
+#define FC_FDMI_PORT_ATTR_CURRENTPORTSPEED_LEN 4
+#define FC_FDMI_PORT_ATTR_MAXFRAMESIZE_LEN     4
+#define FC_FDMI_PORT_ATTR_OSDEVICENAME_LEN     256
+#define FC_FDMI_PORT_ATTR_HOSTNAME_LEN         256
+
+/*
+ * HBA Attribute ID
+ */
+struct fc_fdmi_hba_identifier {
+       __be64          id;
+};
+
+/*
+ * Port Name
+ */
+struct fc_fdmi_port_name {
+       __be64          portname;
+};
+
+/*
+ * Attribute Entry Block for HBA/Port Attributes
+ */
+#define FC_FDMI_ATTR_ENTRY_HEADER_LEN  4
+struct fc_fdmi_attr_entry {
+       __be16          type;
+       __be16          len;
+       __u8            value[1];
+} __attribute__((__packed__));
+
+/*
+ * Common for HBA/Port Attributes
+ */
+struct fs_fdmi_attrs {
+       __be32                          numattrs;
+       struct fc_fdmi_attr_entry       attr[1];
+} __attribute__((__packed__));
+
+/*
+ * Registered Port List
+ */
+struct fc_fdmi_rpl {
+       __be32                          numport;
+       struct fc_fdmi_port_name        port[1];
+} __attribute__((__packed__));
+
+/*
+ * Register HBA (RHBA)
+ */
+struct fc_fdmi_rhba {
+       struct fc_fdmi_hba_identifier hbaid;
+       struct fc_fdmi_rpl               port;
+       struct fs_fdmi_attrs             hba_attrs;
+} __attribute__((__packed__));
+
+/*
+ * Register HBA Attributes (RHAT)
+ */
+struct fc_fdmi_rhat {
+       struct fc_fdmi_hba_identifier hbaid;
+       struct fs_fdmi_attrs             hba_attrs;
+} __attribute__((__packed__));
+
+/*
+ * Register Port (RPRT)
+ */
+struct fc_fdmi_rprt {
+       struct fc_fdmi_hba_identifier hbaid;
+       struct fc_fdmi_port_name         port;
+       struct fs_fdmi_attrs             hba_attrs;
+} __attribute__((__packed__));
+
+/*
+ * Register Port Attributes (RPA)
+ */
+struct fc_fdmi_rpa {
+       struct fc_fdmi_port_name         port;
+       struct fs_fdmi_attrs             hba_attrs;
+} __attribute__((__packed__));
+
+/*
+ * Deregister Port (DPRT)
+ */
+struct fc_fdmi_dprt {
+       struct fc_fdmi_port_name         port;
+} __attribute__((__packed__));
+
+/*
+ * Deregister Port Attributes (DPA)
+ */
+struct fc_fdmi_dpa {
+       struct fc_fdmi_port_name         port;
+       struct fs_fdmi_attrs             hba_attrs;
+} __attribute__((__packed__));
+
+/*
+ * Deregister HBA Attributes (DHAT)
+ */
+struct fc_fdmi_dhat {
+       struct fc_fdmi_hba_identifier hbaid;
+} __attribute__((__packed__));
+
+/*
+ * Deregister HBA (DHBA)
+ */
+struct fc_fdmi_dhba {
+       struct fc_fdmi_hba_identifier hbaid;
+} __attribute__((__packed__));
+
+#endif /* _FC_MS_H_ */
 
 #ifndef _FC_ENCODE_H_
 #define _FC_ENCODE_H_
 #include <asm/unaligned.h>
+#include <linux/utsname.h>
 
 /*
  * F_CTL values for simple requests and responses.
                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;
 };
 
        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.
        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);
 
 
 #include <scsi/fc/fc_fcp.h>
 #include <scsi/fc/fc_ns.h>
+#include <scsi/fc/fc_ms.h>
 #include <scsi/fc/fc_els.h>
 #include <scsi/fc/fc_gs.h>
 
  * @LPORT_ST_RPN_ID:   Register port name by ID (RPN_ID) sent
  * @LPORT_ST_RFT_ID:   Register Fibre Channel types by ID (RFT_ID) sent
  * @LPORT_ST_RFF_ID:   Register FC-4 Features by ID (RFF_ID) sent
+ * @LPORT_ST_FDMI:     Waiting for mgmt server rport to become ready
+ * @LPORT_ST_RHBA:
  * @LPORT_ST_SCR:      State Change Register (SCR) sent
  * @LPORT_ST_READY:    Ready for use
  * @LPORT_ST_LOGO:     Local port logout (LOGO) sent
        LPORT_ST_RSPN_ID,
        LPORT_ST_RFT_ID,
        LPORT_ST_RFF_ID,
+       LPORT_ST_FDMI,
+       LPORT_ST_RHBA,
+       LPORT_ST_RPA,
+       LPORT_ST_DHBA,
+       LPORT_ST_DPRT,
        LPORT_ST_SCR,
        LPORT_ST_READY,
        LPORT_ST_LOGO,
  * @host:                  The SCSI host associated with a local port
  * @ema_list:              Exchange manager anchor list
  * @dns_rdata:             The directory server remote port
+ * @ms_rdata:             The management server remote port
  * @ptp_rdata:             Point to point remote port
  * @scsi_priv:             FCP layer internal data
  * @disc:                  Discovery context
        struct Scsi_Host               *host;
        struct list_head               ema_list;
        struct fc_rport_priv           *dns_rdata;
+       struct fc_rport_priv           *ms_rdata;
        struct fc_rport_priv           *ptp_rdata;
        void                           *scsi_priv;
        struct fc_disc                 disc;
        u32                            does_npiv:1;
        u32                            npiv_enabled:1;
        u32                            point_to_multipoint:1;
+       u32                            fdmi_enabled:1;
        u32                            mfs;
        u8                             max_retry_count;
        u8                             max_rport_retry_count;