be2net: bug fix for flashing the BladeEngine3 ASIC
Subsystems (2)
PATCH 2/7 be2net: bug fix for flashing the BladeEngine3 ASIC
Now flashing both BE2 and BE3 devices is supported.
From: Naresh G <[email protected]>
Signed-off-by Ajit Khaparde <[email protected]>
--- drivers/net/benet/be_cmds.c | 9 +- drivers/net/benet/be_cmds.h | 3 +- drivers/net/benet/be_hw.h | 119 +++++++++++++++------- drivers/net/benet/be_main.c | 239 +++++++++++++++++++++++-------------------- 4 files changed, 217 insertions(+), 153 deletions(-)
drivers/net/benet/be_cmds.c +5 -4
@@ -1374,7 +1374,7 @@ int be_cmd_write_flashrom(struct be_adapter *adapter, struct be_dma_mem *cmd, u32 flash_type, u32 flash_opcode, u32 buf_size) { struct be_mcc_wrb *wrb; -struct be_cmd_write_flashrom *req = cmd->va; +struct be_cmd_write_flashrom *req;struct be_sge *sge;int status;
@@ -1408,7 +1408,8 @@ err:return status; } -int be_cmd_get_flash_crc (struct be_adapter *adapter,u8 *flashed_crc) +int be_cmd_get_flash_crc (struct be_adapter *adapter,u8 *flashed_crc, +int offset) {struct be_mcc_wrb *wrb;struct be_cmd_write_flashrom *req;
@@ -1429,9 +1430,9 @@ int be_cmd_get_flash_crc(struct be_adapter *adapter, u8 *flashed_crc)be_cmd_hdr_prepare (&req->hdr,CMD_SUBSYSTEM_COMMON ,OPCODE_COMMON_READ_FLASHROM ,sizeof (*req)+4 ); - req->params.op_type =cpu_to_le32 (FLASHROM_TYPE_REDBOOT ); + req->params.op_type =cpu_to_le32 (IMG_TYPE_REDBOOT ); req->params.op_code =cpu_to_le32 (FLASHROM_OPER_REPORT ); - req->params.offset =0x3FFFC ; + req->params.offset = offset; req->params.data_buf_size =0x4 ; status =be_mcc_notify_wait (adapter);
drivers/net/benet/be_cmds.h +2 -1
@@ -917,7 +917,8 @@ extern int be_cmd_read_port_type(struct be_adapter *adapter, u32 port,extern int be_cmd_write_flashrom (struct be_adapter *adapter,struct be_dma_mem *cmd,u32 flash_oper,u32 flash_opcode,u32 buf_size); -extern int be_cmd_get_flash_crc (struct be_adapter *adapter,u8 *flashed_crc); +int be_cmd_get_flash_crc (struct be_adapter *adapter,u8 *flashed_crc, +int offset);extern int be_cmd_enable_magic_wol (struct be_adapter *adapter,u8 *mac,struct be_dma_mem *nonemb_cmd);extern int be_cmd_fw_init (struct be_adapter *adapter);
drivers/net/benet/be_hw.h +83 -36
149 lines not on this page · raw message
drivers/net/benet/be_main.c +127 -112
290 lines not on this page · raw message
Signature · 1 line
1.6.3.3
From: Ajit Khaparde <[email protected]>
Date: Tue, 9 Feb 2010 17:00:35 +0530
Quoted 4 lines
Now flashing both BE2 and BE3 devices is supported.
From: Naresh G <[email protected]>
Signed-off-by Ajit Khaparde <[email protected]>
Applied to net-next-2.6