[PULL 0/6] Firmware/edk2 20231213 patches

[PULL 0/6] Firmware/edk2 20231213 patches

[Gerd Hoffmann]

The following changes since commit 9c74490bff6c8886a922008d0c9ce6cae70dd17e:

  Update version for v8.2.0-rc3 release (2023-12-06 14:34:20 -0500)

are available in the Git repository at:

  https://gitlab.com/kraxel/qemu.git tags/firmware/edk2-20231213-pull-request

for you to fetch changes up to 704f7cad5105246822686f65765ab92045f71a3b:

  tests/acpi: disallow tests/data/acpi/virt/SSDT.memhp changes (2023-12-13 11:23:11 +0100)

----------------------------------------------------------------
edk2: update to git snapshot (maybe for-8.2)

This updates edk2 to git master as of today.  This picks up a patch
(merged only yesterday, that's why this last-minute PR) which allows to
work around a bug in shim, and enables that workaround in the qemu
firmware builds.

This solves a real-world problem on arm hardware, walk over to
https://gitlab.com/qemu-project/qemu/-/issues/1990 to see the details.

Merging this firmware update that close to the 8.2 release clearly is
not without risks.  If I get a 'no', I'm not going to complain.

That said I'm not aware of any bugs, and landing this in 8.2.0 would
make a bunch of folks hanging around in issue 1990 very happy.

Alternative plan would be to merge this after the release, give it some
time for testing, and assuming everything goes well schedule a backport
for 8.2.1

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

Gerd Hoffmann (6):
  tests/acpi: allow tests/data/acpi/virt/SSDT.memhp changes
  edk2: update to git snapshot
  edk2: update build config, set PcdUninstallMemAttrProtocol = TRUE.
  edk2: update binaries to git snapshot
  tests/acpi: update expected data files
  tests/acpi: disallow tests/data/acpi/virt/SSDT.memhp changes

 pc-bios/edk2-aarch64-code.fd.bz2       | Bin 1573561 -> 1587761 bytes
 pc-bios/edk2-arm-code.fd.bz2           | Bin 1560966 -> 1569509 bytes
 pc-bios/edk2-i386-code.fd.bz2          | Bin 1770410 -> 1773520 bytes
 pc-bios/edk2-i386-secure-code.fd.bz2   | Bin 2121818 -> 2127480 bytes
 pc-bios/edk2-riscv-code.fd.bz2         | Bin 1177402 -> 1180314 bytes
 pc-bios/edk2-x86_64-code.fd.bz2        | Bin 1887921 -> 1891942 bytes
 pc-bios/edk2-x86_64-microvm.fd.bz2     | Bin 1782629 -> 1783951 bytes
 pc-bios/edk2-x86_64-secure-code.fd.bz2 | Bin 2200701 -> 2212258 bytes
 roms/edk2                              |   2 +-
 roms/edk2-build.config                 |  12 +++++++++---
 tests/data/acpi/virt/SSDT.memhp        | Bin 1817 -> 1817 bytes
 11 files changed, 10 insertions(+), 4 deletions(-)

-- 
2.43.0

[PULL 1/6] tests/acpi: allow tests/data/acpi/virt/SSDT.memhp changes

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 tests/qtest/bios-tables-test-allowed-diff.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8bf4..e569098abddc 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,2 @@
 /* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/virt/SSDT.memhp",
-- 
2.43.0

[PULL 2/6] edk2: update to git snapshot

[Gerd Hoffmann]

Want pick up edk2 commit cee7ba349c0c ("ArmVirtQemu: Allow
EFI memory attributes protocol to be disabled").  Needed to
fix issue #1990.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 roms/edk2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roms/edk2 b/roms/edk2
index 819cfc6b42a6..b8a3eec88cc7 160000
--- a/roms/edk2
+++ b/roms/edk2
@@ -1 +1 @@
-Subproject commit 819cfc6b42a68790a23509e4fcc58ceb70e1965e
+Subproject commit b8a3eec88cc74bbfe7fb389d026cc7d1d8a989c8
-- 
2.43.0

[PULL 3/6] edk2: update build config, set PcdUninstallMemAttrProtocol = TRUE.

[Gerd Hoffmann]

Needed to workaround buggy EFI_MEMORY_ATTRIBUTE_PROTOCOL
usage in shim.efi.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 roms/edk2-build.config | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/roms/edk2-build.config b/roms/edk2-build.config
index bab6a9caebfa..0d367dbdb775 100644
--- a/roms/edk2-build.config
+++ b/roms/edk2-build.config
@@ -22,9 +22,15 @@ SMM_REQUIRE              = TRUE
 [opts.armvirt.silent]
 DEBUG_PRINT_ERROR_LEVEL  = 0x80000000
 
-[pcds.nx.broken.grub]
+[pcds.nx.strict]
+PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD5
+PcdUninstallMemAttrProtocol    = FALSE
+
+[pcds.nx.broken.shim.grub]
 # grub.efi uses EfiLoaderData for code
 PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD1
+# shim.efi has broken MemAttr code
+PcdUninstallMemAttrProtocol    = TRUE
 
 [pcds.workaround.202308]
 PcdFirstTimeWakeUpAPsBySipi = FALSE
@@ -95,7 +101,7 @@ conf = ArmVirtPkg/ArmVirtQemu.dsc
 arch = ARM
 opts = common
        armvirt.silent
-pcds = nx.broken.grub
+pcds = nx.broken.shim.grub
 plat = ArmVirtQemu-ARM
 dest = ../pc-bios
 cpy1 = FV/QEMU_EFI.fd    edk2-arm-code.fd
@@ -112,7 +118,7 @@ conf = ArmVirtPkg/ArmVirtQemu.dsc
 arch = AARCH64
 opts = common
        armvirt.silent
-pcds = nx.broken.grub
+pcds = nx.broken.shim.grub
 plat = ArmVirtQemu-AARCH64
 dest = ../pc-bios
 cpy1 = FV/QEMU_EFI.fd  edk2-aarch64-code.fd
-- 
2.43.0

[PULL 5/6] tests/acpi: update expected data files

[Gerd Hoffmann]

edk2 firmware update caused a address layout change.

 DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001)
 {
     [ ... ]
-    Name (MEMA, 0x43C90000)
+    Name (MEMA, 0x43C80000)
 }

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 tests/data/acpi/virt/SSDT.memhp | Bin 1817 -> 1817 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 31ff6ac46940a3e304a2d68efabe12bab50be0d7..fb3dcde5a10936667ad75a759b8bd444a7b19fc2 100644
GIT binary patch
delta 22
dcmbQqH<OPmIM^jblAVEpaot8PUUsGv&Hz2O1wsG-

delta 22
dcmbQqH<OPmIM^jblAVEpaqUJfUUsIF&Hz2I1wsG-

-- 
2.43.0

[PULL 6/6] tests/acpi: disallow tests/data/acpi/virt/SSDT.memhp changes

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 tests/qtest/bios-tables-test-allowed-diff.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index e569098abddc..dfb8523c8bf4 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,2 +1 @@
 /* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/virt/SSDT.memhp",
-- 
2.43.0

Re: [PULL 6/6] tests/acpi: disallow tests/data/acpi/virt/SSDT.memhp changes

[Ani Sinha]

> On 13-Dec-2023, at 4:20 PM, Gerd Hoffmann <kraxel@redhat.com> wrote:
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Please combine this patch with patch 5. No need to do this separately.

> ---
> tests/qtest/bios-tables-test-allowed-diff.h | 1 -
> 1 file changed, 1 deletion(-)
> 
> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> index e569098abddc..dfb8523c8bf4 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1,2 +1 @@
> /* List of comma-separated changed AML files to ignore */
> -"tests/data/acpi/virt/SSDT.memhp",
> -- 
> 2.43.0
> 

Re: [PULL 6/6] tests/acpi: disallow tests/data/acpi/virt/SSDT.memhp changes

[Michael S. Tsirkin]

On Wed, Dec 13, 2023 at 04:24:24PM +0530, Ani Sinha wrote:
> 
> 
> > On 13-Dec-2023, at 4:20 PM, Gerd Hoffmann <kraxel@redhat.com> wrote:
> > 
> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> 
> Please combine this patch with patch 5. No need to do this separately.


Yes but since it's done - it's fine either way I think. No?

> > ---
> > tests/qtest/bios-tables-test-allowed-diff.h | 1 -
> > 1 file changed, 1 deletion(-)
> > 
> > diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> > index e569098abddc..dfb8523c8bf4 100644
> > --- a/tests/qtest/bios-tables-test-allowed-diff.h
> > +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> > @@ -1,2 +1 @@
> > /* List of comma-separated changed AML files to ignore */
> > -"tests/data/acpi/virt/SSDT.memhp",
> > -- 
> > 2.43.0
> > 

Re: [PULL 6/6] tests/acpi: disallow tests/data/acpi/virt/SSDT.memhp changes

[Ani Sinha]

> On 13-Dec-2023, at 8:03 PM, Michael S. Tsirkin <mst@redhat.com> wrote:
> 
> On Wed, Dec 13, 2023 at 04:24:24PM +0530, Ani Sinha wrote:
>> 
>> 
>>> On 13-Dec-2023, at 4:20 PM, Gerd Hoffmann <kraxel@redhat.com> wrote:
>>> 
>>> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>> 
>> Please combine this patch with patch 5. No need to do this separately.
> 
> 
> Yes but since it's done - it's fine either way I think. No?

Yes I did not realise it was a PR and not a review. I thought it was sent for review. If it’s done it’s ok.
That being said, I would have preferred that the commit had a description and not completely empty.

> 
>>> ---
>>> tests/qtest/bios-tables-test-allowed-diff.h | 1 -
>>> 1 file changed, 1 deletion(-)
>>> 
>>> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
>>> index e569098abddc..dfb8523c8bf4 100644
>>> --- a/tests/qtest/bios-tables-test-allowed-diff.h
>>> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
>>> @@ -1,2 +1 @@
>>> /* List of comma-separated changed AML files to ignore */
>>> -"tests/data/acpi/virt/SSDT.memhp",
>>> -- 
>>> 2.43.0
>>> 
> 

Re: [PULL 6/6] tests/acpi: disallow tests/data/acpi/virt/SSDT.memhp changes

[Michael S. Tsirkin]

On Wed, Dec 13, 2023 at 08:09:29PM +0530, Ani Sinha wrote:
> 
> 
> > On 13-Dec-2023, at 8:03 PM, Michael S. Tsirkin <mst@redhat.com> wrote:
> > 
> > On Wed, Dec 13, 2023 at 04:24:24PM +0530, Ani Sinha wrote:
> >> 
> >> 
> >>> On 13-Dec-2023, at 4:20 PM, Gerd Hoffmann <kraxel@redhat.com> wrote:
> >>> 
> >>> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> >> 
> >> Please combine this patch with patch 5. No need to do this separately.
> > 
> > 
> > Yes but since it's done - it's fine either way I think. No?
> 
> Yes I did not realise it was a PR and not a review. I thought it was sent for review. If it’s done it’s ok.
> That being said, I would have preferred that the commit had a description and not completely empty.


I agree, Gerd, going forward please include the diff of the
disassemled AML.


> > 
> >>> ---
> >>> tests/qtest/bios-tables-test-allowed-diff.h | 1 -
> >>> 1 file changed, 1 deletion(-)
> >>> 
> >>> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> >>> index e569098abddc..dfb8523c8bf4 100644
> >>> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> >>> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> >>> @@ -1,2 +1 @@
> >>> /* List of comma-separated changed AML files to ignore */
> >>> -"tests/data/acpi/virt/SSDT.memhp",
> >>> -- 
> >>> 2.43.0
> >>> 
> > 

Re: [PULL 6/6] tests/acpi: disallow tests/data/acpi/virt/SSDT.memhp changes

[Gerd Hoffmann]

  Hi,

> I agree, Gerd, going forward please include the diff of the
> disassemled AML.

That is in patch 5/6 which updates the test data.

take care,
  Gerd

Re: [PULL 6/6] tests/acpi: disallow tests/data/acpi/virt/SSDT.memhp changes

[Michael S. Tsirkin]

On Wed, Dec 13, 2023 at 04:14:00PM +0100, Gerd Hoffmann wrote:
>   Hi,
> 
> > I agree, Gerd, going forward please include the diff of the
> > disassemled AML.
> 
> That is in patch 5/6 which updates the test data.
> 
> take care,
>   Gerd

Oh I double checked and you are right, I'm not sure where did I look that I missed it.
Pls ignore.

Re: [PULL 6/6] tests/acpi: disallow tests/data/acpi/virt/SSDT.memhp changes

[Ani Sinha]

> On 13-Dec-2023, at 8:47 PM, Michael S. Tsirkin <mst@redhat.com> wrote:
> 
> On Wed, Dec 13, 2023 at 04:14:00PM +0100, Gerd Hoffmann wrote:
>>  Hi,
>> 
>>> I agree, Gerd, going forward please include the diff of the
>>> disassemled AML.
>> 
>> That is in patch 5/6 which updates the test data.
>> 
>> take care,
>>  Gerd
> 
> Oh I double checked and you are right, I'm not sure where did I look that I missed it.

Yes I was talking about patch 6 having an empty description.

Re: [PULL 0/6] Firmware/edk2 20231213 patches

[Gerd Hoffmann]

On Wed, Dec 13, 2023 at 11:50:12AM +0100, Gerd Hoffmann wrote:
> The following changes since commit 9c74490bff6c8886a922008d0c9ce6cae70dd17e:
> 
>   Update version for v8.2.0-rc3 release (2023-12-06 14:34:20 -0500)
> 
> are available in the Git repository at:
> 
>   https://gitlab.com/kraxel/qemu.git tags/firmware/edk2-20231213-pull-request
> 
> for you to fetch changes up to 704f7cad5105246822686f65765ab92045f71a3b:
> 
>   tests/acpi: disallow tests/data/acpi/virt/SSDT.memhp changes (2023-12-13 11:23:11 +0100)
> 
> ----------------------------------------------------------------
> edk2: update to git snapshot (maybe for-8.2)
> 
> This updates edk2 to git master as of today.  This picks up a patch
> (merged only yesterday, that's why this last-minute PR) which allows to
> work around a bug in shim, and enables that workaround in the qemu
> firmware builds.
> 
> This solves a real-world problem on arm hardware, walk over to
> https://gitlab.com/qemu-project/qemu/-/issues/1990 to see the details.
> 
> Merging this firmware update that close to the 8.2 release clearly is
> not without risks.  If I get a 'no', I'm not going to complain.
> 
> That said I'm not aware of any bugs, and landing this in 8.2.0 would
> make a bunch of folks hanging around in issue 1990 very happy.
> 
> Alternative plan would be to merge this after the release, give it some
> time for testing, and assuming everything goes well schedule a backport
> for 8.2.1

Ping.

As expected this missed the 8.2 boat.  Now the devel tree is open again
and people are back from xmas + new year vacations, can this be picked
up for master and eventually 8.2-stable?

thanks,
  Gerd

Re: [PULL 0/6] Firmware/edk2 20231213 patches

[Peter Maydell]

On Thu, 11 Jan 2024 at 14:01, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> On Wed, Dec 13, 2023 at 11:50:12AM +0100, Gerd Hoffmann wrote:
> > The following changes since commit 9c74490bff6c8886a922008d0c9ce6cae70dd17e:
> >
> >   Update version for v8.2.0-rc3 release (2023-12-06 14:34:20 -0500)
> >
> > are available in the Git repository at:
> >
> >   https://gitlab.com/kraxel/qemu.git tags/firmware/edk2-20231213-pull-request
> >
> > for you to fetch changes up to 704f7cad5105246822686f65765ab92045f71a3b:
> >
> >   tests/acpi: disallow tests/data/acpi/virt/SSDT.memhp changes (2023-12-13 11:23:11 +0100)
> >
> > ----------------------------------------------------------------
> > edk2: update to git snapshot (maybe for-8.2)
> >
> > This updates edk2 to git master as of today.  This picks up a patch
> > (merged only yesterday, that's why this last-minute PR) which allows to
> > work around a bug in shim, and enables that workaround in the qemu
> > firmware builds.
> >
> > This solves a real-world problem on arm hardware, walk over to
> > https://gitlab.com/qemu-project/qemu/-/issues/1990 to see the details.
> >
> > Merging this firmware update that close to the 8.2 release clearly is
> > not without risks.  If I get a 'no', I'm not going to complain.
> >
> > That said I'm not aware of any bugs, and landing this in 8.2.0 would
> > make a bunch of folks hanging around in issue 1990 very happy.
> >
> > Alternative plan would be to merge this after the release, give it some
> > time for testing, and assuming everything goes well schedule a backport
> > for 8.2.1
>
> Ping.
>
> As expected this missed the 8.2 boat.  Now the devel tree is open again
> and people are back from xmas + new year vacations, can this be picked
> up for master and eventually 8.2-stable?

I can queue it, sure. Do we need to respin it to add cc: qemu-stable
tags, or can it be applied as-is ?

-- PMM

Re: [PULL 0/6] Firmware/edk2 20231213 patches

[Peter Maydell]

On Thu, 11 Jan 2024 at 15:52, Peter Maydell <peter.maydell@linaro.org> wrote:
>
> On Thu, 11 Jan 2024 at 14:01, Gerd Hoffmann <kraxel@redhat.com> wrote:
> >
> > On Wed, Dec 13, 2023 at 11:50:12AM +0100, Gerd Hoffmann wrote:
> > > The following changes since commit 9c74490bff6c8886a922008d0c9ce6cae70dd17e:
> > >
> > >   Update version for v8.2.0-rc3 release (2023-12-06 14:34:20 -0500)
> > >
> > > are available in the Git repository at:
> > >
> > >   https://gitlab.com/kraxel/qemu.git tags/firmware/edk2-20231213-pull-request
> > >
> > > for you to fetch changes up to 704f7cad5105246822686f65765ab92045f71a3b:
> > >
> > >   tests/acpi: disallow tests/data/acpi/virt/SSDT.memhp changes (2023-12-13 11:23:11 +0100)
> > >
> > > ----------------------------------------------------------------
> > > edk2: update to git snapshot (maybe for-8.2)
> > >
> > > This updates edk2 to git master as of today.  This picks up a patch
> > > (merged only yesterday, that's why this last-minute PR) which allows to
> > > work around a bug in shim, and enables that workaround in the qemu
> > > firmware builds.
> > >
> > > This solves a real-world problem on arm hardware, walk over to
> > > https://gitlab.com/qemu-project/qemu/-/issues/1990 to see the details.
> > >
> > > Merging this firmware update that close to the 8.2 release clearly is
> > > not without risks.  If I get a 'no', I'm not going to complain.
> > >
> > > That said I'm not aware of any bugs, and landing this in 8.2.0 would
> > > make a bunch of folks hanging around in issue 1990 very happy.
> > >
> > > Alternative plan would be to merge this after the release, give it some
> > > time for testing, and assuming everything goes well schedule a backport
> > > for 8.2.1
> >
> > Ping.
> >
> > As expected this missed the 8.2 boat.  Now the devel tree is open again
> > and people are back from xmas + new year vacations, can this be picked
> > up for master and eventually 8.2-stable?
>
> I can queue it, sure. Do we need to respin it to add cc: qemu-stable
> tags, or can it be applied as-is ?

...PS did you mean to cc qemu-stable, not the nonexistent edk2-stable
on this pullreq email?

thanks
-- PMM

Re: Re: [PULL 0/6] Firmware/edk2 20231213 patches

[Gerd Hoffmann]

On Thu, Jan 11, 2024 at 04:02:38PM +0000, Peter Maydell wrote:
> On Thu, 11 Jan 2024 at 15:52, Peter Maydell <peter.maydell@linaro.org> wrote:
> >
> > On Thu, 11 Jan 2024 at 14:01, Gerd Hoffmann <kraxel@redhat.com> wrote:
> > >
> > > Ping.
> > >
> > > As expected this missed the 8.2 boat.  Now the devel tree is open again
> > > and people are back from xmas + new year vacations, can this be picked
> > > up for master and eventually 8.2-stable?
> >
> > I can queue it, sure. Do we need to respin it to add cc: qemu-stable
> > tags, or can it be applied as-is ?
> 
> ...PS did you mean to cc qemu-stable, not the nonexistent edk2-stable
> on this pullreq email?

Yes, Cc'ing qemu-stable was the intention, thanks for fixing it up.

I'd leave it to the stable maintainer(s).  If they prefer a respin with
Cc qemu-stable added to all patches I surely can do that.  If being
notified with this reply is good enough I'm happy too.

take care,
  Gerd

Re: Re: [PULL 0/6] Firmware/edk2 20231213 patches

[Peter Maydell]

On Thu, 11 Jan 2024 at 16:28, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> On Thu, Jan 11, 2024 at 04:02:38PM +0000, Peter Maydell wrote:
> > On Thu, 11 Jan 2024 at 15:52, Peter Maydell <peter.maydell@linaro.org> wrote:
> > >
> > > On Thu, 11 Jan 2024 at 14:01, Gerd Hoffmann <kraxel@redhat.com> wrote:
> > > >
> > > > Ping.
> > > >
> > > > As expected this missed the 8.2 boat.  Now the devel tree is open again
> > > > and people are back from xmas + new year vacations, can this be picked
> > > > up for master and eventually 8.2-stable?
> > >
> > > I can queue it, sure. Do we need to respin it to add cc: qemu-stable
> > > tags, or can it be applied as-is ?
> >
> > ...PS did you mean to cc qemu-stable, not the nonexistent edk2-stable
> > on this pullreq email?
>
> Yes, Cc'ing qemu-stable was the intention, thanks for fixing it up.
>
> I'd leave it to the stable maintainer(s).  If they prefer a respin with
> Cc qemu-stable added to all patches I surely can do that.  If being
> notified with this reply is good enough I'm happy too.

Well, it all made it through the CI fine, and I think MJT is
fairly flexible about stable- notifications, so I'm going to
push this merge to git.


Applied, thanks.

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

-- PMM

Re: Re: [PULL 0/6] Firmware/edk2 20231213 patches

[Peter Maydell]

On Fri, 12 Jan 2024 at 12:47, Peter Maydell <peter.maydell@linaro.org> wrote:
>
> On Thu, 11 Jan 2024 at 16:28, Gerd Hoffmann <kraxel@redhat.com> wrote:
> >
> > On Thu, Jan 11, 2024 at 04:02:38PM +0000, Peter Maydell wrote:
> > > On Thu, 11 Jan 2024 at 15:52, Peter Maydell <peter.maydell@linaro.org> wrote:
> > > >
> > > > On Thu, 11 Jan 2024 at 14:01, Gerd Hoffmann <kraxel@redhat.com> wrote:
> > > > >
> > > > > Ping.
> > > > >
> > > > > As expected this missed the 8.2 boat.  Now the devel tree is open again
> > > > > and people are back from xmas + new year vacations, can this be picked
> > > > > up for master and eventually 8.2-stable?
> > > >
> > > > I can queue it, sure. Do we need to respin it to add cc: qemu-stable
> > > > tags, or can it be applied as-is ?
> > >
> > > ...PS did you mean to cc qemu-stable, not the nonexistent edk2-stable
> > > on this pullreq email?
> >
> > Yes, Cc'ing qemu-stable was the intention, thanks for fixing it up.
> >
> > I'd leave it to the stable maintainer(s).  If they prefer a respin with
> > Cc qemu-stable added to all patches I surely can do that.  If being
> > notified with this reply is good enough I'm happy too.
>
> Well, it all made it through the CI fine, and I think MJT is
> fairly flexible about stable- notifications, so I'm going to
> push this merge to git.
>
>
> Applied, thanks.
>
> Please update the changelog at https://wiki.qemu.org/ChangeLog/9.0
> for any user-visible changes.

PS: when are we likely to be able to update to a proper released
EDK2 ? Running with a git snapshot isn't ideal, so if we can
move to an EDK2 release version within this QEMU cycle that would
be nice.

thanks
-- PMM

Re: Re: [PULL 0/6] Firmware/edk2 20231213 patches

[Peter Maydell]

On Fri, 12 Jan 2024 at 16:19, Peter Maydell <peter.maydell@linaro.org> wrote:
> PS: when are we likely to be able to update to a proper released
> EDK2 ? Running with a git snapshot isn't ideal, so if we can
> move to an EDK2 release version within this QEMU cycle that would
> be nice.

...and for a stable backport, backporting the released version
seems likely to be better than backporting the git-snapshot.

-- PMM

Re: Re: Re: [PULL 0/6] Firmware/edk2 20231213 patches

[Gerd Hoffmann]

  Hi,

> PS: when are we likely to be able to update to a proper released
> EDK2 ? Running with a git snapshot isn't ideal, so if we can
> move to an EDK2 release version within this QEMU cycle that would
> be nice.

Next release should be tagged by end of February, so if the qemu 9.0
schedule is simliar to the 8.0 schedule this is before soft freeze
and an update should be no problem.

take care,
  Gerd

Re: [PULL 0/6] Firmware/edk2 20231213 patches

[Michael Tokarev]

15.01.2024 13:20, Gerd Hoffmann :
>    Hi,
> 
>> PS: when are we likely to be able to update to a proper released
>> EDK2 ? Running with a git snapshot isn't ideal, so if we can
>> move to an EDK2 release version within this QEMU cycle that would
>> be nice.
> 
> Next release should be tagged by end of February, so if the qemu 9.0
> schedule is simliar to the 8.0 schedule this is before soft freeze
> and an update should be no problem.

So, should we pick this up for 8.2.1, or wait till next release of edk2 ?

The thing here is that for (some) downstreams, edk2 is a separate package,
so if qemu relies on changed edk2, it should be there before qemu-side
changes can be added.  So if we pick this patchset up for 8.2.1, it might
be a bit surprising for downstreams.

Thanks,

/mjt

Re: Re: [PULL 0/6] Firmware/edk2 20231213 patches

[Gerd Hoffmann]

On Wed, Jan 17, 2024 at 01:16:34PM +0300, Michael Tokarev wrote:
> 15.01.2024 13:20, Gerd Hoffmann :
> >    Hi,
> > 
> > > PS: when are we likely to be able to update to a proper released
> > > EDK2 ? Running with a git snapshot isn't ideal, so if we can
> > > move to an EDK2 release version within this QEMU cycle that would
> > > be nice.
> > 
> > Next release should be tagged by end of February, so if the qemu 9.0
> > schedule is simliar to the 8.0 schedule this is before soft freeze
> > and an update should be no problem.
> 
> So, should we pick this up for 8.2.1, or wait till next release of edk2 ?
> 
> The thing here is that for (some) downstreams, edk2 is a separate package,
> so if qemu relies on changed edk2, it should be there before qemu-side
> changes can be added.  So if we pick this patchset up for 8.2.1, it might
> be a bit surprising for downstreams.

It's not that there changed something in the edk2 <-> qemu interfaces.
This build contains a workaround for the current shim.efi clusterf*ck.

The tl;dr version:  The build is compiled with the (very recently added)
PcdUninstallMemAttrProtocol=TRUE option to workaround a bug in shim.efi.

The extra long version:
    https://www.kraxel.org/blog/2023/12/uefi-nx-linux-boot/

Picking this up for 8.2.1 makes life easier for the downstreams which do
not do their own firmware builds but ship the qemu prebuilds instead.

take care,
  Gerd

Re: Re: [PULL 0/6] Firmware/edk2 20231213 patches

[Peter Maydell]

On Wed, 17 Jan 2024 at 14:29, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> On Wed, Jan 17, 2024 at 01:16:34PM +0300, Michael Tokarev wrote:
> > 15.01.2024 13:20, Gerd Hoffmann :
> > >    Hi,
> > >
> > > > PS: when are we likely to be able to update to a proper released
> > > > EDK2 ? Running with a git snapshot isn't ideal, so if we can
> > > > move to an EDK2 release version within this QEMU cycle that would
> > > > be nice.
> > >
> > > Next release should be tagged by end of February, so if the qemu 9.0
> > > schedule is simliar to the 8.0 schedule this is before soft freeze
> > > and an update should be no problem.
> >
> > So, should we pick this up for 8.2.1, or wait till next release of edk2 ?
> >
> > The thing here is that for (some) downstreams, edk2 is a separate package,
> > so if qemu relies on changed edk2, it should be there before qemu-side
> > changes can be added.  So if we pick this patchset up for 8.2.1, it might
> > be a bit surprising for downstreams.
>
> It's not that there changed something in the edk2 <-> qemu interfaces.
> This build contains a workaround for the current shim.efi clusterf*ck.
>
> The tl;dr version:  The build is compiled with the (very recently added)
> PcdUninstallMemAttrProtocol=TRUE option to workaround a bug in shim.efi.
>
> The extra long version:
>     https://www.kraxel.org/blog/2023/12/uefi-nx-linux-boot/
>
> Picking this up for 8.2.1 makes life easier for the downstreams which do
> not do their own firmware builds but ship the qemu prebuilds instead.

On the other side of the scales, it's a bit unexpected for a
stable-branch update to include "unreleased version of EDK
binaries" (rather than, say, "same version of EDK binaries
but with one specific fix"). So I can see the argument for
waiting for the tagged upstream EDK release first.

thanks
-- PMM

Re: [PULL 0/6] Firmware/edk2 20231213 patches

[Michael Tokarev]

11.01.2024 19:28, Gerd Hoffmann:
..
> Yes, Cc'ing qemu-stable was the intention, thanks for fixing it up.
> 
> I'd leave it to the stable maintainer(s).  If they prefer a respin with
> Cc qemu-stable added to all patches I surely can do that.  If being
> notified with this reply is good enough I'm happy too.

There's no requirement to have Cc: qemu-stable tags on the patches.
This tagging is only to easily find changes which are supposed to be
picked up for stable, nothing more, so it's completely optional.

It's a bit unusual though to have whole series in -stable.
I picked up all 6 for now, let's see how it will work out.

Thanks,

/mjt

Re: [PULL 0/6] Firmware/edk2 20231213 patches

[Michael Tokarev]

12.01.2024 17:27, Michael Tokarev:
> There's no requirement to have Cc: qemu-stable tags on the patches.
> This tagging is only to easily find changes which are supposed to be
> picked up for stable, nothing more, so it's completely optional.

An additional note: without this Cc by Peter, I would've never noticed
this patchset.

/mjt

[PULL 0/6] Firmware/seabios 20231010 patches

[Gerd Hoffmann]

The following changes since commit 2f3913f4b2ad74baeb5a6f1d36efbd9ecdf1057d:

  Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2023-10-05 09:01:01 -0400)

are available in the Git repository at:

  https://gitlab.com/kraxel/qemu.git tags/firmware/seabios-20231010-pull-request

for you to fetch changes up to e83f3600f9ff7d9e0d014f328e64c49bb81b945c:

  tests/acpi: disable tests/data/acpi/q35/DSDT.mmio64 updates (2023-10-10 11:11:55 +0200)

----------------------------------------------------------------
seabios: update to git snapshot

Give seabios a bit real world testing before tagging a release.
Update to release will follow later in the devel cycle.

v3: update mmio64 acpi test.

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

Gerd Hoffmann (6):
  tests/bios-tables-test: tcg-emulate opteron for mmio64 test
  tests/acpi: enable tests/data/acpi/q35/DSDT.mmio64 updates
  seabios: update submodule to git snapshot
  seabios: update binaries to git snapshot
  tests/acpi: update expected data files
  tests/acpi: disable tests/data/acpi/q35/DSDT.mmio64 updates

 tests/qtest/bios-tables-test.c    |   2 ++
 pc-bios/bios-256k.bin             | Bin 262144 -> 262144 bytes
 pc-bios/bios-microvm.bin          | Bin 131072 -> 131072 bytes
 pc-bios/bios.bin                  | Bin 131072 -> 131072 bytes
 pc-bios/vgabios-ati.bin           | Bin 39936 -> 39424 bytes
 pc-bios/vgabios-bochs-display.bin | Bin 28672 -> 28672 bytes
 pc-bios/vgabios-cirrus.bin        | Bin 39424 -> 38912 bytes
 pc-bios/vgabios-qxl.bin           | Bin 39936 -> 39424 bytes
 pc-bios/vgabios-ramfb.bin         | Bin 29184 -> 28672 bytes
 pc-bios/vgabios-stdvga.bin        | Bin 39936 -> 39424 bytes
 pc-bios/vgabios-virtio.bin        | Bin 39936 -> 39424 bytes
 pc-bios/vgabios-vmware.bin        | Bin 39936 -> 39424 bytes
 pc-bios/vgabios.bin               | Bin 39424 -> 38912 bytes
 roms/seabios                      |   2 +-
 tests/data/acpi/q35/DSDT.mmio64   | Bin 9485 -> 9485 bytes
 15 files changed, 3 insertions(+), 1 deletion(-)

-- 
2.41.0

[PULL 5/6] tests/acpi: update expected data files

[Gerd Hoffmann]

 DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC    ", 0x00000001)
 {
     Scope (\)
     {
         OperationRegion (DBG, SystemIO, 0x0402, One)
         Field (DBG, ByteAcc, NoLock, Preserve)
         {
             DBGB,   8
         }

             DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, NonCacheable, ReadWrite,
                 0x00000000,         // Granularity
                 0x08000000,         // Range Minimum
                 0xAFFFFFFF,         // Range Maximum
                 0x00000000,         // Translation Offset
                 0xA8000000,         // Length
                 ,, , AddressRangeMemory, TypeStatic)
             DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, NonCacheable, ReadWrite,
                 0x00000000,         // Granularity
                 0xC0000000,         // Range Minimum
                 0xFEBFFFFF,         // Range Maximum
                 0x00000000,         // Translation Offset
                 0x3EC00000,         // Length
                 ,, , AddressRangeMemory, TypeStatic)
             QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
                 0x0000000000000000, // Granularity
-                0x0000000200000000, // Range Minimum
-                0x00000009FFFFFFFF, // Range Maximum
+                0x000000FF00000000, // Range Minimum
+                0x00000106FFFFFFFF, // Range Maximum
                 0x0000000000000000, // Translation Offset
                 0x0000000800000000, // Length
                 ,, , AddressRangeMemory, TypeStatic)
         })

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 tests/data/acpi/q35/DSDT.mmio64 | Bin 9485 -> 9485 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/data/acpi/q35/DSDT.mmio64 b/tests/data/acpi/q35/DSDT.mmio64
index 8459b82c958b842cd7b92c2145977634fb9c6e5d..bdf36c4d575bfc4eb2eac3f00c9b7b4270f88677 100644
GIT binary patch
delta 35
pcmeD6>h<Ds33dtLRb^mce7TWJN{Q<~0|Uc<AYfzMtfzFJ2>`-Q3+n&?

delta 35
pcmeD6>h<Ds33dtLRb^mce6o>CN{Ne!fq~&a5O6YV)>FFA1OT%k3hMv>

-- 
2.41.0