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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] dpt_i2o: fix transferred data length for scsi_set_resid()
  [SCSI] scsi_error regression: Fix idempotent command handling
  [SCSI] zfcp: Fix hexdump data in s390dbf traces
  [SCSI] zfcp: fix erp timeout cleanup for port open requests
  [SCSI] zfcp: Wait for port scan to complete when setting adapter online
  [SCSI] zfcp: Fix cast warning
  [SCSI] zfcp: Fix request list handling in error path
  [SCSI] zfcp: fix mempool usage for status_read requests
  [SCSI] zfcp: fix req_list_locking.
  [SCSI] zfcp: Dont clear reference from SCSI device to unit
  [SCSI] qla2xxx: Update version number to 8.02.01-k9.
  [SCSI] qla2xxx: Return a FAILED status when abort mailbox-command fails.
  [SCSI] qla2xxx: Do not honour max_vports from firmware for 2G ISPs and below.
  [SCSI] qla2xxx: Use pci_disable_rom() to manipulate PCI config space.
  [SCSI] qla2xxx: Correct Atmel flash-part handling.
  [SCSI] megaraid: fix mega_internal_command oops

1 files changed, 5 insertions, 21 deletions

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index a470f2d3270d..4218f20f5ed5 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -140,7 +140,6 @@ int
 qla2100_pci_config(scsi_qla_host_t *ha)
 {
         uint16_t w;
-        uint32_t d;
         unsigned long flags;
         struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
 
@@ -151,10 +150,7 @@ qla2100_pci_config(scsi_qla_host_t *ha)
         w |= (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
         pci_write_config_word(ha->pdev, PCI_COMMAND, w);
 
-        /* Reset expansion ROM address decode enable */
-        pci_read_config_dword(ha->pdev, PCI_ROM_ADDRESS, &d);
-        d &= ~PCI_ROM_ADDRESS_ENABLE;
-        pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
+        pci_disable_rom(ha->pdev);
 
         /* Get PCI bus information. */
         spin_lock_irqsave(&ha->hardware_lock, flags);
@@ -174,7 +170,6 @@ int
 qla2300_pci_config(scsi_qla_host_t *ha)
 {
         uint16_t        w;
-        uint32_t        d;
         unsigned long   flags = 0;
         uint32_t        cnt;
         struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
@@ -236,10 +231,7 @@ qla2300_pci_config(scsi_qla_host_t *ha)
 
         pci_write_config_byte(ha->pdev, PCI_LATENCY_TIMER, 0x80);
 
-        /* Reset expansion ROM address decode enable */
-        pci_read_config_dword(ha->pdev, PCI_ROM_ADDRESS, &d);
-        d &= ~PCI_ROM_ADDRESS_ENABLE;
-        pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
+        pci_disable_rom(ha->pdev);
 
         /* Get PCI bus information. */
         spin_lock_irqsave(&ha->hardware_lock, flags);
@@ -259,7 +251,6 @@ int
 qla24xx_pci_config(scsi_qla_host_t *ha)
 {
         uint16_t w;
-        uint32_t d;
         unsigned long flags = 0;
         struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
 
@@ -281,10 +272,7 @@ qla24xx_pci_config(scsi_qla_host_t *ha)
         if (pci_find_capability(ha->pdev, PCI_CAP_ID_EXP))
                 pcie_set_readrq(ha->pdev, 2048);
 
-        /* Reset expansion ROM address decode enable */
-        pci_read_config_dword(ha->pdev, PCI_ROM_ADDRESS, &d);
-        d &= ~PCI_ROM_ADDRESS_ENABLE;
-        pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
+        pci_disable_rom(ha->pdev);
 
         ha->chip_revision = ha->pdev->revision;
 
@@ -306,7 +294,6 @@ int
 qla25xx_pci_config(scsi_qla_host_t *ha)
 {
         uint16_t w;
-        uint32_t d;
 
         pci_set_master(ha->pdev);
         pci_try_set_mwi(ha->pdev);
@@ -320,10 +307,7 @@ qla25xx_pci_config(scsi_qla_host_t *ha)
         if (pci_find_capability(ha->pdev, PCI_CAP_ID_EXP))
                 pcie_set_readrq(ha->pdev, 2048);
 
-        /* Reset expansion ROM address decode enable */
-        pci_read_config_dword(ha->pdev, PCI_ROM_ADDRESS, &d);
-        d &= ~PCI_ROM_ADDRESS_ENABLE;
-        pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
+        pci_disable_rom(ha->pdev);
 
         ha->chip_revision = ha->pdev->revision;
 
@@ -980,7 +964,6 @@ qla2x00_setup_chip(scsi_qla_host_t *ha)
                                     &ha->fw_minor_version,
                                     &ha->fw_subminor_version,
                                     &ha->fw_attributes, &ha->fw_memory_size);
-                                qla2x00_resize_request_q(ha);
                                 ha->flags.npiv_supported = 0;
                                 if ((IS_QLA24XX(ha) || IS_QLA25XX(ha) ||
                                      IS_QLA84XX(ha)) &&
@@ -992,6 +975,7 @@ qla2x00_setup_chip(scsi_qla_host_t *ha)
                                                 ha->max_npiv_vports =
                                                     MIN_MULTI_ID_FABRIC - 1;
                                 }
+                                qla2x00_resize_request_q(ha);
 
                                 if (ql2xallocfwdump)
                                         qla2x00_alloc_fw_dump(ha);