Re: [PATCH v3 26/27] ArmVirtualizationPkg/VirtFdtDxe: wire up XenBusDxe to "xen, xen" DT node

[Olivier Martin <olivier.martin@arm.com>]

Reviewed-By: Olivier Martin <olivier.martin@arm.com>

On 03/02/15 19:20, Ard Biesheuvel wrote:
> This patchs adds support to VirtFdtDxe for the Xen DT node which
> contains the base address of the Grant Table. This data is communicated
> to XenBusDxe using a XENIO_PROTOCOL instance.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
>   .../ArmVirtualizationPkg/ArmVirtualization.dsc.inc |  2 ++
>   .../ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c   | 23 ++++++++++++++++++++++
>   .../ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf |  1 +
>   3 files changed, 26 insertions(+)
>
> diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc
> index f17cd2f5d876..e7a03cd13d3a 100644
> --- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc
> +++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc
> @@ -100,6 +100,8 @@
>     BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf
>     FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
>
> +  XenIoMmioLib|OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.inf
> +
>   [LibraryClasses.common.SEC]
>     PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
>     ArmPlatformSecExtraActionLib|ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
> diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c b/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c
> index 3e8ca8da627e..0064b5e50171 100644
> --- a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c
> +++ b/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c
> @@ -26,6 +26,7 @@
>   #include <Library/DxeServicesLib.h>
>   #include <Library/HobLib.h>
>   #include <libfdt.h>
> +#include <Library/XenIoMmioLib.h>
>
>   #include <Guid/Fdt.h>
>   #include <Guid/VirtioMmioTransport.h>
> @@ -49,6 +50,7 @@ typedef enum {
>     PropertyTypePsci,
>     PropertyTypeFwCfg,
>     PropertyTypeGicV3,
> +  PropertyTypeXen,
>   } PROPERTY_TYPE;
>
>   typedef struct {
> @@ -66,6 +68,7 @@ STATIC CONST PROPERTY CompatibleProperties[] = {
>     { PropertyTypePsci,    "arm,psci-0.2"        },
>     { PropertyTypeFwCfg,   "qemu,fw-cfg-mmio"    },
>     { PropertyTypeGicV3,   "arm,gic-v3"          },
> +  { PropertyTypeXen,     "xen,xen"             },
>     { PropertyTypeUnknown, ""                    }
>   };
>
> @@ -342,6 +345,26 @@ InitializeVirtFdtDxe (
>         }
>         break;
>
> +    case PropertyTypeXen:
> +      ASSERT (Len == 16);
> +
> +      //
> +      // Retrieve the reg base from this node and wire it up to the
> +      // MMIO flavor of the XenBus root device I/O protocol
> +      //
> +      RegBase = fdt64_to_cpu (((UINT64 *)RegProp)[0]);
> +      Handle = NULL;
> +      Status = XenIoMmioInstall (&Handle, RegBase);
> +      if (EFI_ERROR (Status)) {
> +        DEBUG ((EFI_D_ERROR, "%a: XenIoMmioInstall () failed on a new handle "
> +          "(Status == %r)\n", __FUNCTION__, Status));
> +        break;
> +      }
> +
> +      DEBUG ((EFI_D_INFO, "Found Xen node with Grant table @ 0x%Lx\n", RegBase));
> +
> +      break;
> +
>       default:
>         break;
>       }
> diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf b/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf
> index 2768d7be8093..65eaef693d63 100644
> --- a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf
> +++ b/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf
> @@ -41,6 +41,7 @@
>     FdtLib
>     VirtioMmioDeviceLib
>     HobLib
> +  XenIoMmioLib
>
>   [Guids]
>     gFdtTableGuid


-- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium.  Thank you.

ARM Limited, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No:  2557590
ARM Holdings plc, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No:  2548782