Changes since v1 [1]:
1/ Drop the attempt at unifying ioremap() prototypes, just focus on converting ioremap_cache and ioremap_wt over to memremap (Christoph)
2/ Drop the unrelated cleanups to use %pa in __ioremap_caller (Thomas)
3/ Add support for memremap() attempts on "System RAM" to simply return the kernel virtual address for that range. ARM depends on this functionality in ioremap_cache() and ACPI was open coding a similar solution. (Mark)
4/ Split the conversions of ioremap_{cache|wt} into separate patches per driver / arch.
5/ Fix bisection breakage and other reports from 0day-kbuild
--- While developing the pmem driver we noticed that the __iomem annotation on the return value from ioremap_cache() was being mishandled by several callers. We also observed that all of the call sites expected to be able to treat the return value from ioremap_cache() as normal (non-__iomem) pointer to memory.
This patchset takes the opportunity to clean up the above confusion as well as a few issues with the ioremap_{cache|wt} interface, including:
1/ Eliminating the possibility of function prototypes differing between architectures by defining a central memremap() prototype that takes flags to determine the mapping type.
2/ Returning NULL rather than falling back silently to a different mapping-type. This allows drivers to be stricter about the mapping-type fallbacks that are permissible.
[1]: http://marc.info/?l=linux-arm-kernel&m=143735199029255&w=2
---
Dan Williams (22): mm: enhance region_is_ram() to distinguish 'unknown' vs 'mixed' arch, drivers: don't include <asm/io.h> directly, use <linux/io.h> instead cleanup IORESOURCE_CACHEABLE vs ioremap() intel_iommu: fix leaked ioremap mapping arch: introduce memremap() arm: switch from ioremap_cache to memremap x86: switch from ioremap_cache to memremap gma500: switch from acpi_os_ioremap to ioremap i915: switch from acpi_os_ioremap to ioremap acpi: switch from ioremap_cache to memremap toshiba laptop: replace ioremap_cache with ioremap memconsole: fix __iomem mishandling, switch to memremap visorbus: switch from ioremap_cache to memremap intel-iommu: switch from ioremap_cache to memremap libnvdimm, pmem: switch from ioremap_cache to memremap pxa2xx-flash: switch from ioremap_cache to memremap sfi: switch from ioremap_cache to memremap fbdev: switch from ioremap_wt to memremap pmem: switch from ioremap_wt to memremap arch: remove ioremap_cache, replace with arch_memremap arch: remove ioremap_wt, replace with arch_memremap pmem: convert to generic memremap
Toshi Kani (3): mm, x86: Fix warning in ioremap RAM check mm, x86: Remove region_is_ram() call from ioremap mm: Fix bugs in region_is_ram()
arch/arc/include/asm/io.h | 1 arch/arm/Kconfig | 1 arch/arm/include/asm/io.h | 13 +++- arch/arm/include/asm/xen/page.h | 4 + arch/arm/mach-clps711x/board-cdb89712.c | 2 - arch/arm/mach-shmobile/pm-rcar.c | 2 - arch/arm/mm/ioremap.c | 12 +++- arch/arm/mm/nommu.c | 11 ++- arch/arm64/Kconfig | 1 arch/arm64/include/asm/acpi.h | 10 +-- arch/arm64/include/asm/dmi.h | 8 +-- arch/arm64/include/asm/io.h | 8 ++- arch/arm64/kernel/efi.c | 9 ++- arch/arm64/kernel/smp_spin_table.c | 19 +++--- arch/arm64/mm/ioremap.c | 20 ++---- arch/avr32/include/asm/io.h | 1 arch/frv/Kconfig | 1 arch/frv/include/asm/io.h | 17 ++--- arch/frv/mm/kmap.c | 6 ++ arch/ia64/Kconfig | 1 arch/ia64/include/asm/io.h | 11 +++ arch/ia64/kernel/cyclone.c | 2 - arch/m32r/include/asm/io.h | 1 arch/m68k/Kconfig | 1 arch/m68k/include/asm/io_mm.h | 14 +--- arch/m68k/include/asm/io_no.h | 12 ++-- arch/m68k/include/asm/raw_io.h | 4 + arch/m68k/mm/kmap.c | 17 +++++ arch/m68k/mm/sun3kmap.c | 6 ++ arch/metag/include/asm/io.h | 3 - arch/microblaze/include/asm/io.h | 1 arch/mn10300/include/asm/io.h | 1 arch/nios2/include/asm/io.h | 1 arch/powerpc/kernel/pci_of_scan.c | 2 - arch/s390/include/asm/io.h | 1 arch/sh/Kconfig | 1 arch/sh/include/asm/io.h | 20 ++++-- arch/sh/mm/ioremap.c | 10 +++ arch/sparc/include/asm/io_32.h | 1 arch/sparc/include/asm/io_64.h | 1 arch/sparc/kernel/pci.c | 3 - arch/tile/include/asm/io.h | 1 arch/x86/Kconfig | 1 arch/x86/include/asm/efi.h | 3 + arch/x86/include/asm/io.h | 17 +++-- arch/x86/kernel/crash_dump_64.c | 6 +- arch/x86/kernel/kdebugfs.c | 8 +-- arch/x86/kernel/ksysfs.c | 28 ++++----- arch/x86/mm/ioremap.c | 76 ++++++++++-------------- arch/xtensa/Kconfig | 1 arch/xtensa/include/asm/io.h | 9 ++- drivers/acpi/apei/einj.c | 9 ++- drivers/acpi/apei/erst.c | 6 +- drivers/acpi/nvs.c | 6 +- drivers/acpi/osl.c | 70 ++++++---------------- drivers/char/toshiba.c | 2 - drivers/firmware/google/memconsole.c | 7 +- drivers/gpu/drm/gma500/opregion.c | 2 - drivers/gpu/drm/i915/intel_opregion.c | 2 - drivers/iommu/intel-iommu.c | 10 ++- drivers/iommu/intel_irq_remapping.c | 4 + drivers/isdn/icn/icn.h | 2 - drivers/mtd/devices/slram.c | 2 - drivers/mtd/maps/pxa2xx-flash.c | 4 + drivers/mtd/nand/diskonchip.c | 2 - drivers/mtd/onenand/generic.c | 2 - drivers/nvdimm/Kconfig | 2 - drivers/pci/probe.c | 3 - drivers/pnp/manager.c | 2 - drivers/scsi/aic94xx/aic94xx_init.c | 7 -- drivers/scsi/arcmsr/arcmsr_hba.c | 5 -- drivers/scsi/mvsas/mv_init.c | 15 +---- drivers/scsi/sun3x_esp.c | 2 - drivers/sfi/sfi_core.c | 4 + drivers/staging/comedi/drivers/ii_pci20kc.c | 1 drivers/staging/unisys/visorbus/visorchannel.c | 16 +++-- drivers/staging/unisys/visorbus/visorchipset.c | 17 +++-- drivers/tty/serial/8250/8250_core.c | 2 - drivers/video/fbdev/Kconfig | 2 - drivers/video/fbdev/amifb.c | 5 +- drivers/video/fbdev/atafb.c | 5 +- drivers/video/fbdev/hpfb.c | 6 +- drivers/video/fbdev/ocfb.c | 1 drivers/video/fbdev/s1d13xxxfb.c | 3 - drivers/video/fbdev/stifb.c | 1 include/acpi/acpi_io.h | 6 +- include/asm-generic/io.h | 8 --- include/asm-generic/iomap.h | 4 - include/linux/io-mapping.h | 2 - include/linux/io.h | 9 +++ include/linux/mtd/map.h | 2 - include/linux/pmem.h | 26 +++++--- include/video/vga.h | 2 - kernel/Makefile | 2 + kernel/memremap.c | 74 +++++++++++++++++++++++ kernel/resource.c | 43 +++++++------- lib/Kconfig | 5 +- lib/devres.c | 13 +--- lib/pci_iomap.c | 7 +- tools/testing/nvdimm/Kbuild | 4 + tools/testing/nvdimm/test/iomap.c | 34 ++++++++--- 101 files changed, 482 insertions(+), 398 deletions(-) create mode 100644 kernel/memremap.c
acpi_os_ioremap uses cached mappings, however it appears that gma500 wants to read dynamic platform state. Switch to ioremap() to prevent it reading stale state from cache.
Cc: David Airlie airlied@linux.ie Cc: dri-devel@lists.freedesktop.org Signed-off-by: Dan Williams dan.j.williams@intel.com --- drivers/gpu/drm/gma500/opregion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/gma500/opregion.c b/drivers/gpu/drm/gma500/opregion.c index ab696ca7eeec..9809c26ea0cf 100644 --- a/drivers/gpu/drm/gma500/opregion.c +++ b/drivers/gpu/drm/gma500/opregion.c @@ -322,7 +322,7 @@ int psb_intel_opregion_setup(struct drm_device *dev) INIT_WORK(&opregion->asle_work, psb_intel_opregion_asle_work);
DRM_DEBUG("OpRegion detected at 0x%8x\n", opregion_phy); - base = acpi_os_ioremap(opregion_phy, 8*1024); + base = ioremap(opregion_phy, 8*1024); if (!base) return -ENOMEM;
acpi_os_ioremap uses cached mappings, however it appears that i915 wants to read dynamic platform state. Switch to ioremap() to prevent it reading stale state from cache.
Cc: Daniel Vetter daniel.vetter@intel.com Cc: Jani Nikula jani.nikula@linux.intel.com Cc: intel-gfx@lists.freedesktop.org Cc: David Airlie airlied@linux.ie Cc: dri-devel@lists.freedesktop.org Signed-off-by: Dan Williams dan.j.williams@intel.com --- drivers/gpu/drm/i915/intel_opregion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index 481337436f72..16ba7c67410d 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c @@ -863,7 +863,7 @@ int intel_opregion_setup(struct drm_device *dev) INIT_WORK(&opregion->asle_work, asle_work); #endif
- base = acpi_os_ioremap(asls, OPREGION_SIZE); + base = ioremap(asls, OPREGION_SIZE); if (!base) return -ENOMEM;
On Fri, Jul 24, 2015 at 10:39:04PM -0400, Dan Williams wrote:
acpi_os_ioremap uses cached mappings, however it appears that i915 wants to read dynamic platform state. Switch to ioremap() to prevent it reading stale state from cache.
Cc: Daniel Vetter daniel.vetter@intel.com Cc: Jani Nikula jani.nikula@linux.intel.com Cc: intel-gfx@lists.freedesktop.org Cc: David Airlie airlied@linux.ie Cc: dri-devel@lists.freedesktop.org Signed-off-by: Dan Williams dan.j.williams@intel.com
drivers/gpu/drm/i915/intel_opregion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index 481337436f72..16ba7c67410d 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c @@ -863,7 +863,7 @@ int intel_opregion_setup(struct drm_device *dev) INIT_WORK(&opregion->asle_work, asle_work); #endif
- base = acpi_os_ioremap(asls, OPREGION_SIZE);
- base = ioremap(asls, OPREGION_SIZE);
OpRegion is cached memory shared with the firmware afaik, we probably want a memremap here and switch away from the ioread/write stuff. We have a similar confusion going on for the vbt parsing (which on anything but really old machines is also just normal memory).
Same holds for gma500, which is just a copy of i915 for some special platforms. -Daniel
dri-devel@lists.freedesktop.org
-
Dan Williams -
Daniel Vetter