mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-28 09:41:41 +00:00
aba730f488
It uses the same kernel as next, but it uses mainline u-boot with DT overlay support, but without SPI, USB and possibly SATA support
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);
|
|
|
|
/*
|