All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Igor Mammedov" <imammedo@redhat.com>,
	"Ani Sinha" <anisinha@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>
Subject: [PULL 3/6] edk2: update build config, set PcdUninstallMemAttrProtocol = TRUE.
Date: Wed, 13 Dec 2023 11:50:15 +0100	[thread overview]
Message-ID: <20231213105026.1944656-4-kraxel@redhat.com> (raw)
In-Reply-To: <20231213105026.1944656-1-kraxel@redhat.com>

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



  parent reply	other threads:[~2023-12-13 10:52 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-13 10:50 [PULL 0/6] Firmware/edk2 20231213 patches Gerd Hoffmann
2023-12-13 10:50 ` [PULL 1/6] tests/acpi: allow tests/data/acpi/virt/SSDT.memhp changes Gerd Hoffmann
2023-12-13 10:50 ` [PULL 2/6] edk2: update to git snapshot Gerd Hoffmann
2023-12-13 10:50 ` Gerd Hoffmann [this message]
2023-12-13 10:50 ` [PULL 5/6] tests/acpi: update expected data files Gerd Hoffmann
2023-12-13 10:50 ` [PULL 6/6] tests/acpi: disallow tests/data/acpi/virt/SSDT.memhp changes Gerd Hoffmann
2023-12-13 10:54   ` Ani Sinha
2023-12-13 14:33     ` Michael S. Tsirkin
2023-12-13 14:39       ` Ani Sinha
2023-12-13 15:03         ` Michael S. Tsirkin
2023-12-13 15:14           ` Gerd Hoffmann
2023-12-13 15:17             ` Michael S. Tsirkin
2023-12-13 15:22               ` Ani Sinha
2024-01-11 14:01 ` [PULL 0/6] Firmware/edk2 20231213 patches Gerd Hoffmann
2024-01-11 15:52   ` Peter Maydell
2024-01-11 16:02     ` Peter Maydell
2024-01-11 16:28       ` Gerd Hoffmann
2024-01-12 12:47         ` Peter Maydell
2024-01-12 16:19           ` Peter Maydell
2024-01-12 16:19             ` Peter Maydell
2024-01-15 10:20             ` Gerd Hoffmann
2024-01-17 10:16               ` Michael Tokarev
2024-01-17 14:29                 ` Gerd Hoffmann
2024-01-18 12:56                   ` Peter Maydell
2024-01-12 14:27         ` Michael Tokarev
2024-01-12 14:30           ` Michael Tokarev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231213105026.1944656-4-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=anisinha@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=mst@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.