From patchwork Tue Oct 17 09:49:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Duszynski X-Patchwork-Id: 30466 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A11861B7E2; Tue, 17 Oct 2017 11:50:05 +0200 (CEST) Received: from mail-lf0-f49.google.com (mail-lf0-f49.google.com [209.85.215.49]) by dpdk.org (Postfix) with ESMTP id 91A521B7E2 for ; Tue, 17 Oct 2017 11:50:03 +0200 (CEST) Received: by mail-lf0-f49.google.com with SMTP id w21so1278494lfc.6 for ; Tue, 17 Oct 2017 02:50:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=a0XuBSD/m6rqHKqWCjGPQNr8ornOL1YOlqPBjtcD0R8=; b=pIVHabYItjHXMjlEaYGHGgDbItkXYShBbH9LFn4/XB8yGVDEQ2xnKJbBZUCWzTpbUu nE4RIKVmWQNIkQfmTOHicoRjIFLK2j9t4VtwrvjeHAAhZyY5uLf47schUU9bGfw43Lpe 0mPJSYnl8V4LpsEQzvuu4/gIiyqBzvFAO59RuDzu3m3v8tu1w+2s5e8mdaZxpc4XwYgU mdw0PzXIfKdNiYz6X74p7VfGb+JaZssOpbcHmpf2/4KbHVZsqp/G1S15dfrnjG6zrh5D 0eobEN9sD/nVRrbpETg4ZNoantJL+zfQ2wotV8pnXom8faflnj1f4D1OeeJZz/s+xTzS +qag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=a0XuBSD/m6rqHKqWCjGPQNr8ornOL1YOlqPBjtcD0R8=; b=aTptuB6kYv1jlYaJ6thaOmx0/hytK4729mtTxfGFQantzh9WyXPz5kyMroHmOELRj2 tUowvzNhSrXoErlGtDN+h0mYNlWVtFPRLZH/zIvZCDlcPEJj0u4KcWdANBXHCahwG8l+ jgTaJn+btDuu2VIwFa5Z4kTgplliMkjYkQVzTl798og++UiCBVg83ScWFHWEa9g/Hg0A u11hzhZ7TUyp2vbm6ZKqj0Wr+8jw9OzGPM+mWYFTLeooM2TatnJW1JHX6V5ASDJ9ylnC j7UnRpRn2qurRdV5bHiNwyUJ7n20bZAb6Mjpbq0Gumrho8YyRgDvou42sCONRbtfCTA2 QicQ== X-Gm-Message-State: AMCzsaWo7F4mSNtIVw6/YWNlJ+/9JSosh4fNxf9bjr0A9TqKb9P5PlYI 72ZstpZxGOg0jeMVUKFIC4Rvohk2UKY= X-Google-Smtp-Source: ABhQp+R4vx2QrUf+D6F4JDp1wFY/KnuY/nhpzSWvuNNoSqZ/UrncaUuEkfoYxbuRSzEROhbnxE/Qew== X-Received: by 10.46.46.3 with SMTP id u3mr640290lju.190.1508233802929; Tue, 17 Oct 2017 02:50:02 -0700 (PDT) Received: from tdu.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id j13sm2394994ljb.50.2017.10.17.02.50.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Oct 2017 02:50:02 -0700 (PDT) From: Tomasz Duszynski To: dev@dpdk.org Cc: Tomasz Duszynski Date: Tue, 17 Oct 2017 11:49:54 +0200 Message-Id: <1508233794-28068-1-git-send-email-tdu@semihalf.com> X-Mailer: git-send-email 2.7.4 Subject: [dpdk-dev] [PATCH] net/mrvl: remove MRVL_MUSDK_DMA_MEMSIZE from configuration 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" RTE_MRVL_MUSDK_DMA_MEMSIZE can be removed from DPDK configuration as it's no longer used as a synchronization point for net and crypto mrvl pmds. Signed-off-by: Tomasz Duszynski --- config/common_base | 1 - drivers/net/mrvl/mrvl_ethdev.c | 14 +++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/config/common_base b/config/common_base index d9471e8..c87a26b 100644 --- a/config/common_base +++ b/config/common_base @@ -264,7 +264,6 @@ CONFIG_RTE_LIBRTE_NFP_DEBUG=n # Compile Marvell PMD driver # CONFIG_RTE_LIBRTE_MRVL_PMD=n -CONFIG_RTE_MRVL_MUSDK_DMA_MEMSIZE=41943040 # # Compile burst-oriented Broadcom BNXT PMD driver diff --git a/drivers/net/mrvl/mrvl_ethdev.c b/drivers/net/mrvl/mrvl_ethdev.c index 4beaa1d..74491cc 100644 --- a/drivers/net/mrvl/mrvl_ethdev.c +++ b/drivers/net/mrvl/mrvl_ethdev.c @@ -93,6 +93,9 @@ #define MRVL_COOKIE_HIGH_ADDR_SHIFT (sizeof(pp2_cookie_t) * 8) #define MRVL_COOKIE_HIGH_ADDR_MASK (~0ULL << MRVL_COOKIE_HIGH_ADDR_SHIFT) +/* Memory size (in bytes) for MUSDK dma buffers */ +#define MRVL_MUSDK_DMA_MEMSIZE 41943040 + static const char * const valid_args[] = { MRVL_IFACE_NAME_ARG, MRVL_CFG_ARG, @@ -2193,9 +2196,14 @@ rte_pmd_mrvl_probe(struct rte_vdev_device *vdev) * ret == -EEXIST is correct, it means DMA * has been already initialized (by another PMD). */ - ret = mv_sys_dma_mem_init(RTE_MRVL_MUSDK_DMA_MEMSIZE); - if (ret < 0 && ret != -EEXIST) - goto out_free_kvlist; + ret = mv_sys_dma_mem_init(MRVL_MUSDK_DMA_MEMSIZE); + if (ret < 0) { + if (ret != -EEXIST) + goto out_free_kvlist; + else + RTE_LOG(INFO, PMD, + "DMA memory has been already initialized by a different driver.\n"); + } ret = mrvl_init_pp2(); if (ret) {