RE: [PATCH v7 1/7] xen/arm: rename DEVICE_PCI to DEVICE_PCI_HOSTBRIDGE

[Henry Wang <Henry.Wang@xxxxxxx>]

Hi Oleksandr,

> -----Original Message-----
> From: Xen-devel <xen-devel-bounces@xxxxxxxxxxxxxxxxxxxx> On Behalf Of
> Oleksandr Andrushchenko
> Sent: Wednesday, November 24, 2021 4:00 PM
> To: xen-devel@xxxxxxxxxxxxxxxxxxxx
> Cc: julien@xxxxxxx; sstabellini@xxxxxxxxxx;
> oleksandr_tyshchenko@xxxxxxxx; volodymyr_babchuk@xxxxxxxx;
> Artem_Mygaiev@xxxxxxxx; roger.pau@xxxxxxxxxx; jbeulich@xxxxxxxx;
> andrew.cooper3@xxxxxxxxxx; george.dunlap@xxxxxxxxxx; paul@xxxxxxx;
> Bertrand Marquis <Bertrand.Marquis@xxxxxxx>; Rahul Singh
> <Rahul.Singh@xxxxxxx>; Oleksandr Andrushchenko
> <oleksandr_andrushchenko@xxxxxxxx>; Julien Grall <jgrall@xxxxxxxxxx>
> Subject: [PATCH v7 1/7] xen/arm: rename DEVICE_PCI to
> DEVICE_PCI_HOSTBRIDGE
> 
> From: Oleksandr Andrushchenko <oleksandr_andrushchenko@xxxxxxxx>
> 
> To better reflect the nature of the device type and not to make any
> confusion rename DEVICE_PCI to DEVICE_PCI_HOSTBRIDGE which it
> really is.
> 
> Suggested-by: Julien Grall <julien@xxxxxxx>
> Signed-off-by: Oleksandr Andrushchenko
> <oleksandr_andrushchenko@xxxxxxxx>
> Reviewed-by: Julien Grall <jgrall@xxxxxxxxxx>
> ---
> New in v6
> ---
>  xen/arch/arm/pci/pci-host-generic.c | 2 +-
>  xen/arch/arm/pci/pci-host-zynqmp.c  | 2 +-
>  xen/arch/arm/pci/pci.c              | 2 +-
>  xen/include/asm-arm/device.h        | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/xen/arch/arm/pci/pci-host-generic.c b/xen/arch/arm/pci/pci-
> host-generic.c
> index 33457fbe9615..46de6e43cc72 100644
> --- a/xen/arch/arm/pci/pci-host-generic.c
> +++ b/xen/arch/arm/pci/pci-host-generic.c
> @@ -32,7 +32,7 @@ static int __init pci_host_generic_probe(struct
> dt_device_node *dev,
>      return pci_host_common_probe(dev, &pci_generic_ecam_ops);
>  }
> 
> -DT_DEVICE_START(pci_gen, "PCI HOST GENERIC", DEVICE_PCI)
> +DT_DEVICE_START(pci_gen, "PCI HOST GENERIC", DEVICE_PCI_HOSTBRIDGE)
>  .dt_match = gen_pci_dt_match,
>  .init = pci_host_generic_probe,
>  DT_DEVICE_END
> diff --git a/xen/arch/arm/pci/pci-host-zynqmp.c b/xen/arch/arm/pci/pci-
> host-zynqmp.c
> index 61a9807d3d58..516982bca833 100644
> --- a/xen/arch/arm/pci/pci-host-zynqmp.c
> +++ b/xen/arch/arm/pci/pci-host-zynqmp.c
> @@ -49,7 +49,7 @@ static int __init pci_host_generic_probe(struct
> dt_device_node *dev,
>      return pci_host_common_probe(dev, &nwl_pcie_ops);
>  }
> 
> -DT_DEVICE_START(pci_gen, "PCI HOST ZYNQMP", DEVICE_PCI)
> +DT_DEVICE_START(pci_gen, "PCI HOST ZYNQMP", DEVICE_PCI_HOSTBRIDGE)
>  .dt_match = nwl_pcie_dt_match,
>  .init = pci_host_generic_probe,
>  DT_DEVICE_END
> diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c
> index 082c14e127a8..78b97beaef12 100644
> --- a/xen/arch/arm/pci/pci.c
> +++ b/xen/arch/arm/pci/pci.c
> @@ -46,7 +46,7 @@ static int __init dt_pci_init(void)
> 
>      dt_for_each_device_node(dt_host, np)
>      {
> -        rc = device_init(np, DEVICE_PCI, NULL);
> +        rc = device_init(np, DEVICE_PCI_HOSTBRIDGE, NULL);
>          /*
>           * Ignore the following error codes:
>           *   - EBADF: Indicate the current device is not a pci device.
> diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h
> index 3782660751b6..086dde13eb6b 100644
> --- a/xen/include/asm-arm/device.h
> +++ b/xen/include/asm-arm/device.h
> @@ -37,7 +37,7 @@ enum device_class
>      DEVICE_SERIAL,
>      DEVICE_IOMMU,
>      DEVICE_GIC,
> -    DEVICE_PCI,
> +    DEVICE_PCI_HOSTBRIDGE,
>      /* Use for error */
>      DEVICE_UNKNOWN,
>  };
> --
> 2.25.1
> 

Reviewed-by: Henry Wang <Henry.Wang@xxxxxxx>

Kind regards,

Henry