static FC_DEVICE_ATTR(rport, roles, S_IRUGO,
                show_fc_rport_roles, NULL);
 
-fc_private_rport_rd_enum_attr(port_state, FC_PORTSTATE_MAX_NAMELEN);
+static ssize_t fc_rport_set_marginal_state(struct device *dev,
+                                               struct device_attribute *attr,
+                                               const char *buf, size_t count)
+{
+       struct fc_rport *rport = transport_class_to_rport(dev);
+       enum fc_port_state port_state;
+       int ret = 0;
+
+       ret = get_fc_port_state_match(buf, &port_state);
+       if (ret)
+               return -EINVAL;
+       if (port_state == FC_PORTSTATE_MARGINAL) {
+               /*
+                * Change the state to Marginal only if the
+                * current rport state is Online
+                * Allow only Online->Marginal
+                */
+               if (rport->port_state == FC_PORTSTATE_ONLINE)
+                       rport->port_state = port_state;
+               else
+                       return -EINVAL;
+       } else if (port_state == FC_PORTSTATE_ONLINE) {
+               /*
+                * Change the state to Online only if the
+                * current rport state is Marginal
+                * Allow only Marginal->Online
+                */
+               if (rport->port_state == FC_PORTSTATE_MARGINAL)
+                       rport->port_state = port_state;
+               else
+                       return -EINVAL;
+       } else
+               return -EINVAL;
+       return count;
+}
+
+static ssize_t
+show_fc_rport_port_state(struct device *dev,
+                               struct device_attribute *attr, char *buf)
+{
+       const char *name;
+       struct fc_rport *rport = transport_class_to_rport(dev);
+
+       name = get_fc_port_state_name(rport->port_state);
+       if (!name)
+               return -EINVAL;
+
+       return snprintf(buf, 20, "%s\n", name);
+}
+
+static FC_DEVICE_ATTR(rport, port_state, 0444 | 0200,
+                       show_fc_rport_port_state, fc_rport_set_marginal_state);
+
 fc_private_rport_rd_attr(scsi_target_id, "%d\n", 20);
 
 /*
        SETUP_PRIVATE_RPORT_ATTRIBUTE_RD(port_name);
        SETUP_PRIVATE_RPORT_ATTRIBUTE_RD(port_id);
        SETUP_PRIVATE_RPORT_ATTRIBUTE_RD(roles);
-       SETUP_PRIVATE_RPORT_ATTRIBUTE_RD(port_state);
+       SETUP_PRIVATE_RPORT_ATTRIBUTE_RW(port_state);
        SETUP_PRIVATE_RPORT_ATTRIBUTE_RD(scsi_target_id);
        SETUP_PRIVATE_RPORT_ATTRIBUTE_RW(fast_io_fail_tmo);