Create an additional auxiliary device to support fwctl. The next patch will create bnxt_fwctl and bind to this device. Reviewed-by: Andy Gospodarek Signed-off-by: Pavan Chebbi --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 ++ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 63 ++++++++++++++++++- include/linux/bnxt/ulp.h | 1 + 4 files changed, 68 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index bd567f776fe8..82301fc4f53b 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -16185,11 +16185,13 @@ static void bnxt_remove_one(struct pci_dev *pdev) __bnxt_sriov_disable(bp); bnxt_aux_device_del(bp, BNXT_AUXDEV_RDMA); + bnxt_aux_device_del(bp, BNXT_AUXDEV_FWCTL); unregister_netdev(dev); bnxt_ptp_clear(bp); bnxt_aux_device_uninit(bp, BNXT_AUXDEV_RDMA); + bnxt_aux_device_uninit(bp, BNXT_AUXDEV_FWCTL); bnxt_free_l2_filters(bp, true); bnxt_free_ntp_fltrs(bp, true); @@ -16776,6 +16778,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) bnxt_init_ring_params(bp); bnxt_set_ring_params(bp); bnxt_aux_device_init(bp, BNXT_AUXDEV_RDMA); + bnxt_aux_device_init(bp, BNXT_AUXDEV_FWCTL); rc = bnxt_set_dflt_rings(bp, true); if (rc) { if (BNXT_VF(bp) && rc == -ENODEV) { @@ -16840,6 +16843,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) bnxt_dl_fw_reporters_create(bp); bnxt_aux_device_add(bp, BNXT_AUXDEV_RDMA); + bnxt_aux_device_add(bp, BNXT_AUXDEV_FWCTL); bnxt_print_device_info(bp); @@ -16848,6 +16852,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) return 0; init_err_cleanup: bnxt_aux_device_uninit(bp, BNXT_AUXDEV_RDMA); + bnxt_aux_device_uninit(bp, BNXT_AUXDEV_FWCTL); bnxt_dl_unregister(bp); init_err_dl: bnxt_shutdown_tc(bp); diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index b3cba97bb9ea..ea1d10c50da6 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -2345,6 +2345,8 @@ struct bnxt { struct bnxt_napi **bnapi; + struct bnxt_en_dev *edev_fwctl; + struct bnxt_aux_priv *aux_priv_fwctl; struct bnxt_rx_ring_info *rx_ring; struct bnxt_tx_ring_info *tx_ring; u16 *tx_ring_map; diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c index 8009964da698..7fe8848ac9fc 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c @@ -28,6 +28,7 @@ #include "bnxt_hwrm.h" static DEFINE_IDA(bnxt_rdma_aux_dev_ids); +static DEFINE_IDA(bnxt_fwctl_aux_dev_ids); struct bnxt_aux_device { const char *name; @@ -42,6 +43,7 @@ struct bnxt_aux_device { }; static void bnxt_rdma_aux_dev_release(struct device *dev); +static void bnxt_fwctl_aux_dev_release(struct device *dev); static void bnxt_rdma_aux_dev_set_priv(struct bnxt *bp, struct bnxt_aux_priv *priv) @@ -70,6 +72,33 @@ static struct bnxt_en_dev *bnxt_rdma_aux_dev_get_edev(struct bnxt *bp) return bp->edev_rdma; } +static void bnxt_fwctl_aux_dev_set_priv(struct bnxt *bp, + struct bnxt_aux_priv *priv) +{ + bp->aux_priv_fwctl = priv; +} + +static struct bnxt_aux_priv *bnxt_fwctl_aux_dev_get_priv(struct bnxt *bp) +{ + return bp->aux_priv_fwctl; +} + +static struct auxiliary_device *bnxt_fwctl_aux_dev_get_auxdev(struct bnxt *bp) +{ + return &bp->aux_priv_fwctl->aux_dev; +} + +static void bnxt_fwctl_aux_dev_set_edev(struct bnxt *bp, + struct bnxt_en_dev *edev) +{ + bp->edev_fwctl = edev; +} + +static struct bnxt_en_dev *bnxt_fwctl_aux_dev_get_edev(struct bnxt *bp) +{ + return bp->edev_fwctl; +} + static struct bnxt_aux_device bnxt_aux_devices[__BNXT_AUXDEV_MAX] = {{ .name = "rdma", .type = BNXT_AUXDEV_RDMA, @@ -80,6 +109,16 @@ static struct bnxt_aux_device bnxt_aux_devices[__BNXT_AUXDEV_MAX] = {{ .set_edev = bnxt_rdma_aux_dev_set_edev, .get_edev = bnxt_rdma_aux_dev_get_edev, .get_auxdev = bnxt_rdma_aux_dev_get_auxdev, +}, { + .name = "fwctl", + .type = BNXT_AUXDEV_FWCTL, + .ida = &bnxt_fwctl_aux_dev_ids, + .release = bnxt_fwctl_aux_dev_release, + .set_priv = bnxt_fwctl_aux_dev_set_priv, + .get_priv = bnxt_fwctl_aux_dev_get_priv, + .set_edev = bnxt_fwctl_aux_dev_set_edev, + .get_edev = bnxt_fwctl_aux_dev_get_edev, + .get_auxdev = bnxt_fwctl_aux_dev_get_auxdev, }}; static void bnxt_fill_msix_vecs(struct bnxt *bp, struct bnxt_msix_entry *ent) @@ -303,6 +342,8 @@ void bnxt_ulp_stop(struct bnxt *bp) } } ulp_stop_exit: + if (bp->edev_fwctl) + bp->edev_fwctl->flags |= BNXT_EN_FLAG_ULP_STOPPED; mutex_unlock(&edev->en_dev_lock); } @@ -336,6 +377,8 @@ void bnxt_ulp_start(struct bnxt *bp, int err) } ulp_start_exit: edev->flags &= ~BNXT_EN_FLAG_ULP_STOPPED; + if (bp->edev_fwctl) + bp->edev_fwctl->flags &= ~BNXT_EN_FLAG_ULP_STOPPED; mutex_unlock(&edev->en_dev_lock); } @@ -525,13 +568,27 @@ void bnxt_aux_device_add(struct bnxt *bp, enum bnxt_ulp_auxdev_type auxdev_type) aux_dev = bnxt_aux_devices[auxdev_type].get_auxdev(bp); rc = auxiliary_device_add(aux_dev); if (rc) { - netdev_warn(bp->dev, "Failed to add auxiliary device for ROCE\n"); + netdev_warn(bp->dev, "Failed to add auxiliary device for auxdev type %d\n", + auxdev_type); auxiliary_device_uninit(aux_dev); if (bnxt_aux_devices[auxdev_type].type == BNXT_AUXDEV_RDMA) bp->flags &= ~BNXT_FLAG_ROCE_CAP; } } +static void bnxt_fwctl_aux_dev_release(struct device *dev) +{ + struct bnxt_aux_priv *aux_priv = + container_of(dev, struct bnxt_aux_priv, aux_dev.dev); + struct bnxt *bp = netdev_priv(aux_priv->edev->net); + + ida_free(&bnxt_fwctl_aux_dev_ids, aux_priv->id); + kfree(aux_priv->edev); + bp->edev_fwctl = NULL; + kfree(bp->aux_priv_fwctl); + bp->aux_priv_fwctl = NULL; +} + void bnxt_aux_device_init(struct bnxt *bp, enum bnxt_ulp_auxdev_type auxdev_type) { @@ -556,8 +613,8 @@ void bnxt_aux_device_init(struct bnxt *bp, aux_priv->id = ida_alloc(bnxt_aux_devices[auxdev_type].ida, GFP_KERNEL); if (aux_priv->id < 0) { - netdev_warn(bp->dev, - "ida alloc failed for ROCE auxiliary device\n"); + netdev_warn(bp->dev, "ida alloc failed for %d auxiliary device\n", + auxdev_type); kfree(aux_priv); goto exit; } diff --git a/include/linux/bnxt/ulp.h b/include/linux/bnxt/ulp.h index 01b7100dcf4d..b1ec40cf00fa 100644 --- a/include/linux/bnxt/ulp.h +++ b/include/linux/bnxt/ulp.h @@ -22,6 +22,7 @@ struct bnxt; enum bnxt_ulp_auxdev_type { BNXT_AUXDEV_RDMA = 0, + BNXT_AUXDEV_FWCTL, __BNXT_AUXDEV_MAX }; -- 2.39.1