aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.14/950-0382-staging-vc04_services-remove-odd-vchiq_debugfs_top-w.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-11-10 13:03:18 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2018-12-18 23:19:21 +0200
commitf5919b65d4c671fd5083838c7a445f319f9a13c8 (patch)
tree2c791d2a5dea5bbbb0b85f86f74afce2647c0726 /target/linux/brcm2708/patches-4.14/950-0382-staging-vc04_services-remove-odd-vchiq_debugfs_top-w.patch
parent822b4c3b250a254e74407056ccfd5c6aa38da162 (diff)
downloadupstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.tar.gz
upstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.tar.bz2
upstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.zip
brcm2708: add kernel 4.14 support
Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0382-staging-vc04_services-remove-odd-vchiq_debugfs_top-w.patch')
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0382-staging-vc04_services-remove-odd-vchiq_debugfs_top-w.patch104
1 files changed, 104 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0382-staging-vc04_services-remove-odd-vchiq_debugfs_top-w.patch b/target/linux/brcm2708/patches-4.14/950-0382-staging-vc04_services-remove-odd-vchiq_debugfs_top-w.patch
new file mode 100644
index 0000000000..f9b7c3badd
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.14/950-0382-staging-vc04_services-remove-odd-vchiq_debugfs_top-w.patch
@@ -0,0 +1,104 @@
+From a283da4533745e3552b889dce7e31ada9d99c5d2 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 1 Jun 2018 13:10:00 +0200
+Subject: [PATCH 382/454] staging: vc04_services: remove odd
+ vchiq_debugfs_top() wrapper
+
+commit 2739deaece4bc25fba5df0566423f4a11c3f4e84 upstream
+
+vchiq_debugfs_top() is only a wrapper around a pointer to a dentry, so
+just use the dentry directly instead, making it a static variable
+instead of part of a static structure.
+
+This also removes the pointless BUG_ON() when checking that dentry as no
+one should ever care if debugfs is working or not, and the kernel should
+really not panic over something as trivial as that.
+
+Suggested-by: Eric Anholt <eric@anholt.net>
+Cc: Stefan Wahren <stefan.wahren@i2se.com>
+Cc: Kees Cook <keescook@chromium.org>
+Cc: Dan Carpenter <dan.carpenter@oracle.com>
+Cc: Arnd Bergmann <arnd@arndb.de>
+Cc: Keerthi Reddy <keerthigd4990@gmail.com>
+Cc: linux-rpi-kernel@lists.infradead.org
+Cc: linux-arm-kernel@lists.infradead.org
+Reviewed-by: Eric Anholt <eric@anholt.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ .../interface/vchiq_arm/vchiq_debugfs.c | 24 +++++++------------
+ 1 file changed, 8 insertions(+), 16 deletions(-)
+
+--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
+@@ -55,9 +55,6 @@
+
+ /* Top-level debug info */
+ struct vchiq_debugfs_info {
+- /* Global 'vchiq' debugfs entry used by all instances */
+- struct dentry *vchiq_cfg_dir;
+-
+ /* one entry per client process */
+ struct dentry *clients;
+
+@@ -67,6 +64,9 @@ struct vchiq_debugfs_info {
+
+ static struct vchiq_debugfs_info debugfs_info;
+
++/* Global 'vchiq' debugfs entry used by all instances */
++struct dentry *vchiq_dbg_dir;
++
+ /* Log category debugfs entries */
+ struct vchiq_debugfs_log_entry {
+ const char *name;
+@@ -84,7 +84,6 @@ static struct vchiq_debugfs_log_entry vc
+ static int n_log_entries = ARRAY_SIZE(vchiq_debugfs_log_entries);
+
+ static struct dentry *vchiq_clients_top(void);
+-static struct dentry *vchiq_debugfs_top(void);
+
+ static int debugfs_log_show(struct seq_file *f, void *offset)
+ {
+@@ -165,7 +164,7 @@ static void vchiq_debugfs_create_log_ent
+ struct dentry *dir;
+ size_t i;
+
+- dir = debugfs_create_dir("log", vchiq_debugfs_top());
++ dir = debugfs_create_dir("log", vchiq_dbg_dir);
+ debugfs_info.log_categories = dir;
+
+ for (i = 0; i < n_log_entries; i++) {
+@@ -288,17 +287,16 @@ void vchiq_debugfs_remove_instance(VCHIQ
+
+ void vchiq_debugfs_init(void)
+ {
+- debugfs_info.vchiq_cfg_dir = debugfs_create_dir("vchiq", NULL);
+- debugfs_info.clients = debugfs_create_dir("clients",
+- vchiq_debugfs_top());
++ vchiq_dbg_dir = debugfs_create_dir("vchiq", NULL);
++ debugfs_info.clients = debugfs_create_dir("clients", vchiq_dbg_dir);
+
+- vchiq_debugfs_create_log_entries(vchiq_debugfs_top());
++ vchiq_debugfs_create_log_entries(vchiq_dbg_dir);
+ }
+
+ /* remove all the debugfs entries */
+ void vchiq_debugfs_deinit(void)
+ {
+- debugfs_remove_recursive(vchiq_debugfs_top());
++ debugfs_remove_recursive(vchiq_dbg_dir);
+ }
+
+ static struct dentry *vchiq_clients_top(void)
+@@ -306,12 +304,6 @@ static struct dentry *vchiq_clients_top(
+ return debugfs_info.clients;
+ }
+
+-static struct dentry *vchiq_debugfs_top(void)
+-{
+- BUG_ON(debugfs_info.vchiq_cfg_dir == NULL);
+- return debugfs_info.vchiq_cfg_dir;
+-}
+-
+ #else /* CONFIG_DEBUG_FS */
+
+ void vchiq_debugfs_init(void)