Attachment 314716 Details for Bug 459722 – upstream patches part 3

[patch] upstream patches part 3

qla2xxx_rhel5.3_upstream_fixes3_patch07.txt (text/plain), 41.67 KB, created by Marcus Barrow on 2008-08-21 15:41:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Barrow

Created: 2008-08-21 15:41:14 UTC

Size: 41.67 KB

patch

obsolete

>
>BZ 455264 [QLogic 5.3 feat] [3/n] qla2xxx - Upstream updates: 8.02.00-k5 to 8.02.00-k6
>
>This set of patches ports the missing upstream fixes from 8.02.00-k5 to
>8.02.00-k6 driver versions. It also includes a code cleanup patch from
>8.02.00-k7 and an update to the 32 bit platform fix.
>
>Tested at QLogic and applies and builds cleanly with 2.6.18-101.el5
>
>
>    [SCSI] qla2xxx: Correct resource_size_t usages.
>    commit 948882f6b72a95dd76c6c567a45dfe91b7d04c15
>
>    Hmm, it looks like the conversion to resource_size_t usage
>    (3776541d8a46347a4924353a192c6ce4a3d04e2e) requires some additional
>    fixups to cleanup the structure-pointer castings used during IO mapped
>    accesses to the chip.
>
>    There's only a small number of locations, where the driver uses IO
>    mapped accesses to the hardware, the patch below should take care of
>    it without introducing to many structural changes to code flow.
>
>
>
>    [SCSI] qla2xxx: Code cleanups.
>    commit a824ebb37c1a1c5fd8e19b47bf5c14cb7b419b48
>
>    - make the following needlessly global code static:
>      - qla_attr.c: qla24xx_vport_delete()
>      - qla_attr.c: qla24xx_vport_disable()
>      - qla_mid.c: qla24xx_allocate_vp_id()
>      - qla_mid.c: qla24xx_find_vhost_by_name()
>      - qla_mid.c: qla2x00_do_dpc_vp()
>      - qla_os.c: struct qla2x00_driver_template
>      - qla_os.c: qla2x00_stop_timer()
>      - qla_os.c: qla2x00_mem_alloc()
>      - qla_os.c: qla2x00_mem_free()
>      - qla_sup.c: qla2x00_lock_nvram_access()
>      - qla_sup.c: qla2x00_unlock_nvram_access()
>      - qla_sup.c: qla2x00_get_nvram_word()
>      - qla_sup.c: qla2x00_write_nvram_word()
>    - qla_os.c: remove some unneeded function prototypes
>    - removed unused functions:
>      - qla_dbg.c: qla2x00_dump_pkt()
>      - qla_mbx.c: qla2x00_get_serdes_params()
>      - qla_mbx.c: qla2x00_get_idma_speed()
>      - qla_mbx.c: qla24xx_get_vp_database()
>      - qla_mbx.c: qla24xx_get_vp_entry()
>
>
>
>    [SCSI] qla2xxx: Use completion routines.
>    commit 0b05a1f0d68bf4714c37aa7843c31df1866b017a
>
>    Instead of abusing the semaphore interfaces for mailbox command
>    completions.
>
>
>
>    [SCSI] qla2xxx: Fix for 32-bit platforms with 64-bit resources.
>    commit 3776541d8a46347a4924353a192c6ce4a3d04e2e
>
>    The driver stores the contents of PCI resources into unsigned
>    long's before ioremapping. This breaks on 32-bit platforms which
>    support 64-bit MMIO resources.
>
>    Correct code by removing the temporary variables used during MMIO
>    PIO mapping and using resource_size_t where applicable.  Also
>    correct a small typo in a printk() where the wrong region number
>    was displayed.
>
>
>
>    [SCSI] qla2xxx: Consolidate duplicate sense-data handling codes.
>    commit 4733fcb1fe4d64402a8bd18cec766e8b8ad25eee
>
>
>
>    [SCSI] qla2xxx: Correct NPIV support for recent ISPs.
>    commit eb66dc60be5a72bc940458a5adfd400e4d810d49
>
>    Firmware will export to software the maximum number of vports
>    supported for any given firmware version and ISP type.  Use this
>    information rather than the current hardcoding of limitations
>    within the driver.
>
>
>
>    [SCSI] qla2xxx: Don't explicitly read mbx registers while processing a system-error.
>    commit 06e23b7470ca7974b0ca8150c5415b55b5ea2a99
>
>    Callers of qla2x00_async_event() already populate the mb[] array
>    upon invocation, doing so via the appropriate mailbox register
>    accessors.  The stale codes removed are leftover-bits kept during
>    the FWI2 transition.  Though relatively benign, the extra-reads
>    are not valid for FWI2 boards (ISP24xx and above) and peek into
>    the incorrect regions of registers.
>
>---
> drivers/scsi/qla2xxx/qla_attr.c |    6 +-
> drivers/scsi/qla2xxx/qla_dbg.c  |   15 ---
> drivers/scsi/qla2xxx/qla_def.h  |   13 +--
> drivers/scsi/qla2xxx/qla_fw.h   |   16 ++-
> drivers/scsi/qla2xxx/qla_gbl.h  |   25 +----
> drivers/scsi/qla2xxx/qla_init.c |   26 +++---
> drivers/scsi/qla2xxx/qla_isr.c  |   97 ++++++-----------
> drivers/scsi/qla2xxx/qla_mbx.c  |  228 ++-------------------------------------
> drivers/scsi/qla2xxx/qla_mid.c  |   42 +++-----
> drivers/scsi/qla2xxx/qla_os.c   |   62 +++--------
> drivers/scsi/qla2xxx/qla_sup.c  |   44 ++++-----
> 11 files changed, 128 insertions(+), 446 deletions(-)
>
>diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
>index 31888b3..60c0cc6 100644
>--- a/drivers/scsi/qla2xxx/qla_attr.c
>+++ b/drivers/scsi/qla2xxx/qla_attr.c
>@@ -8,7 +8,7 @@
> 
> #include <linux/vmalloc.h>
> 
>-ssize_t qla24xx_vport_disable(struct class_device *, const char *, size_t);
>+static ssize_t qla24xx_vport_disable(struct class_device *, const char *, size_t);
> 
> /* SYSFS attributes --------------------------------------------------------- */
> 
>@@ -1181,7 +1181,7 @@ qla24xx_vport_delete(struct class_device
> 
> 	down(&ha->vport_sem);
> 	ha->cur_vport_count--;
>-	clear_bit(vha->vp_idx, (unsigned long *)ha->vp_idx_map);
>+	clear_bit(vha->vp_idx, ha->vp_idx_map);
> 	up(&ha->vport_sem);
> 
> 	kfree(vha->node_name);
>@@ -1271,7 +1271,7 @@ qla24xx_vport_id_store(struct class_devi
> 	return count;
> }
> 
>-ssize_t
>+static ssize_t
> qla24xx_vport_disable(struct class_device *cdev, const char *buf,
>     size_t count)
> {
>diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
>index 35f4448..ee5be07 100644
>--- a/drivers/scsi/qla2xxx/qla_dbg.c
>+++ b/drivers/scsi/qla2xxx/qla_dbg.c
>@@ -1429,21 +1429,6 @@ qla2x00_print_scsi_cmd(struct scsi_cmnd
> }
> 
> void
>-qla2x00_dump_pkt(void *pkt)
>-{
>-	uint32_t i;
>-	uint8_t *data = (uint8_t *) pkt;
>-
>-	for (i = 0; i < 64; i++) {
>-		if (!(i % 4))
>-			printk("\n%02x: ", i);
>-
>-		printk("%02x ", data[i]);
>-	}
>-	printk("\n");
>-}
>-
>-void
> qla2x00_print_byte_buf(void *buffer, size_t count, size_t per_line)
> {
> 	uint8_t *p = buffer;
>diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
>index e446f0f..10bb375 100644
>--- a/drivers/scsi/qla2xxx/qla_def.h
>+++ b/drivers/scsi/qla2xxx/qla_def.h
>@@ -2133,12 +2133,6 @@ typedef struct vport_params {
> 
> #define to_qla_parent(x) (((x)->parent) ? (x)->parent : (x))
> 
>-#define MAX_MULTI_ID_LOOP                     126
>-#define MAX_MULTI_ID_FABRIC                    64
>-#define MAX_NUM_VPORT_LOOP                      (MAX_MULTI_ID_LOOP - 1)
>-#define MAX_NUM_VPORT_FABRIC                    (MAX_MULTI_ID_FABRIC - 1)
>-#define MAX_NUM_VHBA_LOOP                       (MAX_MULTI_ID_LOOP - 1)
>-#define MAX_NUM_VHBA_FABRIC                     (MAX_MULTI_ID_FABRIC - 1)
> 
> /*
>  * ISP operations
>@@ -2389,8 +2383,7 @@ typedef struct scsi_qla_host {
> 	spinlock_t		hardware_lock ____cacheline_aligned;
> 
> 	device_reg_t __iomem *iobase;		/* Base I/O address */
>-	unsigned long	pio_address;
>-	unsigned long	pio_length;
>+	resource_size_t pio_address;
> #define MIN_IOBASE_LEN		0x100
> 
> 	/* ISP ring lock, rings, and indexes */
>@@ -2626,7 +2619,7 @@ typedef struct scsi_qla_host {
> 	struct qla_msix_entry msix_entries[QLA_MSIX_ENTRIES];
> 
> 	struct list_head	vp_list;	/* list of VP */
>-	uint8_t		vp_idx_map[16];
>+	unsigned long	vp_idx_map[(MAX_MULTI_ID_FABRIC / 8) / sizeof(unsigned long)];
> 	uint16_t	num_vhosts;	/* number of vports created */
> 	uint16_t	num_vsans;	/* number of vsan created */
> 	uint16_t	vp_idx;		/* vport ID */
>@@ -2651,7 +2644,7 @@ typedef struct scsi_qla_host {
> #define VP_ERR_FAB_NORESOURCES	3
> #define VP_ERR_FAB_LOGOUT	4
> #define VP_ERR_ADAP_NORESOURCES	5
>-	int		max_npiv_vports;	/* 63 or 125 per topoloty */
>+	uint16_t	max_npiv_vports;	/* 63 or 125 per topoloty */
> 	int		npiv_vports_inuse;
> 	int		cur_vport_count;
> 	atomic_t	vport_state;
>diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h
>index 5705bd6..31dd1e0 100644
>--- a/drivers/scsi/qla2xxx/qla_fw.h
>+++ b/drivers/scsi/qla2xxx/qla_fw.h
>@@ -954,7 +954,15 @@ struct device_reg_24xx {
> 
> /* MID Support ***************************************************************/
> 
>-#define MAX_MID_VPS	125
>+#define MIN_MULTI_ID_FABRIC	64	/* Must be power-of-2. */
>+#define MAX_MULTI_ID_FABRIC	256	/* ... */
>+
>+#define for_each_mapped_vp_idx(_ha, _idx)		\
>+	for (_idx = find_next_bit((_ha)->vp_idx_map,	\
>+		(_ha)->max_npiv_vports + 1, 1);		\
>+	    _idx <= (_ha)->max_npiv_vports;		\
>+	    _idx = find_next_bit((_ha)->vp_idx_map,	\
>+		(_ha)->max_npiv_vports + 1, _idx + 1))	\
> 
> struct mid_conf_entry_24xx {
> 	uint16_t reserved_1;
>@@ -982,7 +990,7 @@ struct mid_init_cb_24xx {
> 	uint16_t count;
> 	uint16_t options;
> 
>-	struct mid_conf_entry_24xx entries[MAX_MID_VPS];
>+	struct mid_conf_entry_24xx entries[MAX_MULTI_ID_FABRIC];
> };
> 
> 
>@@ -1002,10 +1010,6 @@ struct mid_db_entry_24xx {
> 	uint8_t reserved_1;
> };
> 
>-struct mid_db_24xx {
>-	struct mid_db_entry_24xx entries[MAX_MID_VPS];
>-};
>-
>  /*
>  * Virtual Fabric ID type definition.
>  */
>diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
>index 1da372d..63b99c5 100644
>--- a/drivers/scsi/qla2xxx/qla_gbl.h
>+++ b/drivers/scsi/qla2xxx/qla_gbl.h
>@@ -75,23 +75,16 @@ extern int qla2x00_loop_reset(scsi_qla_h
>  */
> extern struct scsi_transport_template *qla2xxx_transport_template;
> extern struct scsi_host_template qla24xx_driver_vport_template;
>-extern uint8_t qla2x00_mem_alloc(scsi_qla_host_t *);
> extern void qla2x00_timer(scsi_qla_host_t *);
> extern void qla2x00_start_timer(scsi_qla_host_t *, void *, unsigned long);
>-extern void qla2x00_stop_timer(scsi_qla_host_t *);
>-extern uint32_t qla24xx_allocate_vp_id(scsi_qla_host_t *);
> extern void qla24xx_deallocate_vp_id(scsi_qla_host_t *);
> extern int qla24xx_disable_vp (scsi_qla_host_t *);
> extern int qla24xx_enable_vp (scsi_qla_host_t *);
>-extern void qla2x00_mem_free(scsi_qla_host_t *);
> extern int qla24xx_control_vp(scsi_qla_host_t *, int );
> extern int qla24xx_modify_vp_config(scsi_qla_host_t *);
> extern int qla2x00_send_change_request(scsi_qla_host_t *, uint16_t, uint16_t);
> extern void qla2x00_vp_stop_timer(scsi_qla_host_t *);
> extern int qla24xx_configure_vhba (scsi_qla_host_t *);
>-extern int qla24xx_get_vp_entry(scsi_qla_host_t *, uint16_t, int);
>-extern int qla24xx_get_vp_database(scsi_qla_host_t *, uint16_t);
>-extern int qla2x00_do_dpc_vp(scsi_qla_host_t *);
> extern void qla24xx_report_id_acquisition(scsi_qla_host_t *,
> 	struct vp_rpt_id_entry_24xx *);
> extern scsi_qla_host_t * qla24xx_find_vhost_by_name(scsi_qla_host_t *,
>@@ -108,8 +101,6 @@ extern char *qla2x00_get_fw_version_str(
> extern void qla2x00_mark_device_lost(scsi_qla_host_t *, fc_port_t *, int, int);
> extern void qla2x00_mark_all_devices_lost(scsi_qla_host_t *, int);
> 
>-extern int qla2x00_down_timeout(struct semaphore *, unsigned long);
>-
> extern struct fw_blob *qla2x00_request_firmware(scsi_qla_host_t *);
> 
> extern int qla2x00_wait_for_hba_online(scsi_qla_host_t *);
>@@ -227,8 +218,8 @@ extern int
> qla2x00_get_id_list(scsi_qla_host_t *, void *, dma_addr_t, uint16_t *);
> 
> extern int
>-qla2x00_get_resource_cnts(scsi_qla_host_t *, uint16_t *, uint16_t *, uint16_t *,
>-    uint16_t *);
>+qla2x00_get_resource_cnts(scsi_qla_host_t *, uint16_t *, uint16_t *,
>+     uint16_t *, uint16_t *, uint16_t *);
> 
> extern int
> qla2x00_get_fcal_position_map(scsi_qla_host_t *ha, char *pos_map);
>@@ -247,10 +238,6 @@ extern int qla24xx_abort_target(fc_port_
> extern int qla2x00_system_error(scsi_qla_host_t *);
> 
> extern int
>-qla2x00_get_serdes_params(scsi_qla_host_t *, uint16_t *, uint16_t *,
>-    uint16_t *);
>-
>-extern int
> qla2x00_set_serdes_params(scsi_qla_host_t *, uint16_t, uint16_t, uint16_t);
> 
> extern int
>@@ -263,9 +250,6 @@ extern int
> qla2x00_read_sfp(scsi_qla_host_t *, dma_addr_t, uint16_t, uint16_t, uint16_t);
> 
> extern int
>-qla2x00_get_idma_speed(scsi_qla_host_t *, uint16_t, uint16_t *, uint16_t *);
>-
>-extern int
> qla2x00_set_idma_speed(scsi_qla_host_t *, uint16_t, uint16_t, uint16_t *);
> 
> extern int qla84xx_verify_chip(struct scsi_qla_host *, uint16_t *);
>@@ -288,11 +272,7 @@ extern void qla2x00_free_irqs(scsi_qla_h
> /*
>  * Global Function Prototypes in qla_sup.c source file.
>  */
>-extern void qla2x00_lock_nvram_access(scsi_qla_host_t *);
>-extern void qla2x00_unlock_nvram_access(scsi_qla_host_t *);
> extern void qla2x00_release_nvram_protection(scsi_qla_host_t *);
>-extern uint16_t qla2x00_get_nvram_word(scsi_qla_host_t *, uint32_t);
>-extern void qla2x00_write_nvram_word(scsi_qla_host_t *, uint32_t, uint16_t);
> extern uint32_t *qla24xx_read_flash_data(scsi_qla_host_t *, uint32_t *,
>     uint32_t, uint32_t);
> extern uint8_t *qla2x00_read_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,
>@@ -339,7 +319,6 @@ extern void qla25xx_fw_dump(scsi_qla_hos
> extern void qla2x00_dump_regs(scsi_qla_host_t *);
> extern void qla2x00_dump_buffer(uint8_t *, uint32_t);
> extern void qla2x00_print_scsi_cmd(struct scsi_cmnd *);
>-extern void qla2x00_dump_pkt(void *);
> extern void qla2x00_print_byte_buf(void *, size_t, size_t);
> extern void qla2x00_print_word_buf(void *, size_t, size_t);
> 
>diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
>index fb3a183..9c2c280 100644
>--- a/drivers/scsi/qla2xxx/qla_init.c
>+++ b/drivers/scsi/qla2xxx/qla_init.c
>@@ -866,7 +866,8 @@ qla2x00_resize_request_q(scsi_qla_host_t
> 		return;
> 
> 	/* Retrieve IOCB counts available to the firmware. */
>-	rval = qla2x00_get_resource_cnts(ha, NULL, NULL, NULL, &fw_iocb_cnt);
>+	rval = qla2x00_get_resource_cnts(ha, NULL, NULL, NULL, &fw_iocb_cnt,
>+	    &ha->max_npiv_vports);
> 	if (rval)
> 		return;
> 	/* No point in continuing if current settings are sufficient. */
>@@ -933,9 +934,14 @@ qla2x00_setup_chip(scsi_qla_host_t *ha)
> 				    &ha->fw_attributes, &ha->fw_memory_size);
> 				qla2x00_resize_request_q(ha);
> 				ha->flags.npiv_supported = 0;
>-				if ((IS_QLA24XX(ha) || IS_QLA25XX(ha)) && 
>+				if ((IS_QLA24XX_TYPE(ha) || IS_QLA25XX(ha)) &&
> 				    (ha->fw_attributes & BIT_2))
> 					ha->flags.npiv_supported = 1;
>+					if ((!ha->max_npiv_vports) ||
>+					    ((ha->max_npiv_vports + 1) %
>+					    MIN_MULTI_ID_FABRIC))
>+						ha->max_npiv_vports =
>+						    MIN_MULTI_ID_FABRIC - 1;
> 
> 				if (ql2xallocfwdump)
> 					qla2x00_alloc_fw_dump(ha);
>@@ -1172,8 +1178,8 @@ qla2x00_init_rings(scsi_qla_host_t *ha)
> 
> 	DEBUG(printk("scsi(%ld): Issue init firmware.\n", ha->host_no));
> 
>-	mid_init_cb->count = MAX_NUM_VPORT_FABRIC;
>-	ha->max_npiv_vports = MAX_NUM_VPORT_FABRIC;
>+	mid_init_cb->count = cpu_to_le16(ha->max_npiv_vports);
>+	mid_init_cb->options = __constant_cpu_to_le16(BIT_1);
> 
> 	rval = qla2x00_init_firmware(ha, ha->init_cb_size);
> 	if (rval) {
>@@ -2524,14 +2530,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_ho
> 
> 		/* Bypass virtual ports of the same host. */
> 		if (pha->num_vhosts) {
>-			vp_index = find_next_bit(
>-			    (unsigned long *)pha->vp_idx_map,
>-			    MAX_MULTI_ID_FABRIC + 1, 1);
>-
>-			for (;vp_index <= MAX_MULTI_ID_FABRIC;
>-			    vp_index = find_next_bit(
>-			    (unsigned long *)pha->vp_idx_map,
>-			    MAX_MULTI_ID_FABRIC + 1, vp_index + 1)) {
>+			for_each_mapped_vp_idx(pha, vp_index) {
> 				empty_vp_index = 1;
> 				found_vp = 0;
> 				list_for_each_entry(vha, &pha->vp_list,
>@@ -2550,7 +2549,8 @@ qla2x00_find_all_fabric_devs(scsi_qla_ho
> 				    new_fcport->d_id.b24 == vha->d_id.b24)
> 					break;
> 			}
>-			if (vp_index <= MAX_MULTI_ID_FABRIC)
>+
>+			if (vp_index <= pha->max_npiv_vports)
> 				continue;
> 		}
> 
>diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
>index 08ad762..09b7c0c 100644
>--- a/drivers/scsi/qla2xxx/qla_isr.c
>+++ b/drivers/scsi/qla2xxx/qla_isr.c
>@@ -88,7 +88,7 @@ qla2100_intr_handler(int irq, void *dev_
> 	if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) &&
> 	    (status & MBX_INTERRUPT) && ha->flags.mbox_int) {
> 		set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
>-		up(&ha->mbx_intr_sem);
>+		complete(&ha->mbx_intr_comp);
> 	}
> 
> 	return (IRQ_HANDLED);
>@@ -198,7 +198,7 @@ qla2300_intr_handler(int irq, void *dev_
> 	if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) &&
> 	    (status & MBX_INTERRUPT) && ha->flags.mbox_int) {
> 		set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
>-		up(&ha->mbx_intr_sem);
>+		complete(&ha->mbx_intr_comp);
> 	}
> 
> 	return (IRQ_HANDLED);
>@@ -332,10 +332,6 @@ qla2x00_async_event(scsi_qla_host_t *ha,
> 		break;
> 
> 	case MBA_SYSTEM_ERR:		/* System Error */
>-		mb[1] = RD_MAILBOX_REG(ha, reg, 1);
>-		mb[2] = RD_MAILBOX_REG(ha, reg, 2);
>-		mb[3] = RD_MAILBOX_REG(ha, reg, 3);
>-
> 		qla_printk(KERN_INFO, ha,
> 		    "ISP System Error - mbx1=%xh mbx2=%xh mbx3=%xh.\n",
> 		    mb[1], mb[2], mb[3]);
>@@ -858,6 +854,35 @@ qla2x00_process_response_queue(struct sc
> 	WRT_REG_WORD(ISP_RSP_Q_OUT(ha, reg), ha->rsp_ring_index);
> }
> 
>+static inline void
>+qla2x00_handle_sense(srb_t *sp, uint8_t *sense_data, uint32_t sense_len)
>+{
>+	struct scsi_cmnd *cp = sp->cmd;
>+
>+	if (sense_len >= SCSI_SENSE_BUFFERSIZE)
>+		sense_len = SCSI_SENSE_BUFFERSIZE;
>+
>+	CMD_ACTUAL_SNSLEN(cp) = sense_len;
>+	sp->request_sense_length = sense_len;
>+	sp->request_sense_ptr = cp->sense_buffer;
>+	if (sp->request_sense_length > 32)
>+		sense_len = 32;
>+
>+	memcpy(cp->sense_buffer, sense_data, sense_len);
>+
>+	sp->request_sense_ptr += sense_len;
>+	sp->request_sense_length -= sense_len;
>+	if (sp->request_sense_length != 0)
>+		sp->ha->status_srb = sp;
>+
>+	DEBUG5(printk("%s(): Check condition Sense data, scsi(%ld:%d:%d:%d) "
>+	    "cmd=%p pid=%ld\n", __func__, sp->ha->host_no, cp->device->channel,
>+	    cp->device->id, cp->device->lun, cp, cp->serial_number));
>+	if (sense_len)
>+		DEBUG5(qla2x00_dump_buffer(cp->sense_buffer,
>+		    CMD_ACTUAL_SNSLEN(cp)));
>+}
>+
> /**
>  * qla2x00_status_entry() - Process a Status IOCB entry.
>  * @ha: SCSI driver HA context
>@@ -1012,36 +1037,11 @@ qla2x00_status_entry(scsi_qla_host_t *ha
> 		if (lscsi_status != SS_CHECK_CONDITION)
> 			break;
> 
>-		/* Copy Sense Data into sense buffer. */
> 		memset(cp->sense_buffer, 0, sizeof(cp->sense_buffer));
>-
> 		if (!(scsi_status & SS_SENSE_LEN_VALID))
> 			break;
> 
>-		if (sense_len >= sizeof(cp->sense_buffer))
>-			sense_len = sizeof(cp->sense_buffer);
>-
>-		CMD_ACTUAL_SNSLEN(cp) = sense_len;
>-		sp->request_sense_length = sense_len;
>-		sp->request_sense_ptr = cp->sense_buffer;
>-
>-		if (sp->request_sense_length > 32)
>-			sense_len = 32;
>-
>-		memcpy(cp->sense_buffer, sense_data, sense_len);
>-
>-		sp->request_sense_ptr += sense_len;
>-		sp->request_sense_length -= sense_len;
>-		if (sp->request_sense_length != 0)
>-			ha->status_srb = sp;
>-
>-		DEBUG5(printk("%s(): Check condition Sense data, "
>-		    "scsi(%ld:%d:%d:%d) cmd=%p pid=%ld\n", __func__,
>-		    ha->host_no, cp->device->channel, cp->device->id,
>-		    cp->device->lun, cp, cp->serial_number));
>-		if (sense_len)
>-			DEBUG5(qla2x00_dump_buffer(cp->sense_buffer,
>-			    CMD_ACTUAL_SNSLEN(cp)));
>+		qla2x00_handle_sense(sp, sense_data, sense_len);
> 		break;
> 
> 	case CS_DATA_UNDERRUN:
>@@ -1096,34 +1096,11 @@ qla2x00_status_entry(scsi_qla_host_t *ha
> 			if (lscsi_status != SS_CHECK_CONDITION)
> 				break;
> 
>-			/* Copy Sense Data into sense buffer */
> 			memset(cp->sense_buffer, 0, sizeof(cp->sense_buffer));
>-
> 			if (!(scsi_status & SS_SENSE_LEN_VALID))
> 				break;
> 
>-			if (sense_len >= sizeof(cp->sense_buffer))
>-				sense_len = sizeof(cp->sense_buffer);
>-
>-			CMD_ACTUAL_SNSLEN(cp) = sense_len;
>-			sp->request_sense_length = sense_len;
>-			sp->request_sense_ptr = cp->sense_buffer;
>-
>-			if (sp->request_sense_length > 32)
>-				sense_len = 32;
>-
>-			memcpy(cp->sense_buffer, sense_data, sense_len);
>-
>-			sp->request_sense_ptr += sense_len;
>-			sp->request_sense_length -= sense_len;
>-			if (sp->request_sense_length != 0)
>-				ha->status_srb = sp;
>-
>-			DEBUG5(printk("%s(): Check condition Sense data, "
>-			    "scsi(%ld:%d:%d:%d) cmd=%p pid=%ld\n",
>-			    __func__, ha->host_no, cp->device->channel,
>-			    cp->device->id, cp->device->lun, cp,
>-			    cp->serial_number));
>+			qla2x00_handle_sense(sp, sense_data, sense_len);
> 
> 			/*
> 			 * In case of a Underrun condition, set both the lscsi
>@@ -1143,10 +1120,6 @@ qla2x00_status_entry(scsi_qla_host_t *ha
> 
> 				cp->result = DID_ERROR << 16 | lscsi_status;
> 			}
>-
>-			if (sense_len)
>-				DEBUG5(qla2x00_dump_buffer(cp->sense_buffer,
>-				    CMD_ACTUAL_SNSLEN(cp)));
> 		} else {
> 			/*
> 			 * If RISC reports underrun and target does not report
>@@ -1677,7 +1650,7 @@ qla24xx_intr_handler(int irq, void *dev_
> 	if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) &&
> 	    (status & MBX_INTERRUPT) && ha->flags.mbox_int) {
> 		set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
>-		up(&ha->mbx_intr_sem);
>+		complete(&ha->mbx_intr_comp);
> 	}
> 
> 	return IRQ_HANDLED;
>@@ -1811,7 +1784,7 @@ qla24xx_msix_default(int irq, void *dev_
> 	if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) &&
> 	    (status & MBX_INTERRUPT) && ha->flags.mbox_int) {
> 		set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
>-		up(&ha->mbx_intr_sem);
>+		complete(&ha->mbx_intr_comp);
> 	}
> 
> 	return IRQ_HANDLED;
>diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
>index 5a45b56..c6a3418 100644
>--- a/drivers/scsi/qla2xxx/qla_mbx.c
>+++ b/drivers/scsi/qla2xxx/qla_mbx.c
>@@ -8,19 +8,6 @@
> 
> #include <linux/delay.h>
> 
>-static void
>-qla2x00_mbx_sem_timeout(unsigned long data)
>-{
>-	struct semaphore	*sem_ptr = (struct semaphore *)data;
>-
>-	DEBUG11(printk("qla2x00_sem_timeout: entered.\n"));
>-
>-	if (sem_ptr != NULL) {
>-		up(sem_ptr);
>-	}
>-
>-	DEBUG11(printk("qla2x00_mbx_sem_timeout: exiting.\n"));
>-}
> 
> /*
>  * qla2x00_mailbox_command
>@@ -47,7 +34,6 @@ qla2x00_mailbox_command(scsi_qla_host_t
> 	int		rval;
> 	unsigned long    flags = 0;
> 	device_reg_t __iomem *reg;
>-	struct timer_list	tmp_intr_timer;
> 	uint8_t		abort_active;
> 	uint8_t		io_lock_on;
> 	uint16_t	command;
>@@ -72,7 +58,8 @@ qla2x00_mailbox_command(scsi_qla_host_t
> 	 * non ISP abort time.
> 	 */
> 	if (!abort_active) {
>-		if (qla2x00_down_timeout(&ha->mbx_cmd_sem, mcp->tov * HZ)) {
>+		if (!wait_for_completion_timeout(&ha->mbx_cmd_comp,
>+		    mcp->tov * HZ)) {
> 			/* Timeout occurred. Return error. */
> 			DEBUG2_3_11(printk("%s(%ld): cmd access timeout. "
> 			    "Exiting.\n", __func__, ha->host_no));
>@@ -135,22 +122,6 @@ qla2x00_mailbox_command(scsi_qla_host_t
> 	/* Wait for mbx cmd completion until timeout */
> 
> 	if (!abort_active && io_lock_on) {
>-		/* sleep on completion semaphore */
>-		DEBUG11(printk("%s(%ld): INTERRUPT MODE. Initializing timer.\n",
>-		    __func__, ha->host_no));
>-
>-		init_timer(&tmp_intr_timer);
>-		tmp_intr_timer.data = (unsigned long)&ha->mbx_intr_sem;
>-		tmp_intr_timer.expires = jiffies + mcp->tov * HZ;
>-		tmp_intr_timer.function =
>-		    (void (*)(unsigned long))qla2x00_mbx_sem_timeout;
>-
>-		DEBUG11(printk("%s(%ld): Adding timer.\n", __func__,
>-		    ha->host_no));
>-		add_timer(&tmp_intr_timer);
>-
>-		DEBUG11(printk("%s(%ld): going to unlock & sleep. "
>-		    "time=0x%lx.\n", __func__, ha->host_no, jiffies));
> 
> 		set_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags);
> 
>@@ -160,17 +131,10 @@ qla2x00_mailbox_command(scsi_qla_host_t
> 			WRT_REG_WORD(&reg->isp.hccr, HCCR_SET_HOST_INT);
> 		spin_unlock_irqrestore(&ha->hardware_lock, flags);
> 
>-		/* Wait for either the timer to expire
>-		 * or the mbox completion interrupt
>-		 */
>-		down(&ha->mbx_intr_sem);
>+		wait_for_completion_timeout(&ha->mbx_intr_comp, mcp->tov * HZ);
> 
>-		DEBUG11(printk("%s(%ld): waking up. time=0x%lx\n", __func__,
>-		    ha->host_no, jiffies));
> 		clear_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags);
> 
>-		/* delete the timer */
>-		del_timer(&tmp_intr_timer);
> 	} else {
> 		DEBUG3_11(printk("%s(%ld): cmd=%x POLLING MODE.\n", __func__,
> 		    ha->host_no, command));
>@@ -299,7 +263,7 @@ qla2x00_mailbox_command(scsi_qla_host_t
> 
> 	/* Allow next mbx cmd to come in. */
> 	if (!abort_active)
>-		up(&ha->mbx_cmd_sem);
>+		complete(&ha->mbx_cmd_comp);
> 
> 	if (rval) {
> 		DEBUG2_3_11(printk("%s(%ld): **** FAILED. mbx0=%x, mbx1=%x, "
>@@ -914,7 +878,7 @@ qla2x00_get_adapter_id(scsi_qla_host_t *
> 
> 	mcp->mb[0] = MBC_GET_ADAPTER_LOOP_ID;
> 	mcp->mb[9] = ha->vp_idx;
>-	mcp->out_mb = MBX_0;
>+	mcp->out_mb = MBX_9|MBX_0;
> 	mcp->in_mb = MBX_9|MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
> 	mcp->tov = 30;
> 	mcp->flags = 0;
>@@ -1931,7 +1895,8 @@ qla2x00_get_id_list(scsi_qla_host_t *ha,
>  */
> int
> qla2x00_get_resource_cnts(scsi_qla_host_t *ha, uint16_t *cur_xchg_cnt,
>-    uint16_t *orig_xchg_cnt, uint16_t *cur_iocb_cnt, uint16_t *orig_iocb_cnt)
>+    uint16_t *orig_xchg_cnt, uint16_t *cur_iocb_cnt,
>+    uint16_t *orig_iocb_cnt, uint16_t *max_npiv_vports)
> {
> 	int rval;
> 	mbx_cmd_t mc;
>@@ -1964,6 +1929,8 @@ qla2x00_get_resource_cnts(scsi_qla_host_
> 			*cur_iocb_cnt = mcp->mb[7];
> 		if (orig_iocb_cnt)
> 			*orig_iocb_cnt = mcp->mb[10];
>+		if (max_npiv_vports)
>+			*max_npiv_vports = mcp->mb[11];
> 	}
> 
> 	return (rval);
>@@ -2291,6 +2258,7 @@ atarget_done:
> 	return rval;
> }
> 
>+
> int
> qla2x00_system_error(scsi_qla_host_t *ha)
> {
>@@ -2320,47 +2288,6 @@ qla2x00_system_error(scsi_qla_host_t *ha
> 	return rval;
> }
> 
>-/**
>- * qla2x00_get_serdes_params() -
>- * @ha: HA context
>- *
>- * Returns
>- */
>-int
>-qla2x00_get_serdes_params(scsi_qla_host_t *ha, uint16_t *sw_em_1g,
>-    uint16_t *sw_em_2g, uint16_t *sw_em_4g)
>-{
>-	int rval;
>-	mbx_cmd_t mc;
>-	mbx_cmd_t *mcp = &mc;
>-
>-	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
>-
>-	mcp->mb[0] = MBC_SERDES_PARAMS;
>-	mcp->mb[1] = 0;
>-	mcp->out_mb = MBX_1|MBX_0;
>-	mcp->in_mb = MBX_4|MBX_3|MBX_2|MBX_0;
>-	mcp->tov = 30;
>-	mcp->flags = 0;
>-	rval = qla2x00_mailbox_command(ha, mcp);
>-
>-	if (rval != QLA_SUCCESS) {
>-		/*EMPTY*/
>-		DEBUG2_3_11(printk("%s(%ld): failed=%x (%x).\n", __func__,
>-		    ha->host_no, rval, mcp->mb[0]));
>-	} else {
>-		DEBUG11(printk("%s(%ld): done.\n", __func__, ha->host_no));
>-
>-		if (sw_em_1g)
>-			*sw_em_1g = mcp->mb[2];
>-		if (sw_em_2g)
>-			*sw_em_2g = mcp->mb[3];
>-		if (sw_em_4g)
>-			*sw_em_4g = mcp->mb[4];
>-	}
>-
>-	return rval;
>-}
> 
> /**
>  * qla2x00_set_serdes_params() -
>@@ -2509,49 +2436,6 @@ qla2x00_read_sfp(scsi_qla_host_t *ha, dm
> }
> 
> int
>-qla2x00_get_idma_speed(scsi_qla_host_t *ha, uint16_t loop_id,
>-    uint16_t *port_speed, uint16_t *mb)
>-{
>-	int rval;
>-	mbx_cmd_t mc;
>-	mbx_cmd_t *mcp = &mc;
>-
>-	if (!IS_IIDMA_CAPABLE(ha))
>-		return QLA_FUNCTION_FAILED;
>-
>-	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
>-
>-	mcp->mb[0] = MBC_PORT_PARAMS;
>-	mcp->mb[1] = loop_id;
>-	mcp->mb[2] = mcp->mb[3] = mcp->mb[4] = mcp->mb[5] = 0;
>-	mcp->out_mb = MBX_5|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
>-	mcp->in_mb = MBX_5|MBX_4|MBX_3|MBX_1|MBX_0;
>-	mcp->tov = 30;
>-	mcp->flags = 0;
>-	rval = qla2x00_mailbox_command(ha, mcp);
>-
>-	/* Return mailbox statuses. */
>-	if (mb != NULL) {
>-		mb[0] = mcp->mb[0];
>-		mb[1] = mcp->mb[1];
>-		mb[3] = mcp->mb[3];
>-		mb[4] = mcp->mb[4];
>-		mb[5] = mcp->mb[5];
>-	}
>-
>-	if (rval != QLA_SUCCESS) {
>-		DEBUG2_3_11(printk("%s(%ld): failed=%x.\n", __func__,
>-		    ha->host_no, rval));
>-	} else {
>-		DEBUG11(printk("%s(%ld): done.\n", __func__, ha->host_no));
>-		if (port_speed)
>-			*port_speed = mcp->mb[3];
>-	}
>-
>-	return rval;
>-}
>-
>-int
> qla2x00_set_idma_speed(scsi_qla_host_t *ha, uint16_t loop_id,
>     uint16_t port_speed, uint16_t *mb)
> {
>@@ -2642,96 +2526,6 @@ qla2x00_dump_ram(scsi_qla_host_t *ha, dm
> 	return rval;
> }
> 
>-/*
>- * qla24xx_get_vp_database
>- *	Get the VP's database for all configured ports.
>- *
>- * Input:
>- *	ha = adapter block pointer.
>- *	size = size of initialization control block.
>- *
>- * Returns:
>- *	qla2x00 local function return status code.
>- *
>- * Context:
>- *	Kernel context.
>- */
>-int
>-qla24xx_get_vp_database(scsi_qla_host_t *ha, uint16_t size)
>-{
>-	int rval;
>-	mbx_cmd_t mc;
>-	mbx_cmd_t *mcp = &mc;
>-
>-	DEBUG11(printk("scsi(%ld):%s - entered.\n",
>-	    ha->host_no, __func__));
>-
>-	mcp->mb[0] = MBC_MID_GET_VP_DATABASE;
>-	mcp->mb[2] = MSW(ha->init_cb_dma);
>-	mcp->mb[3] = LSW(ha->init_cb_dma);
>-	mcp->mb[4] = 0;
>-	mcp->mb[5] = 0;
>-	mcp->mb[6] = MSW(MSD(ha->init_cb_dma));
>-	mcp->mb[7] = LSW(MSD(ha->init_cb_dma));
>-	mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_0;
>-	mcp->in_mb = MBX_1|MBX_0;
>-	mcp->buf_size = size;
>-	mcp->flags = MBX_DMA_OUT;
>-	mcp->tov = MBX_TOV_SECONDS;
>-	rval = qla2x00_mailbox_command(ha, mcp);
>-
>-	if (rval != QLA_SUCCESS) {
>-		/*EMPTY*/
>-		DEBUG2_3_11(printk("%s(%ld): failed=%x "
>-		    "mb0=%x.\n",
>-		    __func__, ha->host_no, rval, mcp->mb[0]));
>-	} else {
>-		/*EMPTY*/
>-		DEBUG11(printk("%s(%ld): done.\n",
>-		    __func__, ha->host_no));
>-	}
>-
>-	return rval;
>-}
>-
>-int
>-qla24xx_get_vp_entry(scsi_qla_host_t *ha, uint16_t size, int vp_id)
>-{
>-	int rval;
>-	mbx_cmd_t mc;
>-	mbx_cmd_t *mcp = &mc;
>-
>-	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
>-
>-	mcp->mb[0] = MBC_MID_GET_VP_ENTRY;
>-	mcp->mb[2] = MSW(ha->init_cb_dma);
>-	mcp->mb[3] = LSW(ha->init_cb_dma);
>-	mcp->mb[4] = 0;
>-	mcp->mb[5] = 0;
>-	mcp->mb[6] = MSW(MSD(ha->init_cb_dma));
>-	mcp->mb[7] = LSW(MSD(ha->init_cb_dma));
>-	mcp->mb[9] = vp_id;
>-	mcp->out_mb = MBX_9|MBX_7|MBX_6|MBX_3|MBX_2|MBX_0;
>-	mcp->in_mb = MBX_0;
>-	mcp->buf_size = size;
>-	mcp->flags = MBX_DMA_OUT;
>-	mcp->tov = 30;
>-	rval = qla2x00_mailbox_command(ha, mcp);
>-
>-	if (rval != QLA_SUCCESS) {
>-		/*EMPTY*/
>-		DEBUG2_3_11(printk("qla24xx_get_vp_entry(%ld): failed=%x "
>-		    "mb0=%x.\n",
>-		    ha->host_no, rval, mcp->mb[0]));
>-	} else {
>-		/*EMPTY*/
>-		DEBUG11(printk("qla24xx_get_vp_entry(%ld): done.\n",
>-		    ha->host_no));
>-	}
>-
>-	return rval;
>-}
>-
> void
> qla24xx_report_id_acquisition(scsi_qla_host_t *ha,
> 	struct vp_rpt_id_entry_24xx *rptid_entry)
>@@ -2883,7 +2677,7 @@ qla24xx_control_vp(scsi_qla_host_t *vha,
> 	DEBUG11(printk("%s(%ld): entered. Enabling index %d\n", __func__,
> 	    ha->host_no, vp_index));
> 
>-	if (vp_index == 0 || vp_index >= MAX_MULTI_ID_LOOP)
>+	if (vp_index == 0 || vp_index >= ha->max_npiv_vports)
> 		return QLA_PARAMETER_ERROR;
> 
> 	vce = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &vce_dma);
>diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
>index efd2e69..0eee017 100644
>--- a/drivers/scsi/qla2xxx/qla_mid.c
>+++ b/drivers/scsi/qla2xxx/qla_mid.c
>@@ -39,7 +39,7 @@ qla2x00_vp_stop_timer(scsi_qla_host_t *v
> 	}
> }
> 
>-uint32_t
>+static uint32_t
> qla24xx_allocate_vp_id(scsi_qla_host_t *vha)
> {
> 	uint32_t vp_id;
>@@ -47,16 +47,15 @@ qla24xx_allocate_vp_id(scsi_qla_host_t *
> 
> 	/* Find an empty slot and assign an vp_id */
> 	down(&ha->vport_sem);
>-	vp_id = find_first_zero_bit((unsigned long *)ha->vp_idx_map,
>-				MAX_MULTI_ID_FABRIC);
>-	if (vp_id > MAX_MULTI_ID_FABRIC) {
>-		DEBUG15(printk ("vp_id %d is bigger than MAX_MULTI_ID_FABRID\n",
>-		    vp_id));
>+	vp_id = find_first_zero_bit(ha->vp_idx_map, ha->max_npiv_vports + 1);
>+	if (vp_id > ha->max_npiv_vports) {
>+		DEBUG15(printk ("vp_id %d is bigger than max-supported %d.\n",
>+		    vp_id, ha->max_npiv_vports));
> 		up(&ha->vport_sem);
> 		return vp_id;
> 	}
> 
>-	set_bit(vp_id, (unsigned long *)ha->vp_idx_map);
>+	set_bit(vp_id, ha->vp_idx_map);
> 	ha->num_vhosts++;
> 	vha->vp_idx = vp_id;
> 	list_add_tail(&vha->vp_list, &ha->vp_list);
>@@ -73,7 +72,7 @@ qla24xx_deallocate_vp_id(scsi_qla_host_t
> 	down(&ha->vport_sem);
> 	vp_id = vha->vp_idx;
> 	ha->num_vhosts--;
>-	clear_bit(vp_id, (unsigned long *)ha->vp_idx_map);
>+	clear_bit(vp_id, ha->vp_idx_map);
> 	list_del(&vha->vp_list);
> 	up(&ha->vport_sem);
> }
>@@ -225,11 +224,7 @@ qla2x00_alert_all_vps(scsi_qla_host_t *h
> 	if (ha->parent)
> 		return;
> 
>-	i = find_next_bit((unsigned long *)ha->vp_idx_map,
>-	    MAX_MULTI_ID_FABRIC + 1, 1);
>-	for (;i <= MAX_MULTI_ID_FABRIC;
>-	    i = find_next_bit((unsigned long *)ha->vp_idx_map,
>-	    MAX_MULTI_ID_FABRIC + 1, i + 1)) {
>+	for_each_mapped_vp_idx(ha, i) {
> 		vp_idx_matched = 0;
> 
> 		list_for_each_entry(vha, &ha->vp_list, vp_list) {
>@@ -279,7 +274,7 @@ qla2x00_vp_abort_isp(scsi_qla_host_t *vh
> 	qla24xx_enable_vp(vha);
> }
> 
>-int
>+static int
> qla2x00_do_dpc_vp(scsi_qla_host_t *vha)
> {
> 	if (test_and_clear_bit(VP_IDX_ACQUIRED, &vha->vp_flags)) {
>@@ -320,11 +315,7 @@ qla2x00_do_dpc_all_vps(scsi_qla_host_t *
> 
> 	clear_bit(VP_DPC_NEEDED, &ha->dpc_flags);
> 
>-	i = find_next_bit((unsigned long *)ha->vp_idx_map,
>-	    MAX_MULTI_ID_FABRIC + 1, 1);
>-	for (;i <= MAX_MULTI_ID_FABRIC;
>-	    i = find_next_bit((unsigned long *)ha->vp_idx_map,
>-	    MAX_MULTI_ID_FABRIC + 1, i + 1)) {
>+	for_each_mapped_vp_idx(ha, i) {
> 		vp_idx_matched = 0;
> 
> 		list_for_each_entry(vha, &ha->vp_list, vp_list) {
>@@ -421,9 +412,9 @@ qla24xx_vport_create_req_sanity_check(sc
> 
> 	/* Check up max-npiv-supports */
> 	if (ha->num_vhosts > ha->max_npiv_vports) {
>-		DEBUG15(printk("scsi(%ld): num_vhosts %d is bigger than "
>-		    "max_npv_vports %d.\n", ha->host_no,
>-		    (uint16_t) ha->num_vhosts, (int) ha->max_npiv_vports));
>+		DEBUG15(printk("scsi(%ld): num_vhosts %ud is bigger than "
>+		    "max_npv_vports %ud.\n", ha->host_no,
>+		    ha->num_vhosts, ha->max_npiv_vports));
> 		return -EINVAL;
> 	}
> 	return 0;
>@@ -481,8 +472,9 @@ qla24xx_create_vhost(scsi_qla_host_t *ha
> 	}
> 	vha->mgmt_svr_loop_id = 10 + vha->vp_idx;
> 
>-	init_MUTEX(&vha->mbx_cmd_sem);
>-	init_MUTEX_LOCKED(&vha->mbx_intr_sem);
>+	init_completion(&vha->mbx_cmd_comp);
>+	complete(&vha->mbx_cmd_comp);
>+	init_completion(&vha->mbx_intr_comp);
> 
> 	INIT_LIST_HEAD(&vha->list);
> 	INIT_LIST_HEAD(&vha->fcports);
>@@ -519,7 +511,7 @@ qla24xx_create_vhost(scsi_qla_host_t *ha
> 	num_hosts++;
> 
> 	down(&ha->vport_sem);
>-	set_bit(vha->vp_idx, (unsigned long *)ha->vp_idx_map);
>+	set_bit(vha->vp_idx, ha->vp_idx_map);
> 	ha->cur_vport_count++;
> 	up(&ha->vport_sem);
> 
>diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
>index 807b80e..8b08481 100644
>--- a/drivers/scsi/qla2xxx/qla_os.c
>+++ b/drivers/scsi/qla2xxx/qla_os.c
>@@ -207,13 +207,6 @@ struct scsi_transport_template *qla2xxx_
>  * Timer routines
>  */
> 
>-void qla2x00_timer(scsi_qla_host_t *);
>-
>-__inline__ void qla2x00_start_timer(scsi_qla_host_t *,
>-    void *, unsigned long);
>-static __inline__ void qla2x00_restart_timer(scsi_qla_host_t *, unsigned long);
>-__inline__ void qla2x00_stop_timer(scsi_qla_host_t *);
>-
> inline void
> qla2x00_start_timer(scsi_qla_host_t *ha, void *func, unsigned long interval)
> {
>@@ -231,7 +224,7 @@ qla2x00_restart_timer(scsi_qla_host_t *h
> 	mod_timer(&ha->timer, jiffies + interval * HZ);
> }
> 
>-__inline__ void
>+static __inline__ void
> qla2x00_stop_timer(scsi_qla_host_t *ha)
> {
> 	del_timer_sync(&ha->timer);
>@@ -242,12 +235,11 @@ static int qla2x00_do_dpc(void *data);
> 
> static void qla2x00_rst_aen(scsi_qla_host_t *);
> 
>-uint8_t qla2x00_mem_alloc(scsi_qla_host_t *);
>-void qla2x00_mem_free(scsi_qla_host_t *ha);
>+static uint8_t qla2x00_mem_alloc(scsi_qla_host_t *);
>+static void qla2x00_mem_free(scsi_qla_host_t *ha);
> static int qla2x00_allocate_sp_pool( scsi_qla_host_t *ha);
> static void qla2x00_free_sp_pool(scsi_qla_host_t *ha);
> static void qla2x00_sp_free_dma(scsi_qla_host_t *, srb_t *);
>-void qla2x00_sp_compl(scsi_qla_host_t *ha, srb_t *);
> 
> /* -------------------------------------------------------------------------- */
> 
>@@ -1511,15 +1503,12 @@ qla2x00_set_isp_flags(scsi_qla_host_t *h
> static int
> qla2x00_iospace_config(scsi_qla_host_t *ha)
> {
>-	unsigned long	pio, pio_len, pio_flags;
>-	unsigned long	mmio, mmio_len, mmio_flags;
>+	resource_size_t pio;
> 
> 	/* We only need PIO for Flash operations on ISP2312 v2 chips. */
> 	pio = pci_resource_start(ha->pdev, 0);
>-	pio_len = pci_resource_len(ha->pdev, 0);
>-	pio_flags = pci_resource_flags(ha->pdev, 0);
>-	if (pio_flags & IORESOURCE_IO) {
>-		if (pio_len < MIN_IOBASE_LEN) {
>+	if (pci_resource_flags(ha->pdev, 0) & IORESOURCE_IO) {
>+		if (pci_resource_len(ha->pdev, 0) < MIN_IOBASE_LEN) {
> 			qla_printk(KERN_WARNING, ha,
> 			    "Invalid PCI I/O region size (%s)...\n",
> 				pci_name(ha->pdev));
>@@ -1533,17 +1522,13 @@ qla2x00_iospace_config(scsi_qla_host_t *
> 	}
> 
> 	/* Use MMIO operations for all accesses. */
>-	mmio = pci_resource_start(ha->pdev, 1);
>-	mmio_len = pci_resource_len(ha->pdev, 1);
>-	mmio_flags = pci_resource_flags(ha->pdev, 1);
>-
>-	if (!(mmio_flags & IORESOURCE_MEM)) {
>+	if (!(pci_resource_flags(ha->pdev, 1) & IORESOURCE_MEM)) {
> 		qla_printk(KERN_ERR, ha,
>-		    "region #0 not an MMIO resource (%s), aborting\n",
>+		    "region #1 not an MMIO resource (%s), aborting\n",
> 		    pci_name(ha->pdev));
> 		goto iospace_error_exit;
> 	}
>-	if (mmio_len < MIN_IOBASE_LEN) {
>+	if (pci_resource_len(ha->pdev, 1) < MIN_IOBASE_LEN) {
> 		qla_printk(KERN_ERR, ha,
> 		    "Invalid PCI mem region size (%s), aborting\n",
> 			pci_name(ha->pdev));
>@@ -1559,8 +1544,7 @@ qla2x00_iospace_config(scsi_qla_host_t *
> 	}
> 
> 	ha->pio_address = pio;
>-	ha->pio_length = pio_len;
>-	ha->iobase = ioremap(mmio, MIN_IOBASE_LEN);
>+	ha->iobase = ioremap(pci_resource_start(ha->pdev, 1), MIN_IOBASE_LEN);
> 	if (!ha->iobase) {
> 		qla_printk(KERN_ERR, ha,
> 		    "cannot remap MMIO (%s), aborting\n", pci_name(ha->pdev));
>@@ -1722,9 +1706,10 @@ qla2x00_probe_one(struct pci_dev *pdev,
> 
> 	init_completion(&ha->pass_thru_intr_comp);
> 
>-	init_MUTEX(&ha->mbx_cmd_sem);
> 	init_MUTEX(&ha->vport_sem);
>-	init_MUTEX_LOCKED(&ha->mbx_intr_sem);
>+	init_completion(&ha->mbx_cmd_comp);
>+	complete(&ha->mbx_cmd_comp);
>+	init_completion(&ha->mbx_intr_comp);
> 
> 	INIT_LIST_HEAD(&ha->list);
> 	INIT_LIST_HEAD(&ha->fcports);
>@@ -2072,7 +2057,7 @@ qla2x00_mark_all_devices_lost(scsi_qla_h
> *      0  = success.
> *      1  = failure.
> */
>-uint8_t
>+static uint8_t
> qla2x00_mem_alloc(scsi_qla_host_t *ha)
> {
> 	char	name[16];
>@@ -2284,7 +2269,7 @@ qla2x00_mem_alloc(scsi_qla_host_t *ha)
> * Input:
> *      ha = adapter block pointer.
> */
>-void
>+static void
> qla2x00_mem_free(scsi_qla_host_t *ha)
> {
> 	struct list_head	*fcpl, *fcptemp;
>@@ -2831,23 +2816,6 @@ qla2x00_timer(scsi_qla_host_t *ha)
> 	qla2x00_restart_timer(ha, WATCH_INTERVAL);
> }
> 
>-/* XXX(hch): crude hack to emulate a down_timeout() */
>-int
>-qla2x00_down_timeout(struct semaphore *sema, unsigned long timeout)
>-{
>-	const unsigned int step = 100; /* msecs */
>-	unsigned int iterations = jiffies_to_msecs(timeout)/100;
>-
>-	do {
>-		if (!down_trylock(sema))
>-			return 0;
>-		if (msleep_interruptible(step))
>-			break;
>-	} while (--iterations > 0);
>-
>-	return -ETIMEDOUT;
>-}
>-
> /* Firmware interface routines. */
> 
> #define FW_BLOBS	6
>diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
>index 347aafb..6dd7037 100644
>--- a/drivers/scsi/qla2xxx/qla_sup.c
>+++ b/drivers/scsi/qla2xxx/qla_sup.c
>@@ -22,7 +22,7 @@ static void qla2x00_nv_write(scsi_qla_ho
>  * qla2x00_lock_nvram_access() -
>  * @ha: HA context
>  */
>-void
>+static void
> qla2x00_lock_nvram_access(scsi_qla_host_t *ha)
> {
> 	uint16_t data;
>@@ -55,7 +55,7 @@ qla2x00_lock_nvram_access(scsi_qla_host_
>  * qla2x00_unlock_nvram_access() -
>  * @ha: HA context
>  */
>-void
>+static void
> qla2x00_unlock_nvram_access(scsi_qla_host_t *ha)
> {
> 	struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
>@@ -74,7 +74,7 @@ qla2x00_unlock_nvram_access(scsi_qla_hos
>  *
>  * Returns the word read from nvram @addr.
>  */
>-uint16_t
>+static uint16_t
> qla2x00_get_nvram_word(scsi_qla_host_t *ha, uint32_t addr)
> {
> 	uint16_t	data;
>@@ -93,7 +93,7 @@ qla2x00_get_nvram_word(scsi_qla_host_t *
>  * @addr: Address in NVRAM to write
>  * @data: word to program
>  */
>-void
>+static void
> qla2x00_write_nvram_word(scsi_qla_host_t *ha, uint32_t addr, uint16_t data)
> {
> 	int count;
>@@ -893,6 +893,8 @@ qla2x00_flip_colors(scsi_qla_host_t *ha,
> 	}
> }
> 
>+#define PIO_REG(h, r) ((h)->pio_address + offsetof(struct device_reg_2xxx, r))
>+
> void
> qla2x00_beacon_blink(struct scsi_qla_host *ha)
> {
>@@ -902,15 +904,12 @@ qla2x00_beacon_blink(struct scsi_qla_hos
> 	unsigned long flags;
> 	struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
> 
>-	if (ha->pio_address)
>-		reg = (struct device_reg_2xxx __iomem *)ha->pio_address;
>-
> 	spin_lock_irqsave(&ha->hardware_lock, flags);
> 
> 	/* Save the Original GPIOE. */
> 	if (ha->pio_address) {
>-		gpio_enable = RD_REG_WORD_PIO(&reg->gpioe);
>-		gpio_data = RD_REG_WORD_PIO(&reg->gpiod);
>+		gpio_enable = RD_REG_WORD_PIO(PIO_REG(ha, gpioe));
>+		gpio_data = RD_REG_WORD_PIO(PIO_REG(ha, gpiod));
> 	} else {
> 		gpio_enable = RD_REG_WORD(&reg->gpioe);
> 		gpio_data = RD_REG_WORD(&reg->gpiod);
>@@ -920,7 +919,7 @@ qla2x00_beacon_blink(struct scsi_qla_hos
> 	gpio_enable |= GPIO_LED_MASK;
> 
> 	if (ha->pio_address) {
>-		WRT_REG_WORD_PIO(&reg->gpioe, gpio_enable);
>+		WRT_REG_WORD_PIO(PIO_REG(ha, gpioe), gpio_enable);
> 	} else {
> 		WRT_REG_WORD(&reg->gpioe, gpio_enable);
> 		RD_REG_WORD(&reg->gpioe);
>@@ -936,7 +935,7 @@ qla2x00_beacon_blink(struct scsi_qla_hos
> 
> 	/* Set the modified gpio_data values */
> 	if (ha->pio_address) {
>-		WRT_REG_WORD_PIO(&reg->gpiod, gpio_data);
>+		WRT_REG_WORD_PIO(PIO_REG(ha, gpiod), gpio_data);
> 	} else {
> 		WRT_REG_WORD(&reg->gpiod, gpio_data);
> 		RD_REG_WORD(&reg->gpiod);
>@@ -962,14 +961,11 @@ qla2x00_beacon_on(struct scsi_qla_host *
> 		return QLA_FUNCTION_FAILED;
> 	}
> 
>-	if (ha->pio_address)
>-		reg = (struct device_reg_2xxx __iomem *)ha->pio_address;
>-
> 	/* Turn off LEDs. */
> 	spin_lock_irqsave(&ha->hardware_lock, flags);
> 	if (ha->pio_address) {
>-		gpio_enable = RD_REG_WORD_PIO(&reg->gpioe);
>-		gpio_data = RD_REG_WORD_PIO(&reg->gpiod);
>+		gpio_enable = RD_REG_WORD_PIO(PIO_REG(ha, gpioe));
>+		gpio_data = RD_REG_WORD_PIO(PIO_REG(ha, gpiod));
> 	} else {
> 		gpio_enable = RD_REG_WORD(&reg->gpioe);
> 		gpio_data = RD_REG_WORD(&reg->gpiod);
>@@ -978,7 +974,7 @@ qla2x00_beacon_on(struct scsi_qla_host *
> 
> 	/* Set the modified gpio_enable values. */
> 	if (ha->pio_address) {
>-		WRT_REG_WORD_PIO(&reg->gpioe, gpio_enable);
>+		WRT_REG_WORD_PIO(PIO_REG(ha, gpioe), gpio_enable);
> 	} else {
> 		WRT_REG_WORD(&reg->gpioe, gpio_enable);
> 		RD_REG_WORD(&reg->gpioe);
>@@ -987,7 +983,7 @@ qla2x00_beacon_on(struct scsi_qla_host *
> 	/* Clear out previously set LED colour. */
> 	gpio_data &= ~GPIO_LED_MASK;
> 	if (ha->pio_address) {
>-		WRT_REG_WORD_PIO(&reg->gpiod, gpio_data);
>+		WRT_REG_WORD_PIO(PIO_REG(ha, gpiod), gpio_data);
> 	} else {
> 		WRT_REG_WORD(&reg->gpiod, gpio_data);
> 		RD_REG_WORD(&reg->gpiod);
>@@ -1244,13 +1240,12 @@ qla2x00_read_flash_byte(scsi_qla_host_t
> 	if (ha->pio_address) {
> 		uint16_t data2;
> 
>-		reg = (struct device_reg_2xxx __iomem *)ha->pio_address;
>-		WRT_REG_WORD_PIO(&reg->flash_address, (uint16_t)addr);
>+		WRT_REG_WORD_PIO(PIO_REG(ha, flash_address), (uint16_t)addr);
> 		do {
>-			data = RD_REG_WORD_PIO(&reg->flash_data);
>+			data = RD_REG_WORD_PIO(PIO_REG(ha, flash_data));
> 			barrier();
> 			cpu_relax();
>-			data2 = RD_REG_WORD_PIO(&reg->flash_data);
>+			data2 = RD_REG_WORD_PIO(PIO_REG(ha, flash_data));
> 		} while (data != data2);
> 	} else {
> 		WRT_REG_WORD(&reg->flash_address, (uint16_t)addr);
>@@ -1304,9 +1299,8 @@ qla2x00_write_flash_byte(scsi_qla_host_t
> 
> 	/* Always perform IO mapped accesses to the FLASH registers. */
> 	if (ha->pio_address) {
>-		reg = (struct device_reg_2xxx __iomem *)ha->pio_address;
>-		WRT_REG_WORD_PIO(&reg->flash_address, (uint16_t)addr);
>-		WRT_REG_WORD_PIO(&reg->flash_data, (uint16_t)data);
>+		WRT_REG_WORD_PIO(PIO_REG(ha, flash_address), (uint16_t)addr);
>+		WRT_REG_WORD_PIO(PIO_REG(ha, flash_data), (uint16_t)data);
> 	} else {
> 		WRT_REG_WORD(&reg->flash_address, (uint16_t)addr);
> 		RD_REG_WORD(&reg->ctrl_status);		/* PCI Posting. */
>-- 
>1.4.4.1
>

Actions: View | Diff

Attachments on bug 459722: 314716