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 2ECF6A034F; Wed, 6 May 2020 14:43:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A0A3B1D9C3; Wed, 6 May 2020 14:43:37 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 7ABDA1D9A7 for ; Wed, 6 May 2020 14:43:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588769015; 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: in-reply-to:in-reply-to:references:references; bh=erPcslEl4yAGKRLou5ZDzoU3IdC7PHQNyIbcflAGz6M=; b=F/LT7X7qEpIfTlHp8wiyEIb9ZJvYvHfzXBPSsw5cmtLYdEhyx+uFh7AgyRn27UK7Oixqf6 JMKDFS31efH9PHClwdE9DQqgphe47SzNWQ2dbWIRGvv9gv/M+1x7Nx9MYHUdO85rRF4zUX Gae87NIKXIOv4buu3gdlvq5XTh4zcoQ= 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-394-RFKS_F37NL-7eFnMpz39ww-1; Wed, 06 May 2020 08:43:33 -0400 X-MC-Unique: RFKS_F37NL-7eFnMpz39ww-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 705B6107ACCA; Wed, 6 May 2020 12:43:32 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.192.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id 634595D9DA; Wed, 6 May 2020 12:43:31 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: grive@u256.net, Gaetan Rivet Date: Wed, 6 May 2020 14:43:14 +0200 Message-Id: <20200506124314.14009-2-david.marchand@redhat.com> In-Reply-To: <20200506124314.14009-1-david.marchand@redhat.com> References: <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 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-dev] [PATCH 2/2] bus/pci: cleanup private symbols 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" Internal symbols do not need the rte_ prefix. Some symbols do not need to be exposed in the private header and have been made static. Fixes: c752998b5e2e ("pci: introduce library and driver") Signed-off-by: David Marchand --- drivers/bus/pci/bsd/pci.c | 8 ++++---- drivers/bus/pci/linux/pci.c | 8 ++++---- drivers/bus/pci/pci_common.c | 26 ++++++++++++------------ drivers/bus/pci/pci_params.c | 5 ++--- drivers/bus/pci/private.h | 38 ++++++------------------------------ 5 files changed, 29 insertions(+), 56 deletions(-) diff --git a/drivers/bus/pci/bsd/pci.c b/drivers/bus/pci/bsd/pci.c index ebbfeb13a8..ef6b953cd1 100644 --- a/drivers/bus/pci/bsd/pci.c +++ b/drivers/bus/pci/bsd/pci.c @@ -288,7 +288,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf) =20 =09/* device is valid, add in list (sorted) */ =09if (TAILQ_EMPTY(&rte_pci_bus.device_list)) { -=09=09rte_pci_add_device(dev); +=09=09pci_add_device(dev); =09} =09else { =09=09struct rte_pci_device *dev2 =3D NULL; @@ -299,7 +299,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf) =09=09=09if (ret > 0) =09=09=09=09continue; =09=09=09else if (ret < 0) { -=09=09=09=09rte_pci_insert_device(dev2, dev); +=09=09=09=09pci_insert_device(dev2, dev); =09=09=09} else { /* already registered */ =09=09=09=09dev2->kdrv =3D dev->kdrv; =09=09=09=09dev2->max_vfs =3D dev->max_vfs; @@ -311,7 +311,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf) =09=09=09} =09=09=09return 0; =09=09} -=09=09rte_pci_add_device(dev); +=09=09pci_add_device(dev); =09} =20 =09return 0; @@ -326,7 +326,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf) * list. Call pci_scan_one() for each pci entry found. */ int -rte_pci_scan(void) +pci_scan(void) { =09int fd; =09unsigned dev_count =3D 0; diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c index ca783b1575..4dc37c8cad 100644 --- a/drivers/bus/pci/linux/pci.c +++ b/drivers/bus/pci/linux/pci.c @@ -335,7 +335,7 @@ pci_scan_one(const char *dirname, const struct rte_pci_= addr *addr) =20 =09/* device is valid, add in list (sorted) */ =09if (TAILQ_EMPTY(&rte_pci_bus.device_list)) { -=09=09rte_pci_add_device(dev); +=09=09pci_add_device(dev); =09} else { =09=09struct rte_pci_device *dev2; =09=09int ret; @@ -346,7 +346,7 @@ pci_scan_one(const char *dirname, const struct rte_pci_= addr *addr) =09=09=09=09continue; =20 =09=09=09if (ret < 0) { -=09=09=09=09rte_pci_insert_device(dev2, dev); +=09=09=09=09pci_insert_device(dev2, dev); =09=09=09} else { /* already registered */ =09=09=09=09if (!rte_dev_is_probed(&dev2->device)) { =09=09=09=09=09dev2->kdrv =3D dev->kdrv; @@ -388,7 +388,7 @@ pci_scan_one(const char *dirname, const struct rte_pci_= addr *addr) =09=09=09return 0; =09=09} =20 -=09=09rte_pci_add_device(dev); +=09=09pci_add_device(dev); =09} =20 =09return 0; @@ -457,7 +457,7 @@ parse_pci_addr_format(const char *buf, int bufsize, str= uct rte_pci_addr *addr) * list */ int -rte_pci_scan(void) +pci_scan(void) { =09struct dirent *e; =09DIR *dir; diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index ab73c009ac..e3729bdb9a 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -81,8 +81,8 @@ pci_name_set(struct rte_pci_device *dev) /* * Match the PCI Driver and Device using the ID Table */ -int -rte_pci_match(const struct rte_pci_driver *pci_drv, +static int +pci_match(const struct rte_pci_driver *pci_drv, =09 const struct rte_pci_device *pci_dev) { =09const struct rte_pci_id *id_table; @@ -132,7 +132,7 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr, =09loc =3D &dev->addr; =20 =09/* The device is not blacklisted; Check if driver supports it */ -=09if (!rte_pci_match(dr, dev)) +=09if (!pci_match(dr, dev)) =09=09/* Match of device and driver failed */ =09=09return 1; =20 @@ -388,14 +388,14 @@ rte_pci_unregister(struct rte_pci_driver *driver) =20 /* Add a device to PCI bus */ void -rte_pci_add_device(struct rte_pci_device *pci_dev) +pci_add_device(struct rte_pci_device *pci_dev) { =09TAILQ_INSERT_TAIL(&rte_pci_bus.device_list, pci_dev, next); } =20 /* Insert a device into a predefined position in PCI bus */ void -rte_pci_insert_device(struct rte_pci_device *exist_pci_dev, +pci_insert_device(struct rte_pci_device *exist_pci_dev, =09=09 struct rte_pci_device *new_pci_dev) { =09TAILQ_INSERT_BEFORE(exist_pci_dev, new_pci_dev, next); @@ -403,7 +403,7 @@ rte_pci_insert_device(struct rte_pci_device *exist_pci_= dev, =20 /* Remove a device from PCI bus */ static void -rte_pci_remove_device(struct rte_pci_device *pci_dev) +pci_remove_device(struct rte_pci_device *pci_dev) { =09TAILQ_REMOVE(&rte_pci_bus.device_list, pci_dev, next); } @@ -536,7 +536,7 @@ pci_unplug(struct rte_device *dev) =09pdev =3D RTE_DEV_TO_PCI(dev); =09ret =3D rte_pci_detach_dev(pdev); =09if (ret =3D=3D 0) { -=09=09rte_pci_remove_device(pdev); +=09=09pci_remove_device(pdev); =09=09rte_devargs_remove(dev->devargs); =09=09free(pdev); =09} @@ -609,8 +609,8 @@ pci_ignore_device(const struct rte_pci_device *dev) =09return true; } =20 -enum rte_iova_mode -rte_pci_get_iommu_class(void) +static enum rte_iova_mode +pci_get_iommu_class(void) { =09enum rte_iova_mode iova_mode =3D RTE_IOVA_DC; =09const struct rte_pci_device *dev; @@ -635,7 +635,7 @@ rte_pci_get_iommu_class(void) =09=09FOREACH_DRIVER_ON_PCIBUS(drv) { =09=09=09enum rte_iova_mode dev_iova_mode; =20 -=09=09=09if (!rte_pci_match(drv, dev)) +=09=09=09if (!pci_match(drv, dev)) =09=09=09=09continue; =20 =09=09=09dev_iova_mode =3D pci_device_iova_mode(drv, dev); @@ -674,7 +674,7 @@ rte_pci_get_iommu_class(void) =20 struct rte_pci_bus rte_pci_bus =3D { =09.bus =3D { -=09=09.scan =3D rte_pci_scan, +=09=09.scan =3D pci_scan, =09=09.probe =3D pci_probe, =09=09.find_device =3D pci_find_device, =09=09.plug =3D pci_plug, @@ -682,8 +682,8 @@ struct rte_pci_bus rte_pci_bus =3D { =09=09.parse =3D pci_parse, =09=09.dma_map =3D pci_dma_map, =09=09.dma_unmap =3D pci_dma_unmap, -=09=09.get_iommu_class =3D rte_pci_get_iommu_class, -=09=09.dev_iterate =3D rte_pci_dev_iterate, +=09=09.get_iommu_class =3D pci_get_iommu_class, +=09=09.dev_iterate =3D pci_dev_iterate, =09=09.hot_unplug_handler =3D pci_hot_unplug_handler, =09=09.sigbus_handler =3D pci_sigbus_handler, =09}, diff --git a/drivers/bus/pci/pci_params.c b/drivers/bus/pci/pci_params.c index 3192e9c967..16c64c9e9f 100644 --- a/drivers/bus/pci/pci_params.c +++ b/drivers/bus/pci/pci_params.c @@ -55,9 +55,8 @@ pci_dev_match(const struct rte_device *dev, } =20 void * -rte_pci_dev_iterate(const void *start, -=09=09 const char *str, -=09=09 const struct rte_dev_iterator *it __rte_unused) +pci_dev_iterate(const void *start, const char *str, +=09=09const struct rte_dev_iterator *it __rte_unused) { =09rte_bus_find_device_t find_device; =09struct rte_kvargs *kvargs =3D NULL; diff --git a/drivers/bus/pci/private.h b/drivers/bus/pci/private.h index af1c7ae5fe..6992443bf9 100644 --- a/drivers/bus/pci/private.h +++ b/drivers/bus/pci/private.h @@ -24,7 +24,7 @@ extern struct rte_pci_bus rte_pci_bus; * @return * 0 on success, negative on error */ -int rte_pci_scan(void); +int pci_scan(void); =20 /** * Find the name of a PCI device. @@ -41,7 +41,7 @@ pci_name_set(struct rte_pci_device *dev); *=09PCI device to add * @return void */ -void rte_pci_add_device(struct rte_pci_device *pci_dev); +void pci_add_device(struct rte_pci_device *pci_dev); =20 /** * Insert a PCI device in the PCI Bus at a particular location in the devi= ce @@ -54,7 +54,7 @@ void rte_pci_add_device(struct rte_pci_device *pci_dev); *=09PCI device to be added before exist_pci_dev * @return void */ -void rte_pci_insert_device(struct rte_pci_device *exist_pci_dev, +void pci_insert_device(struct rte_pci_device *exist_pci_dev, =09=09struct rte_pci_device *new_pci_dev); =20 /** @@ -147,23 +147,8 @@ pci_uio_remap_resource(struct rte_pci_device *dev); int pci_uio_map_resource_by_index(struct rte_pci_device *dev, int res_idx, =09=09struct mapped_pci_resource *uio_res, int map_idx); =20 -/* - * Match the PCI Driver and Device using the ID Table - * - * @param pci_drv - * PCI driver from which ID table would be extracted - * @param pci_dev - * PCI device to match against the driver - * @return - * 1 for successful match - * 0 for unsuccessful match - */ -int -rte_pci_match(const struct rte_pci_driver *pci_drv, -=09 const struct rte_pci_device *pci_dev); - /** - * OS specific callbacks for rte_pci_get_iommu_class + * OS specific callbacks for pci_get_iommu_class * */ bool @@ -173,16 +158,6 @@ enum rte_iova_mode pci_device_iova_mode(const struct rte_pci_driver *pci_drv, =09=09 const struct rte_pci_device *pci_dev); =20 -/** - * Get iommu class of PCI devices on the bus. - * And return their preferred iova mapping mode. - * - * @return - * - enum rte_iova_mode. - */ -enum rte_iova_mode -rte_pci_get_iommu_class(void); - /* * Iterate over internal devices, * matching any device against the provided @@ -202,8 +177,7 @@ rte_pci_get_iommu_class(void); * NULL otherwise. */ void * -rte_pci_dev_iterate(const void *start, -=09=09 const char *str, -=09=09 const struct rte_dev_iterator *it); +pci_dev_iterate(const void *start, const char *str, +=09=09const struct rte_dev_iterator *it); =20 #endif /* _PCI_PRIVATE_H_ */ --=20 2.23.0