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: Sritej Velaga <sritej.velaga@qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 16 insertions, 4 deletions

diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h
index 9d2e630c3895..d9dd2c40c92f 100644
--- a/drivers/net/qlcnic/qlcnic.h
+++ b/drivers/net/qlcnic/qlcnic.h
@@ -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 */
diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/qlcnic/qlcnic_init.c
index 74ec96da1762..4ec0eeb6bff9 100644
--- a/drivers/net/qlcnic/qlcnic_init.c
+++ b/drivers/net/qlcnic/qlcnic_init.c
@@ -1130,9 +1130,20 @@ qlcnic_load_firmware(struct qlcnic_adapter *adapter)
         } else {
                 u64 data;
                 u32 hi, lo;
-
-                size = (QLCNIC_IMAGE_START - QLCNIC_BOOTLD_START) / 8;
-                flashaddr = QLCNIC_BOOTLD_START;
+                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,