From b61356a7765fb10c6b2b1d205755d553a84d7fb4 Mon Sep 17 00:00:00 2001
From: Santosh Vernekar <santosh.vernekar@qlogic.com>
Date: Fri, 19 Mar 2010 16:59:16 -0700
Subject: [PATCH] --- yaml --- r: 189487 b: refs/heads/master c:
 cad454b12a23c24fd7f409402cf51434655e76c1 h: refs/heads/master i:   189485:
 b076fff8428bd15d1bb36401cad32496962df129   189483:
 2e29d8cbddc6850364bcc5c5bdc54106e35f2227   189479:
 566f3bb12649d7140b4ea152edafa36e9c4176df   189471:
 ab240d50b2a0920ab5984ef2d4d6c4880368feef v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/scsi/qla2xxx/qla_fw.h  | 18 +++++++++++++++---
 trunk/drivers/scsi/qla2xxx/qla_mbx.c |  8 +++++++-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index eae81d0bc8a8..4f07c649aec9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d88a714bfefa7aed7b9cb6c3721707fcd056b472
+refs/heads/master: cad454b12a23c24fd7f409402cf51434655e76c1
diff --git a/trunk/drivers/scsi/qla2xxx/qla_fw.h b/trunk/drivers/scsi/qla2xxx/qla_fw.h
index cebf4f1bb7d9..42c5587cc50c 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_fw.h
+++ b/trunk/drivers/scsi/qla2xxx/qla_fw.h
@@ -1592,10 +1592,22 @@ struct nvram_81xx {
 
 	/* Offset 384. */
 	uint8_t reserved_21[16];
-	uint16_t reserved_22[8];
+	uint16_t reserved_22[3];
+
+	/*
+	 * BIT 0 = Extended BB credits for LR
+	 * BIT 1 = Virtual Fabric Enable
+	 * BIT 2 = Enhanced Features Unused
+	 * BIT 3-7 = Enhanced Features Reserved
+	 */
+	/* Enhanced Features */
+	uint8_t enhanced_features;
+
+	uint8_t reserved_23;
+	uint16_t reserved_24[4];
 
 	/* Offset 416. */
-	uint16_t reserved_23[32];
+	uint16_t reserved_25[32];
 
 	/* Offset 480. */
 	uint8_t model_name[16];
@@ -1603,7 +1615,7 @@ struct nvram_81xx {
 	/* Offset 496. */
 	uint16_t feature_mask_l;
 	uint16_t feature_mask_h;
-	uint16_t reserved_24[2];
+	uint16_t reserved_26[2];
 
 	uint16_t subsystem_vendor_id;
 	uint16_t subsystem_device_id;
diff --git a/trunk/drivers/scsi/qla2xxx/qla_mbx.c b/trunk/drivers/scsi/qla2xxx/qla_mbx.c
index 6e53bdbb1da8..3ba9a2b56556 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_mbx.c
@@ -339,6 +339,7 @@ qla2x00_load_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t risc_addr,
 	return rval;
 }
 
+#define	EXTENDED_BB_CREDITS	BIT_0
 /*
  * qla2x00_execute_fw
  *     Start adapter firmware.
@@ -371,7 +372,12 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)
 		mcp->mb[1] = MSW(risc_addr);
 		mcp->mb[2] = LSW(risc_addr);
 		mcp->mb[3] = 0;
-		mcp->mb[4] = 0;
+		if (IS_QLA81XX(ha)) {
+			struct nvram_81xx *nv = ha->nvram;
+			mcp->mb[4] = (nv->enhanced_features &
+			    EXTENDED_BB_CREDITS);
+		} else
+			mcp->mb[4] = 0;
 		mcp->out_mb |= MBX_4|MBX_3|MBX_2|MBX_1;
 		mcp->in_mb |= MBX_1;
 	} else {