From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 07E1A431B5; Fri, 20 Oct 2023 05:30:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C54A7402B8; Fri, 20 Oct 2023 05:30:30 +0200 (CEST) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mails.dpdk.org (Postfix) with ESMTP id 88CB7402B7 for ; Fri, 20 Oct 2023 05:30:28 +0200 (CEST) Received: from kwepemm000004.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4SBVP601hRzVlQl; Fri, 20 Oct 2023 11:26:33 +0800 (CST) Received: from [10.67.121.59] (10.67.121.59) by kwepemm000004.china.huawei.com (7.193.23.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Fri, 20 Oct 2023 11:30:15 +0800 Message-ID: <0fc36bc6-6fdd-9efd-d26e-6cfb3d1f3c43@huawei.com> Date: Fri, 20 Oct 2023 11:30:15 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: [PATCH 1/2] drivers: use macro for PCI address format To: "John Daley (johndale)" , Thomas Monjalon , "dev@dpdk.org" CC: David Marchand , "chenbox@nvidia.com" , Jerin Jacob , Michal Krawczyk , Shai Brandes , Evgeny Schemeilin , Igor Chauskin , Ron Beider , "Hyong Youb Kim (hyonkim)" , Ziyang Xuan , Xiaoyun Wang , Guoyang Zhou , Matan Azrad , Viacheslav Ovsiienko , Ori Kam , Suanming Mou , Maciej Czekaj References: <20231019154125.308002-1-thomas@monjalon.net> <20231019154125.308002-2-thomas@monjalon.net> From: "lihuisong (C)" In-Reply-To: Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.67.121.59] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm000004.china.huawei.com (7.193.23.18) X-CFilter-Loop: Reflected 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 lgtm, Acked-by: Huisong Li 在 2023/10/20 9:02, John Daley (johndale) 写道: > > Acked-by: John Daley > > *From: *Thomas Monjalon > *Date: *Thursday, October 19, 2023 at 8:41 AM > *To: *dev@dpdk.org > *Cc: *David Marchand , chenbox@nvidia.com > , Jerin Jacob , Michal > Krawczyk , Shai Brandes , Evgeny > Schemeilin , Igor Chauskin , > Ron Beider , John Daley (johndale) > , Hyong Youb Kim (hyonkim) , > 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 > > 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 > --- >  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 >