| Message ID | 20200717205958.163031-1-kuba@kernel.org |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] net: bnxt: don't complain if TC flower can't be supported | expand |
On Fri, Jul 17, 2020 at 2:00 PM Jakub Kicinski <kuba@kernel.org> wrote: > > The fact that NETIF_F_HW_TC is not set should be a sufficient > indication to the user that TC offloads are not supported. > No need to bother users of older firmware versions with > pointless warnings on every boot. > > Also, since the support is optional, bnxt_init_tc() should not > return an error in case FW is old, similarly to how error > is not returned when CONFIG_BNXT_FLOWER_OFFLOAD is not set. > > With that we can add an error message to the caller, to warn > about actual unexpected failures. > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> Reviewed-by: Michael Chan <michael.chan@broadcom.com> Thanks.
From: Jakub Kicinski <kuba@kernel.org> Date: Fri, 17 Jul 2020 13:59:58 -0700 > The fact that NETIF_F_HW_TC is not set should be a sufficient > indication to the user that TC offloads are not supported. > No need to bother users of older firmware versions with > pointless warnings on every boot. > > Also, since the support is optional, bnxt_init_tc() should not > return an error in case FW is old, similarly to how error > is not returned when CONFIG_BNXT_FLOWER_OFFLOAD is not set. > > With that we can add an error message to the caller, to warn > about actual unexpected failures. > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> Applied, thank you.
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 0911eb3b8007..a7e5ebe2d68a 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -12086,7 +12086,10 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) goto init_err_pci_clean; } } - bnxt_init_tc(bp); + rc = bnxt_init_tc(bp); + if (rc) + netdev_err(dev, "Failed to initialize TC flower offload, err = %d.\n", + rc); } bnxt_dl_register(bp); diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c index e82e5cf64d61..5e4429b14b8c 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c @@ -2000,11 +2000,8 @@ int bnxt_init_tc(struct bnxt *bp) struct bnxt_tc_info *tc_info; int rc; - if (bp->hwrm_spec_code < 0x10803) { - netdev_warn(bp->dev, - "Firmware does not support TC flower offload.\n"); - return -ENOTSUPP; - } + if (bp->hwrm_spec_code < 0x10803) + return 0; tc_info = kzalloc(sizeof(*tc_info), GFP_KERNEL); if (!tc_info)
The fact that NETIF_F_HW_TC is not set should be a sufficient indication to the user that TC offloads are not supported. No need to bother users of older firmware versions with pointless warnings on every boot. Also, since the support is optional, bnxt_init_tc() should not return an error in case FW is old, similarly to how error is not returned when CONFIG_BNXT_FLOWER_OFFLOAD is not set. With that we can add an error message to the caller, to warn about actual unexpected failures. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 ++++- drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 7 ++----- 2 files changed, 6 insertions(+), 6 deletions(-)