[SCSI] qla2xxx: Add ISP82XX support.

Enhanced the driver to support new FCoE host bus adapter.

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 74 insertions, 6 deletions

diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index e74552c8c5e1..de92504d7585 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -423,9 +423,6 @@ qla2x00_set_nvram_protection(struct qla_hw_data *ha, int stat)
 /* Flash Manipulation Routines                                               */
 /*****************************************************************************/
 
-#define OPTROM_BURST_SIZE       0x1000
-#define OPTROM_BURST_DWORDS     (OPTROM_BURST_SIZE / 4)
-
 static inline uint32_t
 flash_conf_addr(struct qla_hw_data *ha, uint32_t faddr)
 {
@@ -565,6 +562,10 @@ qla2xxx_find_flt_start(scsi_qla_host_t *vha, uint32_t *start)
                 *start = FA_FLASH_LAYOUT_ADDR;
         else if (IS_QLA81XX(ha))
                 *start = FA_FLASH_LAYOUT_ADDR_81;
+        else if (IS_QLA82XX(ha)) {
+                *start = FA_FLASH_LAYOUT_ADDR_82;
+                goto end;
+        }
         /* Begin with first PCI expansion ROM header. */
         buf = (uint8_t *)req->ring;
         dcode = (uint32_t *)req->ring;
@@ -709,10 +710,14 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)
                         break;
                 case FLT_REG_VPD_0:
                         ha->flt_region_vpd_nvram = start;
+                        if (IS_QLA82XX(ha))
+                                break;
                         if (ha->flags.port0)
                                 ha->flt_region_vpd = start;
                         break;
                 case FLT_REG_VPD_1:
+                        if (IS_QLA82XX(ha))
+                                break;
                         if (!ha->flags.port0)
                                 ha->flt_region_vpd = start;
                         break;
@@ -746,6 +751,21 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)
                         if (!ha->flags.port0)
                                 ha->flt_region_fcp_prio = start;
                         break;
+                case FLT_REG_BOOT_CODE_82XX:
+                        ha->flt_region_boot = start;
+                        break;
+                case FLT_REG_FW_82XX:
+                        ha->flt_region_fw = start;
+                        break;
+                case FLT_REG_GOLD_FW_82XX:
+                        ha->flt_region_gold_fw = start;
+                        break;
+                case FLT_REG_BOOTLOAD_82XX:
+                        ha->flt_region_bootload = start;
+                        break;
+                case FLT_REG_VPD_82XX:
+                        ha->flt_region_vpd = start;
+                        break;
                 }
         }
         goto done;
@@ -791,7 +811,7 @@ qla2xxx_get_fdt_info(scsi_qla_host_t *vha)
         uint16_t *wptr;
         struct qla_fdt_layout *fdt;
         uint8_t man_id, flash_id;
-        uint16_t mid, fid;
+        uint16_t mid = 0, fid = 0;
         struct qla_hw_data *ha = vha->hw;
         struct req_que *req = ha->req_q_map[0];
 
@@ -832,6 +852,10 @@ qla2xxx_get_fdt_info(scsi_qla_host_t *vha)
         goto done;
 no_flash_data:
         loc = locations[0];
+        if (IS_QLA82XX(ha)) {
+                ha->fdt_block_size = FLASH_BLK_SIZE_64K;
+                goto done;
+        }
         qla24xx_get_flash_manufacturer(ha, &man_id, &flash_id);
         mid = man_id;
         fid = flash_id;
@@ -869,6 +893,31 @@ done:
             ha->fdt_block_size));
 }
 
