From 8d33b5b927e14c8db0288bc147301ce2829b0e4a Mon Sep 17 00:00:00 2001
From: Sritej Velaga <sritej.velaga@qlogic.com>
Date: Mon, 29 Aug 2011 12:50:28 +0000
Subject: [PATCH] --- yaml --- r: 265703 b: refs/heads/master c:
 a2050c7eeef034521f34df9cb896e72ea6802331 h: refs/heads/master i:   265701:
 eefc10f7d6fe0260b7ea460fa28ef5009d90955d   265699:
 6aab41359671968c41e60057506c8afb64c91436   265695:
 ae49627391fd4835e6dd3a55b850c206a07407c9 v: v3

---
 [refs]                                                 | 2 +-
 trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h      | 4 +++-
 trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 8 +++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2d446d12b67f..329416fc9c20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df3cfbe30bcd8ddfbbac2d0893c53b6d048dd1f8
+refs/heads/master: a2050c7eeef034521f34df9cb896e72ea6802331
diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index 53c6e5dcf26c..4118502ef295 100644
--- a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -73,6 +73,7 @@
 	(sizeof(struct cmd_desc_type0) * tx_ring->num_desc)
 
 #define QLCNIC_P3P_A0		0x50
+#define QLCNIC_P3P_C0		0x58
 
 #define QLCNIC_IS_REVISION_P3P(REVISION)     (REVISION >= QLCNIC_P3P_A0)
 
@@ -291,7 +292,8 @@ struct uni_data_desc{
 
 /* Flash Defines and Structures */
 #define QLCNIC_FLT_LOCATION	0x3F1000
-#define QLCNIC_FW_IMAGE_REGION	0x74
+#define QLCNIC_B0_FW_IMAGE_REGION 0x74
+#define QLCNIC_C0_FW_IMAGE_REGION 0x97
 #define QLCNIC_BOOTLD_REGION    0X72
 struct qlcnic_flt_header {
 	u16 version;
diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
index b02859c7a23d..7f4b8e69079a 100644
--- a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
+++ b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
@@ -686,7 +686,13 @@ qlcnic_check_flash_fw_ver(struct qlcnic_adapter *adapter)
 	u32 ver = -1, min_ver;
 	int ret;
 
-	ret = qlcnic_get_flt_entry(adapter, QLCNIC_FW_IMAGE_REGION, &fw_entry);
+	if (adapter->ahw->revision_id == QLCNIC_P3P_C0)
+		ret = qlcnic_get_flt_entry(adapter, QLCNIC_C0_FW_IMAGE_REGION,
+						 &fw_entry);
+	else
+		ret = qlcnic_get_flt_entry(adapter, QLCNIC_B0_FW_IMAGE_REGION,
+						 &fw_entry);
+
 	if (!ret)
 		/* 0-4:-signature,  4-8:-fw version */
 		qlcnic_rom_fast_read(adapter, fw_entry.start_addr + 4,