Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / scsi / qla4xxx / ql4_83xx.c

diff --git a/drivers/scsi/qla4xxx/ql4_83xx.c b/drivers/scsi/qla4xxx/ql4_83xx.c
index 2eba35365920d5d58fb3c8a2df68a8a6b3e9636d..556c1525f881650261187b01e60165a36ce81c00 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_83xx.c
+++ b/drivers/scsi/qla4xxx/ql4_83xx.c
@@ -249,110 +249,6 @@ void qla4_83xx_rom_lock_recovery(struct scsi_qla_host *ha)
        qla4_83xx_flash_unlock(ha);
 }
 
-/**
- * qla4_83xx_ms_mem_write_128b - Writes data to MS/off-chip memory
- * @ha: Pointer to adapter structure
- * @addr: Flash address to write to
- * @data: Data to be written
- * @count: word_count to be written
- *
- * Return: On success return QLA_SUCCESS
- *        On error return QLA_ERROR
- **/
-int qla4_83xx_ms_mem_write_128b(struct scsi_qla_host *ha, uint64_t addr,
-                               uint32_t *data, uint32_t count)
-{
-       int i, j;
-       uint32_t agt_ctrl;
-       unsigned long flags;
-       int ret_val = QLA_SUCCESS;
-
-       /* Only 128-bit aligned access */
-       if (addr & 0xF) {
-               ret_val = QLA_ERROR;
-               goto exit_ms_mem_write;
-       }
-
-       write_lock_irqsave(&ha->hw_lock, flags);
-
-       /* Write address */
-       ret_val = qla4_83xx_wr_reg_indirect(ha, MD_MIU_TEST_AGT_ADDR_HI, 0);
-       if (ret_val == QLA_ERROR) {
-               ql4_printk(KERN_ERR, ha, "%s: write to AGT_ADDR_HI failed\n",
-                          __func__);
-               goto exit_ms_mem_write_unlock;
-       }
-
-       for (i = 0; i < count; i++, addr += 16) {
-               if (!((QLA8XXX_ADDR_IN_RANGE(addr, QLA8XXX_ADDR_QDR_NET,
-                                            QLA8XXX_ADDR_QDR_NET_MAX)) ||
-                     (QLA8XXX_ADDR_IN_RANGE(addr, QLA8XXX_ADDR_DDR_NET,
-                                            QLA8XXX_ADDR_DDR_NET_MAX)))) {
-                       ret_val = QLA_ERROR;
-                       goto exit_ms_mem_write_unlock;
-               }
-
-               ret_val = qla4_83xx_wr_reg_indirect(ha, MD_MIU_TEST_AGT_ADDR_LO,
-                                                   addr);
-               /* Write data */
-               ret_val |= qla4_83xx_wr_reg_indirect(ha,
-                                                    MD_MIU_TEST_AGT_WRDATA_LO,
-                                                    *data++);
-               ret_val |= qla4_83xx_wr_reg_indirect(ha,
-                                                    MD_MIU_TEST_AGT_WRDATA_HI,
-                                                    *data++);
-               ret_val |= qla4_83xx_wr_reg_indirect(ha,
-                                                    MD_MIU_TEST_AGT_WRDATA_ULO,
-                                                    *data++);
-               ret_val |= qla4_83xx_wr_reg_indirect(ha,
-                                                    MD_MIU_TEST_AGT_WRDATA_UHI,
-                                                    *data++);
-               if (ret_val == QLA_ERROR) {
-                       ql4_printk(KERN_ERR, ha, "%s: write to AGT_WRDATA failed\n",
-                                  __func__);
-                       goto exit_ms_mem_write_unlock;
-               }
-
-               /* Check write status */
-               ret_val = qla4_83xx_wr_reg_indirect(ha, MD_MIU_TEST_AGT_CTRL,
-                                                   MIU_TA_CTL_WRITE_ENABLE);
-               ret_val |= qla4_83xx_wr_reg_indirect(ha, MD_MIU_TEST_AGT_CTRL,
-                                                    MIU_TA_CTL_WRITE_START);
-               if (ret_val == QLA_ERROR) {
-                       ql4_printk(KERN_ERR, ha, "%s: write to AGT_CTRL failed\n",
-                                  __func__);
-                       goto exit_ms_mem_write_unlock;
-               }
-
-               for (j = 0; j < MAX_CTL_CHECK; j++) {
-                       ret_val = qla4_83xx_rd_reg_indirect(ha,
-                                                       MD_MIU_TEST_AGT_CTRL,
-                                                       &agt_ctrl);
-                       if (ret_val == QLA_ERROR) {
-                               ql4_printk(KERN_ERR, ha, "%s: failed to read MD_MIU_TEST_AGT_CTRL\n",
-                                          __func__);
-                               goto exit_ms_mem_write_unlock;
-                       }
-                       if ((agt_ctrl & MIU_TA_CTL_BUSY) == 0)
-                               break;
-               }
-
-               /* Status check failed */
-               if (j >= MAX_CTL_CHECK) {
-                       printk_ratelimited(KERN_ERR "%s: MS memory write failed!\n",
-                                          __func__);
-                       ret_val = QLA_ERROR;
-                       goto exit_ms_mem_write_unlock;
-               }
-       }
-
-exit_ms_mem_write_unlock:
-       write_unlock_irqrestore(&ha->hw_lock, flags);
-
-exit_ms_mem_write:
-       return ret_val;
-}
-
 #define INTENT_TO_RECOVER      0x01
 #define PROCEED_TO_RECOVER     0x02
 
@@ -760,7 +656,7 @@ static int qla4_83xx_copy_bootloader(struct scsi_qla_host *ha)
                          __func__));
 
        /* 128 bit/16 byte write to MS memory */
-       ret_val = qla4_83xx_ms_mem_write_128b(ha, dest, (uint32_t *)p_cache,
+       ret_val = qla4_8xxx_ms_mem_write_128b(ha, dest, (uint32_t *)p_cache,
                                              count);
        if (ret_val == QLA_ERROR) {
                ql4_printk(KERN_ERR, ha, "%s: Error writing firmware to MS\n",