aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.13
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-10-31 23:32:22 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-10-31 23:32:22 +0000
commit5e3d188e89d719c8949f4f16321d82cc63ca8529 (patch)
tree4303736a67e1acfb1a51dd626636f44b09955ea0 /target/linux/generic/patches-3.13
parentb63cfc95302367d4900d68364fcf66c4074ab112 (diff)
downloadupstream-5e3d188e89d719c8949f4f16321d82cc63ca8529.tar.gz
upstream-5e3d188e89d719c8949f4f16321d82cc63ca8529.tar.bz2
upstream-5e3d188e89d719c8949f4f16321d82cc63ca8529.zip
kernel: add patch header and missing part in 132-mips_inline_dma_ops.patch again
The select SYS_HAS_DMA_OPS in CPU_CAVIUM_OCTEON was from the kernel patch in 3.13, but it is only included in kernel 3.14 and not in 3.13 and 3.18, add it again. Thank you swalker for spotting this. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 43134
Diffstat (limited to 'target/linux/generic/patches-3.13')
-rw-r--r--target/linux/generic/patches-3.13/132-mips_inline_dma_ops.patch31
-rw-r--r--target/linux/generic/patches-3.13/300-mips_expose_boot_raw.patch2
2 files changed, 30 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.13/132-mips_inline_dma_ops.patch b/target/linux/generic/patches-3.13/132-mips_inline_dma_ops.patch
index 53cbbb2455..a42a049d86 100644
--- a/target/linux/generic/patches-3.13/132-mips_inline_dma_ops.patch
+++ b/target/linux/generic/patches-3.13/132-mips_inline_dma_ops.patch
@@ -1,6 +1,33 @@
+From 2c58080407554e1bac8fd50d23cb02420524caed Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Mon, 12 Aug 2013 12:50:22 +0200
+Subject: [PATCH] MIPS: partially inline dma ops
+
+Several DMA ops are no-op on many platforms, and the indirection through
+the mips_dma_map_ops function table is causing the compiler to emit
+unnecessary code.
+
+Inlining visibly improves network performance in my tests (on a 24Kc
+based system), and also slightly reduces code size of a few drivers.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+ arch/mips/Kconfig | 4 +
+ arch/mips/include/asm/dma-mapping.h | 360 +++++++++++++++++++++++++++++++++++-
+ arch/mips/mm/dma-default.c | 163 ++--------------
+ 3 files changed, 373 insertions(+), 154 deletions(-)
+
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -1377,6 +1377,7 @@ config CPU_CAVIUM_OCTEON
+@@ -1145,6 +1145,7 @@ config CPU_LOONGSON2F
+ depends on SYS_HAS_CPU_LOONGSON2F
+ select CPU_LOONGSON2
+ select ARCH_REQUIRE_GPIOLIB
++ select SYS_HAS_DMA_OPS
+ help
+ The Loongson 2F processor implements the MIPS III instruction set
+ with many extensions.
+@@ -1377,6 +1378,7 @@ config CPU_CAVIUM_OCTEON
select LIBFDT
select USE_OF
select USB_EHCI_BIG_ENDIAN_MMIO
@@ -8,7 +35,7 @@
help
The Cavium Octeon processor is a highly integrated chip containing
many ethernet hardware widgets for networking tasks. The processor
-@@ -1599,6 +1600,9 @@ config SYS_HAS_CPU_XLR
+@@ -1599,6 +1601,9 @@ config SYS_HAS_CPU_XLR
config SYS_HAS_CPU_XLP
bool
diff --git a/target/linux/generic/patches-3.13/300-mips_expose_boot_raw.patch b/target/linux/generic/patches-3.13/300-mips_expose_boot_raw.patch
index d80fdee72d..3383bf87d0 100644
--- a/target/linux/generic/patches-3.13/300-mips_expose_boot_raw.patch
+++ b/target/linux/generic/patches-3.13/300-mips_expose_boot_raw.patch
@@ -18,7 +18,7 @@ Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480
bool
-@@ -2349,6 +2346,18 @@ config USE_OF
+@@ -2350,6 +2347,18 @@ config USE_OF
select OF_EARLY_FLATTREE
select IRQ_DOMAIN