+static void
+qla2xxx_get_idc_param(scsi_qla_host_t *vha)
+{
+#define QLA82XX_IDC_PARAM_ADDR       0x003e885c
+        uint32_t *wptr;
+        struct qla_hw_data *ha = vha->hw;
+        struct req_que *req = ha->req_q_map[0];
+
+        if (!IS_QLA82XX(ha))
+                return;
+
+        wptr = (uint32_t *)req->ring;
+        ha->isp_ops->read_optrom(vha, (uint8_t *)req->ring,
+                QLA82XX_IDC_PARAM_ADDR , 8);
+
+        if (*wptr == __constant_cpu_to_le32(0xffffffff)) {
+                ha->nx_dev_init_timeout = QLA82XX_ROM_DEV_INIT_TIMEOUT;
+                ha->nx_reset_timeout = QLA82XX_ROM_DRV_RESET_ACK_TIMEOUT;
+        } else {
+                ha->nx_dev_init_timeout = le32_to_cpu(*wptr++);
+                ha->nx_reset_timeout = le32_to_cpu(*wptr);
+        }
+        return;
+}
+
 int
 qla2xxx_get_flash_info(scsi_qla_host_t *vha)
 {
@@ -876,7 +925,7 @@ qla2xxx_get_flash_info(scsi_qla_host_t *vha)
         uint32_t flt_addr;
         struct qla_hw_data *ha = vha->hw;
 
-        if (!IS_QLA24XX_TYPE(ha) && !IS_QLA25XX(ha) && !IS_QLA81XX(ha))
+        if (!IS_QLA24XX_TYPE(ha) && !IS_QLA25XX(ha) && !IS_QLA8XXX_TYPE(ha))
                 return QLA_SUCCESS;
 
         ret = qla2xxx_find_flt_start(vha, &flt_addr);
@@ -885,6 +934,7 @@ qla2xxx_get_flash_info(scsi_qla_host_t *vha)
 
         qla2xxx_get_flt_info(vha, flt_addr);
         qla2xxx_get_fdt_info(vha);
+        qla2xxx_get_idc_param(vha);
 
         return QLA_SUCCESS;
 }
@@ -901,7 +951,7 @@ qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha)
         struct qla_npiv_entry *entry;
         struct qla_hw_data *ha = vha->hw;
 
-        if (!IS_QLA24XX_TYPE(ha) && !IS_QLA25XX(ha) && !IS_QLA81XX(ha))
+        if (!IS_QLA24XX_TYPE(ha) && !IS_QLA25XX(ha) && !IS_QLA8XXX_TYPE(ha))
                 return;
 
         ha->isp_ops->read_optrom(vha, (uint8_t *)&hdr,
@@ -1194,6 +1244,9 @@ qla24xx_read_nvram_data(scsi_qla_host_t *vha, uint8_t *buf, uint32_t naddr,
         uint32_t *dwptr;
         struct qla_hw_data *ha = vha->hw;
 
+        if (IS_QLA82XX(ha))
+                return  buf;
+
         /* Dword reads to flash. */
         dwptr = (uint32_t *)buf;
         for (i = 0; i < bytes >> 2; i++, naddr++)
@@ -1249,6 +1302,9 @@ qla24xx_write_nvram_data(scsi_qla_host_t *vha, uint8_t *buf, uint32_t naddr,
 
         ret = QLA_SUCCESS;
 
+        if (IS_QLA82XX(ha))
+                return ret;
+
         /* Enable flash write. */
         WRT_REG_DWORD(&reg->ctrl_status,
             RD_REG_DWORD(&reg->ctrl_status) | CSRX_FLASH_ENABLE);
@@ -1360,6 +1416,9 @@ qla2x00_beacon_blink(struct scsi_qla_host *vha)
         struct qla_hw_data *ha = vha->hw;
         struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
 
+        if (IS_QLA82XX(ha))
+                return;
+
         spin_lock_irqsave(&ha->hardware_lock, flags);
 
         /* Save the Original GPIOE. */
@@ -1541,6 +1600,9 @@ qla24xx_beacon_on(struct scsi_qla_host *vha)
         struct qla_hw_data *ha = vha->hw;
         struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
 
+        if (IS_QLA82XX(ha))
+                return QLA_SUCCESS;
+
         if (ha->beacon_blink_led == 0) {
                 /* Enable firmware for update */
                 ha->fw_options[1] |= ADD_FO1_DISABLE_GPIO_LED_CTRL;
@@ -1583,6 +1645,9 @@ qla24xx_beacon_off(struct scsi_qla_host *vha)
         struct qla_hw_data *ha = vha->hw;
         struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
 
+        if (IS_QLA82XX(ha))
+                return QLA_SUCCESS;
+
         ha->beacon_blink_led = 0;
         ha->beacon_color_state = QLA_LED_ALL_ON;
 
@@ -2592,6 +2657,9 @@ qla24xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf)
         int i;
         struct qla_hw_data *ha = vha->hw;
 
+        if (IS_QLA82XX(ha))
+                return ret;
+
         if (!mbuf)
                 return QLA_FUNCTION_FAILED;