[PATCH 0/3] automation: qemu-smoke-arm64.sh: Minor fixes to prevent confusion

[PATCH 0/3] automation: qemu-smoke-arm64.sh: Minor fixes to prevent confusion

[Xenia Ragiadakou]

This patch series performs some minor cleanups in qemu-smoke-arm64.sh to
prevent confusion that may arise to somebody reading the test.
More specifically, this patch series
- cleanups some stale comments
- fixes the name used for the device tree
- fixes the number of cpus in the dt to reflect the number of cpus used
in qemu

Xenia Ragiadakou (3):
  automation: qemu-smoke-arm64.sh: Remove some stale comments
  automation: qemu-smoke-arm64.sh: Rename the device tree to avoid
    confusion
  automation: qemu-smoke-arm64.sh: Fix the number of cpus in the device
    tree

 automation/scripts/qemu-smoke-arm64.sh | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

-- 
2.34.1

[PATCH 1/3] automation: qemu-smoke-arm64.sh: Remove some stale comments

[Xenia Ragiadakou]

Remove comment "# Install QEMU" because qemu is not installed, it is taken
from a test-artifacts container.

Change comment "# Busybox Dom0" to "# Busybox" because busybox is not used
only for the Dom0 but also for the DomU.

Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
---
 automation/scripts/qemu-smoke-arm64.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh
index 898398196a..f483a2ffc1 100755
--- a/automation/scripts/qemu-smoke-arm64.sh
+++ b/automation/scripts/qemu-smoke-arm64.sh
@@ -21,7 +21,6 @@ fi
 "
 fi
 
-# Install QEMU
 export DEBIAN_FRONTENT=noninteractive
 apt-get -qy update
 apt-get -qy install --no-install-recommends u-boot-qemu \
@@ -44,7 +43,7 @@ sed 's/compatible = "arm,pl061.*/status = "disabled";/g' binaries/virt-gicv3.dts
 dtc -I dts -O dtb binaries/virt-gicv3-edited.dts > binaries/virt-gicv3.dtb
 
 
-# Busybox Dom0
+# Busybox
 mkdir -p initrd
 mkdir -p initrd/bin
 mkdir -p initrd/sbin
-- 
2.34.1

[PATCH 2/3] automation: qemu-smoke-arm64.sh: Rename the device tree to avoid confusion

[Xenia Ragiadakou]

Rename the device tree from virt-gicv3 to virt-gicv2 to avoid confusion
since the version of the generic interrupt controller used for this test
is the v2 and not the v3.

Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
---
 automation/scripts/qemu-smoke-arm64.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh
index f483a2ffc1..7ac82b2278 100755
--- a/automation/scripts/qemu-smoke-arm64.sh
+++ b/automation/scripts/qemu-smoke-arm64.sh
@@ -36,11 +36,11 @@ curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom
    -machine virtualization=true \
    -cpu cortex-a57 -machine type=virt \
    -m 1024 -display none \
-   -machine dumpdtb=binaries/virt-gicv3.dtb
+   -machine dumpdtb=binaries/virt-gicv2.dtb
 # XXX disable pl061 to avoid Linux crash
-dtc -I dtb -O dts binaries/virt-gicv3.dtb > binaries/virt-gicv3.dts
-sed 's/compatible = "arm,pl061.*/status = "disabled";/g' binaries/virt-gicv3.dts > binaries/virt-gicv3-edited.dts
-dtc -I dts -O dtb binaries/virt-gicv3-edited.dts > binaries/virt-gicv3.dtb
+dtc -I dtb -O dts binaries/virt-gicv2.dtb > binaries/virt-gicv2.dts
+sed 's/compatible = "arm,pl061.*/status = "disabled";/g' binaries/virt-gicv2.dts > binaries/virt-gicv2-edited.dts
+dtc -I dts -O dtb binaries/virt-gicv2-edited.dts > binaries/virt-gicv2.dtb
 
 
 # Busybox
@@ -73,7 +73,7 @@ cd ..
 echo 'MEMORY_START="0x40000000"
 MEMORY_END="0x80000000"
 
-DEVICE_TREE="virt-gicv3.dtb"
+DEVICE_TREE="virt-gicv2.dtb"
 XEN="xen"
 DOM0_KERNEL="Image"
 DOM0_RAMDISK="initrd"
-- 
2.34.1

[PATCH 3/3] automation: qemu-smoke-arm64.sh: Fix the number of cpus in the device tree

[Xenia Ragiadakou]

Qemu VM is configured with 2 cpus but the device tree passed has only 1.
Generate a device tree with 2 cpus.

Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
---
I am not sure for this patch because I do not know whether the number of cpus
differs deliberately.

 automation/scripts/qemu-smoke-arm64.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh
index 7ac82b2278..b48a20988f 100755
--- a/automation/scripts/qemu-smoke-arm64.sh
+++ b/automation/scripts/qemu-smoke-arm64.sh
@@ -35,7 +35,7 @@ curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom
 ./binaries/qemu-system-aarch64 \
    -machine virtualization=true \
    -cpu cortex-a57 -machine type=virt \
-   -m 1024 -display none \
+   -m 1024 -smp 2 -display none \
    -machine dumpdtb=binaries/virt-gicv2.dtb
 # XXX disable pl061 to avoid Linux crash
 dtc -I dtb -O dts binaries/virt-gicv2.dtb > binaries/virt-gicv2.dts
