Commit 4691720f authored by Maxim Korotkov's avatar Maxim Korotkov Committed by Jakub Kicinski

bnx2: remove deadcode in bnx2_init_cpus()

The load_cpu_fw function has no error return code
and always returns zero. Checking the value returned by
this function does not make sense.
Now checking the value of the return value is misleading when reading
the code. Path with error handling was deleted in 57579f76
("bnx2: Use request_firmware()").
As a result, bnx2_init_cpus() will also return only zero
Therefore, it will be safe to change the type of functions
to void and remove checking to improving readability.

Found by Security Code and Linux Verification
Center (linuxtesting.org) with SVACE
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarMaxim Korotkov <korotkov.maxim.s@gmail.com>
Link: https://lore.kernel.org/r/20230322162843.3452-1-korotkov.maxim.s@gmail.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 0c04328c
...@@ -3828,7 +3828,7 @@ load_rv2p_fw(struct bnx2 *bp, u32 rv2p_proc, ...@@ -3828,7 +3828,7 @@ load_rv2p_fw(struct bnx2 *bp, u32 rv2p_proc,
return 0; return 0;
} }
static int static void
load_cpu_fw(struct bnx2 *bp, const struct cpu_reg *cpu_reg, load_cpu_fw(struct bnx2 *bp, const struct cpu_reg *cpu_reg,
const struct bnx2_mips_fw_file_entry *fw_entry) const struct bnx2_mips_fw_file_entry *fw_entry)
{ {
...@@ -3896,48 +3896,34 @@ load_cpu_fw(struct bnx2 *bp, const struct cpu_reg *cpu_reg, ...@@ -3896,48 +3896,34 @@ load_cpu_fw(struct bnx2 *bp, const struct cpu_reg *cpu_reg,
val &= ~cpu_reg->mode_value_halt; val &= ~cpu_reg->mode_value_halt;
bnx2_reg_wr_ind(bp, cpu_reg->state, cpu_reg->state_value_clear); bnx2_reg_wr_ind(bp, cpu_reg->state, cpu_reg->state_value_clear);
bnx2_reg_wr_ind(bp, cpu_reg->mode, val); bnx2_reg_wr_ind(bp, cpu_reg->mode, val);
return 0;
} }
static int static void
bnx2_init_cpus(struct bnx2 *bp) bnx2_init_cpus(struct bnx2 *bp)
{ {
const struct bnx2_mips_fw_file *mips_fw = const struct bnx2_mips_fw_file *mips_fw =
(const struct bnx2_mips_fw_file *) bp->mips_firmware->data; (const struct bnx2_mips_fw_file *) bp->mips_firmware->data;
const struct bnx2_rv2p_fw_file *rv2p_fw = const struct bnx2_rv2p_fw_file *rv2p_fw =
(const struct bnx2_rv2p_fw_file *) bp->rv2p_firmware->data; (const struct bnx2_rv2p_fw_file *) bp->rv2p_firmware->data;
int rc;
/* Initialize the RV2P processor. */ /* Initialize the RV2P processor. */
load_rv2p_fw(bp, RV2P_PROC1, &rv2p_fw->proc1); load_rv2p_fw(bp, RV2P_PROC1, &rv2p_fw->proc1);
load_rv2p_fw(bp, RV2P_PROC2, &rv2p_fw->proc2); load_rv2p_fw(bp, RV2P_PROC2, &rv2p_fw->proc2);
/* Initialize the RX Processor. */ /* Initialize the RX Processor. */
rc = load_cpu_fw(bp, &cpu_reg_rxp, &mips_fw->rxp); load_cpu_fw(bp, &cpu_reg_rxp, &mips_fw->rxp);
if (rc)
goto init_cpu_err;
/* Initialize the TX Processor. */ /* Initialize the TX Processor. */
rc = load_cpu_fw(bp, &cpu_reg_txp, &mips_fw->txp); load_cpu_fw(bp, &cpu_reg_txp, &mips_fw->txp);
if (rc)
goto init_cpu_err;
/* Initialize the TX Patch-up Processor. */ /* Initialize the TX Patch-up Processor. */
rc = load_cpu_fw(bp, &cpu_reg_tpat, &mips_fw->tpat); load_cpu_fw(bp, &cpu_reg_tpat, &mips_fw->tpat);
if (rc)
goto init_cpu_err;
/* Initialize the Completion Processor. */ /* Initialize the Completion Processor. */
rc = load_cpu_fw(bp, &cpu_reg_com, &mips_fw->com); load_cpu_fw(bp, &cpu_reg_com, &mips_fw->com);
if (rc)
goto init_cpu_err;
/* Initialize the Command Processor. */ /* Initialize the Command Processor. */
rc = load_cpu_fw(bp, &cpu_reg_cp, &mips_fw->cp); load_cpu_fw(bp, &cpu_reg_cp, &mips_fw->cp);
init_cpu_err:
return rc;
} }
static void static void
...@@ -4950,8 +4936,7 @@ bnx2_init_chip(struct bnx2 *bp) ...@@ -4950,8 +4936,7 @@ bnx2_init_chip(struct bnx2 *bp)
} else } else
bnx2_init_context(bp); bnx2_init_context(bp);
if ((rc = bnx2_init_cpus(bp)) != 0) bnx2_init_cpus(bp);
return rc;
bnx2_init_nvram(bp); bnx2_init_nvram(bp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment