3 files changed, 20 insertions, 0 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index c2593782fbbe..e1e66a45e4d0 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 cfb2f2edac3a..dc45ac923691 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 9d3eab513935..e2ef7762dc24 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);