Commit graph

4 commits

Author SHA1 Message Date
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
Christoph Hellwig
3f3ded99ae nios2: remove __iounmap
No need to indirect iounmap for nios2.

Signed-off-by: Christoph Hellwig <hch@lst.de>
2019-11-11 21:18:19 +01:00
Christoph Hellwig
5ace77e0b4 nios2: remove __ioremap
The cacheflag argument to __ioremap is always 0, so just implement
ioremap directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
2019-11-11 17:19:49 +01:00
Ley Foon Tan
6b8baec4d6 nios2: I/O Mapping
This patch adds several definitions for I/O accessors and ioremap().

Signed-off-by: Ley Foon Tan <lftan@altera.com>
2014-12-08 12:55:52 +08:00