powerpc-remove-__ioremap_at-and-__iounmap_at.patch removed from -mm tree
The patch titled
Subject: powerpc: remove __ioremap_at and __iounmap_at
has been removed from the -mm tree. Its filename was
powerpc-remove-__ioremap_at-and-__iounmap_at.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Christoph Hellwig <[email protected]>
Subject: powerpc: remove __ioremap_at and __iounmap_at
These helpers are only used for remapping the ISA I/O base. Replace the mapping side with a remap_isa_range helper in isa-bridge.c that hard codes all the known arguments, and just remove __iounmap_at in favour of open coding it in the only caller.
---
arch/powerpc/include/asm/io.h | 8 ---- arch/powerpc/kernel/isa-bridge.c | 28 ++++++++++++---- arch/powerpc/mm/ioremap_64.c | 50 ----------------------------- 3 files changed, 21 insertions(+), 65 deletions(-)
arch/powerpc/include/asm/io.h renamed from arch/powerpc/include/asm/io.h~powerpc-remove-__ioremap_at-and-__iounmap_at +0 -8
@@ -699,10 +699,6 @@ static inline void iosync(void)* * * iounmap undoes such a mapping and can be hooked * -* * __ioremap_at (and the pending __iounmap_at) are low level functions to -* create hand-made mappings for use only by the PCI code and cannot -* currently be hooked. Must be page aligned. -* * * __ioremap_caller is the same as above but takes an explicit caller * reference rather than using __builtin_return_address(0) *
@@ -729,10 +725,6 @@ void __iomem *do_ioremap(phys_addr_t pa,extern void __iomem *__ioremap_caller (phys_addr_t ,unsigned long size,pgprot_t prot,void *caller); -extern void __iomem *__ioremap_at (phys_addr_t pa,void *ea, -unsigned long size,pgprot_t prot); -extern void __iounmap_at (void *ea,unsigned long size); -/* * When CONFIG_PPC_INDIRECT_PIO is set, we use the generic iomap implementation * which needs some additional definitions here. They basically allow PIO
arch/powerpc/kernel/isa-bridge.c renamed from arch/powerpc/kernel/isa-bridge.c~powerpc-remove-__ioremap_at-and-__iounmap_at +21 -7
@@ -18,6 +18,7 @@#include <linux/init.h> #include <linux/mm.h> #include <linux/notifier.h> +#include <linux/vmalloc.h> #include <asm/processor.h> #include <asm/io.h>
@@ -38,6 +39,22 @@ EXPORT_SYMBOL_GPL(isa_bridge_pcidev);#define ISA_SPACE_MASK 0x1#define ISA_SPACE_IO 0x1 +static void remap_isa_base (phys_addr_t pa,unsigned long size) +{ +WARN_ON_ONCE (ISA_IO_BASE & ~PAGE_MASK ); +WARN_ON_ONCE (pa & ~PAGE_MASK ); +WARN_ON_ONCE (size & ~PAGE_MASK ); + +if (slab_is_available ()) { +if (ioremap_page_range (ISA_IO_BASE ,ISA_IO_BASE + size, pa, +pgprot_noncached (PAGE_KERNEL ))) +unmap_kernel_range (ISA_IO_BASE , size); + }else { +early_ioremap_range (ISA_IO_BASE , pa, size, +pgprot_noncached (PAGE_KERNEL )); + } +} +static void pci_process_ISA_OF_ranges (struct device_node *isa_node,unsigned long phb_io_base_phys) {
@@ -105,15 +122,13 @@ static void pci_process_ISA_OF_ranges(stif (size >0x10000 ) size =0x10000 ; -__ioremap_at (phb_io_base_phys, (void *)ISA_IO_BASE , - size,pgprot_noncached (PAGE_KERNEL )); +remap_isa_base (phb_io_base_phys, size);return ; inval_range:printk (KERN_ERR "no ISA IO ranges or unexpected isa range, " "mapping 64k\n" ); -__ioremap_at (phb_io_base_phys, (void *)ISA_IO_BASE , -0x10000 ,pgprot_noncached (PAGE_KERNEL )); +remap_isa_base (phb_io_base_phys,0x10000 ); }
@@ -248,8 +263,7 @@ void __init isa_bridge_init_non_pci(stru* and map it */ isa_io_base =ISA_IO_BASE ; -__ioremap_at (pbase, (void *)ISA_IO_BASE , - size,pgprot_noncached (PAGE_KERNEL )); +remap_isa_base (pbase, size);pr_debug ("ISA: Non-PCI bridge is %pOF\n" , np); }
@@ -297,7 +311,7 @@ static void isa_bridge_remove(void) isa_bridge_pcidev =NULL ;/* Unmap the ISA area */ -__iounmap_at ((void *)ISA_IO_BASE ,0x10000 ); +unmap_kernel_range (ISA_IO_BASE ,0x10000 ); }/**
arch/powerpc/mm/ioremap_64.c renamed from arch/powerpc/mm/ioremap_64.c~powerpc-remove-__ioremap_at-and-__iounmap_at +0 -50
56 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are
exec-simplify-the-copy_strings_kernel-calling-convention.patch exec-open-code-copy_string_kernel.patch amdgpu-a-null-mm-does-not-mean-a-thread-is-a-kthread.patch kernel-move-use_mm-unuse_mm-to-kthreadc.patch kernel-move-use_mm-unuse_mm-to-kthreadc-v2.patch kernel-better-document-the-use_mm-unuse_mm-api-contract.patch kernel-better-document-the-use_mm-unuse_mm-api-contract-v2.patch kernel-set-user_ds-in-kthread_use_mm.patch arm-fix-the-flush_icache_range-arguments-in-set_fiq_handler.patch nds32-unexport-flush_icache_page.patch powerpc-unexport-flush_icache_user_range.patch unicore32-remove-flush_cache_user_range.patch asm-generic-fix-the-inclusion-guards-for-cacheflushh.patch asm-generic-dont-include-linux-mmh-in-cacheflushh.patch asm-generic-dont-include-linux-mmh-in-cacheflushh-fix.patch asm-generic-improve-the-flush_dcache_page-stub.patch alpha-use-asm-generic-cacheflushh.patch arm64-use-asm-generic-cacheflushh.patch c6x-use-asm-generic-cacheflushh.patch hexagon-use-asm-generic-cacheflushh.patch ia64-use-asm-generic-cacheflushh.patch microblaze-use-asm-generic-cacheflushh.patch m68knommu-use-asm-generic-cacheflushh.patch openrisc-use-asm-generic-cacheflushh.patch powerpc-use-asm-generic-cacheflushh.patch riscv-use-asm-generic-cacheflushh.patch armsparcunicore32-remove-flush_icache_user_range.patch mm-rename-flush_icache_user_range-to-flush_icache_user_page.patch asm-generic-add-a-flush_icache_user_range-stub.patch sh-implement-flush_icache_user_range.patch xtensa-implement-flush_icache_user_range.patch arm-rename-flush_cache_user_range-to-flush_icache_user_range.patch m68k-implement-flush_icache_user_range.patch exec-only-build-read_code-when-needed.patch exec-use-flush_icache_user_range-in-read_code.patch binfmt_flat-use-flush_icache_user_range.patch nommu-use-flush_icache_user_range-in-brk-and-mmap.patch module-move-the-set_fs-hack-for-flush_icache_range-to-m68k.patch maccess-unexport-probe_kernel_write-and-probe_user_write.patch maccess-remove-various-unused-weak-aliases.patch maccess-remove-duplicate-kerneldoc-comments.patch maccess-clarify-kerneldoc-comments.patch maccess-update-the-top-of-file-comment.patch maccess-rename-strncpy_from_unsafe_user-to-strncpy_from_user_nofault.patch maccess-rename-strncpy_from_unsafe_strict-to-strncpy_from_kernel_nofault.patch maccess-rename-strnlen_unsafe_user-to-strnlen_user_nofault.patch maccess-remove-probe_read_common-and-probe_write_common.patch maccess-unify-the-probe-kernel-arch-hooks.patch bpf-factor-out-a-bpf_trace_copy_string-helper.patch bpf-handle-the-compat-string-in-bpf_trace_copy_string-better.patch bpf-rework-the-compat-kernel-probe-handling.patch tracing-kprobes-handle-mixed-kernel-userspace-probes-better.patch maccess-remove-strncpy_from_unsafe.patch maccess-always-use-strict-semantics-for-probe_kernel_read.patch maccess-move-user-access-routines-together.patch maccess-allow-architectures-to-provide-kernel-probing-directly.patch x86-use-non-set_fs-based-maccess-routines.patch maccess-return-erange-when-copy_from_kernel_nofault_allowed-fails.patch