summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Agner <stefan@agner.ch>2018-06-14 18:28:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-06-14 18:55:25 -0400
commitd7dc899abefb4412388a5d3ec690070197d07d20 (patch)
tree2315f94208ffd0e87a1c62d8953c178f583e6b99
parent0825a6f98689d847ab8058c51b3a55f0abcc6563 (diff)
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.ch Signed-off-by: Stefan Agner <stefan@agner.ch> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Acked-by: Catalin Marinas <catalin.marinas@arm.com> [arm64] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/arm64/mm/init.c6
-rw-r--r--arch/mips/kernel/setup.c4
-rw-r--r--arch/powerpc/mm/mem.c2
-rw-r--r--arch/sparc/mm/init_64.c2
-rw-r--r--arch/x86/mm/init_32.c2
-rw-r--r--arch/x86/mm/init_64.c2
-rw-r--r--drivers/firmware/efi/arm-init.c2
-rw-r--r--drivers/remoteproc/qcom_q6v5_pil.c2
-rw-r--r--drivers/soc/qcom/mdt_loader.c4
9 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 1b18b4722420..325cfb3b858a 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -310,7 +310,7 @@ static void __init arm64_memory_present(void)
310} 310}
311#endif 311#endif
312 312
313static phys_addr_t memory_limit = (phys_addr_t)ULLONG_MAX; 313static phys_addr_t memory_limit = PHYS_ADDR_MAX;
314 314
315/* 315/*
316 * Limit the memory size that was specified via FDT. 316 * Limit the memory size that was specified via FDT.
@@ -401,7 +401,7 @@ void __init arm64_memblock_init(void)
401 * high up in memory, add back the kernel region that must be accessible 401 * high up in memory, add back the kernel region that must be accessible
402 * via the linear mapping. 402 * via the linear mapping.
403 */ 403 */
404 if (memory_limit != (phys_addr_t)ULLONG_MAX) { 404 if (memory_limit != PHYS_ADDR_MAX) {
405 memblock_mem_limit_remove_map(memory_limit); 405 memblock_mem_limit_remove_map(memory_limit);
406 memblock_add(__pa_symbol(_text), (u64)(_end - _text)); 406 memblock_add(__pa_symbol(_text), (u64)(_end - _text));
407 } 407 }
@@ -666,7 +666,7 @@ __setup("keepinitrd", keepinitrd_setup);
666 */ 666 */
667static int dump_mem_limit(struct notifier_block *self, unsigned long v, void *p) 667static int dump_mem_limit(struct notifier_block *self, unsigned long v, void *p)
668{ 668{
669 if (memory_limit != (phys_addr_t)ULLONG_MAX) { 669 if (memory_limit != PHYS_ADDR_MAX) {
670 pr_emerg("Memory Limit: %llu MB\n", memory_limit >> 20); 670 pr_emerg("Memory Limit: %llu MB\n", memory_limit >> 20);
671 } else { 671 } else {
672 pr_emerg("Memory Limit: none\n"); 672 pr_emerg("Memory Limit: none\n");
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 563188ac6fa2..2c96c0c68116 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -93,7 +93,7 @@ void __init add_memory_region(phys_addr_t start, phys_addr_t size, long type)
93 * If the region reaches the top of the physical address space, adjust 93 * If the region reaches the top of the physical address space, adjust
94 * the size slightly so that (start + size) doesn't overflow 94 * the size slightly so that (start + size) doesn't overflow
95 */ 95 */
96 if (start + size - 1 == (phys_addr_t)ULLONG_MAX) 96 if (start + size - 1 == PHYS_ADDR_MAX)
97 --size; 97 --size;
98 98
99 /* Sanity check */ 99 /* Sanity check */
@@ -376,7 +376,7 @@ static void __init bootmem_init(void)
376 unsigned long reserved_end; 376 unsigned long reserved_end;
377 unsigned long mapstart = ~0UL; 377 unsigned long mapstart = ~0UL;
378 unsigned long bootmap_size; 378 unsigned long bootmap_size;
379 phys_addr_t ramstart = (phys_addr_t)ULLONG_MAX; 379 phys_addr_t ramstart = PHYS_ADDR_MAX;
380 bool bootmap_valid = false; 380 bool bootmap_valid = false;
381 int i; 381 int i;
382 382
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 8cecda4bd66a..5c8530d0c611 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -215,7 +215,7 @@ void __init mem_topology_setup(void)
215 /* Place all memblock_regions in the same node and merge contiguous 215 /* Place all memblock_regions in the same node and merge contiguous
216 * memblock_regions 216 * memblock_regions
217 */ 217 */
218 memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0); 218 memblock_set_node(0, PHYS_ADDR_MAX, &memblock.memory, 0);
219} 219}
220 220
221void __init initmem_init(void) 221void __init initmem_init(void)
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 8aeb1aabe76e..f396048a0d68 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -1620,7 +1620,7 @@ static void __init bootmem_init_nonnuma(void)
1620 (top_of_ram - total_ram) >> 20); 1620 (top_of_ram - total_ram) >> 20);
1621 1621
1622 init_node_masks_nonnuma(); 1622 init_node_masks_nonnuma();
1623 memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0); 1623 memblock_set_node(0, PHYS_ADDR_MAX, &memblock.memory, 0);
1624 allocate_node_data(0); 1624 allocate_node_data(0);
1625 node_set_online(0); 1625 node_set_online(0);
1626} 1626}
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index c893c6a3d707..979e0a02cbe1 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -692,7 +692,7 @@ void __init initmem_init(void)
692 high_memory = (void *) __va(max_low_pfn * PAGE_SIZE - 1) + 1; 692 high_memory = (void *) __va(max_low_pfn * PAGE_SIZE - 1) + 1;
693#endif 693#endif
694 694
695 memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0); 695 memblock_set_node(0, PHYS_ADDR_MAX, &memblock.memory, 0);
696 sparse_memory_present_with_active_regions(0); 696 sparse_memory_present_with_active_regions(0);
697 697
698#ifdef CONFIG_FLATMEM 698#ifdef CONFIG_FLATMEM
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 17383f9677fa..045f492d5f68 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -742,7 +742,7 @@ kernel_physical_mapping_init(unsigned long paddr_start,
742#ifndef CONFIG_NUMA 742#ifndef CONFIG_NUMA
743void __init initmem_init(void) 743void __init initmem_init(void)
744{ 744{
745 memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0); 745 memblock_set_node(0, PHYS_ADDR_MAX, &memblock.memory, 0);
746} 746}
747#endif 747#endif
748 748
diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
index 80d1a885def5..b5214c143fee 100644
--- a/drivers/firmware/efi/arm-init.c
+++ b/drivers/firmware/efi/arm-init.c
@@ -193,7 +193,7 @@ static __init void reserve_regions(void)
193 * uses its own memory map instead. 193 * uses its own memory map instead.
194 */ 194 */
195 memblock_dump_all(); 195 memblock_dump_all();
196 memblock_remove(0, (phys_addr_t)ULLONG_MAX); 196 memblock_remove(0, PHYS_ADDR_MAX);
197 197
198 for_each_efi_memory_desc(md) { 198 for_each_efi_memory_desc(md) {
199 paddr = md->phys_addr; 199 paddr = md->phys_addr;
diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c
index 2190debf3d35..2bf8e7c49f2a 100644
--- a/drivers/remoteproc/qcom_q6v5_pil.c
+++ b/drivers/remoteproc/qcom_q6v5_pil.c
@@ -686,7 +686,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc)
686 struct elf32_hdr *ehdr; 686 struct elf32_hdr *ehdr;
687 phys_addr_t mpss_reloc; 687 phys_addr_t mpss_reloc;
688 phys_addr_t boot_addr; 688 phys_addr_t boot_addr;
689 phys_addr_t min_addr = (phys_addr_t)ULLONG_MAX; 689 phys_addr_t min_addr = PHYS_ADDR_MAX;
690 phys_addr_t max_addr = 0; 690 phys_addr_t max_addr = 0;
691 bool relocate = false; 691 bool relocate = false;
692 char seg_name[10]; 692 char seg_name[10];
diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c
index 17b314d9a148..dc09d7ac905f 100644
--- a/drivers/soc/qcom/mdt_loader.c
+++ b/drivers/soc/qcom/mdt_loader.c
@@ -50,7 +50,7 @@ ssize_t qcom_mdt_get_size(const struct firmware *fw)
50 const struct elf32_phdr *phdrs; 50 const struct elf32_phdr *phdrs;
51 const struct elf32_phdr *phdr; 51 const struct elf32_phdr *phdr;
52 const struct elf32_hdr *ehdr; 52 const struct elf32_hdr *ehdr;
53 phys_addr_t min_addr = (phys_addr_t)ULLONG_MAX; 53 phys_addr_t min_addr = PHYS_ADDR_MAX;
54 phys_addr_t max_addr = 0; 54 phys_addr_t max_addr = 0;
55 int i; 55 int i;
56 56
@@ -97,7 +97,7 @@ int qcom_mdt_load(struct device *dev, const struct firmware *fw,
97 const struct elf32_hdr *ehdr; 97 const struct elf32_hdr *ehdr;
98 const struct firmware *seg_fw; 98 const struct firmware *seg_fw;
99 phys_addr_t mem_reloc; 99 phys_addr_t mem_reloc;
100 phys_addr_t min_addr = (phys_addr_t)ULLONG_MAX; 100 phys_addr_t min_addr = PHYS_ADDR_MAX;
101 phys_addr_t max_addr = 0; 101 phys_addr_t max_addr = 0;
102 size_t fw_name_len; 102 size_t fw_name_len;
103 ssize_t offset; 103 ssize_t offset;