* [dpdk-dev] [PATCH 0/3] updates for bnxt PMD @ 2019-12-02 4:18 Kalesh A P 2019-12-02 4:18 ` [dpdk-dev] [PATCH 1/3] net/bnxt: rework code to select chip type Kalesh A P ` (3 more replies) 0 siblings, 4 replies; 5+ messages in thread From: Kalesh A P @ 2019-12-02 4:18 UTC (permalink / raw) To: dev; +Cc: ferruh.yigit, ajit.khaparde From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> This series contains code cleanup patches for bnxt PMD. Please apply. Kalesh AP (3): net/bnxt: rework code to select chip type net/bnxt: remove an unnecessary log net/bnxt: use macro for getting default vnic drivers/net/bnxt/bnxt_ethdev.c | 91 +++++++++++++++++++++++------------------- drivers/net/bnxt/bnxt_hwrm.c | 1 - 2 files changed, 51 insertions(+), 41 deletions(-) -- 2.10.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [dpdk-dev] [PATCH 1/3] net/bnxt: rework code to select chip type 2019-12-02 4:18 [dpdk-dev] [PATCH 0/3] updates for bnxt PMD Kalesh A P @ 2019-12-02 4:18 ` Kalesh A P 2019-12-02 4:18 ` [dpdk-dev] [PATCH 2/3] net/bnxt: remove an unnecessary log Kalesh A P ` (2 subsequent siblings) 3 siblings, 0 replies; 5+ messages in thread From: Kalesh A P @ 2019-12-02 4:18 UTC (permalink / raw) To: dev; +Cc: ferruh.yigit, ajit.khaparde From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Use switch-case statement to replace if-else statement. Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com> --- drivers/net/bnxt/bnxt_ethdev.c | 73 ++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 41848f3..081bb46 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4028,49 +4028,60 @@ static void bnxt_cancel_fw_health_check(struct bnxt *bp) bp->flags &= ~BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED; } -static bool bnxt_vf_pciid(uint16_t id) +static bool bnxt_vf_pciid(uint16_t device_id) { - if (id == BROADCOM_DEV_ID_57304_VF || - id == BROADCOM_DEV_ID_57406_VF || - id == BROADCOM_DEV_ID_5731X_VF || - id == BROADCOM_DEV_ID_5741X_VF || - id == BROADCOM_DEV_ID_57414_VF || - id == BROADCOM_DEV_ID_STRATUS_NIC_VF1 || - id == BROADCOM_DEV_ID_STRATUS_NIC_VF2 || - id == BROADCOM_DEV_ID_58802_VF || - id == BROADCOM_DEV_ID_57500_VF1 || - id == BROADCOM_DEV_ID_57500_VF2) + switch (device_id) { + case BROADCOM_DEV_ID_57304_VF: + case BROADCOM_DEV_ID_57406_VF: + case BROADCOM_DEV_ID_5731X_VF: + case BROADCOM_DEV_ID_5741X_VF: + case BROADCOM_DEV_ID_57414_VF: + case BROADCOM_DEV_ID_STRATUS_NIC_VF1: + case BROADCOM_DEV_ID_STRATUS_NIC_VF2: + case BROADCOM_DEV_ID_58802_VF: + case BROADCOM_DEV_ID_57500_VF1: + case BROADCOM_DEV_ID_57500_VF2: + /* FALLTHROUGH */ return true; - return false; + default: + return false; + } } -static bool bnxt_thor_device(uint16_t id) +static bool bnxt_thor_device(uint16_t device_id) { - if (id == BROADCOM_DEV_ID_57508 || - id == BROADCOM_DEV_ID_57504 || - id == BROADCOM_DEV_ID_57502 || - id == BROADCOM_DEV_ID_57508_MF1 || - id == BROADCOM_DEV_ID_57504_MF1 || - id == BROADCOM_DEV_ID_57502_MF1 || - id == BROADCOM_DEV_ID_57508_MF2 || - id == BROADCOM_DEV_ID_57504_MF2 || - id == BROADCOM_DEV_ID_57502_MF2 || - id == BROADCOM_DEV_ID_57500_VF1 || - id == BROADCOM_DEV_ID_57500_VF2) + switch (device_id) { + case BROADCOM_DEV_ID_57508: + case BROADCOM_DEV_ID_57504: + case BROADCOM_DEV_ID_57502: + case BROADCOM_DEV_ID_57508_MF1: + case BROADCOM_DEV_ID_57504_MF1: + case BROADCOM_DEV_ID_57502_MF1: + case BROADCOM_DEV_ID_57508_MF2: + case BROADCOM_DEV_ID_57504_MF2: + case BROADCOM_DEV_ID_57502_MF2: + case BROADCOM_DEV_ID_57500_VF1: + case BROADCOM_DEV_ID_57500_VF2: + /* FALLTHROUGH */ return true; - - return false; + default: + return false; + } } bool bnxt_stratus_device(struct bnxt *bp) { - uint16_t id = bp->pdev->id.device_id; + uint16_t device_id = bp->pdev->id.device_id; - if (id == BROADCOM_DEV_ID_STRATUS_NIC || - id == BROADCOM_DEV_ID_STRATUS_NIC_VF1 || - id == BROADCOM_DEV_ID_STRATUS_NIC_VF2) + switch (device_id) { + case BROADCOM_DEV_ID_STRATUS_NIC: + case BROADCOM_DEV_ID_STRATUS_NIC_VF1: + case BROADCOM_DEV_ID_STRATUS_NIC_VF2: + /* FALLTHROUGH */ return true; - return false; + default: + return false; + } } static int bnxt_init_board(struct rte_eth_dev *eth_dev) -- 2.10.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [dpdk-dev] [PATCH 2/3] net/bnxt: remove an unnecessary log 2019-12-02 4:18 [dpdk-dev] [PATCH 0/3] updates for bnxt PMD Kalesh A P 2019-12-02 4:18 ` [dpdk-dev] [PATCH 1/3] net/bnxt: rework code to select chip type Kalesh A P @ 2019-12-02 4:18 ` Kalesh A P 2019-12-02 4:18 ` [dpdk-dev] [PATCH 3/3] net/bnxt: use macro for getting default vnic Kalesh A P 2019-12-05 18:10 ` [dpdk-dev] [PATCH 0/3] updates for bnxt PMD Ajit Khaparde 3 siblings, 0 replies; 5+ messages in thread From: Kalesh A P @ 2019-12-02 4:18 UTC (permalink / raw) To: dev; +Cc: ferruh.yigit, ajit.khaparde From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Remove an unnecessary log while deleting EM filters. Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com> --- drivers/net/bnxt/bnxt_hwrm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 4173008..b1f908e 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -4192,7 +4192,6 @@ int bnxt_hwrm_clear_em_filter(struct bnxt *bp, struct bnxt_filter_info *filter) if (filter->fw_em_filter_id == UINT64_MAX) return 0; - PMD_DRV_LOG(ERR, "Clear EM filter\n"); HWRM_PREP(req, CFA_EM_FLOW_FREE, BNXT_USE_KONG(bp)); req.em_filter_id = rte_cpu_to_le_64(filter->fw_em_filter_id); -- 2.10.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [dpdk-dev] [PATCH 3/3] net/bnxt: use macro for getting default vnic 2019-12-02 4:18 [dpdk-dev] [PATCH 0/3] updates for bnxt PMD Kalesh A P 2019-12-02 4:18 ` [dpdk-dev] [PATCH 1/3] net/bnxt: rework code to select chip type Kalesh A P 2019-12-02 4:18 ` [dpdk-dev] [PATCH 2/3] net/bnxt: remove an unnecessary log Kalesh A P @ 2019-12-02 4:18 ` Kalesh A P 2019-12-05 18:10 ` [dpdk-dev] [PATCH 0/3] updates for bnxt PMD Ajit Khaparde 3 siblings, 0 replies; 5+ messages in thread From: Kalesh A P @ 2019-12-02 4:18 UTC (permalink / raw) To: dev; +Cc: ferruh.yigit, ajit.khaparde From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> BNXT_GET_DEFAULT_VNIC macro returns the default VNIC of the function and fixed all occurrences of code to use the macro. Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com> --- drivers/net/bnxt/bnxt_ethdev.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 081bb46..c70b072 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1271,7 +1271,7 @@ static int bnxt_reta_update_op(struct rte_eth_dev *eth_dev, { struct bnxt *bp = eth_dev->data->dev_private; struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf; - struct bnxt_vnic_info *vnic = &bp->vnic_info[0]; + struct bnxt_vnic_info *vnic = BNXT_GET_DEFAULT_VNIC(bp); uint16_t tbl_size = bnxt_rss_hash_tbl_size(bp); uint16_t idx, sft; int i, rc; @@ -1328,7 +1328,7 @@ static int bnxt_reta_query_op(struct rte_eth_dev *eth_dev, uint16_t reta_size) { struct bnxt *bp = eth_dev->data->dev_private; - struct bnxt_vnic_info *vnic = &bp->vnic_info[0]; + struct bnxt_vnic_info *vnic = BNXT_GET_DEFAULT_VNIC(bp); uint16_t tbl_size = bnxt_rss_hash_tbl_size(bp); uint16_t idx, sft, i; int rc; @@ -1402,7 +1402,7 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev, memcpy(&bp->rss_conf, rss_conf, sizeof(*rss_conf)); /* Update the default RSS VNIC(s) */ - vnic = &bp->vnic_info[0]; + vnic = BNXT_GET_DEFAULT_VNIC(bp); vnic->hash_type = bnxt_rte_to_hwrm_hash_types(rss_conf->rss_hf); /* @@ -1428,7 +1428,7 @@ static int bnxt_rss_hash_conf_get_op(struct rte_eth_dev *eth_dev, struct rte_eth_rss_conf *rss_conf) { struct bnxt *bp = eth_dev->data->dev_private; - struct bnxt_vnic_info *vnic = &bp->vnic_info[0]; + struct bnxt_vnic_info *vnic = BNXT_GET_DEFAULT_VNIC(bp); int len, rc; uint32_t hash_types; @@ -1964,7 +1964,7 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, { struct bnxt *bp = dev->data->dev_private; /* Default Filter is tied to VNIC 0 */ - struct bnxt_vnic_info *vnic = &bp->vnic_info[0]; + struct bnxt_vnic_info *vnic = BNXT_GET_DEFAULT_VNIC(bp); struct bnxt_filter_info *filter; int rc; @@ -2378,7 +2378,7 @@ bnxt_match_and_validate_ether_filter(struct bnxt *bp, goto exit; } - vnic0 = &bp->vnic_info[0]; + vnic0 = BNXT_GET_DEFAULT_VNIC(bp); vnic = &bp->vnic_info[efilter->queue]; if (vnic == NULL) { PMD_DRV_LOG(ERR, "Invalid queue %d\n", efilter->queue); @@ -2437,7 +2437,7 @@ bnxt_ethertype_filter(struct rte_eth_dev *dev, return -EINVAL; } - vnic0 = &bp->vnic_info[0]; + vnic0 = BNXT_GET_DEFAULT_VNIC(bp); vnic = &bp->vnic_info[efilter->queue]; switch (filter_op) { @@ -2652,7 +2652,7 @@ bnxt_cfg_ntuple_filter(struct bnxt *bp, goto free_filter; vnic = &bp->vnic_info[nfilter->queue]; - vnic0 = &bp->vnic_info[0]; + vnic0 = BNXT_GET_DEFAULT_VNIC(bp); filter1 = STAILQ_FIRST(&vnic0->filter); if (filter1 == NULL) { ret = -EINVAL; @@ -2945,7 +2945,7 @@ bnxt_parse_fdir_filter(struct bnxt *bp, return -EINVAL; } - vnic0 = &bp->vnic_info[0]; + vnic0 = BNXT_GET_DEFAULT_VNIC(bp); vnic = &bp->vnic_info[fdir->action.rx_queue]; if (vnic == NULL) { PMD_DRV_LOG(ERR, "Invalid queue %d\n", fdir->action.rx_queue); -- 2.10.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [dpdk-dev] [PATCH 0/3] updates for bnxt PMD 2019-12-02 4:18 [dpdk-dev] [PATCH 0/3] updates for bnxt PMD Kalesh A P ` (2 preceding siblings ...) 2019-12-02 4:18 ` [dpdk-dev] [PATCH 3/3] net/bnxt: use macro for getting default vnic Kalesh A P @ 2019-12-05 18:10 ` Ajit Khaparde 3 siblings, 0 replies; 5+ messages in thread From: Ajit Khaparde @ 2019-12-05 18:10 UTC (permalink / raw) To: Kalesh A P; +Cc: dpdk-dev, Ferruh Yigit On Sun, Dec 1, 2019 at 8:06 PM Kalesh A P < kalesh-anakkur.purayil@broadcom.com> wrote: > From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> > > This series contains code cleanup patches for bnxt PMD. > > Please apply. > Patches applied to dpdk-next-net-brcm. Thanks > > Kalesh AP (3): > net/bnxt: rework code to select chip type > net/bnxt: remove an unnecessary log > net/bnxt: use macro for getting default vnic > > drivers/net/bnxt/bnxt_ethdev.c | 91 > +++++++++++++++++++++++------------------- > drivers/net/bnxt/bnxt_hwrm.c | 1 - > 2 files changed, 51 insertions(+), 41 deletions(-) > > -- > 2.10.1 > > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-12-05 18:10 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-12-02 4:18 [dpdk-dev] [PATCH 0/3] updates for bnxt PMD Kalesh A P 2019-12-02 4:18 ` [dpdk-dev] [PATCH 1/3] net/bnxt: rework code to select chip type Kalesh A P 2019-12-02 4:18 ` [dpdk-dev] [PATCH 2/3] net/bnxt: remove an unnecessary log Kalesh A P 2019-12-02 4:18 ` [dpdk-dev] [PATCH 3/3] net/bnxt: use macro for getting default vnic Kalesh A P 2019-12-05 18:10 ` [dpdk-dev] [PATCH 0/3] updates for bnxt PMD Ajit Khaparde
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).