mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 08:28:13 +00:00
3eb616b264
Commit7f7b4236f2
("x86/PCI: Ignore E820 reservations for bridge windows on newer systems") fixes the touchpad not working on laptops like the Lenovo IdeaPad 3 15IIL05 and the Lenovo IdeaPad 5 14IIL05, as well as fixing thunderbolt hotplug issues on the Lenovo Yoga C940. Unfortunately it turns out that this is causing issues with suspend/resume on Lenovo ThinkPad X1 Carbon Gen 2 laptops. So, per the no regressions policy, rever this. Note I'm looking into another fix for the issues this fixed. Fixes:7f7b4236f2
("x86/PCI: Ignore E820 reservations for bridge windows on newer systems") BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2029207 Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
51 lines
1.2 KiB
C
51 lines
1.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/ioport.h>
|
|
#include <asm/e820/api.h>
|
|
|
|
static void resource_clip(struct resource *res, resource_size_t start,
|
|
resource_size_t end)
|
|
{
|
|
resource_size_t low = 0, high = 0;
|
|
|
|
if (res->end < start || res->start > end)
|
|
return; /* no conflict */
|
|
|
|
if (res->start < start)
|
|
low = start - res->start;
|
|
|
|
if (res->end > end)
|
|
high = res->end - end;
|
|
|
|
/* Keep the area above or below the conflict, whichever is larger */
|
|
if (low > high)
|
|
res->end = start - 1;
|
|
else
|
|
res->start = end + 1;
|
|
}
|
|
|
|
static void remove_e820_regions(struct resource *avail)
|
|
{
|
|
int i;
|
|
struct e820_entry *entry;
|
|
|
|
for (i = 0; i < e820_table->nr_entries; i++) {
|
|
entry = &e820_table->entries[i];
|
|
|
|
resource_clip(avail, entry->addr,
|
|
entry->addr + entry->size - 1);
|
|
}
|
|
}
|
|
|
|
void arch_remove_reservations(struct resource *avail)
|
|
{
|
|
/*
|
|
* Trim out BIOS area (high 2MB) and E820 regions. We do not remove
|
|
* the low 1MB unconditionally, as this area is needed for some ISA
|
|
* cards requiring a memory range, e.g. the i82365 PCMCIA controller.
|
|
*/
|
|
if (avail->flags & IORESOURCE_MEM) {
|
|
resource_clip(avail, BIOS_ROM_BASE, BIOS_ROM_END);
|
|
|
|
remove_e820_regions(avail);
|
|
}
|
|
}
|