tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

bnx2x: Use firmware 5.2.13

Switch to the new firmware version (5.2.13).

Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Vladislav Zolotarov and committed by
David S. Miller 3359fced 2db29fc7

+28 -16
+2 -2
drivers/net/bnx2x.h
··· 1 1 /* bnx2x.h: Broadcom Everest network driver. 2 2 * 3 - * Copyright (c) 2007-2009 Broadcom Corporation 3 + * Copyright (c) 2007-2010 Broadcom Corporation 4 4 * 5 5 * This program is free software; you can redistribute it and/or modify 6 6 * it under the terms of the GNU General Public License as published by ··· 130 130 offset, len32); \ 131 131 } while (0) 132 132 133 - #define VIRT_WR_DMAE_LEN(bp, data, addr, len32) \ 133 + #define VIRT_WR_DMAE_LEN(bp, data, addr, len32, le32_swap) \ 134 134 do { \ 135 135 memcpy(GUNZIP_BUF(bp), data, (len32) * 4); \ 136 136 bnx2x_write_big_buf_wb(bp, addr, len32); \
+6 -1
drivers/net/bnx2x_fw_defs.h
··· 1 1 /* bnx2x_fw_defs.h: Broadcom Everest network driver. 2 2 * 3 - * Copyright (c) 2007-2009 Broadcom Corporation 3 + * Copyright (c) 2007-2010 Broadcom Corporation 4 4 * 5 5 * This program is free software; you can redistribute it and/or modify 6 6 * it under the terms of the GNU General Public License as published by ··· 471 471 472 472 473 473 /* Host coalescing constants */ 474 + #define HC_IGU_BC_MODE 0 475 + #define HC_IGU_NBC_MODE 1 476 + 477 + #define HC_REGULAR_SEGMENT 0 478 + #define HC_DEFAULT_SEGMENT 1 474 479 475 480 /* index numbers */ 476 481 #define HC_USTORM_DEF_SB_NUM_INDICES 8
+6 -4
drivers/net/bnx2x_hsi.h
··· 1 1 /* bnx2x_hsi.h: Broadcom Everest network driver. 2 2 * 3 - * Copyright (c) 2007-2009 Broadcom Corporation 3 + * Copyright (c) 2007-2010 Broadcom Corporation 4 4 * 5 5 * This program is free software; you can redistribute it and/or modify 6 6 * it under the terms of the GNU General Public License as published by ··· 1261 1261 1262 1262 #define BCM_5710_FW_MAJOR_VERSION 5 1263 1263 #define BCM_5710_FW_MINOR_VERSION 2 1264 - #define BCM_5710_FW_REVISION_VERSION 7 1264 + #define BCM_5710_FW_REVISION_VERSION 13 1265 1265 #define BCM_5710_FW_ENGINEERING_VERSION 0 1266 1266 #define BCM_5710_FW_COMPILE_FLAGS 1 1267 1267 ··· 2433 2433 u8 ramrod_type; 2434 2434 #define COMMON_RAMROD_ETH_RX_CQE_TYPE (0x1<<0) 2435 2435 #define COMMON_RAMROD_ETH_RX_CQE_TYPE_SHIFT 0 2436 - #define COMMON_RAMROD_ETH_RX_CQE_RESERVED0 (0x7F<<1) 2437 - #define COMMON_RAMROD_ETH_RX_CQE_RESERVED0_SHIFT 1 2436 + #define COMMON_RAMROD_ETH_RX_CQE_ERROR (0x1<<1) 2437 + #define COMMON_RAMROD_ETH_RX_CQE_ERROR_SHIFT 1 2438 + #define COMMON_RAMROD_ETH_RX_CQE_RESERVED0 (0x3F<<2) 2439 + #define COMMON_RAMROD_ETH_RX_CQE_RESERVED0_SHIFT 2 2438 2440 u8 conn_type; 2439 2441 __le16 reserved1; 2440 2442 __le32 conn_and_cmd_data;
+9 -4
drivers/net/bnx2x_init_ops.h
··· 2 2 * Static functions needed during the initialization. 3 3 * This file is "included" in bnx2x_main.c. 4 4 * 5 - * Copyright (c) 2007-2009 Broadcom Corporation 5 + * Copyright (c) 2007-2010 Broadcom Corporation 6 6 * 7 7 * This program is free software; you can redistribute it and/or modify 8 8 * it under the terms of the GNU General Public License as published by ··· 138 138 static void bnx2x_init_wr_wb(struct bnx2x *bp, u32 addr, const u32 *data, 139 139 u32 len) 140 140 { 141 + const u32 *old_data = data; 142 + 141 143 data = (const u32 *)bnx2x_sel_blob(bp, addr, (const u8 *)data); 142 144 143 - if (bp->dmae_ready) 144 - VIRT_WR_DMAE_LEN(bp, data, addr, len); 145 - else 145 + if (bp->dmae_ready) { 146 + if (old_data != data) 147 + VIRT_WR_DMAE_LEN(bp, data, addr, len, 1); 148 + else 149 + VIRT_WR_DMAE_LEN(bp, data, addr, len, 0); 150 + } else 146 151 bnx2x_init_ind_wr(bp, addr, data, len); 147 152 } 148 153
+1 -1
drivers/net/bnx2x_main.c
··· 1 1 /* bnx2x_main.c: Broadcom Everest network driver. 2 2 * 3 - * Copyright (c) 2007-2009 Broadcom Corporation 3 + * Copyright (c) 2007-2010 Broadcom Corporation 4 4 * 5 5 * This program is free software; you can redistribute it and/or modify 6 6 * it under the terms of the GNU General Public License as published by
+1 -1
firmware/Makefile
··· 32 32 adaptec/starfire_tx.bin 33 33 fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin 34 34 fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw 35 - fw-shipped-$(CONFIG_BNX2X) += bnx2x-e1-5.2.7.0.fw bnx2x-e1h-5.2.7.0.fw 35 + fw-shipped-$(CONFIG_BNX2X) += bnx2x-e1-5.2.13.0.fw bnx2x-e1h-5.2.13.0.fw 36 36 fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-5.0.0.j9.fw \ 37 37 bnx2/bnx2-rv2p-09-5.0.0.j10.fw \ 38 38 bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw \
+3 -3
firmware/WHENCE
··· 679 679 680 680 Driver: bnx2x: Broadcom Everest 681 681 682 - File: bnx2x-e1-5.2.7.0.fw.ihex 683 - File: bnx2x-e1h-5.2.7.0.fw.ihex 682 + File: bnx2x-e1-5.2.13.0.fw 683 + File: bnx2x-e1h-5.2.13.0.fw 684 684 685 685 License: 686 - Copyright (c) 2007-2009 Broadcom Corporation 686 + Copyright (c) 2007-2010 Broadcom Corporation 687 687 688 688 This file contains firmware data derived from proprietary unpublished 689 689 source code, Copyright (c) 2007-2009 Broadcom Corporation.