diff mbox series

[PULL,2/6] bios-tables-test: use 128M numa nodes on aarch64

Message ID 20230320093847.539751-3-kraxel@redhat.com
State New
Headers show
Series [PULL,1/6] acpi: enable tests/data/acpi updates | expand

Commit Message

Gerd Hoffmann March 20, 2023, 9:38 a.m. UTC
Recent edk2 versions don't boot with very small numa nodes.
Bump the size from 64M to 128M.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 tests/qtest/bios-tables-test.c         |   6 +++---
 tests/data/acpi/virt/SRAT.acpihmatvirt | Bin 240 -> 240 bytes
 tests/data/acpi/virt/SSDT.memhp        | Bin 1817 -> 1817 bytes
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/data/acpi/virt/SRAT.acpihmatvirt b/tests/data/acpi/virt/SRAT.acpihmatvirt
index 691ef56e34bc84509270db316d908f5979c209bb..6fe55dd7d07fef0f8fe16a209e96a89dd48ca240 100644
GIT binary patch
delta 67
zcmeys_<@ltILI;N0|NsC^R$Uvjf@-<d*mlxmepX?U;>JPK>(EIfYJ<%Fb0qY0P4I6
AJ^%m!

delta 59
zcmeys_<@ltILI;N0|NsC^Qwtljf^Z4d*l^dfLst@flv$#j4%d}X4GJsxL6ecZ+{66

diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp
index 2fcfc5fda955dc4ba78a5f4116eed99ec7202fbd..ef93c44464f1fe38f7e5babd5d67f345cc6363a6 100644
GIT binary patch
delta 22
dcmbQqH<OPmIM^jblAVEpap^`bUUsI7&Hz1t1wsG-

delta 22
dcmbQqH<OPmIM^jblAVEpv2i08FFVs$X8=5?1wsG-

Comments

Ani Sinha March 21, 2023, 8:22 a.m. UTC | #1
On Mon, Mar 20, 2023 at 3:08 PM Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> Recent edk2 versions don't boot with very small numa nodes.
> Bump the size from 64M to 128M.

Can you please add the ASL diff between the binary blobs as a result
of the change?
Otherwise.

>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Ani Sinha <ani@anisinha.ca>

> ---
>  tests/qtest/bios-tables-test.c         |   6 +++---
>  tests/data/acpi/virt/SRAT.acpihmatvirt | Bin 240 -> 240 bytes
>  tests/data/acpi/virt/SSDT.memhp        | Bin 1817 -> 1817 bytes
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> index 76d510091177..873358943784 100644
> --- a/tests/qtest/bios-tables-test.c
> +++ b/tests/qtest/bios-tables-test.c
> @@ -1679,9 +1679,9 @@ static void test_acpi_virt_tcg_acpi_hmat(void)
>      test_acpi_one(" -machine hmat=on"
>                    " -cpu cortex-a57"
>                    " -smp 4,sockets=2"
> -                  " -m 256M"
> -                  " -object memory-backend-ram,size=64M,id=ram0"
> -                  " -object memory-backend-ram,size=64M,id=ram1"
> +                  " -m 384M"
> +                  " -object memory-backend-ram,size=128M,id=ram0"
> +                  " -object memory-backend-ram,size=128M,id=ram1"
>                    " -object memory-backend-ram,size=128M,id=ram2"
>                    " -numa node,nodeid=0,memdev=ram0"
>                    " -numa node,nodeid=1,memdev=ram1"
> diff --git a/tests/data/acpi/virt/SRAT.acpihmatvirt b/tests/data/acpi/virt/SRAT.acpihmatvirt
> index 691ef56e34bc84509270db316d908f5979c209bb..6fe55dd7d07fef0f8fe16a209e96a89dd48ca240 100644
> GIT binary patch
> delta 67
> zcmeys_<@ltILI;N0|NsC^R$Uvjf@-<d*mlxmepX?U;>JPK>(EIfYJ<%Fb0qY0P4I6
> AJ^%m!
>
> delta 59
> zcmeys_<@ltILI;N0|NsC^Qwtljf^Z4d*l^dfLst@flv$#j4%d}X4GJsxL6ecZ+{66
>
> diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp
> index 2fcfc5fda955dc4ba78a5f4116eed99ec7202fbd..ef93c44464f1fe38f7e5babd5d67f345cc6363a6 100644
> GIT binary patch
> delta 22
> dcmbQqH<OPmIM^jblAVEpap^`bUUsI7&Hz1t1wsG-
>
> delta 22
> dcmbQqH<OPmIM^jblAVEpv2i08FFVs$X8=5?1wsG-
>
> --
> 2.39.2
>
Michael S. Tsirkin March 21, 2023, 8:44 a.m. UTC | #2
On Tue, Mar 21, 2023 at 01:52:22PM +0530, Ani Sinha wrote:
> On Mon, Mar 20, 2023 at 3:08 PM Gerd Hoffmann <kraxel@redhat.com> wrote:
> >
> > Recent edk2 versions don't boot with very small numa nodes.
> > Bump the size from 64M to 128M.
> 
> Can you please add the ASL diff between the binary blobs as a result
> of the change?
> Otherwise.


Peter merged this so too late, but please do it in the future.
Otherwise it is impossible to review the changes.

> >
> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> Reviewed-by: Ani Sinha <ani@anisinha.ca>
> 
> > ---
> >  tests/qtest/bios-tables-test.c         |   6 +++---
> >  tests/data/acpi/virt/SRAT.acpihmatvirt | Bin 240 -> 240 bytes
> >  tests/data/acpi/virt/SSDT.memhp        | Bin 1817 -> 1817 bytes
> >  3 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> > index 76d510091177..873358943784 100644
> > --- a/tests/qtest/bios-tables-test.c
> > +++ b/tests/qtest/bios-tables-test.c
> > @@ -1679,9 +1679,9 @@ static void test_acpi_virt_tcg_acpi_hmat(void)
> >      test_acpi_one(" -machine hmat=on"
> >                    " -cpu cortex-a57"
> >                    " -smp 4,sockets=2"
> > -                  " -m 256M"
> > -                  " -object memory-backend-ram,size=64M,id=ram0"
> > -                  " -object memory-backend-ram,size=64M,id=ram1"
> > +                  " -m 384M"
> > +                  " -object memory-backend-ram,size=128M,id=ram0"
> > +                  " -object memory-backend-ram,size=128M,id=ram1"
> >                    " -object memory-backend-ram,size=128M,id=ram2"
> >                    " -numa node,nodeid=0,memdev=ram0"
> >                    " -numa node,nodeid=1,memdev=ram1"
> > diff --git a/tests/data/acpi/virt/SRAT.acpihmatvirt b/tests/data/acpi/virt/SRAT.acpihmatvirt
> > index 691ef56e34bc84509270db316d908f5979c209bb..6fe55dd7d07fef0f8fe16a209e96a89dd48ca240 100644
> > GIT binary patch
> > delta 67
> > zcmeys_<@ltILI;N0|NsC^R$Uvjf@-<d*mlxmepX?U;>JPK>(EIfYJ<%Fb0qY0P4I6
> > AJ^%m!
> >
> > delta 59
> > zcmeys_<@ltILI;N0|NsC^Qwtljf^Z4d*l^dfLst@flv$#j4%d}X4GJsxL6ecZ+{66
> >
> > diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp
> > index 2fcfc5fda955dc4ba78a5f4116eed99ec7202fbd..ef93c44464f1fe38f7e5babd5d67f345cc6363a6 100644
> > GIT binary patch
> > delta 22
> > dcmbQqH<OPmIM^jblAVEpap^`bUUsI7&Hz1t1wsG-
> >
> > delta 22
> > dcmbQqH<OPmIM^jblAVEpv2i08FFVs$X8=5?1wsG-
> >
> > --
> > 2.39.2
> >
diff mbox series

Patch

diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 76d510091177..873358943784 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1679,9 +1679,9 @@  static void test_acpi_virt_tcg_acpi_hmat(void)
     test_acpi_one(" -machine hmat=on"
                   " -cpu cortex-a57"
                   " -smp 4,sockets=2"
-                  " -m 256M"
-                  " -object memory-backend-ram,size=64M,id=ram0"
-                  " -object memory-backend-ram,size=64M,id=ram1"
+                  " -m 384M"
+                  " -object memory-backend-ram,size=128M,id=ram0"
+                  " -object memory-backend-ram,size=128M,id=ram1"
                   " -object memory-backend-ram,size=128M,id=ram2"
                   " -numa node,nodeid=0,memdev=ram0"
                   " -numa node,nodeid=1,memdev=ram1"