mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 00:11:13 +00:00
9261e7447e
This makes the patches which were just copied in the previous commit apply on top of kernel 4.19. The patches in the backports-4.19 folder were checked if they are really in kernel 4.19 based on the title and only removed if they were found in the upstream kernel. The following additional patches form the pending folder went into upstream Linux 4.19: pending-4.19/171-usb-dwc2-Fix-inefficient-copy-of-unaligned-buffers.patch pending-4.19/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch pending-4.19/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch pending-4.19/479-mtd-spi-nor-add-eon-en25qh32.patch pending-4.19/950-tty-serial-exar-generalize-rs485-setup.patch pending-4.19/340-MIPS-mm-remove-mips_dma_mapping_error.patch Bigger changes were introduced to the m25p80 spi nor driver, as far as I saw it in the new code, it now has the functionality provided in this patch: pending-4.19/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch Part of this patch went upstream independent of OpenWrt: hack-4.19/220-gc_sections.patch This patch was reworked to match the changes done upstream. The MIPS DMA API changed a lot, this patch was rewritten to match the new DMA handling: pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch I did bigger manual changes to the following patches and I am not 100% sure if they are all correct: pending-4.19/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch pending-4.19/411-mtd-partial_eraseblock_write.patch pending-4.19/600-netfilter_conntrack_flush.patch pending-4.19/611-netfilter_match_bypass_default_table.patch pending-4.19/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch hack-4.19/211-host_tools_portability.patch hack-4.19/221-module_exports.patch hack-4.19/321-powerpc_crtsavres_prereq.patch hack-4.19/902-debloat_proc.patch This is based on patchset from Marko Ratkaj <marko.ratkaj@sartura.hr> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
83 lines
2.3 KiB
Diff
83 lines
2.3 KiB
Diff
From 203f17906ff45705fbdaa0430dbbc71142c2640f Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Sat, 8 Dec 2018 21:45:53 +0100
|
|
Subject: [PATCH 1/3] MIPS: Compile post DMA flush only when needed
|
|
|
|
dma_sync_phys() is only called for some CPUs when a mapping is removed.
|
|
Add ARCH_HAS_SYNC_DMA_FOR_CPU only for the CPUs listed in
|
|
cpu_needs_post_dma_flush() which need this extra call and do not compile
|
|
this code in for other CPUs. We need this for R10000, R12000, BMIPS5000
|
|
CPUs and CPUs supporting MAAR which was introduced in MIPS32r5.
|
|
|
|
This will hopefully improve the performance of the not affected devices.
|
|
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
---
|
|
arch/mips/Kconfig | 6 +++++-
|
|
arch/mips/mm/dma-noncoherent.c | 2 ++
|
|
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
--- a/arch/mips/Kconfig
|
|
+++ b/arch/mips/Kconfig
|
|
@@ -1113,7 +1113,6 @@ config DMA_PERDEV_COHERENT
|
|
config DMA_NONCOHERENT
|
|
bool
|
|
select ARCH_HAS_SYNC_DMA_FOR_DEVICE
|
|
- select ARCH_HAS_SYNC_DMA_FOR_CPU
|
|
select NEED_DMA_MAP_STATE
|
|
select DMA_NONCOHERENT_MMAP
|
|
select DMA_NONCOHERENT_CACHE_SYNC
|
|
@@ -1894,9 +1893,11 @@ config SYS_HAS_CPU_MIPS32_R3_5
|
|
|
|
config SYS_HAS_CPU_MIPS32_R5
|
|
bool
|
|
+ select ARCH_HAS_SYNC_DMA_FOR_CPU
|
|
|
|
config SYS_HAS_CPU_MIPS32_R6
|
|
bool
|
|
+ select ARCH_HAS_SYNC_DMA_FOR_CPU
|
|
|
|
config SYS_HAS_CPU_MIPS64_R1
|
|
bool
|
|
@@ -1906,6 +1907,7 @@ config SYS_HAS_CPU_MIPS64_R2
|
|
|
|
config SYS_HAS_CPU_MIPS64_R6
|
|
bool
|
|
+ select ARCH_HAS_SYNC_DMA_FOR_CPU
|
|
|
|
config SYS_HAS_CPU_R3000
|
|
bool
|
|
@@ -1942,6 +1944,7 @@ config SYS_HAS_CPU_R8000
|
|
|
|
config SYS_HAS_CPU_R10000
|
|
bool
|
|
+ select ARCH_HAS_SYNC_DMA_FOR_CPU
|
|
|
|
config SYS_HAS_CPU_RM7000
|
|
bool
|
|
@@ -1970,6 +1973,7 @@ config SYS_HAS_CPU_BMIPS4380
|
|
config SYS_HAS_CPU_BMIPS5000
|
|
bool
|
|
select SYS_HAS_CPU_BMIPS
|
|
+ select ARCH_HAS_SYNC_DMA_FOR_CPU
|
|
|
|
config SYS_HAS_CPU_XLR
|
|
bool
|
|
--- a/arch/mips/mm/dma-noncoherent.c
|
|
+++ b/arch/mips/mm/dma-noncoherent.c
|
|
@@ -191,12 +191,14 @@ void arch_sync_dma_for_device(struct dev
|
|
dma_sync_phys(paddr, size, dir);
|
|
}
|
|
|
|
+#ifdef CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU
|
|
void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,
|
|
size_t size, enum dma_data_direction dir)
|
|
{
|
|
if (cpu_needs_post_dma_flush(dev))
|
|
dma_sync_phys(paddr, size, dir);
|
|
}
|
|
+#endif
|
|
|
|
void arch_dma_cache_sync(struct device *dev, void *vaddr, size_t size,
|
|
enum dma_data_direction direction)
|