From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5FC11A04A5; Mon, 27 Dec 2021 17:17:56 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C09B241183; Mon, 27 Dec 2021 17:17:06 +0100 (CET) Received: from inva020.nxp.com (inva020.nxp.com [92.121.34.13]) by mails.dpdk.org (Postfix) with ESMTP id E047C410FC for ; Mon, 27 Dec 2021 17:16:52 +0100 (CET) Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id BF12B1A1531; Mon, 27 Dec 2021 17:16:52 +0100 (CET) Received: from aprdc01srsp001v.ap-rdc01.nxp.com (aprdc01srsp001v.ap-rdc01.nxp.com [165.114.16.16]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 5ED5F1A1B87; Mon, 27 Dec 2021 17:16:52 +0100 (CET) Received: from lsv03274.swis.in-blr01.nxp.com (lsv03274.swis.in-blr01.nxp.com [92.120.147.114]) by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id C7772183ACDE; Tue, 28 Dec 2021 00:16:51 +0800 (+08) From: nipun.gupta@nxp.com To: dev@dpdk.org Cc: thomas@monjalon.net, ferruh.yigit@intel.com, hemant.agrawal@nxp.com, Nipun Gupta Subject: [PATCH v2 11/16] net/dpaa: check status before configuring shared MAC Date: Mon, 27 Dec 2021 21:46:40 +0530 Message-Id: <20211227161645.24359-12-nipun.gupta@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211227161645.24359-1-nipun.gupta@nxp.com> References: <20211206121824.3493-1-nipun.gupta@nxp.com> <20211227161645.24359-1-nipun.gupta@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Nipun Gupta For shared MAC interface, it is a prerequisite to enable the interface in the kernel, before using it in user-space. This patch makes sure that device is not getting configured in case shared MAC interface is not enabled in the kernel. Signed-off-by: Nipun Gupta --- drivers/bus/dpaa/base/fman/fman_hw.c | 11 +++++++++++ drivers/bus/dpaa/include/fsl_fman.h | 2 ++ drivers/bus/dpaa/version.map | 1 + drivers/net/dpaa/dpaa_ethdev.c | 13 ++++++++++++- 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/drivers/bus/dpaa/base/fman/fman_hw.c b/drivers/bus/dpaa/base/fman/fman_hw.c index af9bac76c2..24a99f7235 100644 --- a/drivers/bus/dpaa/base/fman/fman_hw.c +++ b/drivers/bus/dpaa/base/fman/fman_hw.c @@ -314,6 +314,17 @@ fman_if_disable_rx(struct fman_if *p) out_be32(__if->ccsr_map + 8, in_be32(__if->ccsr_map + 8) & ~(u32)2); } +int +fman_if_get_rx_status(struct fman_if *p) +{ + struct __fman_if *__if = container_of(p, struct __fman_if, __if); + + assert(fman_ccsr_map_fd != -1); + + /* return true if RX bit is set */ + return !!(in_be32(__if->ccsr_map + 8) & (u32)2); +} + void fman_if_loopback_enable(struct fman_if *p) { diff --git a/drivers/bus/dpaa/include/fsl_fman.h b/drivers/bus/dpaa/include/fsl_fman.h index f3a5d05970..acb344584f 100644 --- a/drivers/bus/dpaa/include/fsl_fman.h +++ b/drivers/bus/dpaa/include/fsl_fman.h @@ -81,6 +81,8 @@ __rte_internal void fman_if_enable_rx(struct fman_if *p); __rte_internal void fman_if_disable_rx(struct fman_if *p); +__rte_internal +int fman_if_get_rx_status(struct fman_if *p); /* Enable/disable loopback on specific interfaces */ __rte_internal diff --git a/drivers/bus/dpaa/version.map b/drivers/bus/dpaa/version.map index 900635b210..1a840fd1a5 100644 --- a/drivers/bus/dpaa/version.map +++ b/drivers/bus/dpaa/version.map @@ -33,6 +33,7 @@ INTERNAL { fman_if_get_fdoff; fman_if_get_maxfrm; fman_if_get_sg_enable; + fman_if_get_rx_status; fman_if_loopback_disable; fman_if_loopback_enable; fman_if_promiscuous_disable; diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index e49f765434..3972ecaed8 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -195,6 +195,7 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev) struct rte_eth_conf *eth_conf = &dev->data->dev_conf; uint64_t rx_offloads = eth_conf->rxmode.offloads; uint64_t tx_offloads = eth_conf->txmode.offloads; + struct dpaa_if *dpaa_intf = dev->data->dev_private; struct rte_device *rdev = dev->device; struct rte_eth_link *link = &dev->data->dev_link; struct rte_dpaa_device *dpaa_dev; @@ -203,7 +204,7 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev) struct rte_intr_handle *intr_handle; uint32_t max_rx_pktlen; int speed, duplex; - int ret; + int ret, rx_status; PMD_INIT_FUNC_TRACE(); @@ -211,6 +212,16 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev) intr_handle = dpaa_dev->intr_handle; __fif = container_of(fif, struct __fman_if, __if); + /* Check if interface is enabled in case of shared MAC */ + if (fif->is_shared_mac) { + rx_status = fman_if_get_rx_status(fif); + if (!rx_status) { + DPAA_PMD_ERR("%s Interface not enabled in kernel!", + dpaa_intf->name); + return -EHOSTDOWN; + } + } + /* Rx offloads which are enabled by default */ if (dev_rx_offloads_nodis & ~rx_offloads) { DPAA_PMD_INFO( -- 2.17.1