From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by dpdk.space (Postfix) with ESMTP id AD35FA0096
for <public@inbox.dpdk.org>; Thu, 6 Jun 2019 15:26:35 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 8A8FE1B95A;
Thu, 6 Jun 2019 15:26:34 +0200 (CEST)
Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com
[209.85.167.66]) by dpdk.org (Postfix) with ESMTP id D7DF11B959
for <dev@dpdk.org>; Thu, 6 Jun 2019 15:26:32 +0200 (CEST)
Received: by mail-lf1-f66.google.com with SMTP id y198so177589lfa.1
for <dev@dpdk.org>; Thu, 06 Jun 2019 06:26:32 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=nfware-com.20150623.gappssmtp.com; s=20150623;
h=from:to:subject:date:message-id:mime-version
:content-transfer-encoding;
bh=cFtsTlkOxX5/rkwAGMtgtEDVAXlAl96z1LG10RxFGOY=;
b=qQVboZ+AJ/lvzLv84eIdk1vWMviJFgUEqhEyAPNEOp7FVWf1MSstNxZ6h3fH8HvBov
zlD/I8jfkmFePY+5weeEoyia3CfGJbKYd28JrGXMssNMqyzzcm5wm1M8SwvnPIbTUmO9
k23lLLXGG+91qFlHxfMkgajUVggHOR0jj9K17pjPTv9nzM8RhyRjCR7oJXPsHbg0/G02
Gt/LiD+wLghakfA4VjBAimcTCPPfLQu0ty3Uuyvu2dWyhYaHYxTgSedO2eLe1lg5X/kV
X21WdBegHbbPYDrA68eimgbWgbHAQYBk1LAAN2/8XYmyRKFtvB80HPcobKSx9kt4mM0O
WaDA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:subject:date:message-id:mime-version
:content-transfer-encoding;
bh=cFtsTlkOxX5/rkwAGMtgtEDVAXlAl96z1LG10RxFGOY=;
b=ugW8EEF4j/1PXE+NMafpn070f8mWNeOcfSCAOG13Tbpgy8LhE3BeJy/zx8vAfg69fR
bnKJgYviiF0V482NX4jDWfuK3bAHQH+gJokV2H0CsCZkKT5mp/6glHRVHggZFqnyRlRS
dkv88M+FSVcCMUiSRrkA1RbEbpHgB40zqcUo0dvvK2QRJVp+Sgo7ncHEPNWHhsnp5zIs
Mz3VqRpth9mHTB5Jw1/dOVpDpI9hB3PKwEdlu5YO7nGBd6hUQjgUr9tWIBUk8QPei3aR
8yGyYNE+qMfyeAf+qwIC0M7THfCJCoaUOFWPm0mh7S70IwIIru8NtKmZlTwwcoGqcJZX
8eFQ==
X-Gm-Message-State: APjAAAXp0ssdGnImY4dUjjsILKrEGaHzaP7zuJArliwt7j6h89lDjUs0
nK4Dg2OXC7ki9r3q8k8AifiOIoZVJ0w=
X-Google-Smtp-Source: APXvYqwdEOOwBS1NCGjl6XpdnkvblEefpEjyrw1pkSs7CoRz5VWsKNmYHwOi5DYCQds5IWTOf3JBwA==
X-Received: by 2002:a05:6512:51c:: with SMTP id
o28mr6512378lfb.67.1559827592122;
Thu, 06 Jun 2019 06:26:32 -0700 (PDT)
Received: from localhost.localdomain ([212.48.63.198])
by smtp.gmail.com with ESMTPSA id p10sm354593ljh.50.2019.06.06.06.26.31
for <dev@dpdk.org>
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Thu, 06 Jun 2019 06:26:31 -0700 (PDT)
From: Igor Ryzhov <iryzhov@nfware.com>
To: dev@dpdk.org
Date: Thu, 6 Jun 2019 16:26:26 +0300
Message-Id: <20190606132626.56392-1-iryzhov@nfware.com>
X-Mailer: git-send-email 2.21.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH] kni: remove PCI related information
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
As there is no ethtool support in KNI anymore,
PCI related information is no longer needed.
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
---
kernel/linux/kni/kni_dev.h | 3 ---
kernel/linux/kni/kni_misc.c | 6 ------
lib/librte_eal/linux/eal/include/rte_kni_common.h | 7 -------
lib/librte_kni/rte_kni.c | 4 ----
4 files changed, 20 deletions(-)
diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h
index 44a5a61f7..d57bce647 100644
--- a/kernel/linux/kni/kni_dev.h
+++ b/kernel/linux/kni/kni_dev.h
@@ -50,9 +50,6 @@ struct kni_dev {
wait_queue_head_t wq;
struct mutex sync_lock;
- /* PCI device id */
- uint16_t device_id;
-
/* kni device */
struct net_device *net_dev;
diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c
index af18c67c4..1fc5eeb9c 100644
--- a/kernel/linux/kni/kni_misc.c
+++ b/kernel/linux/kni/kni_misc.c
@@ -377,12 +377,6 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
(unsigned long long) dev_info.resp_phys, kni->resp_q);
pr_debug("mbuf_size: %u\n", kni->mbuf_size);
- pr_debug("PCI: %02x:%02x.%02x %04x:%04x\n",
- dev_info.bus,
- dev_info.devid,
- dev_info.function,
- dev_info.vendor_id,
- dev_info.device_id);
/* if user has provided a valid mac address */
if (is_valid_ether_addr(dev_info.mac_addr))
memcpy(net_dev->dev_addr, dev_info.mac_addr, ETH_ALEN);
diff --git a/lib/librte_eal/linux/eal/include/rte_kni_common.h b/lib/librte_eal/linux/eal/include/rte_kni_common.h
index 5db5a1333..91a1c1408 100644
--- a/lib/librte_eal/linux/eal/include/rte_kni_common.h
+++ b/lib/librte_eal/linux/eal/include/rte_kni_common.h
@@ -111,13 +111,6 @@ struct rte_kni_device_info {
void * mbuf_va;
phys_addr_t mbuf_phys;
- /* PCI info */
- uint16_t vendor_id; /**< Vendor ID or PCI_ANY_ID. */
- uint16_t device_id; /**< Device ID or PCI_ANY_ID. */
- uint8_t bus; /**< Device bus */
- uint8_t devid; /**< Device ID */
- uint8_t function; /**< Device function. */
-
uint16_t group_id; /**< Group ID */
uint32_t core_id; /**< core ID to bind for kernel thread */
diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
index a0f1e3767..e29d0cc7d 100644
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -252,10 +252,6 @@ rte_kni_alloc(struct rte_mempool *pktmbuf_pool,
strlcpy(dev_info.name, conf->name, RTE_KNI_NAMESIZE);
- RTE_LOG(INFO, KNI, "pci: %02x:%02x:%02x \t %02x:%02x\n",
- dev_info.bus, dev_info.devid, dev_info.function,
- dev_info.vendor_id, dev_info.device_id);
-
ret = kni_reserve_mz(kni);
if (ret < 0)
goto mz_fail;
--
2.21.0