[BNX2]: Support NVRAM on 5709.

The NVRAM interface is slightly modified on the 5709.  To properly
support it, we need to change the buffered flag in the flash data
structure into multiple flags to indicate buffered operation, address
translation, and the use of write enable (WREN).  The 5709 flash
only requires the buffered operation bit to be set.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index d8cd1afeb23d..102adfe1e923 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -6433,6 +6433,11 @@ struct sw_bd {
 #define ST_MICRO_FLASH_PAGE_SIZE                256
 #define ST_MICRO_FLASH_BASE_TOTAL_SIZE          65536
 
+#define BCM5709_FLASH_PAGE_BITS                 8
+#define BCM5709_FLASH_PHY_PAGE_SIZE             (1 << BCM5709_FLASH_PAGE_BITS)
+#define BCM5709_FLASH_BYTE_ADDR_MASK            (BCM5709_FLASH_PHY_PAGE_SIZE-1)
+#define BCM5709_FLASH_PAGE_SIZE                 256
+
 #define NVRAM_TIMEOUT_COUNT                     30000
 
 
@@ -6449,7 +6454,10 @@ struct flash_spec {
         u32 config2;
         u32 config3;
         u32 write1;
-        u32 buffered;
+        u32 flags;
+#define BNX2_NV_BUFFERED        0x00000001
+#define BNX2_NV_TRANSLATE       0x00000002
+#define BNX2_NV_WREN            0x00000004
         u32 page_bits;
         u32 page_size;
         u32 addr_mask;