From patchwork Wed Jan 29 06:42:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil Kumar Kori X-Patchwork-Id: 65285 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 40E08A0524; Wed, 29 Jan 2020 07:42:56 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EB5451D150; Wed, 29 Jan 2020 07:42:54 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id AC8B71D14D for ; Wed, 29 Jan 2020 07:42:53 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 00T6algj016767 for ; Tue, 28 Jan 2020 22:42:52 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0818; bh=IQBQRFAXwFJKlRq/XsLW7Q9rWR7jOtuSVKqonRECKW0=; b=pfpiHk2TKQ1tUWWYduw9flmvk40kaYifOhQJVsFEnzUAn4mCawt0+E7JtfjnARoZDSBb Z/XHCqUUGGUcAjwbPaewQZO7iAfBWij+8a3fTXP9+IloJXyvoOZArx5dYu4YjztrI4xy j81NJRVqOTi+s8SUZjwF+NjUzSugqYqAJfL1JTrlzy7kbzcE8Knbp6GzfwxvYLzDsefw kKPOKCkubhs3BpxPAxLM0/Q36/6WYhbTU4HMXJqlW40nqL4i5FzJnf/6e/ceejJp+a2p AyWn3ePYQpYuGkPH0GFs3eBe/ddfJc3clQDd2DsctLwE/hAgW96vJCkCxgKNDZAgOS6T wA== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0b-0016f401.pphosted.com with ESMTP id 2xrp2t8082-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 28 Jan 2020 22:42:52 -0800 Received: from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 28 Jan 2020 22:42:50 -0800 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 28 Jan 2020 22:42:50 -0800 Received: from localhost.localdomain (unknown [10.28.34.200]) by maili.marvell.com (Postfix) with ESMTP id 7DCF53F703F; Tue, 28 Jan 2020 22:42:49 -0800 (PST) From: Sunil Kumar Kori To: Harman Kalra CC: , Sunil Kumar Kori Date: Wed, 29 Jan 2020 12:12:42 +0530 Message-ID: <20200129064242.8139-1-skori@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200124063554.893-1-skori@marvell.com> References: <20200124063554.893-1-skori@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-01-28_09:2020-01-28, 2020-01-28 signatures=0 Subject: [dpdk-dev] [PATCH v2 1/1] net/octeontx: fix user supplied index in MAC address add X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Earlier after a successful mac_addr_add operation, index was returned by underlying layer which was unused but same as provided by DPDK API. So API is enhanced to use application provided index location to add MAC address entry. Fixes: e4373bf1b3f5 ("net/octeontx: add unicast MAC filter") Signed-off-by: Sunil Kumar Kori Acked-by: Harman Kalra --- v2: - Disable promiscuous mode flag when default MAC address is set. drivers/net/octeontx/base/octeontx_bgx.c | 13 ++++++------- drivers/net/octeontx/base/octeontx_bgx.h | 7 ++++++- drivers/net/octeontx/octeontx_ethdev.c | 21 +++++++++++++++++---- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/drivers/net/octeontx/base/octeontx_bgx.c b/drivers/net/octeontx/base/octeontx_bgx.c index e70255b11..a2d615fb2 100644 --- a/drivers/net/octeontx/base/octeontx_bgx.c +++ b/drivers/net/octeontx/base/octeontx_bgx.c @@ -245,22 +245,21 @@ octeontx_bgx_port_mac_set(int port, uint8_t *mac_addr) } int -octeontx_bgx_port_mac_add(int port, uint8_t *mac_addr) +octeontx_bgx_port_mac_add(int port, uint8_t *mac_addr, int index) { + struct octeontx_mbox_bgx_port_mac_filter filter; struct octeontx_mbox_hdr hdr; - int resp = 0; int len = 6; - int res = 0; hdr.coproc = OCTEONTX_BGX_COPROC; hdr.msg = MBOX_BGX_PORT_ADD_MACADDR; hdr.vfid = port; - res = octeontx_mbox_send(&hdr, mac_addr, len, &resp, sizeof(int)); - if (res < 0) - return -EACCES; + memcpy(filter.mac_addr, mac_addr, len); + filter.index = index; + len = sizeof(struct octeontx_mbox_bgx_port_mac_filter); - return res; + return octeontx_mbox_send(&hdr, &filter, len, NULL, 0); } int diff --git a/drivers/net/octeontx/base/octeontx_bgx.h b/drivers/net/octeontx/base/octeontx_bgx.h index caaff179c..11c25db67 100644 --- a/drivers/net/octeontx/base/octeontx_bgx.h +++ b/drivers/net/octeontx/base/octeontx_bgx.h @@ -112,6 +112,11 @@ typedef struct octeontx_mbox_bgx_port_stats { uint64_t rx_jabber_errors; } octeontx_mbox_bgx_port_stats_t; +struct octeontx_mbox_bgx_port_mac_filter { + uint8_t mac_addr[6]; + int index; +}; + int octeontx_bgx_port_open(int port, octeontx_mbox_bgx_port_conf_t *conf); int octeontx_bgx_port_close(int port); int octeontx_bgx_port_start(int port); @@ -123,7 +128,7 @@ int octeontx_bgx_port_stats_clr(int port); int octeontx_bgx_port_link_status(int port); int octeontx_bgx_port_promisc_set(int port, int en); int octeontx_bgx_port_mac_set(int port, uint8_t *mac_addr); -int octeontx_bgx_port_mac_add(int port, uint8_t *mac_addr); +int octeontx_bgx_port_mac_add(int port, uint8_t *mac_addr, int index); int octeontx_bgx_port_mac_del(int port, uint32_t index); int octeontx_bgx_port_mac_entries_get(int port); diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c index e23162d8a..f965b946e 100644 --- a/drivers/net/octeontx/octeontx_ethdev.c +++ b/drivers/net/octeontx/octeontx_ethdev.c @@ -573,13 +573,14 @@ octeontx_dev_mac_addr_del(struct rte_eth_dev *dev, uint32_t index) static int octeontx_dev_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr, - __rte_unused uint32_t index, + uint32_t index, __rte_unused uint32_t vmdq) { struct octeontx_nic *nic = octeontx_pmd_priv(dev); int ret; - ret = octeontx_bgx_port_mac_add(nic->port_id, mac_addr->addr_bytes); + ret = octeontx_bgx_port_mac_add(nic->port_id, mac_addr->addr_bytes, + index); if (ret < 0) { octeontx_log_err("failed to add MAC address filter on port %d", nic->port_id); @@ -594,12 +595,21 @@ octeontx_dev_default_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *addr) { struct octeontx_nic *nic = octeontx_pmd_priv(dev); + uint8_t prom_mode = dev->data->promiscuous; int ret; + dev->data->promiscuous = 0; ret = octeontx_bgx_port_mac_set(nic->port_id, addr->addr_bytes); - if (ret != 0) + if (ret == 0) { + /* Update same mac address to BGX CAM table */ + ret = octeontx_bgx_port_mac_add(nic->port_id, addr->addr_bytes, + 0); + } + if (ret < 0) { + dev->data->promiscuous = prom_mode; octeontx_log_err("failed to set MAC address on port %d", - nic->port_id); + nic->port_id); + } return ret; } @@ -1149,6 +1159,9 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev, /* Update port_id mac to eth_dev */ memcpy(data->mac_addrs, nic->mac_addr, RTE_ETHER_ADDR_LEN); + /* Update same mac address to BGX CAM table at index 0 */ + octeontx_bgx_port_mac_add(nic->port_id, nic->mac_addr, 0); + PMD_INIT_LOG(DEBUG, "ethdev info: "); PMD_INIT_LOG(DEBUG, "port %d, port_ena %d ochan %d num_ochan %d tx_q %d", nic->port_id, nic->port_ena,