From patchwork Thu Oct 15 13:23:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipun Gupta X-Patchwork-Id: 317771 Delivered-To: patch@linaro.org Received: by 2002:a92:d603:0:0:0:0:0 with SMTP id w3csp488128ilm; Thu, 15 Oct 2020 06:24:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5WeEKqyyS+eGJBfj6geOjRnNeK5V6CZJlWyWFJki6//jUwdY3xLqnsNfYZWjZSFJqUd/4 X-Received: by 2002:a17:907:94d2:: with SMTP id dn18mr4590863ejc.374.1602768263170; Thu, 15 Oct 2020 06:24:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602768263; cv=none; d=google.com; s=arc-20160816; b=bpVq/f3FU2SAtQNzeLUraeNU3KwmINTf6DxuEgBQW9aFtweCSNBYyGAIJbiEU0K1fw E7BvBkMvoFIyqghJSjcvtW99QFZCf0XccDgRMcYd5tisYlarmbQE/ER3LoQTGsFZNVGt 2F2U2nuNA6zhUiR58SHfhgpu938azljPB5CPLmhSP35rPdWCtbEjA+IJhd4M9k8N7RTq 8Cqp5ag67tiN55xqkYjSFTbrcZdtZK2vpeJNMtj0dcWlwRQgw+Q8yJ4GFKGE+875AHWW hzJ1Pjib9NiLnflBd1KuAsvL4/PZ0/W1ETdROQ0FjtIaJmxM+ggj0WFJrbiAjzDCwmDN zaJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:cc:to:from; bh=SqVXdJUw4dS6S7sUYPeNS2Whv5Stb9Z3Da3U6u2EB68=; b=nTGObfWVhZjITjGT4NzB39IqV0UvATsgiMIEk1jL58s9NwmorDe+5CeJtVFDtZsJAw nmZCyTHkJI0t8Tsh1lVc0iOKiiAK7n8prtMwd8VZgfQGHTxNL9InnlJRwd6pxZN/q3o4 7Niu8ytyjSiZNDU27lRqQvdiCc4UvXTb6ge5AiIx00yRgK1MK9o7hp8OlM3mXgyTp6eY 85mdUpD2+1p0X8nLD+bqyODANIsaBm+PSa9fYLOg+GI51om4EK56SqoGx11ew/AIC43s Fh6nbbvvOlbP8cuplZwWpbJQ3iJd5R9RK4uoiZ451k9LUdgVpygx82bF0NMWIvHncoJS ybmw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id x3si2065020ejc.362.2020.10.15.06.24.22; Thu, 15 Oct 2020 06:24:23 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0F4B31E91F; Thu, 15 Oct 2020 15:24:02 +0200 (CEST) Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) by dpdk.org (Postfix) with ESMTP id 8492E1E8FA for ; Thu, 15 Oct 2020 15:23:57 +0200 (CEST) Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 4EFF1200730; Thu, 15 Oct 2020 15:23:56 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id B2E3A2003C6; Thu, 15 Oct 2020 15:23:51 +0200 (CEST) Received: from lsv03273.swis.in-blr01.nxp.com (lsv03273.swis.in-blr01.nxp.com [92.120.147.113]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 57441402A7; Thu, 15 Oct 2020 15:23:46 +0200 (CEST) From: nipun.gupta@nxp.com To: dev@dpdk.org Cc: thomas@monjalon.net, ferruh.yigit@intel.com, arybchenko@solarflare.com, hemant.agrawal@nxp.com, sachin.saxena@nxp.com, rohit.raj@nxp.com, jerinjacobk@gmail.com, stephen@networkplumber.org, asafp@nvidia.com, Nipun Gupta Date: Thu, 15 Oct 2020 18:53:42 +0530 Message-Id: <20201015132343.4050-2-nipun.gupta@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201015132343.4050-1-nipun.gupta@nxp.com> References: <20200831075333.10135-1-nipun.gupta@nxp.com> <20201015132343.4050-1-nipun.gupta@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [PATCH 2/3 v4] net/dpaa: support Rx offload for error packet drop 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" From: Nipun Gupta This patch supports Rx offload configuration to drop error packets in the hardware Signed-off-by: Nipun Gupta --- drivers/bus/dpaa/base/fman/fman_hw.c | 7 ++++++- drivers/net/dpaa/dpaa_ethdev.c | 23 +++++++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/drivers/bus/dpaa/base/fman/fman_hw.c b/drivers/bus/dpaa/base/fman/fman_hw.c index 4ab49f785..40e4e0000 100644 --- a/drivers/bus/dpaa/base/fman/fman_hw.c +++ b/drivers/bus/dpaa/base/fman/fman_hw.c @@ -597,7 +597,12 @@ void fman_if_discard_rx_errors(struct fman_if *fm_if) { struct __fman_if *__if = container_of(fm_if, struct __fman_if, __if); - unsigned int *fmbm_rfsdm, *fmbm_rfsem; + unsigned int *fmbm_rcfg, *fmbm_rfsdm, *fmbm_rfsem; + unsigned int val; + + fmbm_rcfg = &((struct rx_bmi_regs *)__if->bmi_map)->fmbm_rcfg; + val = in_be32(fmbm_rcfg); + out_be32(fmbm_rcfg, val & ~BMI_PORT_CFG_FDOVR); fmbm_rfsem = &((struct rx_bmi_regs *)__if->bmi_map)->fmbm_rfsem; out_be32(fmbm_rfsem, 0); diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index af47c196a..b9cfc4fb3 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -52,7 +52,8 @@ /* Supported Rx offloads */ static uint64_t dev_rx_offloads_sup = DEV_RX_OFFLOAD_JUMBO_FRAME | - DEV_RX_OFFLOAD_SCATTER; + DEV_RX_OFFLOAD_SCATTER | + DEV_RX_OFFLOAD_ERR_PKT_DROP; /* Rx offloads which cannot be disabled */ static uint64_t dev_rx_offloads_nodis = @@ -62,6 +63,10 @@ static uint64_t dev_rx_offloads_nodis = DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM | DEV_RX_OFFLOAD_RSS_HASH; +/* Supported Rx Error packet drop offload */ +static uint64_t dev_rx_err_drop_offloads_sup = + RTE_DEV_RX_ERR_PKT_DROP_OFFLOAD_ALL; + /* Supported Tx offloads */ static uint64_t dev_tx_offloads_sup = DEV_TX_OFFLOAD_MT_LOCKFREE | @@ -262,6 +267,18 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev) dev->data->scattered_rx = 1; } + if (eth_conf->err_pkt_drop_conf.all) { + DPAA_PMD_DEBUG("error packets will be dropped on hw"); + fman_if_discard_rx_errors(fif); + } else { + struct dpaa_if *dpaa_intf = dev->data->dev_private; + struct qman_fq *rxq = &dpaa_intf->rx_queues[0]; + + DPAA_PMD_DEBUG("error packets will not be dropped on hw"); + fman_if_receive_rx_errors(fif, FM_FD_RX_STATUS_ERR_MASK); + fman_if_set_err_fqid(fif, rxq->fqid); + } + if (!(default_q || fmc_q)) { if (dpaa_fm_config(dev, eth_conf->rx_adv_conf.rss_conf.rss_hf)) { @@ -591,6 +608,7 @@ static int dpaa_eth_dev_info(struct rte_eth_dev *dev, dev_rx_offloads_nodis; dev_info->tx_offload_capa = dev_tx_offloads_sup | dev_tx_offloads_nodis; + dev_info->rx_err_drop_offload_capa = dev_rx_err_drop_offloads_sup; dev_info->default_rxportconf.burst_size = DPAA_DEF_RX_BURST_SIZE; dev_info->default_txportconf.burst_size = DPAA_DEF_TX_BURST_SIZE; dev_info->default_rxportconf.nb_queues = 1; @@ -2085,9 +2103,6 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev) fman_intf->mac_addr.addr_bytes[5]); if (!fman_intf->is_shared_mac) { - /* Configure error packet handling */ - fman_if_receive_rx_errors(fman_intf, - FM_FD_RX_STATUS_ERR_MASK); /* Disable RX mode */ fman_if_disable_rx(fman_intf); /* Disable promiscuous mode */