mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 05:18:55 +00:00
150ac0c2af
AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
48 lines
1.9 KiB
Diff
48 lines
1.9 KiB
Diff
From dd57cf53a019fdb8d2df4d0b20f6babef818c4ce Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Mon, 19 May 2014 11:04:39 +0100
|
|
Subject: [PATCH] ARM: 8060/1: mm: allow sub-architectures to override PCI I/O
|
|
memory type
|
|
|
|
Due to a design incompatibility between the PCIe Marvell controller
|
|
and the Cortex-A9, stressing PCIe devices with a lot of traffic
|
|
quickly causes a deadlock.
|
|
|
|
One part of the workaround for this is to have all PCIe regions mapped
|
|
as strongly-ordered (MT_UNCACHED) instead of the default
|
|
MT_DEVICE. While the arch_ioremap_caller() mechanism allows
|
|
sub-architecture code to override ioremap(), used to map PCIe memory
|
|
regions, there isn't such a mechanism to override the behavior of
|
|
pci_ioremap_io().
|
|
|
|
This commit adds the arch_pci_ioremap_mem_type variable, initialized
|
|
to MT_DEVICE by default, and that sub-architecture code can
|
|
override. We have chosen to expose a single variable rather than
|
|
offering the possibility of overriding the entire pci_ioremap_io(),
|
|
because implementing pci_ioremap_io() requires calling functions
|
|
(get_mem_type()) that are private to the arch/arm/mm/ code.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
|
|
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
---
|
|
arch/arm/include/asm/io.h | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
|
|
index 4859820..709bd43 100644
|
|
--- a/arch/arm/include/asm/io.h
|
|
+++ b/arch/arm/include/asm/io.h
|
|
@@ -185,6 +185,12 @@ void pci_ioremap_set_mem_type(int mem_type);
|
|
static inline void pci_ioremap_set_mem_type(int mem_type) {}
|
|
#endif
|
|
|
|
+#if defined(CONFIG_PCI)
|
|
+void pci_ioremap_set_mem_type(int mem_type);
|
|
+#else
|
|
+static inline void pci_ioremap_set_mem_type(int mem_type) {}
|
|
+#endif
|
|
+
|
|
extern int pci_ioremap_io(unsigned int offset, phys_addr_t phys_addr);
|
|
|
|
/*
|