Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18e7555a authored Jun 03, 2009 by Andrew Vasquez Committed by James Bottomley Jun 08, 2009

[SCSI] qla2xxx: Synchronize MPI settings after a PE Reset.



Ensure MPS remains in synchronization across all NIC/FCoE
functions after a reset.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent 656e8912

drivers/scsi/qla2xxx/qla_gbl.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -299,6 +299,12 @@ qla2x00_get_xgmac_stats(scsi_qla_host_t , dma_addr_t, uint16_t, uint16_t );
		extern int
		qla2x00_get_dcbx_params(scsi_qla_host_t *, dma_addr_t, uint16_t);

		extern int
		qla2x00_read_ram_word(scsi_qla_host_t , uint32_t, uint32_t );

		extern int
		qla2x00_write_ram_word(scsi_qla_host_t *, uint32_t, uint32_t);

		/*
		* Global Function Prototypes in qla_isr.c source file.
		*/

drivers/scsi/qla2xxx/qla_init.c

+52 −0

Original line number	Diff line number	Diff line
		@@ -886,6 +886,56 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *vha)
		htonl(offsetof(struct qla2xxx_fw_dump, isp));
		}

		static int
		qla81xx_mpi_sync(scsi_qla_host_t *vha)
		{
		#define MPS_MASK 0xe0
		int rval;
		uint16_t dc;
		uint32_t dw;
		struct qla_hw_data *ha = vha->hw;

		if (!IS_QLA81XX(vha->hw))
		return QLA_SUCCESS;

		rval = qla2x00_write_ram_word(vha, 0x7c00, 1);
		if (rval != QLA_SUCCESS) {
		DEBUG2(qla_printk(KERN_WARNING, ha,
		"Sync-MPI: Unable to acquire semaphore.\n"));
		goto done;
		}

		pci_read_config_word(vha->hw->pdev, 0x54, &dc);
		rval = qla2x00_read_ram_word(vha, 0x7a15, &dw);
		if (rval != QLA_SUCCESS) {
		DEBUG2(qla_printk(KERN_WARNING, ha,
		"Sync-MPI: Unable to read sync.\n"));
		goto done_release;
		}

		dc &= MPS_MASK;
		if (dc == (dw & MPS_MASK))
		goto done_release;

		dw &= ~MPS_MASK;
		dw \|= dc;
		rval = qla2x00_write_ram_word(vha, 0x7a15, dw);
		if (rval != QLA_SUCCESS) {
		DEBUG2(qla_printk(KERN_WARNING, ha,
		"Sync-MPI: Unable to gain sync.\n"));
		}

		done_release:
		rval = qla2x00_write_ram_word(vha, 0x7c00, 0);
		if (rval != QLA_SUCCESS) {
		DEBUG2(qla_printk(KERN_WARNING, ha,
		"Sync-MPI: Unable to release semaphore.\n"));
		}

		done:
		return rval;
		}

		/**
		* qla2x00_setup_chip() - Load and start RISC firmware.
		* @ha: HA context
		@@ -910,6 +960,8 @@ qla2x00_setup_chip(scsi_qla_host_t *vha)
		spin_unlock_irqrestore(&ha->hardware_lock, flags);
		}

		qla81xx_mpi_sync(vha);

		/* Load firmware sequences */
		rval = ha->isp_ops->load_risc(vha, &srisc_address);
		if (rval == QLA_SUCCESS) {

drivers/scsi/qla2xxx/qla_mbx.c

+63 −0

Original line number	Diff line number	Diff line
		@@ -3545,3 +3545,66 @@ qla2x00_get_dcbx_params(scsi_qla_host_t *vha, dma_addr_t tlv_dma,

		return rval;
		}

		int
		qla2x00_read_ram_word(scsi_qla_host_t vha, uint32_t risc_addr, uint32_t data)
		{
		int rval;
		mbx_cmd_t mc;
		mbx_cmd_t *mcp = &mc;

		if (!IS_FWI2_CAPABLE(vha->hw))
		return QLA_FUNCTION_FAILED;

		DEBUG11(printk("%s(%ld): entered.\n", __func__, vha->host_no));

		mcp->mb[0] = MBC_READ_RAM_EXTENDED;
		mcp->mb[1] = LSW(risc_addr);
		mcp->mb[8] = MSW(risc_addr);
		mcp->out_mb = MBX_8\|MBX_1\|MBX_0;
		mcp->in_mb = MBX_3\|MBX_2\|MBX_0;
		mcp->tov = 30;
		mcp->flags = 0;
		rval = qla2x00_mailbox_command(vha, mcp);
		if (rval != QLA_SUCCESS) {
		DEBUG2_3_11(printk("%s(%ld): failed=%x mb[0]=%x.\n", __func__,
		vha->host_no, rval, mcp->mb[0]));
		} else {
		DEBUG11(printk("%s(%ld): done.\n", __func__, vha->host_no));
		*data = mcp->mb[3] << 16 \| mcp->mb[2];
		}

		return rval;
		}

		int
		qla2x00_write_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t data)
		{
		int rval;
		mbx_cmd_t mc;
		mbx_cmd_t *mcp = &mc;

		if (!IS_FWI2_CAPABLE(vha->hw))
		return QLA_FUNCTION_FAILED;

		DEBUG11(printk("%s(%ld): entered.\n", __func__, vha->host_no));

		mcp->mb[0] = MBC_WRITE_RAM_WORD_EXTENDED;
		mcp->mb[1] = LSW(risc_addr);
		mcp->mb[2] = LSW(data);
		mcp->mb[3] = MSW(data);
		mcp->mb[8] = MSW(risc_addr);
		mcp->out_mb = MBX_8\|MBX_3\|MBX_2\|MBX_1\|MBX_0;
		mcp->in_mb = MBX_0;
		mcp->tov = 30;
		mcp->flags = 0;
		rval = qla2x00_mailbox_command(vha, mcp);
		if (rval != QLA_SUCCESS) {
		DEBUG2_3_11(printk("%s(%ld): failed=%x mb[0]=%x.\n", __func__,
		vha->host_no, rval, mcp->mb[0]));
		} else {
		DEBUG11(printk("%s(%ld): done.\n", __func__, vha->host_no));
		}

		return rval;
		}