All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] x86: only load initrd above 4g on second try
@ 2014-08-26 21:45 ` Yinghai Lu
  0 siblings, 0 replies; 22+ messages in thread
From: Yinghai Lu @ 2014-08-26 21:45 UTC (permalink / raw)
  To: Matt Fleming, H. Peter Anvin, Ingo Molnar
  Cc: Mantas Mikulėnas, Anders Darander,
	linux-efi-u79uwXL29TY76Z2rM5mHXA,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA, Yinghai Lu

Mantas found that after commit 4bf7111f5016 ("x86/efi: Support initrd
loaded above 4G"), the kernel freezes at the earliest possible moment
when trying to boot via UEFI on Asus laptop.

There are buggy EFI implementations: with EFI run time, kernel need
to load file with 512bytes alignment when buffer is above 4G.

So revert to old way to load initrd on first try,
second try will use above 4G buffer when initrd is more than
2G and does not fit under 4G.

Reported-by: Mantas Mikulėnas <grawity-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Tested-by: Anders Darander <anders-7UjN0b3lYz2SbKU13Z4Etw@public.gmane.org>
Signed-off-by: Yinghai Lu <yinghai-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>

---
 arch/x86/boot/compressed/eboot.c |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

Index: linux-2.6/arch/x86/boot/compressed/eboot.c
===================================================================
--- linux-2.6.orig/arch/x86/boot/compressed/eboot.c
+++ linux-2.6/arch/x86/boot/compressed/eboot.c
@@ -1032,7 +1032,6 @@ struct boot_params *make_boot_params(str
 	int i;
 	unsigned long ramdisk_addr;
 	unsigned long ramdisk_size;
-	unsigned long initrd_addr_max;
 
 	efi_early = c;
 	sys_table = (efi_system_table_t *)(unsigned long)efi_early->table;
@@ -1095,15 +1094,18 @@ struct boot_params *make_boot_params(str
 
 	memset(sdt, 0, sizeof(*sdt));
 
-	if (hdr->xloadflags & XLF_CAN_BE_LOADED_ABOVE_4G)
-		initrd_addr_max = -1UL;
-	else
-		initrd_addr_max = hdr->initrd_addr_max;
-
 	status = handle_cmdline_files(sys_table, image,
 				      (char *)(unsigned long)hdr->cmd_line_ptr,
-				      "initrd=", initrd_addr_max,
+				      "initrd=", hdr->initrd_addr_max,
+				      &ramdisk_addr, &ramdisk_size);
+
+	if (status != EFI_SUCCESS &&
+	    hdr->xloadflags & XLF_CAN_BE_LOADED_ABOVE_4G)
+		status = handle_cmdline_files(sys_table, image,
+				      (char *)(unsigned long)hdr->cmd_line_ptr,
+				      "initrd=", -1UL,
 				      &ramdisk_addr, &ramdisk_size);
+
 	if (status != EFI_SUCCESS)
 		goto fail2;
 	hdr->ramdisk_image = ramdisk_addr & 0xffffffff;

^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2014-09-02  6:58 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-26 21:45 [PATCH] x86: only load initrd above 4g on second try Yinghai Lu
2014-08-26 21:45 ` Yinghai Lu
     [not found] ` <1409089544-24221-1-git-send-email-yinghai-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2014-08-26 21:53   ` H. Peter Anvin
2014-08-26 21:53     ` H. Peter Anvin
     [not found]     ` <53FD01D0.8020203-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
2014-08-26 22:05       ` Yinghai Lu
2014-08-26 22:05         ` Yinghai Lu
     [not found]         ` <CAE9FiQUF4THLRfzbnhK61QHpM2zyox4E8LTmyzVF7PnPdpb7jQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-08-26 22:16           ` Mantas Mikulėnas
2014-08-26 22:16             ` Mantas Mikulėnas
     [not found]             ` <CAPWNY8WG3E7oZdZDdYsrnGM5pG4kWAKkEq0Eh5Hc_uXJ_8zD5g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-08-26 22:58               ` Yinghai Lu
2014-08-26 22:58                 ` Yinghai Lu
2014-08-27 17:49           ` H. Peter Anvin
2014-08-27 17:49             ` H. Peter Anvin
     [not found]             ` <53FE1A2B.80204-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
2014-08-27 18:50               ` Yinghai Lu
2014-08-27 18:50                 ` Yinghai Lu
2014-08-27 10:59   ` Matt Fleming
2014-08-27 10:59     ` Matt Fleming
     [not found]     ` <20140827105901.GC28116-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2014-08-27 17:13       ` Yinghai Lu
2014-08-27 17:13         ` Yinghai Lu
     [not found]         ` <CAE9FiQWrPtEe3tkJjgOzyJJPPzX=AtMYgR4c91pDHL3q3ZLLKQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-08-30 11:24           ` Matt Fleming
2014-08-30 11:24             ` Matt Fleming
     [not found]             ` <20140830112426.GA2911-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2014-09-02  6:57               ` Anders Darander
2014-09-02  6:57                 ` Anders Darander

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.