[1/2] drivers: use macro for PCI address format

  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 <thomas@monjalon.net>
---
 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(-)
  

Acked-by: John Daley <johndale@cisco.com>


From: Thomas Monjalon <thomas@monjalon.net>
Date: Thursday, October 19, 2023 at 8:41 AM
To: dev@dpdk.org <dev@dpdk.org>
Cc: David Marchand <david.marchand@redhat.com>, chenbox@nvidia.com <chenbox@nvidia.com>, Jerin Jacob <jerinj@marvell.com>, Michal Krawczyk <mk@semihalf.com>, Shai Brandes <shaibran@amazon.com>, Evgeny Schemeilin <evgenys@amazon.com>, Igor Chauskin <igorch@amazon.com>, Ron Beider <rbeider@amazon.com>, John Daley (johndale) <johndale@cisco.com>, Hyong Youb Kim (hyonkim) <hyonkim@cisco.com>, Ziyang Xuan <xuanziyang2@huawei.com>, Xiaoyun Wang <cloud.wangxiaoyun@huawei.com>, Guoyang Zhou <zhouguoyang@huawei.com>, Matan Azrad <matan@nvidia.com>, Viacheslav Ovsiienko <viacheslavo@nvidia.com>, Ori Kam <orika@nvidia.com>, Suanming Mou <suanmingm@nvidia.com>, Maciej Czekaj <mczekaj@marvell.com>
Subject: [PATCH 1/2] drivers: use macro for PCI address format
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 <thomas@monjalon.net>
---
 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);
--
2.42.0
  

lgtm,
Acked-by: Huisong Li <lihuisong@huawei.com>

在 2023/10/20 9:02, John Daley (johndale) 写道:
>
> Acked-by: John Daley <johndale@cisco.com>
>
> *From: *Thomas Monjalon <thomas@monjalon.net>
> *Date: *Thursday, October 19, 2023 at 8:41 AM
> *To: *dev@dpdk.org <dev@dpdk.org>
> *Cc: *David Marchand <david.marchand@redhat.com>, chenbox@nvidia.com 
> <chenbox@nvidia.com>, Jerin Jacob <jerinj@marvell.com>, Michal 
> Krawczyk <mk@semihalf.com>, Shai Brandes <shaibran@amazon.com>, Evgeny 
> Schemeilin <evgenys@amazon.com>, Igor Chauskin <igorch@amazon.com>, 
> Ron Beider <rbeider@amazon.com>, John Daley (johndale) 
> <johndale@cisco.com>, Hyong Youb Kim (hyonkim) <hyonkim@cisco.com>, 
> Ziyang Xuan <xuanziyang2@huawei.com>, Xiaoyun Wang 
> <cloud.wangxiaoyun@huawei.com>, Guoyang Zhou <zhouguoyang@huawei.com>, 
> Matan Azrad <matan@nvidia.com>, Viacheslav Ovsiienko 
> <viacheslavo@nvidia.com>, Ori Kam <orika@nvidia.com>, Suanming Mou 
> <suanmingm@nvidia.com>, Maciej Czekaj <mczekaj@marvell.com>
> *Subject: *[PATCH 1/2] drivers: use macro for PCI address format
>
> 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 <thomas@monjalon.net>
> ---
>  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);
> -- 
> 2.42.0
>