[SCSI] be2iscsi: Fix log level for protocol specific logs

Signed-off-by: John Soni Jose <sony.john-n@emulex.com>
Signed-off-by: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index ddacd2c990793a3610a1723fc3183840b20ca3cd..7e470a322e3593ebb8330e4813871083b1c7b39f 100644 (file)
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -149,7 +149,8 @@ BEISCSI_RW_ATTR(log_enable, 0x00,
                "\t\t\t\tMiscellaneous Events   : 0x04\n"
                "\t\t\t\tError Handling         : 0x08\n"
                "\t\t\t\tIO Path Events         : 0x10\n"
-               "\t\t\t\tConfiguration Path     : 0x20\n");
+               "\t\t\t\tConfiguration Path     : 0x20\n"
+               "\t\t\t\tiSCSI Protocol         : 0x40\n");
 
 DEVICE_ATTR(beiscsi_drvr_ver, S_IRUGO, beiscsi_drvr_ver_disp, NULL);
 DEVICE_ATTR(beiscsi_adapter_family, S_IRUGO, beiscsi_adap_family_disp, NULL);
@@ -5019,8 +5020,12 @@ static int beiscsi_task_xmit(struct iscsi_task *task)
                struct beiscsi_hba *phba = NULL;
 
                phba = ((struct beiscsi_conn *)conn->dd_data)->phba;
-               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_IO,
-                           "BM_%d : scsi_dma_map Failed\n");
+               beiscsi_log(phba, KERN_ERR,
+                           BEISCSI_LOG_IO | BEISCSI_LOG_ISCSI,
+                           "BM_%d : scsi_dma_map Failed "
+                           "Driver_ITT : 0x%x ITT : 0x%x Xferlen : 0x%x\n",
+                           be32_to_cpu(io_task->cmd_bhs->iscsi_hdr.itt),
+                           io_task->libiscsi_itt, scsi_bufflen(sc));
 
                return num_sg;
        }

diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h
index 88291b0051bfd82abd2ca89d1fd3d926e7f4318b..a8ae6b82c3e1a861e13f52c6001b5872713a04a6 100644 (file)
--- a/drivers/scsi/be2iscsi/be_main.h
+++ b/drivers/scsi/be2iscsi/be_main.h
@@ -1040,6 +1040,7 @@ struct hwi_context_memory {
 #define BEISCSI_LOG_EH         0x0008  /* Error Handler */
 #define BEISCSI_LOG_IO         0x0010  /* IO Code Path */
 #define BEISCSI_LOG_CONFIG     0x0020  /* CONFIG Code Path */
+#define BEISCSI_LOG_ISCSI      0x0040  /* SCSI/iSCSI Protocol related Logs */
 
 #define beiscsi_log(phba, level, mask, fmt, arg...) \
 do { \