Commit ee8d2071 authored by Usama Arif's avatar Usama Arif Committed by Andrew Morton

memblock: pass memblock_type to memblock_setclr_flag

This allows setting flags to both memblock types and is in preparation for
setting flags (for e.g.  to not initialize struct pages) on reserved
memory region.

[usama.arif@bytedance.com: add missing argument definition]
  Link: https://lkml.kernel.org/r/20230918090657.220463-1-usama.arif@bytedance.com
Link: https://lkml.kernel.org/r/20230913105401.519709-3-usama.arif@bytedance.comSigned-off-by: default avatarUsama Arif <usama.arif@bytedance.com>
Reviewed-by: default avatarMuchun Song <songmuchun@bytedance.com>
Reviewed-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
Acked-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Cc: Fam Zheng <fam.zheng@bytedance.com>
Cc: Punit Agrawal <punit.agrawal@bytedance.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a9e34ea1
...@@ -892,6 +892,7 @@ int __init_memblock memblock_physmem_add(phys_addr_t base, phys_addr_t size) ...@@ -892,6 +892,7 @@ int __init_memblock memblock_physmem_add(phys_addr_t base, phys_addr_t size)
/** /**
* memblock_setclr_flag - set or clear flag for a memory region * memblock_setclr_flag - set or clear flag for a memory region
* @type: memblock type to set/clear flag for
* @base: base address of the region * @base: base address of the region
* @size: size of the region * @size: size of the region
* @set: set or clear the flag * @set: set or clear the flag
...@@ -901,10 +902,9 @@ int __init_memblock memblock_physmem_add(phys_addr_t base, phys_addr_t size) ...@@ -901,10 +902,9 @@ int __init_memblock memblock_physmem_add(phys_addr_t base, phys_addr_t size)
* *
* Return: 0 on success, -errno on failure. * Return: 0 on success, -errno on failure.
*/ */
static int __init_memblock memblock_setclr_flag(phys_addr_t base, static int __init_memblock memblock_setclr_flag(struct memblock_type *type,
phys_addr_t size, int set, int flag) phys_addr_t base, phys_addr_t size, int set, int flag)
{ {
struct memblock_type *type = &memblock.memory;
int i, ret, start_rgn, end_rgn; int i, ret, start_rgn, end_rgn;
ret = memblock_isolate_range(type, base, size, &start_rgn, &end_rgn); ret = memblock_isolate_range(type, base, size, &start_rgn, &end_rgn);
...@@ -933,7 +933,7 @@ static int __init_memblock memblock_setclr_flag(phys_addr_t base, ...@@ -933,7 +933,7 @@ static int __init_memblock memblock_setclr_flag(phys_addr_t base,
*/ */
int __init_memblock memblock_mark_hotplug(phys_addr_t base, phys_addr_t size) int __init_memblock memblock_mark_hotplug(phys_addr_t base, phys_addr_t size)
{ {
return memblock_setclr_flag(base, size, 1, MEMBLOCK_HOTPLUG); return memblock_setclr_flag(&memblock.memory, base, size, 1, MEMBLOCK_HOTPLUG);
} }
/** /**
...@@ -945,7 +945,7 @@ int __init_memblock memblock_mark_hotplug(phys_addr_t base, phys_addr_t size) ...@@ -945,7 +945,7 @@ int __init_memblock memblock_mark_hotplug(phys_addr_t base, phys_addr_t size)
*/ */
int __init_memblock memblock_clear_hotplug(phys_addr_t base, phys_addr_t size) int __init_memblock memblock_clear_hotplug(phys_addr_t base, phys_addr_t size)
{ {
return memblock_setclr_flag(base, size, 0, MEMBLOCK_HOTPLUG); return memblock_setclr_flag(&memblock.memory, base, size, 0, MEMBLOCK_HOTPLUG);
} }
/** /**
...@@ -962,7 +962,7 @@ int __init_memblock memblock_mark_mirror(phys_addr_t base, phys_addr_t size) ...@@ -962,7 +962,7 @@ int __init_memblock memblock_mark_mirror(phys_addr_t base, phys_addr_t size)
system_has_some_mirror = true; system_has_some_mirror = true;
return memblock_setclr_flag(base, size, 1, MEMBLOCK_MIRROR); return memblock_setclr_flag(&memblock.memory, base, size, 1, MEMBLOCK_MIRROR);
} }
/** /**
...@@ -982,7 +982,7 @@ int __init_memblock memblock_mark_mirror(phys_addr_t base, phys_addr_t size) ...@@ -982,7 +982,7 @@ int __init_memblock memblock_mark_mirror(phys_addr_t base, phys_addr_t size)
*/ */
int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size) int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size)
{ {
return memblock_setclr_flag(base, size, 1, MEMBLOCK_NOMAP); return memblock_setclr_flag(&memblock.memory, base, size, 1, MEMBLOCK_NOMAP);
} }
/** /**
...@@ -994,7 +994,7 @@ int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size) ...@@ -994,7 +994,7 @@ int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size)
*/ */
int __init_memblock memblock_clear_nomap(phys_addr_t base, phys_addr_t size) int __init_memblock memblock_clear_nomap(phys_addr_t base, phys_addr_t size)
{ {
return memblock_setclr_flag(base, size, 0, MEMBLOCK_NOMAP); return memblock_setclr_flag(&memblock.memory, base, size, 0, MEMBLOCK_NOMAP);
} }
static bool should_skip_region(struct memblock_type *type, static bool should_skip_region(struct memblock_type *type,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment