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

Commit 03eb912a authored Oct 30, 2013 by Armen Baloyan Committed by James Bottomley Dec 19, 2013

[SCSI] qla2xxx: Add changes to obtain ISPFX00 adapters product information in...


[SCSI] qla2xxx: Add changes to obtain ISPFX00 adapters product information in accordance with firmware update.

Signed-off-by: Armen Baloyan <armen.baloyan@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent 767157c5

drivers/scsi/qla2xxx/qla_attr.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -956,10 +956,6 @@ qla2x00_model_name_show(struct device dev, struct device_attribute attr,
		{
		scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

		if (IS_QLAFX00(vha->hw))
		return snprintf(buf, PAGE_SIZE, "%s\n",
		vha->hw->mr.product_name);

		return snprintf(buf, PAGE_SIZE, "%s\n", vha->hw->model_number);
		}

drivers/scsi/qla2xxx/qla_dbg.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		* \| Level \| Last Value Used \| Holes \|
		* ----------------------------------------------------------------------
		* \| Module Init and Probe \| 0x015b \| 0x4b,0xba,0xfa \|
		* \| \| \| 0x0x015a \|
		* \| Mailbox commands \| 0x1187 \| 0x111a-0x111b \|
		* \| \| \| 0x1155-0x1158 \|
		* \| \| \| 0x1018-0x1019 \|

drivers/scsi/qla2xxx/qla_mr.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1967,8 +1967,8 @@ qlafx00_fx_disc(scsi_qla_host_t vha, fc_port_t fcport, uint16_t fx_type)
		if (fx_type == FXDISC_GET_CONFIG_INFO) {
		struct config_info_data *pinfo =
		(struct config_info_data *) fdisc->u.fxiocb.rsp_addr;
		memcpy(&vha->hw->mr.product_name, pinfo->product_name,
		sizeof(vha->hw->mr.product_name));
		strcpy(vha->hw->model_number, pinfo->model_num);
		strcpy(vha->hw->model_desc, pinfo->model_description);
		memcpy(&vha->hw->mr.symbolic_name, pinfo->symbolic_name,
		sizeof(vha->hw->mr.symbolic_name));
		memcpy(&vha->hw->mr.serial_num, pinfo->serial_num,

drivers/scsi/qla2xxx/qla_mr.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -304,7 +304,9 @@ struct register_host_info {
		#define QLAFX00_TGT_NODE_LIST_SIZE (sizeof(uint32_t) * 32)

		struct config_info_data {
		uint8_t product_name[256];
		uint8_t model_num[16];
		uint8_t model_description[80];
		uint8_t reserved0[160];
		uint8_t symbolic_name[64];
		uint8_t serial_num[32];
		uint8_t hw_version[16];
		@@ -491,7 +493,6 @@ struct qla_mt_iocb_rsp_fx00 {
		#define FX00_DEF_RATOV 10

		struct mr_data_fx00 {
		uint8_t product_name[256];
		uint8_t symbolic_name[64];
		uint8_t serial_num[32];
		uint8_t hw_version[16];

drivers/scsi/qla2xxx/qla_os.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -2836,10 +2836,6 @@ qla2x00_probe_one(struct pci_dev pdev, const struct pci_device_id id)

		qla2x00_dfs_setup(base_vha);

		if (IS_QLAFX00(ha))
		ql_log(ql_log_info, base_vha, 0x015a,
		"QLogic %s.\n", ha->mr.product_name);
		else
		ql_log(ql_log_info, base_vha, 0x00fb,
		"QLogic %s - %s.\n", ha->model_number, ha->model_desc);
		ql_log(ql_log_info, base_vha, 0x00fc,