1
0
Fork 0
alistair23-linux/arch/nios2/mm
Guenter Roeck e32ea127d8 nios2: Fix ioremap
Commit 5ace77e0b4 ("nios2: remove __ioremap") removed the following code,
with the argument that cacheflag is always 0 and the expression would
therefore always be false.

	if (IS_MAPPABLE_UNCACHEABLE(phys_addr) &&
	    IS_MAPPABLE_UNCACHEABLE(last_addr) &&
	    !(cacheflag & _PAGE_CACHED))
		return (void __iomem *)(CONFIG_NIOS2_IO_REGION_BASE + phys_addr);

This did not take the "!" in the expression into account. Result is that
nios2 images no longer boot. Restoring the removed code fixes the problem.

Fixes: 5ace77e0b4 ("nios2: remove __ioremap")
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com>
2019-12-12 16:34:33 +08:00
..
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
cacheflush.c nios2: update_mmu_cache preload the TLB with the new PTE 2019-03-07 05:29:35 +08:00
dma-mapping.c dma-mapping: drop the dev argument to arch_sync_dma_for_* 2019-11-20 20:31:38 +01:00
extable.c nios2: migrate exception table users off module.h and onto extable.h 2017-01-26 10:58:14 -05:00
fault.c nios2 update for v5.1-rc1 2019-03-10 10:13:37 -07:00
init.c init: provide a generic free_initmem implementation 2019-05-14 09:47:47 -07:00
ioremap.c nios2: Fix ioremap 2019-12-12 16:34:33 +08:00
mmu_context.c nios2: Process management 2014-12-08 12:55:53 +08:00
pgtable.c nios2: Page table management 2014-12-08 12:55:53 +08:00
tlb.c nios2: Fix update_mmu_cache preload the TLB with the new PTE 2019-03-07 06:00:48 +08:00
uaccess.c nios2: use generic strncpy_from_user() and strnlen_user() 2017-05-08 17:14:14 +08:00