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

Commit f8d54811 authored by Sritej Velaga's avatar Sritej Velaga Committed by David S. Miller
Browse files

qlcnic: Use flt method to determine flash fw region 



Use flash layout table to get flash fw starting address and its size.
If that fails, use legacy method.

Signed-off-by: default avatarSritej Velaga <sritej.velaga@qlogic.com>
Signed-off-by: default avatarAnirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8816d009

drivers/net/qlcnic/qlcnic.h

+2 −1
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ struct uni_data_desc{ 
/* Flash Defines and Structures */

#define QLCNIC_FLT_LOCATION	0x3F1000

#define QLCNIC_FW_IMAGE_REGION	0x74

#define QLCNIC_BOOTLD_REGION    0X72

struct qlcnic_flt_header {

	u16 version;

	u16 len;
@@ -306,7 +307,7 @@ struct qlcnic_flt_entry { 
	u8 reserved1;

	u32 size;

	u32 start_addr;

	u32 end_add;

	u32 end_addr;

};



/* Magic number to let user know flash is programmed */

drivers/net/qlcnic/qlcnic_init.c

+14 −3
Original line number Diff line number Diff line
@@ -1130,9 +1130,20 @@ qlcnic_load_firmware(struct qlcnic_adapter *adapter) 
	} else {

		u64 data;

		u32 hi, lo;

		int ret;

		struct qlcnic_flt_entry bootld_entry;



		ret = qlcnic_get_flt_entry(adapter, QLCNIC_BOOTLD_REGION,

					&bootld_entry);

		if (!ret) {

			size = bootld_entry.size / 8;

			flashaddr = bootld_entry.start_addr;

		} else {

			size = (QLCNIC_IMAGE_START - QLCNIC_BOOTLD_START) / 8;

			flashaddr = QLCNIC_BOOTLD_START;

			dev_info(&pdev->dev,

				"using legacy method to get flash fw region");

		}



		for (i = 0; i < size; i++) {

			if (qlcnic_rom_fast_read(adapter,