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

Commit cfb27874 authored by Manish Dusane's avatar Manish Dusane Committed by James Bottomley
Browse files

[SCSI] qla4xxx: Added new mbox cmd to pass driver version to FW 



Signed-off-by: default avatarManish Dusane <manish.dusane@qlogic.com>
Signed-off-by: default avatarVikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent e47f8976

drivers/scsi/qla4xxx/ql4_fw.h

+3 −0
Original line number Diff line number Diff line
@@ -390,6 +390,9 @@ struct qla_flt_region { 
#define LOGOUT_OPTION_CLOSE_SESSION		0x0002

#define LOGOUT_OPTION_RELOGIN			0x0004

#define LOGOUT_OPTION_FREE_DDB			0x0008

#define MBOX_CMD_SET_PARAM			0x0059

#define SET_DRVR_VERSION			0x200

#define MAX_DRVR_VER_LEN			24

#define MBOX_CMD_EXECUTE_IOCB_A64		0x005A

#define MBOX_CMD_INITIALIZE_FIRMWARE		0x0060

#define MBOX_CMD_GET_INIT_FW_CTRL_BLOCK		0x0061

drivers/scsi/qla4xxx/ql4_glbl.h

+1 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ int qla4_8xxx_device_bootstrap(struct scsi_qla_host *ha); 
void qla4_8xxx_get_minidump(struct scsi_qla_host *ha);

int qla4_8xxx_mbx_intr_disable(struct scsi_qla_host *ha);

int qla4_8xxx_mbx_intr_enable(struct scsi_qla_host *ha);

int qla4_8xxx_set_param(struct scsi_qla_host *ha, int param);



extern int ql4xextended_error_logging;

extern int ql4xdontresethba;

drivers/scsi/qla4xxx/ql4_mbx.c

+37 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include "ql4_glbl.h"

#include "ql4_dbg.h"

#include "ql4_inline.h"

#include "ql4_version.h"



void qla4xxx_queue_mbox_cmd(struct scsi_qla_host *ha, uint32_t *mbx_cmd,

			    int in_count)
@@ -1931,3 +1932,39 @@ int qla4xxx_restore_factory_defaults(struct scsi_qla_host *ha, 
	}

	return status;

}



/**

 * qla4_8xxx_set_param - set driver version in firmware.

 * @ha: Pointer to host adapter structure.

 * @param: Parameter to set i.e driver version

 **/

int qla4_8xxx_set_param(struct scsi_qla_host *ha, int param)

{

	uint32_t mbox_cmd[MBOX_REG_COUNT];

	uint32_t mbox_sts[MBOX_REG_COUNT];

	uint32_t status;



	memset(&mbox_cmd, 0, sizeof(mbox_cmd));

	memset(&mbox_sts, 0, sizeof(mbox_sts));



	mbox_cmd[0] = MBOX_CMD_SET_PARAM;

	if (param == SET_DRVR_VERSION) {

		mbox_cmd[1] = SET_DRVR_VERSION;

		strncpy((char *)&mbox_cmd[2], QLA4XXX_DRIVER_VERSION,

			MAX_DRVR_VER_LEN);

	} else {

		ql4_printk(KERN_ERR, ha, "%s: invalid parameter 0x%x\n",

			   __func__, param);

		status = QLA_ERROR;

		goto exit_set_param;

	}



	status = qla4xxx_mailbox_command(ha, MBOX_REG_COUNT, 2, mbox_cmd,

					 mbox_sts);

	if (status == QLA_ERROR)

		ql4_printk(KERN_ERR, ha, "%s: failed status %04X\n",

			   __func__, mbox_sts[0]);



exit_set_param:

	return status;

}

drivers/scsi/qla4xxx/ql4_os.c

+4 −0
Original line number Diff line number Diff line
@@ -5329,6 +5329,10 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev, 
	       ha->host_no, ha->firmware_version[0], ha->firmware_version[1],

	       ha->patch_number, ha->build_number);



	/* Set the driver version */

	if (is_qla80XX(ha))

		qla4_8xxx_set_param(ha, SET_DRVR_VERSION);



	if (qla4xxx_setup_boot_info(ha))

		ql4_printk(KERN_ERR, ha,

			   "%s: No iSCSI boot target configured\n", __func__);