-- 
2.34.1

Re: [PATCH 1/3] automation: qemu-smoke-arm64.sh: Remove some stale comments

[Stefano Stabellini]

On Fri, 29 Jul 2022, Xenia Ragiadakou wrote:
> Remove comment "# Install QEMU" because qemu is not installed, it is taken
> from a test-artifacts container.
> 
> Change comment "# Busybox Dom0" to "# Busybox" because busybox is not used
> only for the Dom0 but also for the DomU.
> 
> Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>

Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>


> ---
>  automation/scripts/qemu-smoke-arm64.sh | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh
> index 898398196a..f483a2ffc1 100755
> --- a/automation/scripts/qemu-smoke-arm64.sh
> +++ b/automation/scripts/qemu-smoke-arm64.sh
> @@ -21,7 +21,6 @@ fi
>  "
>  fi
>  
> -# Install QEMU
>  export DEBIAN_FRONTENT=noninteractive
>  apt-get -qy update
>  apt-get -qy install --no-install-recommends u-boot-qemu \
> @@ -44,7 +43,7 @@ sed 's/compatible = "arm,pl061.*/status = "disabled";/g' binaries/virt-gicv3.dts
>  dtc -I dts -O dtb binaries/virt-gicv3-edited.dts > binaries/virt-gicv3.dtb
>  
>  
> -# Busybox Dom0
> +# Busybox
>  mkdir -p initrd
>  mkdir -p initrd/bin
>  mkdir -p initrd/sbin
> -- 
> 2.34.1
> 

Re: [PATCH 2/3] automation: qemu-smoke-arm64.sh: Rename the device tree to avoid confusion

[Stefano Stabellini]

On Fri, 29 Jul 2022, Xenia Ragiadakou wrote:
> Rename the device tree from virt-gicv3 to virt-gicv2 to avoid confusion
> since the version of the generic interrupt controller used for this test
> is the v2 and not the v3.
> 
> Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>

Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>


> ---
>  automation/scripts/qemu-smoke-arm64.sh | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh
> index f483a2ffc1..7ac82b2278 100755
> --- a/automation/scripts/qemu-smoke-arm64.sh
> +++ b/automation/scripts/qemu-smoke-arm64.sh
> @@ -36,11 +36,11 @@ curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom
>     -machine virtualization=true \
>     -cpu cortex-a57 -machine type=virt \
>     -m 1024 -display none \
> -   -machine dumpdtb=binaries/virt-gicv3.dtb
> +   -machine dumpdtb=binaries/virt-gicv2.dtb
>  # XXX disable pl061 to avoid Linux crash
> -dtc -I dtb -O dts binaries/virt-gicv3.dtb > binaries/virt-gicv3.dts
> -sed 's/compatible = "arm,pl061.*/status = "disabled";/g' binaries/virt-gicv3.dts > binaries/virt-gicv3-edited.dts
> -dtc -I dts -O dtb binaries/virt-gicv3-edited.dts > binaries/virt-gicv3.dtb
> +dtc -I dtb -O dts binaries/virt-gicv2.dtb > binaries/virt-gicv2.dts
> +sed 's/compatible = "arm,pl061.*/status = "disabled";/g' binaries/virt-gicv2.dts > binaries/virt-gicv2-edited.dts
> +dtc -I dts -O dtb binaries/virt-gicv2-edited.dts > binaries/virt-gicv2.dtb
>  
>  
>  # Busybox
> @@ -73,7 +73,7 @@ cd ..
>  echo 'MEMORY_START="0x40000000"
>  MEMORY_END="0x80000000"
>  
> -DEVICE_TREE="virt-gicv3.dtb"
> +DEVICE_TREE="virt-gicv2.dtb"
>  XEN="xen"
>  DOM0_KERNEL="Image"
>  DOM0_RAMDISK="initrd"
> -- 
> 2.34.1
> 

Re: [PATCH 3/3] automation: qemu-smoke-arm64.sh: Fix the number of cpus in the device tree

[Stefano Stabellini]

On Fri, 29 Jul 2022, Xenia Ragiadakou wrote:
> Qemu VM is configured with 2 cpus but the device tree passed has only 1.
> Generate a device tree with 2 cpus.
> 
> Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
> ---
> I am not sure for this patch because I do not know whether the number of cpus
> differs deliberately.

Yes let's go with 2

Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>

>  automation/scripts/qemu-smoke-arm64.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh
> index 7ac82b2278..b48a20988f 100755
> --- a/automation/scripts/qemu-smoke-arm64.sh
> +++ b/automation/scripts/qemu-smoke-arm64.sh
> @@ -35,7 +35,7 @@ curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom
>  ./binaries/qemu-system-aarch64 \
>     -machine virtualization=true \
>     -cpu cortex-a57 -machine type=virt \
> -   -m 1024 -display none \
> +   -m 1024 -smp 2 -display none \
>     -machine dumpdtb=binaries/virt-gicv2.dtb
>  # XXX disable pl061 to avoid Linux crash
>  dtc -I dtb -O dts binaries/virt-gicv2.dtb > binaries/virt-gicv2.dts
> -- 
> 2.34.1
>