Commit e31736d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nios2-v5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2 

Pull nios2 fix from Ley Foon Tan:
 "Fix nios2 ioremap regression"

* tag 'nios2-v5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
  nios2: Fix ioremap
parents 1482e664 e32ea127

arch/nios2/mm/ioremap.c

+8 −0
Original line number Diff line number Diff line
@@ -138,6 +138,14 @@ void __iomem *ioremap(unsigned long phys_addr, unsigned long size) 
				return NULL;

	}



	/*

	 * Map uncached objects in the low part of address space to

	 * CONFIG_NIOS2_IO_REGION_BASE

	 */

	if (IS_MAPPABLE_UNCACHEABLE(phys_addr) &&

	    IS_MAPPABLE_UNCACHEABLE(last_addr))

		return (void __iomem *)(CONFIG_NIOS2_IO_REGION_BASE + phys_addr);



	/* Mappings have to be page-aligned */

	offset = phys_addr & ~PAGE_MASK;

	phys_addr &= PAGE_MASK;