2 files changed, 68 insertions, 20 deletions

diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 933a91b1474e..2c3a89b64e71 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -86,7 +86,7 @@ struct iscsi_uevent {
                         uint32_t        sid;
                         uint32_t        cid;
                         uint32_t        param; /* enum iscsi_param */
-                        uint32_t        value;
+                        uint32_t        len;
                 } set_param;
                 struct msg_start_conn {
                         uint32_t        sid;
@@ -155,22 +155,54 @@ enum iscsi_err {
  * iSCSI Parameters (RFC3720)
  */
 enum iscsi_param {
-        ISCSI_PARAM_MAX_RECV_DLENGTH    = 0,
-        ISCSI_PARAM_MAX_XMIT_DLENGTH    = 1,
-        ISCSI_PARAM_HDRDGST_EN          = 2,
-        ISCSI_PARAM_DATADGST_EN         = 3,
-        ISCSI_PARAM_INITIAL_R2T_EN      = 4,
-        ISCSI_PARAM_MAX_R2T             = 5,
-        ISCSI_PARAM_IMM_DATA_EN         = 6,
-        ISCSI_PARAM_FIRST_BURST         = 7,
-        ISCSI_PARAM_MAX_BURST           = 8,
-        ISCSI_PARAM_PDU_INORDER_EN      = 9,
-        ISCSI_PARAM_DATASEQ_INORDER_EN  = 10,
-        ISCSI_PARAM_ERL                 = 11,
-        ISCSI_PARAM_IFMARKER_EN         = 12,
-        ISCSI_PARAM_OFMARKER_EN         = 13,
+        /* passed in using netlink set param */
+        ISCSI_PARAM_MAX_RECV_DLENGTH,
+        ISCSI_PARAM_MAX_XMIT_DLENGTH,
+        ISCSI_PARAM_HDRDGST_EN,
+        ISCSI_PARAM_DATADGST_EN,
+        ISCSI_PARAM_INITIAL_R2T_EN,
+        ISCSI_PARAM_MAX_R2T,
+        ISCSI_PARAM_IMM_DATA_EN,
+        ISCSI_PARAM_FIRST_BURST,
+        ISCSI_PARAM_MAX_BURST,
+        ISCSI_PARAM_PDU_INORDER_EN,
+        ISCSI_PARAM_DATASEQ_INORDER_EN,
+        ISCSI_PARAM_ERL,
+        ISCSI_PARAM_IFMARKER_EN,
+        ISCSI_PARAM_OFMARKER_EN,
+        ISCSI_PARAM_TARGET_NAME,
+        ISCSI_PARAM_TPGT,
+        ISCSI_PARAM_PERSISTENT_ADDRESS,
+        ISCSI_PARAM_PERSISTENT_PORT,
+
+        /* pased in through bind conn using transport_fd */
+        ISCSI_PARAM_CONN_PORT,
+        ISCSI_PARAM_CONN_ADDRESS,
+
+        /* must always be last */
+        ISCSI_PARAM_MAX,
 };
-#define ISCSI_PARAM_MAX                 14
+
+#define ISCSI_MAX_RECV_DLENGTH          (1 << ISCSI_PARAM_MAX_RECV_DLENGTH)
+#define ISCSI_MAX_XMIT_DLENGTH          (1 << ISCSI_PARAM_MAX_XMIT_DLENGTH)
+#define ISCSI_HDRDGST_EN                (1 << ISCSI_PARAM_HDRDGST_EN)
+#define ISCSI_DATADGST_EN               (1 << ISCSI_PARAM_DATADGST_EN)
+#define ISCSI_INITIAL_R2T_EN            (1 << ISCSI_PARAM_INITIAL_R2T_EN)
+#define ISCSI_MAX_R2T                   (1 << ISCSI_PARAM_MAX_R2T)
+#define ISCSI_IMM_DATA_EN               (1 << ISCSI_PARAM_IMM_DATA_EN)
+#define ISCSI_FIRST_BURST               (1 << ISCSI_PARAM_FIRST_BURST)
+#define ISCSI_MAX_BURST                 (1 << ISCSI_PARAM_MAX_BURST)
+#define ISCSI_PDU_INORDER_EN            (1 << ISCSI_PARAM_PDU_INORDER_EN)
+#define ISCSI_DATASEQ_INORDER_EN        (1 << ISCSI_PARAM_DATASEQ_INORDER_EN)
+#define ISCSI_ERL                       (1 << ISCSI_PARAM_ERL)
+#define ISCSI_IFMARKER_EN               (1 << ISCSI_PARAM_IFMARKER_EN)
+#define ISCSI_OFMARKER_EN               (1 << ISCSI_PARAM_OFMARKER_EN)
+#define ISCSI_TARGET_NAME               (1 << ISCSI_PARAM_TARGET_NAME)
+#define ISCSI_TPGT                      (1 << ISCSI_PARAM_TPGT)
+#define ISCSI_PERSISTENT_ADDRESS        (1 << ISCSI_PARAM_PERSISTENT_ADDRESS)
+#define ISCSI_PERSISTENT_PORT           (1 << ISCSI_PARAM_PERSISTENT_PORT)
+#define ISCSI_CONN_PORT                 (1 << ISCSI_PARAM_CONN_PORT)
+#define ISCSI_CONN_ADDRESS              (1 << ISCSI_PARAM_CONN_ADDRESS)
 
 #define iscsi_ptr(_handle) ((void*)(unsigned long)_handle)
 #define iscsi_handle(_ptr) ((uint64_t)(unsigned long)_ptr)
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index 631463cd4892..4b200645c84b 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -53,11 +53,11 @@ struct iscsi_transport {
         struct module *owner;
         char *name;
         unsigned int caps;
+        /* LLD sets this to indicate what values it can export to sysfs */
+        unsigned int param_mask;
         struct scsi_host_template *host_template;
         /* LLD session/scsi_host data size */
         int hostdata_size;
-        /* LLD iscsi_host data size */
-        int ihostdata_size;
         /* LLD connection data size */
         int conndata_size;
         /* LLD session data size */
@@ -79,10 +79,13 @@ struct iscsi_transport {
         int (*set_param) (struct iscsi_cls_conn *conn, enum iscsi_param param,
                           uint32_t value);
         int (*get_conn_param) (struct iscsi_cls_conn *conn,
-                               enum iscsi_param param,
-                               uint32_t *value);
+                               enum iscsi_param param, uint32_t *value);
         int (*get_session_param) (struct iscsi_cls_session *session,
                                   enum iscsi_param param, uint32_t *value);
+        int (*get_conn_str_param) (struct iscsi_cls_conn *conn,
+                                   enum iscsi_param param, char *buf);
+        int (*get_session_str_param) (struct iscsi_cls_session *session,
+                                      enum iscsi_param param, char *buf);
         int (*send_pdu) (struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,
                          char *data, uint32_t data_size);
         void (*get_stats) (struct iscsi_cls_conn *conn,
@@ -107,6 +110,14 @@ struct iscsi_cls_conn {
         void *dd_data;                  /* LLD private data */
         struct iscsi_transport *transport;
         uint32_t cid;                   /* connection id */
+
+        /* portal/group values we got during discovery */
+        char *persistent_address;
+        int persistent_port;
+        /* portal/group values we are currently using */
+        char *address;
+        int port;
+
         int active;                     /* must be accessed with the connlock */
         struct device dev;              /* sysfs transport/container device */
         struct mempool_zone *z_error;
@@ -120,6 +131,11 @@ struct iscsi_cls_conn {
 struct iscsi_cls_session {
         struct list_head sess_list;             /* item in session_list */
         struct iscsi_transport *transport;
+
+        /* iSCSI values used as unique id by userspace. */
+        char *targetname;
+        int tpgt;
+
         int sid;                                /* session id */
         void *dd_data;                          /* LLD private data */
         struct device dev;      /* sysfs transport/container device */