mbox

[PULL,00/11] Edk2 20220315 patches

Message ID 20220315083656.1949517-1-kraxel@redhat.com (mailing list archive)
State New, archived
Headers show

Pull-request

git://git.kraxel.org/qemu tags/edk2-20220315-pull-request

Message

Gerd Hoffmann March 15, 2022, 8:36 a.m. UTC 
The following changes since commit 352998df1c53b366413690d95b35f76d0721ebed:

  Merge tag 'i2c-20220314' of https://github.com/philmd/qemu into staging (2022-03-14 14:39:33 +0000)

are available in the Git repository at:

  git://git.kraxel.org/qemu tags/edk2-20220315-pull-request

for you to fetch changes up to 9b437cd0f95398198852f25d7847a605370f984d:

  MAINTAINERS: take edk2 (2022-03-15 09:32:22 +0100)

----------------------------------------------------------------
edk2: update to stable202202

----------------------------------------------------------------

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 15, 2022, 8:36 a.m. UTC | #1 
The switch to edk2 RELEASE builds changes the memory layout a bit,
resulting in a acpi table change.

See commits ca26041500eb ("edk2: switch to release builds") and
3891a5996fee ("edk2: update binaries to stable202202")

 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>
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
Peter Maydell March 15, 2022, 2:41 p.m. UTC | #2 
On Tue, 15 Mar 2022 at 08:43, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit 352998df1c53b366413690d95b35f76d0721ebed:
>
>   Merge tag 'i2c-20220314' of https://github.com/philmd/qemu into staging (2022-03-14 14:39:33 +0000)
>
> are available in the Git repository at:
>
>   git://git.kraxel.org/qemu tags/edk2-20220315-pull-request
>
> for you to fetch changes up to 9b437cd0f95398198852f25d7847a605370f984d:
>
>   MAINTAINERS: take edk2 (2022-03-15 09:32:22 +0100)
>
> ----------------------------------------------------------------
> edk2: update to stable202202
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/7.0
for any user-visible changes.

-- PMM