Re: [PATCH v7 10/10] tests: add support for LoongArch

[Glenn Washburn]

On Mon, 8 Aug 2022 16:08:55 +0800
Xiaotian Wu <wuxiaotian@loongson.cn> wrote:

> 
> 在 2022/8/5 下午12:58, Glenn Washburn 写道:
> > On Thu,  4 Aug 2022 21:01:44 +0800
> > Xiaotian Wu <wuxiaotian@loongson.cn> wrote:
> >
> >> Signed-off-by: Xiaotian Wu <wuxiaotian@loongson.cn>
> >> ---
> >>   tests/ahci_test.in       |  2 +-
> >>   tests/ehci_test.in       |  2 +-
> >>   tests/ohci_test.in       |  2 +-
> >>   tests/pata_test.in       |  2 +-
> >>   tests/uhci_test.in       |  2 +-
> >>   tests/util/grub-shell.in | 14 ++++++++++++++
> >>   6 files changed, 19 insertions(+), 5 deletions(-)
> >>
> >> diff --git a/tests/ahci_test.in b/tests/ahci_test.in
> >> index 6d2e61d4e..70646a24e 100644
> >> --- a/tests/ahci_test.in
> >> +++ b/tests/ahci_test.in
> >> @@ -30,7 +30,7 @@ case 
> >> "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
> >>       mips*-arc | mips*-qemu_mips)
> >>    exit 77;;
> >>       # FIXME: No native drivers are available for those
> >> -    powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi)
> >> +    powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi | loongarch64-efi)
> >>    exit 77;;
> >>   esac
> >>   
> >> diff --git a/tests/ehci_test.in b/tests/ehci_test.in
> >> index df671b4b6..bf823a5de 100644
> >> --- a/tests/ehci_test.in
> >> +++ b/tests/ehci_test.in
> >> @@ -30,7 +30,7 @@ case 
> >> "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
> >>       mips*-arc | mips*-qemu_mips)
> >>    exit 77;;
> >>       # FIXME: No native drivers are available for those
> >> -    powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi)
> >> +    powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi | loongarch64-efi)
> >>    exit 77;;
> >>   esac
> >>   
> >> diff --git a/tests/ohci_test.in b/tests/ohci_test.in
> >> index 741ad881f..a40d3bc0a 100644
> >> --- a/tests/ohci_test.in
> >> +++ b/tests/ohci_test.in
> >> @@ -30,7 +30,7 @@ case 
> >> "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
> >>       mips*-arc | mips*-qemu_mips)
> >>    exit 77;;
> >>       # FIXME: No native drivers are available for those
> >> -    powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi)
> >> +    powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi | loongarch64-efi)
> >>    exit 77;;
> >>   esac
> >>   
> >> diff --git a/tests/pata_test.in b/tests/pata_test.in
> >> index 31144a8fd..4d0e7d573 100644
> >> --- a/tests/pata_test.in
> >> +++ b/tests/pata_test.in
> >> @@ -33,7 +33,7 @@ case 
> >> "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
> >>       i386-efi)
> >>    exit 77;;
> >>       # FIXME: No native drivers are available for those
> >> -    powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi)
> >> +    powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi | loongarch64-efi)
> >>    exit 77;;
> >>       i386-ieee1275)
> >>    disk=hdb
> >> diff --git a/tests/uhci_test.in b/tests/uhci_test.in
> >> index 5aa5eb726..de199a281 100644
> >> --- a/tests/uhci_test.in
> >> +++ b/tests/uhci_test.in
> >> @@ -30,7 +30,7 @@ case 
> >> "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
> >>       mips*-arc | mips*-qemu_mips)
> >>    exit 77;;
> >>       # FIXME: No native drivers are available for those
> >> -    powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi)
> >> +    powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi | loongarch64-efi)
> >>    exit 77;;
> >>   esac
> >>   
> >> diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
> >> index 4828afb7c..edf738c2a 100644
> >> --- a/tests/util/grub-shell.in
> >> +++ b/tests/util/grub-shell.in
> >> @@ -194,6 +194,16 @@ case 
> >> "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
> >>    disk="device virtio-blk-device,drive=hd1 -drive if=none,id=hd1,file="
> >>    serial_port=efi0
> >>    ;;
> >> +    loongarch64-efi)
> >> +  qemu=qemu-system-loongarch64
> >> +  boot=hd
> >> +  console=console
> >> +  trim=1
> >> +  qemuopts="-machine virt -cpu la464 -smp 2 -nographic -L ${srcdir} \
> >> +            -bios edk2-loongarch64-code.fd $qemuopts"
> >> +  disk="device virtio-blk-pci,drive=hd1 -drive if=none,id=hd1,file="
> >> +  serial_port=
> >> +  ;;
> >>       *)
> >>    boot=hd
> >>    qemu=qemu-system-i386
> >> @@ -395,6 +405,8 @@ fi
> >>   if [ x$boot = xhd ]; then
> >>       if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = 
> >> arm64-efi ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = 
> >> arm-efi ]; then
> >>    device="device virtio-blk-device,drive=hd0 -drive if=none,id=hd0,file="
> >> +    elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = 
> >> loongarch64-efi ]; then
> >> +  device="device virtio-blk-pci,drive=hd0 -drive if=none,id=hd0,file="
> > I thought you were going to change hd0 to "grubdisk" (I actually
> > suggested grubdev, but I think grubdisk is better).
> OK, maybe in this patch, I should change the "hd0" to "grubdisk0", "hd1" 
> to "grubdisk1", and change the "cd0" to "grubcd"?

Not exactly, "hd0" should be "grubdisk" and "cd0" should be "grubcd".
This is to signify that that is where GRUB is being booted from. We do
not want "hd1" to be "grubdisk1" because GRUB will not be on that disk.

I think I'm seeing a problem with this (and the arm* targets) if --disk
is given more than once. This in case, there will be multiple drives
with id=hd1, does qemu get confused by this? The disk handling code in
grub-shell needs to be updated (not necessarily by you though).

Glenn

> >
> >>       elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = 
> >> mips-arc ]; then
> >>    device="hdb "
> >>       else
> >> @@ -405,6 +417,8 @@ fi
> >>   if [ x$boot = xcd ]; then
> >>       if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = 
> >> arm64-efi ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = 
> >> arm-efi ]; then
> >>    device="device virtio-blk-device,drive=cd0 -drive 
> >> if=none,id=cd0,media=cdrom,file="
> >> +    elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = 
> >> loongarch64-efi ]; then
> >> +  device="device virtio-blk-pci,drive=cd0 -drive 
> >> if=none,id=cd0,media=cdrom,file="
> > Would be nice to change cd0 to "grubcd" also.
> >
> > Glenn
> >
> >>       elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = 
> >> powerpc-ieee1275 ] && [ x$pseries != xy ] ; then
> >>    device="-drive if=ide,media=cdrom,file="
> >>       else
>