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

Commit e9f4f418 authored by Joe Carnuccio's avatar Joe Carnuccio Committed by James Bottomley
Browse files

[SCSI] Revert "qla2xxx: Add setting of driver version string for vendor application." 



The original patch was not covering all the adapters and firmwares.

This commit reverts 3a11711a.

Signed-off-by: default avatarJoe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: default avatarSaurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 9077a944

drivers/scsi/qla2xxx/qla_dbg.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 * | Mailbox commands             |       0x115b       | 0x111a-0x111b  |

 * |                              |                    | 0x112c-0x112e  |

 * |                              |                    | 0x113a         |

 * |                              |                    | 0x1155-0x1158  |

 * | Device Discovery             |       0x2087       | 0x2020-0x2022, |

 * |                              |                    | 0x2016         |

 * | Queue Command and IO tracing |       0x3031       | 0x3006-0x300b  |

drivers/scsi/qla2xxx/qla_def.h

+0 −1
Original line number Diff line number Diff line
@@ -863,7 +863,6 @@ typedef struct { 
#define	MBX_1		BIT_1

#define	MBX_0		BIT_0



#define RNID_TYPE_SET_VERSION	0x9

#define RNID_TYPE_ASIC_TEMP	0xC



/*

drivers/scsi/qla2xxx/qla_gbl.h

+0 −3
Original line number Diff line number Diff line
@@ -357,9 +357,6 @@ qla2x00_enable_fce_trace(scsi_qla_host_t *, dma_addr_t, uint16_t , uint16_t *, 
extern int

qla2x00_disable_fce_trace(scsi_qla_host_t *, uint64_t *, uint64_t *);



extern int

qla2x00_set_driver_version(scsi_qla_host_t *, char *);



extern int

qla2x00_read_sfp(scsi_qla_host_t *, dma_addr_t, uint8_t *,

	uint16_t, uint16_t, uint16_t, uint16_t);

drivers/scsi/qla2xxx/qla_init.c

+0 −2
Original line number Diff line number Diff line
@@ -619,8 +619,6 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha) 
	if (IS_QLA24XX_TYPE(ha) || IS_QLA25XX(ha))

		qla24xx_read_fcp_prio_cfg(vha);



	qla2x00_set_driver_version(vha, QLA2XXX_VERSION);



	return (rval);

}

drivers/scsi/qla2xxx/qla_mbx.c

+0 −58
Original line number Diff line number Diff line
@@ -3866,64 +3866,6 @@ qla81xx_restart_mpi_firmware(scsi_qla_host_t *vha) 
	return rval;

}



int

qla2x00_set_driver_version(scsi_qla_host_t *vha, char *version)

{

	int rval;

	mbx_cmd_t mc;

	mbx_cmd_t *mcp = &mc;

	int len;

	uint16_t dwlen;

	uint8_t *str;

	dma_addr_t str_dma;

	struct qla_hw_data *ha = vha->hw;



	if (!IS_FWI2_CAPABLE(ha) || IS_QLA82XX(ha))

		return QLA_FUNCTION_FAILED;



	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1155,

	    "Entered %s.\n", __func__);



	str = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &str_dma);

	if (!str) {

		ql_log(ql_log_warn, vha, 0x1156,

		    "Failed to allocate driver version param.\n");

		return QLA_MEMORY_ALLOC_FAILED;

	}



	memcpy(str, "\x7\x3\x11\x0", 4);

	dwlen = str[0];

	len = dwlen * sizeof(uint32_t) - 4;

	memset(str + 4, 0, len);

	if (len > strlen(version))

		len = strlen(version);

	memcpy(str + 4, version, len);



	mcp->mb[0] = MBC_SET_RNID_PARAMS;

	mcp->mb[1] = RNID_TYPE_SET_VERSION << 8 | dwlen;

	mcp->mb[2] = MSW(LSD(str_dma));

	mcp->mb[3] = LSW(LSD(str_dma));

	mcp->mb[6] = MSW(MSD(str_dma));

	mcp->mb[7] = LSW(MSD(str_dma));

	mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;

	mcp->in_mb = MBX_0;

	mcp->tov = MBX_TOV_SECONDS;

	mcp->flags = 0;

	rval = qla2x00_mailbox_command(vha, mcp);



	if (rval != QLA_SUCCESS) {

		ql_dbg(ql_dbg_mbx, vha, 0x1157,

		    "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);

	} else {

		ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1158,

		    "Done %s.\n", __func__);

	}



	dma_pool_free(ha->s_dma_pool, str, str_dma);



	return rval;

}



static int

qla2x00_read_asic_temperature(scsi_qla_host_t *vha, uint16_t *temp)

{