1 files changed, 46 insertions, 3 deletions

diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index 71ff340f6de4..524f9eb7fcd1 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -1,6 +1,6 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2012 QLogic Corporation
+ * Copyright (c)  2003-2014 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
@@ -2054,9 +2054,49 @@ qla26xx_serdes_op(struct fc_bsg_job *bsg_job)
                 bsg_job->reply->reply_payload_rcv_len = sizeof(sr);
                 break;
         default:
-                ql_log(ql_log_warn, vha, 0x708c,
+                ql_dbg(ql_dbg_user, vha, 0x708c,
                     "Unknown serdes cmd %x.\n", sr.cmd);
-                rval = -EDOM;
+                rval = -EINVAL;
+                break;
+        }
+
+        bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
+            rval ? EXT_STATUS_MAILBOX : 0;
+
+        bsg_job->reply_len = sizeof(struct fc_bsg_reply);
+        bsg_job->reply->result = DID_OK << 16;
+        bsg_job->job_done(bsg_job);
+        return 0;
+}
+
+static int
+qla8044_serdes_op(struct fc_bsg_job *bsg_job)
+{
+        struct Scsi_Host *host = bsg_job->shost;
+        scsi_qla_host_t *vha = shost_priv(host);
+        int rval = 0;
+        struct qla_serdes_reg_ex sr;
+
+        memset(&sr, 0, sizeof(sr));
+
+        sg_copy_to_buffer(bsg_job->request_payload.sg_list,
+            bsg_job->request_payload.sg_cnt, &sr, sizeof(sr));
+
+        switch (sr.cmd) {
+        case INT_SC_SERDES_WRITE_REG:
+                rval = qla8044_write_serdes_word(vha, sr.addr, sr.val);
+                bsg_job->reply->reply_payload_rcv_len = 0;
+                break;
+        case INT_SC_SERDES_READ_REG:
+                rval = qla8044_read_serdes_word(vha, sr.addr, &sr.val);
+                sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
+                    bsg_job->reply_payload.sg_cnt, &sr, sizeof(sr));
+                bsg_job->reply->reply_payload_rcv_len = sizeof(sr);
+                break;
+        default:
+                ql_dbg(ql_dbg_user, vha, 0x70cf,
+                    "Unknown serdes cmd %x.\n", sr.cmd);
+                rval = -EINVAL;
                 break;
         }
 
@@ -2121,6 +2161,9 @@ qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job)
         case QL_VND_SERDES_OP:
                 return qla26xx_serdes_op(bsg_job);
 
+        case QL_VND_SERDES_OP_EX:
+                return qla8044_serdes_op(bsg_job);
+
         default:
                 return -ENOSYS;
         }