mbox series

[v2,0/3] misc aarch64-sbsa cleanups

Message ID 20230303122251.3392998-1-niklas.cassel@wdc.com
Headers show
Series misc aarch64-sbsa cleanups | expand

Message

Niklas Cassel March 3, 2023, 12:22 p.m. UTC
Hello,

Here come some small aarch64-sbsa cleanups.
Please consider for inclusion.

Changes since v1:
-Modified test_edk2.py to use the same kernel config as
 qemu_aarch64_sbsa_defconfig. (Thanks Vincent.)


Kind regards,
Niklas


Niklas Cassel (3):
  board/qemu/aarch64-sbsa: use PARTLABEL to specify root
  board/qemu/aarch64-sbsa: use the default console specified by ACPI
  support/testing: use the arch default kernel config in test_edk2.py

 board/qemu/aarch64-sbsa/grub.cfg        |  2 +-
 board/qemu/aarch64-sbsa/linux.config    | 68 -------------------------
 support/testing/tests/boot/test_edk2.py |  7 +--
 3 files changed, 5 insertions(+), 72 deletions(-)
 delete mode 100644 board/qemu/aarch64-sbsa/linux.config

Comments

Vincent Stehlé March 6, 2023, 5:17 p.m. UTC | #1
On Fri, Mar 03, 2023 at 01:22:48PM +0100, Niklas Cassel wrote:
> Hello,
> 
> Here come some small aarch64-sbsa cleanups.
> Please consider for inclusion.
> 
> Changes since v1:
> -Modified test_edk2.py to use the same kernel config as
>  qemu_aarch64_sbsa_defconfig. (Thanks Vincent.)

Hi Niklas,

Thanks for fixing that.

I tested this v2 patch series on master and next: the
qemu_aarch64_sbsa_defconfig and the edk2 unit test work for me.

The edk2 unit test is slower due to the more complete kernel config and this
breaks the CI on gitlab. Maybe we should leave the reduced kernel config for the
unit test as it is after all? An alternative would be to extend the timeout,
somehow, but I don't know if unit tests longer than an hour are desirable.

Best regards,
Vincent.

> 
> 
> Kind regards,
> Niklas
> 
> 
> Niklas Cassel (3):
>   board/qemu/aarch64-sbsa: use PARTLABEL to specify root
>   board/qemu/aarch64-sbsa: use the default console specified by ACPI
>   support/testing: use the arch default kernel config in test_edk2.py
> 
>  board/qemu/aarch64-sbsa/grub.cfg        |  2 +-
>  board/qemu/aarch64-sbsa/linux.config    | 68 -------------------------
>  support/testing/tests/boot/test_edk2.py |  7 +--
>  3 files changed, 5 insertions(+), 72 deletions(-)
>  delete mode 100644 board/qemu/aarch64-sbsa/linux.config
> 
> -- 
> 2.39.2
>
Niklas Cassel March 7, 2023, 9:19 a.m. UTC | #2
On Mon, Mar 06, 2023 at 06:17:07PM +0100, Vincent Stehlé wrote:
> On Fri, Mar 03, 2023 at 01:22:48PM +0100, Niklas Cassel wrote:
> > Hello,
> > 
> > Here come some small aarch64-sbsa cleanups.
> > Please consider for inclusion.
> > 
> > Changes since v1:
> > -Modified test_edk2.py to use the same kernel config as
> >  qemu_aarch64_sbsa_defconfig. (Thanks Vincent.)
> 
> Hi Niklas,
> 
> Thanks for fixing that.
> 
> I tested this v2 patch series on master and next: the
> qemu_aarch64_sbsa_defconfig and the edk2 unit test work for me.
> 
> The edk2 unit test is slower due to the more complete kernel config and this
> breaks the CI on gitlab. Maybe we should leave the reduced kernel config for the
> unit test as it is after all? An alternative would be to extend the timeout,
> somehow, but I don't know if unit tests longer than an hour are desirable.

The config already looked like it included a bunch of unnecessary stuff to me,
e.g. CONFIG_DRM, CONFIG_DRM_VIRTIO_GPU, CONFIG_NETDEVICES, CONFIG_INET,
CONFIG_IP_MULTICAST, CONFIG_IP_ADVANCED_ROUTER, CONFIG_NET_SCHED,
CONFIG_SCSI_VIRTIO, CONFIG_VIRTIO_BLK, CONFIG_VIRTIO_FS, CONFIG_FUSE_FS.

None of which should be needed to do what test_edk2.py actually tests
(that we get Linux to boot all the way to a "login: " prompt).


QEMU is executed with:
-display none
no so need for any DRM.

-hda {...}/disk.img
which will emulate a drive at ATA level, so pointless to enable all the virtio
Kconfigs.

The buildroot config defined in test_edk2.py does not set BR2_SYSTEM_DHCP,
so no need for any network Kconfigs.


But I agree with you, it's better to keep this existing config rather than
extending the unit test timeout.

I will send a v3 which simply moves the config file.


Kind regards,
Niklas