Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (28 commits)
  [SCSI] mpt fusion: Changes in mptctl.c for logging support
  [SCSI] mpt fusion: Changes in mptfc.c mptlan.c mptsas.c and mptspi.c for logging support
  [SCSI] mpt fusion: Changes in mptscsih.c for logging support
  [SCSI] mpt fusion: Changes in mptbase.c for logging support
  [SCSI] mpt fusion: logging support in Kconfig, Makefile, mptbase.h and addition of mptdebug.h
  [SCSI] libsas: Fix potential NULL dereference in sas_smp_get_phy_events()
  [SCSI] bsg: Fix build for CONFIG_BLOCK=n
  [SCSI] aacraid: fix Sunrise Lake reset handling
  [SCSI] aacraid: add SCSI SYNCHONIZE_CACHE range checking
  [SCSI] add easyRAID to the no report luns blacklist
  [SCSI] advansys: lindent and other large, uninteresting changes
  [SCSI] aic79xx, aic7xxx: Fix incorrect width setting
  [SCSI] qla2xxx: fix to honor ignored parameters in sysfs attributes
  [SCSI] aacraid: draw line in sand, sundry cleanup and version update
  [SCSI] iscsi_tcp: Turn off bounce buffers
  [SCSI] libiscsi: fix cmd seqeunce number checking
  [SCSI] iscsi_tcp, ib_iser Enable module refcounting for iscsi host template
  [SCSI] libiscsi: make sure session is not blocked when removing host
  [SCSI] libsas: Remove PCI dependencies
  [SCSI] simscsi: convert to use the data buffer accessors
  ...

1 files changed, 11 insertions, 8 deletions

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 5ec798c2bf13..374abe19b547 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1461,8 +1461,8 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
         uint16_t        cnt;
         uint8_t         *dptr1, *dptr2;
         init_cb_t       *icb = ha->init_cb;
-        nvram_t         *nv = (nvram_t *)ha->request_ring;
-        uint8_t         *ptr = (uint8_t *)ha->request_ring;
+        nvram_t         *nv = ha->nvram;
+        uint8_t         *ptr = ha->nvram;
         struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
 
         rval = QLA_SUCCESS;
@@ -1480,8 +1480,7 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
                 chksum += *ptr++;
 
         DEBUG5(printk("scsi(%ld): Contents of NVRAM\n", ha->host_no));
-        DEBUG5(qla2x00_dump_buffer((uint8_t *)ha->request_ring,
-            ha->nvram_size));
+        DEBUG5(qla2x00_dump_buffer((uint8_t *)nv, ha->nvram_size));
 
         /* Bad NVRAM data, set defaults parameters. */
         if (chksum || nv->id[0] != 'I' || nv->id[1] != 'S' ||
@@ -3500,7 +3499,7 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
 
         rval = QLA_SUCCESS;
         icb = (struct init_cb_24xx *)ha->init_cb;
-        nv = (struct nvram_24xx *)ha->request_ring;
+        nv = ha->nvram;
 
         /* Determine NVRAM starting address. */
         ha->nvram_size = sizeof(struct nvram_24xx);
@@ -3512,7 +3511,12 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
                 ha->vpd_base = FA_NVRAM_VPD1_ADDR;
         }
 
-        /* Get NVRAM data and calculate checksum. */
+        /* Get VPD data into cache */
+        ha->vpd = ha->nvram + VPD_OFFSET;
+        ha->isp_ops->read_nvram(ha, (uint8_t *)ha->vpd,
+            ha->nvram_base - FA_NVRAM_FUNC0_ADDR, FA_NVRAM_VPD_SIZE * 4);
+
+        /* Get NVRAM data into cache and calculate checksum. */
         dptr = (uint32_t *)nv;
         ha->isp_ops->read_nvram(ha, (uint8_t *)dptr, ha->nvram_base,
             ha->nvram_size);
@@ -3520,8 +3524,7 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
                 chksum += le32_to_cpu(*dptr++);
 
         DEBUG5(printk("scsi(%ld): Contents of NVRAM\n", ha->host_no));
-        DEBUG5(qla2x00_dump_buffer((uint8_t *)ha->request_ring,
-            ha->nvram_size));
+        DEBUG5(qla2x00_dump_buffer((uint8_t *)nv, ha->nvram_size));
 
         /* Bad NVRAM data, set defaults parameters. */
         if (chksum || nv->id[0] != 'I' || nv->id[1] != 'S' || nv->id[2] != 'P'