From patchwork Mon Sep 10 20:04:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44535 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 2FDED4CC3; Mon, 10 Sep 2018 22:04:41 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 544A14CB3 for ; Mon, 10 Sep 2018 22:04:39 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id n2-v6so23267439wrw.7 for ; Mon, 10 Sep 2018 13:04:39 -0700 (PDT) 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=/Io4u5xYs8ONOMd8JAnWt8W7Kqu4U3SIb19iqdGLt/U=; b=nBN2//jsBbNaAg1WvjP9wea1ZdgYT3l95bIHBXi8MXIaYBZNIdGqDFJ0e2ROREaFKz Q9PeqUJiBvB68O949bpvzFkEEHkZKvoXcnhsHt5gaxdJZsFrtVhQBwl6TUErCQ2JenYZ uIsg5fz9P9ubisGTZ2TKPcfWUyAfcpNYVhzEkt+hicZajZnW7+G1VcqJfVx6D7QRIky6 wME5y8VRP7ZbZ4Vdbn+pMCtyiYZfahQEmm2mNPQIWkguMUI9o5JYgNDsUpeFVA+ug0uX 8jObJIdHzaukXLXF05FMx4k+E2zFQuMwgPiilwHnaHntsf8Gzkz8gpkcu1X1KuCOA77q hnwg== X-Gm-Message-State: APzg51ADrxhTvWxW1317bYE+pvdhlMHJx20PED0sAA1bWTe6tOd4RLLK 1t2rTup7cu7mc8PCfNfZNpeUZJd1Qac= X-Google-Smtp-Source: ANB0VdarBB66tP/A05QmTri23XgQr2D6+db3Im5uHyeMB2Y/B5BgA+nPKtuIsoXCvweOTq0p/+SPpw== X-Received: by 2002:adf:ad47:: with SMTP id p65-v6mr16365518wrc.222.1536609878660; Mon, 10 Sep 2018 13:04:38 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id b22-v6sm16699260wme.48.2018.09.10.13.04.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:04:37 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com, wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com, shahed.shaikh@cavium.com, amr.mokhtar@intel.com, shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com, peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com, maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com, antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com, yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net Date: Mon, 10 Sep 2018 21:04:01 +0100 Message-Id: <20180910200415.8340-2-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180910200415.8340-1-bluca@debian.org> References: <20180910200415.8340-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 01/15] build: add Meson file for tap PMD 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" Use same autoconf generation mechanism as the MLX4/5 PMDs Signed-off-by: Luca Boccassi --- drivers/net/meson.build | 1 + drivers/net/tap/meson.build | 41 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 drivers/net/tap/meson.build diff --git a/drivers/net/meson.build b/drivers/net/meson.build index c7a2d0e7db..b7b4870eb8 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -27,6 +27,7 @@ drivers = ['af_packet', 'sfc', 'softnic', 'szedata2', + 'tap', 'thunderx', 'vhost', 'virtio'] diff --git a/drivers/net/tap/meson.build b/drivers/net/tap/meson.build new file mode 100644 index 0000000000..ef3c6e1fee --- /dev/null +++ b/drivers/net/tap/meson.build @@ -0,0 +1,41 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 Luca Boccassi + +sources = files( + 'rte_eth_tap.c', + 'tap_bpf_api.c', + 'tap_flow.c', + 'tap_intr.c', + 'tap_netlink.c', + 'tap_tcmsgs.c', +) + +deps = ['bus_vdev', 'gso', 'hash'] + +cflags += '-DTAP_MAX_QUEUES=16' + +# To maintain the compatibility with the make build system +# tap_autoconf.h file is still generated. +# input array for meson symbol search: +# [ "MACRO to define if found", "header for the search", +# "enum/define", "symbol to search" ] +# +args = [ + [ 'HAVE_TC_FLOWER', 'linux/pkt_cls.h', + 'enum', 'TCA_FLOWER_UNSPEC' ], + [ 'HAVE_TC_VLAN_ID', 'linux/pkt_cls.h', + 'enum', 'TCA_FLOWER_KEY_VLAN_PRIO' ], + [ 'HAVE_TC_BPF', 'linux/pkt_cls.h', + 'enum', 'TCA_BPF_UNSPEC' ], + [ 'HAVE_TC_BPF_FD', 'linux/pkt_cls.h', + 'enum', 'TCA_BPF_FD' ], + [ 'HAVE_TC_ACT_BPF', 'linux/tc_act/tc_bpf.h', + 'enum', 'TCA_ACT_BPF_UNSPEC' ], + [ 'HAVE_TC_ACT_BPF_FD', 'linux/tc_act/tc_bpf.h', + 'enum', 'TCA_ACT_BPF_FD' ], +] +config = configuration_data() +foreach arg:args + config.set(arg[0], cc.has_header_symbol(arg[1], arg[3])) +endforeach +configure_file(output : 'tap_autoconf.h', configuration : config) From patchwork Mon Sep 10 20:04:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44536 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 9581F4F91; Mon, 10 Sep 2018 22:04:42 +0200 (CEST) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id 1300F4CB5 for ; Mon, 10 Sep 2018 22:04:41 +0200 (CEST) Received: by mail-wm0-f65.google.com with SMTP id b19-v6so22833831wme.3 for ; Mon, 10 Sep 2018 13:04:41 -0700 (PDT) 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=ofSI+emroMR0vH2fpKpMe5FPLmfVQK/MnFwJWy9tk3A=; b=TokJWbM+BzwnSMRxQBSm1FOMUPEXttDS7b8f1xVx+3f2oqge01S61wyPXGk66Vmp3I zw+JGTxTCyUP968jSCZmvDd3aMjFG2AzUvwE7xjwNIanUpN/yjbMmstbcuFBQsy95JLR 3oTRJR3xJeP7VmE55vkCeSdhSsBL2pLLJ/mwZ7OP8BY8W92gGs43NVfarV4KW2UsPI2J lNh448iEbVRmZPjN5h95it5NssyDUGB3T3TrfhheG1sR75REN2dXlIKeKR2m7/P2VhFv Ibmu++/IOs7nhYXUc05plzGZmK2N2wI9o/p4EwH1GbS7xoVeuVWqGZNa8+B//MpMtPXf 2mHA== X-Gm-Message-State: APzg51DJZTx1+VvyMMS9k5aFbqNC4Tnn03IPcCUywKsgG/nVGxYrVa39 xEW/1S6zcDBZBVgl6MwkUOR3ZGwTXsA= X-Google-Smtp-Source: ANB0VdY6KvA0cM4qpg+GyQTtEXM5SoamAGr5z6RmCptGAYXX0LfINSslxyG+QCif5roOgRw9qNXdDw== X-Received: by 2002:a1c:99c2:: with SMTP id b185-v6mr1711748wme.15.1536609880416; Mon, 10 Sep 2018 13:04:40 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id c19-v6sm16521721wre.86.2018.09.10.13.04.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:04:39 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com, wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com, shahed.shaikh@cavium.com, amr.mokhtar@intel.com, shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com, peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com, maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com, antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com, yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net Date: Mon, 10 Sep 2018 21:04:02 +0100 Message-Id: <20180910200415.8340-3-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180910200415.8340-1-bluca@debian.org> References: <20180910200415.8340-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 02/15] build: add Meson file for vdev_netvsc PMD 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" Signed-off-by: Luca Boccassi --- drivers/net/meson.build | 1 + drivers/net/vdev_netvsc/meson.build | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 drivers/net/vdev_netvsc/meson.build diff --git a/drivers/net/meson.build b/drivers/net/meson.build index b7b4870eb8..68ac42d67c 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -29,6 +29,7 @@ drivers = ['af_packet', 'szedata2', 'tap', 'thunderx', + 'vdev_netvsc', 'vhost', 'virtio'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc diff --git a/drivers/net/vdev_netvsc/meson.build b/drivers/net/vdev_netvsc/meson.build new file mode 100644 index 0000000000..cc956e7b27 --- /dev/null +++ b/drivers/net/vdev_netvsc/meson.build @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi + +sources = files('vdev_netvsc.c') + +allow_experimental_apis = true + +cflags_options = [ + '-Wall', + '-Wextra', + '-D_BSD_SOURCE', + '-D_DEFAULT_SOURCE', + '-D_XOPEN_SOURCE=600' +] +foreach option:cflags_options + if cc.has_argument(option) + cflags += option + endif +endforeach From patchwork Mon Sep 10 20:04:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44537 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 695835689; Mon, 10 Sep 2018 22:04:44 +0200 (CEST) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id C5EA74F9C for ; Mon, 10 Sep 2018 22:04:42 +0200 (CEST) Received: by mail-wm0-f65.google.com with SMTP id r1-v6so6330857wmh.0 for ; Mon, 10 Sep 2018 13:04:42 -0700 (PDT) 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=misJ/CzLZnpk27zBm2RE6I75513WPnfrNkLL6LnbfZM=; b=nF8hXDWRJ79PSNjKElwCoJqqcA/OGnEQtRMiKEZrz+fXny91g1oXp/8jX089+5ny+a wRIjzW3Kowhq05H71zaeBDJHGSraEqwhLDakar3Tf2/wuSeJJLpVeegv7PJgVhAp2/Rc 27c0m+ccGtS0D+7Md5oYBFv3VH/AuFQhaomoLu7Zt6Ez5o/swjhYIca6qBZg4hOrwHh/ WBcLF1DIzRxrK0WJawSOhACCfJmmMwBWA0t3NJ7L2ekQzCmtMFj+Urf5UGlNXnfBYUtD rpayQ7vkE1/laJq2ghF1O9CK99uXTvKJ0bGfi4/5D7XwkJe8Q5BFZ/Zy5ZR7abBzglDx Hm3g== X-Gm-Message-State: APzg51A1djrlKdvZcsBOUQE0BOWNOU0U5ue9vmycGYHhSnXSqe7MIpfN NVM9rehKRb8MYeap/hqZR+L6ymNWsAY= X-Google-Smtp-Source: ANB0VdaArpqieM48bGulCMaWrA1heB+o0AQkk04P5y2EOgcQuLRjGXshr95yeVZS9BdWrp4recqFmA== X-Received: by 2002:a1c:9d02:: with SMTP id g2-v6mr1840279wme.122.1536609882176; Mon, 10 Sep 2018 13:04:42 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id j2-v6sm28503923wmj.5.2018.09.10.13.04.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:04:41 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com, wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com, shahed.shaikh@cavium.com, amr.mokhtar@intel.com, shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com, peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com, maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com, antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com, yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net Date: Mon, 10 Sep 2018 21:04:03 +0100 Message-Id: <20180910200415.8340-4-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180910200415.8340-1-bluca@debian.org> References: <20180910200415.8340-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 03/15] build: add Meson file for crypto scheduler PMD 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" Signed-off-by: Luca Boccassi --- drivers/crypto/meson.build | 2 +- drivers/crypto/scheduler/meson.build | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 drivers/crypto/scheduler/meson.build diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build index d64ca418bc..6ed853b7ab 100644 --- a/drivers/crypto/meson.build +++ b/drivers/crypto/meson.build @@ -2,7 +2,7 @@ # Copyright(c) 2017 Intel Corporation drivers = ['ccp', 'dpaa_sec', 'dpaa2_sec', 'mvsam', - 'null', 'openssl', 'qat', 'virtio'] + 'null', 'openssl', 'qat', 'scheduler', 'virtio'] std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps config_flag_fmt = 'RTE_LIBRTE_@0@_PMD' diff --git a/drivers/crypto/scheduler/meson.build b/drivers/crypto/scheduler/meson.build new file mode 100644 index 0000000000..c5ba2d6804 --- /dev/null +++ b/drivers/crypto/scheduler/meson.build @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi + +deps += ['bus_vdev', 'reorder'] +name = 'crypto_scheduler' +sources = files( + 'rte_cryptodev_scheduler.c', + 'scheduler_failover.c', + 'scheduler_multicore.c', + 'scheduler_pkt_size_distr.c', + 'scheduler_pmd.c', + 'scheduler_pmd_ops.c', + 'scheduler_roundrobin.c', +) + +headers = files( + 'rte_cryptodev_scheduler.h', + 'rte_cryptodev_scheduler_operations.h', +) From patchwork Mon Sep 10 20:04:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44538 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 D992B58EC; Mon, 10 Sep 2018 22:04:45 +0200 (CEST) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by dpdk.org (Postfix) with ESMTP id 9D4A5569B for ; Mon, 10 Sep 2018 22:04:44 +0200 (CEST) Received: by mail-wm0-f68.google.com with SMTP id q8-v6so22781440wmq.4 for ; Mon, 10 Sep 2018 13:04:44 -0700 (PDT) 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=yPU2yLHutDNt1rXMZZQmp6fslc41mvVkALY2bDpcM+Q=; b=HWMn0TpVdKkXBLRPkVMOAISkSAAFtyn24hdoQRLvtlcl4/kXTcZ3SgiBsV98Jr2JxV lPnZVUugB2r+W3mWM59PUlyIUqm36oj/VRNYXwSD2etwaJKWFi3Y05CT38Fwo1imETxX 1O9Q2XdgdqZru/V/Ob11JM97AN9qT84giH2xjNcGjeBjiOlQzPrZS2xuJKv6nUxfPYu4 ymULw8S9nNW6UZOn3mHAfbz4tX+6q+PShqARID/5QZPRVoVu8/CbyqY5awWf87hrLUla 9xmNhJ1v8Yu5lr7xnlzMY/l0fceXnnnAIdLQnxTJtmaV5e1mLdTthfLYhOzyC3eitAAv V3Ow== X-Gm-Message-State: APzg51BHiPH2TVMpXf8Vet5PXTLLuXKSAH8SDO+/j4dkyKdH5ULNfGA7 PhCFcxpl2chx/M9EIK8ZNWKvvMw8YpA= X-Google-Smtp-Source: ANB0VdbIWXDqiJ7BDOf9yICw6+toPdsGQxNC4+JnEYrsBk19AUuXEY8WcIBo18Auy7zykl/G4LQ9XQ== X-Received: by 2002:a1c:b9cf:: with SMTP id j198-v6mr1684471wmf.93.1536609884085; Mon, 10 Sep 2018 13:04:44 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id p11-v6sm18716176wrd.74.2018.09.10.13.04.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:04:42 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com, wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com, shahed.shaikh@cavium.com, amr.mokhtar@intel.com, shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com, peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com, maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com, antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com, yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net Date: Mon, 10 Sep 2018 21:04:04 +0100 Message-Id: <20180910200415.8340-5-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180910200415.8340-1-bluca@debian.org> References: <20180910200415.8340-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 04/15] build: add Meson files for avf PMD 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" Signed-off-by: Luca Boccassi --- drivers/net/avf/base/meson.build | 20 ++++++++++++++++++++ drivers/net/avf/meson.build | 15 +++++++++++++++ drivers/net/meson.build | 1 + 3 files changed, 36 insertions(+) create mode 100644 drivers/net/avf/base/meson.build create mode 100644 drivers/net/avf/meson.build diff --git a/drivers/net/avf/base/meson.build b/drivers/net/avf/base/meson.build new file mode 100644 index 0000000000..90fd6b445f --- /dev/null +++ b/drivers/net/avf/base/meson.build @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi + +sources = [ + 'avf_adminq.c', + 'avf_common.c', +] + +error_cflags = ['-Wno-pointer-to-int-cast'] +c_args = cflags +foreach flag: error_cflags + if cc.has_argument(flag) + c_args += flag + endif +endforeach + +base_lib = static_library('avf_base', sources, + dependencies: static_rte_eal, + c_args: c_args) +base_objs = base_lib.extract_all_objects() diff --git a/drivers/net/avf/meson.build b/drivers/net/avf/meson.build new file mode 100644 index 0000000000..d341f029b2 --- /dev/null +++ b/drivers/net/avf/meson.build @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi + +subdir('base') +objs = [base_objs] + +sources = files( + 'avf_ethdev.c', + 'avf_rxtx.c', + 'avf_rxtx_vec_sse.c', + 'avf_vchnl.c', +) +if arch_subdir == 'x86' + sources += files('avf_rxtx_vec_sse.c') +endif diff --git a/drivers/net/meson.build b/drivers/net/meson.build index 68ac42d67c..28efeda0b6 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -3,6 +3,7 @@ drivers = ['af_packet', 'ark', + 'avf', 'avp', 'axgbe', 'bonding', 'bnx2x', From patchwork Mon Sep 10 20:04:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44539 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 5EC5458FE; Mon, 10 Sep 2018 22:04:48 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id A64924C96 for ; Mon, 10 Sep 2018 22:04:46 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id v17-v6so23235387wrr.9 for ; Mon, 10 Sep 2018 13:04:46 -0700 (PDT) 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=eF+S3+fBKM3DMM8PRO9bYFyyYR4jJvz+xigx0EUyp7I=; b=PxFHH0mamtn0eeLKeFXBaJQPXl7v7wob4FSFsWRWQln9wKxVaAwn0SKfZcs++Tfv74 Hc8i5d2NDy4LflKcFSU1FDI/N3dNNwqpD6RVfiy7AKpxdaHjMqz4PrtN2vha+5SkZIki mH+ZhV1qYRnsdLtT4889nrqMtKQJ20gRoh5zs0ruWcAl7ef97LxJsb+MGYTZ+ljTczlE SdIirzMFIKVIozY7xURRIme7o8xCxsjcLYEhPTXEGF01z1T7A03E5Mdxv4NhBPoEffWy aCZ6zJ8//04jEdjs4vRs9kls2hlU5Gdud2EyG65Z+PGDqKpjJ1Y8HUDfc0xqiM4oNiDk oQYw== X-Gm-Message-State: APzg51DPHma0+KcdU9D6xApEjJwwGcfk0RTSe3RzP9KCkTfVM2hvUyN5 PuaCRCVTDTSvAZIUwKvl85LFERqoCTw= X-Google-Smtp-Source: ANB0VdYc6inQyB4/P+UDkHtS3AMDmxb8jszjirlwY9LjI1sxfPnrFQuqmZpA+gQhJl2Rv66l6/HYIw== X-Received: by 2002:a5d:4a87:: with SMTP id o7-v6mr14904787wrq.132.1536609886133; Mon, 10 Sep 2018 13:04:46 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id h18-v6sm29457524wru.42.2018.09.10.13.04.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:04:44 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com, wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com, shahed.shaikh@cavium.com, amr.mokhtar@intel.com, shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com, peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com, maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com, antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com, yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net Date: Mon, 10 Sep 2018 21:04:05 +0100 Message-Id: <20180910200415.8340-6-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180910200415.8340-1-bluca@debian.org> References: <20180910200415.8340-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 05/15] build: add Meson files for qede PMD 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" Signed-off-by: Luca Boccassi Acked-by: Shahed Shaikh --- config/rte_config.h | 3 ++ drivers/net/meson.build | 2 +- drivers/net/qede/base/meson.build | 57 +++++++++++++++++++++++++++++++ drivers/net/qede/meson.build | 14 ++++++++ 4 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 drivers/net/qede/base/meson.build create mode 100644 drivers/net/qede/meson.build diff --git a/config/rte_config.h b/config/rte_config.h index 46775a8419..ee84f04977 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -116,4 +116,7 @@ #define RTE_PMD_RING_MAX_RX_RINGS 16 #define RTE_PMD_RING_MAX_TX_RINGS 16 +/* QEDE PMD defines */ +#define RTE_LIBRTE_QEDE_FW "" + #endif /* _RTE_CONFIG_H_ */ diff --git a/drivers/net/meson.build b/drivers/net/meson.build index 28efeda0b6..74f4109161 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -24,7 +24,7 @@ drivers = ['af_packet', 'mvpp2', 'netvsc', 'nfp', - 'null', 'octeontx', 'pcap', 'ring', + 'null', 'octeontx', 'pcap', 'qede', 'ring', 'sfc', 'softnic', 'szedata2', diff --git a/drivers/net/qede/base/meson.build b/drivers/net/qede/base/meson.build new file mode 100644 index 0000000000..59b41c895d --- /dev/null +++ b/drivers/net/qede/base/meson.build @@ -0,0 +1,57 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi + +sources = [ + 'bcm_osal.c', + 'ecore_cxt.c', + 'ecore_dcbx.c', + 'ecore_dev.c', + 'ecore_hw.c', + 'ecore_init_fw_funcs.c', + 'ecore_init_ops.c', + 'ecore_int.c', + 'ecore_l2.c', + 'ecore_mcp.c', + 'ecore_sp_commands.c', + 'ecore_spq.c', + 'ecore_sriov.c', + 'ecore_vf.c', +] + + +error_cflags = [ + '-Wno-unused-parameter', + '-Wno-sign-compare', + '-Wno-missing-prototypes', + '-Wno-cast-qual', + '-Wno-unused-function', + '-Wno-unused-variable', + '-Wno-strict-aliasing', + '-Wno-missing-prototypes', + '-Wno-unused-value', + '-Wno-format-nonliteral', + '-Wno-shift-negative-value', + '-Wno-unused-but-set-variable', + '-Wno-missing-declarations', + '-Wno-maybe-uninitialized', + '-Wno-strict-prototypes', + '-Wno-shift-negative-value', + '-Wno-implicit-fallthrough', + '-Wno-format-extra-args', + '-Wno-visibility', + '-Wno-empty-body', + '-Wno-invalid-source-encoding', + '-Wno-sometimes-uninitialized', + '-Wno-pointer-bool-conversion', +] +c_args = cflags +foreach flag: error_cflags + if cc.has_argument(flag) + c_args += flag + endif +endforeach + +base_lib = static_library('qede_base', sources, + dependencies: static_rte_net, + c_args: c_args) +base_objs = base_lib.extract_all_objects() diff --git a/drivers/net/qede/meson.build b/drivers/net/qede/meson.build new file mode 100644 index 0000000000..167c03bdf2 --- /dev/null +++ b/drivers/net/qede/meson.build @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi + +subdir('base') +objs = [base_objs] + +sources = files( + 'qede_ethdev.c', + 'qede_fdir.c', + 'qede_main.c', + 'qede_rxtx.c', +) + +#deps += ['ethdev'] From patchwork Mon Sep 10 20:04:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44540 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 DF73F5942; Mon, 10 Sep 2018 22:04:50 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 4B3225398 for ; Mon, 10 Sep 2018 22:04:48 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id z96-v6so23269221wrb.8 for ; Mon, 10 Sep 2018 13:04:48 -0700 (PDT) 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=VNPQayk7qWULqErd/3fj8ce5o/HfPiuhN+jNWsBsfeM=; b=X3PM4UNo/cF1lGJEIKj589R7vtwK5uN7cE64vgn3y7+GUqT5Oy9ryxwSEPg5rnNuBT 5KMRpy9X2Ure9sL2EmcC4l6FmZNKScotPy6JhhnJRdJaPqMqfy53IbNXpCBBltnOXWH0 qi/W7lw5CCO/e4GoIWNH2duTqEOnKUvjflqwgnsm2KTybuV8gZHk+mS2ZmSi8+U9YuVl +z9zEamAsOwN7+XzLpV2EdaZsRtOH5hlfiPrR9CFmkivl220uAyHwqq8KyT+ScizFWp5 kd0kYoJ4A2pNcgeBJUTDfge0KWfL/ZTOzu9NBtFaXYzTbDp2GqtaQZQNXazkENwk/Fuc gLvg== X-Gm-Message-State: APzg51CGYIxC92Y5Dupw8wpvQPoGQOYn+B0WqSAcBPeBlN/hdvqRp0+w dRzatjR5dNuXup5LNk47D73EIq3WiEo= X-Google-Smtp-Source: ANB0VdYxKXS9DKZqc4HUUp6YjKwx5z1x/bqpvvAYJ60DWXgG5FhYBRCXHyOzRRT7b174Q8q53XAIDg== X-Received: by 2002:a5d:5685:: with SMTP id f5-v6mr17205176wrv.58.1536609887780; Mon, 10 Sep 2018 13:04:47 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id y12-v6sm11219951wrq.33.2018.09.10.13.04.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:04:46 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com, wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com, shahed.shaikh@cavium.com, amr.mokhtar@intel.com, shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com, peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com, maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com, antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com, yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net Date: Mon, 10 Sep 2018 21:04:06 +0100 Message-Id: <20180910200415.8340-7-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180910200415.8340-1-bluca@debian.org> References: <20180910200415.8340-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 06/15] build: add Meson file for bbdev_null PMD 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" Signed-off-by: Luca Boccassi --- drivers/baseband/meson.build | 7 +++++++ drivers/baseband/null/meson.build | 7 +++++++ drivers/meson.build | 1 + 3 files changed, 15 insertions(+) create mode 100644 drivers/baseband/meson.build create mode 100644 drivers/baseband/null/meson.build diff --git a/drivers/baseband/meson.build b/drivers/baseband/meson.build new file mode 100644 index 0000000000..52489df354 --- /dev/null +++ b/drivers/baseband/meson.build @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi + +drivers = ['null'] + +config_flag_fmt = 'RTE_LIBRTE_@0@_PMD' +driver_name_fmt = 'rte_pmd_@0@' diff --git a/drivers/baseband/null/meson.build b/drivers/baseband/null/meson.build new file mode 100644 index 0000000000..64c29d8600 --- /dev/null +++ b/drivers/baseband/null/meson.build @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi + +deps += ['bbdev', 'bus_vdev', 'ring'] +name = 'bbdev_null' +allow_experimental_apis = true +sources = files('bbdev_null.c') diff --git a/drivers/meson.build b/drivers/meson.build index f94e2fe672..14e335ec1d 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -9,6 +9,7 @@ driver_classes = ['common', 'crypto', # depends on common, bus and mempool (net in future). 'compress', # depends on common, bus, mempool. 'event', # depends on common, bus, mempool and net. + 'baseband', # depends on common and bus. 'raw'] # depends on common, bus, mempool, net and event. default_cflags = machine_args From patchwork Mon Sep 10 20:04:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44541 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 904C25B1E; Mon, 10 Sep 2018 22:04:52 +0200 (CEST) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by dpdk.org (Postfix) with ESMTP id 09CE95592 for ; Mon, 10 Sep 2018 22:04:50 +0200 (CEST) Received: by mail-wm0-f66.google.com with SMTP id f21-v6so22794979wmc.5 for ; Mon, 10 Sep 2018 13:04:50 -0700 (PDT) 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=UnP5f32vufwdrde5lYIQyEPqYWIqpJt0nPi/ETyZW64=; b=qgqJn1fcErv+YQRrL9gZt9yLsvk2XMiduHQ9fPczVBA3pZpbBwtP2MJXTgWIzsPtM4 y1OGNuNgucl8BFzz9N7yo4Ioyy7K0Qucq+dr4Xy77fngioa08enLH6hmukLr0+BK/tha 40OWzWSTb1/ig3d8s0RVKnlHHvZ7TSsoxKrkno1Z7N0OQtxHbFSUDTmj5GAg+mPeHsyY gWmAJB1jOPGg8JUbqqYF7/3iOJBlc60Xj8Ksca3Z+n5s+YzhvU1sdFiy4Zxvs5qpk/At /W8Xdi5hzvIRiRl1Vh8LQY0opoS6bge0MjncypeKREIAaBxLhkXpG3orUQ7YgnBi+tnN nVKw== X-Gm-Message-State: APzg51A9zmFZxsBPblnmrkBe5d1af++xYLqYY/XhtM5unvcWSPJgS5Da ffwyjypnOgC6SwVm5ygnrZ6adVNlWgM= X-Google-Smtp-Source: ANB0VdbCBx8tB7r0EMYec6CqgbEYZ0cKiknYjAGH53oudkA9xedvABmsZX7u5XhHCNQcbHtImMPCcQ== X-Received: by 2002:a1c:168a:: with SMTP id 132-v6mr1869759wmw.13.1536609889531; Mon, 10 Sep 2018 13:04:49 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id s131-v6sm19651475wmf.2.2018.09.10.13.04.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:04:48 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com, wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com, shahed.shaikh@cavium.com, amr.mokhtar@intel.com, shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com, peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com, maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com, antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com, yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net Date: Mon, 10 Sep 2018 21:04:07 +0100 Message-Id: <20180910200415.8340-8-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180910200415.8340-1-bluca@debian.org> References: <20180910200415.8340-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 07/15] net/liquidio: rename version map after library file name 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" The library is called librte_pmd_lio, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the same Fixes: bad475c03fee ("net/liquidio: add to meson build") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi --- drivers/net/liquidio/Makefile | 2 +- drivers/net/liquidio/meson.build | 1 + .../{rte_pmd_liquidio_version.map => rte_pmd_lio_version.map} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename drivers/net/liquidio/{rte_pmd_liquidio_version.map => rte_pmd_lio_version.map} (100%) diff --git a/drivers/net/liquidio/Makefile b/drivers/net/liquidio/Makefile index f1092851a9..fc5f18ad63 100644 --- a/drivers/net/liquidio/Makefile +++ b/drivers/net/liquidio/Makefile @@ -15,7 +15,7 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs LDLIBS += -lrte_bus_pci -EXPORT_MAP := rte_pmd_liquidio_version.map +EXPORT_MAP := rte_pmd_lio_version.map LIBABIVER := 1 diff --git a/drivers/net/liquidio/meson.build b/drivers/net/liquidio/meson.build index 9ae48e2139..83d002f557 100644 --- a/drivers/net/liquidio/meson.build +++ b/drivers/net/liquidio/meson.build @@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +name = 'lio' sources = files('base/lio_23xx_vf.c', 'base/lio_mbox.c', 'lio_ethdev.c', diff --git a/drivers/net/liquidio/rte_pmd_liquidio_version.map b/drivers/net/liquidio/rte_pmd_lio_version.map similarity index 100% rename from drivers/net/liquidio/rte_pmd_liquidio_version.map rename to drivers/net/liquidio/rte_pmd_lio_version.map From patchwork Mon Sep 10 20:04:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44542 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 30B685B2E; Mon, 10 Sep 2018 22:04:54 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id A51635A6E for ; Mon, 10 Sep 2018 22:04:51 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id v90-v6so23313161wrc.0 for ; Mon, 10 Sep 2018 13:04:51 -0700 (PDT) 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=m4O6nLvUM5Gyc3zsSou4MsiMd70euGw7i91YAv35qPQ=; b=kwSjesahnJH0/9TmxtgBjlyhUZGHwabGCNJWUTrTZ/K01WFExVnDLlsFy9xTHO7p4f EFz6rm60jjekiWzTtDopQf+SrOnTu5VmRISaOEghux5mfcIiuShOrbeYkHlAizg/UDIy iGFZurl5SnweMpKZNDS8TEV+e69H9vdabfQv3DkWdj+KhK2ICrVcmCNV22VZTNKpl5mN G8PU2FQTJYvafnRUfJbncvvWBIyy/smVAlVg36ymrWBBSFp8At82V2raspdD0uzod4qT uMF/Y7YgUPJFpqMlxC5dGm8eWfgfl0tiS193Zi9A7CxakFDR8lvKe/Op9ET44OCze59W pXUA== X-Gm-Message-State: APzg51Cm4CPkOW7xCDFiOT5yMz14fK0D4pfrTjUU1AnJUWqBpjWBBNet VQCATt5hQu9KVNHGKStJHP7jdLf9+tw= X-Google-Smtp-Source: ANB0VdYVg6p5tl8dvXKoOUSizCnyHd+pmriv3yery+L9GbY0/Ech5jturRAsf3bQC3T9ZIRMgcc1Hg== X-Received: by 2002:a5d:4d82:: with SMTP id b2-v6mr15368043wru.80.1536609891158; Mon, 10 Sep 2018 13:04:51 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id s10-v6sm19192375wrw.35.2018.09.10.13.04.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:04:50 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com, wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com, shahed.shaikh@cavium.com, amr.mokhtar@intel.com, shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com, peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com, maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com, antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com, yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net Date: Mon, 10 Sep 2018 21:04:08 +0100 Message-Id: <20180910200415.8340-9-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180910200415.8340-1-bluca@debian.org> References: <20180910200415.8340-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 08/15] event/opdl: rename map file to match library name 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" So that it can be used from Meson as well Signed-off-by: Luca Boccassi --- drivers/event/opdl/Makefile | 2 +- ...md_evdev_opdl_version.map => rte_pmd_opdl_event_version.map} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename drivers/event/opdl/{rte_pmd_evdev_opdl_version.map => rte_pmd_opdl_event_version.map} (100%) diff --git a/drivers/event/opdl/Makefile b/drivers/event/opdl/Makefile index cea8118d36..bf50a60a0b 100644 --- a/drivers/event/opdl/Makefile +++ b/drivers/event/opdl/Makefile @@ -24,7 +24,7 @@ LDLIBS += -lrte_bus_vdev -lrte_mbuf -lrte_mempool LIBABIVER := 1 # versioning export map -EXPORT_MAP := rte_pmd_evdev_opdl_version.map +EXPORT_MAP := rte_pmd_opdl_event_version.map # library source files SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_ring.c diff --git a/drivers/event/opdl/rte_pmd_evdev_opdl_version.map b/drivers/event/opdl/rte_pmd_opdl_event_version.map similarity index 100% rename from drivers/event/opdl/rte_pmd_evdev_opdl_version.map rename to drivers/event/opdl/rte_pmd_opdl_event_version.map From patchwork Mon Sep 10 20:04:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44543 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 E5E315B40; Mon, 10 Sep 2018 22:04:55 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 9D3FA5B2C for ; Mon, 10 Sep 2018 22:04:53 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id a108-v6so23229964wrc.13 for ; Mon, 10 Sep 2018 13:04:53 -0700 (PDT) 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=/532KbnSXe9LZ4MvMof4949WxPUwm3/AVHUJms+N6t0=; b=awexv+XkM5AihTfSiCu78dqS2C6I73GE8TwFNlmHNRiWRGGwgI8ls/ZYDqOxRap0XH MDAuzKd8yqlIG/C2MRXU10FY1IocQacXd04AxpyzZqutR6cXnPAfYMkTqmF7ZlmNlYY7 UeWU94sE79pqeeW+cN08SJXYMwjPfvtyokA34E3f1Q+4qdGTIKUQvpdjq0Bn2PdjqDUO Nu0yjyDR11QgKkr+iD3ikwjcRBVwh1OMTPDXHK2dwaYN5/raAdgsNlbOHNZ6I3OjqPgv ddniO+q3rqjnWoVzezHN80zmgrFXZkrQUD8R2vOQiGH9DHswZwQbqpiCmdMKCn45om1X jhfA== X-Gm-Message-State: APzg51C1WCHnwzzWY7yf4SfzeWR4zF7izn62zQGGn1QJg7ux9jU3JtHW WbQkFa9WhbSKkn9hTPja2XRaeP6mG6U= X-Google-Smtp-Source: ANB0VdbMlBVw377R0Aek3xlGwGqCxSvocNIHMyvtamOI7BRgX5I613W+Hx0KwFWzzv8RUztsokNwxw== X-Received: by 2002:adf:a41c:: with SMTP id d28-v6mr15582961wra.121.1536609892846; Mon, 10 Sep 2018 13:04:52 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id i125-v6sm24099586wmd.23.2018.09.10.13.04.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:04:51 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com, wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com, shahed.shaikh@cavium.com, amr.mokhtar@intel.com, shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com, peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com, maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com, antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com, yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net Date: Mon, 10 Sep 2018 21:04:09 +0100 Message-Id: <20180910200415.8340-10-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180910200415.8340-1-bluca@debian.org> References: <20180910200415.8340-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 09/15] build: add Meson file for opdl_event PMD 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" Signed-off-by: Luca Boccassi --- drivers/event/meson.build | 2 +- drivers/event/opdl/meson.build | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 drivers/event/opdl/meson.build diff --git a/drivers/event/meson.build b/drivers/event/meson.build index e951199358..ed56d20062 100644 --- a/drivers/event/meson.build +++ b/drivers/event/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -drivers = ['dpaa', 'dpaa2', 'octeontx', 'skeleton', 'sw'] +drivers = ['dpaa', 'dpaa2', 'octeontx', 'opdl', 'skeleton', 'sw'] std_deps = ['eventdev', 'kvargs'] config_flag_fmt = 'RTE_LIBRTE_@0@_EVENTDEV_PMD' driver_name_fmt = 'rte_pmd_@0@_event' diff --git a/drivers/event/opdl/meson.build b/drivers/event/opdl/meson.build new file mode 100644 index 0000000000..cc6029c6f0 --- /dev/null +++ b/drivers/event/opdl/meson.build @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi + +sources = files( + 'opdl_evdev.c', + 'opdl_evdev_init.c', + 'opdl_evdev_xstats.c', + 'opdl_ring.c', + 'opdl_test.c', +) +deps += ['bus_vdev'] From patchwork Mon Sep 10 20:04:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44544 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 CF4075F19; Mon, 10 Sep 2018 22:04:57 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 986935B3A for ; Mon, 10 Sep 2018 22:04:55 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id j26-v6so23289898wre.2 for ; Mon, 10 Sep 2018 13:04:55 -0700 (PDT) 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=Oss94w3tgkpPBPdHJLgmZp85Bv3lWeCBPBQVgvMdRw4=; b=QfIAVrR9D3YB1BsbR2Ce8vF/Tl/AU+JkhVU5TVn6WgPvgUJ0/1gBdAmNHFK60oDypY yr14FEZiT/tCg7rRozyZUF+MCiHnAHGoqc/HrKS7GW0WhNOAN1+R0RiMxMr+JfDHes4+ 2TqdV1KODs2rtsp0x6r6C7CDj5LpmugX0Qf0OAxJ5QCIYATlcKrK8UCNyMY7J4LLJ+SW /ePZN2cW9h0v6+AEFYvkWbtFfIZcJjXO0R4wTfvkS4W8D514ZdFKS6718YPtdxxf2BPO Jy7y+tU/DiyhrttJhuaseaXe/mAR0e/uh/WSPeUTIpAzLXnuEBurDFQxNHgBBIMAtAKf Afag== X-Gm-Message-State: APzg51CnPA6n3hGlmJWBesDgm7Hu7xnN38HJRG5VJ51w+Q0O/fJs2SgQ GduBul2szU6H8YBVa0gOqPVMm/Wj63w= X-Google-Smtp-Source: ANB0VdaXBCup9Xy+Po+KFBex+rsnD8HqzFUetQnar9UrhZGqQylKcGJirQ3bxThCkWqDrTmPJu2u+g== X-Received: by 2002:adf:b609:: with SMTP id f9-v6mr15051212wre.14.1536609894901; Mon, 10 Sep 2018 13:04:54 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id g7-v6sm14447804wrw.30.2018.09.10.13.04.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:04:53 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com, wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com, shahed.shaikh@cavium.com, amr.mokhtar@intel.com, shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com, peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com, maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com, antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com, yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net Date: Mon, 10 Sep 2018 21:04:10 +0100 Message-Id: <20180910200415.8340-11-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180910200415.8340-1-bluca@debian.org> References: <20180910200415.8340-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 10/15] net/thunderx: rename version map after library file name 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" The library is called librte_pmd_thunderx_nicvf, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the same Fixes: 7f615033d64f ("drivers/net: build Cavium NIC PMDs with meson") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi --- drivers/net/thunderx/Makefile | 2 +- drivers/net/thunderx/meson.build | 1 + ..._thunderx_version.map => rte_pmd_thunderx_nicvf_version.map} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename drivers/net/thunderx/{rte_pmd_thunderx_version.map => rte_pmd_thunderx_nicvf_version.map} (100%) diff --git a/drivers/net/thunderx/Makefile b/drivers/net/thunderx/Makefile index e6bf497522..cc008bd3a4 100644 --- a/drivers/net/thunderx/Makefile +++ b/drivers/net/thunderx/Makefile @@ -16,7 +16,7 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs LDLIBS += -lrte_bus_pci -EXPORT_MAP := rte_pmd_thunderx_version.map +EXPORT_MAP := rte_pmd_thunderx_nicvf_version.map LIBABIVER := 1 diff --git a/drivers/net/thunderx/meson.build b/drivers/net/thunderx/meson.build index 69819a97fa..0c1207455e 100644 --- a/drivers/net/thunderx/meson.build +++ b/drivers/net/thunderx/meson.build @@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Cavium, Inc +name = 'thunderx_nicvf' subdir('base') objs = [base_objs] diff --git a/drivers/net/thunderx/rte_pmd_thunderx_version.map b/drivers/net/thunderx/rte_pmd_thunderx_nicvf_version.map similarity index 100% rename from drivers/net/thunderx/rte_pmd_thunderx_version.map rename to drivers/net/thunderx/rte_pmd_thunderx_nicvf_version.map From patchwork Mon Sep 10 20:04:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44545 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 4A4EF5F21; Mon, 10 Sep 2018 22:04:59 +0200 (CEST) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by dpdk.org (Postfix) with ESMTP id 0B2D55F1C for ; Mon, 10 Sep 2018 22:04:58 +0200 (CEST) Received: by mail-wm0-f68.google.com with SMTP id f21-v6so22795360wmc.5 for ; Mon, 10 Sep 2018 13:04:58 -0700 (PDT) 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=8m7QFNGyWo96VSQcAlezET6YwNk+j6BIO3hXz/AZ7Ac=; b=axsZU2tobQQPmvYtMNjYkZ5VxABER6nrfjP7q+Wq+EFSp8BDhRWR+T759eIR4OhIkt NadyBONAyY/581oCHbLTi7XYYEXA+U1UIYUy4f1mSyQIw0zxV+VOoYL31VnjJ7qiDZ1P KEU6Z+kwH5qC6XtNT3yqmVaYRm7Ope++h4TVsq6MBjtXJtav8U/2gqmIicCgL4Pswy4P lPm5IwE5V1el+HAkvn6LPx2LyapiGzP0ZNcgqKwGN+u8jdIwsYw79OzVIuU87TtQn+lS rpptW8+blbGVWfOoQY4D1xoqrJCspA4PWwfRtOUeInpRVUMm5NqQq4QSVbpajK9ybYNG MhUw== X-Gm-Message-State: APzg51AkDHXPh2AdVJVxQNmriC07Yi8g1Jsr3xbZuG79pcp7KspWNBSr Hvru8OPM8q3E9IwGtapfp1Z+ZPBwZ8c= X-Google-Smtp-Source: ANB0VdY1++BEb0z+jIJjc3Hu11dlIy3l1xGqb7X5EWF5JjrtruahK7YegROkD7Nfm9uRe3cUmWpNug== X-Received: by 2002:a1c:e141:: with SMTP id y62-v6mr1892151wmg.138.1536609896718; Mon, 10 Sep 2018 13:04:56 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id l10-v6sm15629922wre.0.2018.09.10.13.04.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:04:55 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com, wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com, shahed.shaikh@cavium.com, amr.mokhtar@intel.com, shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com, peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com, maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com, antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com, yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net Date: Mon, 10 Sep 2018 21:04:11 +0100 Message-Id: <20180910200415.8340-12-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180910200415.8340-1-bluca@debian.org> References: <20180910200415.8340-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 11/15] net/sfc: rename version map after library file name 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" The library is called librte_pmd_sfc_efx, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the same Fixes: bfa8d5990cd6 ("net/sfc: support meson build") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi --- drivers/net/sfc/Makefile | 2 +- drivers/net/sfc/meson.build | 2 ++ .../{rte_pmd_sfc_version.map => rte_pmd_sfc_efx_version.map} | 0 3 files changed, 3 insertions(+), 1 deletion(-) rename drivers/net/sfc/{rte_pmd_sfc_version.map => rte_pmd_sfc_efx_version.map} (100%) diff --git a/drivers/net/sfc/Makefile b/drivers/net/sfc/Makefile index 3bb41a0001..2825649599 100644 --- a/drivers/net/sfc/Makefile +++ b/drivers/net/sfc/Makefile @@ -60,7 +60,7 @@ BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*. $(foreach obj, $(BASE_DRIVER_OBJS), \ $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER))) -EXPORT_MAP := rte_pmd_sfc_version.map +EXPORT_MAP := rte_pmd_sfc_efx_version.map LIBABIVER := 1 diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build index 2d34e869d8..d6572b82c0 100644 --- a/drivers/net/sfc/meson.build +++ b/drivers/net/sfc/meson.build @@ -6,6 +6,8 @@ # This software was jointly developed between OKTET Labs (under contract # for Solarflare) and Solarflare Communications, Inc. +name = 'sfc_efx' + if arch_subdir != 'x86' or cc.sizeof('void *') == 4 build = false endif diff --git a/drivers/net/sfc/rte_pmd_sfc_version.map b/drivers/net/sfc/rte_pmd_sfc_efx_version.map similarity index 100% rename from drivers/net/sfc/rte_pmd_sfc_version.map rename to drivers/net/sfc/rte_pmd_sfc_efx_version.map From patchwork Mon Sep 10 20:04:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44546 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 B72425F1F; Mon, 10 Sep 2018 22:05:02 +0200 (CEST) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id 2EF6B5F28 for ; Mon, 10 Sep 2018 22:05:01 +0200 (CEST) Received: by mail-wm0-f65.google.com with SMTP id t25-v6so22672022wmi.3 for ; Mon, 10 Sep 2018 13:05:01 -0700 (PDT) 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=PSBA1oTeI9juL56QlZ5eG8sOdLUGDzoZn1QsBDPQd2E=; b=AToNTAspEs9kt5GZRl/BpphwD8/cxA37ENzUUmX/mG7H0Wjp4p1h39pdDEkHJFbp96 +lj617b2GDXnHHmbyTgVo4dFUr/SxhscRjMUeKxasSj7BrBqRFVodCa0TKKiufpdcaUJ 7EDelzVsFl7fdYQwIpiOeU47wlQnaici4uNq1Ak4z3Gy1ExRYZMBL7OIq1j6Nu5+7iC4 rjip4Avk3gZd6P1jGGsWNL2F5qP8nvQqXdooRccIhXgyMgnNO7wSGFT/sqH+r9818oNj 1zFGTzjEcvqgRmGya0K3UkiJisaSTPaz1Y0HvWDsUU25CD2pRJpJKzmN4TzzQrAkAIwL 2W8w== X-Gm-Message-State: APzg51DLagwyzoiZl2GGQgFOrcCQ7dHoQ/7++OMVQEALZyvLxoPR+hQ2 VdF5YlmSUJjLxP+foj2mBpeYI6RoQEw= X-Google-Smtp-Source: ANB0VdYEMAf8bITe00bA9Hn0HlDwPxkZZqFdZnkpzJXzYk32I4BFmJMHjaT1DojTbEyzslxJxsm4xQ== X-Received: by 2002:a1c:8291:: with SMTP id e139-v6mr1908440wmd.39.1536609900633; Mon, 10 Sep 2018 13:05:00 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id f18-v6sm17274930wrw.32.2018.09.10.13.04.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:04:58 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com, wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com, shahed.shaikh@cavium.com, amr.mokhtar@intel.com, shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com, peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com, maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com, antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com, yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net Date: Mon, 10 Sep 2018 21:04:12 +0100 Message-Id: <20180910200415.8340-13-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180910200415.8340-1-bluca@debian.org> References: <20180910200415.8340-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 12/15] event/octeontx: rename version map after library file name 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" The library is called librte_pmd_octeonx_ssovf, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the same. Also refactor how the event PMDs library names are built in Meson to allow for this discrepancy in the octeonx driver (all other PMDs are called FOO_event, while this is called octeonx_ssovf) Fixes: bd77f2d64c44 ("event/octeontx: build with meson") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi --- drivers/event/dpaa/meson.build | 1 + drivers/event/dpaa2/meson.build | 1 + drivers/event/meson.build | 2 +- drivers/event/octeontx/Makefile | 2 +- drivers/event/octeontx/meson.build | 1 + ...ntx_event_version.map => rte_pmd_octeontx_ssovf_version.map} | 0 drivers/event/opdl/meson.build | 1 + drivers/event/skeleton/meson.build | 1 + drivers/event/sw/meson.build | 1 + 9 files changed, 8 insertions(+), 2 deletions(-) rename drivers/event/octeontx/{rte_pmd_octeontx_event_version.map => rte_pmd_octeontx_ssovf_version.map} (100%) diff --git a/drivers/event/dpaa/meson.build b/drivers/event/dpaa/meson.build index 0914f858ef..da65aee179 100644 --- a/drivers/event/dpaa/meson.build +++ b/drivers/event/dpaa/meson.build @@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP +name = 'dpaa_event' if host_machine.system() != 'linux' build = false endif diff --git a/drivers/event/dpaa2/meson.build b/drivers/event/dpaa2/meson.build index de7a461553..dd38643811 100644 --- a/drivers/event/dpaa2/meson.build +++ b/drivers/event/dpaa2/meson.build @@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP +name = 'dpaa2_event' if host_machine.system() != 'linux' build = false endif diff --git a/drivers/event/meson.build b/drivers/event/meson.build index ed56d20062..245a98ec93 100644 --- a/drivers/event/meson.build +++ b/drivers/event/meson.build @@ -4,4 +4,4 @@ drivers = ['dpaa', 'dpaa2', 'octeontx', 'opdl', 'skeleton', 'sw'] std_deps = ['eventdev', 'kvargs'] config_flag_fmt = 'RTE_LIBRTE_@0@_EVENTDEV_PMD' -driver_name_fmt = 'rte_pmd_@0@_event' +driver_name_fmt = 'rte_pmd_@0@' diff --git a/drivers/event/octeontx/Makefile b/drivers/event/octeontx/Makefile index 90ad2217f3..6aeaa2bb9d 100644 --- a/drivers/event/octeontx/Makefile +++ b/drivers/event/octeontx/Makefile @@ -19,7 +19,7 @@ LDLIBS += -lrte_eal -lrte_eventdev -lrte_common_octeontx -lrte_pmd_octeontx LDLIBS += -lrte_bus_pci -lrte_mempool -lrte_mbuf -lrte_kvargs LDLIBS += -lrte_bus_vdev -EXPORT_MAP := rte_pmd_octeontx_event_version.map +EXPORT_MAP := rte_pmd_octeontx_ssovf_version.map LIBABIVER := 1 diff --git a/drivers/event/octeontx/meson.build b/drivers/event/octeontx/meson.build index 0418553308..48b3ffea52 100644 --- a/drivers/event/octeontx/meson.build +++ b/drivers/event/octeontx/meson.build @@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Cavium, Inc +name = 'octeontx_ssovf' sources = files('ssovf_worker.c', 'ssovf_evdev.c', 'ssovf_evdev_selftest.c', diff --git a/drivers/event/octeontx/rte_pmd_octeontx_event_version.map b/drivers/event/octeontx/rte_pmd_octeontx_ssovf_version.map similarity index 100% rename from drivers/event/octeontx/rte_pmd_octeontx_event_version.map rename to drivers/event/octeontx/rte_pmd_octeontx_ssovf_version.map diff --git a/drivers/event/opdl/meson.build b/drivers/event/opdl/meson.build index cc6029c6f0..6083a7e78a 100644 --- a/drivers/event/opdl/meson.build +++ b/drivers/event/opdl/meson.build @@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Luca Boccassi +name = 'opdl_event' sources = files( 'opdl_evdev.c', 'opdl_evdev_init.c', diff --git a/drivers/event/skeleton/meson.build b/drivers/event/skeleton/meson.build index acfe156532..0995cf50cb 100644 --- a/drivers/event/skeleton/meson.build +++ b/drivers/event/skeleton/meson.build @@ -1,5 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +name = 'skeleton_event' sources = files('skeleton_eventdev.c') deps += ['bus_pci', 'bus_vdev'] diff --git a/drivers/event/sw/meson.build b/drivers/event/sw/meson.build index 30d2216476..9dd55743aa 100644 --- a/drivers/event/sw/meson.build +++ b/drivers/event/sw/meson.build @@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +name = 'sw_event' allow_experimental_apis = true sources = files('sw_evdev_scheduler.c', 'sw_evdev_selftest.c', From patchwork Mon Sep 10 20:04:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44547 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 3664B5F2F; Mon, 10 Sep 2018 22:05:06 +0200 (CEST) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by dpdk.org (Postfix) with ESMTP id 902C85F2D for ; Mon, 10 Sep 2018 22:05:04 +0200 (CEST) Received: by mail-wm0-f67.google.com with SMTP id o18-v6so22803558wmc.0 for ; Mon, 10 Sep 2018 13:05:04 -0700 (PDT) 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=WUH+FA4iuDt5aESNSwt0iCstJfWSGS/CWT4+7h0ShaE=; b=YbmbxQW2twexRd7Ku86Q6Q7dl2oGDDzCoVizr3TWiNrIhLEjhV8YA+/GVXJMZVoiMc EBD1Xvoo4LmE44Xx628RZgwkZeWdj7dZSLLZSDSESaKxJrsb2N8l4vya5tB+9+NLNA3q NFTc95iLWSKKthOp9U2u4GXuqAT763AKI4L0ornT0itT9pKldsWq3Faebs1FSgijdi9C SU7KYIjx3h2I0v4Cx8f0DKB5btt1ECkK1bdBxMR89tZKCgrCvhQx25/6lgzy6ctGcKHX krRhpcebyNM2wEzyAi13X+mmXNy1u0Y2mErl3halOQWURnH/+DEJ07H11WcArNQbZpq7 lP/Q== X-Gm-Message-State: APzg51DpKryrOJV/7/jJz59hp3NvzG56e+wscAzVRzKdi6yeR5Z656aU BHcutPueErGRJfhlwVNIlqIenNJkpfI= X-Google-Smtp-Source: ANB0VdausX3uCbB9VFlA5Eb2YEA68xXDADLFk3KA62m0Ciq27QTqgb0WlH+CiEZToQr7ekRU6+aHTQ== X-Received: by 2002:a1c:4182:: with SMTP id o124-v6mr1904976wma.101.1536609903915; Mon, 10 Sep 2018 13:05:03 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id z13sm18329491wrw.19.2018.09.10.13.05.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:05:02 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com, wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com, shahed.shaikh@cavium.com, amr.mokhtar@intel.com, shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com, peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com, maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com, antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com, yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net Date: Mon, 10 Sep 2018 21:04:13 +0100 Message-Id: <20180910200415.8340-14-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180910200415.8340-1-bluca@debian.org> References: <20180910200415.8340-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 13/15] compress/octeontx: rename version map after library file name 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" The library is called librte_pmd_octeonx_compress, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the same Fixes: 43e610bb8565 ("compress/octeontx: introduce octeontx zip PMD") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi --- drivers/compress/octeontx/Makefile | 2 +- drivers/compress/octeontx/meson.build | 2 +- ...tx_compress_version.map => rte_pmd_octeontx_zip_version.map} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename drivers/compress/octeontx/{rte_pmd_octeontx_compress_version.map => rte_pmd_octeontx_zip_version.map} (100%) diff --git a/drivers/compress/octeontx/Makefile b/drivers/compress/octeontx/Makefile index f34424c87f..0499004402 100644 --- a/drivers/compress/octeontx/Makefile +++ b/drivers/compress/octeontx/Makefile @@ -25,6 +25,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += otx_zip_pmd.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += otx_zip.c # versioning export map -EXPORT_MAP := rte_pmd_octeontx_compress_version.map +EXPORT_MAP := rte_pmd_octeontx_zip_version.map include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/compress/octeontx/meson.build b/drivers/compress/octeontx/meson.build index 7cd202d07a..520d19684b 100644 --- a/drivers/compress/octeontx/meson.build +++ b/drivers/compress/octeontx/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Cavium, Inc -name = 'octeontx_compress' +name = 'octeontx_zip' sources = files('otx_zip.c', 'otx_zip_pmd.c') allow_experimental_apis = true includes += include_directories('include') diff --git a/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map b/drivers/compress/octeontx/rte_pmd_octeontx_zip_version.map similarity index 100% rename from drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map rename to drivers/compress/octeontx/rte_pmd_octeontx_zip_version.map From patchwork Mon Sep 10 20:04:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44548 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 1630F5F3C; Mon, 10 Sep 2018 22:05:10 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id E89395F34 for ; Mon, 10 Sep 2018 22:05:07 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id e1-v6so14203973wrt.3 for ; Mon, 10 Sep 2018 13:05:07 -0700 (PDT) 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=OgqA3pAppsA8jw+BNLHwLMLopskz9fUmcQtGwC6OE5M=; b=XSjtAcqMGs3FbwavW+jW+kioJzuufSJBatztf/X2/Ei1sIezfiFpFiI1v2e0NLh5QU GVWZ3QWl/Xo/JSovAsCOozXQHeY4AdQCyREgyZ1pgW8yiCb1lVi5+t7Hj4hGkla2xLTf hlCnoZZpcbr/ZYSJC/B4ClU7U+R/BekeMCBCIExI+hh3LGxk6YihTkIFqaodH4ZwIiZQ kHH32vYN90mJMy/GtGVUxytc65Tlxti/xiTSMlqlN2n1g5woJkk7bJHlyFzN5wp+LG1o ZnpEafTzcKjiXIIxet8cWyp23mhaW4nlws0mqQK7zeDhv5GQ5AFNJqL1tO1klx2x+dn+ diKw== X-Gm-Message-State: APzg51CHSiShPSDLLLYPVrWs284rvit8WL6WLb3lLMKKylbSqJ+BZDtM MpD28PebMT3CTeNeQtJaP85Hvfht9yY= X-Google-Smtp-Source: ANB0Vdaj2GpGzTHwnV8mluLkkrmm9z3kM5r1d4rRqbJHcwrFPteA+CMWuMOWeNpCtKTo/ivID+cIPQ== X-Received: by 2002:adf:9081:: with SMTP id i1-v6mr17069308wri.271.1536609906567; Mon, 10 Sep 2018 13:05:06 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id 1-v6sm28429893wmf.47.2018.09.10.13.05.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:05:05 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com, wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com, shahed.shaikh@cavium.com, amr.mokhtar@intel.com, shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com, peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com, maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com, antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com, yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net Date: Mon, 10 Sep 2018 21:04:14 +0100 Message-Id: <20180910200415.8340-15-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180910200415.8340-1-bluca@debian.org> References: <20180910200415.8340-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 14/15] net/vmxnet3: rename version map after library file name 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" The library is called librte_pmd_vmxnet3_uio, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the same Signed-off-by: Luca Boccassi --- drivers/net/vmxnet3/Makefile | 2 +- ..._pmd_vmxnet3_version.map => rte_pmd_vmxnet3_uio_version.map} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename drivers/net/vmxnet3/{rte_pmd_vmxnet3_version.map => rte_pmd_vmxnet3_uio_version.map} (100%) diff --git a/drivers/net/vmxnet3/Makefile b/drivers/net/vmxnet3/Makefile index f1141da674..9848cd224f 100644 --- a/drivers/net/vmxnet3/Makefile +++ b/drivers/net/vmxnet3/Makefile @@ -43,7 +43,7 @@ LDLIBS += -lrte_bus_pci VPATH += $(SRCDIR)/base -EXPORT_MAP := rte_pmd_vmxnet3_version.map +EXPORT_MAP := rte_pmd_vmxnet3_uio_version.map LIBABIVER := 1 diff --git a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map b/drivers/net/vmxnet3/rte_pmd_vmxnet3_uio_version.map similarity index 100% rename from drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map rename to drivers/net/vmxnet3/rte_pmd_vmxnet3_uio_version.map From patchwork Mon Sep 10 20:04:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44549 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 4D7145F54; Mon, 10 Sep 2018 22:05:14 +0200 (CEST) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by dpdk.org (Postfix) with ESMTP id 67B1A5F34 for ; Mon, 10 Sep 2018 22:05:09 +0200 (CEST) Received: by mail-wm0-f68.google.com with SMTP id b19-v6so22835146wme.3 for ; Mon, 10 Sep 2018 13:05:09 -0700 (PDT) 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=Mm4oZ5TfXmK6sWxV4yf4+ruC3Gf9VMgMVQtoyk1ohzc=; b=k6WUB+89nce3ZcALN8M30tpgnXcFfyr03YFMOu1jtLpmheonxaAczn9KjxH0eG50ve M6P86hcZQl88UdNIqXu58pD4ZZymbPWV7kCdcYJ00/jrY4vYczkizUu/ySRayQWB+Zt5 Rgl3P9EDzelgdxHp+1vSbWDpQNrJggwVp84UQPxWdBw58LTXEqe/vfix3IOrV/kYRXOT opPNTJssYbwjqfcM9oooE9mrWpAYG6n7SnB6H0TyVi89GJ4u6nD9H9MYNpvyWMLxeYMF U+2fFKm5Q7kafln6a7eZ6iI6DNhImksW1fDQiF2WAkRjVZz40EXZAwoHWS1+r6hOIscO Lt/Q== X-Gm-Message-State: APzg51A8px69XMBTmCTMfiH7MnM3MeWidRZ35jkbTTEkMlRRVBbHvk3U sKs8NHkUNJ0AIqYBgYoFm3Nq3pk+bEg= X-Google-Smtp-Source: ANB0VdZuZBiTI3nwXW9f7mvoZPf8lNKPqdXvznV9g7Qrq82/wduEtqrngZViJW2y5zZf7aRxqVPMfQ== X-Received: by 2002:a1c:c642:: with SMTP id w63-v6mr1741724wmf.3.1536609908263; Mon, 10 Sep 2018 13:05:08 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id h73-v6sm49519975wma.11.2018.09.10.13.05.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:05:07 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com, wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com, shahed.shaikh@cavium.com, amr.mokhtar@intel.com, shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com, peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com, maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com, antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com, yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net Date: Mon, 10 Sep 2018 21:04:15 +0100 Message-Id: <20180910200415.8340-16-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180910200415.8340-1-bluca@debian.org> References: <20180910200415.8340-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 15/15] build: add Meson file for vmxnet3_uio PMD 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" Signed-off-by: Luca Boccassi --- drivers/net/meson.build | 4 +++- drivers/net/vmxnet3/meson.build | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 drivers/net/vmxnet3/meson.build diff --git a/drivers/net/meson.build b/drivers/net/meson.build index 74f4109161..5906283c2f 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -32,7 +32,9 @@ drivers = ['af_packet', 'thunderx', 'vdev_netvsc', 'vhost', - 'virtio'] + 'virtio', + 'vmxnet3', +] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std std_deps += ['bus_vdev'] # same with vdev bus diff --git a/drivers/net/vmxnet3/meson.build b/drivers/net/vmxnet3/meson.build new file mode 100644 index 0000000000..0019661e81 --- /dev/null +++ b/drivers/net/vmxnet3/meson.build @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Luca Boccassi + +name = 'vmxnet3_uio' +allow_experimental_apis = true +sources += files( + 'vmxnet3_ethdev.c', + 'vmxnet3_rxtx.c', +) + +error_cflags = [ + '-Wno-unused-parameter', '-Wno-unused-value', + '-Wno-strict-aliasing', '-Wno-format-extra-args', +] +foreach flag: error_cflags + if cc.has_argument(flag) + cflags += flag + endif +endforeach