tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+8
+8
arch/nios2/mm/ioremap.c
+8
arch/nios2/mm/ioremap.c
···
138
138
return NULL;
139
139
}
140
140
141
+
/*
142
+
* Map uncached objects in the low part of address space to
143
+
* CONFIG_NIOS2_IO_REGION_BASE
144
+
*/
145
+
if (IS_MAPPABLE_UNCACHEABLE(phys_addr) &&
146
+
IS_MAPPABLE_UNCACHEABLE(last_addr))
147
+
return (void __iomem *)(CONFIG_NIOS2_IO_REGION_BASE + phys_addr);
148
+
141
149
/* Mappings have to be page-aligned */
142
150
offset = phys_addr & ~PAGE_MASK;
143
151
phys_addr &= PAGE_MASK;