Re: [Xen-devel] [PATCH v12 10/12] vpci: add a priority parameter to the vPCI register initializer

[Julien Grall <julien.grall@xxxxxxx>]

Hi Roger,

On 03/22/2018 01:58 PM, Roger Pau Monne wrote:
> This is needed for MSI-X, since MSI-X will need to be initialized
> before parsing the BARs, so that the header BAR handlers are aware of
> the MSI-X related holes and make sure they are not mapped in order for
> the trap handlers to work properly.
>
> Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
> Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
For ARM bits:

Acked-by: Julien Grall <julien.grall@xxxxxxx>

Cheers,

> ---
> Cc: Stefano Stabellini <sstabellini@xxxxxxxxxx>
> Cc: Julien Grall <julien.grall@xxxxxxx>
> Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> Cc: George Dunlap <George.Dunlap@xxxxxxxxxxxxx>
> Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> Cc: Jan Beulich <jbeulich@xxxxxxxx>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
> Cc: Tim Deegan <tim@xxxxxxx>
> Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
> ---
> Changes since v4:
>   - Add a middle priority and add the PCI header to it.
>
> Changes since v3:
>   - Add a numerial suffix to the section used to store the pointer to
>     each initializer function, and sort them at link time.
> ---
>   xen/arch/arm/xen.lds.S    | 4 ++--
>   xen/arch/x86/xen.lds.S    | 4 ++--
>   xen/drivers/vpci/header.c | 2 +-
>   xen/drivers/vpci/msi.c    | 2 +-
>   xen/include/xen/vpci.h    | 8 ++++++--
>   5 files changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S
> index 49cae2af71..245a0e0e85 100644
> --- a/xen/arch/arm/xen.lds.S
> +++ b/xen/arch/arm/xen.lds.S
> @@ -69,7 +69,7 @@ SECTIONS
>   #if defined(CONFIG_HAS_VPCI) && defined(CONFIG_LATE_HWDOM)
>          . = ALIGN(POINTER_ALIGN);
>          __start_vpci_array = .;
> -       *(.data.vpci)
> +       *(SORT(.data.vpci.*))
>          __end_vpci_array = .;
>   #endif
>     } :text
> @@ -182,7 +182,7 @@ SECTIONS
>   #if defined(CONFIG_HAS_VPCI) && !defined(CONFIG_LATE_HWDOM)
>          . = ALIGN(POINTER_ALIGN);
>          __start_vpci_array = .;
> -       *(.data.vpci)
> +       *(SORT(.data.vpci.*))
>          __end_vpci_array = .;
>   #endif
>     } :text
> diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S
> index 7bd6fb51c3..70afedd31d 100644
> --- a/xen/arch/x86/xen.lds.S
> +++ b/xen/arch/x86/xen.lds.S
> @@ -139,7 +139,7 @@ SECTIONS
>   #if defined(CONFIG_HAS_VPCI) && defined(CONFIG_LATE_HWDOM)
>          . = ALIGN(POINTER_ALIGN);
>          __start_vpci_array = .;
> -       *(.data.vpci)
> +       *(SORT(.data.vpci.*))
>          __end_vpci_array = .;
>   #endif
>     } :text
> @@ -246,7 +246,7 @@ SECTIONS
>   #if defined(CONFIG_HAS_VPCI) && !defined(CONFIG_LATE_HWDOM)
>          . = ALIGN(POINTER_ALIGN);
>          __start_vpci_array = .;
> -       *(.data.vpci)
> +       *(SORT(.data.vpci.*))
>          __end_vpci_array = .;
>   #endif
>     } :text
> diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c
> index 25d8ec0507..9fa07992cc 100644
> --- a/xen/drivers/vpci/header.c
> +++ b/xen/drivers/vpci/header.c
> @@ -532,7 +532,7 @@ static int init_bars(struct pci_dev *pdev)
>   
>       return (cmd & PCI_COMMAND_MEMORY) ? modify_bars(pdev, true, false) : 0;
>   }
> -REGISTER_VPCI_INIT(init_bars);
> +REGISTER_VPCI_INIT(init_bars, VPCI_PRIORITY_MIDDLE);
>   
>   /*
>    * Local variables:
> diff --git a/xen/drivers/vpci/msi.c b/xen/drivers/vpci/msi.c
> index c3c69ec453..de4ddf562e 100644
> --- a/xen/drivers/vpci/msi.c
> +++ b/xen/drivers/vpci/msi.c
> @@ -267,7 +267,7 @@ static int init_msi(struct pci_dev *pdev)
>   
>       return 0;
>   }
> -REGISTER_VPCI_INIT(init_msi);
> +REGISTER_VPCI_INIT(init_msi, VPCI_PRIORITY_LOW);
>   
>   void vpci_dump_msi(void)
>   {
> diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h
> index 116b93f519..7266c17679 100644
> --- a/xen/include/xen/vpci.h
> +++ b/xen/include/xen/vpci.h
> @@ -15,9 +15,13 @@ typedef void vpci_write_t(const struct pci_dev *pdev, 
> unsigned int reg,
>   
>   typedef int vpci_register_init_t(struct pci_dev *dev);
>   
> -#define REGISTER_VPCI_INIT(x)                   \
> +#define VPCI_PRIORITY_HIGH      "1"
> +#define VPCI_PRIORITY_MIDDLE    "5"
> +#define VPCI_PRIORITY_LOW       "9"
> +
> +#define REGISTER_VPCI_INIT(x, p)                \
>     static vpci_register_init_t *const x##_entry  \
> -               __used_section(".data.vpci") = x
> +               __used_section(".data.vpci." p) = x
>   
>   /* Add vPCI handlers to device. */
>   int __must_check vpci_add_handlers(struct pci_dev *dev);
--
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel