From patchwork Wed May 6 12:43:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 69839 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B737AA034F; Wed, 6 May 2020 14:43:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8FC8C1D9A8; Wed, 6 May 2020 14:43:36 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id E2FD01D9A7 for ; Wed, 6 May 2020 14:43:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588769014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LvWajrj4r+iTabvakxYuXsnkbDAdObmf1pjaP1AwoK4=; b=iDaiIucFtGTWCCgR473hhyE+qMNSQy92+wDhmtB5gOaiXY+dLeLT1Kr4nAV9UlVFA19B0l KEklpI0SxFStC1rRF0PvYhNGvdKM9DeHxIzfQUSlD404eE/u0d40CCD1HODTNmiNnbpSsv bHzg94RuinTwLN647T32ElBqCfMVM94= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-457--HPqlIJCMNmeAFXSlDOxCQ-1; Wed, 06 May 2020 08:43:32 -0400 X-MC-Unique: -HPqlIJCMNmeAFXSlDOxCQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E15F9805724; Wed, 6 May 2020 12:43:29 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.192.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id 186755D9C5; Wed, 6 May 2020 12:43:22 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: grive@u256.net, stable@dpdk.org, Marko Kovacevic , Ori Kam , Bruce Richardson , Radu Nicolau , Akhil Goyal , Tomasz Kantecki , Sunil Kumar Kori , Pavan Nikhilesh , John McNamara , Anatoly Burakov , Maxime Coquelin , Zhihong Wang , Xiaolong Ye , Gaetan Rivet Date: Wed, 6 May 2020 14:43:13 +0200 Message-Id: <20200506124314.14009-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH 1/2] remove references to private PCI probe function 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_pci_probe() is private to the PCI bus. Clean the remaining references in the documentation and comments. Fixes: c752998b5e2e ("pci: introduce library and driver") Cc: stable@dpdk.org Signed-off-by: David Marchand Reviewed-by: Gaetan Rivet Reviewed-by: Gaetan Rivet --- doc/guides/sample_app_ug/l2_forward_event.rst | 8 -------- doc/guides/sample_app_ug/l2_forward_real_virtual.rst | 9 --------- doc/guides/sample_app_ug/link_status_intr.rst | 7 ------- doc/guides/sample_app_ug/multi_process.rst | 2 +- drivers/bus/pci/pci_common.c | 6 +++--- drivers/bus/pci/private.h | 10 ---------- drivers/net/virtio/virtio_user_ethdev.c | 2 +- 7 files changed, 5 insertions(+), 39 deletions(-) diff --git a/doc/guides/sample_app_ug/l2_forward_event.rst b/doc/guides/sample_app_ug/l2_forward_event.rst index 8bdf352c4e..d536eee819 100644 --- a/doc/guides/sample_app_ug/l2_forward_event.rst +++ b/doc/guides/sample_app_ug/l2_forward_event.rst @@ -204,9 +204,6 @@ chapters that related to the Poll Mode and Event mode Driver in the .. code-block:: c - if (rte_pci_probe() < 0) - rte_panic("Cannot probe PCI\n"); - /* reset l2fwd_dst_ports */ for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++) @@ -236,11 +233,6 @@ chapters that related to the Poll Mode and Event mode Driver in the rte_eth_dev_info_get((uint8_t) portid, &dev_info); } -Observe that: - -* rte_pci_probe() parses the devices on the PCI bus and initializes recognized - devices. - The next step is to configure the RX and TX queues. For each port, there is only one RX queue (only one lcore is able to poll a given port). The number of TX queues depends on the number of available lcores. The rte_eth_dev_configure() diff --git a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst index 39d6b0067a..671d0c7c19 100644 --- a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst +++ b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst @@ -194,9 +194,6 @@ in the *DPDK Programmer's Guide* - Rel 1.4 EAR and the *DPDK API Reference*. .. code-block:: c - if (rte_pci_probe() < 0) - rte_exit(EXIT_FAILURE, "Cannot probe PCI\n"); - /* reset l2fwd_dst_ports */ for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++) @@ -226,12 +223,6 @@ in the *DPDK Programmer's Guide* - Rel 1.4 EAR and the *DPDK API Reference*. rte_eth_dev_info_get((uint8_t) portid, &dev_info); } -Observe that: - -* rte_igb_pmd_init_all() simultaneously registers the driver as a PCI driver and as an Ethernet* Poll Mode Driver. - -* rte_pci_probe() parses the devices on the PCI bus and initializes recognized devices. - The next step is to configure the RX and TX queues. For each port, there is only one RX queue (only one lcore is able to poll a given port). The number of TX queues depends on the number of available lcores. diff --git a/doc/guides/sample_app_ug/link_status_intr.rst b/doc/guides/sample_app_ug/link_status_intr.rst index 5283be8b7c..04c40f2854 100644 --- a/doc/guides/sample_app_ug/link_status_intr.rst +++ b/doc/guides/sample_app_ug/link_status_intr.rst @@ -88,9 +88,6 @@ To fully understand this code, it is recommended to study the chapters that rela .. code-block:: c - if (rte_pci_probe() < 0) - rte_exit(EXIT_FAILURE, "Cannot probe PCI\n"); - /* * Each logical core is assigned a dedicated TX queue on each port. */ @@ -115,10 +112,6 @@ To fully understand this code, it is recommended to study the chapters that rela rte_eth_dev_info_get((uint8_t) portid, &dev_info); } -Observe that: - -* rte_pci_probe() parses the devices on the PCI bus and initializes recognized devices. - The next step is to configure the RX and TX queues. For each port, there is only one RX queue (only one lcore is able to poll a given port). The number of TX queues depends on the number of available lcores. diff --git a/doc/guides/sample_app_ug/multi_process.rst b/doc/guides/sample_app_ug/multi_process.rst index 9c374da6f7..f2a79a6397 100644 --- a/doc/guides/sample_app_ug/multi_process.rst +++ b/doc/guides/sample_app_ug/multi_process.rst @@ -209,7 +209,7 @@ How the Application Works ^^^^^^^^^^^^^^^^^^^^^^^^^ The initialization calls in both the primary and secondary instances are the same for the most part, -calling the rte_eal_init(), 1 G and 10 G driver initialization and then rte_pci_probe() functions. +calling the rte_eal_init(), 1 G and 10 G driver initialization and then probing devices. Thereafter, the initialization done depends on whether the process is configured as a primary or secondary instance. In the primary instance, a memory pool is created for the packet mbufs and the network ports to be used are initialized - diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index 3f55420769..ab73c009ac 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -288,8 +288,8 @@ pci_probe_all_drivers(struct rte_pci_device *dev) * all registered drivers that have a matching entry in its id_table * for discovered devices. */ -int -rte_pci_probe(void) +static int +pci_probe(void) { struct rte_pci_device *dev = NULL; size_t probed = 0, failed = 0; @@ -675,7 +675,7 @@ rte_pci_get_iommu_class(void) struct rte_pci_bus rte_pci_bus = { .bus = { .scan = rte_pci_scan, - .probe = rte_pci_probe, + .probe = pci_probe, .find_device = pci_find_device, .plug = pci_plug, .unplug = pci_unplug, diff --git a/drivers/bus/pci/private.h b/drivers/bus/pci/private.h index a205d4d9f0..af1c7ae5fe 100644 --- a/drivers/bus/pci/private.h +++ b/drivers/bus/pci/private.h @@ -17,16 +17,6 @@ struct rte_pci_device; extern struct rte_pci_bus rte_pci_bus; -/** - * Probe the PCI bus - * - * @return - * - 0 on success. - * - !0 on error. - */ -int -rte_pci_probe(void); - /** * Scan the content of the PCI bus, and the devices in the devices * list diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c index 953f00d72d..4743c11fd2 100644 --- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c @@ -720,7 +720,7 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev) goto end; } - /* previously called by rte_pci_probe() for physical dev */ + /* previously called by pci probing for physical dev */ if (eth_virtio_dev_init(eth_dev) < 0) { PMD_INIT_LOG(ERR, "eth_virtio_dev_init fails"); virtio_user_eth_dev_free(eth_dev);