Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/24994/?format=api
{ "id": 24994, "url": "https://patches.dpdk.org/api/patches/24994/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20170601170723.48709-10-ajit.khaparde@broadcom.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20170601170723.48709-10-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20170601170723.48709-10-ajit.khaparde@broadcom.com", "date": "2017-06-01T17:07:06", "name": "[dpdk-dev,v4,09/26] net/bnxt: add support for set multicast addr list and MAC addr set", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "e2caecb18da4089ab384ac48a08e69b76d43ed22", "submitter": { "id": 501, "url": "https://patches.dpdk.org/api/people/501/?format=api", "name": "Ajit Khaparde", "email": "ajit.khaparde@broadcom.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20170601170723.48709-10-ajit.khaparde@broadcom.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/24994/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/24994/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 22B5D7D18;\n\tThu, 1 Jun 2017 19:08:03 +0200 (CEST)", "from rnd-relay.smtp.broadcom.com (lpdvrndsmtp01.broadcom.com\n\t[192.19.229.170]) by dpdk.org (Postfix) with ESMTP id BB4187CC4\n\tfor <dev@dpdk.org>; Thu, 1 Jun 2017 19:07:43 +0200 (CEST)", "from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net\n\t[10.75.224.233])\n\tby rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 9F51730C01A;\n\tThu, 1 Jun 2017 10:07:42 -0700 (PDT)", "from C02PT1RBG8WP.wifi.broadcom.net (c02pt1rbg8wp.wifi.broadcom.net\n\t[10.45.51.51])\n\tby mail-irv-17.broadcom.com (Postfix) with ESMTP id 3CE8C81EB5;\n\tThu, 1 Jun 2017 10:07:42 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 9F51730C01A", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n\ts=dkimrelay; t=1496336862;\n\tbh=0ktBlZsRjCgvBZlzUvzSvl9ED3KJrzpKJYt8IdR+9PQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=igmDusSgdZLgmuz3obrt+ZUPNhF48g7Y95xGNYTRmnGSRxOwX4bWx429UcK8Aoqtf\n\tl4BLU0pAxg+f7/U3iWz3UzYXBalpyE6AievOcZt96A0O7T6IsMLjfKfVvPVtdHF0iD\n\tFNxWJaOH/ph3diobj/cKVgXKDkmXi01GfuLr+Hsg=", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com", "Date": "Thu, 1 Jun 2017 12:07:06 -0500", "Message-Id": "<20170601170723.48709-10-ajit.khaparde@broadcom.com>", "X-Mailer": "git-send-email 2.10.1 (Apple Git-78)", "In-Reply-To": "<20170601170723.48709-1-ajit.khaparde@broadcom.com>", "References": "<20170601030232.38677-1-ajit.khaparde@broadcom.com>\n\t<20170601170723.48709-1-ajit.khaparde@broadcom.com>", "Subject": "[dpdk-dev] [PATCH v4 09/26] net/bnxt: add support for set multicast\n\taddr list and MAC addr set", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This patch adds support for set_mc_addr_list and\nmac_addr_set dev_ops\n\nSigned-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\n--\nv1->v2: regroup related patches and incorporate other review comments\n\nv2->v3:\n - rebasing to next-net tree\n - Use net/bnxt instead of just bnxt in patch subject\n - Split the patch to document \"Allmulticast mode\" in bnxt.ini\n---\n drivers/net/bnxt/bnxt_ethdev.c | 74 ++++++++++++++++++++++++++++++++++++++++--\n drivers/net/bnxt/bnxt_hwrm.c | 13 +++++---\n drivers/net/bnxt/bnxt_hwrm.h | 2 +-\n drivers/net/bnxt/bnxt_vnic.c | 7 +++-\n drivers/net/bnxt/bnxt_vnic.h | 4 +++\n 5 files changed, 91 insertions(+), 9 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex 5073cd8..ef14fb9 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -638,7 +638,7 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,\n \tSTAILQ_INSERT_TAIL(&vnic->filter, filter, next);\n \tfilter->mac_index = index;\n \tmemcpy(filter->l2_addr, mac_addr, ETHER_ADDR_LEN);\n-\treturn bnxt_hwrm_set_filter(bp, vnic, filter);\n+\treturn bnxt_hwrm_set_filter(bp, vnic->fw_vnic_id, filter);\n }\n \n int bnxt_link_update_op(struct rte_eth_dev *eth_dev, int wait_to_complete)\n@@ -1155,7 +1155,7 @@ static int bnxt_del_vlan_filter(struct bnxt *bp, uint16_t vlan_id)\n \t\t\t\t\t filter->l2_addr, ETHER_ADDR_LEN);\n \t\t\t\t\t/* MAC only filter */\n \t\t\t\t\trc = bnxt_hwrm_set_filter(bp,\n-\t\t\t\t\t\t\tvnic,\n+\t\t\t\t\t\t\tvnic->fw_vnic_id,\n \t\t\t\t\t\t\tnew_filter);\n \t\t\t\t\tif (rc)\n \t\t\t\t\t\tgoto exit;\n@@ -1229,7 +1229,7 @@ static int bnxt_add_vlan_filter(struct bnxt *bp, uint16_t vlan_id)\n \t\t\t\tnew_filter->l2_ovlan = vlan_id;\n \t\t\t\tnew_filter->l2_ovlan_mask = 0xF000;\n \t\t\t\tnew_filter->enables |= en;\n-\t\t\t\trc = bnxt_hwrm_set_filter(bp, vnic,\n+\t\t\t\trc = bnxt_hwrm_set_filter(bp, vnic->fw_vnic_id,\n \t\t\t\t\t\t\t new_filter);\n \t\t\t\tif (rc)\n \t\t\t\t\tgoto exit;\n@@ -1290,6 +1290,72 @@ bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask)\n \t\tRTE_LOG(ERR, PMD, \"Extend VLAN Not supported\\n\");\n }\n \n+static void\n+bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev, struct ether_addr *addr)\n+{\n+\tstruct bnxt *bp = (struct bnxt *)dev->data->dev_private;\n+\t/* Default Filter is tied to VNIC 0 */\n+\tstruct bnxt_vnic_info *vnic = &bp->vnic_info[0];\n+\tstruct bnxt_filter_info *filter;\n+\tint rc;\n+\n+\tif (BNXT_VF(bp))\n+\t\treturn;\n+\n+\tmemcpy(bp->mac_addr, addr, sizeof(bp->mac_addr));\n+\tmemcpy(&dev->data->mac_addrs[0], bp->mac_addr, ETHER_ADDR_LEN);\n+\n+\tSTAILQ_FOREACH(filter, &vnic->filter, next) {\n+\t\t/* Default Filter is at Index 0 */\n+\t\tif (filter->mac_index != 0)\n+\t\t\tcontinue;\n+\t\trc = bnxt_hwrm_clear_filter(bp, filter);\n+\t\tif (rc)\n+\t\t\tbreak;\n+\t\tmemcpy(filter->l2_addr, bp->mac_addr, ETHER_ADDR_LEN);\n+\t\tmemset(filter->l2_addr_mask, 0xff, ETHER_ADDR_LEN);\n+\t\tfilter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX;\n+\t\tfilter->enables |=\n+\t\t\tHWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR |\n+\t\t\tHWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR_MASK;\n+\t\trc = bnxt_hwrm_set_filter(bp, vnic->fw_vnic_id, filter);\n+\t\tif (rc)\n+\t\t\tbreak;\n+\t\tfilter->mac_index = 0;\n+\t\tRTE_LOG(DEBUG, PMD, \"Set MAC addr\\n\");\n+\t}\n+}\n+\n+static int\n+bnxt_dev_set_mc_addr_list_op(struct rte_eth_dev *eth_dev,\n+\t\t\t struct ether_addr *mc_addr_set,\n+\t\t\t uint32_t nb_mc_addr)\n+{\n+\tstruct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;\n+\tchar *mc_addr_list = (char *)mc_addr_set;\n+\tstruct bnxt_vnic_info *vnic;\n+\tuint32_t off = 0, i = 0;\n+\n+\tvnic = &bp->vnic_info[0];\n+\n+\tif (nb_mc_addr > BNXT_MAX_MC_ADDRS) {\n+\t\tvnic->flags |= BNXT_VNIC_INFO_ALLMULTI;\n+\t\tgoto allmulti;\n+\t}\n+\n+\t/* TODO Check for Duplicate mcast addresses */\n+\tvnic->flags &= ~BNXT_VNIC_INFO_ALLMULTI;\n+\tfor (i = 0; i < nb_mc_addr; i++) {\n+\t\tmemcpy(vnic->mc_list + off, &mc_addr_list[i], ETHER_ADDR_LEN);\n+\t\toff += ETHER_ADDR_LEN;\n+\t}\n+\n+\tvnic->mc_addr_cnt = i;\n+\n+allmulti:\n+\treturn bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic);\n+}\n+\n /*\n * Initialization\n */\n@@ -1325,9 +1391,11 @@ static const struct eth_dev_ops bnxt_dev_ops = {\n \t.udp_tunnel_port_del = bnxt_udp_tunnel_port_del_op,\n \t.vlan_filter_set = bnxt_vlan_filter_set_op,\n \t.vlan_offload_set = bnxt_vlan_offload_set_op,\n+\t.mac_addr_set = bnxt_set_default_mac_addr_op,\n \t.xstats_get = bnxt_dev_xstats_get_op,\n \t.xstats_get_names = bnxt_dev_xstats_get_names_op,\n \t.xstats_reset = bnxt_dev_xstats_reset_op,\n+\t.set_mc_addr_list = bnxt_dev_set_mc_addr_list_op,\n };\n \n static bool bnxt_vf_pciid(uint16_t id)\ndiff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c\nindex d942648..22e18d6 100644\n--- a/drivers/net/bnxt/bnxt_hwrm.c\n+++ b/drivers/net/bnxt/bnxt_hwrm.c\n@@ -229,7 +229,12 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, struct bnxt_vnic_info *vnic)\n \tif (vnic->flags & BNXT_VNIC_INFO_PROMISC)\n \t\tmask = HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_PROMISCUOUS;\n \tif (vnic->flags & BNXT_VNIC_INFO_ALLMULTI)\n-\t\tmask = HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_ALL_MCAST;\n+\t\tmask |= HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_ALL_MCAST;\n+\tif (vnic->mc_addr_cnt) {\n+\t\tmask |= HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_MCAST;\n+\t\treq.num_mc_entries = rte_cpu_to_le_32(vnic->mc_addr_cnt);\n+\t\treq.mc_tbl_addr = rte_cpu_to_le_64(vnic->mc_list_dma_addr);\n+\t}\n \treq.mask = rte_cpu_to_le_32(HWRM_CFA_L2_SET_RX_MASK_INPUT_MASK_BCAST |\n \t\t\t\t mask);\n \n@@ -261,7 +266,7 @@ int bnxt_hwrm_clear_filter(struct bnxt *bp,\n }\n \n int bnxt_hwrm_set_filter(struct bnxt *bp,\n-\t\t\t struct bnxt_vnic_info *vnic,\n+\t\t\t uint16_t dst_id,\n \t\t\t struct bnxt_filter_info *filter)\n {\n \tint rc = 0;\n@@ -275,7 +280,7 @@ int bnxt_hwrm_set_filter(struct bnxt *bp,\n \n \tenables = filter->enables |\n \t HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_DST_ID;\n-\treq.dst_id = rte_cpu_to_le_16(vnic->fw_vnic_id);\n+\treq.dst_id = rte_cpu_to_le_16(dst_id);\n \n \tif (enables &\n \t HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR)\n@@ -1419,7 +1424,7 @@ int bnxt_set_hwrm_vnic_filters(struct bnxt *bp, struct bnxt_vnic_info *vnic)\n \tint rc = 0;\n \n \tSTAILQ_FOREACH(filter, &vnic->filter, next) {\n-\t\trc = bnxt_hwrm_set_filter(bp, vnic, filter);\n+\t\trc = bnxt_hwrm_set_filter(bp, vnic->fw_vnic_id, filter);\n \t\tif (rc)\n \t\t\tbreak;\n \t}\ndiff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h\nindex 8f7d103..c15404f 100644\n--- a/drivers/net/bnxt/bnxt_hwrm.h\n+++ b/drivers/net/bnxt/bnxt_hwrm.h\n@@ -49,7 +49,7 @@ int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, struct bnxt_vnic_info *vnic);\n int bnxt_hwrm_clear_filter(struct bnxt *bp,\n \t\t\t struct bnxt_filter_info *filter);\n int bnxt_hwrm_set_filter(struct bnxt *bp,\n-\t\t\t struct bnxt_vnic_info *vnic,\n+\t\t\t uint16_t dst_id,\n \t\t\t struct bnxt_filter_info *filter);\n int bnxt_hwrm_exec_fwd_resp(struct bnxt *bp, uint16_t target_id,\n \t\t\t void *encaped, size_t ec_size);\ndiff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c\nindex fe2244b..db9fb07 100644\n--- a/drivers/net/bnxt/bnxt_vnic.c\n+++ b/drivers/net/bnxt/bnxt_vnic.c\n@@ -170,7 +170,8 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)\n \tchar mz_name[RTE_MEMZONE_NAMESIZE];\n \tuint32_t entry_length = RTE_CACHE_LINE_ROUNDUP(\n \t\t\t\tHW_HASH_INDEX_SIZE * sizeof(*vnic->rss_table) +\n-\t\t\t\tHW_HASH_KEY_SIZE);\n+\t\t\t\tHW_HASH_KEY_SIZE +\n+\t\t\t\tBNXT_MAX_MC_ADDRS * ETHER_ADDR_LEN);\n \tuint16_t max_vnics;\n \tint i;\n \tphys_addr_t mz_phys_addr;\n@@ -218,6 +219,10 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)\n \n \t\tvnic->rss_hash_key_dma_addr = vnic->rss_table_dma_addr +\n \t\t\t HW_HASH_INDEX_SIZE * sizeof(*vnic->rss_table);\n+\t\tvnic->mc_list = (void *)((char *)vnic->rss_hash_key +\n+\t\t\t\tHW_HASH_KEY_SIZE);\n+\t\tvnic->mc_list_dma_addr = vnic->rss_hash_key_dma_addr +\n+\t\t\t\tHW_HASH_KEY_SIZE;\n \t}\n \n \treturn 0;\ndiff --git a/drivers/net/bnxt/bnxt_vnic.h b/drivers/net/bnxt/bnxt_vnic.h\nindex ca1c9cf..0d50224 100644\n--- a/drivers/net/bnxt/bnxt_vnic.h\n+++ b/drivers/net/bnxt/bnxt_vnic.h\n@@ -57,6 +57,10 @@ struct bnxt_vnic_info {\n \tuint16_t\t*rss_table;\n \tphys_addr_t\trss_hash_key_dma_addr;\n \tvoid\t\t*rss_hash_key;\n+\tphys_addr_t\tmc_list_dma_addr;\n+\tchar\t\t*mc_list;\n+\tuint32_t\tmc_addr_cnt;\n+#define BNXT_MAX_MC_ADDRS\t\t16\n \tuint32_t\tflags;\n #define BNXT_VNIC_INFO_PROMISC\t\t\t(1 << 0)\n #define BNXT_VNIC_INFO_ALLMULTI\t\t\t(1 << 1)\n", "prefixes": [ "dpdk-dev", "v4", "09/26" ] }