mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-03 17:26:40 +07:00
x86/boot/e820: Use bool in query APIs
Change e820__mapped_any() and e820__mapped_all()'s return type and e820__range_remove()'s check_type parameter to bool. Propagate it into arch/x86/pci/mmconfig-shared.c as this change affects a function signature there too. No change in functionality. Cc: Alex Thorlton <athorlton@sgi.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Huang, Ying <ying.huang@intel.com> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Juergen Gross <jgross@suse.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Paul Jackson <pj@sgi.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rafael J. Wysocki <rjw@sisk.pl> Cc: Tejun Heo <tj@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Wei Yang <richard.weiyang@gmail.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
1a1270349a
commit
81b3e090fa
@ -8,12 +8,12 @@ extern struct e820_table *e820_table_firmware;
|
||||
|
||||
extern unsigned long pci_mem_start;
|
||||
|
||||
extern int e820__mapped_any(u64 start, u64 end, enum e820_type type);
|
||||
extern int e820__mapped_all(u64 start, u64 end, enum e820_type type);
|
||||
extern bool e820__mapped_any(u64 start, u64 end, enum e820_type type);
|
||||
extern bool e820__mapped_all(u64 start, u64 end, enum e820_type type);
|
||||
|
||||
extern void e820__range_add (u64 start, u64 size, enum e820_type type);
|
||||
extern u64 e820__range_update(u64 start, u64 size, enum e820_type old_type, enum e820_type new_type);
|
||||
extern u64 e820__range_remove(u64 start, u64 size, enum e820_type old_type, int checktype);
|
||||
extern u64 e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool check_type);
|
||||
|
||||
extern void e820__print_table(char *who);
|
||||
extern int e820__update_table(struct e820_table *table);
|
||||
|
@ -68,7 +68,7 @@ EXPORT_SYMBOL(pci_mem_start);
|
||||
* This function checks if any part of the range <start,end> is mapped
|
||||
* with type.
|
||||
*/
|
||||
int e820__mapped_any(u64 start, u64 end, enum e820_type type)
|
||||
bool e820__mapped_any(u64 start, u64 end, enum e820_type type)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -91,7 +91,7 @@ EXPORT_SYMBOL_GPL(e820__mapped_any);
|
||||
* Note: this function only works correctly once the E820 table is sorted and
|
||||
* not-overlapping (at least for the range specified), which is the case normally.
|
||||
*/
|
||||
int __init e820__mapped_all(u64 start, u64 end, enum e820_type type)
|
||||
bool __init e820__mapped_all(u64 start, u64 end, enum e820_type type)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -492,7 +492,7 @@ static u64 __init e820__range_update_firmware(u64 start, u64 size, enum e820_typ
|
||||
}
|
||||
|
||||
/* Remove a range of memory from the E820 table: */
|
||||
u64 __init e820__range_remove(u64 start, u64 size, enum e820_type old_type, int checktype)
|
||||
u64 __init e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool check_type)
|
||||
{
|
||||
int i;
|
||||
u64 end;
|
||||
@ -503,7 +503,7 @@ u64 __init e820__range_remove(u64 start, u64 size, enum e820_type old_type, int
|
||||
|
||||
end = start + size;
|
||||
pr_debug("e820: remove [mem %#010Lx-%#010Lx] ", start, end - 1);
|
||||
if (checktype)
|
||||
if (check_type)
|
||||
e820_print_type(old_type);
|
||||
pr_cont("\n");
|
||||
|
||||
@ -512,7 +512,7 @@ u64 __init e820__range_remove(u64 start, u64 size, enum e820_type old_type, int
|
||||
u64 final_start, final_end;
|
||||
u64 entry_end;
|
||||
|
||||
if (checktype && entry->type != old_type)
|
||||
if (check_type && entry->type != old_type)
|
||||
continue;
|
||||
|
||||
entry_end = entry->addr + entry->size;
|
||||
|
@ -423,7 +423,7 @@ static acpi_status find_mboard_resource(acpi_handle handle, u32 lvl,
|
||||
return AE_OK;
|
||||
}
|
||||
|
||||
static int is_acpi_reserved(u64 start, u64 end, unsigned not_used)
|
||||
static bool is_acpi_reserved(u64 start, u64 end, unsigned not_used)
|
||||
{
|
||||
struct resource mcfg_res;
|
||||
|
||||
@ -440,11 +440,11 @@ static int is_acpi_reserved(u64 start, u64 end, unsigned not_used)
|
||||
return mcfg_res.flags;
|
||||
}
|
||||
|
||||
typedef int (*check_reserved_t)(u64 start, u64 end, unsigned type);
|
||||
typedef bool (*check_reserved_t)(u64 start, u64 end, unsigned type);
|
||||
|
||||
static int __ref is_mmconf_reserved(check_reserved_t is_reserved,
|
||||
struct pci_mmcfg_region *cfg,
|
||||
struct device *dev, int with_e820)
|
||||
static bool __ref is_mmconf_reserved(check_reserved_t is_reserved,
|
||||
struct pci_mmcfg_region *cfg,
|
||||
struct device *dev, int with_e820)
|
||||
{
|
||||
u64 addr = cfg->res.start;
|
||||
u64 size = resource_size(&cfg->res);
|
||||
@ -494,8 +494,8 @@ static int __ref is_mmconf_reserved(check_reserved_t is_reserved,
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int __ref pci_mmcfg_check_reserved(struct device *dev,
|
||||
struct pci_mmcfg_region *cfg, int early)
|
||||
static bool __ref
|
||||
pci_mmcfg_check_reserved(struct device *dev, struct pci_mmcfg_region *cfg, int early)
|
||||
{
|
||||
if (!early && !acpi_disabled) {
|
||||
if (is_mmconf_reserved(is_acpi_reserved, cfg, dev, 0))
|
||||
|
Loading…
Reference in New Issue
Block a user