powerpc: Replace _ALIGN_DOWN() by ALIGN_DOWN()

_ALIGN_DOWN() is specific to powerpc
ALIGN_DOWN() is generic and does the same

Replace _ALIGN_DOWN() by ALIGN_DOWN()

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Link: https://lore.kernel.org/r/3911a86d6b5bfa7ad88cd7c82416fbe6bb47e793.1587407777.git.christophe.leroy@c-s.fr

diff --git a/arch/powerpc/include/asm/book3s/32/pgtable.h b/arch/powerpc/include/asm/book3s/32/pgtable.h
index 7549393c4c43693579e747c8588f4f7493f497c2..53b5c93eaf5dd2f89e54be93eef19372db711b29 100644 (file)
--- a/arch/powerpc/include/asm/book3s/32/pgtable.h
+++ b/arch/powerpc/include/asm/book3s/32/pgtable.h
@@ -195,7 +195,7 @@ int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot);
 #endif
 
 #ifdef CONFIG_KASAN_VMALLOC
-#define VMALLOC_END    _ALIGN_DOWN(ioremap_bot, PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT)
+#define VMALLOC_END    ALIGN_DOWN(ioremap_bot, PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT)
 #else
 #define VMALLOC_END    ioremap_bot
 #endif

diff --git a/arch/powerpc/include/asm/nohash/32/pgtable.h b/arch/powerpc/include/asm/nohash/32/pgtable.h
index b04ba257fddbc7733651ec42cb85175c779d51c4..5b4d4c4297e1bb345c2e9f5ccc097bb94ee8af5e 100644 (file)
--- a/arch/powerpc/include/asm/nohash/32/pgtable.h
+++ b/arch/powerpc/include/asm/nohash/32/pgtable.h
@@ -116,7 +116,7 @@ int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot);
 #endif
 
 #ifdef CONFIG_KASAN_VMALLOC
-#define VMALLOC_END    _ALIGN_DOWN(ioremap_bot, PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT)
+#define VMALLOC_END    ALIGN_DOWN(ioremap_bot, PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT)
 #else
 #define VMALLOC_END    ioremap_bot
 #endif

diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 30d07fc79dd14ce5b739f77cfdc2445cb2ca9987..89591fb31fb65a1a4afe83480b0f5f767b4646aa 100644 (file)
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -130,7 +130,7 @@ static int pcibios_map_phb_io_space(struct pci_controller *hose)
        unsigned long size_page;
        unsigned long io_virt_offset;
 
-       phys_page = _ALIGN_DOWN(hose->io_base_phys, PAGE_SIZE);
+       phys_page = ALIGN_DOWN(hose->io_base_phys, PAGE_SIZE);
        size_page = _ALIGN_UP(hose->pci_io_size, PAGE_SIZE);
 
        /* Make sure IO area address is clear */

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 6620f37abe732326c380872b62ead719da2950e0..10b5d5eafd34cdf3facf04640e098d4d4a0cd524 100644 (file)
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -96,7 +96,7 @@ static inline int overlaps_initrd(unsigned long start, unsigned long size)
        if (!initrd_start)
                return 0;
 
-       return  (start + size) > _ALIGN_DOWN(initrd_start, PAGE_SIZE) &&
+       return  (start + size) > ALIGN_DOWN(initrd_start, PAGE_SIZE) &&
                        start <= _ALIGN_UP(initrd_end, PAGE_SIZE);
 #else
        return 0;
