Re: [GIT PULL] x86 fixes

Matt Fleming
2014-09-23T14:37:18Z

On Tue, 23 Sep, at 04:25:36PM, Maarten Lankhorst wrote:
> It seems to boot for me with direct efi netboot. But when I'm doing a
> local boot through refind instead I also hit that setup_efi_pci()
> failed bug, it doesn't look like it's fixed by reverting all the efi
> stub patches though. This might need more bisecting first...

Thanks for testing!

The "setup_efi_pci() failed!" message doesn't indicate a bug, it's
superfluous and I've queued up the below patch for v3.18.

But maybe we should merge it sooner since people are likely to interpret
it as indicating there's some boot bug (there isn't).

I know Josh was in favour of getting this message dropped and treating
this as a regression fix, but I was erring on the side of caution
because it's not critical.

tip folks, if I sent this patch to you in a pull request, would you
merge it?

---

>From c988616127c10d8c68dd1b9b946cddf51e4ca718 Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt.fleming@intel.com>
Date: Thu, 11 Sep 2014 09:04:25 +0100
Subject: [PATCH] x86/efi: Delete misleading efi_printk() error message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A number of people are reporting seeing the "setup_efi_pci() failed!"
error message in what used to be a quiet boot,

https://bugzilla.kernel.org/show_bug.cgi?id=81891

The message isn't all that helpful because setup_efi_pci() can return a
non-success error code for a variety of reasons, not all of them fatal.

Drop the efi_printk() now that we have more fine-grained, and more
specific, error messages throughout the *setup_efi_pci*() code paths.

Reported-by: Darren Hart <dvhart@linux.intel.com>
Reported-by: Josh Boyer <jwboyer@fedoraproject.org>
Cc: Ulf Winkelvos <ulf@winkelvos.de>
Cc: Andre Müller <andre.muller@web.de>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
---
arch/x86/boot/compressed/eboot.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index ed8e06c59a4c..87398f9434f3 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -1394,10 +1394,7 @@ struct boot_params *efi_main(struct efi_config *c,

setup_graphics(boot_params);

- status = setup_efi_pci(boot_params);
- if (status != EFI_SUCCESS) {
- efi_printk(sys_table, "setup_efi_pci() failed!\n");
- }
+ setup_efi_pci(boot_params);

status = efi_call_early(allocate_pool, EFI_LOADER_DATA,
sizeof(*gdt), (void **)&gdt);
--
1.9.3

--
Matt Fleming, Intel Open Source Technology Center