mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
f5919b65d4
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>
62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
From 068cfca9e8c54902c45b8c35b49191c766d346c9 Mon Sep 17 00:00:00 2001
|
|
From: Sugizaki Yukimasa <i.can.speak.c.and.basic@gmail.com>
|
|
Date: Wed, 10 Jan 2018 04:32:20 +0900
|
|
Subject: [PATCH 155/454] vcsm: Add no-op cache operation constant
|
|
|
|
Signed-off-by: Sugizaki Yukimasa <i.can.speak.c.and.basic@gmail.com>
|
|
---
|
|
drivers/char/broadcom/vc_sm/vmcs_sm.c | 10 ++++++++++
|
|
include/linux/broadcom/vmcs_sm_ioctl.h | 1 +
|
|
2 files changed, 11 insertions(+)
|
|
|
|
--- a/drivers/char/broadcom/vc_sm/vmcs_sm.c
|
|
+++ b/drivers/char/broadcom/vc_sm/vmcs_sm.c
|
|
@@ -1269,6 +1269,8 @@ static int clean_invalid_mem_2d(const vo
|
|
}
|
|
|
|
switch (cache_op) {
|
|
+ case VCSM_CACHE_OP_NOP:
|
|
+ return 0;
|
|
case VCSM_CACHE_OP_INV:
|
|
op_fn = dmac_inv_range;
|
|
break;
|
|
@@ -1312,6 +1314,8 @@ static int clean_invalid_resource(const
|
|
return 0;
|
|
|
|
switch (cache_op) {
|
|
+ case VCSM_CACHE_OP_NOP:
|
|
+ return 0;
|
|
case VCSM_CACHE_OP_INV:
|
|
stat_attempt = INVALID;
|
|
stat_failure = INVALID_FAIL;
|
|
@@ -2936,6 +2940,9 @@ static long vc_sm_ioctl(struct file *fil
|
|
goto out;
|
|
}
|
|
for (i = 0; i < sizeof(ioparam.s) / sizeof(*ioparam.s); i++) {
|
|
+ if (ioparam.s[i].cmd == VCSM_CACHE_OP_NOP)
|
|
+ break;
|
|
+
|
|
/* Locate resource from GUID. */
|
|
resource =
|
|
vmcs_sm_acquire_resource(file_data, ioparam.s[i].handle);
|
|
@@ -2989,6 +2996,9 @@ static long vc_sm_ioctl(struct file *fil
|
|
ret = clean_invalid_mem_2d((void __user*) op->start_address,
|
|
op->block_count, op->block_size,
|
|
op->inter_block_stride, op->invalidate_mode);
|
|
+ if (op->invalidate_mode == VCSM_CACHE_OP_NOP)
|
|
+ continue;
|
|
+
|
|
if (ret)
|
|
break;
|
|
}
|
|
--- a/include/linux/broadcom/vmcs_sm_ioctl.h
|
|
+++ b/include/linux/broadcom/vmcs_sm_ioctl.h
|
|
@@ -172,6 +172,7 @@ struct vmcs_sm_ioctl_cache {
|
|
* Cache functions to be set to struct vmcs_sm_ioctl_clean_invalid cmd and
|
|
* vmcs_sm_ioctl_clean_invalid2 invalidate_mode.
|
|
*/
|
|
+#define VCSM_CACHE_OP_NOP 0x00
|
|
#define VCSM_CACHE_OP_INV 0x01
|
|
#define VCSM_CACHE_OP_CLEAN 0x02
|
|
#define VCSM_CACHE_OP_FLUSH 0x03
|