[GIT PULL] arch/microblaze patches for 5.11-rc1
From: Michal Simek
Date: Wed Dec 16 2020 - 05:22:47 EST
Hi Linus,
please pull these changes to your tree. The biggest change is to remove
support for noMMU configuration. FPGAs are bigger that's why people use
Microblaze with MMU for a lot of years and there is likely no user of
this code anymore. None is updating libraries for this configuration too.
Stephen Rothwell reported issue with merge because of highem changes
from Thomas Gleixner done by commit 7ac1b26b0a72
("microblaze/mm/highmem: Switch to generic kmap atomic")
Resolution of this merge conflict is here
https://lore.kernel.org/linux-next/20201210155808.717a7257@xxxxxxxxxxxxxxxx/
I have also c&p resolution below. In
arch/microblaze/include/asm/mmu_context.h only asm/mmu_context_mm.h remains.
Please let me know if you want to prepare it differently.
Thanks,
Michal
diff --cc arch/microblaze/Kconfig
index 6acbb4571b0f,7f6ca0ab4f81..000000000000
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@@ -139,8 -143,19 +139,9 @@@ config ADVANCED_OPTION
comment "Default settings for advanced configuration options are used"
depends on !ADVANCED_OPTIONS
-config XILINX_UNCACHED_SHADOW
- bool "Are you using uncached shadow for RAM ?"
- depends on ADVANCED_OPTIONS && !MMU
- default n
- help
- This is needed to be able to allocate uncachable memory regions.
- The feature requires the design to define the RAM memory controller
- window to be twice as large as the actual physical memory.
-
config HIGHMEM
bool "High memory support"
- depends on MMU
+ select KMAP_LOCAL
help
The address space of Microblaze processors is only 4 Gigabytes large
and it has to accommodate user address space, kernel address
diff --cc arch/microblaze/mm/Makefile
index cd8a844bf29e,8ced71100047..000000000000
--- a/arch/microblaze/mm/Makefile
+++ b/arch/microblaze/mm/Makefile
@@@ -5,5 -5,4 +5,4 @@@
obj-y := consistent.o init.o
-obj-$(CONFIG_MMU) += pgtable.o mmu_context.o fault.o
+obj-y += pgtable.o mmu_context.o fault.o
- obj-$(CONFIG_HIGHMEM) += highmem.o
The following changes since commit 3650b228f83adda7e5ee532e2b90429c03f7b9ec:
Linux 5.10-rc1 (2020-10-25 15:14:11 -0700)
are available in the Git repository at:
git://git.monstr.eu/linux-2.6-microblaze.git tags/microblaze-v5.11
for you to fetch changes up to 05cdf457477d6603b207d91873f0a3d4c7f8c1cd:
microblaze: Remove noMMU code (2020-11-26 16:39:35 +0100)
----------------------------------------------------------------
Microblaze patches for 5.11-rc1
- Remove noMMU support
- Add support for TIF_NOTIFY_SIGNAL
- Small header fix
----------------------------------------------------------------
Geert Uytterhoeven (1):
microblaze: Replace <linux/clk-provider.h> by <linux/of_clk.h>
Jens Axboe (1):
microblaze: add support for TIF_NOTIFY_SIGNAL
Michal Simek (1):
microblaze: Remove noMMU code
arch/microblaze/Kconfig | 53 +-----
arch/microblaze/Makefile | 11 +-
arch/microblaze/configs/mmu_defconfig | 1 -
arch/microblaze/configs/nommu_defconfig | 90 ----------
arch/microblaze/include/asm/dma.h | 6 -
arch/microblaze/include/asm/exceptions.h | 5 -
arch/microblaze/include/asm/io.h | 3 -
arch/microblaze/include/asm/mmu.h | 4 -
arch/microblaze/include/asm/mmu_context.h | 4 -
arch/microblaze/include/asm/page.h | 59 -------
arch/microblaze/include/asm/pgalloc.h | 4 -
arch/microblaze/include/asm/pgtable.h | 43 -----
arch/microblaze/include/asm/processor.h | 37 ----
arch/microblaze/include/asm/registers.h | 2 -
arch/microblaze/include/asm/setup.h | 2 -
arch/microblaze/include/asm/thread_info.h | 2 +
arch/microblaze/include/asm/tlbflush.h | 14 --
arch/microblaze/include/asm/uaccess.h | 27 ---
arch/microblaze/kernel/Makefile | 4 +-
arch/microblaze/kernel/asm-offsets.c | 2 -
arch/microblaze/kernel/entry-nommu.S | 622
------------------------------------------------------------------
arch/microblaze/kernel/exceptions.c | 5 -
arch/microblaze/kernel/head.S | 12 --
arch/microblaze/kernel/hw_exception_handler.S | 130 +-------------
arch/microblaze/kernel/microblaze_ksyms.c | 2 -
arch/microblaze/kernel/process.c | 10 --
arch/microblaze/kernel/setup.c | 4 +-
arch/microblaze/kernel/signal.c | 10 +-
arch/microblaze/kernel/unwind.c | 19 --
arch/microblaze/mm/Makefile | 2 +-
arch/microblaze/mm/consistent.c | 29 ----
arch/microblaze/mm/init.c | 49 ------
arch/microblaze/pci/pci-common.c | 2 -
33 files changed, 16 insertions(+), 1253 deletions(-)
delete mode 100644 arch/microblaze/configs/nommu_defconfig
delete mode 100644 arch/microblaze/kernel/entry-nommu.S
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs