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 reverts a GICv3 commit (which was broken) and fixes it in another way, by adding a memblock build-time entries quirk for ARM64" * 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: efi/arm: Revert "Defer persistent reservations until after paging_init()" arm64, mm, efi: Account for GICv3 LPI tables in static memblock reserve table
This commit is contained in:
Коммит
2fee036af0
|
@ -332,6 +332,17 @@ static inline void *phys_to_virt(phys_addr_t x)
|
|||
#define virt_addr_valid(kaddr) \
|
||||
(_virt_addr_is_linear(kaddr) && _virt_addr_valid(kaddr))
|
||||
|
||||
/*
|
||||
* Given that the GIC architecture permits ITS implementations that can only be
|
||||
* configured with a LPI table address once, GICv3 systems with many CPUs may
|
||||
* end up reserving a lot of different regions after a kexec for their LPI
|
||||
* tables (one per CPU), as we are forced to reuse the same memory after kexec
|
||||
* (and thus reserve it persistently with EFI beforehand)
|
||||
*/
|
||||
#if defined(CONFIG_EFI) && defined(CONFIG_ARM_GIC_V3_ITS)
|
||||
# define INIT_MEMBLOCK_RESERVED_REGIONS (INIT_MEMBLOCK_REGIONS + NR_CPUS + 1)
|
||||
#endif
|
||||
|
||||
#include <asm-generic/memory_model.h>
|
||||
|
||||
#endif
|
||||
|
|
|
@ -313,7 +313,6 @@ void __init setup_arch(char **cmdline_p)
|
|||
arm64_memblock_init();
|
||||
|
||||
paging_init();
|
||||
efi_apply_persistent_mem_reservations();
|
||||
|
||||
acpi_table_upgrade();
|
||||
|
||||
|
|
|
@ -592,11 +592,7 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz,
|
|||
|
||||
early_memunmap(tbl, sizeof(*tbl));
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int __init efi_apply_persistent_mem_reservations(void)
|
||||
{
|
||||
if (efi.mem_reserve != EFI_INVALID_TABLE_ADDR) {
|
||||
unsigned long prsv = efi.mem_reserve;
|
||||
|
||||
|
|
|
@ -75,9 +75,6 @@ void install_memreserve_table(efi_system_table_t *sys_table_arg)
|
|||
efi_guid_t memreserve_table_guid = LINUX_EFI_MEMRESERVE_TABLE_GUID;
|
||||
efi_status_t status;
|
||||
|
||||
if (IS_ENABLED(CONFIG_ARM))
|
||||
return;
|
||||
|
||||
status = efi_call_early(allocate_pool, EFI_LOADER_DATA, sizeof(*rsv),
|
||||
(void **)&rsv);
|
||||
if (status != EFI_SUCCESS) {
|
||||
|
|
|
@ -1198,8 +1198,6 @@ static inline bool efi_enabled(int feature)
|
|||
extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);
|
||||
|
||||
extern bool efi_is_table_address(unsigned long phys_addr);
|
||||
|
||||
extern int efi_apply_persistent_mem_reservations(void);
|
||||
#else
|
||||
static inline bool efi_enabled(int feature)
|
||||
{
|
||||
|
@ -1218,11 +1216,6 @@ static inline bool efi_is_table_address(unsigned long phys_addr)
|
|||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
static inline int efi_apply_persistent_mem_reservations(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
extern int efi_status_to_err(efi_status_t status);
|
||||
|
|
|
@ -29,9 +29,6 @@ extern unsigned long max_pfn;
|
|||
*/
|
||||
extern unsigned long long max_possible_pfn;
|
||||
|
||||
#define INIT_MEMBLOCK_REGIONS 128
|
||||
#define INIT_PHYSMEM_REGIONS 4
|
||||
|
||||
/**
|
||||
* enum memblock_flags - definition of memory region attributes
|
||||
* @MEMBLOCK_NONE: no special request
|
||||
|
|
|
@ -26,6 +26,13 @@
|
|||
|
||||
#include "internal.h"
|
||||
|
||||
#define INIT_MEMBLOCK_REGIONS 128
|
||||
#define INIT_PHYSMEM_REGIONS 4
|
||||
|
||||
#ifndef INIT_MEMBLOCK_RESERVED_REGIONS
|
||||
# define INIT_MEMBLOCK_RESERVED_REGIONS INIT_MEMBLOCK_REGIONS
|
||||
#endif
|
||||
|
||||
/**
|
||||
* DOC: memblock overview
|
||||
*
|
||||
|
@ -92,7 +99,7 @@ unsigned long max_pfn;
|
|||
unsigned long long max_possible_pfn;
|
||||
|
||||
static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
|
||||
static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
|
||||
static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_RESERVED_REGIONS] __initdata_memblock;
|
||||
#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP
|
||||
static struct memblock_region memblock_physmem_init_regions[INIT_PHYSMEM_REGIONS] __initdata_memblock;
|
||||
#endif
|
||||
|
@ -105,7 +112,7 @@ struct memblock memblock __initdata_memblock = {
|
|||
|
||||
.reserved.regions = memblock_reserved_init_regions,
|
||||
.reserved.cnt = 1, /* empty dummy entry */
|
||||
.reserved.max = INIT_MEMBLOCK_REGIONS,
|
||||
.reserved.max = INIT_MEMBLOCK_RESERVED_REGIONS,
|
||||
.reserved.name = "reserved",
|
||||
|
||||
#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP
|
||||
|
|
Загрузка…
Ссылка в новой задаче