mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 20:53:53 +08:00
bnxt_en: Handle firmware reset.
Add the bnxt_fw_reset() main function to handle firmware reset. This is triggered by firmware to initiate an orderly reset, for example when a non-fatal exception condition has been detected. bnxt_fw_reset() will first wait for all VFs to shutdown and then start the bnxt_fw_reset_task() work queue to go through the sequence of reset, re-probe, and re-initialization. The next patch will add the devlink reporter to start the sequence and call bnxt_fw_reset(). Signed-off-by: Michael Chan <michael.chan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
2151fe0830
commit
230d1f0de7
@ -1140,6 +1140,14 @@ static int bnxt_discard_rx(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void bnxt_queue_fw_reset_work(struct bnxt *bp, unsigned long delay)
|
||||||
|
{
|
||||||
|
if (BNXT_PF(bp))
|
||||||
|
queue_delayed_work(bnxt_pf_wq, &bp->fw_reset_task, delay);
|
||||||
|
else
|
||||||
|
schedule_delayed_work(&bp->fw_reset_task, delay);
|
||||||
|
}
|
||||||
|
|
||||||
static void bnxt_queue_sp_work(struct bnxt *bp)
|
static void bnxt_queue_sp_work(struct bnxt *bp)
|
||||||
{
|
{
|
||||||
if (BNXT_PF(bp))
|
if (BNXT_PF(bp))
|
||||||
@ -6355,6 +6363,8 @@ static int bnxt_hwrm_func_qcfg(struct bnxt *bp)
|
|||||||
struct bnxt_vf_info *vf = &bp->vf;
|
struct bnxt_vf_info *vf = &bp->vf;
|
||||||
|
|
||||||
vf->vlan = le16_to_cpu(resp->vlan) & VLAN_VID_MASK;
|
vf->vlan = le16_to_cpu(resp->vlan) & VLAN_VID_MASK;
|
||||||
|
} else {
|
||||||
|
bp->pf.registered_vfs = le16_to_cpu(resp->registered_vfs);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
flags = le16_to_cpu(resp->flags);
|
flags = le16_to_cpu(resp->flags);
|
||||||
@ -9980,6 +9990,53 @@ static void bnxt_reset(struct bnxt *bp, bool silent)
|
|||||||
bnxt_rtnl_unlock_sp(bp);
|
bnxt_rtnl_unlock_sp(bp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void bnxt_fw_reset_close(struct bnxt *bp)
|
||||||
|
{
|
||||||
|
__bnxt_close_nic(bp, true, false);
|
||||||
|
bnxt_ulp_irq_stop(bp);
|
||||||
|
bnxt_clear_int_mode(bp);
|
||||||
|
bnxt_hwrm_func_drv_unrgtr(bp);
|
||||||
|
bnxt_free_ctx_mem(bp);
|
||||||
|
kfree(bp->ctx);
|
||||||
|
bp->ctx = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
void bnxt_fw_reset(struct bnxt *bp)
|
||||||
|
{
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
bnxt_rtnl_lock_sp(bp);
|
||||||
|
if (test_bit(BNXT_STATE_OPEN, &bp->state) &&
|
||||||
|
!test_bit(BNXT_STATE_IN_FW_RESET, &bp->state)) {
|
||||||
|
set_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
|
||||||
|
if (BNXT_PF(bp) && bp->pf.active_vfs) {
|
||||||
|
rc = bnxt_hwrm_func_qcfg(bp);
|
||||||
|
if (rc) {
|
||||||
|
netdev_err(bp->dev, "Firmware reset aborted, first func_qcfg cmd failed, rc = %d\n",
|
||||||
|
rc);
|
||||||
|
clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
|
||||||
|
dev_close(bp->dev);
|
||||||
|
goto fw_reset_exit;
|
||||||
|
}
|
||||||
|
if (bp->pf.registered_vfs || bp->sriov_cfg) {
|
||||||
|
u16 vf_tmo_dsecs = bp->pf.registered_vfs * 10;
|
||||||
|
|
||||||
|
if (bp->fw_reset_max_dsecs < vf_tmo_dsecs)
|
||||||
|
bp->fw_reset_max_dsecs = vf_tmo_dsecs;
|
||||||
|
bp->fw_reset_state =
|
||||||
|
BNXT_FW_RESET_STATE_POLL_VF;
|
||||||
|
bnxt_queue_fw_reset_work(bp, HZ / 10);
|
||||||
|
goto fw_reset_exit;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
bnxt_fw_reset_close(bp);
|
||||||
|
bp->fw_reset_state = BNXT_FW_RESET_STATE_ENABLE_DEV;
|
||||||
|
bnxt_queue_fw_reset_work(bp, bp->fw_reset_min_dsecs * HZ / 10);
|
||||||
|
}
|
||||||
|
fw_reset_exit:
|
||||||
|
bnxt_rtnl_unlock_sp(bp);
|
||||||
|
}
|
||||||
|
|
||||||
static void bnxt_chk_missed_irq(struct bnxt *bp)
|
static void bnxt_chk_missed_irq(struct bnxt *bp)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
@ -10339,6 +10396,98 @@ static int bnxt_fw_init_one(struct bnxt *bp)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void bnxt_fw_reset_task(struct work_struct *work)
|
||||||
|
{
|
||||||
|
struct bnxt *bp = container_of(work, struct bnxt, fw_reset_task.work);
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
if (!test_bit(BNXT_STATE_IN_FW_RESET, &bp->state)) {
|
||||||
|
netdev_err(bp->dev, "bnxt_fw_reset_task() called when not in fw reset mode!\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (bp->fw_reset_state) {
|
||||||
|
case BNXT_FW_RESET_STATE_POLL_VF:
|
||||||
|
rc = bnxt_hwrm_func_qcfg(bp);
|
||||||
|
if (rc) {
|
||||||
|
netdev_err(bp->dev, "Firmware reset aborted, subsequent func_qcfg cmd failed, rc = %d, %d msecs since reset timestamp\n",
|
||||||
|
rc, jiffies_to_msecs(jiffies -
|
||||||
|
bp->fw_reset_timestamp));
|
||||||
|
goto fw_reset_abort;
|
||||||
|
}
|
||||||
|
if (bp->pf.registered_vfs || bp->sriov_cfg) {
|
||||||
|
if (time_after(jiffies, bp->fw_reset_timestamp +
|
||||||
|
(bp->fw_reset_max_dsecs * HZ / 10))) {
|
||||||
|
clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
|
||||||
|
bp->fw_reset_state = 0;
|
||||||
|
netdev_err(bp->dev, "Firmware reset aborted, %d VFs still registered, sriov_cfg %d\n",
|
||||||
|
bp->pf.registered_vfs,
|
||||||
|
bp->sriov_cfg);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
bnxt_queue_fw_reset_work(bp, HZ / 10);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
bp->fw_reset_timestamp = jiffies;
|
||||||
|
rtnl_lock();
|
||||||
|
bnxt_fw_reset_close(bp);
|
||||||
|
bp->fw_reset_state = BNXT_FW_RESET_STATE_ENABLE_DEV;
|
||||||
|
rtnl_unlock();
|
||||||
|
bnxt_queue_fw_reset_work(bp, bp->fw_reset_min_dsecs * HZ / 10);
|
||||||
|
return;
|
||||||
|
case BNXT_FW_RESET_STATE_ENABLE_DEV:
|
||||||
|
if (pci_enable_device(bp->pdev)) {
|
||||||
|
netdev_err(bp->dev, "Cannot re-enable PCI device\n");
|
||||||
|
goto fw_reset_abort;
|
||||||
|
}
|
||||||
|
pci_set_master(bp->pdev);
|
||||||
|
bp->fw_reset_state = BNXT_FW_RESET_STATE_POLL_FW;
|
||||||
|
/* fall through */
|
||||||
|
case BNXT_FW_RESET_STATE_POLL_FW:
|
||||||
|
bp->hwrm_cmd_timeout = SHORT_HWRM_CMD_TIMEOUT;
|
||||||
|
rc = __bnxt_hwrm_ver_get(bp, true);
|
||||||
|
if (rc) {
|
||||||
|
if (time_after(jiffies, bp->fw_reset_timestamp +
|
||||||
|
(bp->fw_reset_max_dsecs * HZ / 10))) {
|
||||||
|
netdev_err(bp->dev, "Firmware reset aborted\n");
|
||||||
|
goto fw_reset_abort;
|
||||||
|
}
|
||||||
|
bnxt_queue_fw_reset_work(bp, HZ / 5);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
bp->hwrm_cmd_timeout = DFLT_HWRM_CMD_TIMEOUT;
|
||||||
|
bp->fw_reset_state = BNXT_FW_RESET_STATE_OPENING;
|
||||||
|
/* fall through */
|
||||||
|
case BNXT_FW_RESET_STATE_OPENING:
|
||||||
|
while (!rtnl_trylock()) {
|
||||||
|
bnxt_queue_fw_reset_work(bp, HZ / 10);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
rc = bnxt_open(bp->dev);
|
||||||
|
if (rc) {
|
||||||
|
netdev_err(bp->dev, "bnxt_open_nic() failed\n");
|
||||||
|
clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
|
||||||
|
dev_close(bp->dev);
|
||||||
|
}
|
||||||
|
bnxt_ulp_irq_restart(bp, rc);
|
||||||
|
rtnl_unlock();
|
||||||
|
|
||||||
|
bp->fw_reset_state = 0;
|
||||||
|
/* Make sure fw_reset_state is 0 before clearing the flag */
|
||||||
|
smp_mb__before_atomic();
|
||||||
|
clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
|
||||||
|
fw_reset_abort:
|
||||||
|
clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
|
||||||
|
bp->fw_reset_state = 0;
|
||||||
|
rtnl_lock();
|
||||||
|
dev_close(bp->dev);
|
||||||
|
rtnl_unlock();
|
||||||
|
}
|
||||||
|
|
||||||
static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev)
|
static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
@ -10401,6 +10550,7 @@ static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev)
|
|||||||
pci_enable_pcie_error_reporting(pdev);
|
pci_enable_pcie_error_reporting(pdev);
|
||||||
|
|
||||||
INIT_WORK(&bp->sp_task, bnxt_sp_task);
|
INIT_WORK(&bp->sp_task, bnxt_sp_task);
|
||||||
|
INIT_DELAYED_WORK(&bp->fw_reset_task, bnxt_fw_reset_task);
|
||||||
|
|
||||||
spin_lock_init(&bp->ntp_fltr_lock);
|
spin_lock_init(&bp->ntp_fltr_lock);
|
||||||
#if BITS_PER_LONG == 32
|
#if BITS_PER_LONG == 32
|
||||||
|
@ -640,6 +640,7 @@ struct nqe_cn {
|
|||||||
#define BNXT_HWRM_MAX_REQ_LEN (bp->hwrm_max_req_len)
|
#define BNXT_HWRM_MAX_REQ_LEN (bp->hwrm_max_req_len)
|
||||||
#define BNXT_HWRM_SHORT_REQ_LEN sizeof(struct hwrm_short_input)
|
#define BNXT_HWRM_SHORT_REQ_LEN sizeof(struct hwrm_short_input)
|
||||||
#define DFLT_HWRM_CMD_TIMEOUT 500
|
#define DFLT_HWRM_CMD_TIMEOUT 500
|
||||||
|
#define SHORT_HWRM_CMD_TIMEOUT 20
|
||||||
#define HWRM_CMD_TIMEOUT (bp->hwrm_cmd_timeout)
|
#define HWRM_CMD_TIMEOUT (bp->hwrm_cmd_timeout)
|
||||||
#define HWRM_RESET_TIMEOUT ((HWRM_CMD_TIMEOUT) * 4)
|
#define HWRM_RESET_TIMEOUT ((HWRM_CMD_TIMEOUT) * 4)
|
||||||
#define HWRM_RESP_ERR_CODE_MASK 0xffff
|
#define HWRM_RESP_ERR_CODE_MASK 0xffff
|
||||||
@ -1066,6 +1067,7 @@ struct bnxt_pf_info {
|
|||||||
u8 mac_addr[ETH_ALEN];
|
u8 mac_addr[ETH_ALEN];
|
||||||
u32 first_vf_id;
|
u32 first_vf_id;
|
||||||
u16 active_vfs;
|
u16 active_vfs;
|
||||||
|
u16 registered_vfs;
|
||||||
u16 max_vfs;
|
u16 max_vfs;
|
||||||
u32 max_encap_records;
|
u32 max_encap_records;
|
||||||
u32 max_decap_records;
|
u32 max_decap_records;
|
||||||
@ -1721,6 +1723,14 @@ struct bnxt {
|
|||||||
#define BNXT_RING_COAL_NOW_SP_EVENT 17
|
#define BNXT_RING_COAL_NOW_SP_EVENT 17
|
||||||
#define BNXT_FW_RESET_NOTIFY_SP_EVENT 18
|
#define BNXT_FW_RESET_NOTIFY_SP_EVENT 18
|
||||||
|
|
||||||
|
struct delayed_work fw_reset_task;
|
||||||
|
int fw_reset_state;
|
||||||
|
#define BNXT_FW_RESET_STATE_POLL_VF 1
|
||||||
|
#define BNXT_FW_RESET_STATE_RESET_FW 2
|
||||||
|
#define BNXT_FW_RESET_STATE_ENABLE_DEV 3
|
||||||
|
#define BNXT_FW_RESET_STATE_POLL_FW 4
|
||||||
|
#define BNXT_FW_RESET_STATE_OPENING 5
|
||||||
|
|
||||||
u16 fw_reset_min_dsecs;
|
u16 fw_reset_min_dsecs;
|
||||||
#define BNXT_DFLT_FW_RST_MIN_DSECS 20
|
#define BNXT_DFLT_FW_RST_MIN_DSECS 20
|
||||||
u16 fw_reset_max_dsecs;
|
u16 fw_reset_max_dsecs;
|
||||||
@ -1966,6 +1976,7 @@ int bnxt_open_nic(struct bnxt *, bool, bool);
|
|||||||
int bnxt_half_open_nic(struct bnxt *bp);
|
int bnxt_half_open_nic(struct bnxt *bp);
|
||||||
void bnxt_half_close_nic(struct bnxt *bp);
|
void bnxt_half_close_nic(struct bnxt *bp);
|
||||||
int bnxt_close_nic(struct bnxt *, bool, bool);
|
int bnxt_close_nic(struct bnxt *, bool, bool);
|
||||||
|
void bnxt_fw_reset(struct bnxt *bp);
|
||||||
int bnxt_check_rings(struct bnxt *bp, int tx, int rx, bool sh, int tcs,
|
int bnxt_check_rings(struct bnxt *bp, int tx, int rx, bool sh, int tcs,
|
||||||
int tx_xdp);
|
int tx_xdp);
|
||||||
int bnxt_setup_mq_tc(struct net_device *dev, u8 tc);
|
int bnxt_setup_mq_tc(struct net_device *dev, u8 tc);
|
||||||
|
@ -226,6 +226,9 @@ static int bnxt_send_msg(struct bnxt_en_dev *edev, int ulp_id,
|
|||||||
struct input *req;
|
struct input *req;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
|
if (ulp_id != BNXT_ROCE_ULP && bp->fw_reset_state)
|
||||||
|
return -EBUSY;
|
||||||
|
|
||||||
mutex_lock(&bp->hwrm_cmd_lock);
|
mutex_lock(&bp->hwrm_cmd_lock);
|
||||||
req = fw_msg->msg;
|
req = fw_msg->msg;
|
||||||
req->resp_addr = cpu_to_le64(bp->hwrm_cmd_resp_dma_addr);
|
req->resp_addr = cpu_to_le64(bp->hwrm_cmd_resp_dma_addr);
|
||||||
|
Loading…
Reference in New Issue
Block a user