* [PATCH 1/7] qla4xxx: Temperature monitoring for ISP82XX core.
2012-01-11 10:44 [PATCH 0/7] qla4xxx: Update driver version to 5.02.00-k12 vikas.chaudhary
@ 2012-01-11 10:44 ` vikas.chaudhary
2012-01-11 10:44 ` [PATCH 2/7] qla4xxx: Disable generating pause frames in case of FW hung vikas.chaudhary
` (6 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: vikas.chaudhary @ 2012-01-11 10:44 UTC (permalink / raw)
To: jbottomley, michaelc
Cc: linux-scsi, vikas.chaudhary, lalit.chandivade, ravi.anand,
Mike Hernandez
From: Mike Hernandez <michael.hernandez@qlogic.com>
During watchdog, need to monitor temperature of ISP82XX core
and set device state to FAILED when temperature reaches
"Panic" level.
Signed-off-by: Mike Hernandez <michael.hernandez@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
drivers/scsi/qla4xxx/ql4_def.h | 1 +
drivers/scsi/qla4xxx/ql4_nx.h | 19 +++++++++++++++--
drivers/scsi/qla4xxx/ql4_os.c | 42 +++++++++++++++++++++++++++++++++++++++-
3 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index 22a3ff0..ec48dc3 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -671,6 +671,7 @@ struct scsi_qla_host {
uint16_t pri_ddb_idx;
uint16_t sec_ddb_idx;
int is_reset;
+ uint16_t temperature;
};
struct ql4_task_data {
diff --git a/drivers/scsi/qla4xxx/ql4_nx.h b/drivers/scsi/qla4xxx/ql4_nx.h
index 35376a1..cfb2f2e 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.h
+++ b/drivers/scsi/qla4xxx/ql4_nx.h
@@ -19,12 +19,25 @@
#define PHAN_PEG_RCV_INITIALIZED 0xff01
/*CRB_RELATED*/
-#define QLA82XX_CRB_BASE QLA82XX_CAM_RAM(0x200)
-#define QLA82XX_REG(X) (QLA82XX_CRB_BASE+(X))
-
+#define QLA82XX_CRB_BASE (QLA82XX_CAM_RAM(0x200))
+#define QLA82XX_REG(X) (QLA82XX_CRB_BASE+(X))
#define CRB_CMDPEG_STATE QLA82XX_REG(0x50)
#define CRB_RCVPEG_STATE QLA82XX_REG(0x13c)
#define CRB_DMA_SHIFT QLA82XX_REG(0xcc)
+#define CRB_TEMP_STATE QLA82XX_REG(0x1b4)
+
+#define qla82xx_get_temp_val(x) ((x) >> 16)
+#define qla82xx_get_temp_state(x) ((x) & 0xffff)
+#define qla82xx_encode_temp(val, state) (((val) << 16) | (state))
+
+/*
+ * Temperature control.
+ */
+enum {
+ QLA82XX_TEMP_NORMAL = 0x1, /* Normal operating range */
+ QLA82XX_TEMP_WARN, /* Sound alert, temperature getting high */
+ QLA82XX_TEMP_PANIC /* Fatal error, hardware has shut down. */
+};
#define QLA82XX_HW_H0_CH_HUB_ADR 0x05
#define QLA82XX_HW_H1_CH_HUB_ADR 0x0E
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 6f9b84d..d816229 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1972,6 +1972,42 @@ mem_alloc_error_exit:
}
/**
+ * qla4_8xxx_check_temp - Check the ISP82XX temperature.
+ * @ha: adapter block pointer.
+ *
+ * Note: The caller should not hold the idc lock.
+ **/
+static int qla4_8xxx_check_temp(struct scsi_qla_host *ha)
+{
+ uint32_t temp, temp_state, temp_val;
+ int status = QLA_SUCCESS;
+
+ temp = qla4_8xxx_rd_32(ha, CRB_TEMP_STATE);
+
+ temp_state = qla82xx_get_temp_state(temp);
+ temp_val = qla82xx_get_temp_val(temp);
+
+ if (temp_state == QLA82XX_TEMP_PANIC) {
+ ql4_printk(KERN_WARNING, ha, "Device temperature %d degrees C"
+ " exceeds maximum allowed. Hardware has been shut"
+ " down.\n", temp_val);
+ status = QLA_ERROR;
+ } else if (temp_state == QLA82XX_TEMP_WARN) {
+ if (ha->temperature == QLA82XX_TEMP_NORMAL)
+ ql4_printk(KERN_WARNING, ha, "Device temperature %d"
+ " degrees C exceeds operating range."
+ " Immediate action needed.\n", temp_val);
+ } else {
+ if (ha->temperature == QLA82XX_TEMP_WARN)
+ ql4_printk(KERN_INFO, ha, "Device temperature is"
+ " now %d degrees C in normal range.\n",
+ temp_val);
+ }
+ ha->temperature = temp_state;
+ return status;
+}
+
+/**
* qla4_8xxx_check_fw_alive - Check firmware health
* @ha: Pointer to host adapter structure.
*
@@ -2042,7 +2078,11 @@ void qla4_8xxx_watchdog(struct scsi_qla_host *ha)
test_bit(DPC_RESET_HA, &ha->dpc_flags) ||
test_bit(DPC_RETRY_RESET_HA, &ha->dpc_flags))) {
dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
- if (dev_state == QLA82XX_DEV_NEED_RESET &&
+
+ if (qla4_8xxx_check_temp(ha)) {
+ set_bit(DPC_HA_UNRECOVERABLE, &ha->dpc_flags);
+ qla4xxx_wake_dpc(ha);
+ } else if (dev_state == QLA82XX_DEV_NEED_RESET &&
!test_bit(DPC_RESET_HA, &ha->dpc_flags)) {
if (!ql4xdontresethba) {
ql4_printk(KERN_INFO, ha, "%s: HW State: "
--
1.7.8.rc2.3.g0911
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/7] qla4xxx: Disable generating pause frames in case of FW hung
2012-01-11 10:44 [PATCH 0/7] qla4xxx: Update driver version to 5.02.00-k12 vikas.chaudhary
2012-01-11 10:44 ` [PATCH 1/7] qla4xxx: Temperature monitoring for ISP82XX core vikas.chaudhary
@ 2012-01-11 10:44 ` vikas.chaudhary
2012-01-11 10:44 ` [PATCH 3/7] qla4xxx: Added error logging for firmware abort vikas.chaudhary
` (5 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: vikas.chaudhary @ 2012-01-11 10:44 UTC (permalink / raw)
To: jbottomley, michaelc
Cc: linux-scsi, vikas.chaudhary, lalit.chandivade, ravi.anand,
Giridhar Malavali
From: Giridhar Malavali <giridhar.malavali@qlogic.com>
In case of FW hung ISP82xx generates continuous pause frames
which causes switch to disable port.
Added fix to disable generating pause frames in case of
FW hung
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
drivers/scsi/qla4xxx/ql4_mbx.c | 7 +++++++
drivers/scsi/qla4xxx/ql4_nx.h | 3 +++
drivers/scsi/qla4xxx/ql4_os.c | 10 ++++++++++
3 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index c259378..e1e66a4 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -219,6 +219,13 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
ha->mailbox_timeout_count++;
mbx_sts[0] = (-1);
set_bit(DPC_RESET_HA, &ha->dpc_flags);
+ if (is_qla8022(ha)) {
+ ql4_printk(KERN_INFO, ha,
+ "disabling pause transmit on port 0 & 1.\n");
+ qla4_8xxx_wr_32(ha, QLA82XX_CRB_NIU + 0x98,
+ CRB_NIU_XG_PAUSE_CTL_P0 |
+ CRB_NIU_XG_PAUSE_CTL_P1);
+ }
goto mbox_exit;
}
diff --git a/drivers/scsi/qla4xxx/ql4_nx.h b/drivers/scsi/qla4xxx/ql4_nx.h
index cfb2f2e..dc45ac9 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.h
+++ b/drivers/scsi/qla4xxx/ql4_nx.h
@@ -39,6 +39,9 @@ enum {
QLA82XX_TEMP_PANIC /* Fatal error, hardware has shut down. */
};
+#define CRB_NIU_XG_PAUSE_CTL_P0 0x1
+#define CRB_NIU_XG_PAUSE_CTL_P1 0x8
+
#define QLA82XX_HW_H0_CH_HUB_ADR 0x05
#define QLA82XX_HW_H1_CH_HUB_ADR 0x0E
#define QLA82XX_HW_H2_CH_HUB_ADR 0x03
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index d816229..f47a337 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -2080,6 +2080,11 @@ void qla4_8xxx_watchdog(struct scsi_qla_host *ha)
dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
if (qla4_8xxx_check_temp(ha)) {
+ ql4_printk(KERN_INFO, ha, "disabling pause"
+ " transmit on port 0 & 1.\n");
+ qla4_8xxx_wr_32(ha, QLA82XX_CRB_NIU + 0x98,
+ CRB_NIU_XG_PAUSE_CTL_P0 |
+ CRB_NIU_XG_PAUSE_CTL_P1);
set_bit(DPC_HA_UNRECOVERABLE, &ha->dpc_flags);
qla4xxx_wake_dpc(ha);
} else if (dev_state == QLA82XX_DEV_NEED_RESET &&
@@ -2099,6 +2104,11 @@ void qla4_8xxx_watchdog(struct scsi_qla_host *ha)
} else {
/* Check firmware health */
if (qla4_8xxx_check_fw_alive(ha)) {
+ ql4_printk(KERN_INFO, ha, "disabling pause"
+ " transmit on port 0 & 1.\n");
+ qla4_8xxx_wr_32(ha, QLA82XX_CRB_NIU + 0x98,
+ CRB_NIU_XG_PAUSE_CTL_P0 |
+ CRB_NIU_XG_PAUSE_CTL_P1);
halt_status = qla4_8xxx_rd_32(ha,
QLA82XX_PEG_HALT_STATUS1);
--
1.7.8.rc2.3.g0911
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 3/7] qla4xxx: Added error logging for firmware abort
2012-01-11 10:44 [PATCH 0/7] qla4xxx: Update driver version to 5.02.00-k12 vikas.chaudhary
2012-01-11 10:44 ` [PATCH 1/7] qla4xxx: Temperature monitoring for ISP82XX core vikas.chaudhary
2012-01-11 10:44 ` [PATCH 2/7] qla4xxx: Disable generating pause frames in case of FW hung vikas.chaudhary
@ 2012-01-11 10:44 ` vikas.chaudhary
2012-01-11 10:44 ` [PATCH 4/7] qla4xxx: Clear the RISC interrupt bit during FW init vikas.chaudhary
` (4 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: vikas.chaudhary @ 2012-01-11 10:44 UTC (permalink / raw)
To: jbottomley, michaelc
Cc: linux-scsi, vikas.chaudhary, lalit.chandivade, ravi.anand,
Nilesh Javali
From: Nilesh Javali <nilesh.javali@qlogic.com>
Added debug print with error code in case of firmware error.
Signed-off-by: Nilesh Javali <nilesh.javali@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
drivers/scsi/qla4xxx/ql4_def.h | 2 ++
drivers/scsi/qla4xxx/ql4_os.c | 7 +++++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index ec48dc3..bfe6854 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -150,6 +150,8 @@
#define QL4_SESS_RECOVERY_TMO 120 /* iSCSI session */
/* recovery timeout */
+#define MSB(x) ((uint8_t)((uint16_t)(x) >> 8))
+#define LSW(x) ((uint16_t)(x))
#define LSDW(x) ((u32)((u64)(x)))
#define MSDW(x) ((u32)((((u64)(x)) >> 16) >> 16))
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index f47a337..cb9dcd8 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -2112,6 +2112,13 @@ void qla4_8xxx_watchdog(struct scsi_qla_host *ha)
halt_status = qla4_8xxx_rd_32(ha,
QLA82XX_PEG_HALT_STATUS1);
+ if (LSW(MSB(halt_status)) == 0x67)
+ ql4_printk(KERN_ERR, ha, "%s:"
+ " Firmware aborted with"
+ " error code 0x00006700."
+ " Device is being reset\n",
+ __func__);
+
/* Since we cannot change dev_state in interrupt
* context, set appropriate DPC flag then wakeup
* DPC */
--
1.7.8.rc2.3.g0911
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 4/7] qla4xxx: Clear the RISC interrupt bit during FW init
2012-01-11 10:44 [PATCH 0/7] qla4xxx: Update driver version to 5.02.00-k12 vikas.chaudhary
` (2 preceding siblings ...)
2012-01-11 10:44 ` [PATCH 3/7] qla4xxx: Added error logging for firmware abort vikas.chaudhary
@ 2012-01-11 10:44 ` vikas.chaudhary
2012-01-11 10:44 ` [PATCH 5/7] qla4xxx: Update license vikas.chaudhary
` (3 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: vikas.chaudhary @ 2012-01-11 10:44 UTC (permalink / raw)
To: jbottomley, michaelc
Cc: linux-scsi, vikas.chaudhary, lalit.chandivade, ravi.anand,
Sarang Radke
From: Sarang Radke <sarang.radke@qlogic.com>
This patch fix kernel panic during kdump.
Signed-off-by: Sarang Radke <sarang.radke@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
drivers/scsi/qla4xxx/ql4_init.c | 3 +++
drivers/scsi/qla4xxx/ql4_nx.c | 5 +++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index 1bdfa81..90614f3 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -697,6 +697,9 @@ int qla4xxx_start_firmware(struct scsi_qla_host *ha)
writel(set_rmask(CSR_SCSI_PROCESSOR_INTR),
&ha->reg->ctrl_status);
readl(&ha->reg->ctrl_status);
+ writel(set_rmask(CSR_SCSI_COMPLETION_INTR),
+ &ha->reg->ctrl_status);
+ readl(&ha->reg->ctrl_status);
spin_unlock_irqrestore(&ha->hardware_lock, flags);
if (qla4xxx_get_firmware_state(ha) == QLA_SUCCESS) {
DEBUG2(printk("scsi%ld: %s: Get firmware "
diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index 8d6bc1b..78f1111 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -1875,6 +1875,11 @@ exit:
int qla4_8xxx_load_risc(struct scsi_qla_host *ha)
{
int retval;
+
+ /* clear the interrupt */
+ writel(0, &ha->qla4_8xxx_reg->host_int);
+ readl(&ha->qla4_8xxx_reg->host_int);
+
retval = qla4_8xxx_device_state_handler(ha);
if (retval == QLA_SUCCESS && !test_bit(AF_INIT_DONE, &ha->flags))
--
1.7.8.rc2.3.g0911
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 5/7] qla4xxx: Update license
2012-01-11 10:44 [PATCH 0/7] qla4xxx: Update driver version to 5.02.00-k12 vikas.chaudhary
` (3 preceding siblings ...)
2012-01-11 10:44 ` [PATCH 4/7] qla4xxx: Clear the RISC interrupt bit during FW init vikas.chaudhary
@ 2012-01-11 10:44 ` vikas.chaudhary
2012-01-11 10:44 ` [PATCH 6/7] qla4xxx: Cleanup modinfo display vikas.chaudhary
` (2 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: vikas.chaudhary @ 2012-01-11 10:44 UTC (permalink / raw)
To: jbottomley, michaelc
Cc: linux-scsi, vikas.chaudhary, lalit.chandivade, ravi.anand
From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
Documentation/scsi/LICENSE.qla4xxx | 23 +----------------------
1 files changed, 1 insertions(+), 22 deletions(-)
diff --git a/Documentation/scsi/LICENSE.qla4xxx b/Documentation/scsi/LICENSE.qla4xxx
index 494980e..ab89959 100644
--- a/Documentation/scsi/LICENSE.qla4xxx
+++ b/Documentation/scsi/LICENSE.qla4xxx
@@ -1,32 +1,11 @@
Copyright (c) 2003-2011 QLogic Corporation
-QLogic Linux iSCSI HBA Driver
+QLogic Linux iSCSI Driver
This program includes a device driver for Linux 3.x.
You may modify and redistribute the device driver code under the
GNU General Public License (a copy of which is attached hereto as
Exhibit A) published by the Free Software Foundation (version 2).
-REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE,
-THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT
-CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR
-OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT,
-TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN
-ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN
-COMBINATION WITH THIS PROGRAM.
-
EXHIBIT A
--
1.7.8.rc2.3.g0911
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 6/7] qla4xxx: Cleanup modinfo display
2012-01-11 10:44 [PATCH 0/7] qla4xxx: Update driver version to 5.02.00-k12 vikas.chaudhary
` (4 preceding siblings ...)
2012-01-11 10:44 ` [PATCH 5/7] qla4xxx: Update license vikas.chaudhary
@ 2012-01-11 10:44 ` vikas.chaudhary
2012-01-12 2:01 ` Mike Christie
2012-01-11 10:44 ` [PATCH 7/7] qla4xxx: Update driver version to 5.02.00-k12 vikas.chaudhary
2012-01-12 2:02 ` [PATCH 0/7] " Mike Christie
7 siblings, 1 reply; 11+ messages in thread
From: vikas.chaudhary @ 2012-01-11 10:44 UTC (permalink / raw)
To: jbottomley, michaelc
Cc: linux-scsi, vikas.chaudhary, lalit.chandivade, ravi.anand,
Karen Higgins
From: Karen Higgins <karen.higgins@qlogic.com>
* Beautify modinfo display.
* Display correct info for ql4xextended_error_logging
Signed-off-by: Karen Higgins <karen.higgins@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
drivers/scsi/qla4xxx/ql4_os.c | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index cb9dcd8..4d99f9e 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -35,43 +35,44 @@ static struct kmem_cache *srb_cachep;
int ql4xdisablesysfsboot = 1;
module_param(ql4xdisablesysfsboot, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(ql4xdisablesysfsboot,
- "Set to disable exporting boot targets to sysfs\n"
- " 0 - Export boot targets\n"
- " 1 - Do not export boot targets (Default)");
+ " Set to disable exporting boot targets to sysfs.\n"
+ "\t\t 0 - Export boot targets\n"
+ "\t\t 1 - Do not export boot targets (Default)");
int ql4xdontresethba = 0;
module_param(ql4xdontresethba, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(ql4xdontresethba,
- "Don't reset the HBA for driver recovery \n"
- " 0 - It will reset HBA (Default)\n"
- " 1 - It will NOT reset HBA");
+ " Don't reset the HBA for driver recovery.\n"
+ "\t\t 0 - It will reset HBA (Default)\n"
+ "\t\t 1 - It will NOT reset HBA");
-int ql4xextended_error_logging = 0; /* 0 = off, 1 = log errors */
+int ql4xextended_error_logging = 0;
module_param(ql4xextended_error_logging, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(ql4xextended_error_logging,
- "Option to enable extended error logging, "
- "Default is 0 - no logging, 1 - debug logging");
+ " Option to enable extended error logging.\n"
+ "\t\t 0 - no logging (Default)\n"
+ "\t\t 2 - debug logging");
int ql4xenablemsix = 1;
module_param(ql4xenablemsix, int, S_IRUGO|S_IWUSR);
MODULE_PARM_DESC(ql4xenablemsix,
- "Set to enable MSI or MSI-X interrupt mechanism.\n"
- " 0 = enable INTx interrupt mechanism.\n"
- " 1 = enable MSI-X interrupt mechanism (Default).\n"
- " 2 = enable MSI interrupt mechanism.");
+ " Set to enable MSI or MSI-X interrupt mechanism.\n"
+ "\t\t 0 = enable INTx interrupt mechanism.\n"
+ "\t\t 1 = enable MSI-X interrupt mechanism (Default).\n"
+ "\t\t 2 = enable MSI interrupt mechanism.");
#define QL4_DEF_QDEPTH 32
static int ql4xmaxqdepth = QL4_DEF_QDEPTH;
module_param(ql4xmaxqdepth, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(ql4xmaxqdepth,
- "Maximum queue depth to report for target devices.\n"
- " Default: 32.");
+ " Maximum queue depth to report for target devices.\n"
+ "\t\t Default: 32.");
static int ql4xsess_recovery_tmo = QL4_SESS_RECOVERY_TMO;
module_param(ql4xsess_recovery_tmo, int, S_IRUGO);
MODULE_PARM_DESC(ql4xsess_recovery_tmo,
"Target Session Recovery Timeout.\n"
- " Default: 120 sec.");
+ "\t\t Default: 120 sec.");
static int qla4xxx_wait_for_hba_online(struct scsi_qla_host *ha);
/*
--
1.7.8.rc2.3.g0911
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 6/7] qla4xxx: Cleanup modinfo display
2012-01-11 10:44 ` [PATCH 6/7] qla4xxx: Cleanup modinfo display vikas.chaudhary
@ 2012-01-12 2:01 ` Mike Christie
2012-01-12 12:57 ` Vikas Chaudhary
0 siblings, 1 reply; 11+ messages in thread
From: Mike Christie @ 2012-01-12 2:01 UTC (permalink / raw)
To: vikas.chaudhary
Cc: jbottomley, linux-scsi, lalit.chandivade, ravi.anand,
Karen Higgins
On 01/11/2012 04:44 AM, vikas.chaudhary@qlogic.com wrote:
>
> -int ql4xextended_error_logging = 0; /* 0 = off, 1 = log errors */
> +int ql4xextended_error_logging = 0;
You do not need to init this to 0 like above. It gets set to zero for
you. I think this is some codingstyle doc rule violation. You should run
checkpatch.pl on your patches before sending to catch this type of stuff.
It is probably ok since it was there before and you are not adding it
and your patch is focused on other stuff, but you should clean it up one
day and make note of it for the future.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 6/7] qla4xxx: Cleanup modinfo display
2012-01-12 2:01 ` Mike Christie
@ 2012-01-12 12:57 ` Vikas Chaudhary
0 siblings, 0 replies; 11+ messages in thread
From: Vikas Chaudhary @ 2012-01-12 12:57 UTC (permalink / raw)
To: Mike Christie
Cc: jbottomley@parallels.com, scsi, Lalit Chandivade, Ravi Anand,
Karen Higgins
On 12/01/12 7:31 AM, "Mike Christie" <michaelc@cs.wisc.edu> wrote:
>On 01/11/2012 04:44 AM, vikas.chaudhary@qlogic.com wrote:
>>
>> -int ql4xextended_error_logging = 0; /* 0 = off, 1 = log errors */
>> +int ql4xextended_error_logging = 0;
>
>You do not need to init this to 0 like above. It gets set to zero for
>you. I think this is some codingstyle doc rule violation. You should run
>checkpatch.pl on your patches before sending to catch this type of stuff.
>
>It is probably ok since it was there before and you are not adding it
>and your patch is focused on other stuff, but you should clean it up one
>day and make note of it for the future.
Yes, I will send separate cleanup patch for this type of codingstyle doc
rule violation.
This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 7/7] qla4xxx: Update driver version to 5.02.00-k12
2012-01-11 10:44 [PATCH 0/7] qla4xxx: Update driver version to 5.02.00-k12 vikas.chaudhary
` (5 preceding siblings ...)
2012-01-11 10:44 ` [PATCH 6/7] qla4xxx: Cleanup modinfo display vikas.chaudhary
@ 2012-01-11 10:44 ` vikas.chaudhary
2012-01-12 2:02 ` [PATCH 0/7] " Mike Christie
7 siblings, 0 replies; 11+ messages in thread
From: vikas.chaudhary @ 2012-01-11 10:44 UTC (permalink / raw)
To: jbottomley, michaelc
Cc: linux-scsi, vikas.chaudhary, lalit.chandivade, ravi.anand
From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
drivers/scsi/qla4xxx/ql4_version.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/scsi/qla4xxx/ql4_version.h b/drivers/scsi/qla4xxx/ql4_version.h
index 7d04eb0..133989b 100644
--- a/drivers/scsi/qla4xxx/ql4_version.h
+++ b/drivers/scsi/qla4xxx/ql4_version.h
@@ -5,4 +5,4 @@
* See LICENSE.qla4xxx for copyright and licensing details.
*/
-#define QLA4XXX_DRIVER_VERSION "5.02.00-k11"
+#define QLA4XXX_DRIVER_VERSION "5.02.00-k12"
--
1.7.8.rc2.3.g0911
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 0/7] qla4xxx: Update driver version to 5.02.00-k12
2012-01-11 10:44 [PATCH 0/7] qla4xxx: Update driver version to 5.02.00-k12 vikas.chaudhary
` (6 preceding siblings ...)
2012-01-11 10:44 ` [PATCH 7/7] qla4xxx: Update driver version to 5.02.00-k12 vikas.chaudhary
@ 2012-01-12 2:02 ` Mike Christie
7 siblings, 0 replies; 11+ messages in thread
From: Mike Christie @ 2012-01-12 2:02 UTC (permalink / raw)
To: vikas.chaudhary; +Cc: jbottomley, linux-scsi, lalit.chandivade, ravi.anand
On 01/11/2012 04:44 AM, vikas.chaudhary@qlogic.com wrote:
> From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
>
> James,
>
> Please apply the following patches to scsi-misc for inclusion in mainline.
>
> Giridhar Malavali (1):
> qla4xxx: Disable generating pause frames in case of FW hung
>
> Karen Higgins (1):
> qla4xxx: Cleanup modinfo display
>
> Mike Hernandez (1):
> qla4xxx: Temperature monitoring for ISP82XX core.
>
> Nilesh Javali (1):
> qla4xxx: Added error logging for firmware abort
>
> Sarang Radke (1):
> qla4xxx: Clear the RISC interrupt bit during FW init
>
> Vikas Chaudhary (2):
> qla4xxx: Update license
> qla4xxx: Update driver version to 5.02.00-k12
>
Looks ok.
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
^ permalink raw reply [flat|nested] 11+ messages in thread