mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
fm10k: Only trigger data path reset if fabric is up
This change makes it so that we only trigger the data path reset if the fabric is ready to handle traffic. The general idea is to avoid triggering the reset unless the switch API is ready for us. Otherwise we can just postpone the reset until we receive a switch ready notification. Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com> Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
parent
95f4f8da64
commit
ac98100359
1 changed files with 6 additions and 0 deletions
|
@ -59,6 +59,11 @@ static s32 fm10k_reset_hw_pf(struct fm10k_hw *hw)
|
||||||
if (reg & (FM10K_DMA_CTRL_TX_ACTIVE | FM10K_DMA_CTRL_RX_ACTIVE))
|
if (reg & (FM10K_DMA_CTRL_TX_ACTIVE | FM10K_DMA_CTRL_RX_ACTIVE))
|
||||||
return FM10K_ERR_DMA_PENDING;
|
return FM10K_ERR_DMA_PENDING;
|
||||||
|
|
||||||
|
/* verify the switch is ready for reset */
|
||||||
|
reg = fm10k_read_reg(hw, FM10K_DMA_CTRL2);
|
||||||
|
if (!(reg & FM10K_DMA_CTRL2_SWITCH_READY))
|
||||||
|
goto out;
|
||||||
|
|
||||||
/* Inititate data path reset */
|
/* Inititate data path reset */
|
||||||
reg |= FM10K_DMA_CTRL_DATAPATH_RESET;
|
reg |= FM10K_DMA_CTRL_DATAPATH_RESET;
|
||||||
fm10k_write_reg(hw, FM10K_DMA_CTRL, reg);
|
fm10k_write_reg(hw, FM10K_DMA_CTRL, reg);
|
||||||
|
@ -72,6 +77,7 @@ static s32 fm10k_reset_hw_pf(struct fm10k_hw *hw)
|
||||||
if (!(reg & FM10K_IP_NOTINRESET))
|
if (!(reg & FM10K_IP_NOTINRESET))
|
||||||
err = FM10K_ERR_RESET_FAILED;
|
err = FM10K_ERR_RESET_FAILED;
|
||||||
|
|
||||||
|
out:
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue