From patchwork Thu Oct 19 15:31:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 132985 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6D110431AD; Thu, 19 Oct 2023 17:41:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D016F40695; Thu, 19 Oct 2023 17:41:47 +0200 (CEST) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by mails.dpdk.org (Postfix) with ESMTP id 3D5EE4029F for ; Thu, 19 Oct 2023 17:41:46 +0200 (CEST) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id C0E865C0052; Thu, 19 Oct 2023 11:41:45 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 19 Oct 2023 11:41:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1697730105; x= 1697816505; bh=1KbYCnJaCDvX1+vaExiN7vhfkO882ZmV6S0HBIK1C+o=; b=a C5d+7vJACdYE1akl25Kca7a48OBZBCmyd6VmozcP9ru7xq5oY7jE/h4TkNXZnxEY +neY8hEFS3rCJ/qvYx84ogerTH6TyGL/782H9ql3n3Gs7MxRPPlPv4n+TWnuH0e7 yUF6KgSmyK0r5+B+sfHaL5RMYXlfVjUG5SgC6h7KpENBStGTceKsMuiwyi/b8EWf KYd42cZisYgzKCe6phqL9deoMmd26zbkXdTYjLBY6785RxlG5k3sO4sJTw4AqUBV NTIpuNF9tvECLvw3xp2YVYHPBID+uFSxNDMwQEjxnvQf0oTk3CLt0QKAIGmsdbuc knU/mt1FnUpYfb8MNVibQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1697730105; x= 1697816505; bh=1KbYCnJaCDvX1+vaExiN7vhfkO882ZmV6S0HBIK1C+o=; b=V p5JYYr6Hm6wzQEGUOoGfQ0DjVv7L0fzDgehy+X1eUMK/onV0opLnYtsg9ujE4/+3 Sm4YTNPrfqGhkVzDkdsb8IB0nujACyNNomjMZrK+Ct+vzR4V2CSX4ctJdd+oKguY NFfVEWVjBtblR2piBDeaIp/snWwJTerGKvUwmhac3hYqwzx/f+HWNo+hp8e6LZ7k zC84Tl2AqgVHmxuG9yZ3dTfKNX1SYuQD4xfgeGmkLAq0AKnncMJf3cpkc/jRNOYe hltD64FooCG0ixXZkNDejNU/fGOHSMKBCnVgeLhEzD2+ru64GTAYgwFt+UTlB7an hokyPXV8561fTEBmzel4Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrjeeigdeltdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg ftrfgrthhtvghrnhepvdejhfdugeehvddtieejieegteeuudfgjeeukeeiledthfetveek hefhieelhfdtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth X-ME-Proxy: Feedback-ID: i47234305:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 19 Oct 2023 11:41:42 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: David Marchand , chenbox@nvidia.com, Jerin Jacob , Michal Krawczyk , Shai Brandes , Evgeny Schemeilin , Igor Chauskin , Ron Beider , John Daley , Hyong Youb Kim , Ziyang Xuan , Xiaoyun Wang , Guoyang Zhou , Matan Azrad , Viacheslav Ovsiienko , Ori Kam , Suanming Mou , Maciej Czekaj Subject: [PATCH 1/2] drivers: use macro for PCI address format Date: Thu, 19 Oct 2023 17:31:52 +0200 Message-ID: <20231019154125.308002-2-thomas@monjalon.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231019154125.308002-1-thomas@monjalon.net> References: <20231019154125.308002-1-thomas@monjalon.net> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Some places were not using the macro PCI_PRI_FMT as print format of a PCI address. Note: RTE prefix is missing in the name of some PCI macros. Signed-off-by: Thomas Monjalon Acked-by: John Daley Signed-off-by: Thomas Monjalon Acked-by: Huisong Li --- drivers/event/skeleton/skeleton_eventdev.c | 2 +- drivers/net/ena/ena_ethdev.c | 2 +- drivers/net/enic/enic.h | 3 +-- drivers/net/enic/enic_ethdev.c | 2 +- drivers/net/enic/enic_vf_representor.c | 2 +- drivers/net/hinic/hinic_pmd_ethdev.c | 4 ++-- drivers/net/mlx5/linux/mlx5_os.c | 2 +- drivers/net/thunderx/nicvf_ethdev.c | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/event/skeleton/skeleton_eventdev.c b/drivers/event/skeleton/skeleton_eventdev.c index dc9b131641..dd2dab2e27 100644 --- a/drivers/event/skeleton/skeleton_eventdev.c +++ b/drivers/event/skeleton/skeleton_eventdev.c @@ -373,7 +373,7 @@ skeleton_eventdev_init(struct rte_eventdev *eventdev) skel->subsystem_device_id = pci_dev->id.subsystem_device_id; skel->subsystem_vendor_id = pci_dev->id.subsystem_vendor_id; - PMD_DRV_LOG(DEBUG, "pci device (%x:%x) %u:%u:%u:%u", + PMD_DRV_LOG(DEBUG, "PCI device (%x:%x) " PCI_PRI_FMT, pci_dev->id.vendor_id, pci_dev->id.device_id, pci_dev->addr.domain, pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function); diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 7345e480f8..b39ec629e7 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -2125,7 +2125,7 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev) pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev); - PMD_INIT_LOG(INFO, "Initializing %x:%x:%x.%d\n", + PMD_INIT_LOG(INFO, "Initializing " PCI_PRI_FMT "\n", pci_dev->addr.domain, pci_dev->addr.bus, pci_dev->addr.devid, diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h index 163a1f037e..78778704f2 100644 --- a/drivers/net/enic/enic.h +++ b/drivers/net/enic/enic.h @@ -32,7 +32,6 @@ #define ENICPMD_SETTING(enic, f) ((enic->config.flags & VENETF_##f) ? 1 : 0) -#define ENICPMD_BDF_LENGTH 13 /* 0000:00:00.0'\0' */ #define ENIC_CALC_IP_CKSUM 1 #define ENIC_CALC_TCP_UDP_CKSUM 2 #define ENIC_MAX_MTU 9000 @@ -101,7 +100,7 @@ struct enic { bool overlay_offload; struct rte_eth_dev *rte_dev; struct rte_eth_dev_data *dev_data; - char bdf_name[ENICPMD_BDF_LENGTH]; + char bdf_name[PCI_PRI_STR_SIZE]; int dev_fd; int iommu_group_fd; int iommu_groupid; diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c index a487256fa1..b04b6c9aa1 100644 --- a/drivers/net/enic/enic_ethdev.c +++ b/drivers/net/enic/enic_ethdev.c @@ -1274,7 +1274,7 @@ static int eth_enic_dev_init(struct rte_eth_dev *eth_dev, enic->pdev = pdev; addr = &pdev->addr; - snprintf(enic->bdf_name, ENICPMD_BDF_LENGTH, "%04x:%02x:%02x.%x", + snprintf(enic->bdf_name, PCI_PRI_STR_SIZE, PCI_PRI_FMT, addr->domain, addr->bus, addr->devid, addr->function); err = enic_check_devargs(eth_dev); diff --git a/drivers/net/enic/enic_vf_representor.c b/drivers/net/enic/enic_vf_representor.c index 46f85964e9..5d8d29135c 100644 --- a/drivers/net/enic/enic_vf_representor.c +++ b/drivers/net/enic/enic_vf_representor.c @@ -707,7 +707,7 @@ int enic_vf_representor_init(struct rte_eth_dev *eth_dev, void *init_params) LIST_INIT(&vf_enic->memzone_list); rte_spinlock_init(&vf_enic->memzone_list_lock); addr = &vf->bdf; - snprintf(vf_enic->bdf_name, ENICPMD_BDF_LENGTH, "%04x:%02x:%02x.%x", + snprintf(vf_enic->bdf_name, PCI_PRI_STR_SIZE, PCI_PRI_FMT, addr->domain, addr->bus, addr->devid, addr->function); return 0; } diff --git a/drivers/net/hinic/hinic_pmd_ethdev.c b/drivers/net/hinic/hinic_pmd_ethdev.c index adc9f75c81..d4978e0649 100644 --- a/drivers/net/hinic/hinic_pmd_ethdev.c +++ b/drivers/net/hinic/hinic_pmd_ethdev.c @@ -3086,7 +3086,7 @@ static int hinic_func_init(struct rte_eth_dev *eth_dev) snprintf(nic_dev->proc_dev_name, sizeof(nic_dev->proc_dev_name), - "hinic-%.4x:%.2x:%.2x.%x", + "hinic-" PCI_PRI_FMT, pci_dev->addr.domain, pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function); @@ -3202,7 +3202,7 @@ static int hinic_dev_init(struct rte_eth_dev *eth_dev) pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev); - PMD_DRV_LOG(INFO, "Initializing pf hinic-%.4x:%.2x:%.2x.%x in %s process", + PMD_DRV_LOG(INFO, "Initializing pf hinic-" PCI_PRI_FMT " in %s process", pci_dev->addr.domain, pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function, (rte_eal_process_type() == RTE_PROC_PRIMARY) ? diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index d5ef695e6d..0706e9e9b2 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -1952,7 +1952,7 @@ mlx5_device_bond_pci_match(const char *ibdev_name, ifindex, bond_info->ifindex, bond_info->ifname); } if (owner == 0 && pf != 0) { - DRV_LOG(INFO, "PCIe instance %04x:%02x:%02x.%x isn't bonding owner", + DRV_LOG(INFO, "PCIe instance " PCI_PRI_FMT " isn't bonding owner", pci_dev->domain, pci_dev->bus, pci_dev->devid, pci_dev->function); } diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c index ab1e714d97..a504d41dfe 100644 --- a/drivers/net/thunderx/nicvf_ethdev.c +++ b/drivers/net/thunderx/nicvf_ethdev.c @@ -2218,7 +2218,7 @@ nicvf_eth_dev_init(struct rte_eth_dev *eth_dev) nic->subsystem_device_id = pci_dev->id.subsystem_device_id; nic->subsystem_vendor_id = pci_dev->id.subsystem_vendor_id; - PMD_INIT_LOG(DEBUG, "nicvf: device (%x:%x) %u:%u:%u:%u", + PMD_INIT_LOG(DEBUG, "nicvf: device (%x:%x) " PCI_PRI_FMT, pci_dev->id.vendor_id, pci_dev->id.device_id, pci_dev->addr.domain, pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function); From patchwork Thu Oct 19 15:31:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 132986 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A4093431AD; Thu, 19 Oct 2023 17:41:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 089A640A67; Thu, 19 Oct 2023 17:41:51 +0200 (CEST) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by mails.dpdk.org (Postfix) with ESMTP id 320A040A67 for ; Thu, 19 Oct 2023 17:41:49 +0200 (CEST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 95B245C032E; Thu, 19 Oct 2023 11:41:48 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Thu, 19 Oct 2023 11:41:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1697730108; x= 1697816508; bh=whMtndLEERiKGnxloPoI/DR7jK4mGSQ6ZhiDyV56Zrw=; b=X TWWVoZS+dJwzV0aBX06p0VqCZO3zW9M4jcR4fo7GnOE0NWQaLXhfkf25qE3acLX9 u2T4LPwxrhl8JI7BpDS5JjAN3Hi2dkeiB9QKFv6W9a3VQ84Cx7BL9u/qJdoIWjKi PegGSnyrV3LOsFs6V/BERyQZpNtEngfn++G0SiBYqTxnJ1bDqHTOL8SHm+rNNkq7 dIqTodttcqrmCzu/wPYA4wxTKfkngp8tnqND+2bN0/JvZsPzEUJbrbdzyNwLt5uf EUm/uszD+EndYns4HSfdquA7iAKGJH3UFlIzYC10AN/G0fhu5McuIx0ZONW/Ho9q Nipv13aej7VEhuZOy2JjA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1697730108; x= 1697816508; bh=whMtndLEERiKGnxloPoI/DR7jK4mGSQ6ZhiDyV56Zrw=; b=F 2Psl/p2t6QQT3Z/HuR1MWdvbvOl2Zhxhan/z58pb3OUYvVxnQepXYGlmNWGLOs9J FW5s5VDvjM6MLGyNeWoqLfUJNO3S9elAGBuhRZ+Lu+y7dGb1TNQzol8yToC2ysUC 3ChLVBlvLU9MC5GUtzNrVBeBXKomciV/gWQ3swENGb1gOmhF1YBxhsNCFHVixrRr S3uBn6M/SnyZWR+/cYGzwL00s+EW01NPLtKtZrwWoJ0w9+/vgv2WgdbyQrcHaHqU 5eXIuFDVibIvMuiO2DLYbIQhKl4m00pfHBc3dl9FZ1Cfx6pAEIkzVca/SlWfNDi4 qIcp4bGirC360l+iw/+3A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrjeeigdeltdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg ftrfgrthhtvghrnhepvdejhfdugeehvddtieejieegteeuudfgjeeukeeiledthfetveek hefhieelhfdtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth X-ME-Proxy: Feedback-ID: i47234305:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 19 Oct 2023 11:41:47 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: David Marchand , chenbox@nvidia.com, Long Li , Matan Azrad , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH 2/2] drivers: use function to compare PCI addresses Date: Thu, 19 Oct 2023 17:31:53 +0200 Message-ID: <20231019154125.308002-3-thomas@monjalon.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231019154125.308002-1-thomas@monjalon.net> References: <20231019154125.308002-1-thomas@monjalon.net> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Some places were not using the function rte_pci_addr_cmp() to compare 2 PCI addresses. Signed-off-by: Thomas Monjalon Acked-by: Long Li --- drivers/net/mana/mana.c | 6 ++---- drivers/net/mlx4/mlx4.c | 5 +---- drivers/net/mlx5/linux/mlx5_os.c | 5 +---- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/net/mana/mana.c b/drivers/net/mana/mana.c index 41c3cf2595..781ed76139 100644 --- a/drivers/net/mana/mana.c +++ b/drivers/net/mana/mana.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -1464,10 +1465,7 @@ mana_pci_probe_mac(struct rte_pci_device *pci_dev, continue; /* Ignore if this IB device is not this PCI device */ - if (pci_dev->addr.domain != pci_addr.domain || - pci_dev->addr.bus != pci_addr.bus || - pci_dev->addr.devid != pci_addr.devid || - pci_dev->addr.function != pci_addr.function) + if (rte_pci_addr_cmp(&pci_dev->addr, &pci_addr) != 0) continue; ctx = ibv_open_device(ibdev); diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 1389b606cc..a1a7e93288 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -817,10 +817,7 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) DEBUG("checking device \"%s\"", list[i]->name); if (mlx4_ibv_device_to_pci_addr(list[i], &pci_addr)) continue; - if ((pci_dev->addr.domain != pci_addr.domain) || - (pci_dev->addr.bus != pci_addr.bus) || - (pci_dev->addr.devid != pci_addr.devid) || - (pci_dev->addr.function != pci_addr.function)) + if (rte_pci_addr_cmp(&pci_dev->addr, &pci_addr) != 0) continue; vf = (pci_dev->id.device_id == PCI_DEVICE_ID_MELLANOX_CONNECTX3VF); diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 0706e9e9b2..922490ff97 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -2065,10 +2065,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev, if (mlx5_get_pci_addr(ibv_list[ret]->ibdev_path, &pci_addr)) continue; - if (owner_pci.domain != pci_addr.domain || - owner_pci.bus != pci_addr.bus || - owner_pci.devid != pci_addr.devid || - owner_pci.function != pci_addr.function) + if (rte_pci_addr_cmp(&owner_pci, &pci_addr) != 0) continue; DRV_LOG(INFO, "PCI information matches for device \"%s\"", ibv_list[ret]->name);