Commit d7dc899a authored by Stefan Agner's avatar Stefan Agner Committed by Linus Torvalds

treewide: use PHYS_ADDR_MAX to avoid type casting ULLONG_MAX

With PHYS_ADDR_MAX there is now a type safe variant for all bits set.
Make use of it.

Patch created using a semantic patch as follows:

// <smpl>
@@
typedef phys_addr_t;
@@
-(phys_addr_t)ULLONG_MAX
+PHYS_ADDR_MAX
// </smpl>

Link: http://lkml.kernel.org/r/20180419214204.19322-1-stefan@agner.chSigned-off-by: default avatarStefan Agner <stefan@agner.ch>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>	[arm64]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0825a6f9
...@@ -310,7 +310,7 @@ static void __init arm64_memory_present(void) ...@@ -310,7 +310,7 @@ static void __init arm64_memory_present(void)
} }
#endif #endif
static phys_addr_t memory_limit = (phys_addr_t)ULLONG_MAX; static phys_addr_t memory_limit = PHYS_ADDR_MAX;
/* /*
* Limit the memory size that was specified via FDT. * Limit the memory size that was specified via FDT.
...@@ -401,7 +401,7 @@ void __init arm64_memblock_init(void) ...@@ -401,7 +401,7 @@ void __init arm64_memblock_init(void)
* high up in memory, add back the kernel region that must be accessible * high up in memory, add back the kernel region that must be accessible
* via the linear mapping. * via the linear mapping.
*/ */
if (memory_limit != (phys_addr_t)ULLONG_MAX) { if (memory_limit != PHYS_ADDR_MAX) {
memblock_mem_limit_remove_map(memory_limit); memblock_mem_limit_remove_map(memory_limit);
memblock_add(__pa_symbol(_text), (u64)(_end - _text)); memblock_add(__pa_symbol(_text), (u64)(_end - _text));
} }
...@@ -666,7 +666,7 @@ __setup("keepinitrd", keepinitrd_setup); ...@@ -666,7 +666,7 @@ __setup("keepinitrd", keepinitrd_setup);
*/ */
static int dump_mem_limit(struct notifier_block *self, unsigned long v, void *p) static int dump_mem_limit(struct notifier_block *self, unsigned long v, void *p)
{ {
if (memory_limit != (phys_addr_t)ULLONG_MAX) { if (memory_limit != PHYS_ADDR_MAX) {
pr_emerg("Memory Limit: %llu MB\n", memory_limit >> 20); pr_emerg("Memory Limit: %llu MB\n", memory_limit >> 20);
} else { } else {
pr_emerg("Memory Limit: none\n"); pr_emerg("Memory Limit: none\n");
......
...@@ -93,7 +93,7 @@ void __init add_memory_region(phys_addr_t start, phys_addr_t size, long type) ...@@ -93,7 +93,7 @@ void __init add_memory_region(phys_addr_t start, phys_addr_t size, long type)
* If the region reaches the top of the physical address space, adjust * If the region reaches the top of the physical address space, adjust
* the size slightly so that (start + size) doesn't overflow * the size slightly so that (start + size) doesn't overflow
*/ */
if (start + size - 1 == (phys_addr_t)ULLONG_MAX) if (start + size - 1 == PHYS_ADDR_MAX)
--size; --size;
/* Sanity check */ /* Sanity check */
...@@ -376,7 +376,7 @@ static void __init bootmem_init(void) ...@@ -376,7 +376,7 @@ static void __init bootmem_init(void)
unsigned long reserved_end; unsigned long reserved_end;
unsigned long mapstart = ~0UL; unsigned long mapstart = ~0UL;
unsigned long bootmap_size; unsigned long bootmap_size;
phys_addr_t ramstart = (phys_addr_t)ULLONG_MAX; phys_addr_t ramstart = PHYS_ADDR_MAX;
bool bootmap_valid = false; bool bootmap_valid = false;
int i; int i;
......
...@@ -215,7 +215,7 @@ void __init mem_topology_setup(void) ...@@ -215,7 +215,7 @@ void __init mem_topology_setup(void)
/* Place all memblock_regions in the same node and merge contiguous /* Place all memblock_regions in the same node and merge contiguous
* memblock_regions * memblock_regions
*/ */
memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0); memblock_set_node(0, PHYS_ADDR_MAX, &memblock.memory, 0);
} }
void __init initmem_init(void) void __init initmem_init(void)
......
...@@ -1620,7 +1620,7 @@ static void __init bootmem_init_nonnuma(void) ...@@ -1620,7 +1620,7 @@ static void __init bootmem_init_nonnuma(void)
(top_of_ram - total_ram) >> 20); (top_of_ram - total_ram) >> 20);
init_node_masks_nonnuma(); init_node_masks_nonnuma();
memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0); memblock_set_node(0, PHYS_ADDR_MAX, &memblock.memory, 0);
allocate_node_data(0); allocate_node_data(0);
node_set_online(0); node_set_online(0);
} }
......
...@@ -692,7 +692,7 @@ void __init initmem_init(void) ...@@ -692,7 +692,7 @@ void __init initmem_init(void)
high_memory = (void *) __va(max_low_pfn * PAGE_SIZE - 1) + 1; high_memory = (void *) __va(max_low_pfn * PAGE_SIZE - 1) + 1;
#endif #endif
memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0); memblock_set_node(0, PHYS_ADDR_MAX, &memblock.memory, 0);
sparse_memory_present_with_active_regions(0); sparse_memory_present_with_active_regions(0);
#ifdef CONFIG_FLATMEM #ifdef CONFIG_FLATMEM
......
...@@ -742,7 +742,7 @@ kernel_physical_mapping_init(unsigned long paddr_start, ...@@ -742,7 +742,7 @@ kernel_physical_mapping_init(unsigned long paddr_start,
#ifndef CONFIG_NUMA #ifndef CONFIG_NUMA
void __init initmem_init(void) void __init initmem_init(void)
{ {
memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0); memblock_set_node(0, PHYS_ADDR_MAX, &memblock.memory, 0);
} }
#endif #endif
......
...@@ -193,7 +193,7 @@ static __init void reserve_regions(void) ...@@ -193,7 +193,7 @@ static __init void reserve_regions(void)
* uses its own memory map instead. * uses its own memory map instead.
*/ */
memblock_dump_all(); memblock_dump_all();
memblock_remove(0, (phys_addr_t)ULLONG_MAX); memblock_remove(0, PHYS_ADDR_MAX);
for_each_efi_memory_desc(md) { for_each_efi_memory_desc(md) {
paddr = md->phys_addr; paddr = md->phys_addr;
......
...@@ -686,7 +686,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc) ...@@ -686,7 +686,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc)
struct elf32_hdr *ehdr; struct elf32_hdr *ehdr;
phys_addr_t mpss_reloc; phys_addr_t mpss_reloc;
phys_addr_t boot_addr; phys_addr_t boot_addr;
phys_addr_t min_addr = (phys_addr_t)ULLONG_MAX; phys_addr_t min_addr = PHYS_ADDR_MAX;
phys_addr_t max_addr = 0; phys_addr_t max_addr = 0;
bool relocate = false; bool relocate = false;
char seg_name[10]; char seg_name[10];
......
...@@ -50,7 +50,7 @@ ssize_t qcom_mdt_get_size(const struct firmware *fw) ...@@ -50,7 +50,7 @@ ssize_t qcom_mdt_get_size(const struct firmware *fw)
const struct elf32_phdr *phdrs; const struct elf32_phdr *phdrs;
const struct elf32_phdr *phdr; const struct elf32_phdr *phdr;
const struct elf32_hdr *ehdr; const struct elf32_hdr *ehdr;
phys_addr_t min_addr = (phys_addr_t)ULLONG_MAX; phys_addr_t min_addr = PHYS_ADDR_MAX;
phys_addr_t max_addr = 0; phys_addr_t max_addr = 0;
int i; int i;
...@@ -97,7 +97,7 @@ int qcom_mdt_load(struct device *dev, const struct firmware *fw, ...@@ -97,7 +97,7 @@ int qcom_mdt_load(struct device *dev, const struct firmware *fw,
const struct elf32_hdr *ehdr; const struct elf32_hdr *ehdr;
const struct firmware *seg_fw; const struct firmware *seg_fw;
phys_addr_t mem_reloc; phys_addr_t mem_reloc;
phys_addr_t min_addr = (phys_addr_t)ULLONG_MAX; phys_addr_t min_addr = PHYS_ADDR_MAX;
phys_addr_t max_addr = 0; phys_addr_t max_addr = 0;
size_t fw_name_len; size_t fw_name_len;
ssize_t offset; ssize_t offset;
......
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