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

Commit ad1ef177 authored by Joe Carnuccio's avatar Joe Carnuccio Committed by Martin K. Petersen
Browse files

qla2xxx: Add ram area DDR for fwdump template entry T262. 



Signed-off-by: default avatarJoe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@qlogic.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f1d7ce65

drivers/scsi/qla2xxx/qla_def.h

+2 −0
Original line number Diff line number Diff line
@@ -3370,6 +3370,8 @@ struct qla_hw_data { 


	uint32_t	fw_shared_ram_start;

	uint32_t	fw_shared_ram_end;

	uint32_t	fw_ddr_ram_start;

	uint32_t	fw_ddr_ram_end;



	uint16_t	fw_options[16];         /* slots: 1,2,3,10,11 */

	uint8_t		fw_seriallink_options[4];

drivers/scsi/qla2xxx/qla_mbx.c

+5 −2
Original line number Diff line number Diff line
@@ -782,8 +782,9 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha) 
	if (IS_FWI2_CAPABLE(ha))

		mcp->in_mb |= MBX_17|MBX_16|MBX_15;

	if (IS_QLA27XX(ha))

		mcp->in_mb |= MBX_23 | MBX_22 | MBX_21 | MBX_20 | MBX_19 |

		    MBX_18 | MBX_14 | MBX_13 | MBX_11 | MBX_10 | MBX_9 | MBX_8;

		mcp->in_mb |=

		    MBX_25|MBX_24|MBX_23|MBX_22|MBX_21|MBX_20|MBX_19|MBX_18|

		    MBX_14|MBX_13|MBX_11|MBX_10|MBX_9|MBX_8;



	mcp->flags = 0;

	mcp->tov = MBX_TOV_SECONDS;
@@ -842,6 +843,8 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha) 
		ha->pep_version[2] = mcp->mb[14] & 0xff;

		ha->fw_shared_ram_start = (mcp->mb[19] << 16) | mcp->mb[18];

		ha->fw_shared_ram_end = (mcp->mb[21] << 16) | mcp->mb[20];

		ha->fw_ddr_ram_start = (mcp->mb[23] << 16) | mcp->mb[22];

		ha->fw_ddr_ram_end = (mcp->mb[25] << 16) | mcp->mb[24];

	}



failed:

drivers/scsi/qla2xxx/qla_tmpl.c

+8 −1
Original line number Diff line number Diff line
@@ -357,6 +357,13 @@ qla27xx_fwdt_entry_t262(struct scsi_qla_host *vha, 
			ent->t262.start_addr = start;

			ent->t262.end_addr = end;

		}

	} else if (ent->t262.ram_area == T262_RAM_AREA_DDR_RAM) {

		start = vha->hw->fw_ddr_ram_start;

		end = vha->hw->fw_ddr_ram_end;

		if (buf) {

			ent->t262.start_addr = start;

			ent->t262.end_addr = end;

		}

	} else {

		ql_dbg(ql_dbg_misc, vha, 0xd022,

		    "%s: unknown area %x\n", __func__, ent->t262.ram_area);
@@ -364,7 +371,7 @@ qla27xx_fwdt_entry_t262(struct scsi_qla_host *vha, 
		goto done;

	}



	if (end < start || end == 0) {

	if (end <= start || start == 0 || end == 0) {

		ql_dbg(ql_dbg_misc, vha, 0xd023,

		    "%s: unusable range (start=%x end=%x)\n", __func__,

		    ent->t262.end_addr, ent->t262.start_addr);