From: Thomas Lamprecht Date: Tue, 6 Jun 2023 14:16:00 +0000 (+0200) Subject: fix line endings of phys-bits patch X-Git-Url: https://git.proxmox.com/?p=pve-edk2-firmware.git;a=commitdiff_plain;h=763adf39b22f3f5962410dc52bcafb2040790845 fix line endings of phys-bits patch edk2 source is using \r\n ... Signed-off-by: Thomas Lamprecht --- diff --git a/debian/patches/0001-OvmfPkg-PlatformInitLib-limit-phys-bits-to-46.patch b/debian/patches/0001-OvmfPkg-PlatformInitLib-limit-phys-bits-to-46.patch index 93f46ad..1708f40 100644 --- a/debian/patches/0001-OvmfPkg-PlatformInitLib-limit-phys-bits-to-46.patch +++ b/debian/patches/0001-OvmfPkg-PlatformInitLib-limit-phys-bits-to-46.patch @@ -19,28 +19,25 @@ index 38cece9173..4d0522ce22 100644 --- a/OvmfPkg/Library/PlatformInitLib/MemDetect.c +++ b/OvmfPkg/Library/PlatformInitLib/MemDetect.c @@ -657,16 +657,19 @@ PlatformAddressWidthFromCpuid ( - )); - - if (Valid) { -- if (PhysBits > 47) { -+ if (PhysBits > 46) { - /* - * Avoid 5-level paging altogether for now, which limits - * PhysBits to 48. Also avoid using address bit 48, due to sign - * extension we can't identity-map these addresses (and lots of - * places in edk2 assume we have everything identity-mapped). - * So the actual limit is 47. -+ * -+ * Also some older linux kernels apparently have problems handling -+ * phys-bits > 46 correctly, so use that as limit. - */ -- DEBUG ((DEBUG_INFO, "%a: limit PhysBits to 47 (avoid 5-level paging)\n", __func__)); -- PhysBits = 47; -+ DEBUG ((DEBUG_INFO, "%a: limit PhysBits to 46 (avoid 5-level paging)\n", __func__)); -+ PhysBits = 46; - } - - if (!Page1GSupport && (PhysBits > 40)) { --- -2.39.2 - + )); + + if (Valid) { +- if (PhysBits > 47) { ++ if (PhysBits > 46) { + /* + * Avoid 5-level paging altogether for now, which limits + * PhysBits to 48. Also avoid using address bit 48, due to sign + * extension we can't identity-map these addresses (and lots of + * places in edk2 assume we have everything identity-mapped). + * So the actual limit is 47. ++ * ++ * Also some older linux kernels apparently have problems handling ++ * phys-bits > 46 correctly, so use that as limit. + */ +- DEBUG ((DEBUG_INFO, "%a: limit PhysBits to 47 (avoid 5-level paging)\n", __func__)); +- PhysBits = 47; ++ DEBUG ((DEBUG_INFO, "%a: limit PhysBits to 46 (avoid 5-level paging)\n", __func__)); ++ PhysBits = 46; + } + + if (!Page1GSupport && (PhysBits > 40)) {