From patchwork Mon Oct 15 12:53:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 46833 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 E3A4D493D; Mon, 15 Oct 2018 14:53:36 +0200 (CEST) Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by dpdk.org (Postfix) with ESMTP id 4BADB2F4F for ; Mon, 15 Oct 2018 14:53:35 +0200 (CEST) Received: by mail-qk1-f195.google.com with SMTP id a85-v6so11712116qkg.3 for ; Mon, 15 Oct 2018 05:53:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atomicrules-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=J8SoMSPgpfVAu7FfQXRLzQljh8wVo3bMGFqcFvH76XM=; b=ofIUtkKwvLtpYQvl0J3zLjuMdEsAq7vyW0PFJoHe/HtSei85KEMgLsve+ZLQGJ9I1W P3N2asQ/NdhJ74wlae6iS0GRqIe25YAooiccYB1udAgNJ3Qeuv/tcZlRZ15IdTWWBtIP fa1JEVYySnuWt0ZPiUCSz5h73VTdUHXP+vB5abl46toaQf+r6TFy6+aXisUhfbFQVGgi JOVOSJ9L7TNwr+/sUMHq0bDtNKuJN4I6RLRpMYqvczfdtnCxtBeeMD5vBUvPDg/NB536 LLYWY3hEi8m2K9dF2T1rzc+5ESzwwS9cNNySQ8jfpGmPwjpWtmzU9YDtwXrOZ2U80lMi 1DeA== 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:in-reply-to :references; bh=J8SoMSPgpfVAu7FfQXRLzQljh8wVo3bMGFqcFvH76XM=; b=OPYsGC7cbaar81Pqh2R/+1PqSfMnNTmHCsjISZnoD6BIg3uasrs/G2d4bF1PdobuHV C4Twt3gh9xq0eZCOhbJxCfJhbnBd+MwwUoqHtqeuJULwmmeK6lJ84aexrRR9d+WVm2JJ hvT4Jb03prGX7digq9L/zE7xRpIqsfKJrLhgTkgB+2W0mpFbytEg7ZJA1Fxh3xWa8Sd2 9QQq2YxiBlgeCU0xVLsW9MRWzcyTc/DIkvTXLu+qV+cU1bl53jAbH18WdjRU8ORGTV0l HYN/CajPBv0wK7DCjeOuKYUFJRY+lJFeBJlzWPhCxCdS5UrXX2CShXmP5DUa2F1qpP9M 6S9g== X-Gm-Message-State: ABuFfog+k0gwgu0Om3iHGd4T4iL0D0n7GC2NawX6QvVqEDwFzQ1FUSat jI5cpd25vEaxen9ch3WJbORv+prmD3ywZQ== X-Google-Smtp-Source: ACcGV61ZMOmj8h5NjqkFc0eme/Hm3VZzIbNpaqJPukALIjwmCrWrOHh2kqgexBJsshScaXXaOS9Udw== X-Received: by 2002:a37:d909:: with SMTP id u9-v6mr16004391qki.140.1539608014402; Mon, 15 Oct 2018 05:53:34 -0700 (PDT) Received: from z170.home (pool-173-48-117-246.bstnma.fios.verizon.net. [173.48.117.246]) by smtp.gmail.com with ESMTPSA id s28-v6sm6694244qtc.92.2018.10.15.05.53.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Oct 2018 05:53:33 -0700 (PDT) From: Ed Czeck To: dev@dpdk.org Cc: john.miller@atomicrules.com, shepard.siegel@atomicrules.com, ferruh.yigit@intel.com, Ed Czeck Date: Mon, 15 Oct 2018 08:53:26 -0400 Message-Id: <1539608006-21758-1-git-send-email-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539033410-21422-3-git-send-email-ed.czeck@atomicrules.com> References: <1539033410-21422-3-git-send-email-ed.czeck@atomicrules.com> Subject: [dpdk-dev] [PATCH v2 3/3] net/ark: support for updated hardware and Tx meta data 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" Support for version 2 of DDM hardware and user tx meta data. Verify version during initialization. Signed-off-by: Ed Czeck --- drivers/net/ark/ark_ddm.c | 12 ++++++++++-- drivers/net/ark/ark_ddm.h | 7 +++++-- drivers/net/ark/ark_ethdev.c | 3 +++ drivers/net/ark/ark_ethdev_tx.c | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/drivers/net/ark/ark_ddm.c b/drivers/net/ark/ark_ddm.c index eea388a..57026f8 100644 --- a/drivers/net/ark/ark_ddm.c +++ b/drivers/net/ark/ark_ddm.c @@ -11,14 +11,22 @@ int ark_ddm_verify(struct ark_ddm_t *ddm) { + uint32_t hw_const; if (sizeof(struct ark_ddm_t) != ARK_DDM_EXPECTED_SIZE) { PMD_DRV_LOG(ERR, "ARK: DDM structure looks incorrect %d vs %zd\n", ARK_DDM_EXPECTED_SIZE, sizeof(struct ark_ddm_t)); return -1; } - if (ddm->cfg.const0 != ARK_DDM_CONST) { - PMD_DRV_LOG(ERR, "ARK: DDM module not found as expected 0x%08x\n", + hw_const = ddm->cfg.const0; + if (hw_const == ARK_DDM_CONST1) { + PMD_DRV_LOG(ERR, + "ARK: DDM module is version 1, " + "PMD expects version 2\n"); + return -1; + } else if (hw_const != ARK_DDM_CONST2) { + PMD_DRV_LOG(ERR, + "ARK: DDM module not found as expected 0x%08x\n", ddm->cfg.const0); return -1; } diff --git a/drivers/net/ark/ark_ddm.h b/drivers/net/ark/ark_ddm.h index b37d1e0..5456b4b 100644 --- a/drivers/net/ark/ark_ddm.h +++ b/drivers/net/ark/ark_ddm.h @@ -19,7 +19,7 @@ /* struct defining Tx meta data -- fixed in FPGA -- 16 bytes */ struct ark_tx_meta { uint64_t physaddr; - uint32_t delta_ns; + uint32_t user1; uint16_t data_len; /* of this MBUF */ #define ARK_DDM_EOP 0x01 #define ARK_DDM_SOP 0x02 @@ -34,7 +34,10 @@ struct ark_tx_meta { * structs will never be instantiated in ram memory */ #define ARK_DDM_CFG 0x0000 -#define ARK_DDM_CONST 0xfacecafe +/* Set unique HW ID for hardware version */ +#define ARK_DDM_CONST2 (0x324d4444) +#define ARK_DDM_CONST1 (0xfacecafe) + struct ark_ddm_cfg_t { uint32_t r0; volatile uint32_t tlp_stats_clear; diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index 552ca01..c26f076 100644 --- a/drivers/net/ark/ark_ethdev.c +++ b/drivers/net/ark/ark_ethdev.c @@ -313,6 +313,9 @@ eth_ark_dev_init(struct rte_eth_dev *dev) /* We are a single function multi-port device. */ ret = ark_config_device(dev); + if (ret) + return -1; + dev->dev_ops = &ark_eth_dev_ops; dev->data->mac_addrs = rte_zmalloc("ark", ETHER_ADDR_LEN, 0); diff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c index 57188c2..94da5f9 100644 --- a/drivers/net/ark/ark_ethdev_tx.c +++ b/drivers/net/ark/ark_ethdev_tx.c @@ -65,7 +65,7 @@ eth_ark_tx_meta_from_mbuf(struct ark_tx_meta *meta, uint8_t flags) { meta->physaddr = rte_mbuf_data_iova(mbuf); - meta->delta_ns = 0; + meta->user1 = (uint32_t)mbuf->udata64; meta->data_len = rte_pktmbuf_data_len(mbuf); meta->flags = flags; }