Re: [RFC/PATCH v0 02/12] update-linux-headers: Include gunyah.h

[Alex Bennée]

Srivatsa Vaddagiri <quic_svaddagi@quicinc.com> writes:

> gunyah.h containts UAPI definitions exported by Gunyah Linux kernel
> driver. This file will be referenced by Gunyah accelerator driver in
> Qemu.
>
> Note: Gunyah Linux kernel driver is not yet merged in Linux kernel.
> v14 of the patch series has been posted on mailing lists.
>
> https://lore.kernel.org/lkml/20230613172054.3959700-1-quic_eberman@quicinc.com/
>
> One of the subsequent versions of the patch is expected to be merged
> upstream soon, after this this change to 'update-linux-headers' can be
> run against the main Linux kernel source repository from kernel.org.
>
> In the meantime, a version of Gunyah kernel driver is available in
> Android kernel repository, against which this change can be run.
>
> https://android.googlesource.com/kernel/common
> Branch: android14-6.1
>
> Signed-off-by: Srivatsa Vaddagiri <quic_svaddagi@quicinc.com>

with fix:

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

although it will need another fixup on rebase due to other headers being
added. Maybe now is the time to sort the header list to lessen the
chance of clashes in future?


> ---
>  scripts/update-linux-headers.sh | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
> index 35a64bb501..3f3608bcbe 100755
> --- a/scripts/update-linux-headers.sh
> +++ b/scripts/update-linux-headers.sh
> @@ -161,7 +161,8 @@ done
>  rm -rf "$output/linux-headers/linux"
>  mkdir -p "$output/linux-headers/linux"
>  for header in const.h stddef.h kvm.h vfio.h vfio_ccw.h vfio_zdev.h vhost.h \
> -              psci.h psp-sev.h userfaultfd.h memfd.h mman.h nvme_ioctl.h 
> vduse.h; do
> +              psci.h psp-sev.h userfaultfd.h memfd.h mman.h nvme_ioctl.h \
> +              vduse.h gunyah.h; do
>      cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux"
>  done

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro