mbox series

[v2,00/11] edk2: update to stable202202

Message ID 20220311053759.875785-1-kraxel@redhat.com (mailing list archive)
Headers show
Series edk2: update to stable202202 | expand

Message

Gerd Hoffmann March 11, 2022, 5:37 a.m. UTC 
While being at it switch to RELEASE builds,
which in turn needs acpi test data updates.

Add microvm build.  Update MAINTAINERS.
Some build/ci tweaks.

Also available here:
  https://gitlab.com/kraxel/qemu/-/commits/edk2

v2:
 - tweaked .git check
 - updated acpi table commit messages.
 - picked up review tags.

Gerd Hoffmann (11):
  tests/acpi: allow virt memory hotplug changes
  edk2: update submodule to stable202202
  edk2: switch to release builds
  edk2: .git can be a file
  edk2: add microvm build
  edk2: update binaries to stable202202
  tests/acpi: update expected data files
  tests/acpi: disallow virt memory hotplug changes
  edk2/docker: install python3
  edk2/docker: use ubuntu 18.04
  MAINTAINERS: take edk2

 .gitlab-ci.d/edk2/Dockerfile           |   4 ++--
 MAINTAINERS                            |   2 +-
 pc-bios/edk2-aarch64-code.fd.bz2       | Bin 1507722 -> 1161290 bytes
 pc-bios/edk2-arm-code.fd.bz2           | Bin 1503187 -> 1161845 bytes
 pc-bios/edk2-i386-code.fd.bz2          | Bin 1646741 -> 1282120 bytes
 pc-bios/edk2-i386-secure-code.fd.bz2   | Bin 1860546 -> 1473677 bytes
 pc-bios/edk2-x86_64-code.fd.bz2        | Bin 1680164 -> 1327522 bytes
 pc-bios/edk2-x86_64-microvm.fd.bz2     | Bin 0 -> 1309407 bytes
 pc-bios/edk2-x86_64-secure-code.fd.bz2 | Bin 1912112 -> 1513711 bytes
 roms/Makefile.edk2                     |  30 +++++++++++++++++--------
 roms/edk2                              |   2 +-
 roms/edk2-build.sh                     |   2 +-
 tests/data/acpi/virt/SSDT.memhp        | Bin 736 -> 736 bytes
 13 files changed, 26 insertions(+), 14 deletions(-)
 create mode 100644 pc-bios/edk2-x86_64-microvm.fd.bz2

Comments

Gerd Hoffmann March 11, 2022, 5:37 a.m. UTC | #1 
The switch to edk2 RELEASE builds changes the memory layout a bit,
resulting in a acpi table change.

 DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001)
 {
     Scope (\_SB)
     {
         Device (NVDR)
         {
             Name (_HID, "ACPI0012" /* NVDIMM Root Device */)  // _HID: Hardware ID
             Method (NCAL, 5, Serialized)
             {
                 Local6 = MEMA /* \MEMA */
                 {
                     Return (NCAL (Arg0, Arg1, Arg2, Arg3, 0x02))
                 }
             }

             Device (NV02)
             {
                 Name (_ADR, 0x03)  // _ADR: Address
                 Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method
                 {
                     Return (NCAL (Arg0, Arg1, Arg2, Arg3, 0x03))
                 }
             }
         }
     }

-    Name (MEMA, 0x43D10000)
+    Name (MEMA, 0x43F50000)
 }

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 tests/data/acpi/virt/SSDT.memhp | Bin 736 -> 736 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp
index 375d7b6fc85a484f492a26ccd355c205f2c34473..4c363a6d95a7e2e826568c85f5719127748e7932 100644
GIT binary patch
delta 22
dcmaFB`hb-yIM^lR0TTlQqx43uD@;sZodHo~2HXGu

delta 22
dcmaFB`hb-yIM^lR0TTlQqy0v%D@;rmodHrj2HXGu
Igor Mammedov March 11, 2022, 10:02 a.m. UTC | #2 
On Fri, 11 Mar 2022 06:37:55 +0100
Gerd Hoffmann <kraxel@redhat.com> wrote:

> The switch to edk2 RELEASE builds changes the memory layout a bit,
> resulting in a acpi table change.
> 
>  DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001)
>  {
>      Scope (\_SB)
>      {
>          Device (NVDR)
>          {
>              Name (_HID, "ACPI0012" /* NVDIMM Root Device */)  // _HID: Hardware ID
>              Method (NCAL, 5, Serialized)
>              {
>                  Local6 = MEMA /* \MEMA */
>                  {
>                      Return (NCAL (Arg0, Arg1, Arg2, Arg3, 0x02))
>                  }
>              }
> 
>              Device (NV02)
>              {
>                  Name (_ADR, 0x03)  // _ADR: Address
>                  Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method
>                  {
>                      Return (NCAL (Arg0, Arg1, Arg2, Arg3, 0x03))
>                  }
>              }
>          }
>      }
> 
> -    Name (MEMA, 0x43D10000)
> +    Name (MEMA, 0x43F50000)
>  }
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Acked-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  tests/data/acpi/virt/SSDT.memhp | Bin 736 -> 736 bytes
>  1 file changed, 0 insertions(+), 0 deletions(-)
> 
> diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp
> index 375d7b6fc85a484f492a26ccd355c205f2c34473..4c363a6d95a7e2e826568c85f5719127748e7932 100644
> GIT binary patch
> delta 22
> dcmaFB`hb-yIM^lR0TTlQqx43uD@;sZodHo~2HXGu
> 
> delta 22
> dcmaFB`hb-yIM^lR0TTlQqy0v%D@;rmodHrj2HXGu
>
Ani Sinha March 11, 2022, 12:19 p.m. UTC | #3 
On Fri, Mar 11, 2022 at 11:09 AM Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The switch to edk2 RELEASE builds changes the memory layout a bit,
> resulting in a acpi table change.

I would actually also refer to the actual change (submodule update
etc) that results in this change. Otherwise its hard to track/bosect
stuff.

>
>  DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001)
>  {
>      Scope (\_SB)
>      {
>          Device (NVDR)
>          {
>              Name (_HID, "ACPI0012" /* NVDIMM Root Device */)  // _HID: Hardware ID
>              Method (NCAL, 5, Serialized)
>              {
>                  Local6 = MEMA /* \MEMA */
>                  {
>                      Return (NCAL (Arg0, Arg1, Arg2, Arg3, 0x02))
>                  }
>              }
>
>              Device (NV02)
>              {
>                  Name (_ADR, 0x03)  // _ADR: Address
>                  Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method
>                  {
>                      Return (NCAL (Arg0, Arg1, Arg2, Arg3, 0x03))
>                  }
>              }
>          }
>      }
>
> -    Name (MEMA, 0x43D10000)
> +    Name (MEMA, 0x43F50000)
>  }
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  tests/data/acpi/virt/SSDT.memhp | Bin 736 -> 736 bytes
>  1 file changed, 0 insertions(+), 0 deletions(-)
>
> diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp
> index 375d7b6fc85a484f492a26ccd355c205f2c34473..4c363a6d95a7e2e826568c85f5719127748e7932 100644
> GIT binary patch
> delta 22
> dcmaFB`hb-yIM^lR0TTlQqx43uD@;sZodHo~2HXGu
>
> delta 22
> dcmaFB`hb-yIM^lR0TTlQqy0v%D@;rmodHrj2HXGu
>
> --
> 2.35.1
>
Michael S. Tsirkin March 11, 2022, 3:29 p.m. UTC | #4 
On Fri, Mar 11, 2022 at 06:37:55AM +0100, Gerd Hoffmann wrote:
> The switch to edk2 RELEASE builds changes the memory layout a bit,
> resulting in a acpi table change.
> 
>  DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001)
>  {
>      Scope (\_SB)
>      {
>          Device (NVDR)
>          {
>              Name (_HID, "ACPI0012" /* NVDIMM Root Device */)  // _HID: Hardware ID
>              Method (NCAL, 5, Serialized)
>              {
>                  Local6 = MEMA /* \MEMA */
>                  {
>                      Return (NCAL (Arg0, Arg1, Arg2, Arg3, 0x02))
>                  }
>              }
> 
>              Device (NV02)
>              {
>                  Name (_ADR, 0x03)  // _ADR: Address
>                  Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method
>                  {
>                      Return (NCAL (Arg0, Arg1, Arg2, Arg3, 0x03))
>                  }
>              }
>          }
>      }
> 
> -    Name (MEMA, 0x43D10000)
> +    Name (MEMA, 0x43F50000)
>  }
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  tests/data/acpi/virt/SSDT.memhp | Bin 736 -> 736 bytes
>  1 file changed, 0 insertions(+), 0 deletions(-)
> 
> diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp
> index 375d7b6fc85a484f492a26ccd355c205f2c34473..4c363a6d95a7e2e826568c85f5719127748e7932 100644
> GIT binary patch
> delta 22
> dcmaFB`hb-yIM^lR0TTlQqx43uD@;sZodHo~2HXGu
> 
> delta 22
> dcmaFB`hb-yIM^lR0TTlQqy0v%D@;rmodHrj2HXGu
> 
> -- 
> 2.35.1