@@ -623,9 +623,9 @@ static void __init early_reserve_mem(void)
 #ifdef CONFIG_BLK_DEV_INITRD
        /* Then reserve the initrd, if any */
        if (initrd_start && (initrd_end > initrd_start)) {
-               memblock_reserve(_ALIGN_DOWN(__pa(initrd_start), PAGE_SIZE),
+               memblock_reserve(ALIGN_DOWN(__pa(initrd_start), PAGE_SIZE),
                        _ALIGN_UP(initrd_end, PAGE_SIZE) -
-                       _ALIGN_DOWN(initrd_start, PAGE_SIZE));
+                       ALIGN_DOWN(initrd_start, PAGE_SIZE));
        }
 #endif /* CONFIG_BLK_DEV_INITRD */
 

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 806be751c3369b7c7250d13807dabd2c35590992..4cf5958eebd40ee015690d6597e64b01c25fef84 100644 (file)
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -1500,7 +1500,7 @@ static unsigned long __init alloc_down(unsigned long size, unsigned long align,
 
        if (highmem) {
                /* Carve out storage for the TCE table. */
-               addr = _ALIGN_DOWN(alloc_top_high - size, align);
+               addr = ALIGN_DOWN(alloc_top_high - size, align);
                if (addr <= alloc_bottom)
                        return 0;
                /* Will we bump into the RMO ? If yes, check out that we
@@ -1518,9 +1518,9 @@ static unsigned long __init alloc_down(unsigned long size, unsigned long align,
                goto bail;
        }
 
-       base = _ALIGN_DOWN(alloc_top - size, align);
+       base = ALIGN_DOWN(alloc_top - size, align);
        for (; base > alloc_bottom;
-            base = _ALIGN_DOWN(base - 0x100000, align))  {
+            base = ALIGN_DOWN(base - 0x100000, align))  {
                prom_debug("    trying: 0x%lx\n\r", base);
                addr = (unsigned long)prom_claim(base, size, 0);
                if (addr != PROM_ERROR && addr != 0)
@@ -1586,7 +1586,7 @@ static void __init reserve_mem(u64 base, u64 size)
         * have our terminator with "size" set to 0 since we are
         * dumb and just copy this entire array to the boot params
         */
-       base = _ALIGN_DOWN(base, PAGE_SIZE);
+       base = ALIGN_DOWN(base, PAGE_SIZE);
        top = _ALIGN_UP(top, PAGE_SIZE);
        size = top - base;
 

diff --git a/arch/powerpc/mm/book3s64/hash_tlb.c b/arch/powerpc/mm/book3s64/hash_tlb.c
index 1fa2173413b55bf391544426d363edd21c4b2e24..a500979fbc59d140cc3f90a2ea946461a88999ef 100644 (file)
--- a/arch/powerpc/mm/book3s64/hash_tlb.c
+++ b/arch/powerpc/mm/book3s64/hash_tlb.c
@@ -193,7 +193,7 @@ void __flush_hash_table_range(unsigned long start, unsigned long end)
        int hugepage_shift;
        unsigned long flags;
 
-       start = _ALIGN_DOWN(start, PAGE_SIZE);
+       start = ALIGN_DOWN(start, PAGE_SIZE);
        end = _ALIGN_UP(end, PAGE_SIZE);
 
 
@@ -228,7 +228,7 @@ void flush_tlb_pmd_range(struct mm_struct *mm, pmd_t *pmd, unsigned long addr)
        pte_t *start_pte;
        unsigned long flags;
 
-       addr = _ALIGN_DOWN(addr, PMD_SIZE);
+       addr = ALIGN_DOWN(addr, PMD_SIZE);
        /*
         * Note: Normally, we should only ever use a batch within a
         * PTE locked section. This violates the rule, but will work

diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 4002ced3596f770d8562699cabd03ef388ac1224..c7ce4ec5060eb37d3034d29ee02754e86fc27603 100644 (file)
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -203,7 +203,7 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,
        unsigned long page_size = 1 << mmu_psize_defs[mmu_vmemmap_psize].shift;
 
        /* Align to the page size of the linear mapping. */
-       start = _ALIGN_DOWN(start, page_size);
+       start = ALIGN_DOWN(start, page_size);
 
        pr_debug("vmemmap_populate %lx..%lx, node %d\n", start, end, node);
 
@@ -292,7 +292,7 @@ void __ref vmemmap_free(unsigned long start, unsigned long end,
        unsigned long alt_start = ~0, alt_end = ~0;
        unsigned long base_pfn;
 
-       start = _ALIGN_DOWN(start, page_size);
+       start = ALIGN_DOWN(start, page_size);
        if (altmap) {
                alt_start = altmap->base_pfn;
                alt_end = altmap->base_pfn + altmap->reserve +

diff --git a/arch/powerpc/platforms/powernv/opal-fadump.c b/arch/powerpc/platforms/powernv/opal-fadump.c
index d361d37d975f313e4830bedb045721d6a15acb6a..9a360ced663b0a64519cb8f56c909376c2d039ff 100644 (file)
--- a/arch/powerpc/platforms/powernv/opal-fadump.c
+++ b/arch/powerpc/platforms/powernv/opal-fadump.c
@@ -671,7 +671,7 @@ void __init opal_fadump_dt_scan(struct fw_dump *fadump_conf, u64 node)
         * Firmware supports 32-bit field for size. Align it to PAGE_SIZE
         * and request firmware to copy multiple kernel boot memory regions.
         */
-       fadump_conf->max_copy_size = _ALIGN_DOWN(U32_MAX, PAGE_SIZE);
+       fadump_conf->max_copy_size = ALIGN_DOWN(U32_MAX, PAGE_SIZE);
 
        /*
         * Check if dump has been initiated on last reboot.

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 57d3a6af1d52cd4c5a2eb4d26b4586ce4974af9c..276b011cd45d2b0842eb74bd3b59ee639f5ad0c4 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -264,7 +264,7 @@ static void pnv_ioda_reserve_dev_m64_pe(struct pci_dev *pdev,
                if (!r->parent || !pnv_pci_is_m64(phb, r))
                        continue;
 
-               start = _ALIGN_DOWN(r->start - base, sgsz);
+               start = ALIGN_DOWN(r->start - base, sgsz);
                end = _ALIGN_UP(r->end - base, sgsz);
                for (segno = start / sgsz; segno < end / sgsz; segno++) {
                        if (pe_bitmap)

diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
index 423be34f0f5fb5cb17c0b8fb24fe203bfd9b431e..71ed37f7f475e7b4b78621be1867b32ccea99684 100644 (file)
--- a/arch/powerpc/platforms/ps3/mm.c
+++ b/arch/powerpc/platforms/ps3/mm.c
@@ -263,7 +263,7 @@ static int ps3_mm_region_create(struct mem_region *r, unsigned long size)
        int result;
        u64 muid;
 
-       r->size = _ALIGN_DOWN(size, 1 << PAGE_SHIFT_16M);
+       r->size = ALIGN_DOWN(size, 1 << PAGE_SHIFT_16M);
 
        DBG("%s:%d requested  %lxh\n", __func__, __LINE__, size);
        DBG("%s:%d actual     %llxh\n", __func__, __LINE__, r->size);
@@ -394,7 +394,7 @@ static struct dma_chunk * dma_find_chunk(struct ps3_dma_region *r,
        unsigned long bus_addr, unsigned long len)
 {
        struct dma_chunk *c;
-       unsigned long aligned_bus = _ALIGN_DOWN(bus_addr, 1 << r->page_size);
+       unsigned long aligned_bus = ALIGN_DOWN(bus_addr, 1 << r->page_size);
        unsigned long aligned_len = _ALIGN_UP(len+bus_addr-aligned_bus,
                                              1 << r->page_size);
 
@@ -423,7 +423,7 @@ static struct dma_chunk *dma_find_chunk_lpar(struct ps3_dma_region *r,
        unsigned long lpar_addr, unsigned long len)
 {
        struct dma_chunk *c;
-       unsigned long aligned_lpar = _ALIGN_DOWN(lpar_addr, 1 << r->page_size);
+       unsigned long aligned_lpar = ALIGN_DOWN(lpar_addr, 1 << r->page_size);
        unsigned long aligned_len = _ALIGN_UP(len + lpar_addr - aligned_lpar,
                                              1 << r->page_size);
 
@@ -775,7 +775,7 @@ static int dma_sb_map_area(struct ps3_dma_region *r, unsigned long virt_addr,
        struct dma_chunk *c;
        unsigned long phys_addr = is_kernel_addr(virt_addr) ? __pa(virt_addr)
                : virt_addr;
-       unsigned long aligned_phys = _ALIGN_DOWN(phys_addr, 1 << r->page_size);
+       unsigned long aligned_phys = ALIGN_DOWN(phys_addr, 1 << r->page_size);
        unsigned long aligned_len = _ALIGN_UP(len + phys_addr - aligned_phys,
                                              1 << r->page_size);
        *bus_addr = dma_sb_lpar_to_bus(r, ps3_mm_phys_to_lpar(phys_addr));
@@ -830,7 +830,7 @@ static int dma_ioc0_map_area(struct ps3_dma_region *r, unsigned long virt_addr,
        struct dma_chunk *c;
        unsigned long phys_addr = is_kernel_addr(virt_addr) ? __pa(virt_addr)
                : virt_addr;
-       unsigned long aligned_phys = _ALIGN_DOWN(phys_addr, 1 << r->page_size);
+       unsigned long aligned_phys = ALIGN_DOWN(phys_addr, 1 << r->page_size);
        unsigned long aligned_len = _ALIGN_UP(len + phys_addr - aligned_phys,
                                              1 << r->page_size);
 
@@ -889,7 +889,7 @@ static int dma_sb_unmap_area(struct ps3_dma_region *r, dma_addr_t bus_addr,
        c = dma_find_chunk(r, bus_addr, len);
 
        if (!c) {
-               unsigned long aligned_bus = _ALIGN_DOWN(bus_addr,
+               unsigned long aligned_bus = ALIGN_DOWN(bus_addr,
                        1 << r->page_size);
                unsigned long aligned_len = _ALIGN_UP(len + bus_addr
                        - aligned_bus, 1 << r->page_size);
@@ -926,7 +926,7 @@ static int dma_ioc0_unmap_area(struct ps3_dma_region *r,
        c = dma_find_chunk(r, bus_addr, len);
 
        if (!c) {
-               unsigned long aligned_bus = _ALIGN_DOWN(bus_addr,
+               unsigned long aligned_bus = ALIGN_DOWN(bus_addr,
                                                        1 << r->page_size);
                unsigned long aligned_len = _ALIGN_UP(len + bus_addr
                                                      - aligned_bus,

diff --git a/arch/powerpc/platforms/pseries/rtas-fadump.c b/arch/powerpc/platforms/pseries/rtas-fadump.c
index 70c3013fdd074f457cc8cbbdd28504519aaa19df..81343908ed3346825daad16e40eedebad50fd935 100644 (file)
--- a/arch/powerpc/platforms/pseries/rtas-fadump.c
+++ b/arch/powerpc/platforms/pseries/rtas-fadump.c
@@ -506,7 +506,7 @@ void __init rtas_fadump_dt_scan(struct fw_dump *fadump_conf, u64 node)
        fadump_conf->fadump_supported   = 1;
 
        /* Firmware supports 64-bit value for size, align it to pagesize. */
-       fadump_conf->max_copy_size = _ALIGN_DOWN(U64_MAX, PAGE_SIZE);
+       fadump_conf->max_copy_size = ALIGN_DOWN(U64_MAX, PAGE_SIZE);
 
        /*
         * The 'ibm,kernel-dump' rtas node is present only if there is