mirror of
https://github.com/torvalds/linux.git
synced 2026-06-02 11:33:28 +02:00
bnxt_en: Remove the read of BNXT_FW_RESET_INPROG_REG after firmware reset.
Once the chip goes through reset, the register mapping may be lost and any read of the mapped health registers may return garbage value until the registers are mapped again in the init path. Reading BNXT_FW_RESET_INPROG_REG after firmware reset will likely return garbage value due to the above reason. Reading this register is for information purpose only so remove it. Reviewed-by: Edwin Peer <edwin.peer@broadcom.com> Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com> Signed-off-by: Michael Chan <michael.chan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
2924ad95cb
commit
bae8a00379
|
|
@ -11769,28 +11769,19 @@ static void bnxt_fw_reset_task(struct work_struct *work)
|
|||
return;
|
||||
case BNXT_FW_RESET_STATE_ENABLE_DEV:
|
||||
bnxt_inv_fw_health_reg(bp);
|
||||
if (test_bit(BNXT_STATE_FW_FATAL_COND, &bp->state)) {
|
||||
u32 val;
|
||||
if (test_bit(BNXT_STATE_FW_FATAL_COND, &bp->state) &&
|
||||
!bp->fw_reset_min_dsecs) {
|
||||
u16 val;
|
||||
|
||||
if (!bp->fw_reset_min_dsecs) {
|
||||
u16 val;
|
||||
|
||||
pci_read_config_word(bp->pdev, PCI_SUBSYSTEM_ID,
|
||||
&val);
|
||||
if (val == 0xffff) {
|
||||
if (bnxt_fw_reset_timeout(bp)) {
|
||||
netdev_err(bp->dev, "Firmware reset aborted, PCI config space invalid\n");
|
||||
goto fw_reset_abort;
|
||||
}
|
||||
bnxt_queue_fw_reset_work(bp, HZ / 1000);
|
||||
return;
|
||||
pci_read_config_word(bp->pdev, PCI_SUBSYSTEM_ID, &val);
|
||||
if (val == 0xffff) {
|
||||
if (bnxt_fw_reset_timeout(bp)) {
|
||||
netdev_err(bp->dev, "Firmware reset aborted, PCI config space invalid\n");
|
||||
goto fw_reset_abort;
|
||||
}
|
||||
bnxt_queue_fw_reset_work(bp, HZ / 1000);
|
||||
return;
|
||||
}
|
||||
val = bnxt_fw_health_readl(bp,
|
||||
BNXT_FW_RESET_INPROG_REG);
|
||||
if (val)
|
||||
netdev_warn(bp->dev, "FW reset inprog %x after min wait time.\n",
|
||||
val);
|
||||
}
|
||||
clear_bit(BNXT_STATE_FW_FATAL_COND, &bp->state);
|
||||
if (pci_enable_device(bp->pdev)) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user