Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / scsi / qla4xxx / ql4_nx.c

diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index 474b10d713647ea8aafde7a9057a49450bcf99e9..3d5ef2df4134b84763a7f671fc630438844e2810 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -1,6 +1,6 @@
 /*
  * QLogic iSCSI HBA Driver
- * Copyright (c)  2003-2009 QLogic Corporation
+ * Copyright (c)  2003-2010 QLogic Corporation
  *
  * See LICENSE.qla4xxx for copyright and licensing details.
  */
@@ -942,12 +942,55 @@ qla4_8xxx_pinit_from_rom(struct scsi_qla_host *ha, int verbose)
 
        /* Halt all the indiviual PEGs and other blocks of the ISP */
        qla4_8xxx_rom_lock(ha);
+
+       /* mask all niu interrupts */
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_NIU + 0x40, 0xff);
+       /* disable xge rx/tx */
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_NIU + 0x70000, 0x00);
+       /* disable xg1 rx/tx */
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_NIU + 0x80000, 0x00);
+
+       /* halt sre */
+       val = qla4_8xxx_rd_32(ha, QLA82XX_CRB_SRE + 0x1000);
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_SRE + 0x1000, val & (~(0x1)));
+
+       /* halt epg */
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_EPG + 0x1300, 0x1);
+
+       /* halt timers */
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_TIMER + 0x0, 0x0);
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_TIMER + 0x8, 0x0);
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_TIMER + 0x10, 0x0);
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_TIMER + 0x18, 0x0);
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_TIMER + 0x100, 0x0);
+
+       /* halt pegs */
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_PEG_NET_0 + 0x3c, 1);
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_PEG_NET_1 + 0x3c, 1);
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_PEG_NET_2 + 0x3c, 1);
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_PEG_NET_3 + 0x3c, 1);
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_PEG_NET_4 + 0x3c, 1);
+
+       /* big hammer */
+       msleep(1000);
        if (test_bit(DPC_RESET_HA, &ha->dpc_flags))
                /* don't reset CAM block on reset */
                qla4_8xxx_wr_32(ha, QLA82XX_ROMUSB_GLB_SW_RESET, 0xfeffffff);
        else
                qla4_8xxx_wr_32(ha, QLA82XX_ROMUSB_GLB_SW_RESET, 0xffffffff);
 
+       /* reset ms */
+       val = qla4_8xxx_rd_32(ha, QLA82XX_CRB_QDR_NET + 0xe4);
+       val |= (1 << 1);
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_QDR_NET + 0xe4, val);
+
+       msleep(20);
+       /* unreset ms */
+       val = qla4_8xxx_rd_32(ha, QLA82XX_CRB_QDR_NET + 0xe4);
+       val &= ~(1 << 1);
+       qla4_8xxx_wr_32(ha, QLA82XX_CRB_QDR_NET + 0xe4, val);
+       msleep(20);
+
        qla4_8xxx_rom_unlock(ha);
 
        /* Read the signature value from the flash.
@@ -1084,14 +1127,14 @@ qla4_8xxx_pinit_from_rom(struct scsi_qla_host *ha, int verbose)
 static int
 qla4_8xxx_load_from_flash(struct scsi_qla_host *ha, uint32_t image_start)
 {
-       int  i;
+       int  i, rval = 0;
        long size = 0;
        long flashaddr, memaddr;
        u64 data;
        u32 high, low;
 
        flashaddr = memaddr = ha->hw.flt_region_bootload;
-       size = (image_start - flashaddr)/8;
+       size = (image_start - flashaddr) / 8;
 
        DEBUG2(printk("scsi%ld: %s: bootldr=0x%lx, fw_image=0x%x\n",
            ha->host_no, __func__, flashaddr, image_start));
@@ -1100,14 +1143,18 @@ qla4_8xxx_load_from_flash(struct scsi_qla_host *ha, uint32_t image_start)
                if ((qla4_8xxx_rom_fast_read(ha, flashaddr, (int *)&low)) ||
                    (qla4_8xxx_rom_fast_read(ha, flashaddr + 4,
                    (int *)&high))) {
-                       return -1;
+                       rval = -1;
+                       goto exit_load_from_flash;
                }
                data = ((u64)high << 32) | low ;
-               qla4_8xxx_pci_mem_write_2M(ha, memaddr, &data, 8);
+               rval = qla4_8xxx_pci_mem_write_2M(ha, memaddr, &data, 8);
+               if (rval)
+                       goto exit_load_from_flash;
+
                flashaddr += 8;
                memaddr   += 8;
 
-               if (i%0x1000 == 0)
+               if (i % 0x1000 == 0)
                        msleep(1);
 
        }
@@ -1119,7 +1166,8 @@ qla4_8xxx_load_from_flash(struct scsi_qla_host *ha, uint32_t image_start)
        qla4_8xxx_wr_32(ha, QLA82XX_ROMUSB_GLB_SW_RESET, 0x80001e);
        read_unlock(&ha->hw_lock);
 
-       return 0;
+exit_load_from_flash:
+       return rval;
 }
 
 static int qla4_8xxx_load_fw(struct scsi_qla_host *ha, uint32_t image_start)