e07a3bae84
- Require /usr/bin/kernel-install to fix installation after systemd package swizzling (rhbz 1331012) - Reenable debugging options.
97 lines
3.4 KiB
Diff
97 lines
3.4 KiB
Diff
From 5b252532b1785a82b71d16e3c134f58d7c7fee3d Mon Sep 17 00:00:00 2001
|
|
From: Josh Boyer <jwboyer@fedoraproject.org>
|
|
Date: Wed, 27 Apr 2016 08:37:41 -0400
|
|
Subject: [PATCH] x86/efi-bgrt: Switch all pr_err() to pr_debug() for invalid
|
|
BGRT
|
|
|
|
The promise of pretty boot splashes from firmware via BGRT was at
|
|
best only that; a promise. The kernel diligently checks to make
|
|
sure the BGRT data firmware gives it is valid, and dutifully warns
|
|
the user when it isn't. However, it does so via the pr_err log
|
|
level which seems unnecessary. The user cannot do anything about
|
|
this and there really isn't an error on the part of Linux to
|
|
correct.
|
|
|
|
This lowers the log level by using pr_debug instead. Users will
|
|
no longer have their boot process uglified by the kernel reminding
|
|
us that firmware can and often is broken. Ironic, considering
|
|
BGRT is supposed to make boot pretty to begin with.
|
|
|
|
Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
|
|
---
|
|
arch/x86/platform/efi/efi-bgrt.c | 18 +++++++++---------
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/arch/x86/platform/efi/efi-bgrt.c b/arch/x86/platform/efi/efi-bgrt.c
|
|
index a2433817c987..6f70d2ac8029 100644
|
|
--- a/arch/x86/platform/efi/efi-bgrt.c
|
|
+++ b/arch/x86/platform/efi/efi-bgrt.c
|
|
@@ -43,40 +43,40 @@ void __init efi_bgrt_init(void)
|
|
return;
|
|
|
|
if (bgrt_tab->header.length < sizeof(*bgrt_tab)) {
|
|
- pr_err("Ignoring BGRT: invalid length %u (expected %zu)\n",
|
|
+ pr_debug("Ignoring BGRT: invalid length %u (expected %zu)\n",
|
|
bgrt_tab->header.length, sizeof(*bgrt_tab));
|
|
return;
|
|
}
|
|
if (bgrt_tab->version != 1) {
|
|
- pr_err("Ignoring BGRT: invalid version %u (expected 1)\n",
|
|
+ pr_debug("Ignoring BGRT: invalid version %u (expected 1)\n",
|
|
bgrt_tab->version);
|
|
return;
|
|
}
|
|
if (bgrt_tab->status & 0xfe) {
|
|
- pr_err("Ignoring BGRT: reserved status bits are non-zero %u\n",
|
|
+ pr_debug("Ignoring BGRT: reserved status bits are non-zero %u\n",
|
|
bgrt_tab->status);
|
|
return;
|
|
}
|
|
if (bgrt_tab->image_type != 0) {
|
|
- pr_err("Ignoring BGRT: invalid image type %u (expected 0)\n",
|
|
+ pr_debug("Ignoring BGRT: invalid image type %u (expected 0)\n",
|
|
bgrt_tab->image_type);
|
|
return;
|
|
}
|
|
if (!bgrt_tab->image_address) {
|
|
- pr_err("Ignoring BGRT: null image address\n");
|
|
+ pr_debug("Ignoring BGRT: null image address\n");
|
|
return;
|
|
}
|
|
|
|
image = memremap(bgrt_tab->image_address, sizeof(bmp_header), MEMREMAP_WB);
|
|
if (!image) {
|
|
- pr_err("Ignoring BGRT: failed to map image header memory\n");
|
|
+ pr_debug("Ignoring BGRT: failed to map image header memory\n");
|
|
return;
|
|
}
|
|
|
|
memcpy(&bmp_header, image, sizeof(bmp_header));
|
|
memunmap(image);
|
|
if (bmp_header.id != 0x4d42) {
|
|
- pr_err("Ignoring BGRT: Incorrect BMP magic number 0x%x (expected 0x4d42)\n",
|
|
+ pr_debug("Ignoring BGRT: Incorrect BMP magic number 0x%x (expected 0x4d42)\n",
|
|
bmp_header.id);
|
|
return;
|
|
}
|
|
@@ -84,14 +84,14 @@ void __init efi_bgrt_init(void)
|
|
|
|
bgrt_image = kmalloc(bgrt_image_size, GFP_KERNEL | __GFP_NOWARN);
|
|
if (!bgrt_image) {
|
|
- pr_err("Ignoring BGRT: failed to allocate memory for image (wanted %zu bytes)\n",
|
|
+ pr_debug("Ignoring BGRT: failed to allocate memory for image (wanted %zu bytes)\n",
|
|
bgrt_image_size);
|
|
return;
|
|
}
|
|
|
|
image = memremap(bgrt_tab->image_address, bmp_header.size, MEMREMAP_WB);
|
|
if (!image) {
|
|
- pr_err("Ignoring BGRT: failed to map image memory\n");
|
|
+ pr_debug("Ignoring BGRT: failed to map image memory\n");
|
|
kfree(bgrt_image);
|
|
bgrt_image = NULL;
|
|
return;
|
|
--
|
|
2.5.5
|
|
|