Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fixes from Ingo Molnar:
"This tree contains three fixes: a console spam fix, a file pattern fix
and a sysfb_efi fix for a bug that triggered on older ThinkPads"
* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/sysfb_efi: Fix valid BAR address range check
x86/efi-bgrt: Switch all pr_err() to pr_notice() for invalid BGRT
MAINTAINERS: Remove asterisk from EFI directory names
+23
-13
+2
-2
MAINTAINERS
+2
-2
MAINTAINERS
···
4223
4223
F: arch/ia64/kernel/efi.c
4224
4224
F: arch/x86/boot/compressed/eboot.[ch]
4225
4225
F: arch/x86/include/asm/efi.h
4226
-
F: arch/x86/platform/efi/*
4227
-
F: drivers/firmware/efi/*
4226
+
F: arch/x86/platform/efi/
4227
+
F: drivers/firmware/efi/
4228
4228
F: include/linux/efi*.h
4229
4229
4230
4230
EFI VARIABLE FILESYSTEM
+12
-2
arch/x86/kernel/sysfb_efi.c
+12
-2
arch/x86/kernel/sysfb_efi.c
···
106
106
continue;
107
107
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
108
108
resource_size_t start, end;
109
+
unsigned long flags;
110
+
111
+
flags = pci_resource_flags(dev, i);
112
+
if (!(flags & IORESOURCE_MEM))
113
+
continue;
114
+
115
+
if (flags & IORESOURCE_UNSET)
116
+
continue;
117
+
118
+
if (pci_resource_len(dev, i) == 0)
119
+
continue;
109
120
110
121
start = pci_resource_start(dev, i);
111
-
if (start == 0)
112
-
break;
113
122
end = pci_resource_end(dev, i);
114
123
if (screen_info.lfb_base >= start &&
115
124
screen_info.lfb_base < end) {
116
125
found_bar = 1;
126
+
break;
117
127
}
118
128
}
119
129
}
+9
-9
arch/x86/platform/efi/efi-bgrt.c
+9
-9
arch/x86/platform/efi/efi-bgrt.c
···
43
43
return;
44
44
45
45
if (bgrt_tab->header.length < sizeof(*bgrt_tab)) {
46
-
pr_err("Ignoring BGRT: invalid length %u (expected %zu)\n",
46
+
pr_notice("Ignoring BGRT: invalid length %u (expected %zu)\n",
47
47
bgrt_tab->header.length, sizeof(*bgrt_tab));
48
48
return;
49
49
}
50
50
if (bgrt_tab->version != 1) {
51
-
pr_err("Ignoring BGRT: invalid version %u (expected 1)\n",
51
+
pr_notice("Ignoring BGRT: invalid version %u (expected 1)\n",
52
52
bgrt_tab->version);
53
53
return;
54
54
}
55
55
if (bgrt_tab->status & 0xfe) {
56
-
pr_err("Ignoring BGRT: reserved status bits are non-zero %u\n",
56
+
pr_notice("Ignoring BGRT: reserved status bits are non-zero %u\n",
57
57
bgrt_tab->status);
58
58
return;
59
59
}
60
60
if (bgrt_tab->image_type != 0) {
61
-
pr_err("Ignoring BGRT: invalid image type %u (expected 0)\n",
61
+
pr_notice("Ignoring BGRT: invalid image type %u (expected 0)\n",
62
62
bgrt_tab->image_type);
63
63
return;
64
64
}
65
65
if (!bgrt_tab->image_address) {
66
-
pr_err("Ignoring BGRT: null image address\n");
66
+
pr_notice("Ignoring BGRT: null image address\n");
67
67
return;
68
68
}
69
69
70
70
image = memremap(bgrt_tab->image_address, sizeof(bmp_header), MEMREMAP_WB);
71
71
if (!image) {
72
-
pr_err("Ignoring BGRT: failed to map image header memory\n");
72
+
pr_notice("Ignoring BGRT: failed to map image header memory\n");
73
73
return;
74
74
}
75
75
76
76
memcpy(&bmp_header, image, sizeof(bmp_header));
77
77
memunmap(image);
78
78
if (bmp_header.id != 0x4d42) {
79
-
pr_err("Ignoring BGRT: Incorrect BMP magic number 0x%x (expected 0x4d42)\n",
79
+
pr_notice("Ignoring BGRT: Incorrect BMP magic number 0x%x (expected 0x4d42)\n",
80
80
bmp_header.id);
81
81
return;
82
82
}
···
84
84
85
85
bgrt_image = kmalloc(bgrt_image_size, GFP_KERNEL | __GFP_NOWARN);
86
86
if (!bgrt_image) {
87
-
pr_err("Ignoring BGRT: failed to allocate memory for image (wanted %zu bytes)\n",
87
+
pr_notice("Ignoring BGRT: failed to allocate memory for image (wanted %zu bytes)\n",
88
88
bgrt_image_size);
89
89
return;
90
90
}
91
91
92
92
image = memremap(bgrt_tab->image_address, bmp_header.size, MEMREMAP_WB);
93
93
if (!image) {
94
-
pr_err("Ignoring BGRT: failed to map image memory\n");
94
+
pr_notice("Ignoring BGRT: failed to map image memory\n");
95
95
kfree(bgrt_image);
96
96
bgrt_image = NULL;
97
97
return;