From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D39D6A051B; Wed, 10 Jun 2020 13:56:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D1A234C7A; Wed, 10 Jun 2020 13:50:20 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 14FD6397D for ; Wed, 10 Jun 2020 13:50:18 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 05ABf9VP011203; Wed, 10 Jun 2020 04:50:16 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0818; bh=kjVtwU297HZ9y9znsVzEGYme+r9LwGydywQ9qgmUebE=; b=oLEUAWYdpBi1izpGblFzvldDdaRNnx7KduWyDcMX2gyuMfVpHRXnlyrbAb393e79JMPD ZZ2rFeQuMYf0lLGCJSUpDm3zRRmHtb4t7XC3YJ+WCf4fgJb5XZw4QRmx5Zu99BMldeKi 97/54DBeyIKdbpfVJCvxf6EywYp2jVTc7ykgmHHieiitU4hL598McCb5aaUI/tWimGTa 7/7STbr8pKSQZCFzEY5DFUifoTRk5EL9zeMbTveSx6NfDLuS/vE8hKW73V2wcoitLU2z jod++VERJr7VBbHPhyGhtPlIuXXqG+KBxdnHMetBNrAgAZqpeuRMlC5FpjS+yvB5z++o cQ== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0a-0016f401.pphosted.com with ESMTP id 31j77dmrbw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 10 Jun 2020 04:50:15 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 10 Jun 2020 04:50:14 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 10 Jun 2020 04:50:15 -0700 Received: from jerin-lab.marvell.com (jerin-lab.marvell.com [10.28.34.14]) by maili.marvell.com (Postfix) with ESMTP id 682BD3F7040; Wed, 10 Jun 2020 04:50:12 -0700 (PDT) From: To: , Ray Kinsella , Neil Horman , John McNamara , "Marko Kovacevic" CC: , , , Jerin Jacob Date: Wed, 10 Jun 2020 17:20:50 +0530 Message-ID: <20200610115050.1636260-1-jerinj@marvell.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216, 18.0.687 definitions=2020-06-10_07:2020-06-10, 2020-06-10 signatures=0 Subject: [dpdk-dev] [PATCH] bus/pci: optimize bus scan 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: Jerin Jacob In order to optimize the PCI management, RTE_KDRV_NONE based device driver probing removed by not adding them to list in the scan phase. The legacy virtio is the only consumer of RTE_KDRV_NONE based device driver probe scheme. The legacy virtio support will be available through the existing VFIO/UIO based kernel driver scheme. This patch also removes the deprecation notice for the same. Signed-off-by: Jerin Jacob --- doc/guides/rel_notes/deprecation.rst | 8 -------- drivers/bus/pci/linux/pci.c | 25 +++---------------------- 2 files changed, 3 insertions(+), 30 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 0bee92425..d1034f60f 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -130,11 +130,3 @@ Deprecation Notices Python 2 support will be completely removed in 20.11. In 20.08, explicit deprecation warnings will be displayed when running scripts with Python 2. - -* pci: Remove ``RTE_KDRV_NONE`` based device driver probing. - In order to optimize the DPDK PCI enumeration management, ``RTE_KDRV_NONE`` - based device driver probing will be removed in v20.08. - The legacy virtio is the only consumer of ``RTE_KDRV_NONE`` based device - driver probe scheme. The legacy virtio support will be available through - the existing VFIO/UIO based kernel driver scheme. - More details at https://patches.dpdk.org/patch/69351/ diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c index da2f55b3a..a2198abf4 100644 --- a/drivers/bus/pci/linux/pci.c +++ b/drivers/bus/pci/linux/pci.c @@ -330,9 +330,10 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr) dev->kdrv = RTE_KDRV_UIO_GENERIC; else dev->kdrv = RTE_KDRV_UNKNOWN; - } else + } else { dev->kdrv = RTE_KDRV_NONE; - + return 0; + } /* device is valid, add in list (sorted) */ if (TAILQ_EMPTY(&rte_pci_bus.device_list)) { rte_pci_add_device(dev); @@ -772,11 +773,6 @@ rte_pci_ioport_map(struct rte_pci_device *dev, int bar, ret = pci_ioport_map(dev, bar, p); #else ret = pci_uio_ioport_map(dev, bar, p); -#endif - break; - case RTE_KDRV_NONE: -#if defined(RTE_ARCH_X86) - ret = pci_ioport_map(dev, bar, p); #endif break; default: @@ -805,11 +801,6 @@ rte_pci_ioport_read(struct rte_pci_ioport *p, case RTE_KDRV_UIO_GENERIC: pci_uio_ioport_read(p, data, len, offset); break; - case RTE_KDRV_NONE: -#if defined(RTE_ARCH_X86) - pci_uio_ioport_read(p, data, len, offset); -#endif - break; default: break; } @@ -831,11 +822,6 @@ rte_pci_ioport_write(struct rte_pci_ioport *p, case RTE_KDRV_UIO_GENERIC: pci_uio_ioport_write(p, data, len, offset); break; - case RTE_KDRV_NONE: -#if defined(RTE_ARCH_X86) - pci_uio_ioport_write(p, data, len, offset); -#endif - break; default: break; } @@ -861,11 +847,6 @@ rte_pci_ioport_unmap(struct rte_pci_ioport *p) ret = 0; #else ret = pci_uio_ioport_unmap(p); -#endif - break; - case RTE_KDRV_NONE: -#if defined(RTE_ARCH_X86) - ret = 0; #endif break; default: -- 2.26.2