From: Sasha Levin Date: Sat, 9 Feb 2019 17:52:47 +0000 (-0500) Subject: autosel patches for 4.14 X-Git-Tag: v4.9.156~49 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bccb67303540a27349d6e597a3cfe1866f2ce182;p=thirdparty%2Fkernel%2Fstable-queue.git autosel patches for 4.14 Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/acpi-apei-clear-ghes-block_status-before-panic.patch b/queue-4.14/acpi-apei-clear-ghes-block_status-before-panic.patch new file mode 100644 index 00000000000..8b12ca0ca31 --- /dev/null +++ b/queue-4.14/acpi-apei-clear-ghes-block_status-before-panic.patch @@ -0,0 +1,42 @@ +From 02c76e319dd2001bedb3ea135c0d4875c05cae5a Mon Sep 17 00:00:00 2001 +From: Lenny Szubowicz +Date: Wed, 19 Dec 2018 11:50:52 -0500 +Subject: ACPI/APEI: Clear GHES block_status before panic() + +[ Upstream commit 98cff8b23ed1c763a029ee81ea300df0d153d07d ] + +In __ghes_panic() clear the block status in the APEI generic +error status block for that generic hardware error source before +calling panic() to prevent a second panic() in the crash kernel +for exactly the same fatal error. + +Otherwise ghes_probe(), running in the crash kernel, would see +an unhandled error in the APEI generic error status block and +panic again, thereby precluding any crash dump. + +Signed-off-by: Lenny Szubowicz +Signed-off-by: David Arcari +Tested-by: Tyler Baicar +Acked-by: Borislav Petkov +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/apei/ghes.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c +index f14695e744d0..5889f6407fea 100644 +--- a/drivers/acpi/apei/ghes.c ++++ b/drivers/acpi/apei/ghes.c +@@ -675,6 +675,8 @@ static void __ghes_panic(struct ghes *ghes) + { + __ghes_print_estatus(KERN_EMERG, ghes->generic, ghes->estatus); + ++ ghes_clear_estatus(ghes); ++ + /* reboot to log the error! */ + if (!panic_timeout) + panic_timeout = ghes_panic_timeout; +-- +2.19.1 + diff --git a/queue-4.14/acpi-spcr-consider-baud-rate-0-as-preconfigured-stat.patch b/queue-4.14/acpi-spcr-consider-baud-rate-0-as-preconfigured-stat.patch new file mode 100644 index 00000000000..8b0492fc309 --- /dev/null +++ b/queue-4.14/acpi-spcr-consider-baud-rate-0-as-preconfigured-stat.patch @@ -0,0 +1,52 @@ +From 56cc31513311b73874e05d23e2429bf31e1441c2 Mon Sep 17 00:00:00 2001 +From: Andy Shevchenko +Date: Wed, 21 Nov 2018 15:43:37 +0200 +Subject: ACPI: SPCR: Consider baud rate 0 as preconfigured state + +[ Upstream commit b413b1abeb21b4a152c0bf8d1379efa30759b6e3 ] + +Since SPCR 1.04 [1] the baud rate of 0 means a preconfigured state of UART. +Assume firmware or bootloader configures console correctly. + +[1]: https://docs.microsoft.com/en-us/windows-hardware/drivers/serports/serial-port-console-redirection-table + +Signed-off-by: Andy Shevchenko +Reviewed-by: Prarit Bhargava +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/spcr.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/drivers/acpi/spcr.c b/drivers/acpi/spcr.c +index 324b35bfe781..f567fa5f0148 100644 +--- a/drivers/acpi/spcr.c ++++ b/drivers/acpi/spcr.c +@@ -148,6 +148,13 @@ int __init parse_spcr(bool earlycon) + } + + switch (table->baud_rate) { ++ case 0: ++ /* ++ * SPCR 1.04 defines 0 as a preconfigured state of UART. ++ * Assume firmware or bootloader configures console correctly. ++ */ ++ baud_rate = 0; ++ break; + case 3: + baud_rate = 9600; + break; +@@ -196,6 +203,10 @@ int __init parse_spcr(bool earlycon) + * UART so don't attempt to change to the baud rate state + * in the table because driver cannot calculate the dividers + */ ++ baud_rate = 0; ++ } ++ ++ if (!baud_rate) { + snprintf(opts, sizeof(opts), "%s,%s,0x%llx", uart, iotype, + table->serial_port.address); + } else { +-- +2.19.1 + diff --git a/queue-4.14/arm-8808-1-kexec-offline-panic_smp_self_stop-cpu.patch b/queue-4.14/arm-8808-1-kexec-offline-panic_smp_self_stop-cpu.patch new file mode 100644 index 00000000000..d309cf1ca57 --- /dev/null +++ b/queue-4.14/arm-8808-1-kexec-offline-panic_smp_self_stop-cpu.patch @@ -0,0 +1,63 @@ +From f45cad1ea4a614d5971696892b1bfd35bee0a8e2 Mon Sep 17 00:00:00 2001 +From: Yufen Wang +Date: Fri, 2 Nov 2018 11:51:31 +0100 +Subject: ARM: 8808/1: kexec:offline panic_smp_self_stop CPU + +[ Upstream commit 82c08c3e7f171aa7f579b231d0abbc1d62e91974 ] + +In case panic() and panic() called at the same time on different CPUS. +For example: +CPU 0: + panic() + __crash_kexec + machine_crash_shutdown + crash_smp_send_stop + machine_kexec + BUG_ON(num_online_cpus() > 1); + +CPU 1: + panic() + local_irq_disable + panic_smp_self_stop + +If CPU 1 calls panic_smp_self_stop() before crash_smp_send_stop(), kdump +fails. CPU1 can't receive the ipi irq, CPU1 will be always online. +To fix this problem, this patch split out the panic_smp_self_stop() +and add set_cpu_online(smp_processor_id(), false). + +Signed-off-by: Yufen Wang +Signed-off-by: Russell King +Signed-off-by: Sasha Levin +--- + arch/arm/kernel/smp.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c +index e61af0600133..5e31c62127a0 100644 +--- a/arch/arm/kernel/smp.c ++++ b/arch/arm/kernel/smp.c +@@ -691,6 +691,21 @@ void smp_send_stop(void) + pr_warn("SMP: failed to stop secondary CPUs\n"); + } + ++/* In case panic() and panic() called at the same time on CPU1 and CPU2, ++ * and CPU 1 calls panic_smp_self_stop() before crash_smp_send_stop() ++ * CPU1 can't receive the ipi irqs from CPU2, CPU1 will be always online, ++ * kdump fails. So split out the panic_smp_self_stop() and add ++ * set_cpu_online(smp_processor_id(), false). ++ */ ++void panic_smp_self_stop(void) ++{ ++ pr_debug("CPU %u will stop doing anything useful since another CPU has paniced\n", ++ smp_processor_id()); ++ set_cpu_online(smp_processor_id(), false); ++ while (1) ++ cpu_relax(); ++} ++ + /* + * not supported here + */ +-- +2.19.1 + diff --git a/queue-4.14/arm-dts-fix-omap4430-sdp-ethernet-startup.patch b/queue-4.14/arm-dts-fix-omap4430-sdp-ethernet-startup.patch new file mode 100644 index 00000000000..0e26f895e22 --- /dev/null +++ b/queue-4.14/arm-dts-fix-omap4430-sdp-ethernet-startup.patch @@ -0,0 +1,65 @@ +From 4df02f20522b3018893faaf032e7b26a05aa83db Mon Sep 17 00:00:00 2001 +From: Russell King - ARM Linux +Date: Fri, 7 Dec 2018 09:17:07 -0800 +Subject: ARM: dts: Fix OMAP4430 SDP Ethernet startup + +[ Upstream commit 84fb6c7feb1494ebb7d1ec8b95cfb7ada0264465 ] + +It was noticed that unbinding and rebinding the KSZ8851 ethernet +resulted in the driver reporting "failed to read device ID" at probe. +Probing the reset line with a 'scope while repeatedly attempting to +bind the driver in a shell loop revealed that the KSZ8851 RSTN pin is +constantly held at zero, meaning the device is held in reset, and +does not respond on the SPI bus. + +Experimentation with the startup delay on the regulator set to 50ms +shows that the reset is positively released after 20ms. + +Schematics for this board are not available, and the traces are buried +in the inner layers of the board which makes tracing where the RSTN pin +extremely difficult. We can only guess that the RSTN pin is wired to a +reset generator chip driven off the ethernet supply, which fits the +observed behaviour. + +Include this delay in the regulator startup delay - effectively +treating the reset as a "supply stable" indicator. + +This can not be modelled as a delay in the KSZ8851 driver since the +reset generation is board specific - if the RSTN pin had been wired to +a GPIO, reset could be released earlier via the already provided support +in the KSZ8851 driver. + +This also got confirmed by Peter Ujfalusi based +on Blaze schematics that should be very close to SDP4430: + +TPS22902YFPR is used as the regulator switch (gpio48 controlled): +Convert arm boot_lock to raw The VOUT is routed to TPS3808G01DBV. +(SCH Note: Threshold set at 90%. Vsense: 0.405V). + +According to the TPS3808 data sheet the RESET delay time when Ct is +open (this is the case in the schema): MIN/TYP/MAX: 12/20/28 ms. + +Signed-off-by: Russell King +Reviewed-by: Peter Ujfalusi +[tony@atomide.com: updated with notes from schematics from Peter] +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/omap4-sdp.dts | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts +index 280d92d42bf1..bfad6aadfe88 100644 +--- a/arch/arm/boot/dts/omap4-sdp.dts ++++ b/arch/arm/boot/dts/omap4-sdp.dts +@@ -33,6 +33,7 @@ + gpio = <&gpio2 16 GPIO_ACTIVE_HIGH>; /* gpio line 48 */ + enable-active-high; + regulator-boot-on; ++ startup-delay-us = <25000>; + }; + + vbat: fixedregulator-vbat { +-- +2.19.1 + diff --git a/queue-4.14/arm-dts-fix-up-the-d-link-dir-685-mtd-partition-info.patch b/queue-4.14/arm-dts-fix-up-the-d-link-dir-685-mtd-partition-info.patch new file mode 100644 index 00000000000..36e3a36e870 --- /dev/null +++ b/queue-4.14/arm-dts-fix-up-the-d-link-dir-685-mtd-partition-info.patch @@ -0,0 +1,74 @@ +From 4a7dfe0065540923118680eac8c3c6e9714c66e8 Mon Sep 17 00:00:00 2001 +From: Linus Walleij +Date: Thu, 17 May 2018 17:00:10 +0200 +Subject: ARM: dts: Fix up the D-Link DIR-685 MTD partition info + +[ Upstream commit 738a05e673435afb986b53da43befd83ad87ec3b ] + +The vendor firmware was analyzed to get the right idea about +this flash layout. /proc/mtd contains: + +dev: size erasesize name +mtd0: 01e7ff40 00020000 "rootfs" +mtd1: 01f40000 00020000 "upgrade" +mtd2: 00040000 00020000 "rgdb" +mtd3: 00020000 00020000 "nvram" +mtd4: 00040000 00020000 "RedBoot" +mtd5: 00020000 00020000 "LangPack" +mtd6: 02000000 00020000 "flash" + +Here "flash" is obviously the whole device and we know "rootfs" +is a bogus hack to point to a squashfs rootfs inside of the main +"upgrade partition". We know "RedBoot" is the first 0x40000 of +the flash and the "upgrade" partition follows from 0x40000 to +0x1f8000. So we have mtd0, 1, 4 and 6 covered. + +Remains: +mtd2: 00040000 00020000 "rgdb" +mtd3: 00020000 00020000 "nvram" +mtd5: 00020000 00020000 "LangPack" + +Inspecting the flash at 0x1f8000 and 0x1fa000 reveals each of +these starting with "RGCFG1" so we assume 0x1f8000-1fbfff is +"rgdb" of 0x40000. + +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/gemini-dlink-dir-685.dts | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts +index e75e2d44371c..d6f752ab07bb 100644 +--- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts ++++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts +@@ -128,20 +128,16 @@ + read-only; + }; + /* +- * Between the boot loader and the rootfs is the kernel +- * in a custom Storlink format flashed from the boot +- * menu. The rootfs is in squashfs format. ++ * This firmware image contains the kernel catenated ++ * with the squashfs root filesystem. For some reason ++ * this is called "upgrade" on the vendor system. + */ +- partition@1800c0 { +- label = "rootfs"; +- reg = <0x001800c0 0x01dbff40>; +- read-only; +- }; +- partition@1f40000 { ++ partition@40000 { + label = "upgrade"; +- reg = <0x01f40000 0x00040000>; ++ reg = <0x00040000 0x01f40000>; + read-only; + }; ++ /* RGDB, Residental Gateway Database? */ + partition@1f80000 { + label = "rgdb"; + reg = <0x01f80000 0x00040000>; +-- +2.19.1 + diff --git a/queue-4.14/arm-dts-mmp2-fix-twsi2.patch b/queue-4.14/arm-dts-mmp2-fix-twsi2.patch new file mode 100644 index 00000000000..13c4c63c1ec --- /dev/null +++ b/queue-4.14/arm-dts-mmp2-fix-twsi2.patch @@ -0,0 +1,56 @@ +From 84360e96153d75fd35ce04bbdf9879d83cb66673 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Wed, 28 Nov 2018 18:53:10 +0100 +Subject: ARM: dts: mmp2: fix TWSI2 + +[ Upstream commit 1147e05ac9fc2ef86a3691e7ca5c2db7602d81dd ] + +Marvell keeps their MMP2 datasheet secret, but there are good clues +that TWSI2 is not on 0xd4025000 on that platform, not does it use +IRQ 58. In fact, the IRQ 58 on MMP2 seems to be a signal processor: + + arch/arm/mach-mmp/irqs.h:#define IRQ_MMP2_MSP 58 + +I'm taking a somewhat educated guess that is probably a copy & paste +error from PXA168 or PXA910 and that the real controller in fact hides +at address 0xd4031000 and uses an interrupt line multiplexed via IRQ 17. + +I'm also copying some properties from TWSI1 that were missing or +incorrect. + +Tested on a OLPC XO 1.75 machine, where the RTC is on TWSI2. + +Signed-off-by: Lubomir Rintel +Tested-by: Pavel Machek +Signed-off-by: Olof Johansson +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/mmp2.dtsi | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi +index 766bbb8495b6..47e5b63339d1 100644 +--- a/arch/arm/boot/dts/mmp2.dtsi ++++ b/arch/arm/boot/dts/mmp2.dtsi +@@ -220,12 +220,15 @@ + status = "disabled"; + }; + +- twsi2: i2c@d4025000 { ++ twsi2: i2c@d4031000 { + compatible = "mrvl,mmp-twsi"; +- reg = <0xd4025000 0x1000>; +- interrupts = <58>; ++ reg = <0xd4031000 0x1000>; ++ interrupt-parent = <&intcmux17>; ++ interrupts = <0>; + clocks = <&soc_clocks MMP2_CLK_TWSI1>; + resets = <&soc_clocks MMP2_CLK_TWSI1>; ++ #address-cells = <1>; ++ #size-cells = <0>; + status = "disabled"; + }; + +-- +2.19.1 + diff --git a/queue-4.14/arm-mmp-fix-timer_init-calls.patch b/queue-4.14/arm-mmp-fix-timer_init-calls.patch new file mode 100644 index 00000000000..43de4af8c13 --- /dev/null +++ b/queue-4.14/arm-mmp-fix-timer_init-calls.patch @@ -0,0 +1,112 @@ +From 37505999896141fee397b0ba93c3dc98b8c4a9e5 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Mon, 10 Dec 2018 21:43:01 +0100 +Subject: ARM: mmp: fix timer_init calls + +[ Upstream commit 12d3a30db4a3b3df5fbadf5974b9cf50544a9950 ] + +The change to passing the timer frequency as a function argument +was a good idea, but caused a build failure for one user that +was missed in the update: + +arch/arm/mach-mmp/time.c: In function 'mmp_dt_init_timer': +arch/arm/mach-mmp/time.c:242:2: error: implicit declaration of function 'timer_init'; did you mean 'hrtimer_init'? [-Werror=implicit-function-declaration] + +Change that as well to fix the build error, and rename the +function to put it into a proper namespace and make it clearer +what is actually going on. + +I saw that the high 6500000 HZ frequency was previously only +set with CONFIG_MMP2, but is now also used with MMP (pxa910), +so I'm changing that back here. Please make sure that the +frequencies are all correct now. + +Fixes: f36797ee4380 ("ARM: mmp/mmp2: dt: enable the clock") +Signed-off-by: Arnd Bergmann +Signed-off-by: Olof Johansson +Signed-off-by: Sasha Levin +--- + arch/arm/mach-mmp/common.h | 2 +- + arch/arm/mach-mmp/mmp2.c | 2 +- + arch/arm/mach-mmp/pxa168.c | 2 +- + arch/arm/mach-mmp/pxa910.c | 2 +- + arch/arm/mach-mmp/time.c | 4 ++-- + 5 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/arch/arm/mach-mmp/common.h b/arch/arm/mach-mmp/common.h +index 5ac2851ef5d3..483b8b6d3005 100644 +--- a/arch/arm/mach-mmp/common.h ++++ b/arch/arm/mach-mmp/common.h +@@ -2,7 +2,7 @@ + #include + #define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) + +-extern void timer_init(int irq, unsigned long rate); ++extern void mmp_timer_init(int irq, unsigned long rate); + + extern void __init mmp_map_io(void); + extern void mmp_restart(enum reboot_mode, const char *); +diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c +index fb3e7e32c882..726c1a642dea 100644 +--- a/arch/arm/mach-mmp/mmp2.c ++++ b/arch/arm/mach-mmp/mmp2.c +@@ -134,7 +134,7 @@ void __init mmp2_timer_init(void) + clk_rst = APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(1); + __raw_writel(clk_rst, APBC_TIMERS); + +- timer_init(IRQ_MMP2_TIMER1, 6500000); ++ mmp_timer_init(IRQ_MMP2_TIMER1, 6500000); + } + + /* on-chip devices */ +diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c +index 77a358165a56..cdcf65ace3f9 100644 +--- a/arch/arm/mach-mmp/pxa168.c ++++ b/arch/arm/mach-mmp/pxa168.c +@@ -79,7 +79,7 @@ void __init pxa168_timer_init(void) + /* 3.25MHz, bus/functional clock enabled, release reset */ + __raw_writel(TIMER_CLK_RST, APBC_TIMERS); + +- timer_init(IRQ_PXA168_TIMER1, 6500000); ++ mmp_timer_init(IRQ_PXA168_TIMER1, 3250000); + } + + void pxa168_clear_keypad_wakeup(void) +diff --git a/arch/arm/mach-mmp/pxa910.c b/arch/arm/mach-mmp/pxa910.c +index 1ccbba9ac495..d30a7d12bc98 100644 +--- a/arch/arm/mach-mmp/pxa910.c ++++ b/arch/arm/mach-mmp/pxa910.c +@@ -116,7 +116,7 @@ void __init pxa910_timer_init(void) + __raw_writel(APBC_APBCLK | APBC_RST, APBC_TIMERS); + __raw_writel(TIMER_CLK_RST, APBC_TIMERS); + +- timer_init(IRQ_PXA910_AP1_TIMER1); ++ mmp_timer_init(IRQ_PXA910_AP1_TIMER1, 3250000); + } + + /* on-chip devices */ +diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c +index eab0fd8a7343..f9c295154b94 100644 +--- a/arch/arm/mach-mmp/time.c ++++ b/arch/arm/mach-mmp/time.c +@@ -184,7 +184,7 @@ static struct irqaction timer_irq = { + .dev_id = &ckevt, + }; + +-void __init timer_init(int irq, unsigned long rate) ++void __init mmp_timer_init(int irq, unsigned long rate) + { + timer_config(); + +@@ -239,7 +239,7 @@ void __init mmp_dt_init_timer(void) + ret = -ENOMEM; + goto out; + } +- timer_init(irq, rate); ++ mmp_timer_init(irq, rate); + return; + out: + pr_err("Failed to get timer from device tree with error:%d\n", ret); +-- +2.19.1 + diff --git a/queue-4.14/arm-mmp-mmp2-dt-enable-the-clock.patch b/queue-4.14/arm-mmp-mmp2-dt-enable-the-clock.patch new file mode 100644 index 00000000000..b4182be0e29 --- /dev/null +++ b/queue-4.14/arm-mmp-mmp2-dt-enable-the-clock.patch @@ -0,0 +1,153 @@ +From 81bd1f5159f8bac885757894d9b85070f75c9b9a Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Wed, 28 Nov 2018 18:53:20 +0100 +Subject: ARM: mmp/mmp2: dt: enable the clock + +[ Upstream commit f36797ee43802b367e59f0f9a9805304a4ff0c98 ] + +The device-tree booted MMP2 needs to enable the timer clock, otherwise +it would stop ticking when the boot finishes. + +It can also use the clock rate from the clk, the non-DT boards need to +keep using the hardcoded rates. + +Signed-off-by: Lubomir Rintel +Acked-by: Pavel Machek +Signed-off-by: Olof Johansson +Signed-off-by: Sasha Levin +--- + arch/arm/mach-mmp/common.h | 2 +- + arch/arm/mach-mmp/mmp2.c | 2 +- + arch/arm/mach-mmp/pxa168.c | 2 +- + arch/arm/mach-mmp/time.c | 32 ++++++++++++++++++++------------ + 4 files changed, 23 insertions(+), 15 deletions(-) + +diff --git a/arch/arm/mach-mmp/common.h b/arch/arm/mach-mmp/common.h +index 7e284d9c429f..5ac2851ef5d3 100644 +--- a/arch/arm/mach-mmp/common.h ++++ b/arch/arm/mach-mmp/common.h +@@ -2,7 +2,7 @@ + #include + #define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) + +-extern void timer_init(int irq); ++extern void timer_init(int irq, unsigned long rate); + + extern void __init mmp_map_io(void); + extern void mmp_restart(enum reboot_mode, const char *); +diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c +index afba5460cdaf..fb3e7e32c882 100644 +--- a/arch/arm/mach-mmp/mmp2.c ++++ b/arch/arm/mach-mmp/mmp2.c +@@ -134,7 +134,7 @@ void __init mmp2_timer_init(void) + clk_rst = APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(1); + __raw_writel(clk_rst, APBC_TIMERS); + +- timer_init(IRQ_MMP2_TIMER1); ++ timer_init(IRQ_MMP2_TIMER1, 6500000); + } + + /* on-chip devices */ +diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c +index 0f5f16fb8c66..77a358165a56 100644 +--- a/arch/arm/mach-mmp/pxa168.c ++++ b/arch/arm/mach-mmp/pxa168.c +@@ -79,7 +79,7 @@ void __init pxa168_timer_init(void) + /* 3.25MHz, bus/functional clock enabled, release reset */ + __raw_writel(TIMER_CLK_RST, APBC_TIMERS); + +- timer_init(IRQ_PXA168_TIMER1); ++ timer_init(IRQ_PXA168_TIMER1, 6500000); + } + + void pxa168_clear_keypad_wakeup(void) +diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c +index 96ad1db0b04b..eab0fd8a7343 100644 +--- a/arch/arm/mach-mmp/time.c ++++ b/arch/arm/mach-mmp/time.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -38,12 +39,6 @@ + #include "cputype.h" + #include "clock.h" + +-#ifdef CONFIG_CPU_MMP2 +-#define MMP_CLOCK_FREQ 6500000 +-#else +-#define MMP_CLOCK_FREQ 3250000 +-#endif +- + #define TIMERS_VIRT_BASE TIMERS1_VIRT_BASE + + #define MAX_DELTA (0xfffffffe) +@@ -189,19 +184,18 @@ static struct irqaction timer_irq = { + .dev_id = &ckevt, + }; + +-void __init timer_init(int irq) ++void __init timer_init(int irq, unsigned long rate) + { + timer_config(); + +- sched_clock_register(mmp_read_sched_clock, 32, MMP_CLOCK_FREQ); ++ sched_clock_register(mmp_read_sched_clock, 32, rate); + + ckevt.cpumask = cpumask_of(0); + + setup_irq(irq, &timer_irq); + +- clocksource_register_hz(&cksrc, MMP_CLOCK_FREQ); +- clockevents_config_and_register(&ckevt, MMP_CLOCK_FREQ, +- MIN_DELTA, MAX_DELTA); ++ clocksource_register_hz(&cksrc, rate); ++ clockevents_config_and_register(&ckevt, rate, MIN_DELTA, MAX_DELTA); + } + + #ifdef CONFIG_OF +@@ -213,7 +207,9 @@ static const struct of_device_id mmp_timer_dt_ids[] = { + void __init mmp_dt_init_timer(void) + { + struct device_node *np; ++ struct clk *clk; + int irq, ret; ++ unsigned long rate; + + np = of_find_matching_node(NULL, mmp_timer_dt_ids); + if (!np) { +@@ -221,6 +217,18 @@ void __init mmp_dt_init_timer(void) + goto out; + } + ++ clk = of_clk_get(np, 0); ++ if (!IS_ERR(clk)) { ++ ret = clk_prepare_enable(clk); ++ if (ret) ++ goto out; ++ rate = clk_get_rate(clk) / 2; ++ } else if (cpu_is_pj4()) { ++ rate = 6500000; ++ } else { ++ rate = 3250000; ++ } ++ + irq = irq_of_parse_and_map(np, 0); + if (!irq) { + ret = -EINVAL; +@@ -231,7 +239,7 @@ void __init mmp_dt_init_timer(void) + ret = -ENOMEM; + goto out; + } +- timer_init(irq); ++ timer_init(irq, rate); + return; + out: + pr_err("Failed to get timer from device tree with error:%d\n", ret); +-- +2.19.1 + diff --git a/queue-4.14/arm-omap2-hwmod-fix-some-section-annotations.patch b/queue-4.14/arm-omap2-hwmod-fix-some-section-annotations.patch new file mode 100644 index 00000000000..780701b8d7b --- /dev/null +++ b/queue-4.14/arm-omap2-hwmod-fix-some-section-annotations.patch @@ -0,0 +1,76 @@ +From 2bb61648567d4f30ee9808c5d8df80afe7c165a5 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Wed, 17 Oct 2018 17:52:07 -0700 +Subject: ARM: OMAP2+: hwmod: Fix some section annotations + +[ Upstream commit c10b26abeb53cabc1e6271a167d3f3d396ce0218 ] + +When building the kernel with Clang, the following section mismatch +warnings appears: + +WARNING: vmlinux.o(.text+0x2d398): Section mismatch in reference from +the function _setup() to the function .init.text:_setup_iclk_autoidle() +The function _setup() references +the function __init _setup_iclk_autoidle(). +This is often because _setup lacks a __init +annotation or the annotation of _setup_iclk_autoidle is wrong. + +WARNING: vmlinux.o(.text+0x2d3a0): Section mismatch in reference from +the function _setup() to the function .init.text:_setup_reset() +The function _setup() references +the function __init _setup_reset(). +This is often because _setup lacks a __init +annotation or the annotation of _setup_reset is wrong. + +WARNING: vmlinux.o(.text+0x2d408): Section mismatch in reference from +the function _setup() to the function .init.text:_setup_postsetup() +The function _setup() references +the function __init _setup_postsetup(). +This is often because _setup lacks a __init +annotation or the annotation of _setup_postsetup is wrong. + +_setup is used in omap_hwmod_allocate_module, which isn't marked __init +and looks like it shouldn't be, meaning to fix these warnings, those +functions must be moved out of the init section, which this patch does. + +Signed-off-by: Nathan Chancellor +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +--- + arch/arm/mach-omap2/omap_hwmod.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c +index 2dbd63239c54..45c8f2ef4e23 100644 +--- a/arch/arm/mach-omap2/omap_hwmod.c ++++ b/arch/arm/mach-omap2/omap_hwmod.c +@@ -2497,7 +2497,7 @@ static int __init _init(struct omap_hwmod *oh, void *data) + * a stub; implementing this properly requires iclk autoidle usecounting in + * the clock code. No return value. + */ +-static void __init _setup_iclk_autoidle(struct omap_hwmod *oh) ++static void _setup_iclk_autoidle(struct omap_hwmod *oh) + { + struct omap_hwmod_ocp_if *os; + +@@ -2528,7 +2528,7 @@ static void __init _setup_iclk_autoidle(struct omap_hwmod *oh) + * reset. Returns 0 upon success or a negative error code upon + * failure. + */ +-static int __init _setup_reset(struct omap_hwmod *oh) ++static int _setup_reset(struct omap_hwmod *oh) + { + int r; + +@@ -2589,7 +2589,7 @@ static int __init _setup_reset(struct omap_hwmod *oh) + * + * No return value. + */ +-static void __init _setup_postsetup(struct omap_hwmod *oh) ++static void _setup_postsetup(struct omap_hwmod *oh) + { + u8 postsetup_state; + +-- +2.19.1 + diff --git a/queue-4.14/arm-pxa-avoid-section-mismatch-warning.patch b/queue-4.14/arm-pxa-avoid-section-mismatch-warning.patch new file mode 100644 index 00000000000..7564ea6d7d5 --- /dev/null +++ b/queue-4.14/arm-pxa-avoid-section-mismatch-warning.patch @@ -0,0 +1,76 @@ +From 22412ea81e59d988cba9d2a59897dbf571f49d57 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Mon, 10 Dec 2018 22:58:39 +0100 +Subject: ARM: pxa: avoid section mismatch warning + +[ Upstream commit 88af3209aa0881aa5ffd99664b6080a4be5f24e5 ] + +WARNING: vmlinux.o(.text+0x19f90): Section mismatch in reference from the function littleton_init_lcd() to the function .init.text:pxa_set_fb_info() +The function littleton_init_lcd() references +the function __init pxa_set_fb_info(). +This is often because littleton_init_lcd lacks a __init +annotation or the annotation of pxa_set_fb_info is wrong. + +WARNING: vmlinux.o(.text+0xf824): Section mismatch in reference from the function zeus_register_ohci() to the function .init.text:pxa_set_ohci_info() +The function zeus_register_ohci() references +the function __init pxa_set_ohci_info(). +This is often because zeus_register_ohci lacks a __init +annotation or the annotation of pxa_set_ohci_info is wrong. + +WARNING: vmlinux.o(.text+0xf95c): Section mismatch in reference from the function cm_x300_init_u2d() to the function .init.text:pxa3xx_set_u2d_info() +The function cm_x300_init_u2d() references +the function __init pxa3xx_set_u2d_info(). +This is often because cm_x300_init_u2d lacks a __init +annotation or the annotation of pxa3xx_set_u2d_info is wrong. + +Signed-off-by: Arnd Bergmann +Signed-off-by: Olof Johansson +Signed-off-by: Sasha Levin +--- + arch/arm/mach-pxa/cm-x300.c | 2 +- + arch/arm/mach-pxa/littleton.c | 2 +- + arch/arm/mach-pxa/zeus.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c +index 868448d2cd82..38ab30869821 100644 +--- a/arch/arm/mach-pxa/cm-x300.c ++++ b/arch/arm/mach-pxa/cm-x300.c +@@ -547,7 +547,7 @@ static struct pxa3xx_u2d_platform_data cm_x300_u2d_platform_data = { + .exit = cm_x300_u2d_exit, + }; + +-static void cm_x300_init_u2d(void) ++static void __init cm_x300_init_u2d(void) + { + pxa3xx_set_u2d_info(&cm_x300_u2d_platform_data); + } +diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c +index fae38fdc8d8e..5cd6b4bd31e0 100644 +--- a/arch/arm/mach-pxa/littleton.c ++++ b/arch/arm/mach-pxa/littleton.c +@@ -183,7 +183,7 @@ static struct pxafb_mach_info littleton_lcd_info = { + .lcd_conn = LCD_COLOR_TFT_16BPP, + }; + +-static void littleton_init_lcd(void) ++static void __init littleton_init_lcd(void) + { + pxa_set_fb_info(NULL, &littleton_lcd_info); + } +diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c +index ecbcaee5a2d5..c293ea0a7eaf 100644 +--- a/arch/arm/mach-pxa/zeus.c ++++ b/arch/arm/mach-pxa/zeus.c +@@ -558,7 +558,7 @@ static struct pxaohci_platform_data zeus_ohci_platform_data = { + .flags = ENABLE_PORT_ALL | POWER_SENSE_LOW, + }; + +-static void zeus_register_ohci(void) ++static void __init zeus_register_ohci(void) + { + /* Port 2 is shared between host and client interface. */ + UP2OCR = UP2OCR_HXOE | UP2OCR_HXS | UP2OCR_DMPDE | UP2OCR_DPPDE; +-- +2.19.1 + diff --git a/queue-4.14/arm64-ftrace-don-t-adjust-the-lr-value.patch b/queue-4.14/arm64-ftrace-don-t-adjust-the-lr-value.patch new file mode 100644 index 00000000000..50bfd6e91e1 --- /dev/null +++ b/queue-4.14/arm64-ftrace-don-t-adjust-the-lr-value.patch @@ -0,0 +1,53 @@ +From b94e603d35460c953521748a47adf9049c721ad8 Mon Sep 17 00:00:00 2001 +From: Mark Rutland +Date: Thu, 15 Nov 2018 22:42:01 +0000 +Subject: arm64: ftrace: don't adjust the LR value + +[ Upstream commit 6e803e2e6e367db9a0d6ecae1bd24bb5752011bd ] + +The core ftrace code requires that when it is handed the PC of an +instrumented function, this PC is the address of the instrumented +instruction. This is necessary so that the core ftrace code can identify +the specific instrumentation site. Since the instrumented function will +be a BL, the address of the instrumented function is LR - 4 at entry to +the ftrace code. + +This fixup is applied in the mcount_get_pc and mcount_get_pc0 helpers, +which acquire the PC of the instrumented function. + +The mcount_get_lr helper is used to acquire the LR of the instrumented +function, whose value does not require this adjustment, and cannot be +adjusted to anything meaningful. No adjustment of this value is made on +other architectures, including arm. However, arm64 adjusts this value by +4. + +This patch brings arm64 in line with other architectures and removes the +adjustment of the LR value. + +Signed-off-by: Mark Rutland +Cc: AKASHI Takahiro +Cc: Ard Biesheuvel +Cc: Catalin Marinas +Cc: Torsten Duwe +Cc: Will Deacon +Signed-off-by: Will Deacon +Signed-off-by: Sasha Levin +--- + arch/arm64/kernel/entry-ftrace.S | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/arch/arm64/kernel/entry-ftrace.S b/arch/arm64/kernel/entry-ftrace.S +index e1be42e11ff5..5a10e3a3e843 100644 +--- a/arch/arm64/kernel/entry-ftrace.S ++++ b/arch/arm64/kernel/entry-ftrace.S +@@ -79,7 +79,6 @@ + .macro mcount_get_lr reg + ldr \reg, [x29] + ldr \reg, [\reg, #8] +- mcount_adjust_addr \reg, \reg + .endm + + .macro mcount_get_lr_addr reg +-- +2.19.1 + diff --git a/queue-4.14/arm64-io-ensure-calls-to-delay-routines-are-ordered-.patch b/queue-4.14/arm64-io-ensure-calls-to-delay-routines-are-ordered-.patch new file mode 100644 index 00000000000..b226690cc5a --- /dev/null +++ b/queue-4.14/arm64-io-ensure-calls-to-delay-routines-are-ordered-.patch @@ -0,0 +1,99 @@ +From 7ccd6aa1f0e440c518a608e32d4f580ca6eeb3bd Mon Sep 17 00:00:00 2001 +From: Will Deacon +Date: Wed, 7 Nov 2018 23:06:15 +0000 +Subject: arm64: io: Ensure calls to delay routines are ordered against prior + readX() + +[ Upstream commit 6460d32014717686d3b7963595950ba2c6d1bb5e ] + +A relatively standard idiom for ensuring that a pair of MMIO writes to a +device arrive at that device with a specified minimum delay between them +is as follows: + + writel_relaxed(42, dev_base + CTL1); + readl(dev_base + CTL1); + udelay(10); + writel_relaxed(42, dev_base + CTL2); + +the intention being that the read-back from the device will push the +prior write to CTL1, and the udelay will hold up the write to CTL1 until +at least 10us have elapsed. + +Unfortunately, on arm64 where the underlying delay loop is implemented +as a read of the architected counter, the CPU does not guarantee +ordering from the readl() to the delay loop and therefore the delay loop +could in theory be speculated and not provide the desired interval +between the two writes. + +Fix this in a similar manner to PowerPC by introducing a dummy control +dependency on the output of readX() which, combined with the ISB in the +read of the architected counter, guarantees that a subsequent delay loop +can not be executed until the readX() has returned its result. + +Cc: Benjamin Herrenschmidt +Cc: Arnd Bergmann +Signed-off-by: Will Deacon +Signed-off-by: Sasha Levin +--- + arch/arm64/include/asm/io.h | 31 +++++++++++++++++++++++-------- + 1 file changed, 23 insertions(+), 8 deletions(-) + +diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h +index 35b2e50f17fb..b2bc7dbc1fa6 100644 +--- a/arch/arm64/include/asm/io.h ++++ b/arch/arm64/include/asm/io.h +@@ -106,7 +106,22 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) + } + + /* IO barriers */ +-#define __iormb() rmb() ++#define __iormb(v) \ ++({ \ ++ unsigned long tmp; \ ++ \ ++ rmb(); \ ++ \ ++ /* \ ++ * Create a dummy control dependency from the IO read to any \ ++ * later instructions. This ensures that a subsequent call to \ ++ * udelay() will be ordered due to the ISB in get_cycles(). \ ++ */ \ ++ asm volatile("eor %0, %1, %1\n" \ ++ "cbnz %0, ." \ ++ : "=r" (tmp) : "r" (v) : "memory"); \ ++}) ++ + #define __iowmb() wmb() + + #define mmiowb() do { } while (0) +@@ -131,10 +146,10 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) + * following Normal memory access. Writes are ordered relative to any prior + * Normal memory access. + */ +-#define readb(c) ({ u8 __v = readb_relaxed(c); __iormb(); __v; }) +-#define readw(c) ({ u16 __v = readw_relaxed(c); __iormb(); __v; }) +-#define readl(c) ({ u32 __v = readl_relaxed(c); __iormb(); __v; }) +-#define readq(c) ({ u64 __v = readq_relaxed(c); __iormb(); __v; }) ++#define readb(c) ({ u8 __v = readb_relaxed(c); __iormb(__v); __v; }) ++#define readw(c) ({ u16 __v = readw_relaxed(c); __iormb(__v); __v; }) ++#define readl(c) ({ u32 __v = readl_relaxed(c); __iormb(__v); __v; }) ++#define readq(c) ({ u64 __v = readq_relaxed(c); __iormb(__v); __v; }) + + #define writeb(v,c) ({ __iowmb(); writeb_relaxed((v),(c)); }) + #define writew(v,c) ({ __iowmb(); writew_relaxed((v),(c)); }) +@@ -185,9 +200,9 @@ extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size); + /* + * io{read,write}{16,32,64}be() macros + */ +-#define ioread16be(p) ({ __u16 __v = be16_to_cpu((__force __be16)__raw_readw(p)); __iormb(); __v; }) +-#define ioread32be(p) ({ __u32 __v = be32_to_cpu((__force __be32)__raw_readl(p)); __iormb(); __v; }) +-#define ioread64be(p) ({ __u64 __v = be64_to_cpu((__force __be64)__raw_readq(p)); __iormb(); __v; }) ++#define ioread16be(p) ({ __u16 __v = be16_to_cpu((__force __be16)__raw_readw(p)); __iormb(__v); __v; }) ++#define ioread32be(p) ({ __u32 __v = be32_to_cpu((__force __be32)__raw_readl(p)); __iormb(__v); __v; }) ++#define ioread64be(p) ({ __u64 __v = be64_to_cpu((__force __be64)__raw_readq(p)); __iormb(__v); __v; }) + + #define iowrite16be(v,p) ({ __iowmb(); __raw_writew((__force __u16)cpu_to_be16(v), p); }) + #define iowrite32be(v,p) ({ __iowmb(); __raw_writel((__force __u32)cpu_to_be32(v), p); }) +-- +2.19.1 + diff --git a/queue-4.14/arm64-io-ensure-value-passed-to-__iormb-is-held-in-a.patch b/queue-4.14/arm64-io-ensure-value-passed-to-__iormb-is-held-in-a.patch new file mode 100644 index 00000000000..6f448a2709e --- /dev/null +++ b/queue-4.14/arm64-io-ensure-value-passed-to-__iormb-is-held-in-a.patch @@ -0,0 +1,53 @@ +From ae0f8cc26fd6cdc697e20268f98ac5714adf82ca Mon Sep 17 00:00:00 2001 +From: Will Deacon +Date: Thu, 29 Nov 2018 16:31:04 +0000 +Subject: arm64: io: Ensure value passed to __iormb() is held in a 64-bit + register + +[ Upstream commit 1b57ec8c75279b873639eb44a215479236f93481 ] + +As of commit 6460d3201471 ("arm64: io: Ensure calls to delay routines +are ordered against prior readX()"), MMIO reads smaller than 64 bits +fail to compile under clang because we end up mixing 32-bit and 64-bit +register operands for the same data processing instruction: + +./include/asm-generic/io.h:695:9: warning: value size does not match register size specified by the constraint and modifier [-Wasm-operand-widths] + return readb(addr); + ^ +./arch/arm64/include/asm/io.h:147:58: note: expanded from macro 'readb' + ^ +./include/asm-generic/io.h:695:9: note: use constraint modifier "w" +./arch/arm64/include/asm/io.h:147:50: note: expanded from macro 'readb' + ^ +./arch/arm64/include/asm/io.h:118:24: note: expanded from macro '__iormb' + asm volatile("eor %0, %1, %1\n" \ + ^ + +Fix the build by casting the macro argument to 'unsigned long' when used +as an input to the inline asm. + +Reported-by: Nick Desaulniers +Reported-by: Nathan Chancellor +Signed-off-by: Will Deacon +Signed-off-by: Sasha Levin +--- + arch/arm64/include/asm/io.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h +index b2bc7dbc1fa6..49bb9a020a09 100644 +--- a/arch/arm64/include/asm/io.h ++++ b/arch/arm64/include/asm/io.h +@@ -119,7 +119,8 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) + */ \ + asm volatile("eor %0, %1, %1\n" \ + "cbnz %0, ." \ +- : "=r" (tmp) : "r" (v) : "memory"); \ ++ : "=r" (tmp) : "r" ((unsigned long)(v)) \ ++ : "memory"); \ + }) + + #define __iowmb() wmb() +-- +2.19.1 + diff --git a/queue-4.14/arm64-kvm-skip-mmio-insn-after-emulation.patch b/queue-4.14/arm64-kvm-skip-mmio-insn-after-emulation.patch new file mode 100644 index 00000000000..c3faaf12921 --- /dev/null +++ b/queue-4.14/arm64-kvm-skip-mmio-insn-after-emulation.patch @@ -0,0 +1,63 @@ +From 5914466764e6ea444117ebdc1eca84850968bd01 Mon Sep 17 00:00:00 2001 +From: Mark Rutland +Date: Fri, 9 Nov 2018 15:07:10 +0000 +Subject: arm64: KVM: Skip MMIO insn after emulation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[ Upstream commit 0d640732dbebed0f10f18526de21652931f0b2f2 ] + +When we emulate an MMIO instruction, we advance the CPU state within +decode_hsr(), before emulating the instruction effects. + +Having this logic in decode_hsr() is opaque, and advancing the state +before emulation is problematic. It gets in the way of applying +consistent single-step logic, and it prevents us from being able to fail +an MMIO instruction with a synchronous exception. + +Clean this up by only advancing the CPU state *after* the effects of the +instruction are emulated. + +Cc: Peter Maydell +Reviewed-by: Alex Bennée +Reviewed-by: Christoffer Dall +Signed-off-by: Mark Rutland +Signed-off-by: Marc Zyngier +Signed-off-by: Sasha Levin +--- + virt/kvm/arm/mmio.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/virt/kvm/arm/mmio.c b/virt/kvm/arm/mmio.c +index dac7ceb1a677..08443a15e6be 100644 +--- a/virt/kvm/arm/mmio.c ++++ b/virt/kvm/arm/mmio.c +@@ -117,6 +117,12 @@ int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run) + vcpu_set_reg(vcpu, vcpu->arch.mmio_decode.rt, data); + } + ++ /* ++ * The MMIO instruction is emulated and should not be re-executed ++ * in the guest. ++ */ ++ kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu)); ++ + return 0; + } + +@@ -144,11 +150,6 @@ static int decode_hsr(struct kvm_vcpu *vcpu, bool *is_write, int *len) + vcpu->arch.mmio_decode.sign_extend = sign_extend; + vcpu->arch.mmio_decode.rt = rt; + +- /* +- * The MMIO instruction is emulated and should not be re-executed +- * in the guest. +- */ +- kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu)); + return 0; + } + +-- +2.19.1 + diff --git a/queue-4.14/asoc-fsl-fix-snd_soc_eukrea_tlv320-build-error-on-i..patch b/queue-4.14/asoc-fsl-fix-snd_soc_eukrea_tlv320-build-error-on-i..patch new file mode 100644 index 00000000000..dc3c8aab810 --- /dev/null +++ b/queue-4.14/asoc-fsl-fix-snd_soc_eukrea_tlv320-build-error-on-i..patch @@ -0,0 +1,45 @@ +From b72646fbc9010817cdef6c50197ac00b7c33a74c Mon Sep 17 00:00:00 2001 +From: Fabio Estevam +Date: Thu, 13 Dec 2018 00:08:38 -0200 +Subject: ASoC: fsl: Fix SND_SOC_EUKREA_TLV320 build error on i.MX8M + +[ Upstream commit add6883619a9e3bf9658eaff1a547354131bbcd9 ] + +eukrea-tlv320.c machine driver runs on non-DT platforms +and include header file in order to be able +to use some machine_is_eukrea_xxx() macros. + +Building it for ARM64 causes the following build error: + +sound/soc/fsl/eukrea-tlv320.c:28:10: fatal error: asm/mach-types.h: No such file or directory + +Avoid this error by not allowing to build the SND_SOC_EUKREA_TLV320 +driver when ARM64 is selected. + +This is needed in preparation for the i.MX8M support. + +Reported-by: kbuild test robot +Signed-off-by: Fabio Estevam +Acked-by: Shawn Guo +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/fsl/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig +index 37f9b6201918..4087deeda7cf 100644 +--- a/sound/soc/fsl/Kconfig ++++ b/sound/soc/fsl/Kconfig +@@ -221,7 +221,7 @@ config SND_SOC_PHYCORE_AC97 + + config SND_SOC_EUKREA_TLV320 + tristate "Eukrea TLV320" +- depends on ARCH_MXC && I2C ++ depends on ARCH_MXC && !ARM64 && I2C + select SND_SOC_TLV320AIC23_I2C + select SND_SOC_IMX_AUDMUX + select SND_SOC_IMX_SSI +-- +2.19.1 + diff --git a/queue-4.14/asoc-intel-mrfld-fix-uninitialized-variable-access.patch b/queue-4.14/asoc-intel-mrfld-fix-uninitialized-variable-access.patch new file mode 100644 index 00000000000..709c901778c --- /dev/null +++ b/queue-4.14/asoc-intel-mrfld-fix-uninitialized-variable-access.patch @@ -0,0 +1,54 @@ +From 00dffd286959e952866b916c4af31295cd471b39 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Sat, 3 Nov 2018 22:21:22 +0100 +Subject: ASoC: Intel: mrfld: fix uninitialized variable access + +[ Upstream commit 1539c7f23f256120f89f8b9ec53160790bce9ed2 ] + +Randconfig testing revealed a very old bug, with gcc-8: + +sound/soc/intel/atom/sst/sst_loader.c: In function 'sst_load_fw': +sound/soc/intel/atom/sst/sst_loader.c:357:5: error: 'fw' may be used uninitialized in this function [-Werror=maybe-uninitialized] + if (fw == NULL) { + ^ +sound/soc/intel/atom/sst/sst_loader.c:354:25: note: 'fw' was declared here + const struct firmware *fw; + +We must check the return code of request_firmware() before we look at the +pointer result that may be uninitialized when the function fails. + +Fixes: 9012c9544eea ("ASoC: Intel: mrfld - Add DSP load and management") +Signed-off-by: Arnd Bergmann +Acked-by: Pierre-Louis Bossart +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/intel/atom/sst/sst_loader.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/sound/soc/intel/atom/sst/sst_loader.c b/sound/soc/intel/atom/sst/sst_loader.c +index 33917146d9c4..054b1d514e8a 100644 +--- a/sound/soc/intel/atom/sst/sst_loader.c ++++ b/sound/soc/intel/atom/sst/sst_loader.c +@@ -354,14 +354,14 @@ static int sst_request_fw(struct intel_sst_drv *sst) + const struct firmware *fw; + + retval = request_firmware(&fw, sst->firmware_name, sst->dev); +- if (fw == NULL) { +- dev_err(sst->dev, "fw is returning as null\n"); +- return -EINVAL; +- } + if (retval) { + dev_err(sst->dev, "request fw failed %d\n", retval); + return retval; + } ++ if (fw == NULL) { ++ dev_err(sst->dev, "fw is returning as null\n"); ++ return -EINVAL; ++ } + mutex_lock(&sst->sst_lock); + retval = sst_cache_and_parse_fw(sst, fw); + mutex_unlock(&sst->sst_lock); +-- +2.19.1 + diff --git a/queue-4.14/ath9k-dynack-use-authentication-messages-for-late-ac.patch b/queue-4.14/ath9k-dynack-use-authentication-messages-for-late-ac.patch new file mode 100644 index 00000000000..5dbab71c905 --- /dev/null +++ b/queue-4.14/ath9k-dynack-use-authentication-messages-for-late-ac.patch @@ -0,0 +1,39 @@ +From 0ef49f6e2b5caddc27846fd7db78f542b94efe3c Mon Sep 17 00:00:00 2001 +From: Lorenzo Bianconi +Date: Fri, 2 Nov 2018 21:49:55 +0100 +Subject: ath9k: dynack: use authentication messages for 'late' ack + +[ Upstream commit 3831a2a0010c72e3956020cbf1057a1701a2e469 ] + +In order to properly support dynack in ad-hoc mode running +wpa_supplicant, take into account authentication frames for +'late ack' detection. This patch has been tested on devices +mounted on offshore high-voltage stations connected through +~24Km link + +Reported-by: Koen Vandeputte +Tested-by: Koen Vandeputte +Signed-off-by: Lorenzo Bianconi +Signed-off-by: Kalle Valo +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath9k/dynack.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/ath/ath9k/dynack.c b/drivers/net/wireless/ath/ath9k/dynack.c +index 7334c9b09e82..cc0dc966c512 100644 +--- a/drivers/net/wireless/ath/ath9k/dynack.c ++++ b/drivers/net/wireless/ath/ath9k/dynack.c +@@ -187,7 +187,8 @@ void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb, + /* late ACK */ + if (ts->ts_status & ATH9K_TXERR_XRETRY) { + if (ieee80211_is_assoc_req(hdr->frame_control) || +- ieee80211_is_assoc_resp(hdr->frame_control)) { ++ ieee80211_is_assoc_resp(hdr->frame_control) || ++ ieee80211_is_auth(hdr->frame_control)) { + ath_dbg(common, DYNACK, "late ack\n"); + ath9k_hw_setslottime(ah, (LATEACK_TO - 3) / 2); + ath9k_hw_set_ack_timeout(ah, LATEACK_TO); +-- +2.19.1 + diff --git a/queue-4.14/block-swim3-fix-ebusy-error-when-re-opening-device-a.patch b/queue-4.14/block-swim3-fix-ebusy-error-when-re-opening-device-a.patch new file mode 100644 index 00000000000..035c73a9024 --- /dev/null +++ b/queue-4.14/block-swim3-fix-ebusy-error-when-re-opening-device-a.patch @@ -0,0 +1,42 @@ +From 4aa7545b892ca052af8e5c3c30dfd8f5bdcad9b1 Mon Sep 17 00:00:00 2001 +From: Finn Thain +Date: Mon, 31 Dec 2018 16:44:09 +1100 +Subject: block/swim3: Fix -EBUSY error when re-opening device after unmount + +[ Upstream commit 296dcc40f2f2e402facf7cd26cf3f2c8f4b17d47 ] + +When the block device is opened with FMODE_EXCL, ref_count is set to -1. +This value doesn't get reset when the device is closed which means the +device cannot be opened again. Fix this by checking for refcount <= 0 +in the release method. + +Reported-and-tested-by: Stan Johnson +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Cc: linuxppc-dev@lists.ozlabs.org +Signed-off-by: Finn Thain +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/block/swim3.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c +index 0d7527c6825a..2f7acdb830c3 100644 +--- a/drivers/block/swim3.c ++++ b/drivers/block/swim3.c +@@ -1027,7 +1027,11 @@ static void floppy_release(struct gendisk *disk, fmode_t mode) + struct swim3 __iomem *sw = fs->swim3; + + mutex_lock(&swim3_mutex); +- if (fs->ref_count > 0 && --fs->ref_count == 0) { ++ if (fs->ref_count > 0) ++ --fs->ref_count; ++ else if (fs->ref_count == -1) ++ fs->ref_count = 0; ++ if (fs->ref_count == 0) { + swim3_action(fs, MOTOR_OFF); + out_8(&sw->control_bic, 0xff); + swim3_select(fs, RELAX); +-- +2.19.1 + diff --git a/queue-4.14/bluetooth-fix-unnecessary-error-message-for-hci-requ.patch b/queue-4.14/bluetooth-fix-unnecessary-error-message-for-hci-requ.patch new file mode 100644 index 00000000000..c585078f6ea --- /dev/null +++ b/queue-4.14/bluetooth-fix-unnecessary-error-message-for-hci-requ.patch @@ -0,0 +1,43 @@ +From 6b216388f5a01bc40c278c4aab02253b30d07b02 Mon Sep 17 00:00:00 2001 +From: Johan Hedberg +Date: Tue, 27 Nov 2018 11:37:46 +0200 +Subject: Bluetooth: Fix unnecessary error message for HCI request completion + +[ Upstream commit 1629db9c75342325868243d6bca5853017d91cf8 ] + +In case a command which completes in Command Status was sent using the +hci_cmd_send-family of APIs there would be a misleading error in the +hci_get_cmd_complete function, since the code would be trying to fetch +the Command Complete parameters when there are none. + +Avoid the misleading error and silently bail out from the function in +case the received event is a command status. + +Signed-off-by: Johan Hedberg +Acked-by: Luiz Augusto von Dentz +Signed-off-by: Marcel Holtmann +Signed-off-by: Sasha Levin +--- + net/bluetooth/hci_event.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c +index 01f211e31f47..363dc85bbc5c 100644 +--- a/net/bluetooth/hci_event.c ++++ b/net/bluetooth/hci_event.c +@@ -5212,6 +5212,12 @@ static bool hci_get_cmd_complete(struct hci_dev *hdev, u16 opcode, + return true; + } + ++ /* Check if request ended in Command Status - no way to retreive ++ * any extra parameters in this case. ++ */ ++ if (hdr->evt == HCI_EV_CMD_STATUS) ++ return false; ++ + if (hdr->evt != HCI_EV_CMD_COMPLETE) { + BT_DBG("Last event is not cmd complete (0x%2.2x)", hdr->evt); + return false; +-- +2.19.1 + diff --git a/queue-4.14/btrfs-harden-agaist-duplicate-fsid-on-scanned-device.patch b/queue-4.14/btrfs-harden-agaist-duplicate-fsid-on-scanned-device.patch new file mode 100644 index 00000000000..a407125941f --- /dev/null +++ b/queue-4.14/btrfs-harden-agaist-duplicate-fsid-on-scanned-device.patch @@ -0,0 +1,116 @@ +From 2590f717cfd952f726597e4ebf0800154be5e5f5 Mon Sep 17 00:00:00 2001 +From: Anand Jain +Date: Mon, 15 Oct 2018 10:45:17 +0800 +Subject: btrfs: harden agaist duplicate fsid on scanned devices + +[ Upstream commit a9261d4125c97ce8624e9941b75dee1b43ad5df9 ] + +It's not that impossible to imagine that a device OR a btrfs image is +copied just by using the dd or the cp command. Which in case both the +copies of the btrfs will have the same fsid. If on the system with +automount enabled, the copied FS gets scanned. + +We have a known bug in btrfs, that we let the device path be changed +after the device has been mounted. So using this loop hole the new +copied device would appears as if its mounted immediately after it's +been copied. + +For example: + +Initially.. /dev/mmcblk0p4 is mounted as / + + $ lsblk + NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT + mmcblk0 179:0 0 29.2G 0 disk + |-mmcblk0p4 179:4 0 4G 0 part / + |-mmcblk0p2 179:2 0 500M 0 part /boot + |-mmcblk0p3 179:3 0 256M 0 part [SWAP] + `-mmcblk0p1 179:1 0 256M 0 part /boot/efi + + $ btrfs fi show + Label: none uuid: 07892354-ddaa-4443-90ea-f76a06accaba + Total devices 1 FS bytes used 1.40GiB + devid 1 size 4.00GiB used 3.00GiB path /dev/mmcblk0p4 + +Copy mmcblk0 to sda + + $ dd if=/dev/mmcblk0 of=/dev/sda + +And immediately after the copy completes the change in the device +superblock is notified which the automount scans using btrfs device scan +and the new device sda becomes the mounted root device. + + $ lsblk + NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT + sda 8:0 1 14.9G 0 disk + |-sda4 8:4 1 4G 0 part / + |-sda2 8:2 1 500M 0 part + |-sda3 8:3 1 256M 0 part + `-sda1 8:1 1 256M 0 part + mmcblk0 179:0 0 29.2G 0 disk + |-mmcblk0p4 179:4 0 4G 0 part + |-mmcblk0p2 179:2 0 500M 0 part /boot + |-mmcblk0p3 179:3 0 256M 0 part [SWAP] + `-mmcblk0p1 179:1 0 256M 0 part /boot/efi + + $ btrfs fi show / + Label: none uuid: 07892354-ddaa-4443-90ea-f76a06accaba + Total devices 1 FS bytes used 1.40GiB + devid 1 size 4.00GiB used 3.00GiB path /dev/sda4 + +The bug is quite nasty that you can't either unmount /dev/sda4 or +/dev/mmcblk0p4. And the problem does not get solved until you take sda +out of the system on to another system to change its fsid using the +'btrfstune -u' command. + +Signed-off-by: Anand Jain +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Sasha Levin +--- + fs/btrfs/volumes.c | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c +index 9663b6aa2a56..1e8d216720a2 100644 +--- a/fs/btrfs/volumes.c ++++ b/fs/btrfs/volumes.c +@@ -696,6 +696,35 @@ static noinline int device_list_add(const char *path, + return -EEXIST; + } + ++ /* ++ * We are going to replace the device path for a given devid, ++ * make sure it's the same device if the device is mounted ++ */ ++ if (device->bdev) { ++ struct block_device *path_bdev; ++ ++ path_bdev = lookup_bdev(path); ++ if (IS_ERR(path_bdev)) { ++ mutex_unlock(&fs_devices->device_list_mutex); ++ return ERR_CAST(path_bdev); ++ } ++ ++ if (device->bdev != path_bdev) { ++ bdput(path_bdev); ++ mutex_unlock(&fs_devices->device_list_mutex); ++ btrfs_warn_in_rcu(device->fs_info, ++ "duplicate device fsid:devid for %pU:%llu old:%s new:%s", ++ disk_super->fsid, devid, ++ rcu_str_deref(device->name), path); ++ return ERR_PTR(-EEXIST); ++ } ++ bdput(path_bdev); ++ btrfs_info_in_rcu(device->fs_info, ++ "device fsid %pU devid %llu moved old:%s new:%s", ++ disk_super->fsid, devid, ++ rcu_str_deref(device->name), path); ++ } ++ + name = rcu_string_strdup(path, GFP_NOFS); + if (!name) + return -ENOMEM; +-- +2.19.1 + diff --git a/queue-4.14/cgroup-fix-parsing-empty-mount-option-string.patch b/queue-4.14/cgroup-fix-parsing-empty-mount-option-string.patch new file mode 100644 index 00000000000..795d96c726a --- /dev/null +++ b/queue-4.14/cgroup-fix-parsing-empty-mount-option-string.patch @@ -0,0 +1,45 @@ +From 0aa45b61d06f4c6a6b1614721c54d04502387138 Mon Sep 17 00:00:00 2001 +From: Ondrej Mosnacek +Date: Thu, 13 Dec 2018 15:17:37 +0100 +Subject: cgroup: fix parsing empty mount option string + +[ Upstream commit e250d91d65750a0c0c62483ac4f9f357e7317617 ] + +This fixes the case where all mount options specified are consumed by an +LSM and all that's left is an empty string. In this case cgroupfs should +accept the string and not fail. + +How to reproduce (with SELinux enabled): + + # umount /sys/fs/cgroup/unified + # mount -o context=system_u:object_r:cgroup_t:s0 -t cgroup2 cgroup2 /sys/fs/cgroup/unified + mount: /sys/fs/cgroup/unified: wrong fs type, bad option, bad superblock on cgroup2, missing codepage or helper program, or other error. + # dmesg | tail -n 1 + [ 31.575952] cgroup: cgroup2: unknown option "" + +Fixes: 67e9c74b8a87 ("cgroup: replace __DEVEL__sane_behavior with cgroup2 fs type") +[NOTE: should apply on top of commit 5136f6365ce3 ("cgroup: implement "nsdelegate" mount option"), older versions need manual rebase] +Suggested-by: Stephen Smalley +Signed-off-by: Ondrej Mosnacek +Signed-off-by: Tejun Heo +Signed-off-by: Sasha Levin +--- + kernel/cgroup/cgroup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c +index 109c32c56de7..21bbfc09e395 100644 +--- a/kernel/cgroup/cgroup.c ++++ b/kernel/cgroup/cgroup.c +@@ -1692,7 +1692,7 @@ static int parse_cgroup_root_flags(char *data, unsigned int *root_flags) + + *root_flags = 0; + +- if (!data) ++ if (!data || *data == '\0') + return 0; + + while ((token = strsep(&data, ",")) != NULL) { +-- +2.19.1 + diff --git a/queue-4.14/cifs-check-ntwrk_buf_start-for-null-before-dereferen.patch b/queue-4.14/cifs-check-ntwrk_buf_start-for-null-before-dereferen.patch new file mode 100644 index 00000000000..acd9c64b627 --- /dev/null +++ b/queue-4.14/cifs-check-ntwrk_buf_start-for-null-before-dereferen.patch @@ -0,0 +1,48 @@ +From 4abf3d121ab4f02f1a1ed7e91d6e225c2e95957c Mon Sep 17 00:00:00 2001 +From: Ronnie Sahlberg +Date: Thu, 13 Dec 2018 08:06:16 +1000 +Subject: cifs: check ntwrk_buf_start for NULL before dereferencing it + +[ Upstream commit 59a63e479ce36a3f24444c3a36efe82b78e4a8e0 ] + +RHBZ: 1021460 + +There is an issue where when multiple threads open/close the same directory +ntwrk_buf_start might end up being NULL, causing the call to smbCalcSize +later to oops with a NULL deref. + +The real bug is why this happens and why this can become NULL for an +open cfile, which should not be allowed. +This patch tries to avoid a oops until the time when we fix the underlying +issue. + +Signed-off-by: Ronnie Sahlberg +Signed-off-by: Steve French +Signed-off-by: Sasha Levin +--- + fs/cifs/readdir.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c +index ef24b4527459..68183872bf8b 100644 +--- a/fs/cifs/readdir.c ++++ b/fs/cifs/readdir.c +@@ -655,7 +655,14 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon, loff_t pos, + /* scan and find it */ + int i; + char *cur_ent; +- char *end_of_smb = cfile->srch_inf.ntwrk_buf_start + ++ char *end_of_smb; ++ ++ if (cfile->srch_inf.ntwrk_buf_start == NULL) { ++ cifs_dbg(VFS, "ntwrk_buf_start is NULL during readdir\n"); ++ return -EIO; ++ } ++ ++ end_of_smb = cfile->srch_inf.ntwrk_buf_start + + server->ops->calc_smb_size( + cfile->srch_inf.ntwrk_buf_start); + +-- +2.19.1 + diff --git a/queue-4.14/clk-boston-fix-possible-memory-leak-in-clk_boston_se.patch b/queue-4.14/clk-boston-fix-possible-memory-leak-in-clk_boston_se.patch new file mode 100644 index 00000000000..e37896ca155 --- /dev/null +++ b/queue-4.14/clk-boston-fix-possible-memory-leak-in-clk_boston_se.patch @@ -0,0 +1,65 @@ +From d6edb1532b05483f99b611dde47a3a2f14267ee4 Mon Sep 17 00:00:00 2001 +From: Yi Wang +Date: Wed, 31 Oct 2018 15:41:41 +0800 +Subject: clk: boston: fix possible memory leak in clk_boston_setup() + +[ Upstream commit 46fda5b5067a391912cf73bf3d32c26b6a22ad09 ] + +Smatch report warnings: +drivers/clk/imgtec/clk-boston.c:76 clk_boston_setup() warn: possible memory leak of 'onecell' +drivers/clk/imgtec/clk-boston.c:83 clk_boston_setup() warn: possible memory leak of 'onecell' +drivers/clk/imgtec/clk-boston.c:90 clk_boston_setup() warn: possible memory leak of 'onecell' + +'onecell' is malloced in clk_boston_setup(), but not be freed +before leaving from the error handling cases. + +Signed-off-by: Yi Wang +Signed-off-by: Stephen Boyd +Signed-off-by: Sasha Levin +--- + drivers/clk/imgtec/clk-boston.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/drivers/clk/imgtec/clk-boston.c b/drivers/clk/imgtec/clk-boston.c +index 15af423cc0c9..f5d54a64d33c 100644 +--- a/drivers/clk/imgtec/clk-boston.c ++++ b/drivers/clk/imgtec/clk-boston.c +@@ -73,27 +73,32 @@ static void __init clk_boston_setup(struct device_node *np) + hw = clk_hw_register_fixed_rate(NULL, "input", NULL, 0, in_freq); + if (IS_ERR(hw)) { + pr_err("failed to register input clock: %ld\n", PTR_ERR(hw)); +- return; ++ goto error; + } + onecell->hws[BOSTON_CLK_INPUT] = hw; + + hw = clk_hw_register_fixed_rate(NULL, "sys", "input", 0, sys_freq); + if (IS_ERR(hw)) { + pr_err("failed to register sys clock: %ld\n", PTR_ERR(hw)); +- return; ++ goto error; + } + onecell->hws[BOSTON_CLK_SYS] = hw; + + hw = clk_hw_register_fixed_rate(NULL, "cpu", "input", 0, cpu_freq); + if (IS_ERR(hw)) { + pr_err("failed to register cpu clock: %ld\n", PTR_ERR(hw)); +- return; ++ goto error; + } + onecell->hws[BOSTON_CLK_CPU] = hw; + + err = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, onecell); + if (err) + pr_err("failed to add DT provider: %d\n", err); ++ ++ return; ++ ++error: ++ kfree(onecell); + } + + /* +-- +2.19.1 + diff --git a/queue-4.14/clk-imx6sl-ensure-mmdc-ch0-handshake-is-bypassed.patch b/queue-4.14/clk-imx6sl-ensure-mmdc-ch0-handshake-is-bypassed.patch new file mode 100644 index 00000000000..74cf51791c8 --- /dev/null +++ b/queue-4.14/clk-imx6sl-ensure-mmdc-ch0-handshake-is-bypassed.patch @@ -0,0 +1,46 @@ +From 3ad50d2f4c94c94b495d711e9fb3c00e29e95a2a Mon Sep 17 00:00:00 2001 +From: Anson Huang +Date: Fri, 30 Nov 2018 07:23:47 +0000 +Subject: clk: imx6sl: ensure MMDC CH0 handshake is bypassed + +[ Upstream commit 0efcc2c0fd2001a83240a8c3d71f67770484917e ] + +Same as other i.MX6 SoCs, ensure unused MMDC channel's +handshake is bypassed, this is to make sure no request +signal will be generated when periphe_clk_sel is changed +or SRC warm reset is triggered. + +Signed-off-by: Anson Huang +Signed-off-by: Stephen Boyd +Signed-off-by: Sasha Levin +--- + drivers/clk/imx/clk-imx6sl.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/clk/imx/clk-imx6sl.c b/drivers/clk/imx/clk-imx6sl.c +index 9642cdf0fb88..c264a744fae8 100644 +--- a/drivers/clk/imx/clk-imx6sl.c ++++ b/drivers/clk/imx/clk-imx6sl.c +@@ -17,6 +17,8 @@ + + #include "clk.h" + ++#define CCDR 0x4 ++#define BM_CCM_CCDR_MMDC_CH0_MASK (1 << 17) + #define CCSR 0xc + #define BM_CCSR_PLL1_SW_CLK_SEL (1 << 2) + #define CACRR 0x10 +@@ -414,6 +416,10 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node) + clks[IMX6SL_CLK_USDHC3] = imx_clk_gate2("usdhc3", "usdhc3_podf", base + 0x80, 6); + clks[IMX6SL_CLK_USDHC4] = imx_clk_gate2("usdhc4", "usdhc4_podf", base + 0x80, 8); + ++ /* Ensure the MMDC CH0 handshake is bypassed */ ++ writel_relaxed(readl_relaxed(base + CCDR) | ++ BM_CCM_CCDR_MMDC_CH0_MASK, base + CCDR); ++ + imx_check_clocks(clks, ARRAY_SIZE(clks)); + + clk_data.clks = clks; +-- +2.19.1 + diff --git a/queue-4.14/clk-sunxi-ng-a33-set-clk_set_rate_parent-for-all-aud.patch b/queue-4.14/clk-sunxi-ng-a33-set-clk_set_rate_parent-for-all-aud.patch new file mode 100644 index 00000000000..5432dc9c852 --- /dev/null +++ b/queue-4.14/clk-sunxi-ng-a33-set-clk_set_rate_parent-for-all-aud.patch @@ -0,0 +1,54 @@ +From 7316478328f9de927c0089dba73ad205a1917dc9 Mon Sep 17 00:00:00 2001 +From: Chen-Yu Tsai +Date: Wed, 5 Dec 2018 18:11:51 +0800 +Subject: clk: sunxi-ng: a33: Set CLK_SET_RATE_PARENT for all audio module + clocks + +[ Upstream commit 6e6da2039c82271dd873b9ad2b902a692a7dd554 ] + +All the audio interfaces on Allwinner SoCs need to change their module +clocks during operation, to switch between support for 44.1 kHz and 48 +kHz family sample rates. The clock rate for the module clocks is +governed by their upstream audio PLL. The module clocks themselves only +have a gate, and sometimes a divider or mux. Thus any rate changes need +to be propagated upstream. + +Set the CLK_SET_RATE_PARENT flag for all audio module clocks to achieve +this. + +Signed-off-by: Chen-Yu Tsai +Signed-off-by: Maxime Ripard +Signed-off-by: Sasha Levin +--- + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-a33.c b/drivers/clk/sunxi-ng/ccu-sun8i-a33.c +index 13eb5b23c5e7..c40d572a7602 100644 +--- a/drivers/clk/sunxi-ng/ccu-sun8i-a33.c ++++ b/drivers/clk/sunxi-ng/ccu-sun8i-a33.c +@@ -366,10 +366,10 @@ static SUNXI_CCU_MP_WITH_MUX_GATE(spi1_clk, "spi1", mod0_default_parents, 0x0a4, + static const char * const i2s_parents[] = { "pll-audio-8x", "pll-audio-4x", + "pll-audio-2x", "pll-audio" }; + static SUNXI_CCU_MUX_WITH_GATE(i2s0_clk, "i2s0", i2s_parents, +- 0x0b0, 16, 2, BIT(31), 0); ++ 0x0b0, 16, 2, BIT(31), CLK_SET_RATE_PARENT); + + static SUNXI_CCU_MUX_WITH_GATE(i2s1_clk, "i2s1", i2s_parents, +- 0x0b4, 16, 2, BIT(31), 0); ++ 0x0b4, 16, 2, BIT(31), CLK_SET_RATE_PARENT); + + /* TODO: the parent for most of the USB clocks is not known */ + static SUNXI_CCU_GATE(usb_phy0_clk, "usb-phy0", "osc24M", +@@ -446,7 +446,7 @@ static SUNXI_CCU_M_WITH_GATE(ve_clk, "ve", "pll-ve", + static SUNXI_CCU_GATE(ac_dig_clk, "ac-dig", "pll-audio", + 0x140, BIT(31), CLK_SET_RATE_PARENT); + static SUNXI_CCU_GATE(ac_dig_4x_clk, "ac-dig-4x", "pll-audio-4x", +- 0x140, BIT(30), 0); ++ 0x140, BIT(30), CLK_SET_RATE_PARENT); + static SUNXI_CCU_GATE(avs_clk, "avs", "osc24M", + 0x144, BIT(31), 0); + +-- +2.19.1 + diff --git a/queue-4.14/cpuidle-big.little-fix-refcount-leak.patch b/queue-4.14/cpuidle-big.little-fix-refcount-leak.patch new file mode 100644 index 00000000000..5da95df1adf --- /dev/null +++ b/queue-4.14/cpuidle-big.little-fix-refcount-leak.patch @@ -0,0 +1,47 @@ +From da3173d3058200129d97a32efdd40ae33eb8d9a8 Mon Sep 17 00:00:00 2001 +From: Yangtao Li +Date: Mon, 10 Dec 2018 11:26:41 -0500 +Subject: cpuidle: big.LITTLE: fix refcount leak + +[ Upstream commit 9456823c842f346c74265fcd98d008d87a7eb6f5 ] + +of_find_node_by_path() acquires a reference to the node +returned by it and that reference needs to be dropped by its caller. +bl_idle_init() doesn't do that, so fix it. + +Signed-off-by: Yangtao Li +Acked-by: Daniel Lezcano +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/cpuidle/cpuidle-big_little.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/drivers/cpuidle/cpuidle-big_little.c b/drivers/cpuidle/cpuidle-big_little.c +index db2ede565f1a..b44476a1b7ad 100644 +--- a/drivers/cpuidle/cpuidle-big_little.c ++++ b/drivers/cpuidle/cpuidle-big_little.c +@@ -167,6 +167,7 @@ static int __init bl_idle_init(void) + { + int ret; + struct device_node *root = of_find_node_by_path("/"); ++ const struct of_device_id *match_id; + + if (!root) + return -ENODEV; +@@ -174,7 +175,11 @@ static int __init bl_idle_init(void) + /* + * Initialize the driver just for a compliant set of machines + */ +- if (!of_match_node(compatible_machine_match, root)) ++ match_id = of_match_node(compatible_machine_match, root); ++ ++ of_node_put(root); ++ ++ if (!match_id) + return -ENODEV; + + if (!mcpm_is_available()) +-- +2.19.1 + diff --git a/queue-4.14/crypto-aes_ti-disable-interrupts-while-accessing-s-b.patch b/queue-4.14/crypto-aes_ti-disable-interrupts-while-accessing-s-b.patch new file mode 100644 index 00000000000..0bbd3fe6b81 --- /dev/null +++ b/queue-4.14/crypto-aes_ti-disable-interrupts-while-accessing-s-b.patch @@ -0,0 +1,113 @@ +From 6c24c4ca0ba16bcaf51d3a4ab363280b8570ee60 Mon Sep 17 00:00:00 2001 +From: Eric Biggers +Date: Wed, 17 Oct 2018 21:37:58 -0700 +Subject: crypto: aes_ti - disable interrupts while accessing S-box + +[ Upstream commit 0a6a40c2a8c184a2fb467efacfb1cd338d719e0b ] + +In the "aes-fixed-time" AES implementation, disable interrupts while +accessing the S-box, in order to make cache-timing attacks more +difficult. Previously it was possible for the CPU to be interrupted +while the S-box was loaded into L1 cache, potentially evicting the +cachelines and causing later table lookups to be time-variant. + +In tests I did on x86 and ARM, this doesn't affect performance +significantly. Responsiveness is potentially a concern, but interrupts +are only disabled for a single AES block. + +Note that even after this change, the implementation still isn't +necessarily guaranteed to be constant-time; see +https://cr.yp.to/antiforgery/cachetiming-20050414.pdf for a discussion +of the many difficulties involved in writing truly constant-time AES +software. But it's valuable to make such attacks more difficult. + +Reviewed-by: Ard Biesheuvel +Signed-off-by: Eric Biggers +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + crypto/Kconfig | 3 ++- + crypto/aes_ti.c | 18 ++++++++++++++++++ + 2 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/crypto/Kconfig b/crypto/Kconfig +index 5579eb88d460..84f99f8eca4b 100644 +--- a/crypto/Kconfig ++++ b/crypto/Kconfig +@@ -930,7 +930,8 @@ config CRYPTO_AES_TI + 8 for decryption), this implementation only uses just two S-boxes of + 256 bytes each, and attempts to eliminate data dependent latencies by + prefetching the entire table into the cache at the start of each +- block. ++ block. Interrupts are also disabled to avoid races where cachelines ++ are evicted when the CPU is interrupted to do something else. + + config CRYPTO_AES_586 + tristate "AES cipher algorithms (i586)" +diff --git a/crypto/aes_ti.c b/crypto/aes_ti.c +index 03023b2290e8..1ff9785b30f5 100644 +--- a/crypto/aes_ti.c ++++ b/crypto/aes_ti.c +@@ -269,6 +269,7 @@ static void aesti_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) + const u32 *rkp = ctx->key_enc + 4; + int rounds = 6 + ctx->key_length / 4; + u32 st0[4], st1[4]; ++ unsigned long flags; + int round; + + st0[0] = ctx->key_enc[0] ^ get_unaligned_le32(in); +@@ -276,6 +277,12 @@ static void aesti_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) + st0[2] = ctx->key_enc[2] ^ get_unaligned_le32(in + 8); + st0[3] = ctx->key_enc[3] ^ get_unaligned_le32(in + 12); + ++ /* ++ * Temporarily disable interrupts to avoid races where cachelines are ++ * evicted when the CPU is interrupted to do something else. ++ */ ++ local_irq_save(flags); ++ + st0[0] ^= __aesti_sbox[ 0] ^ __aesti_sbox[128]; + st0[1] ^= __aesti_sbox[32] ^ __aesti_sbox[160]; + st0[2] ^= __aesti_sbox[64] ^ __aesti_sbox[192]; +@@ -300,6 +307,8 @@ static void aesti_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) + put_unaligned_le32(subshift(st1, 1) ^ rkp[5], out + 4); + put_unaligned_le32(subshift(st1, 2) ^ rkp[6], out + 8); + put_unaligned_le32(subshift(st1, 3) ^ rkp[7], out + 12); ++ ++ local_irq_restore(flags); + } + + static void aesti_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) +@@ -308,6 +317,7 @@ static void aesti_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) + const u32 *rkp = ctx->key_dec + 4; + int rounds = 6 + ctx->key_length / 4; + u32 st0[4], st1[4]; ++ unsigned long flags; + int round; + + st0[0] = ctx->key_dec[0] ^ get_unaligned_le32(in); +@@ -315,6 +325,12 @@ static void aesti_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) + st0[2] = ctx->key_dec[2] ^ get_unaligned_le32(in + 8); + st0[3] = ctx->key_dec[3] ^ get_unaligned_le32(in + 12); + ++ /* ++ * Temporarily disable interrupts to avoid races where cachelines are ++ * evicted when the CPU is interrupted to do something else. ++ */ ++ local_irq_save(flags); ++ + st0[0] ^= __aesti_inv_sbox[ 0] ^ __aesti_inv_sbox[128]; + st0[1] ^= __aesti_inv_sbox[32] ^ __aesti_inv_sbox[160]; + st0[2] ^= __aesti_inv_sbox[64] ^ __aesti_inv_sbox[192]; +@@ -339,6 +355,8 @@ static void aesti_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) + put_unaligned_le32(inv_subshift(st1, 1) ^ rkp[5], out + 4); + put_unaligned_le32(inv_subshift(st1, 2) ^ rkp[6], out + 8); + put_unaligned_le32(inv_subshift(st1, 3) ^ rkp[7], out + 12); ++ ++ local_irq_restore(flags); + } + + static struct crypto_alg aes_alg = { +-- +2.19.1 + diff --git a/queue-4.14/crypto-ux500-use-proper-enum-in-cryp_set_dma_transfe.patch b/queue-4.14/crypto-ux500-use-proper-enum-in-cryp_set_dma_transfe.patch new file mode 100644 index 00000000000..9288b7c2f74 --- /dev/null +++ b/queue-4.14/crypto-ux500-use-proper-enum-in-cryp_set_dma_transfe.patch @@ -0,0 +1,62 @@ +From f156d9501c22f41f236ec2470de9f1e9930afa03 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Mon, 10 Dec 2018 16:49:29 -0700 +Subject: crypto: ux500 - Use proper enum in cryp_set_dma_transfer + +[ Upstream commit 9d880c5945c748d8edcac30965f3349a602158c4 ] + +Clang warns when one enumerated type is implicitly converted to another: + +drivers/crypto/ux500/cryp/cryp_core.c:559:5: warning: implicit +conversion from enumeration type 'enum dma_data_direction' to different +enumeration type 'enum dma_transfer_direction' [-Wenum-conversion] + direction, DMA_CTRL_ACK); + ^~~~~~~~~ +drivers/crypto/ux500/cryp/cryp_core.c:583:5: warning: implicit +conversion from enumeration type 'enum dma_data_direction' to different +enumeration type 'enum dma_transfer_direction' [-Wenum-conversion] + direction, + ^~~~~~~~~ +2 warnings generated. + +dmaengine_prep_slave_sg expects an enum from dma_transfer_direction. +Because we know the value of the dma_data_direction enum from the +switch statement, we can just use the proper value from +dma_transfer_direction so there is no more conversion. + +DMA_TO_DEVICE = DMA_MEM_TO_DEV = 1 +DMA_FROM_DEVICE = DMA_DEV_TO_MEM = 2 + +Signed-off-by: Nathan Chancellor +Reviewed-by: Nick Desaulniers +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + drivers/crypto/ux500/cryp/cryp_core.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c +index 790f7cadc1ed..efebc484e371 100644 +--- a/drivers/crypto/ux500/cryp/cryp_core.c ++++ b/drivers/crypto/ux500/cryp/cryp_core.c +@@ -555,7 +555,7 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx, + desc = dmaengine_prep_slave_sg(channel, + ctx->device->dma.sg_src, + ctx->device->dma.sg_src_len, +- direction, DMA_CTRL_ACK); ++ DMA_MEM_TO_DEV, DMA_CTRL_ACK); + break; + + case DMA_FROM_DEVICE: +@@ -579,7 +579,7 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx, + desc = dmaengine_prep_slave_sg(channel, + ctx->device->dma.sg_dst, + ctx->device->dma.sg_dst_len, +- direction, ++ DMA_DEV_TO_MEM, + DMA_CTRL_ACK | + DMA_PREP_INTERRUPT); + +-- +2.19.1 + diff --git a/queue-4.14/crypto-ux500-use-proper-enum-in-hash_set_dma_transfe.patch b/queue-4.14/crypto-ux500-use-proper-enum-in-hash_set_dma_transfe.patch new file mode 100644 index 00000000000..b1f22d4e151 --- /dev/null +++ b/queue-4.14/crypto-ux500-use-proper-enum-in-hash_set_dma_transfe.patch @@ -0,0 +1,47 @@ +From cb745985587adf82a3368e11f6d90f1d0c4941c1 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Mon, 10 Dec 2018 16:49:54 -0700 +Subject: crypto: ux500 - Use proper enum in hash_set_dma_transfer + +[ Upstream commit 5ac93f808338f4dd465402e91869702eb87db241 ] + +Clang warns when one enumerated type is implicitly converted to another: + +drivers/crypto/ux500/hash/hash_core.c:169:4: warning: implicit +conversion from enumeration type 'enum dma_data_direction' to different +enumeration type 'enum dma_transfer_direction' [-Wenum-conversion] + direction, DMA_CTRL_ACK | DMA_PREP_INTERRUPT); + ^~~~~~~~~ +1 warning generated. + +dmaengine_prep_slave_sg expects an enum from dma_transfer_direction. +We know that the only direction supported by this function is +DMA_TO_DEVICE because of the check at the top of this function so we can +just use the equivalent value from dma_transfer_direction. + +DMA_TO_DEVICE = DMA_MEM_TO_DEV = 1 + +Signed-off-by: Nathan Chancellor +Reviewed-by: Nick Desaulniers +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + drivers/crypto/ux500/hash/hash_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c +index 9acccad26928..17c8e2b28c42 100644 +--- a/drivers/crypto/ux500/hash/hash_core.c ++++ b/drivers/crypto/ux500/hash/hash_core.c +@@ -165,7 +165,7 @@ static int hash_set_dma_transfer(struct hash_ctx *ctx, struct scatterlist *sg, + __func__); + desc = dmaengine_prep_slave_sg(channel, + ctx->device->dma.sg, ctx->device->dma.sg_len, +- direction, DMA_CTRL_ACK | DMA_PREP_INTERRUPT); ++ DMA_MEM_TO_DEV, DMA_CTRL_ACK | DMA_PREP_INTERRUPT); + if (!desc) { + dev_err(ctx->device->dev, + "%s: dmaengine_prep_slave_sg() failed!\n", __func__); +-- +2.19.1 + diff --git a/queue-4.14/cw1200-fix-concurrency-use-after-free-bugs-in-cw1200.patch b/queue-4.14/cw1200-fix-concurrency-use-after-free-bugs-in-cw1200.patch new file mode 100644 index 00000000000..0bc8c9c15e6 --- /dev/null +++ b/queue-4.14/cw1200-fix-concurrency-use-after-free-bugs-in-cw1200.patch @@ -0,0 +1,81 @@ +From 4dc28e08bd32a1f9d533347fd58090320fb93435 Mon Sep 17 00:00:00 2001 +From: Jia-Ju Bai +Date: Fri, 14 Dec 2018 11:55:21 +0800 +Subject: cw1200: Fix concurrency use-after-free bugs in cw1200_hw_scan() + +[ Upstream commit 4f68ef64cd7feb1220232bd8f501d8aad340a099 ] + +The function cw1200_bss_info_changed() and cw1200_hw_scan() can be +concurrently executed. +The two functions both access a possible shared variable "frame.skb". + +This shared variable is freed by dev_kfree_skb() in cw1200_upload_beacon(), +which is called by cw1200_bss_info_changed(). The free operation is +protected by a mutex lock "priv->conf_mutex" in cw1200_bss_info_changed(). + +In cw1200_hw_scan(), this shared variable is accessed without the +protection of the mutex lock "priv->conf_mutex". +Thus, concurrency use-after-free bugs may occur. + +To fix these bugs, the original calls to mutex_lock(&priv->conf_mutex) and +mutex_unlock(&priv->conf_mutex) are moved to the places, which can +protect the accesses to the shared variable. + +Signed-off-by: Jia-Ju Bai +Signed-off-by: Kalle Valo +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/st/cw1200/scan.c | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +diff --git a/drivers/net/wireless/st/cw1200/scan.c b/drivers/net/wireless/st/cw1200/scan.c +index cc2ce60f4f09..f22c8ae15ad8 100644 +--- a/drivers/net/wireless/st/cw1200/scan.c ++++ b/drivers/net/wireless/st/cw1200/scan.c +@@ -78,6 +78,10 @@ int cw1200_hw_scan(struct ieee80211_hw *hw, + if (req->n_ssids > WSM_SCAN_MAX_NUM_OF_SSIDS) + return -EINVAL; + ++ /* will be unlocked in cw1200_scan_work() */ ++ down(&priv->scan.lock); ++ mutex_lock(&priv->conf_mutex); ++ + frame.skb = ieee80211_probereq_get(hw, priv->vif->addr, NULL, 0, + req->ie_len); + if (!frame.skb) +@@ -86,19 +90,15 @@ int cw1200_hw_scan(struct ieee80211_hw *hw, + if (req->ie_len) + skb_put_data(frame.skb, req->ie, req->ie_len); + +- /* will be unlocked in cw1200_scan_work() */ +- down(&priv->scan.lock); +- mutex_lock(&priv->conf_mutex); +- + ret = wsm_set_template_frame(priv, &frame); + if (!ret) { + /* Host want to be the probe responder. */ + ret = wsm_set_probe_responder(priv, true); + } + if (ret) { ++ dev_kfree_skb(frame.skb); + mutex_unlock(&priv->conf_mutex); + up(&priv->scan.lock); +- dev_kfree_skb(frame.skb); + return ret; + } + +@@ -120,10 +120,9 @@ int cw1200_hw_scan(struct ieee80211_hw *hw, + ++priv->scan.n_ssids; + } + +- mutex_unlock(&priv->conf_mutex); +- + if (frame.skb) + dev_kfree_skb(frame.skb); ++ mutex_unlock(&priv->conf_mutex); + queue_work(priv->workqueue, &priv->scan.work); + return 0; + } +-- +2.19.1 + diff --git a/queue-4.14/dlm-don-t-swamp-the-cpu-with-callbacks-queued-during.patch b/queue-4.14/dlm-don-t-swamp-the-cpu-with-callbacks-queued-during.patch new file mode 100644 index 00000000000..5e166f8229d --- /dev/null +++ b/queue-4.14/dlm-don-t-swamp-the-cpu-with-callbacks-queued-during.patch @@ -0,0 +1,60 @@ +From 51f6e15573004ce9a32edcb5f2b19fa3fba8ca8e Mon Sep 17 00:00:00 2001 +From: Bob Peterson +Date: Thu, 8 Nov 2018 14:04:50 -0500 +Subject: dlm: Don't swamp the CPU with callbacks queued during recovery + +[ Upstream commit 216f0efd19b9cc32207934fd1b87a45f2c4c593e ] + +Before this patch, recovery would cause all callbacks to be delayed, +put on a queue, and afterward they were all queued to the callback +work queue. This patch does the same thing, but occasionally takes +a break after 25 of them so it won't swamp the CPU at the expense +of other RT processes like corosync. + +Signed-off-by: Bob Peterson +Signed-off-by: David Teigland +Signed-off-by: Sasha Levin +--- + fs/dlm/ast.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/fs/dlm/ast.c b/fs/dlm/ast.c +index 07fed838d8fd..15fa4239ae9f 100644 +--- a/fs/dlm/ast.c ++++ b/fs/dlm/ast.c +@@ -290,6 +290,8 @@ void dlm_callback_suspend(struct dlm_ls *ls) + flush_workqueue(ls->ls_callback_wq); + } + ++#define MAX_CB_QUEUE 25 ++ + void dlm_callback_resume(struct dlm_ls *ls) + { + struct dlm_lkb *lkb, *safe; +@@ -300,15 +302,23 @@ void dlm_callback_resume(struct dlm_ls *ls) + if (!ls->ls_callback_wq) + return; + ++more: + mutex_lock(&ls->ls_cb_mutex); + list_for_each_entry_safe(lkb, safe, &ls->ls_cb_delay, lkb_cb_list) { + list_del_init(&lkb->lkb_cb_list); + queue_work(ls->ls_callback_wq, &lkb->lkb_cb_work); + count++; ++ if (count == MAX_CB_QUEUE) ++ break; + } + mutex_unlock(&ls->ls_cb_mutex); + + if (count) + log_rinfo(ls, "dlm_callback_resume %d", count); ++ if (count == MAX_CB_QUEUE) { ++ count = 0; ++ cond_resched(); ++ goto more; ++ } + } + +-- +2.19.1 + diff --git a/queue-4.14/dmaengine-xilinx_dma-remove-__aligned-attribute-on-z.patch b/queue-4.14/dmaengine-xilinx_dma-remove-__aligned-attribute-on-z.patch new file mode 100644 index 00000000000..114ab59097d --- /dev/null +++ b/queue-4.14/dmaengine-xilinx_dma-remove-__aligned-attribute-on-z.patch @@ -0,0 +1,51 @@ +From 4509bba0b3e37d02b3d95f569a356597907302cf Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Thu, 25 Oct 2018 11:05:25 -0700 +Subject: dmaengine: xilinx_dma: Remove __aligned attribute on + zynqmp_dma_desc_ll + +[ Upstream commit aeaebcc17cdf37065d2693865eeb1ff1c7dc5bf3 ] + +Clang warns: + +drivers/dma/xilinx/zynqmp_dma.c:166:4: warning: attribute 'aligned' is +ignored, place it after "struct" to apply attribute to type declaration +[-Wignored-attributes] +}; __aligned(64) + ^ +./include/linux/compiler_types.h:200:38: note: expanded from macro +'__aligned' + ^ +1 warning generated. + +As Nick pointed out in the previous version of this patch, the author +likely intended for this struct to be 8-byte (64-bit) aligned, not +64-byte, which is the default. Remove the hanging __aligned attribute. + +Fixes: b0cc417c1637 ("dmaengine: Add Xilinx zynqmp dma engine driver support") +Reported-by: Nick Desaulniers +Suggested-by: Nick Desaulniers +Signed-off-by: Nathan Chancellor +Reviewed-by: Nick Desaulniers +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/dma/xilinx/zynqmp_dma.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/dma/xilinx/zynqmp_dma.c b/drivers/dma/xilinx/zynqmp_dma.c +index 5cc8ed31f26b..6d86d05e53aa 100644 +--- a/drivers/dma/xilinx/zynqmp_dma.c ++++ b/drivers/dma/xilinx/zynqmp_dma.c +@@ -159,7 +159,7 @@ struct zynqmp_dma_desc_ll { + u32 ctrl; + u64 nxtdscraddr; + u64 rsvd; +-}; __aligned(64) ++}; + + /** + * struct zynqmp_dma_desc_sw - Per Transaction structure +-- +2.19.1 + diff --git a/queue-4.14/drbd-avoid-clang-warning-about-pointless-switch-stat.patch b/queue-4.14/drbd-avoid-clang-warning-about-pointless-switch-stat.patch new file mode 100644 index 00000000000..b6429e2c55c --- /dev/null +++ b/queue-4.14/drbd-avoid-clang-warning-about-pointless-switch-stat.patch @@ -0,0 +1,72 @@ +From 3b1d3efb67c749e9882f7316a3b5a6f23052ae84 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Thu, 20 Dec 2018 17:23:43 +0100 +Subject: drbd: Avoid Clang warning about pointless switch statment + +[ Upstream commit a52c5a16cf19d8a85831bb1b915a221dd4ffae3c ] + +There are several warnings from Clang about no case statement matching +the constant 0: + +In file included from drivers/block/drbd/drbd_receiver.c:48: +In file included from drivers/block/drbd/drbd_int.h:48: +In file included from ./include/linux/drbd_genl_api.h:54: +In file included from ./include/linux/genl_magic_struct.h:236: +./include/linux/drbd_genl.h:321:1: warning: no case matching constant +switch condition '0' +GENL_struct(DRBD_NLA_HELPER, 24, drbd_helper_info, +^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +./include/linux/genl_magic_struct.h:220:10: note: expanded from macro +'GENL_struct' + switch (0) { + ^ + +Silence this warning by adding a 'case 0:' statement. Additionally, +adjust the alignment of the statements in the ct_assert_unique macro to +avoid a checkpatch warning. + +This solution was originally sent by Arnd Bergmann with a default case +statement: https://lore.kernel.org/patchwork/patch/756723/ + +Link: https://github.com/ClangBuiltLinux/linux/issues/43 +Suggested-by: Lars Ellenberg +Signed-off-by: Nathan Chancellor +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + include/linux/genl_magic_struct.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/include/linux/genl_magic_struct.h b/include/linux/genl_magic_struct.h +index 5972e4969197..eeae59d3ceb7 100644 +--- a/include/linux/genl_magic_struct.h ++++ b/include/linux/genl_magic_struct.h +@@ -191,6 +191,7 @@ static inline void ct_assert_unique_operations(void) + { + switch (0) { + #include GENL_MAGIC_INCLUDE_FILE ++ case 0: + ; + } + } +@@ -209,6 +210,7 @@ static inline void ct_assert_unique_top_level_attributes(void) + { + switch (0) { + #include GENL_MAGIC_INCLUDE_FILE ++ case 0: + ; + } + } +@@ -218,7 +220,8 @@ static inline void ct_assert_unique_top_level_attributes(void) + static inline void ct_assert_unique_ ## s_name ## _attributes(void) \ + { \ + switch (0) { \ +- s_fields \ ++ s_fields \ ++ case 0: \ + ; \ + } \ + } +-- +2.19.1 + diff --git a/queue-4.14/drbd-disconnect-if-the-wrong-uuids-are-attached-on-a.patch b/queue-4.14/drbd-disconnect-if-the-wrong-uuids-are-attached-on-a.patch new file mode 100644 index 00000000000..0b8229d0eef --- /dev/null +++ b/queue-4.14/drbd-disconnect-if-the-wrong-uuids-are-attached-on-a.patch @@ -0,0 +1,46 @@ +From 5b6173e03fd74344453f7f02437b14dd15afff94 Mon Sep 17 00:00:00 2001 +From: Lars Ellenberg +Date: Thu, 20 Dec 2018 17:23:32 +0100 +Subject: drbd: disconnect, if the wrong UUIDs are attached on a connected peer + +[ Upstream commit b17b59602b6dcf8f97a7dc7bc489a48388d7063a ] + +With "on-no-data-accessible suspend-io", DRBD requires the next attach +or connect to be to the very same data generation uuid tag it lost last. + +If we first lost connection to the peer, +then later lost connection to our own disk, +we would usually refuse to re-connect to the peer, +because it presents the wrong data set. + +However, if the peer first connects without a disk, +and then attached its disk, we accepted that same wrong data set, +which would be "unexpected" by any user of that DRBD +and cause "undefined results" (read: very likely data corruption). + +The fix is to forcefully disconnect as soon as we notice that the peer +attached to the "wrong" dataset. + +Signed-off-by: Lars Ellenberg +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/block/drbd/drbd_receiver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c +index 143c5a666e25..1aad373da50e 100644 +--- a/drivers/block/drbd/drbd_receiver.c ++++ b/drivers/block/drbd/drbd_receiver.c +@@ -4139,7 +4139,7 @@ static int receive_uuids(struct drbd_connection *connection, struct packet_info + kfree(device->p_uuid); + device->p_uuid = p_uuid; + +- if (device->state.conn < C_CONNECTED && ++ if ((device->state.conn < C_CONNECTED || device->state.pdsk == D_DISKLESS) && + device->state.disk < D_INCONSISTENT && + device->state.role == R_PRIMARY && + (device->ed_uuid & ~((u64)1)) != (p_uuid[UI_CURRENT] & ~((u64)1))) { +-- +2.19.1 + diff --git a/queue-4.14/drbd-narrow-rcu_read_lock-in-drbd_sync_handshake.patch b/queue-4.14/drbd-narrow-rcu_read_lock-in-drbd_sync_handshake.patch new file mode 100644 index 00000000000..a81d7201d4d --- /dev/null +++ b/queue-4.14/drbd-narrow-rcu_read_lock-in-drbd_sync_handshake.patch @@ -0,0 +1,82 @@ +From 6937040e44149f80b6a5482c9fce925356d13d20 Mon Sep 17 00:00:00 2001 +From: Roland Kammerer +Date: Thu, 20 Dec 2018 17:23:28 +0100 +Subject: drbd: narrow rcu_read_lock in drbd_sync_handshake + +[ Upstream commit d29e89e34952a9ad02c77109c71a80043544296e ] + +So far there was the possibility that we called +genlmsg_new(GFP_NOIO)/mutex_lock() while holding an rcu_read_lock(). + +This included cases like: + +drbd_sync_handshake (acquire the RCU lock) + drbd_asb_recover_1p + drbd_khelper + drbd_bcast_event + genlmsg_new(GFP_NOIO) --> may sleep + +drbd_sync_handshake (acquire the RCU lock) + drbd_asb_recover_1p + drbd_khelper + notify_helper + genlmsg_new(GFP_NOIO) --> may sleep + +drbd_sync_handshake (acquire the RCU lock) + drbd_asb_recover_1p + drbd_khelper + notify_helper + mutex_lock --> may sleep + +While using GFP_ATOMIC whould have been possible in the first two cases, +the real fix is to narrow the rcu_read_lock. + +Reported-by: Jia-Ju Bai +Reviewed-by: Lars Ellenberg +Signed-off-by: Roland Kammerer +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/block/drbd/drbd_receiver.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c +index 796eaf347dc0..143c5a666e25 100644 +--- a/drivers/block/drbd/drbd_receiver.c ++++ b/drivers/block/drbd/drbd_receiver.c +@@ -3361,7 +3361,7 @@ static enum drbd_conns drbd_sync_handshake(struct drbd_peer_device *peer_device, + enum drbd_conns rv = C_MASK; + enum drbd_disk_state mydisk; + struct net_conf *nc; +- int hg, rule_nr, rr_conflict, tentative; ++ int hg, rule_nr, rr_conflict, tentative, always_asbp; + + mydisk = device->state.disk; + if (mydisk == D_NEGOTIATING) +@@ -3412,8 +3412,12 @@ static enum drbd_conns drbd_sync_handshake(struct drbd_peer_device *peer_device, + + rcu_read_lock(); + nc = rcu_dereference(peer_device->connection->net_conf); ++ always_asbp = nc->always_asbp; ++ rr_conflict = nc->rr_conflict; ++ tentative = nc->tentative; ++ rcu_read_unlock(); + +- if (hg == 100 || (hg == -100 && nc->always_asbp)) { ++ if (hg == 100 || (hg == -100 && always_asbp)) { + int pcount = (device->state.role == R_PRIMARY) + + (peer_role == R_PRIMARY); + int forced = (hg == -100); +@@ -3452,9 +3456,6 @@ static enum drbd_conns drbd_sync_handshake(struct drbd_peer_device *peer_device, + "Sync from %s node\n", + (hg < 0) ? "peer" : "this"); + } +- rr_conflict = nc->rr_conflict; +- tentative = nc->tentative; +- rcu_read_unlock(); + + if (hg == -100) { + /* FIXME this log message is not correct if we end up here +-- +2.19.1 + diff --git a/queue-4.14/drbd-skip-spurious-timeout-ping-timeo-when-failing-p.patch b/queue-4.14/drbd-skip-spurious-timeout-ping-timeo-when-failing-p.patch new file mode 100644 index 00000000000..b810082c479 --- /dev/null +++ b/queue-4.14/drbd-skip-spurious-timeout-ping-timeo-when-failing-p.patch @@ -0,0 +1,60 @@ +From 03e90f29073d0f2f51e3dfb49ff0d99ea2a992ce Mon Sep 17 00:00:00 2001 +From: Lars Ellenberg +Date: Thu, 20 Dec 2018 17:23:41 +0100 +Subject: drbd: skip spurious timeout (ping-timeo) when failing promote + +[ Upstream commit 9848b6ddd8c92305252f94592c5e278574e7a6ac ] + +If you try to promote a Secondary while connected to a Primary +and allow-two-primaries is NOT set, we will wait for "ping-timeout" +to give this node a chance to detect a dead primary, +in case the cluster manager noticed faster than we did. + +But if we then are *still* connected to a Primary, +we fail (after an additional timeout of ping-timout). + +This change skips the spurious second timeout. + +Most people won't notice really, +since "ping-timeout" by default is half a second. + +But in some installations, ping-timeout may be 10 or 20 seconds or more, +and spuriously delaying the error return becomes annoying. + +Signed-off-by: Lars Ellenberg +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/block/drbd/drbd_nl.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c +index a12f77e6891e..ad13ec66c8e4 100644 +--- a/drivers/block/drbd/drbd_nl.c ++++ b/drivers/block/drbd/drbd_nl.c +@@ -668,14 +668,15 @@ drbd_set_role(struct drbd_device *const device, enum drbd_role new_role, int for + if (rv == SS_TWO_PRIMARIES) { + /* Maybe the peer is detected as dead very soon... + retry at most once more in this case. */ +- int timeo; +- rcu_read_lock(); +- nc = rcu_dereference(connection->net_conf); +- timeo = nc ? (nc->ping_timeo + 1) * HZ / 10 : 1; +- rcu_read_unlock(); +- schedule_timeout_interruptible(timeo); +- if (try < max_tries) ++ if (try < max_tries) { ++ int timeo; + try = max_tries - 1; ++ rcu_read_lock(); ++ nc = rcu_dereference(connection->net_conf); ++ timeo = nc ? (nc->ping_timeo + 1) * HZ / 10 : 1; ++ rcu_read_unlock(); ++ schedule_timeout_interruptible(timeo); ++ } + continue; + } + if (rv < SS_SUCCESS) { +-- +2.19.1 + diff --git a/queue-4.14/driver-core-move-async_synchronize_full-call.patch b/queue-4.14/driver-core-move-async_synchronize_full-call.patch new file mode 100644 index 00000000000..5fed51398bd --- /dev/null +++ b/queue-4.14/driver-core-move-async_synchronize_full-call.patch @@ -0,0 +1,58 @@ +From 19bb2e79deed0f9d8b2165e8a5c1dfc6fce7c72b Mon Sep 17 00:00:00 2001 +From: Alexander Duyck +Date: Wed, 28 Nov 2018 16:32:11 -0800 +Subject: driver core: Move async_synchronize_full call + +[ Upstream commit c37d721c68ad88925ba0e72f6e14acb829a8c6bb ] + +Move the async_synchronize_full call out of __device_release_driver and +into driver_detach. + +The idea behind this is that the async_synchronize_full call will only +guarantee that any existing async operations are flushed. This doesn't do +anything to guarantee that a hotplug event that may occur while we are +doing the release of the driver will not be asynchronously scheduled. + +By moving this into the driver_detach path we can avoid potential deadlocks +as we aren't holding the device lock at this point and we should not have +the driver we want to flush loaded so the flush will take care of any +asynchronous events the driver we are detaching might have scheduled. + +Fixes: 765230b5f084 ("driver-core: add asynchronous probing support for drivers") +Reviewed-by: Bart Van Assche +Reviewed-by: Dan Williams +Signed-off-by: Alexander Duyck +Reviewed-by: Luis Chamberlain +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/base/dd.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/base/dd.c b/drivers/base/dd.c +index 55fc31f6fe7f..d928cc6d0638 100644 +--- a/drivers/base/dd.c ++++ b/drivers/base/dd.c +@@ -813,9 +813,6 @@ static void __device_release_driver(struct device *dev, struct device *parent) + + drv = dev->driver; + if (drv) { +- if (driver_allows_async_probing(drv)) +- async_synchronize_full(); +- + while (device_links_busy(dev)) { + device_unlock(dev); + if (parent) +@@ -920,6 +917,9 @@ void driver_detach(struct device_driver *drv) + struct device_private *dev_prv; + struct device *dev; + ++ if (driver_allows_async_probing(drv)) ++ async_synchronize_full(); ++ + for (;;) { + spin_lock(&drv->p->klist_devices.k_lock); + if (list_empty(&drv->p->klist_devices.k_list)) { +-- +2.19.1 + diff --git a/queue-4.14/drm-bufs-fix-spectre-v1-vulnerability.patch b/queue-4.14/drm-bufs-fix-spectre-v1-vulnerability.patch new file mode 100644 index 00000000000..d48e5a2297e --- /dev/null +++ b/queue-4.14/drm-bufs-fix-spectre-v1-vulnerability.patch @@ -0,0 +1,55 @@ +From f1137c1a513f1a154d3f31aabbb3eb00f2b84306 Mon Sep 17 00:00:00 2001 +From: "Gustavo A. R. Silva" +Date: Tue, 16 Oct 2018 11:55:49 +0200 +Subject: drm/bufs: Fix Spectre v1 vulnerability + +[ Upstream commit a37805098900a6e73a55b3a43b7d3bcd987bb3f4 ] + +idx can be indirectly controlled by user-space, hence leading to a +potential exploitation of the Spectre variant 1 vulnerability. + +This issue was detected with the help of Smatch: + +drivers/gpu/drm/drm_bufs.c:1420 drm_legacy_freebufs() warn: potential +spectre issue 'dma->buflist' [r] (local cap) + +Fix this by sanitizing idx before using it to index dma->buflist + +Notice that given that speculation windows are large, the policy is +to kill the speculation on the first load and not worry if it can be +completed with a dependent load/store [1]. + +[1] https://marc.info/?l=linux-kernel&m=152449131114778&w=2 + +Signed-off-by: Gustavo A. R. Silva +Signed-off-by: Daniel Vetter +Link: https://patchwork.freedesktop.org/patch/msgid/20181016095549.GA23586@embeddedor.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/drm_bufs.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c +index 1ee84dd802d4..0f05b8d8fefa 100644 +--- a/drivers/gpu/drm/drm_bufs.c ++++ b/drivers/gpu/drm/drm_bufs.c +@@ -36,6 +36,8 @@ + #include + #include "drm_legacy.h" + ++#include ++ + static struct drm_map_list *drm_find_matching_map(struct drm_device *dev, + struct drm_local_map *map) + { +@@ -1417,6 +1419,7 @@ int drm_legacy_freebufs(struct drm_device *dev, void *data, + idx, dma->buf_count - 1); + return -EINVAL; + } ++ idx = array_index_nospec(idx, dma->buf_count); + buf = dma->buflist[idx]; + if (buf->file_priv != file_priv) { + DRM_ERROR("Process %d freeing buffer not owned\n", +-- +2.19.1 + diff --git a/queue-4.14/drm-clear-state-acquire_ctx-before-leaving-drm_atomi.patch b/queue-4.14/drm-clear-state-acquire_ctx-before-leaving-drm_atomi.patch new file mode 100644 index 00000000000..92740274c06 --- /dev/null +++ b/queue-4.14/drm-clear-state-acquire_ctx-before-leaving-drm_atomi.patch @@ -0,0 +1,55 @@ +From 354c3b5880f324651755b5c5b8c661ea5b69b536 Mon Sep 17 00:00:00 2001 +From: Sean Paul +Date: Thu, 29 Nov 2018 10:04:14 -0500 +Subject: drm: Clear state->acquire_ctx before leaving + drm_atomic_helper_commit_duplicated_state() + +[ Upstream commit aa394b0dd68cb00c483e151dcd84713d4d517ed1 ] + +drm_atomic_helper_commit_duplicated_state() sets state->acquire_ctx to +the context given in the argument and leaves it in state after it +quits. The lifetime of state and context are not guaranteed to be the +same, so we shouldn't leave that pointer hanging around. This patch +resets the context to NULL to avoid any oopses. + +Changes in v2: +- Added to the set + +Suggested-by: Daniel Vetter +Reviewed-by: Daniel Vetter +Signed-off-by: Sean Paul +Link: https://patchwork.freedesktop.org/patch/msgid/20181129150423.239081-1-sean@poorly.run +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/drm_atomic_helper.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c +index 1f08d597b87a..d05ed0521e20 100644 +--- a/drivers/gpu/drm/drm_atomic_helper.c ++++ b/drivers/gpu/drm/drm_atomic_helper.c +@@ -2899,7 +2899,7 @@ EXPORT_SYMBOL(drm_atomic_helper_suspend); + int drm_atomic_helper_commit_duplicated_state(struct drm_atomic_state *state, + struct drm_modeset_acquire_ctx *ctx) + { +- int i; ++ int i, ret; + struct drm_plane *plane; + struct drm_plane_state *new_plane_state; + struct drm_connector *connector; +@@ -2918,7 +2918,11 @@ int drm_atomic_helper_commit_duplicated_state(struct drm_atomic_state *state, + for_each_new_connector_in_state(state, connector, new_conn_state, i) + state->connectors[i].old_state = connector->state; + +- return drm_atomic_commit(state); ++ ret = drm_atomic_commit(state); ++ ++ state->acquire_ctx = NULL; ++ ++ return ret; + } + EXPORT_SYMBOL(drm_atomic_helper_commit_duplicated_state); + +-- +2.19.1 + diff --git a/queue-4.14/drm-rockchip-fix-for-mailbox-read-size.patch b/queue-4.14/drm-rockchip-fix-for-mailbox-read-size.patch new file mode 100644 index 00000000000..5c600b618df --- /dev/null +++ b/queue-4.14/drm-rockchip-fix-for-mailbox-read-size.patch @@ -0,0 +1,45 @@ +From 04ca94d0e54e79d87b11480e7353661f9ed9a493 Mon Sep 17 00:00:00 2001 +From: Damian Kos +Date: Tue, 6 Nov 2018 15:37:05 +0000 +Subject: drm/rockchip: fix for mailbox read size + +[ Upstream commit fa68d4f8476bea4cdf441062b614b41bb85ef1da ] + +Some of the functions (like cdn_dp_dpcd_read, cdn_dp_get_edid_block) +allow to read 64KiB, but the cdn_dp_mailbox_read_receive, that is +used by them, can read only up to 255 bytes at once. Normally, it's +not a big issue as DPCD or EDID reads won't (hopefully) exceed that +value. +The real issue here is the revocation list read during the HDCP +authentication process. (problematic use case: +https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-4.4/drivers/gpu/drm/rockchip/cdn-dp-reg.c#1152) +The list can reach 127*5+4 bytes (num devs * 5 bytes per ID/Bksv + +4 bytes of an additional info). +In other words - CTSes with HDCP Repeater won't pass without this +fix. Oh, and the driver will most likely stop working (best case +scenario). + +Signed-off-by: Damian Kos +Signed-off-by: Heiko Stuebner +Link: https://patchwork.freedesktop.org/patch/msgid/1541518625-25984-1-git-send-email-dkos@cadence.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/rockchip/cdn-dp-reg.c +index b14d211f6c21..0ed7e91471f6 100644 +--- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c ++++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.c +@@ -147,7 +147,7 @@ static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp, + } + + static int cdn_dp_mailbox_read_receive(struct cdn_dp_device *dp, +- u8 *buff, u8 buff_size) ++ u8 *buff, u16 buff_size) + { + u32 i; + int ret; +-- +2.19.1 + diff --git a/queue-4.14/drm-vc4-x_scaling-1-should-never-be-set-to-vc4_scali.patch b/queue-4.14/drm-vc4-x_scaling-1-should-never-be-set-to-vc4_scali.patch new file mode 100644 index 00000000000..6cf0887e846 --- /dev/null +++ b/queue-4.14/drm-vc4-x_scaling-1-should-never-be-set-to-vc4_scali.patch @@ -0,0 +1,54 @@ +From 0f8eb5a0049192e8774c97759ed292080af3fee7 Mon Sep 17 00:00:00 2001 +From: Boris Brezillon +Date: Fri, 9 Nov 2018 11:26:32 +0100 +Subject: drm/vc4: ->x_scaling[1] should never be set to VC4_SCALING_NONE + +[ Upstream commit 0560054da5673b25d56bea6c57c8d069673af73b ] + +For the YUV conversion to work properly, ->x_scaling[1] should never +be set to VC4_SCALING_NONE, but vc4_get_scaling_mode() might return +VC4_SCALING_NONE if the horizontal scaling ratio exactly matches the +horizontal subsampling factor. Add a test to turn VC4_SCALING_NONE +into VC4_SCALING_PPF when that happens. + +The old ->x_scaling[0] adjustment is dropped as I couldn't find any +mention to this constraint in the spec and it's proven to be +unnecessary (I tested various multi-planar YUV formats with scaling +disabled, and all of them worked fine without this adjustment). + +Fixes: fc04023fafec ("drm/vc4: Add support for YUV planes.") +Signed-off-by: Boris Brezillon +Reviewed-by: Eric Anholt +Link: https://patchwork.freedesktop.org/patch/msgid/20181109102633.32603-1-boris.brezillon@bootlin.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/vc4/vc4_plane.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c +index 5bd3c2ef0067..6277a3f2d5d1 100644 +--- a/drivers/gpu/drm/vc4/vc4_plane.c ++++ b/drivers/gpu/drm/vc4/vc4_plane.c +@@ -347,12 +347,14 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state) + vc4_get_scaling_mode(vc4_state->src_h[1], + vc4_state->crtc_h); + +- /* YUV conversion requires that horizontal scaling be enabled, +- * even on a plane that's otherwise 1:1. Looks like only PPF +- * works in that case, so let's pick that one. ++ /* YUV conversion requires that horizontal scaling be enabled ++ * on the UV plane even if vc4_get_scaling_mode() returned ++ * VC4_SCALING_NONE (which can happen when the down-scaling ++ * ratio is 0.5). Let's force it to VC4_SCALING_PPF in this ++ * case. + */ +- if (vc4_state->is_unity) +- vc4_state->x_scaling[0] = VC4_SCALING_PPF; ++ if (vc4_state->x_scaling[1] == VC4_SCALING_NONE) ++ vc4_state->x_scaling[1] = VC4_SCALING_PPF; + } else { + vc4_state->is_yuv = false; + vc4_state->x_scaling[1] = VC4_SCALING_NONE; +-- +2.19.1 + diff --git a/queue-4.14/drm-vgem-fix-vgem_init-to-get-drm-device-available.patch b/queue-4.14/drm-vgem-fix-vgem_init-to-get-drm-device-available.patch new file mode 100644 index 00000000000..f7e281b7712 --- /dev/null +++ b/queue-4.14/drm-vgem-fix-vgem_init-to-get-drm-device-available.patch @@ -0,0 +1,71 @@ +From b87c8d65c5f6a2e9b1b9ad490fda7f55e084b5bf Mon Sep 17 00:00:00 2001 +From: Deepak Sharma +Date: Tue, 23 Oct 2018 17:35:48 +0100 +Subject: drm/vgem: Fix vgem_init to get drm device available. + +[ Upstream commit d5c04dff24870ef07ce6453a3f4e1ffd9cf88d27 ] + +Modify vgem_init to take platform dev as parent in drm_dev_init. +This will make drm device available at "/sys/devices/platform/vgem" +in x86 chromebook. + +v2: rebase, address checkpatch typo and line over 80 characters + +Cc: Daniel Vetter +Signed-off-by: Deepak Sharma +Reviewed-by: Sean Paul +Signed-off-by: Emil Velikov +Reviewed-by: Daniel Vetter +Link: https://patchwork.freedesktop.org/patch/msgid/20181023163550.15211-1-emil.l.velikov@gmail.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/vgem/vgem_drv.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c +index 2524ff116f00..81c7ab10c083 100644 +--- a/drivers/gpu/drm/vgem/vgem_drv.c ++++ b/drivers/gpu/drm/vgem/vgem_drv.c +@@ -472,31 +472,31 @@ static int __init vgem_init(void) + if (!vgem_device) + return -ENOMEM; + +- ret = drm_dev_init(&vgem_device->drm, &vgem_driver, NULL); +- if (ret) +- goto out_free; +- + vgem_device->platform = + platform_device_register_simple("vgem", -1, NULL, 0); + if (IS_ERR(vgem_device->platform)) { + ret = PTR_ERR(vgem_device->platform); +- goto out_fini; ++ goto out_free; + } + + dma_coerce_mask_and_coherent(&vgem_device->platform->dev, + DMA_BIT_MASK(64)); ++ ret = drm_dev_init(&vgem_device->drm, &vgem_driver, ++ &vgem_device->platform->dev); ++ if (ret) ++ goto out_unregister; + + /* Final step: expose the device/driver to userspace */ + ret = drm_dev_register(&vgem_device->drm, 0); + if (ret) +- goto out_unregister; ++ goto out_fini; + + return 0; + +-out_unregister: +- platform_device_unregister(vgem_device->platform); + out_fini: + drm_dev_fini(&vgem_device->drm); ++out_unregister: ++ platform_device_unregister(vgem_device->platform); + out_free: + kfree(vgem_device); + return ret; +-- +2.19.1 + diff --git a/queue-4.14/exec-load_script-don-t-blindly-truncate-shebang-stri.patch b/queue-4.14/exec-load_script-don-t-blindly-truncate-shebang-stri.patch new file mode 100644 index 00000000000..2f7495840cd --- /dev/null +++ b/queue-4.14/exec-load_script-don-t-blindly-truncate-shebang-stri.patch @@ -0,0 +1,54 @@ +From 9239c5fde85da3d2508b43f8e620606cfe43533f Mon Sep 17 00:00:00 2001 +From: Oleg Nesterov +Date: Thu, 3 Jan 2019 15:28:07 -0800 +Subject: exec: load_script: don't blindly truncate shebang string + +[ Upstream commit 8099b047ecc431518b9bb6bdbba3549bbecdc343 ] + +load_script() simply truncates bprm->buf and this is very wrong if the +length of shebang string exceeds BINPRM_BUF_SIZE-2. This can silently +truncate i_arg or (worse) we can execute the wrong binary if buf[2:126] +happens to be the valid executable path. + +Change load_script() to return ENOEXEC if it can't find '\n' or zero in +bprm->buf. Note that '\0' can come from either +prepare_binprm()->memset() or from kernel_read(), we do not care. + +Link: http://lkml.kernel.org/r/20181112160931.GA28463@redhat.com +Signed-off-by: Oleg Nesterov +Acked-by: Kees Cook +Acked-by: Michal Hocko +Cc: Ben Woodard +Cc: "Eric W. Biederman" +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + fs/binfmt_script.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c +index 7cde3f46ad26..d0078cbb718b 100644 +--- a/fs/binfmt_script.c ++++ b/fs/binfmt_script.c +@@ -42,10 +42,14 @@ static int load_script(struct linux_binprm *bprm) + fput(bprm->file); + bprm->file = NULL; + +- bprm->buf[BINPRM_BUF_SIZE - 1] = '\0'; +- if ((cp = strchr(bprm->buf, '\n')) == NULL) +- cp = bprm->buf+BINPRM_BUF_SIZE-1; ++ for (cp = bprm->buf+2;; cp++) { ++ if (cp >= bprm->buf + BINPRM_BUF_SIZE) ++ return -ENOEXEC; ++ if (!*cp || (*cp == '\n')) ++ break; ++ } + *cp = '\0'; ++ + while (cp > bprm->buf) { + cp--; + if ((*cp == ' ') || (*cp == '\t')) +-- +2.19.1 + diff --git a/queue-4.14/f2fs-avoid-build-warn-of-fall_through.patch b/queue-4.14/f2fs-avoid-build-warn-of-fall_through.patch new file mode 100644 index 00000000000..5a6de9461fe --- /dev/null +++ b/queue-4.14/f2fs-avoid-build-warn-of-fall_through.patch @@ -0,0 +1,43 @@ +From b6dca37ea09e8e31e204e0ebd8789802ea1708d8 Mon Sep 17 00:00:00 2001 +From: Jaegeuk Kim +Date: Mon, 26 Nov 2018 14:20:32 -0800 +Subject: f2fs: avoid build warn of fall_through + +[ Upstream commit f5d5510e7389fa264337fb524346bac9eb93adc8 ] + +After merging the f2fs tree, today's linux-next build + (x86_64_allmodconfig) produced this warning: + + In file included from fs/f2fs/dir.c:11: + fs/f2fs/f2fs.h: In function '__mark_inode_dirty_flag': + fs/f2fs/f2fs.h:2388:6: warning: this statement may fall through [-Wimplicit-fallthrough=] + if (set) + ^ + fs/f2fs/f2fs.h:2390:2: note: here + case FI_DATA_EXIST: + ^~~~ + + Exposed by my use of -Wimplicit-fallthrough + +Reported-by: Stephen Rothwell +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/f2fs.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h +index 3f1a44696036..d2873f227072 100644 +--- a/fs/f2fs/f2fs.h ++++ b/fs/f2fs/f2fs.h +@@ -2014,6 +2014,7 @@ static inline void __mark_inode_dirty_flag(struct inode *inode, + case FI_INLINE_DENTRY: + if (set) + return; ++ /* fall through */ + case FI_DATA_EXIST: + case FI_INLINE_DOTS: + f2fs_mark_inode_dirty_sync(inode, true); +-- +2.19.1 + diff --git a/queue-4.14/f2fs-fix-race-between-write_checkpoint-and-write_beg.patch b/queue-4.14/f2fs-fix-race-between-write_checkpoint-and-write_beg.patch new file mode 100644 index 00000000000..1feba4baff0 --- /dev/null +++ b/queue-4.14/f2fs-fix-race-between-write_checkpoint-and-write_beg.patch @@ -0,0 +1,90 @@ +From fa6fbff6f10936ecc93a193adc181c95e2576108 Mon Sep 17 00:00:00 2001 +From: Sheng Yong +Date: Wed, 14 Nov 2018 19:34:28 +0800 +Subject: f2fs: fix race between write_checkpoint and write_begin + +[ Upstream commit 2866fb16d67992195b0526d19e65acb6640fb87f ] + +The following race could lead to inconsistent SIT bitmap: + +Task A Task B +====== ====== +f2fs_write_checkpoint + block_operations + f2fs_lock_all + down_write(node_change) + down_write(node_write) + ... sync ... + up_write(node_change) + f2fs_file_write_iter + set_inode_flag(FI_NO_PREALLOC) + ...... + f2fs_write_begin(index=0, has inline data) + prepare_write_begin + __do_map_lock(AIO) => down_read(node_change) + f2fs_convert_inline_page => update SIT + __do_map_lock(AIO) => up_read(node_change) + f2fs_flush_sit_entries <= inconsistent SIT + finish write checkpoint + sudden-power-off + +If SPO occurs after checkpoint is finished, SIT bitmap will be set +incorrectly. + +Signed-off-by: Sheng Yong +Reviewed-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/data.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c +index c68b319b07aa..3d37124eb63e 100644 +--- a/fs/f2fs/data.c ++++ b/fs/f2fs/data.c +@@ -1880,6 +1880,7 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi, + bool locked = false; + struct extent_info ei = {0,0,0}; + int err = 0; ++ int flag; + + /* + * we already allocated all the blocks, so we don't need to get +@@ -1889,9 +1890,15 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi, + !is_inode_flag_set(inode, FI_NO_PREALLOC)) + return 0; + ++ /* f2fs_lock_op avoids race between write CP and convert_inline_page */ ++ if (f2fs_has_inline_data(inode) && pos + len > MAX_INLINE_DATA(inode)) ++ flag = F2FS_GET_BLOCK_DEFAULT; ++ else ++ flag = F2FS_GET_BLOCK_PRE_AIO; ++ + if (f2fs_has_inline_data(inode) || + (pos & PAGE_MASK) >= i_size_read(inode)) { +- __do_map_lock(sbi, F2FS_GET_BLOCK_PRE_AIO, true); ++ __do_map_lock(sbi, flag, true); + locked = true; + } + restart: +@@ -1929,6 +1936,7 @@ restart: + f2fs_put_dnode(&dn); + __do_map_lock(sbi, F2FS_GET_BLOCK_PRE_AIO, + true); ++ WARN_ON(flag != F2FS_GET_BLOCK_PRE_AIO); + locked = true; + goto restart; + } +@@ -1942,7 +1950,7 @@ out: + f2fs_put_dnode(&dn); + unlock_out: + if (locked) +- __do_map_lock(sbi, F2FS_GET_BLOCK_PRE_AIO, false); ++ __do_map_lock(sbi, flag, false); + return err; + } + +-- +2.19.1 + diff --git a/queue-4.14/f2fs-fix-sbi-extent_list-corruption-issue.patch b/queue-4.14/f2fs-fix-sbi-extent_list-corruption-issue.patch new file mode 100644 index 00000000000..e8db3dd15c8 --- /dev/null +++ b/queue-4.14/f2fs-fix-sbi-extent_list-corruption-issue.patch @@ -0,0 +1,92 @@ +From a140d6c99117e96ee6a7d7eb786f1222b234fb66 Mon Sep 17 00:00:00 2001 +From: Sahitya Tummala +Date: Tue, 18 Dec 2018 16:39:24 +0530 +Subject: f2fs: fix sbi->extent_list corruption issue + +[ Upstream commit e4589fa545e0020dbbc3c9bde35f35f949901392 ] + +When there is a failure in f2fs_fill_super() after/during +the recovery of fsync'd nodes, it frees the current sbi and +retries again. This time the mount is successful, but the files +that got recovered before retry, still holds the extent tree, +whose extent nodes list is corrupted since sbi and sbi->extent_list +is freed up. The list_del corruption issue is observed when the +file system is getting unmounted and when those recoverd files extent +node is being freed up in the below context. + +list_del corruption. prev->next should be fffffff1e1ef5480, but was (null) +<...> +kernel BUG at kernel/msm-4.14/lib/list_debug.c:53! +lr : __list_del_entry_valid+0x94/0xb4 +pc : __list_del_entry_valid+0x94/0xb4 +<...> +Call trace: +__list_del_entry_valid+0x94/0xb4 +__release_extent_node+0xb0/0x114 +__free_extent_tree+0x58/0x7c +f2fs_shrink_extent_tree+0xdc/0x3b0 +f2fs_leave_shrinker+0x28/0x7c +f2fs_put_super+0xfc/0x1e0 +generic_shutdown_super+0x70/0xf4 +kill_block_super+0x2c/0x5c +kill_f2fs_super+0x44/0x50 +deactivate_locked_super+0x60/0x8c +deactivate_super+0x68/0x74 +cleanup_mnt+0x40/0x78 +__cleanup_mnt+0x1c/0x28 +task_work_run+0x48/0xd0 +do_notify_resume+0x678/0xe98 +work_pending+0x8/0x14 + +Fix this by not creating extents for those recovered files if shrinker is +not registered yet. Once mount is successful and shrinker is registered, +those files can have extents again. + +Signed-off-by: Sahitya Tummala +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/f2fs.h | 11 ++++++++++- + fs/f2fs/shrinker.c | 2 +- + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h +index d2873f227072..64760314c5f2 100644 +--- a/fs/f2fs/f2fs.h ++++ b/fs/f2fs/f2fs.h +@@ -2295,10 +2295,19 @@ static inline bool is_dot_dotdot(const struct qstr *str) + + static inline bool f2fs_may_extent_tree(struct inode *inode) + { +- if (!test_opt(F2FS_I_SB(inode), EXTENT_CACHE) || ++ struct f2fs_sb_info *sbi = F2FS_I_SB(inode); ++ ++ if (!test_opt(sbi, EXTENT_CACHE) || + is_inode_flag_set(inode, FI_NO_EXTENT)) + return false; + ++ /* ++ * for recovered files during mount do not create extents ++ * if shrinker is not registered. ++ */ ++ if (list_empty(&sbi->s_list)) ++ return false; ++ + return S_ISREG(inode->i_mode); + } + +diff --git a/fs/f2fs/shrinker.c b/fs/f2fs/shrinker.c +index 5c60fc28ec75..ec71d2e29a15 100644 +--- a/fs/f2fs/shrinker.c ++++ b/fs/f2fs/shrinker.c +@@ -138,6 +138,6 @@ void f2fs_leave_shrinker(struct f2fs_sb_info *sbi) + f2fs_shrink_extent_tree(sbi, __count_extent_cache(sbi)); + + spin_lock(&f2fs_list_lock); +- list_del(&sbi->s_list); ++ list_del_init(&sbi->s_list); + spin_unlock(&f2fs_list_lock); + } +-- +2.19.1 + diff --git a/queue-4.14/f2fs-fix-wrong-return-value-of-f2fs_acl_create.patch b/queue-4.14/f2fs-fix-wrong-return-value-of-f2fs_acl_create.patch new file mode 100644 index 00000000000..6609f4b450a --- /dev/null +++ b/queue-4.14/f2fs-fix-wrong-return-value-of-f2fs_acl_create.patch @@ -0,0 +1,61 @@ +From 04bfa658890214e1d24cda37e3f417b569a75f81 Mon Sep 17 00:00:00 2001 +From: Tiezhu Yang +Date: Wed, 21 Nov 2018 07:21:38 +0800 +Subject: f2fs: fix wrong return value of f2fs_acl_create + +[ Upstream commit f6176473a0c7472380eef72ebeb330cf9485bf0a ] + +When call f2fs_acl_create_masq() failed, the caller f2fs_acl_create() +should return -EIO instead of -ENOMEM, this patch makes it consistent +with posix_acl_create() which has been fixed in commit beaf226b863a +("posix_acl: don't ignore return value of posix_acl_create_masq()"). + +Fixes: 83dfe53c185e ("f2fs: fix reference leaks in f2fs_acl_create") +Signed-off-by: Tiezhu Yang +Reviewed-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/acl.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c +index 436b3a1464d9..5e4860b8bbfc 100644 +--- a/fs/f2fs/acl.c ++++ b/fs/f2fs/acl.c +@@ -349,12 +349,14 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode, + return PTR_ERR(p); + + clone = f2fs_acl_clone(p, GFP_NOFS); +- if (!clone) +- goto no_mem; ++ if (!clone) { ++ ret = -ENOMEM; ++ goto release_acl; ++ } + + ret = f2fs_acl_create_masq(clone, mode); + if (ret < 0) +- goto no_mem_clone; ++ goto release_clone; + + if (ret == 0) + posix_acl_release(clone); +@@ -368,11 +370,11 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode, + + return 0; + +-no_mem_clone: ++release_clone: + posix_acl_release(clone); +-no_mem: ++release_acl: + posix_acl_release(p); +- return -ENOMEM; ++ return ret; + } + + int f2fs_init_acl(struct inode *inode, struct inode *dir, struct page *ipage, +-- +2.19.1 + diff --git a/queue-4.14/f2fs-move-dir-data-flush-to-write-checkpoint-process.patch b/queue-4.14/f2fs-move-dir-data-flush-to-write-checkpoint-process.patch new file mode 100644 index 00000000000..82c87bf3e9d --- /dev/null +++ b/queue-4.14/f2fs-move-dir-data-flush-to-write-checkpoint-process.patch @@ -0,0 +1,48 @@ +From 5641cdf29b90a83166aab8bc4f97b39df59d9359 Mon Sep 17 00:00:00 2001 +From: Yunlei He +Date: Tue, 6 Nov 2018 10:25:29 +0800 +Subject: f2fs: move dir data flush to write checkpoint process + +[ Upstream commit b61ac5b720146c619c7cdf17eff2551b934399e5 ] + +This patch move dir data flush to write checkpoint process, by +doing this, it may reduce some time for dir fsync. + +pre: + -f2fs_do_sync_file enter + -file_write_and_wait_range <- flush & wait + -write_checkpoint + -do_checkpoint <- wait all + -f2fs_do_sync_file exit + +now: + -f2fs_do_sync_file enter + -write_checkpoint + -block_operations <- flush dir & no wait + -do_checkpoint <- wait all + -f2fs_do_sync_file exit + +Signed-off-by: Yunlei He +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/file.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c +index 7d3189f1941c..5f549bc4e097 100644 +--- a/fs/f2fs/file.c ++++ b/fs/f2fs/file.c +@@ -205,6 +205,9 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end, + + trace_f2fs_sync_file_enter(inode); + ++ if (S_ISDIR(inode->i_mode)) ++ goto go_write; ++ + /* if fdatasync is triggered, let's do in-place-update */ + if (datasync || get_dirty_pages(inode) <= SM_I(sbi)->min_fsync_blocks) + set_inode_flag(inode, FI_NEED_IPU); +-- +2.19.1 + diff --git a/queue-4.14/fbdev-fbcon-fix-unregister-crash-when-more-than-one-.patch b/queue-4.14/fbdev-fbcon-fix-unregister-crash-when-more-than-one-.patch new file mode 100644 index 00000000000..dfef04f2d94 --- /dev/null +++ b/queue-4.14/fbdev-fbcon-fix-unregister-crash-when-more-than-one-.patch @@ -0,0 +1,84 @@ +From f4743b18960b7d18384be7e2c55d439b6189407f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= +Date: Thu, 20 Dec 2018 19:13:09 +0100 +Subject: fbdev: fbcon: Fix unregister crash when more than one framebuffer +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[ Upstream commit 2122b40580dd9d0620398739c773d07a7b7939d0 ] + +When unregistering fbdev using unregister_framebuffer(), any bound +console will unbind automatically. This is working fine if this is the +only framebuffer, resulting in a switch to the dummy console. However if +there is a fb0 and I unregister fb1 having a bound console, I eventually +get a crash. The fastest way for me to trigger the crash is to do a +reboot, resulting in this splat: + +[ 76.478825] WARNING: CPU: 0 PID: 527 at linux/kernel/workqueue.c:1442 __queue_work+0x2d4/0x41c +[ 76.478849] Modules linked in: raspberrypi_hwmon gpio_backlight backlight bcm2835_rng rng_core [last unloaded: tinydrm] +[ 76.478916] CPU: 0 PID: 527 Comm: systemd-udevd Not tainted 4.20.0-rc4+ #4 +[ 76.478933] Hardware name: BCM2835 +[ 76.478949] Backtrace: +[ 76.478995] [] (dump_backtrace) from [] (show_stack+0x20/0x24) +[ 76.479022] r6:00000000 r5:c0bc73be r4:00000000 r3:6fb5bf81 +[ 76.479060] [] (show_stack) from [] (dump_stack+0x20/0x28) +[ 76.479102] [] (dump_stack) from [] (__warn+0xec/0x12c) +[ 76.479134] [] (__warn) from [] (warn_slowpath_null+0x4c/0x58) +[ 76.479165] r9:c0eb6944 r8:00000001 r7:c0e927f8 r6:c0bc73be r5:000005a2 r4:c0139e84 +[ 76.479197] [] (warn_slowpath_null) from [] (__queue_work+0x2d4/0x41c) +[ 76.479222] r6:d7666a00 r5:c0e918ee r4:dbc4e700 +[ 76.479251] [] (__queue_work) from [] (queue_work_on+0x60/0x88) +[ 76.479281] r10:c0496bf8 r9:00000100 r8:c0e92ae0 r7:00000001 r6:d9403700 r5:d7666a00 +[ 76.479298] r4:20000113 +[ 76.479348] [] (queue_work_on) from [] (cursor_timer_handler+0x30/0x54) +[ 76.479374] r7:d8a8fabc r6:c0e08088 r5:d8afdc5c r4:d8a8fabc +[ 76.479413] [] (cursor_timer_handler) from [] (call_timer_fn+0x100/0x230) +[ 76.479435] r4:c0e9192f r3:d758a340 +[ 76.479465] [] (call_timer_fn) from [] (expire_timers+0x10c/0x12c) +[ 76.479495] r10:40000000 r9:c0e9192f r8:c0e92ae0 r7:d8afdccc r6:c0e19280 r5:c0496bf8 +[ 76.479513] r4:d8a8fabc +[ 76.479541] [] (expire_timers) from [] (run_timer_softirq+0xa8/0x184) +[ 76.479570] r9:00000001 r8:c0e19280 r7:00000000 r6:c0e08088 r5:c0e1a3e0 r4:c0e19280 +[ 76.479603] [] (run_timer_softirq) from [] (__do_softirq+0x1ac/0x3fc) +[ 76.479632] r10:c0e91680 r9:d8afc020 r8:0000000a r7:00000100 r6:00000001 r5:00000002 +[ 76.479650] r4:c0eb65ec +[ 76.479686] [] (__do_softirq) from [] (irq_exit+0xe8/0x168) +[ 76.479716] r10:d8d1a9b0 r9:d8afc000 r8:00000001 r7:d949c000 r6:00000000 r5:c0e8b3f0 +[ 76.479734] r4:00000000 +[ 76.479764] [] (irq_exit) from [] (__handle_domain_irq+0x94/0xb0) +[ 76.479793] [] (__handle_domain_irq) from [] (bcm2835_handle_irq+0x3c/0x48) +[ 76.479823] r8:d8afdebc r7:d8afddfc r6:ffffffff r5:c0e089f8 r4:d8afddc8 r3:d8afddc8 +[ 76.479851] [] (bcm2835_handle_irq) from [] (__irq_svc+0x70/0x98) + +The problem is in the console rebinding in fbcon_fb_unbind(). It uses the +virtual console index as the new framebuffer index to bind the console(s) +to. The correct way is to use the con2fb_map lookup table to find the +framebuffer index. + +Fixes: cfafca8067c6 ("fbdev: fbcon: console unregistration from unregister_framebuffer") +Signed-off-by: Noralf Trønnes +Reviewed-by: Mikulas Patocka +Acked-by: Daniel Vetter +Signed-off-by: Bartlomiej Zolnierkiewicz +Signed-off-by: Sasha Levin +--- + drivers/video/fbdev/core/fbcon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c +index 04612f938bab..85787119bfbf 100644 +--- a/drivers/video/fbdev/core/fbcon.c ++++ b/drivers/video/fbdev/core/fbcon.c +@@ -3041,7 +3041,7 @@ static int fbcon_fb_unbind(int idx) + for (i = first_fb_vc; i <= last_fb_vc; i++) { + if (con2fb_map[i] != idx && + con2fb_map[i] != -1) { +- new_idx = i; ++ new_idx = con2fb_map[i]; + break; + } + } +-- +2.19.1 + diff --git a/queue-4.14/fbdev-fbmem-behave-better-with-small-rotated-display.patch b/queue-4.14/fbdev-fbmem-behave-better-with-small-rotated-display.patch new file mode 100644 index 00000000000..1886e28053e --- /dev/null +++ b/queue-4.14/fbdev-fbmem-behave-better-with-small-rotated-display.patch @@ -0,0 +1,62 @@ +From b73f4c52a9f99d9f903db37ecf4191d9353d4210 Mon Sep 17 00:00:00 2001 +From: Peter Rosin +Date: Thu, 20 Dec 2018 19:13:07 +0100 +Subject: fbdev: fbmem: behave better with small rotated displays and many CPUs + +[ Upstream commit f75df8d4b4fabfad7e3cba2debfad12741c6fde7 ] + +Blitting an image with "negative" offsets is not working since there +is no clipping. It hopefully just crashes. For the bootup logo, there +is protection so that blitting does not happen as the image is drawn +further and further to the right (ROTATE_UR) or further and further +down (ROTATE_CW). There is however no protection when drawing in the +opposite directions (ROTATE_UD and ROTATE_CCW). + +Add back this protection. + +The regression is 20-odd years old but the mindless warning-killing +mentality displayed in commit 34bdb666f4b2 ("fbdev: fbmem: remove +positive test on unsigned values") is also to blame, methinks. + +Fixes: 448d479747b8 ("fbdev: fb_do_show_logo() updates") +Signed-off-by: Peter Rosin +Cc: Tomi Valkeinen +Cc: Fabian Frederick +Cc: Geert Uytterhoeven +cc: Geoff Levand +Cc: James Simmons +Signed-off-by: Bartlomiej Zolnierkiewicz +Signed-off-by: Sasha Levin +--- + drivers/video/fbdev/core/fbmem.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c +index 11d73b5fc885..302cce7185e3 100644 +--- a/drivers/video/fbdev/core/fbmem.c ++++ b/drivers/video/fbdev/core/fbmem.c +@@ -435,7 +435,9 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image, + image->dx += image->width + 8; + } + } else if (rotate == FB_ROTATE_UD) { +- for (x = 0; x < num; x++) { ++ u32 dx = image->dx; ++ ++ for (x = 0; x < num && image->dx <= dx; x++) { + info->fbops->fb_imageblit(info, image); + image->dx -= image->width + 8; + } +@@ -447,7 +449,9 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image, + image->dy += image->height + 8; + } + } else if (rotate == FB_ROTATE_CCW) { +- for (x = 0; x < num; x++) { ++ u32 dy = image->dy; ++ ++ for (x = 0; x < num && image->dy <= dy; x++) { + info->fbops->fb_imageblit(info, image); + image->dy -= image->height + 8; + } +-- +2.19.1 + diff --git a/queue-4.14/firmware-efi-add-null-pointer-checks-in-efivars-api-.patch b/queue-4.14/firmware-efi-add-null-pointer-checks-in-efivars-api-.patch new file mode 100644 index 00000000000..1d8d42c1123 --- /dev/null +++ b/queue-4.14/firmware-efi-add-null-pointer-checks-in-efivars-api-.patch @@ -0,0 +1,318 @@ +From f94593e62066f3ea5cc6f1835f82da910a508f32 Mon Sep 17 00:00:00 2001 +From: Arend van Spriel +Date: Thu, 29 Nov 2018 18:12:27 +0100 +Subject: firmware/efi: Add NULL pointer checks in efivars API functions + +[ Upstream commit ab2180a15ce54739fed381efb4cb12e78dfb1561 ] + +Since commit: + + ce2e6db554fa ("brcmfmac: Add support for getting nvram contents from EFI variables") + +we have a device driver accessing the efivars API. Several functions in +the efivars API assume __efivars is set, i.e., that they will be accessed +only after efivars_register() has been called. However, the following NULL +pointer access was reported calling efivar_entry_size() from the brcmfmac +device driver: + + Unable to handle kernel NULL pointer dereference at virtual address 00000008 + pgd = 60bfa5f1 + [00000008] *pgd=00000000 + Internal error: Oops: 5 [#1] SMP ARM + ... + Hardware name: NVIDIA Tegra SoC (Flattened Device Tree) + Workqueue: events request_firmware_work_func + PC is at efivar_entry_size+0x28/0x90 + LR is at brcmf_fw_complete_request+0x3f8/0x8d4 [brcmfmac] + pc : [] lr : [] psr: a00d0113 + sp : ede7fe28 ip : ee983410 fp : c1787f30 + r10: 00000000 r9 : 00000000 r8 : bf2b2258 + r7 : ee983000 r6 : c1604c48 r5 : ede7fe88 r4 : edf337c0 + r3 : 00000000 r2 : 00000000 r1 : ede7fe88 r0 : c17712c8 + Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none + Control: 10c5387d Table: ad16804a DAC: 00000051 + +Disassembly showed that the local static variable __efivars is NULL, +which is not entirely unexpected given that it is a non-EFI platform. + +So add a NULL pointer check to efivar_entry_size(), and to related +functions while at it. In efivars_register() a couple of sanity checks +are added as well. + +Reported-by: Jon Hunter +Signed-off-by: Arend van Spriel +Signed-off-by: Ard Biesheuvel +Cc: Andy Lutomirski +Cc: Bhupesh Sharma +Cc: Borislav Petkov +Cc: Dave Hansen +Cc: Eric Snowberg +Cc: Hans de Goede +Cc: Joe Perches +Cc: Julien Thierry +Cc: Linus Torvalds +Cc: Marc Zyngier +Cc: Matt Fleming +Cc: Nathan Chancellor +Cc: Peter Zijlstra +Cc: Sai Praneeth Prakhya +Cc: Sedat Dilek +Cc: Thomas Gleixner +Cc: YiFei Zhu +Cc: linux-efi@vger.kernel.org +Link: http://lkml.kernel.org/r/20181129171230.18699-9-ard.biesheuvel@linaro.org +Signed-off-by: Ingo Molnar +Signed-off-by: Sasha Levin +--- + drivers/firmware/efi/vars.c | 99 +++++++++++++++++++++++++++++-------- + 1 file changed, 78 insertions(+), 21 deletions(-) + +diff --git a/drivers/firmware/efi/vars.c b/drivers/firmware/efi/vars.c +index 9336ffdf6e2c..fceaafd67ec6 100644 +--- a/drivers/firmware/efi/vars.c ++++ b/drivers/firmware/efi/vars.c +@@ -318,7 +318,12 @@ EXPORT_SYMBOL_GPL(efivar_variable_is_removable); + static efi_status_t + check_var_size(u32 attributes, unsigned long size) + { +- const struct efivar_operations *fops = __efivars->ops; ++ const struct efivar_operations *fops; ++ ++ if (!__efivars) ++ return EFI_UNSUPPORTED; ++ ++ fops = __efivars->ops; + + if (!fops->query_variable_store) + return EFI_UNSUPPORTED; +@@ -329,7 +334,12 @@ check_var_size(u32 attributes, unsigned long size) + static efi_status_t + check_var_size_nonblocking(u32 attributes, unsigned long size) + { +- const struct efivar_operations *fops = __efivars->ops; ++ const struct efivar_operations *fops; ++ ++ if (!__efivars) ++ return EFI_UNSUPPORTED; ++ ++ fops = __efivars->ops; + + if (!fops->query_variable_store) + return EFI_UNSUPPORTED; +@@ -429,13 +439,18 @@ static void dup_variable_bug(efi_char16_t *str16, efi_guid_t *vendor_guid, + int efivar_init(int (*func)(efi_char16_t *, efi_guid_t, unsigned long, void *), + void *data, bool duplicates, struct list_head *head) + { +- const struct efivar_operations *ops = __efivars->ops; ++ const struct efivar_operations *ops; + unsigned long variable_name_size = 1024; + efi_char16_t *variable_name; + efi_status_t status; + efi_guid_t vendor_guid; + int err = 0; + ++ if (!__efivars) ++ return -EFAULT; ++ ++ ops = __efivars->ops; ++ + variable_name = kzalloc(variable_name_size, GFP_KERNEL); + if (!variable_name) { + printk(KERN_ERR "efivars: Memory allocation failed.\n"); +@@ -583,12 +598,14 @@ static void efivar_entry_list_del_unlock(struct efivar_entry *entry) + */ + int __efivar_entry_delete(struct efivar_entry *entry) + { +- const struct efivar_operations *ops = __efivars->ops; + efi_status_t status; + +- status = ops->set_variable(entry->var.VariableName, +- &entry->var.VendorGuid, +- 0, 0, NULL); ++ if (!__efivars) ++ return -EINVAL; ++ ++ status = __efivars->ops->set_variable(entry->var.VariableName, ++ &entry->var.VendorGuid, ++ 0, 0, NULL); + + return efi_status_to_err(status); + } +@@ -607,12 +624,17 @@ EXPORT_SYMBOL_GPL(__efivar_entry_delete); + */ + int efivar_entry_delete(struct efivar_entry *entry) + { +- const struct efivar_operations *ops = __efivars->ops; ++ const struct efivar_operations *ops; + efi_status_t status; + + if (down_interruptible(&efivars_lock)) + return -EINTR; + ++ if (!__efivars) { ++ up(&efivars_lock); ++ return -EINVAL; ++ } ++ ops = __efivars->ops; + status = ops->set_variable(entry->var.VariableName, + &entry->var.VendorGuid, + 0, 0, NULL); +@@ -650,13 +672,19 @@ EXPORT_SYMBOL_GPL(efivar_entry_delete); + int efivar_entry_set(struct efivar_entry *entry, u32 attributes, + unsigned long size, void *data, struct list_head *head) + { +- const struct efivar_operations *ops = __efivars->ops; ++ const struct efivar_operations *ops; + efi_status_t status; + efi_char16_t *name = entry->var.VariableName; + efi_guid_t vendor = entry->var.VendorGuid; + + if (down_interruptible(&efivars_lock)) + return -EINTR; ++ ++ if (!__efivars) { ++ up(&efivars_lock); ++ return -EINVAL; ++ } ++ ops = __efivars->ops; + if (head && efivar_entry_find(name, vendor, head, false)) { + up(&efivars_lock); + return -EEXIST; +@@ -687,12 +715,17 @@ static int + efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor, + u32 attributes, unsigned long size, void *data) + { +- const struct efivar_operations *ops = __efivars->ops; ++ const struct efivar_operations *ops; + efi_status_t status; + + if (down_trylock(&efivars_lock)) + return -EBUSY; + ++ if (!__efivars) { ++ up(&efivars_lock); ++ return -EINVAL; ++ } ++ + status = check_var_size_nonblocking(attributes, + size + ucs2_strsize(name, 1024)); + if (status != EFI_SUCCESS) { +@@ -700,6 +733,7 @@ efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor, + return -ENOSPC; + } + ++ ops = __efivars->ops; + status = ops->set_variable_nonblocking(name, &vendor, attributes, + size, data); + +@@ -727,9 +761,13 @@ efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor, + int efivar_entry_set_safe(efi_char16_t *name, efi_guid_t vendor, u32 attributes, + bool block, unsigned long size, void *data) + { +- const struct efivar_operations *ops = __efivars->ops; ++ const struct efivar_operations *ops; + efi_status_t status; + ++ if (!__efivars) ++ return -EINVAL; ++ ++ ops = __efivars->ops; + if (!ops->query_variable_store) + return -ENOSYS; + +@@ -829,13 +867,18 @@ EXPORT_SYMBOL_GPL(efivar_entry_find); + */ + int efivar_entry_size(struct efivar_entry *entry, unsigned long *size) + { +- const struct efivar_operations *ops = __efivars->ops; ++ const struct efivar_operations *ops; + efi_status_t status; + + *size = 0; + + if (down_interruptible(&efivars_lock)) + return -EINTR; ++ if (!__efivars) { ++ up(&efivars_lock); ++ return -EINVAL; ++ } ++ ops = __efivars->ops; + status = ops->get_variable(entry->var.VariableName, + &entry->var.VendorGuid, NULL, size, NULL); + up(&efivars_lock); +@@ -861,12 +904,14 @@ EXPORT_SYMBOL_GPL(efivar_entry_size); + int __efivar_entry_get(struct efivar_entry *entry, u32 *attributes, + unsigned long *size, void *data) + { +- const struct efivar_operations *ops = __efivars->ops; + efi_status_t status; + +- status = ops->get_variable(entry->var.VariableName, +- &entry->var.VendorGuid, +- attributes, size, data); ++ if (!__efivars) ++ return -EINVAL; ++ ++ status = __efivars->ops->get_variable(entry->var.VariableName, ++ &entry->var.VendorGuid, ++ attributes, size, data); + + return efi_status_to_err(status); + } +@@ -882,14 +927,19 @@ EXPORT_SYMBOL_GPL(__efivar_entry_get); + int efivar_entry_get(struct efivar_entry *entry, u32 *attributes, + unsigned long *size, void *data) + { +- const struct efivar_operations *ops = __efivars->ops; + efi_status_t status; + + if (down_interruptible(&efivars_lock)) + return -EINTR; +- status = ops->get_variable(entry->var.VariableName, +- &entry->var.VendorGuid, +- attributes, size, data); ++ ++ if (!__efivars) { ++ up(&efivars_lock); ++ return -EINVAL; ++ } ++ ++ status = __efivars->ops->get_variable(entry->var.VariableName, ++ &entry->var.VendorGuid, ++ attributes, size, data); + up(&efivars_lock); + + return efi_status_to_err(status); +@@ -921,7 +971,7 @@ EXPORT_SYMBOL_GPL(efivar_entry_get); + int efivar_entry_set_get_size(struct efivar_entry *entry, u32 attributes, + unsigned long *size, void *data, bool *set) + { +- const struct efivar_operations *ops = __efivars->ops; ++ const struct efivar_operations *ops; + efi_char16_t *name = entry->var.VariableName; + efi_guid_t *vendor = &entry->var.VendorGuid; + efi_status_t status; +@@ -940,6 +990,11 @@ int efivar_entry_set_get_size(struct efivar_entry *entry, u32 attributes, + if (down_interruptible(&efivars_lock)) + return -EINTR; + ++ if (!__efivars) { ++ err = -EINVAL; ++ goto out; ++ } ++ + /* + * Ensure that the available space hasn't shrunk below the safe level + */ +@@ -956,6 +1011,8 @@ int efivar_entry_set_get_size(struct efivar_entry *entry, u32 attributes, + } + } + ++ ops = __efivars->ops; ++ + status = ops->set_variable(name, vendor, attributes, *size, data); + if (status != EFI_SUCCESS) { + err = efi_status_to_err(status); +-- +2.19.1 + diff --git a/queue-4.14/fpga-altera-cvp-fix-registration-for-cvp-incapable-d.patch b/queue-4.14/fpga-altera-cvp-fix-registration-for-cvp-incapable-d.patch new file mode 100644 index 00000000000..8189f80cf5e --- /dev/null +++ b/queue-4.14/fpga-altera-cvp-fix-registration-for-cvp-incapable-d.patch @@ -0,0 +1,52 @@ +From 0a22d0cb5eda62dbabfe71b4d390d64ffd90ea5b Mon Sep 17 00:00:00 2001 +From: Andreas Puhm +Date: Wed, 7 Nov 2018 11:51:47 -0600 +Subject: fpga: altera-cvp: Fix registration for CvP incapable devices + +[ Upstream commit 68f60538daa4bc3da5d0764d46f391916fba20fd ] + +The probe function needs to verify the CvP enable bit in order to +properly determine if FPGA Manager functionality can be safely +enabled. + +Fixes: 34d1dc17ce97 ("fpga manager: Add Altera CvP driver") +Signed-off-by: Andreas Puhm +Signed-off-by: Anatolij Gustschin +Reviewed-by: Moritz Fischer +Acked-by: Alan Tull +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/fpga/altera-cvp.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c +index 00e73d28077c..b7558acd1a66 100644 +--- a/drivers/fpga/altera-cvp.c ++++ b/drivers/fpga/altera-cvp.c +@@ -404,6 +404,7 @@ static int altera_cvp_probe(struct pci_dev *pdev, + { + struct altera_cvp_conf *conf; + u16 cmd, val; ++ u32 regval; + int ret; + + /* +@@ -417,6 +418,14 @@ static int altera_cvp_probe(struct pci_dev *pdev, + return -ENODEV; + } + ++ pci_read_config_dword(pdev, VSE_CVP_STATUS, ®val); ++ if (!(regval & VSE_CVP_STATUS_CVP_EN)) { ++ dev_err(&pdev->dev, ++ "CVP is disabled for this device: CVP_STATUS Reg 0x%x\n", ++ regval); ++ return -ENODEV; ++ } ++ + conf = devm_kzalloc(&pdev->dev, sizeof(*conf), GFP_KERNEL); + if (!conf) + return -ENOMEM; +-- +2.19.1 + diff --git a/queue-4.14/fs-epoll-drop-ovflist-branch-prediction.patch b/queue-4.14/fs-epoll-drop-ovflist-branch-prediction.patch new file mode 100644 index 00000000000..2bcd719187f --- /dev/null +++ b/queue-4.14/fs-epoll-drop-ovflist-branch-prediction.patch @@ -0,0 +1,55 @@ +From 0e3dc1c8f7263356c1114ddd9571709d003b31b8 Mon Sep 17 00:00:00 2001 +From: Davidlohr Bueso +Date: Thu, 3 Jan 2019 15:27:09 -0800 +Subject: fs/epoll: drop ovflist branch prediction + +[ Upstream commit 76699a67f3041ff4c7af6d6ee9be2bfbf1ffb671 ] + +The ep->ovflist is a secondary ready-list to temporarily store events +that might occur when doing sproc without holding the ep->wq.lock. This +accounts for every time we check for ready events and also send events +back to userspace; both callbacks, particularly the latter because of +copy_to_user, can account for a non-trivial time. + +As such, the unlikely() check to see if the pointer is being used, seems +both misleading and sub-optimal. In fact, we go to an awful lot of +trouble to sync both lists, and populating the ovflist is far from an +uncommon scenario. + +For example, profiling a concurrent epoll_wait(2) benchmark, with +CONFIG_PROFILE_ANNOTATED_BRANCHES shows that for a two threads a 33% +incorrect rate was seen; and when incrementally increasing the number of +epoll instances (which is used, for example for multiple queuing load +balancing models), up to a 90% incorrect rate was seen. + +Similarly, by deleting the prediction, 3% throughput boost was seen +across incremental threads. + +Link: http://lkml.kernel.org/r/20181108051006.18751-4-dave@stgolabs.net +Signed-off-by: Davidlohr Bueso +Reviewed-by: Andrew Morton +Cc: Al Viro +Cc: Jason Baron +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + fs/eventpoll.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/eventpoll.c b/fs/eventpoll.c +index 2fabd19cdeea..c291bf61afb9 100644 +--- a/fs/eventpoll.c ++++ b/fs/eventpoll.c +@@ -1167,7 +1167,7 @@ static int ep_poll_callback(wait_queue_entry_t *wait, unsigned mode, int sync, v + * semantics). All the events that happen during that period of time are + * chained in ep->ovflist and requeued later on. + */ +- if (unlikely(ep->ovflist != EP_UNACTIVE_PTR)) { ++ if (ep->ovflist != EP_UNACTIVE_PTR) { + if (epi->next == EP_UNACTIVE_PTR) { + epi->next = ep->ovflist; + ep->ovflist = epi; +-- +2.19.1 + diff --git a/queue-4.14/fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch b/queue-4.14/fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch new file mode 100644 index 00000000000..459aacc3aab --- /dev/null +++ b/queue-4.14/fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch @@ -0,0 +1,77 @@ +From 4a43f992c7ec4eaadf1b36b1614c5e1c3f3841e1 Mon Sep 17 00:00:00 2001 +From: Benjamin Gordon +Date: Thu, 3 Jan 2019 15:25:56 -0800 +Subject: fs/proc/base.c: use ns_capable instead of capable for timerslack_ns + +[ Upstream commit 8da0b4f692c6d90b09c91f271517db746a22ff67 ] + +Access to timerslack_ns is controlled by a process having CAP_SYS_NICE +in its effective capability set, but the current check looks in the root +namespace instead of the process' user namespace. Since a process is +allowed to do other activities controlled by CAP_SYS_NICE inside a +namespace, it should also be able to adjust timerslack_ns. + +Link: http://lkml.kernel.org/r/20181030180012.232896-1-bmgordon@google.com +Signed-off-by: Benjamin Gordon +Acked-by: "Eric W. Biederman" +Cc: John Stultz +Cc: "Eric W. Biederman" +Cc: Kees Cook +Cc: "Serge E. Hallyn" +Cc: Thomas Gleixner +Cc: Arjan van de Ven +Cc: Oren Laadan +Cc: Ruchi Kandoi +Cc: Rom Lemarchand +Cc: Todd Kjos +Cc: Colin Cross +Cc: Nick Kralevich +Cc: Dmitry Shmidt +Cc: Elliott Hughes +Cc: Alexey Dobriyan +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + fs/proc/base.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/fs/proc/base.c b/fs/proc/base.c +index 9063738ff1f0..e26155a97afa 100644 +--- a/fs/proc/base.c ++++ b/fs/proc/base.c +@@ -2374,10 +2374,13 @@ static ssize_t timerslack_ns_write(struct file *file, const char __user *buf, + return -ESRCH; + + if (p != current) { +- if (!capable(CAP_SYS_NICE)) { ++ rcu_read_lock(); ++ if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) { ++ rcu_read_unlock(); + count = -EPERM; + goto out; + } ++ rcu_read_unlock(); + + err = security_task_setscheduler(p); + if (err) { +@@ -2410,11 +2413,14 @@ static int timerslack_ns_show(struct seq_file *m, void *v) + return -ESRCH; + + if (p != current) { +- +- if (!capable(CAP_SYS_NICE)) { ++ rcu_read_lock(); ++ if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) { ++ rcu_read_unlock(); + err = -EPERM; + goto out; + } ++ rcu_read_unlock(); ++ + err = security_task_getscheduler(p); + if (err) + goto out; +-- +2.19.1 + diff --git a/queue-4.14/fsl-fman-use-gfp_atomic-in-memac-tgec-_add_hash_mac_.patch b/queue-4.14/fsl-fman-use-gfp_atomic-in-memac-tgec-_add_hash_mac_.patch new file mode 100644 index 00000000000..e638b67e5f9 --- /dev/null +++ b/queue-4.14/fsl-fman-use-gfp_atomic-in-memac-tgec-_add_hash_mac_.patch @@ -0,0 +1,73 @@ +From c3b32510499a1bea73757fb85abac5edcd644144 Mon Sep 17 00:00:00 2001 +From: Scott Wood +Date: Thu, 27 Dec 2018 18:29:09 -0600 +Subject: fsl/fman: Use GFP_ATOMIC in {memac,tgec}_add_hash_mac_address() + +[ Upstream commit 0d9c9a238faf925823bde866182c663b6d734f2e ] + +These functions are called from atomic context: + +[ 9.150239] BUG: sleeping function called from invalid context at /home/scott/git/linux/mm/slab.h:421 +[ 9.158159] in_atomic(): 1, irqs_disabled(): 0, pid: 4432, name: ip +[ 9.163128] CPU: 8 PID: 4432 Comm: ip Not tainted 4.20.0-rc2-00169-g63d86876f324 #29 +[ 9.163130] Call Trace: +[ 9.170701] [c0000002e899a980] [c0000000009c1068] .dump_stack+0xa8/0xec (unreliable) +[ 9.177140] [c0000002e899aa10] [c00000000007a7b4] .___might_sleep+0x138/0x164 +[ 9.184440] [c0000002e899aa80] [c0000000001d5bac] .kmem_cache_alloc_trace+0x238/0x30c +[ 9.191216] [c0000002e899ab40] [c00000000065ea1c] .memac_add_hash_mac_address+0x104/0x198 +[ 9.199464] [c0000002e899abd0] [c00000000065a788] .set_multi+0x1c8/0x218 +[ 9.206242] [c0000002e899ac80] [c0000000006615ec] .dpaa_set_rx_mode+0xdc/0x17c +[ 9.213544] [c0000002e899ad00] [c00000000083d2b0] .__dev_set_rx_mode+0x80/0xd4 +[ 9.219535] [c0000002e899ad90] [c00000000083d334] .dev_set_rx_mode+0x30/0x54 +[ 9.225271] [c0000002e899ae10] [c00000000083d4a0] .__dev_open+0x148/0x1c8 +[ 9.230751] [c0000002e899aeb0] [c00000000083d934] .__dev_change_flags+0x19c/0x1e0 +[ 9.230755] [c0000002e899af60] [c00000000083d9a4] .dev_change_flags+0x2c/0x80 +[ 9.242752] [c0000002e899aff0] [c0000000008554ec] .do_setlink+0x350/0xf08 +[ 9.248228] [c0000002e899b170] [c000000000857ad0] .rtnl_newlink+0x588/0x7e0 +[ 9.253965] [c0000002e899b740] [c000000000852424] .rtnetlink_rcv_msg+0x3e0/0x498 +[ 9.261440] [c0000002e899b820] [c000000000884790] .netlink_rcv_skb+0x134/0x14c +[ 9.267607] [c0000002e899b8e0] [c000000000851840] .rtnetlink_rcv+0x18/0x2c +[ 9.274558] [c0000002e899b950] [c000000000883c8c] .netlink_unicast+0x214/0x318 +[ 9.281163] [c0000002e899ba00] [c000000000884220] .netlink_sendmsg+0x348/0x444 +[ 9.287076] [c0000002e899bae0] [c00000000080d13c] .sock_sendmsg+0x2c/0x54 +[ 9.287080] [c0000002e899bb50] [c0000000008106c0] .___sys_sendmsg+0x2d0/0x2d8 +[ 9.298375] [c0000002e899bd30] [c000000000811a80] .__sys_sendmsg+0x5c/0xb0 +[ 9.303939] [c0000002e899be20] [c0000000000006b0] system_call+0x60/0x6c + +Signed-off-by: Scott Wood +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/freescale/fman/fman_memac.c | 2 +- + drivers/net/ethernet/freescale/fman/fman_tgec.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c +index c0296880feba..75ce773c21a6 100644 +--- a/drivers/net/ethernet/freescale/fman/fman_memac.c ++++ b/drivers/net/ethernet/freescale/fman/fman_memac.c +@@ -927,7 +927,7 @@ int memac_add_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr) + hash = get_mac_addr_hash_code(addr) & HASH_CTRL_ADDR_MASK; + + /* Create element to be added to the driver hash table */ +- hash_entry = kmalloc(sizeof(*hash_entry), GFP_KERNEL); ++ hash_entry = kmalloc(sizeof(*hash_entry), GFP_ATOMIC); + if (!hash_entry) + return -ENOMEM; + hash_entry->addr = addr; +diff --git a/drivers/net/ethernet/freescale/fman/fman_tgec.c b/drivers/net/ethernet/freescale/fman/fman_tgec.c +index 4b0f3a50b293..e575259d20f4 100644 +--- a/drivers/net/ethernet/freescale/fman/fman_tgec.c ++++ b/drivers/net/ethernet/freescale/fman/fman_tgec.c +@@ -551,7 +551,7 @@ int tgec_add_hash_mac_address(struct fman_mac *tgec, enet_addr_t *eth_addr) + hash = (crc >> TGEC_HASH_MCAST_SHIFT) & TGEC_HASH_ADR_MSK; + + /* Create element to be added to the driver hash table */ +- hash_entry = kmalloc(sizeof(*hash_entry), GFP_KERNEL); ++ hash_entry = kmalloc(sizeof(*hash_entry), GFP_ATOMIC); + if (!hash_entry) + return -ENOMEM; + hash_entry->addr = addr; +-- +2.19.1 + diff --git a/queue-4.14/gdrom-fix-a-memory-leak-bug.patch b/queue-4.14/gdrom-fix-a-memory-leak-bug.patch new file mode 100644 index 00000000000..029e293f487 --- /dev/null +++ b/queue-4.14/gdrom-fix-a-memory-leak-bug.patch @@ -0,0 +1,39 @@ +From 4757af5037c738699f58e57bbb9a82292cc1aab2 Mon Sep 17 00:00:00 2001 +From: Wenwen Wang +Date: Wed, 26 Dec 2018 20:15:13 -0600 +Subject: gdrom: fix a memory leak bug + +[ Upstream commit 093c48213ee37c3c3ff1cf5ac1aa2a9d8bc66017 ] + +In probe_gdrom(), the buffer pointed by 'gd.cd_info' is allocated through +kzalloc() and is used to hold the information of the gdrom device. To +register and unregister the device, the pointer 'gd.cd_info' is passed to +the functions register_cdrom() and unregister_cdrom(), respectively. +However, this buffer is not freed after it is used, which can cause a +memory leak bug. + +This patch simply frees the buffer 'gd.cd_info' in exit_gdrom() to fix the +above issue. + +Signed-off-by: Wenwen Wang +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/cdrom/gdrom.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c +index ae3a7537cf0f..72cd96a8eb19 100644 +--- a/drivers/cdrom/gdrom.c ++++ b/drivers/cdrom/gdrom.c +@@ -889,6 +889,7 @@ static void __exit exit_gdrom(void) + platform_device_unregister(pd); + platform_driver_unregister(&gdrom_driver); + kfree(gd.toc); ++ kfree(gd.cd_info); + } + + module_init(init_gdrom); +-- +2.19.1 + diff --git a/queue-4.14/gpu-ipu-v3-image-convert-prevent-race-between-run-an.patch b/queue-4.14/gpu-ipu-v3-image-convert-prevent-race-between-run-an.patch new file mode 100644 index 00000000000..3b650873985 --- /dev/null +++ b/queue-4.14/gpu-ipu-v3-image-convert-prevent-race-between-run-an.patch @@ -0,0 +1,72 @@ +From b9bca25afcf178d1e5fb49b86bfb9bd7b63c5eb6 Mon Sep 17 00:00:00 2001 +From: Steve Longerbeam +Date: Wed, 19 Sep 2018 16:07:18 -0700 +Subject: gpu: ipu-v3: image-convert: Prevent race between run and unprepare + +[ Upstream commit 819bec35c8c9706185498c9222bd244e0781ad35 ] + +Prevent possible race by parallel threads between ipu_image_convert_run() +and ipu_image_convert_unprepare(). This involves setting ctx->aborting +to true unconditionally so that no new job runs can be queued during +unprepare, and holding the ctx->aborting flag until the context is freed. + +Note that the "normal" ipu_image_convert_abort() case (e.g. not during +context unprepare) should clear the ctx->aborting flag after aborting +any active run and clearing the context's pending queue. This is because +it should be possible to continue to use the conversion context and queue +more runs after an abort. + +Signed-off-by: Steve Longerbeam +Tested-by: Philipp Zabel +Signed-off-by: Philipp Zabel +Signed-off-by: Sasha Levin +--- + drivers/gpu/ipu-v3/ipu-image-convert.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/ipu-v3/ipu-image-convert.c b/drivers/gpu/ipu-v3/ipu-image-convert.c +index 524a717ab28e..a5e33d58e02f 100644 +--- a/drivers/gpu/ipu-v3/ipu-image-convert.c ++++ b/drivers/gpu/ipu-v3/ipu-image-convert.c +@@ -1518,7 +1518,7 @@ unlock: + EXPORT_SYMBOL_GPL(ipu_image_convert_queue); + + /* Abort any active or pending conversions for this context */ +-void ipu_image_convert_abort(struct ipu_image_convert_ctx *ctx) ++static void __ipu_image_convert_abort(struct ipu_image_convert_ctx *ctx) + { + struct ipu_image_convert_chan *chan = ctx->chan; + struct ipu_image_convert_priv *priv = chan->priv; +@@ -1545,7 +1545,7 @@ void ipu_image_convert_abort(struct ipu_image_convert_ctx *ctx) + + need_abort = (run_count || active_run); + +- ctx->aborting = need_abort; ++ ctx->aborting = true; + + spin_unlock_irqrestore(&chan->irqlock, flags); + +@@ -1566,7 +1566,11 @@ void ipu_image_convert_abort(struct ipu_image_convert_ctx *ctx) + dev_warn(priv->ipu->dev, "%s: timeout\n", __func__); + force_abort(ctx); + } ++} + ++void ipu_image_convert_abort(struct ipu_image_convert_ctx *ctx) ++{ ++ __ipu_image_convert_abort(ctx); + ctx->aborting = false; + } + EXPORT_SYMBOL_GPL(ipu_image_convert_abort); +@@ -1580,7 +1584,7 @@ void ipu_image_convert_unprepare(struct ipu_image_convert_ctx *ctx) + bool put_res; + + /* make sure no runs are hanging around */ +- ipu_image_convert_abort(ctx); ++ __ipu_image_convert_abort(ctx); + + dev_dbg(priv->ipu->dev, "%s: task %u: removing ctx %p\n", __func__, + chan->ic_task, ctx); +-- +2.19.1 + diff --git a/queue-4.14/hid-lenovo-add-checks-to-fix-of_led_classdev_registe.patch b/queue-4.14/hid-lenovo-add-checks-to-fix-of_led_classdev_registe.patch new file mode 100644 index 00000000000..1705f2e3ab1 --- /dev/null +++ b/queue-4.14/hid-lenovo-add-checks-to-fix-of_led_classdev_registe.patch @@ -0,0 +1,48 @@ +From 3d2af0d8a7b04c3db28360a1736872afa4b07d81 Mon Sep 17 00:00:00 2001 +From: Aditya Pakki +Date: Mon, 24 Dec 2018 15:39:14 -0600 +Subject: HID: lenovo: Add checks to fix of_led_classdev_register + +[ Upstream commit 6ae16dfb61bce538d48b7fe98160fada446056c5 ] + +In lenovo_probe_tpkbd(), the function of_led_classdev_register() could +return an error value that is unchecked. The fix adds these checks. + +Signed-off-by: Aditya Pakki +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-lenovo.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c +index 643b6eb54442..eacc76d2ab96 100644 +--- a/drivers/hid/hid-lenovo.c ++++ b/drivers/hid/hid-lenovo.c +@@ -743,7 +743,9 @@ static int lenovo_probe_tpkbd(struct hid_device *hdev) + data_pointer->led_mute.brightness_get = lenovo_led_brightness_get_tpkbd; + data_pointer->led_mute.brightness_set = lenovo_led_brightness_set_tpkbd; + data_pointer->led_mute.dev = dev; +- led_classdev_register(dev, &data_pointer->led_mute); ++ ret = led_classdev_register(dev, &data_pointer->led_mute); ++ if (ret < 0) ++ goto err; + + data_pointer->led_micmute.name = name_micmute; + data_pointer->led_micmute.brightness_get = +@@ -751,7 +753,11 @@ static int lenovo_probe_tpkbd(struct hid_device *hdev) + data_pointer->led_micmute.brightness_set = + lenovo_led_brightness_set_tpkbd; + data_pointer->led_micmute.dev = dev; +- led_classdev_register(dev, &data_pointer->led_micmute); ++ ret = led_classdev_register(dev, &data_pointer->led_micmute); ++ if (ret < 0) { ++ led_classdev_unregister(&data_pointer->led_mute); ++ goto err; ++ } + + lenovo_features_set_tpkbd(hdev); + +-- +2.19.1 + diff --git a/queue-4.14/hwmon-lm80-fix-a-missing-check-of-bus-read-in-lm80-p.patch b/queue-4.14/hwmon-lm80-fix-a-missing-check-of-bus-read-in-lm80-p.patch new file mode 100644 index 00000000000..91e54f5f9b8 --- /dev/null +++ b/queue-4.14/hwmon-lm80-fix-a-missing-check-of-bus-read-in-lm80-p.patch @@ -0,0 +1,53 @@ +From 8910f9415d8bd2ceb3006e46e8c3cd6ec966b858 Mon Sep 17 00:00:00 2001 +From: Kangjie Lu +Date: Fri, 21 Dec 2018 13:10:39 -0600 +Subject: hwmon: (lm80) fix a missing check of bus read in lm80 probe + +[ Upstream commit 9aa3aa15f4c2f74f47afd6c5db4b420fadf3f315 ] + +In lm80_probe(), if lm80_read_value() fails, it returns a negative +error number which is stored to data->fan[f_min] and will be further +used. We should avoid using the data if the read fails. + +The fix checks if lm80_read_value() fails, and if so, returns with the +error number. + +Signed-off-by: Kangjie Lu +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +--- + drivers/hwmon/lm80.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c +index 04f9df0d2341..0e30fa00204c 100644 +--- a/drivers/hwmon/lm80.c ++++ b/drivers/hwmon/lm80.c +@@ -628,6 +628,7 @@ static int lm80_probe(struct i2c_client *client, + struct device *dev = &client->dev; + struct device *hwmon_dev; + struct lm80_data *data; ++ int rv; + + data = devm_kzalloc(dev, sizeof(struct lm80_data), GFP_KERNEL); + if (!data) +@@ -640,8 +641,14 @@ static int lm80_probe(struct i2c_client *client, + lm80_init_client(client); + + /* A few vars need to be filled upon startup */ +- data->fan[f_min][0] = lm80_read_value(client, LM80_REG_FAN_MIN(1)); +- data->fan[f_min][1] = lm80_read_value(client, LM80_REG_FAN_MIN(2)); ++ rv = lm80_read_value(client, LM80_REG_FAN_MIN(1)); ++ if (rv < 0) ++ return rv; ++ data->fan[f_min][0] = rv; ++ rv = lm80_read_value(client, LM80_REG_FAN_MIN(2)); ++ if (rv < 0) ++ return rv; ++ data->fan[f_min][1] = rv; + + hwmon_dev = devm_hwmon_device_register_with_groups(dev, client->name, + data, lm80_groups); +-- +2.19.1 + diff --git a/queue-4.14/hwmon-lm80-fix-a-missing-check-of-the-status-of-smbu.patch b/queue-4.14/hwmon-lm80-fix-a-missing-check-of-the-status-of-smbu.patch new file mode 100644 index 00000000000..f0562221dd7 --- /dev/null +++ b/queue-4.14/hwmon-lm80-fix-a-missing-check-of-the-status-of-smbu.patch @@ -0,0 +1,58 @@ +From 8fc49e2215386590ee32ca84e4f7b2dc4e740c6c Mon Sep 17 00:00:00 2001 +From: Kangjie Lu +Date: Fri, 21 Dec 2018 13:01:33 -0600 +Subject: hwmon: (lm80) fix a missing check of the status of SMBus read + +[ Upstream commit c9c63915519b1def7043b184680f33c24cd49d7b ] + +If lm80_read_value() fails, it returns a negative number instead of the +correct read data. Therefore, we should avoid using the data if it +fails. + +The fix checks if lm80_read_value() fails, and if so, returns with the +error number. + +Signed-off-by: Kangjie Lu +[groeck: One variable for return values is enough] +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +--- + drivers/hwmon/lm80.c | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c +index 08e3945a6fbf..04f9df0d2341 100644 +--- a/drivers/hwmon/lm80.c ++++ b/drivers/hwmon/lm80.c +@@ -360,9 +360,11 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr, + struct i2c_client *client = data->client; + unsigned long min, val; + u8 reg; +- int err = kstrtoul(buf, 10, &val); +- if (err < 0) +- return err; ++ int rv; ++ ++ rv = kstrtoul(buf, 10, &val); ++ if (rv < 0) ++ return rv; + + /* Save fan_min */ + mutex_lock(&data->update_lock); +@@ -390,8 +392,11 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr, + return -EINVAL; + } + +- reg = (lm80_read_value(client, LM80_REG_FANDIV) & +- ~(3 << (2 * (nr + 1)))) | (data->fan_div[nr] << (2 * (nr + 1))); ++ rv = lm80_read_value(client, LM80_REG_FANDIV); ++ if (rv < 0) ++ return rv; ++ reg = (rv & ~(3 << (2 * (nr + 1)))) ++ | (data->fan_div[nr] << (2 * (nr + 1))); + lm80_write_value(client, LM80_REG_FANDIV, reg); + + /* Restore fan_min */ +-- +2.19.1 + diff --git a/queue-4.14/i2c-axxia-check-for-error-conditions-first.patch b/queue-4.14/i2c-axxia-check-for-error-conditions-first.patch new file mode 100644 index 00000000000..d5b69d8e428 --- /dev/null +++ b/queue-4.14/i2c-axxia-check-for-error-conditions-first.patch @@ -0,0 +1,85 @@ +From ca4aebb846984b03c9992afb4c4600d5454e7f7a Mon Sep 17 00:00:00 2001 +From: "Adamski, Krzysztof (Nokia - PL/Wroclaw)" +Date: Mon, 10 Dec 2018 15:01:27 +0000 +Subject: i2c-axxia: check for error conditions first + +[ Upstream commit 4f5c85fe3a60ace555d09898166af372547f97fc ] + +It was observed that when using seqentional mode contrary to the +documentation, the SS bit (which is supposed to only be set if +automatic/sequence command completed normally), is sometimes set +together with NA (NAK in address phase) causing transfer to falsely be +considered successful. + +My assumption is that this does not happen during manual mode since the +controller is stopping its work the moment it sets NA/ND bit in status +register. This is not the case in Automatic/Sequentional mode where it +is still working to send STOP condition and the actual status we get +depends on the time when the ISR is run. + +This patch changes the order of checking status bits in ISR - error +conditions are checked first and only if none of them occurred, the +transfer may be considered successful. This is required to introduce +using of sequentional mode in next patch. + +Signed-off-by: Krzysztof Adamski +Reviewed-by: Alexander Sverdlin +Signed-off-by: Wolfram Sang +Signed-off-by: Sasha Levin +--- + drivers/i2c/busses/i2c-axxia.c | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +diff --git a/drivers/i2c/busses/i2c-axxia.c b/drivers/i2c/busses/i2c-axxia.c +index deea13838648..30d80ce0bde3 100644 +--- a/drivers/i2c/busses/i2c-axxia.c ++++ b/drivers/i2c/busses/i2c-axxia.c +@@ -296,22 +296,7 @@ static irqreturn_t axxia_i2c_isr(int irq, void *_dev) + i2c_int_disable(idev, MST_STATUS_TFL); + } + +- if (status & MST_STATUS_SCC) { +- /* Stop completed */ +- i2c_int_disable(idev, ~MST_STATUS_TSS); +- complete(&idev->msg_complete); +- } else if (status & MST_STATUS_SNS) { +- /* Transfer done */ +- i2c_int_disable(idev, ~MST_STATUS_TSS); +- if (i2c_m_rd(idev->msg) && idev->msg_xfrd < idev->msg->len) +- axxia_i2c_empty_rx_fifo(idev); +- complete(&idev->msg_complete); +- } else if (status & MST_STATUS_TSS) { +- /* Transfer timeout */ +- idev->msg_err = -ETIMEDOUT; +- i2c_int_disable(idev, ~MST_STATUS_TSS); +- complete(&idev->msg_complete); +- } else if (unlikely(status & MST_STATUS_ERR)) { ++ if (unlikely(status & MST_STATUS_ERR)) { + /* Transfer error */ + i2c_int_disable(idev, ~0); + if (status & MST_STATUS_AL) +@@ -328,6 +313,21 @@ static irqreturn_t axxia_i2c_isr(int irq, void *_dev) + readl(idev->base + MST_TX_BYTES_XFRD), + readl(idev->base + MST_TX_XFER)); + complete(&idev->msg_complete); ++ } else if (status & MST_STATUS_SCC) { ++ /* Stop completed */ ++ i2c_int_disable(idev, ~MST_STATUS_TSS); ++ complete(&idev->msg_complete); ++ } else if (status & MST_STATUS_SNS) { ++ /* Transfer done */ ++ i2c_int_disable(idev, ~MST_STATUS_TSS); ++ if (i2c_m_rd(idev->msg) && idev->msg_xfrd < idev->msg->len) ++ axxia_i2c_empty_rx_fifo(idev); ++ complete(&idev->msg_complete); ++ } else if (status & MST_STATUS_TSS) { ++ /* Transfer timeout */ ++ idev->msg_err = -ETIMEDOUT; ++ i2c_int_disable(idev, ~MST_STATUS_TSS); ++ complete(&idev->msg_complete); + } + + out: +-- +2.19.1 + diff --git a/queue-4.14/i2c-sh_mobile-add-support-for-r8a77990-r-car-e3.patch b/queue-4.14/i2c-sh_mobile-add-support-for-r8a77990-r-car-e3.patch new file mode 100644 index 00000000000..fc1648d4890 --- /dev/null +++ b/queue-4.14/i2c-sh_mobile-add-support-for-r8a77990-r-car-e3.patch @@ -0,0 +1,41 @@ +From 51c8c72d25cd31dde91ef339a78081fa9bbcc3ea Mon Sep 17 00:00:00 2001 +From: Simon Horman +Date: Wed, 21 Nov 2018 13:09:28 +0100 +Subject: i2c: sh_mobile: add support for r8a77990 (R-Car E3) + +[ Upstream commit 5eb316e636eb298c204f5b368526d4480b63c0ba ] + +Add support for the IIC code for the r8a77990 (R-Car E3). + +It is not considered compatible with existing fallback bindings +due to the documented absence of automatic transmission registers. + +These registers are currently not used by the driver and +thus the provides the same behaviour for "renesas,iic-r8a77990" and +"renesas,rcar-gen3-iic". The point of declaring incompatibility is +to allow for automatic transmission register support to be added to +"renesas,iic-r8a77990" and "renesas,rcar-gen3-iic" in future. + +Signed-off-by: Simon Horman +Reviewed-by: Geert Uytterhoeven +Signed-off-by: Wolfram Sang +Signed-off-by: Sasha Levin +--- + drivers/i2c/busses/i2c-sh_mobile.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c +index 6f2aaeb7c4fa..338344e76e02 100644 +--- a/drivers/i2c/busses/i2c-sh_mobile.c ++++ b/drivers/i2c/busses/i2c-sh_mobile.c +@@ -836,6 +836,7 @@ static const struct of_device_id sh_mobile_i2c_dt_ids[] = { + { .compatible = "renesas,rcar-gen2-iic", .data = &fast_clock_dt_config }, + { .compatible = "renesas,iic-r8a7795", .data = &fast_clock_dt_config }, + { .compatible = "renesas,rcar-gen3-iic", .data = &fast_clock_dt_config }, ++ { .compatible = "renesas,iic-r8a77990", .data = &fast_clock_dt_config }, + { .compatible = "renesas,iic-sh73a0", .data = &fast_clock_dt_config }, + { .compatible = "renesas,rmobile-iic", .data = &default_dt_config }, + {}, +-- +2.19.1 + diff --git a/queue-4.14/i40e-define-proper-net_device-neigh_priv_len.patch b/queue-4.14/i40e-define-proper-net_device-neigh_priv_len.patch new file mode 100644 index 00000000000..dd373e7c75d --- /dev/null +++ b/queue-4.14/i40e-define-proper-net_device-neigh_priv_len.patch @@ -0,0 +1,46 @@ +From 60df6f590592ccac15fbe0974a702f77dbf6b18f Mon Sep 17 00:00:00 2001 +From: Konstantin Khorenko +Date: Fri, 23 Nov 2018 19:10:28 +0300 +Subject: i40e: define proper net_device::neigh_priv_len + +[ Upstream commit 31389b53b3e0b535867af9090a5d19ec64768d55 ] + +Out of bound read reported by KASan. + +i40iw_net_event() reads unconditionally 16 bytes from +neigh->primary_key while the memory allocated for +"neighbour" struct is evaluated in neigh_alloc() as + + tbl->entry_size + dev->neigh_priv_len + +where "dev" is a net_device. + +But the driver does not setup dev->neigh_priv_len and +we read beyond the neigh entry allocated memory, +so the patch in the next mail fixes this. + +Signed-off-by: Konstantin Khorenko +Tested-by: Andrew Bowers +Signed-off-by: Jeff Kirsher +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/i40e/i40e_main.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c +index 904b42becd45..5d47a51e74eb 100644 +--- a/drivers/net/ethernet/intel/i40e/i40e_main.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_main.c +@@ -9772,6 +9772,9 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) + ether_addr_copy(netdev->dev_addr, mac_addr); + ether_addr_copy(netdev->perm_addr, mac_addr); + ++ /* i40iw_net_event() reads 16 bytes from neigh->primary_key */ ++ netdev->neigh_priv_len = sizeof(u32) * 4; ++ + netdev->priv_flags |= IFF_UNICAST_FLT; + netdev->priv_flags |= IFF_SUPP_NOFCS; + /* Setup netdev TC information */ +-- +2.19.1 + diff --git a/queue-4.14/ib-hfi1-unreserve-a-reserved-request-when-it-is-comp.patch b/queue-4.14/ib-hfi1-unreserve-a-reserved-request-when-it-is-comp.patch new file mode 100644 index 00000000000..4f5c0b77408 --- /dev/null +++ b/queue-4.14/ib-hfi1-unreserve-a-reserved-request-when-it-is-comp.patch @@ -0,0 +1,46 @@ +From a7f9c2009ccfdb1774995d8ee65e61093f5ca8b1 Mon Sep 17 00:00:00 2001 +From: Kaike Wan +Date: Wed, 28 Nov 2018 10:22:09 -0800 +Subject: IB/hfi1: Unreserve a reserved request when it is completed + +[ Upstream commit ca95f802ef5139722acc8d30aeaab6fe5bbe939e ] + +Currently, When a reserved operation is completed, its entry in the send +queue will not be unreserved, which leads to the miscalculation of +qp->s_avail and thus the triggering of a WARN_ON call trace. This patch +fixes the problem by unreserving the reserved operation when it is +completed. + +Fixes: 856cc4c237ad ("IB/hfi1: Add the capability for reserved operations") +Reviewed-by: Mike Marciniszyn +Signed-off-by: Kaike Wan +Signed-off-by: Dennis Dalessandro +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/hw/hfi1/rc.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/infiniband/hw/hfi1/rc.c b/drivers/infiniband/hw/hfi1/rc.c +index 818bac1a4056..d3b8cb92fd6d 100644 +--- a/drivers/infiniband/hw/hfi1/rc.c ++++ b/drivers/infiniband/hw/hfi1/rc.c +@@ -1162,6 +1162,7 @@ void hfi1_rc_send_complete(struct rvt_qp *qp, struct hfi1_opa_header *opah) + if (cmp_psn(wqe->lpsn, qp->s_sending_psn) >= 0 && + cmp_psn(qp->s_sending_psn, qp->s_sending_hpsn) <= 0) + break; ++ rvt_qp_wqe_unreserve(qp, wqe); + s_last = qp->s_last; + trace_hfi1_qp_send_completion(qp, wqe, s_last); + if (++s_last >= qp->s_size) +@@ -1214,6 +1215,7 @@ static struct rvt_swqe *do_rc_completion(struct rvt_qp *qp, + u32 s_last; + + rvt_put_swqe(wqe); ++ rvt_qp_wqe_unreserve(qp, wqe); + s_last = qp->s_last; + trace_hfi1_qp_send_completion(qp, wqe, s_last); + if (++s_last >= qp->s_size) +-- +2.19.1 + diff --git a/queue-4.14/igb-fix-an-issue-that-pme-is-not-enabled-during-runt.patch b/queue-4.14/igb-fix-an-issue-that-pme-is-not-enabled-during-runt.patch new file mode 100644 index 00000000000..8d6a1e68679 --- /dev/null +++ b/queue-4.14/igb-fix-an-issue-that-pme-is-not-enabled-during-runt.patch @@ -0,0 +1,48 @@ +From bd8f4a55661ee4926346dff1df80031b0e016f42 Mon Sep 17 00:00:00 2001 +From: Kai-Heng Feng +Date: Mon, 3 Dec 2018 13:54:38 +0800 +Subject: igb: Fix an issue that PME is not enabled during runtime suspend + +[ Upstream commit 1fb3a7a75e2efcc83ef21f2434069cddd6fae6f5 ] + +I210 ethernet card doesn't wakeup when a cable gets plugged. It's +because its PME is not set. + +Since commit 42eca2302146 ("PCI: Don't touch card regs after runtime +suspend D3"), if the PCI state is saved, pci_pm_runtime_suspend() stops +calling pci_finish_runtime_suspend(), which enables the PCI PME. + +To fix the issue, let's not to save PCI states when it's runtime +suspend, to let the PCI subsystem enables PME. + +Fixes: 42eca2302146 ("PCI: Don't touch card regs after runtime suspend D3") +Signed-off-by: Kai-Heng Feng +Tested-by: Aaron Brown +Signed-off-by: Jeff Kirsher +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/igb/igb_main.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c +index 1c027f9d9af5..8892ea5cbb01 100644 +--- a/drivers/net/ethernet/intel/igb/igb_main.c ++++ b/drivers/net/ethernet/intel/igb/igb_main.c +@@ -7950,9 +7950,11 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake, + rtnl_unlock(); + + #ifdef CONFIG_PM +- retval = pci_save_state(pdev); +- if (retval) +- return retval; ++ if (!runtime) { ++ retval = pci_save_state(pdev); ++ if (retval) ++ return retval; ++ } + #endif + + status = rd32(E1000_STATUS); +-- +2.19.1 + diff --git a/queue-4.14/iio-accel-kxcjk1013-add-kiox010a-acpi-hardware-id.patch b/queue-4.14/iio-accel-kxcjk1013-add-kiox010a-acpi-hardware-id.patch new file mode 100644 index 00000000000..1c81cc060f9 --- /dev/null +++ b/queue-4.14/iio-accel-kxcjk1013-add-kiox010a-acpi-hardware-id.patch @@ -0,0 +1,38 @@ +From 58fb55b08956e4df73c3eaa4d0b574e77e6a8b81 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Tue, 20 Nov 2018 12:10:14 +0100 +Subject: iio: accel: kxcjk1013: Add KIOX010A ACPI Hardware-ID + +[ Upstream commit 7f6232e69539971cf9eaed07a6c14ab4a2361133 ] + +Various 2-in-1's use KIOX010A and KIOX020A as HIDs for 2 KXCJ91008 +accelerometers. The KIOX010A HID is for the one in the base and the +KIOX020A for the accelerometer in the keyboard. + +Since userspace does not have a way yet to deal with (or ignore) the +accelerometer in the keyboard, this commit just adds the KIOX010A HID +for now so that display rotation will work. + +Related: https://github.com/hadess/iio-sensor-proxy/issues/166 +Signed-off-by: Hans de Goede +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/iio/accel/kxcjk-1013.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c +index 3f968c46e667..784636800361 100644 +--- a/drivers/iio/accel/kxcjk-1013.c ++++ b/drivers/iio/accel/kxcjk-1013.c +@@ -1393,6 +1393,7 @@ static const struct acpi_device_id kx_acpi_match[] = { + {"KXCJ1008", KXCJ91008}, + {"KXCJ9000", KXCJ91008}, + {"KIOX000A", KXCJ91008}, ++ {"KIOX010A", KXCJ91008}, /* KXCJ91008 inside the display of a 2-in-1 */ + {"KXTJ1009", KXTJ21009}, + {"SMO8500", KXCJ91008}, + { }, +-- +2.19.1 + diff --git a/queue-4.14/iio-adc-meson-saradc-check-for-devm_kasprintf-failur.patch b/queue-4.14/iio-adc-meson-saradc-check-for-devm_kasprintf-failur.patch new file mode 100644 index 00000000000..f854bfa6f9c --- /dev/null +++ b/queue-4.14/iio-adc-meson-saradc-check-for-devm_kasprintf-failur.patch @@ -0,0 +1,49 @@ +From 23138e0543134730c0bb67dda6e964c0b82a97f4 Mon Sep 17 00:00:00 2001 +From: Nicholas Mc Guire +Date: Thu, 22 Nov 2018 08:46:43 +0100 +Subject: iio: adc: meson-saradc: check for devm_kasprintf failure + +[ Upstream commit aad172b017617994343e36d8659c69e14cd694fd ] + +devm_kasprintf() may return NULL on failure of internal allocation thus +the assignments to init.name are not safe if not checked. On error +meson_sar_adc_clk_init() returns negative values so -ENOMEM in the +(unlikely) failure case of devm_kasprintf() should be fine here. + +Signed-off-by: Nicholas Mc Guire +Fixes: 3adbf3427330 ("iio: adc: add a driver for the SAR ADC found in Amlogic Meson SoCs") +Acked-by: Martin Blumenstingl +Tested-by: Martin Blumenstingl +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/iio/adc/meson_saradc.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c +index 11484cb38b84..9a52a91166d2 100644 +--- a/drivers/iio/adc/meson_saradc.c ++++ b/drivers/iio/adc/meson_saradc.c +@@ -585,6 +585,9 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev, + + init.name = devm_kasprintf(&indio_dev->dev, GFP_KERNEL, "%pOF#adc_div", + indio_dev->dev.of_node); ++ if (!init.name) ++ return -ENOMEM; ++ + init.flags = 0; + init.ops = &clk_divider_ops; + clk_parents[0] = __clk_get_name(priv->clkin); +@@ -604,6 +607,9 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev, + + init.name = devm_kasprintf(&indio_dev->dev, GFP_KERNEL, "%pOF#adc_en", + indio_dev->dev.of_node); ++ if (!init.name) ++ return -ENOMEM; ++ + init.flags = CLK_SET_RATE_PARENT; + init.ops = &clk_gate_ops; + clk_parents[0] = __clk_get_name(priv->adc_div_clk); +-- +2.19.1 + diff --git a/queue-4.14/iio-adc-meson-saradc-fix-internal-clock-names.patch b/queue-4.14/iio-adc-meson-saradc-fix-internal-clock-names.patch new file mode 100644 index 00000000000..dd5224f27ce --- /dev/null +++ b/queue-4.14/iio-adc-meson-saradc-fix-internal-clock-names.patch @@ -0,0 +1,64 @@ +From 1ba8b4bec29ae3a10a98f8b2dcfe68d88ba2b6f4 Mon Sep 17 00:00:00 2001 +From: Martin Blumenstingl +Date: Thu, 22 Nov 2018 23:01:11 +0100 +Subject: iio: adc: meson-saradc: fix internal clock names + +[ Upstream commit 50314f98b0ac468218e7c9af8c99f215a35436df ] + +Before this patch we are registering the internal clocks (for example on +Meson8b, where the SAR ADC IP block implements the divider and gate +clocks) with the following names: +- /soc/cbus@c1100000/adc@8680#adc_div +- /soc/cbus@c1100000/adc@8680#adc_en + +This is bad because the common clock framework uses the clock to create +a directory in /clk. With such name, the directory creation +(silently) fails and the debugfs entry ends up being created at the +debugfs root. + +With this change, the new clock names are: +- c1108680.adc#adc_div +- c1108680.adc#adc_en + +This matches the clock naming scheme used in the PWM, Ethernet and MMC +drivers. It also fixes the problem with debugfs. +The idea is shamelessly taken from commit b96e9eb62841c5 ("pwm: meson: +Fix mux clock names"). + +Fixes: 3921db46a8c5bc ("iio: Convert to using %pOF instead of full_name") +Signed-off-by: Martin Blumenstingl +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/iio/adc/meson_saradc.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c +index 9a52a91166d2..2515badf8b28 100644 +--- a/drivers/iio/adc/meson_saradc.c ++++ b/drivers/iio/adc/meson_saradc.c +@@ -583,8 +583,8 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev, + struct clk_init_data init; + const char *clk_parents[1]; + +- init.name = devm_kasprintf(&indio_dev->dev, GFP_KERNEL, "%pOF#adc_div", +- indio_dev->dev.of_node); ++ init.name = devm_kasprintf(&indio_dev->dev, GFP_KERNEL, "%s#adc_div", ++ dev_name(indio_dev->dev.parent)); + if (!init.name) + return -ENOMEM; + +@@ -605,8 +605,8 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev, + if (WARN_ON(IS_ERR(priv->adc_div_clk))) + return PTR_ERR(priv->adc_div_clk); + +- init.name = devm_kasprintf(&indio_dev->dev, GFP_KERNEL, "%pOF#adc_en", +- indio_dev->dev.of_node); ++ init.name = devm_kasprintf(&indio_dev->dev, GFP_KERNEL, "%s#adc_en", ++ dev_name(indio_dev->dev.parent)); + if (!init.name) + return -ENOMEM; + +-- +2.19.1 + diff --git a/queue-4.14/iommu-amd-fix-amd_iommu-force_isolation.patch b/queue-4.14/iommu-amd-fix-amd_iommu-force_isolation.patch new file mode 100644 index 00000000000..ae5c57e9ed1 --- /dev/null +++ b/queue-4.14/iommu-amd-fix-amd_iommu-force_isolation.patch @@ -0,0 +1,55 @@ +From 24391e08d40203b6c3222d82bed733e214c1e2a0 Mon Sep 17 00:00:00 2001 +From: Yu Zhao +Date: Thu, 6 Dec 2018 14:39:15 -0700 +Subject: iommu/amd: Fix amd_iommu=force_isolation + +[ Upstream commit c12b08ebbe16f0d3a96a116d86709b04c1ee8e74 ] + +The parameter is still there but it's ignored. We need to check its +value before deciding to go into passthrough mode for AMD IOMMU v2 +capable device. + +We occasionally use this parameter to force v2 capable device into +translation mode to debug memory corruption that we suspect is +caused by DMA writes. + +To address the following comment from Joerg Roedel on the first +version, v2 capability of device is completely ignored. +> This breaks the iommu_v2 use-case, as it needs a direct mapping for the +> devices that support it. + +And from Documentation/admin-guide/kernel-parameters.txt: + This option does not override iommu=pt + +Fixes: aafd8ba0ca74 ("iommu/amd: Implement add_device and remove_device") + +Signed-off-by: Yu Zhao +Signed-off-by: Joerg Roedel +Signed-off-by: Sasha Levin +--- + drivers/iommu/amd_iommu.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c +index efa6cd2500b9..766103ea237e 100644 +--- a/drivers/iommu/amd_iommu.c ++++ b/drivers/iommu/amd_iommu.c +@@ -442,7 +442,14 @@ static int iommu_init_device(struct device *dev) + + dev_data->alias = get_alias(dev); + +- if (dev_is_pci(dev) && pci_iommuv2_capable(to_pci_dev(dev))) { ++ /* ++ * By default we use passthrough mode for IOMMUv2 capable device. ++ * But if amd_iommu=force_isolation is set (e.g. to debug DMA to ++ * invalid address), we ignore the capability for the device so ++ * it'll be forced to go into translation mode. ++ */ ++ if ((iommu_pass_through || !amd_iommu_force_isolation) && ++ dev_is_pci(dev) && pci_iommuv2_capable(to_pci_dev(dev))) { + struct amd_iommu *iommu; + + iommu = amd_iommu_rlookup_table[dev_data->devid]; +-- +2.19.1 + diff --git a/queue-4.14/iommu-arm-smmu-add-support-for-qcom-smmu-v2-variant.patch b/queue-4.14/iommu-arm-smmu-add-support-for-qcom-smmu-v2-variant.patch new file mode 100644 index 00000000000..985cbf5973a --- /dev/null +++ b/queue-4.14/iommu-arm-smmu-add-support-for-qcom-smmu-v2-variant.patch @@ -0,0 +1,55 @@ +From 274ad900a19122f2976fd44093476d1734cfb522 Mon Sep 17 00:00:00 2001 +From: Vivek Gautam +Date: Tue, 4 Dec 2018 11:52:13 +0530 +Subject: iommu/arm-smmu: Add support for qcom,smmu-v2 variant + +[ Upstream commit 89cddc563743cb1e0068867ac97013b2a5bf86aa ] + +qcom,smmu-v2 is an arm,smmu-v2 implementation with specific +clock and power requirements. +On msm8996, multiple cores, viz. mdss, video, etc. use this +smmu. On sdm845, this smmu is used with gpu. +Add bindings for the same. + +Signed-off-by: Vivek Gautam +Reviewed-by: Rob Herring +Reviewed-by: Tomasz Figa +Tested-by: Srinivas Kandagatla +Reviewed-by: Robin Murphy +Signed-off-by: Will Deacon +Signed-off-by: Sasha Levin +--- + drivers/iommu/arm-smmu.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c +index 15b5856475fc..01a6a0ea2a4f 100644 +--- a/drivers/iommu/arm-smmu.c ++++ b/drivers/iommu/arm-smmu.c +@@ -117,6 +117,7 @@ enum arm_smmu_implementation { + GENERIC_SMMU, + ARM_MMU500, + CAVIUM_SMMUV2, ++ QCOM_SMMUV2, + }; + + /* Until ACPICA headers cover IORT rev. C */ +@@ -1910,6 +1911,7 @@ ARM_SMMU_MATCH_DATA(smmu_generic_v2, ARM_SMMU_V2, GENERIC_SMMU); + ARM_SMMU_MATCH_DATA(arm_mmu401, ARM_SMMU_V1_64K, GENERIC_SMMU); + ARM_SMMU_MATCH_DATA(arm_mmu500, ARM_SMMU_V2, ARM_MMU500); + ARM_SMMU_MATCH_DATA(cavium_smmuv2, ARM_SMMU_V2, CAVIUM_SMMUV2); ++ARM_SMMU_MATCH_DATA(qcom_smmuv2, ARM_SMMU_V2, QCOM_SMMUV2); + + static const struct of_device_id arm_smmu_of_match[] = { + { .compatible = "arm,smmu-v1", .data = &smmu_generic_v1 }, +@@ -1918,6 +1920,7 @@ static const struct of_device_id arm_smmu_of_match[] = { + { .compatible = "arm,mmu-401", .data = &arm_mmu401 }, + { .compatible = "arm,mmu-500", .data = &arm_mmu500 }, + { .compatible = "cavium,smmu-v2", .data = &cavium_smmuv2 }, ++ { .compatible = "qcom,smmu-v2", .data = &qcom_smmuv2 }, + { }, + }; + MODULE_DEVICE_TABLE(of, arm_smmu_of_match); +-- +2.19.1 + diff --git a/queue-4.14/iommu-arm-smmu-v3-use-explicit-mb-when-moving-cons-p.patch b/queue-4.14/iommu-arm-smmu-v3-use-explicit-mb-when-moving-cons-p.patch new file mode 100644 index 00000000000..b8f27281a76 --- /dev/null +++ b/queue-4.14/iommu-arm-smmu-v3-use-explicit-mb-when-moving-cons-p.patch @@ -0,0 +1,48 @@ +From 1a27f2261b683a80ba80c38bc477757534550ac6 Mon Sep 17 00:00:00 2001 +From: Will Deacon +Date: Wed, 7 Nov 2018 22:58:24 +0000 +Subject: iommu/arm-smmu-v3: Use explicit mb() when moving cons pointer + +[ Upstream commit a868e8530441286342f90c1fd9c5f24de3aa2880 ] + +After removing an entry from a queue (e.g. reading an event in +arm_smmu_evtq_thread()) it is necessary to advance the MMIO consumer +pointer to free the queue slot back to the SMMU. A memory barrier is +required here so that all reads targetting the queue entry have +completed before the consumer pointer is updated. + +The implementation of queue_inc_cons() relies on a writel() to complete +the previous reads, but this is incorrect because writel() is only +guaranteed to complete prior writes. This patch replaces the call to +writel() with an mb(); writel_relaxed() sequence, which gives us the +read->write ordering which we require. + +Cc: Robin Murphy +Signed-off-by: Will Deacon +Signed-off-by: Sasha Levin +--- + drivers/iommu/arm-smmu-v3.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c +index 26e99c03390f..09eb258a9a7d 100644 +--- a/drivers/iommu/arm-smmu-v3.c ++++ b/drivers/iommu/arm-smmu-v3.c +@@ -730,7 +730,13 @@ static void queue_inc_cons(struct arm_smmu_queue *q) + u32 cons = (Q_WRP(q, q->cons) | Q_IDX(q, q->cons)) + 1; + + q->cons = Q_OVF(q, q->cons) | Q_WRP(q, cons) | Q_IDX(q, cons); +- writel(q->cons, q->cons_reg); ++ ++ /* ++ * Ensure that all CPU accesses (reads and writes) to the queue ++ * are complete before we update the cons pointer. ++ */ ++ mb(); ++ writel_relaxed(q->cons, q->cons_reg); + } + + static int queue_sync_prod(struct arm_smmu_queue *q) +-- +2.19.1 + diff --git a/queue-4.14/isdn-hisax-hfc_pci-fix-a-possible-concurrency-use-af.patch b/queue-4.14/isdn-hisax-hfc_pci-fix-a-possible-concurrency-use-af.patch new file mode 100644 index 00000000000..25c586ca292 --- /dev/null +++ b/queue-4.14/isdn-hisax-hfc_pci-fix-a-possible-concurrency-use-af.patch @@ -0,0 +1,53 @@ +From 480efe9830bd0edc8f863d0ef6c4f2a8d5967793 Mon Sep 17 00:00:00 2001 +From: Jia-Ju Bai +Date: Wed, 26 Dec 2018 22:09:34 +0800 +Subject: isdn: hisax: hfc_pci: Fix a possible concurrency use-after-free bug + in HFCPCI_l1hw() + +[ Upstream commit 7418e6520f22a2e35815122fa5a53d5bbfa2c10f ] + +In drivers/isdn/hisax/hfc_pci.c, the functions hfcpci_interrupt() and +HFCPCI_l1hw() may be concurrently executed. + +HFCPCI_l1hw() + line 1173: if (!cs->tx_skb) + +hfcpci_interrupt() + line 942: spin_lock_irqsave(); + line 1066: dev_kfree_skb_irq(cs->tx_skb); + +Thus, a possible concurrency use-after-free bug may occur +in HFCPCI_l1hw(). + +To fix these bugs, the calls to spin_lock_irqsave() and +spin_unlock_irqrestore() are added in HFCPCI_l1hw(), to protect the +access to cs->tx_skb. + +Signed-off-by: Jia-Ju Bai +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/isdn/hisax/hfc_pci.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c +index f9ca35cc32b1..b42d27a4c950 100644 +--- a/drivers/isdn/hisax/hfc_pci.c ++++ b/drivers/isdn/hisax/hfc_pci.c +@@ -1169,11 +1169,13 @@ HFCPCI_l1hw(struct PStack *st, int pr, void *arg) + if (cs->debug & L1_DEB_LAPD) + debugl1(cs, "-> PH_REQUEST_PULL"); + #endif ++ spin_lock_irqsave(&cs->lock, flags); + if (!cs->tx_skb) { + test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); + st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); + } else + test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); ++ spin_unlock_irqrestore(&cs->lock, flags); + break; + case (HW_RESET | REQUEST): + spin_lock_irqsave(&cs->lock, flags); +-- +2.19.1 + diff --git a/queue-4.14/kdb-don-t-back-trace-on-a-cpu-that-didn-t-round-up.patch b/queue-4.14/kdb-don-t-back-trace-on-a-cpu-that-didn-t-round-up.patch new file mode 100644 index 00000000000..86119bc7767 --- /dev/null +++ b/queue-4.14/kdb-don-t-back-trace-on-a-cpu-that-didn-t-round-up.patch @@ -0,0 +1,88 @@ +From 990c1aaedefaf2969fb65f7d5fa35698c504b400 Mon Sep 17 00:00:00 2001 +From: Douglas Anderson +Date: Tue, 4 Dec 2018 19:38:28 -0800 +Subject: kdb: Don't back trace on a cpu that didn't round up + +[ Upstream commit 162bc7f5afd75b72acbe3c5f3488ef7e64a3fe36 ] + +If you have a CPU that fails to round up and then run 'btc' you'll end +up crashing in kdb becaue we dereferenced NULL. Let's add a check. +It's wise to also set the task to NULL when leaving the debugger so +that if we fail to round up on a later entry into the debugger we +won't backtrace a stale task. + +Signed-off-by: Douglas Anderson +Acked-by: Daniel Thompson +Signed-off-by: Daniel Thompson +Signed-off-by: Sasha Levin +--- + kernel/debug/debug_core.c | 4 ++++ + kernel/debug/kdb/kdb_bt.c | 11 ++++++++++- + kernel/debug/kdb/kdb_debugger.c | 7 ------- + 3 files changed, 14 insertions(+), 8 deletions(-) + +diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c +index 65c0f1363788..94aa9ae0007a 100644 +--- a/kernel/debug/debug_core.c ++++ b/kernel/debug/debug_core.c +@@ -535,6 +535,8 @@ return_normal: + arch_kgdb_ops.correct_hw_break(); + if (trace_on) + tracing_on(); ++ kgdb_info[cpu].debuggerinfo = NULL; ++ kgdb_info[cpu].task = NULL; + kgdb_info[cpu].exception_state &= + ~(DCPU_WANT_MASTER | DCPU_IS_SLAVE); + kgdb_info[cpu].enter_kgdb--; +@@ -667,6 +669,8 @@ kgdb_restore: + if (trace_on) + tracing_on(); + ++ kgdb_info[cpu].debuggerinfo = NULL; ++ kgdb_info[cpu].task = NULL; + kgdb_info[cpu].exception_state &= + ~(DCPU_WANT_MASTER | DCPU_IS_SLAVE); + kgdb_info[cpu].enter_kgdb--; +diff --git a/kernel/debug/kdb/kdb_bt.c b/kernel/debug/kdb/kdb_bt.c +index 7921ae4fca8d..7e2379aa0a1e 100644 +--- a/kernel/debug/kdb/kdb_bt.c ++++ b/kernel/debug/kdb/kdb_bt.c +@@ -186,7 +186,16 @@ kdb_bt(int argc, const char **argv) + kdb_printf("btc: cpu status: "); + kdb_parse("cpu\n"); + for_each_online_cpu(cpu) { +- sprintf(buf, "btt 0x%px\n", KDB_TSK(cpu)); ++ void *kdb_tsk = KDB_TSK(cpu); ++ ++ /* If a CPU failed to round up we could be here */ ++ if (!kdb_tsk) { ++ kdb_printf("WARNING: no task for cpu %ld\n", ++ cpu); ++ continue; ++ } ++ ++ sprintf(buf, "btt 0x%px\n", kdb_tsk); + kdb_parse(buf); + touch_nmi_watchdog(); + } +diff --git a/kernel/debug/kdb/kdb_debugger.c b/kernel/debug/kdb/kdb_debugger.c +index 15e1a7af5dd0..53a0df6e4d92 100644 +--- a/kernel/debug/kdb/kdb_debugger.c ++++ b/kernel/debug/kdb/kdb_debugger.c +@@ -118,13 +118,6 @@ int kdb_stub(struct kgdb_state *ks) + kdb_bp_remove(); + KDB_STATE_CLEAR(DOING_SS); + KDB_STATE_SET(PAGER); +- /* zero out any offline cpu data */ +- for_each_present_cpu(i) { +- if (!cpu_online(i)) { +- kgdb_info[i].debuggerinfo = NULL; +- kgdb_info[i].task = NULL; +- } +- } + if (ks->err_code == DIE_OOPS || reason == KDB_REASON_OOPS) { + ks->pass_exception = 1; + KDB_FLAG_SET(CATASTROPHIC); +-- +2.19.1 + diff --git a/queue-4.14/kernel-hung_task.c-break-rcu-locks-based-on-jiffies.patch b/queue-4.14/kernel-hung_task.c-break-rcu-locks-based-on-jiffies.patch new file mode 100644 index 00000000000..688d95cd6a7 --- /dev/null +++ b/queue-4.14/kernel-hung_task.c-break-rcu-locks-based-on-jiffies.patch @@ -0,0 +1,69 @@ +From f847bbf16e2a944bae28994916c651a1f6b75410 Mon Sep 17 00:00:00 2001 +From: Tetsuo Handa +Date: Thu, 3 Jan 2019 15:26:31 -0800 +Subject: kernel/hung_task.c: break RCU locks based on jiffies + +[ Upstream commit 304ae42739b108305f8d7b3eb3c1aec7c2b643a9 ] + +check_hung_uninterruptible_tasks() is currently calling rcu_lock_break() +for every 1024 threads. But check_hung_task() is very slow if printk() +was called, and is very fast otherwise. + +If many threads within some 1024 threads called printk(), the RCU grace +period might be extended enough to trigger RCU stall warnings. +Therefore, calling rcu_lock_break() for every some fixed jiffies will be +safer. + +Link: http://lkml.kernel.org/r/1544800658-11423-1-git-send-email-penguin-kernel@I-love.SAKURA.ne.jp +Signed-off-by: Tetsuo Handa +Acked-by: Paul E. McKenney +Cc: Petr Mladek +Cc: Sergey Senozhatsky +Cc: Dmitry Vyukov +Cc: "Rafael J. Wysocki" +Cc: Vitaly Kuznetsov +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + kernel/hung_task.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/kernel/hung_task.c b/kernel/hung_task.c +index 32b479468e4d..0cec1241e26f 100644 +--- a/kernel/hung_task.c ++++ b/kernel/hung_task.c +@@ -33,7 +33,7 @@ int __read_mostly sysctl_hung_task_check_count = PID_MAX_LIMIT; + * is disabled during the critical section. It also controls the size of + * the RCU grace period. So it needs to be upper-bound. + */ +-#define HUNG_TASK_BATCHING 1024 ++#define HUNG_TASK_LOCK_BREAK (HZ / 10) + + /* + * Zero means infinite timeout - no checking done: +@@ -164,7 +164,7 @@ static bool rcu_lock_break(struct task_struct *g, struct task_struct *t) + static void check_hung_uninterruptible_tasks(unsigned long timeout) + { + int max_count = sysctl_hung_task_check_count; +- int batch_count = HUNG_TASK_BATCHING; ++ unsigned long last_break = jiffies; + struct task_struct *g, *t; + + /* +@@ -179,10 +179,10 @@ static void check_hung_uninterruptible_tasks(unsigned long timeout) + for_each_process_thread(g, t) { + if (!max_count--) + goto unlock; +- if (!--batch_count) { +- batch_count = HUNG_TASK_BATCHING; ++ if (time_after(jiffies, last_break + HUNG_TASK_LOCK_BREAK)) { + if (!rcu_lock_break(g, t)) + goto unlock; ++ last_break = jiffies; + } + /* use "==" to skip the TASK_KILLABLE tasks waiting on NFS */ + if (t->state == TASK_UNINTERRUPTIBLE) +-- +2.19.1 + diff --git a/queue-4.14/kernel-hung_task.c-force-console-verbose-before-pani.patch b/queue-4.14/kernel-hung_task.c-force-console-verbose-before-pani.patch new file mode 100644 index 00000000000..eff7b04b816 --- /dev/null +++ b/queue-4.14/kernel-hung_task.c-force-console-verbose-before-pani.patch @@ -0,0 +1,77 @@ +From e0a3afc4cf6aa5704b12dfc7da9f4a7f0b6f6f88 Mon Sep 17 00:00:00 2001 +From: "Liu, Chuansheng" +Date: Thu, 3 Jan 2019 15:26:27 -0800 +Subject: kernel/hung_task.c: force console verbose before panic + +[ Upstream commit 168e06f7937d96c7222037d8a05565e8a6eb00fe ] + +Based on commit 401c636a0eeb ("kernel/hung_task.c: show all hung tasks +before panic"), we could get the call stack of hung task. + +However, if the console loglevel is not high, we still can not see the +useful panic information in practice, and in most cases users don't set +console loglevel to high level. + +This patch is to force console verbose before system panic, so that the +real useful information can be seen in the console, instead of being +like the following, which doesn't have hung task information. + + INFO: task init:1 blocked for more than 120 seconds. + Tainted: G U W 4.19.0-quilt-2e5dc0ac-g51b6c21d76cc #1 + "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. + Kernel panic - not syncing: hung_task: blocked tasks + CPU: 2 PID: 479 Comm: khungtaskd Tainted: G U W 4.19.0-quilt-2e5dc0ac-g51b6c21d76cc #1 + Call Trace: + dump_stack+0x4f/0x65 + panic+0xde/0x231 + watchdog+0x290/0x410 + kthread+0x12c/0x150 + ret_from_fork+0x35/0x40 + reboot: panic mode set: p,w + Kernel Offset: 0x34000000 from 0xffffffff81000000 (relocation range: 0xffffffff80000000-0xffffffffbfffffff) + +Link: http://lkml.kernel.org/r/27240C0AC20F114CBF8149A2696CBE4A6015B675@SHSMSX101.ccr.corp.intel.com +Signed-off-by: Chuansheng Liu +Reviewed-by: Petr Mladek +Reviewed-by: Sergey Senozhatsky +Cc: Tetsuo Handa +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + kernel/hung_task.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/kernel/hung_task.c b/kernel/hung_task.c +index 0cec1241e26f..f9aaf4994062 100644 +--- a/kernel/hung_task.c ++++ b/kernel/hung_task.c +@@ -103,8 +103,11 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout) + + trace_sched_process_hang(t); + +- if (!sysctl_hung_task_warnings && !sysctl_hung_task_panic) +- return; ++ if (sysctl_hung_task_panic) { ++ console_verbose(); ++ hung_task_show_lock = true; ++ hung_task_call_panic = true; ++ } + + /* + * Ok, the task did not get scheduled for more than 2 minutes, +@@ -126,11 +129,6 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout) + } + + touch_nmi_watchdog(); +- +- if (sysctl_hung_task_panic) { +- hung_task_show_lock = true; +- hung_task_call_panic = true; +- } + } + + /* +-- +2.19.1 + diff --git a/queue-4.14/kobject-return-error-code-if-writing-sys-.-uevent-fa.patch b/queue-4.14/kobject-return-error-code-if-writing-sys-.-uevent-fa.patch new file mode 100644 index 00000000000..fc1773b22b3 --- /dev/null +++ b/queue-4.14/kobject-return-error-code-if-writing-sys-.-uevent-fa.patch @@ -0,0 +1,95 @@ +From 644d57a5bebe87828068d1349a81be1e713023e5 Mon Sep 17 00:00:00 2001 +From: Peter Rajnoha +Date: Wed, 5 Dec 2018 12:27:44 +0100 +Subject: kobject: return error code if writing /sys/.../uevent fails + +[ Upstream commit df44b479654f62b478c18ee4d8bc4e9f897a9844 ] + +Propagate error code back to userspace if writing the /sys/.../uevent +file fails. Before, the write operation always returned with success, +even if we failed to recognize the input string or if we failed to +generate the uevent itself. + +With the error codes properly propagated back to userspace, we are +able to react in userspace accordingly by not assuming and awaiting +a uevent that is not delivered. + +Signed-off-by: Peter Rajnoha +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/base/bus.c | 12 ++++++++---- + drivers/base/core.c | 8 +++++++- + kernel/module.c | 6 ++++-- + 3 files changed, 19 insertions(+), 7 deletions(-) + +diff --git a/drivers/base/bus.c b/drivers/base/bus.c +index 1cf1460f8c90..3464c49dad0d 100644 +--- a/drivers/base/bus.c ++++ b/drivers/base/bus.c +@@ -616,8 +616,10 @@ static void remove_probe_files(struct bus_type *bus) + static ssize_t uevent_store(struct device_driver *drv, const char *buf, + size_t count) + { +- kobject_synth_uevent(&drv->p->kobj, buf, count); +- return count; ++ int rc; ++ ++ rc = kobject_synth_uevent(&drv->p->kobj, buf, count); ++ return rc ? rc : count; + } + static DRIVER_ATTR_WO(uevent); + +@@ -833,8 +835,10 @@ static void klist_devices_put(struct klist_node *n) + static ssize_t bus_uevent_store(struct bus_type *bus, + const char *buf, size_t count) + { +- kobject_synth_uevent(&bus->p->subsys.kobj, buf, count); +- return count; ++ int rc; ++ ++ rc = kobject_synth_uevent(&bus->p->subsys.kobj, buf, count); ++ return rc ? rc : count; + } + static BUS_ATTR(uevent, S_IWUSR, NULL, bus_uevent_store); + +diff --git a/drivers/base/core.c b/drivers/base/core.c +index fc5bbb2519fe..1c67bf24bc23 100644 +--- a/drivers/base/core.c ++++ b/drivers/base/core.c +@@ -991,8 +991,14 @@ out: + static ssize_t uevent_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) + { +- if (kobject_synth_uevent(&dev->kobj, buf, count)) ++ int rc; ++ ++ rc = kobject_synth_uevent(&dev->kobj, buf, count); ++ ++ if (rc) { + dev_err(dev, "uevent: failed to send synthetic uevent\n"); ++ return rc; ++ } + + return count; + } +diff --git a/kernel/module.c b/kernel/module.c +index 2a44c515f0d7..94528b891027 100644 +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -1201,8 +1201,10 @@ static ssize_t store_uevent(struct module_attribute *mattr, + struct module_kobject *mk, + const char *buffer, size_t count) + { +- kobject_synth_uevent(&mk->kobj, buffer, count); +- return count; ++ int rc; ++ ++ rc = kobject_synth_uevent(&mk->kobj, buffer, count); ++ return rc ? rc : count; + } + + struct module_attribute module_uevent = +-- +2.19.1 + diff --git a/queue-4.14/kvm-change-offset-in-kvm_write_guest_offset_cached-t.patch b/queue-4.14/kvm-change-offset-in-kvm_write_guest_offset_cached-t.patch new file mode 100644 index 00000000000..5bc465f9742 --- /dev/null +++ b/queue-4.14/kvm-change-offset-in-kvm_write_guest_offset_cached-t.patch @@ -0,0 +1,63 @@ +From 1865003015f38695971a888f153ff4fc0c13e46c Mon Sep 17 00:00:00 2001 +From: Jim Mattson +Date: Fri, 14 Dec 2018 14:34:43 -0800 +Subject: kvm: Change offset in kvm_write_guest_offset_cached to unsigned +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[ Upstream commit 7a86dab8cf2f0fdf508f3555dddfc236623bff60 ] + +Since the offset is added directly to the hva from the +gfn_to_hva_cache, a negative offset could result in an out of bounds +write. The existing BUG_ON only checks for addresses beyond the end of +the gfn_to_hva_cache, not for addresses before the start of the +gfn_to_hva_cache. + +Note that all current call sites have non-negative offsets. + +Fixes: 4ec6e8636256 ("kvm: Introduce kvm_write_guest_offset_cached()") +Reported-by: Cfir Cohen +Signed-off-by: Jim Mattson +Reviewed-by: Cfir Cohen +Reviewed-by: Peter Shier +Reviewed-by: Krish Sadhukhan +Reviewed-by: Sean Christopherson +Signed-off-by: Radim Krčmář +Signed-off-by: Sasha Levin +--- + include/linux/kvm_host.h | 3 ++- + virt/kvm/kvm_main.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h +index b6962ae6237e..4f7f19c1dc0a 100644 +--- a/include/linux/kvm_host.h ++++ b/include/linux/kvm_host.h +@@ -685,7 +685,8 @@ int kvm_write_guest(struct kvm *kvm, gpa_t gpa, const void *data, + int kvm_write_guest_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc, + void *data, unsigned long len); + int kvm_write_guest_offset_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc, +- void *data, int offset, unsigned long len); ++ void *data, unsigned int offset, ++ unsigned long len); + int kvm_gfn_to_hva_cache_init(struct kvm *kvm, struct gfn_to_hva_cache *ghc, + gpa_t gpa, unsigned long len); + int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len); +diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c +index 4f35f0dfe681..bbc34e87d88f 100644 +--- a/virt/kvm/kvm_main.c ++++ b/virt/kvm/kvm_main.c +@@ -1962,7 +1962,8 @@ int kvm_gfn_to_hva_cache_init(struct kvm *kvm, struct gfn_to_hva_cache *ghc, + EXPORT_SYMBOL_GPL(kvm_gfn_to_hva_cache_init); + + int kvm_write_guest_offset_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc, +- void *data, int offset, unsigned long len) ++ void *data, unsigned int offset, ++ unsigned long len) + { + struct kvm_memslots *slots = kvm_memslots(kvm); + int r; +-- +2.19.1 + diff --git a/queue-4.14/kvm-ppc-book3s-only-report-kvm_cap_spapr_tce_vfio-on.patch b/queue-4.14/kvm-ppc-book3s-only-report-kvm_cap_spapr_tce_vfio-on.patch new file mode 100644 index 00000000000..35b810f5d0e --- /dev/null +++ b/queue-4.14/kvm-ppc-book3s-only-report-kvm_cap_spapr_tce_vfio-on.patch @@ -0,0 +1,45 @@ +From 1d8f3ea5e78c6461158ddcd2c8d75ff8a4f13ee3 Mon Sep 17 00:00:00 2001 +From: Suraj Jitindar Singh +Date: Fri, 14 Dec 2018 16:29:03 +1100 +Subject: KVM: PPC: Book3S: Only report KVM_CAP_SPAPR_TCE_VFIO on powernv + machines + +[ Upstream commit 693ac10a88a2219bde553b2e8460dbec97e594e6 ] + +The kvm capability KVM_CAP_SPAPR_TCE_VFIO is used to indicate the +availability of in kernel tce acceleration for vfio. However it is +currently the case that this is only available on a powernv machine, +not for a pseries machine. + +Thus make this capability dependent on having the cpu feature +CPU_FTR_HVMODE. + +[paulus@ozlabs.org - fixed compilation for Book E.] + +Signed-off-by: Suraj Jitindar Singh +Signed-off-by: Paul Mackerras +Signed-off-by: Sasha Levin +--- + arch/powerpc/kvm/powerpc.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c +index ecb45361095b..a35995a6b34a 100644 +--- a/arch/powerpc/kvm/powerpc.c ++++ b/arch/powerpc/kvm/powerpc.c +@@ -540,8 +540,11 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) + #ifdef CONFIG_PPC_BOOK3S_64 + case KVM_CAP_SPAPR_TCE: + case KVM_CAP_SPAPR_TCE_64: +- /* fallthrough */ ++ r = 1; ++ break; + case KVM_CAP_SPAPR_TCE_VFIO: ++ r = !!cpu_has_feature(CPU_FTR_HVMODE); ++ break; + case KVM_CAP_PPC_RTAS: + case KVM_CAP_PPC_FIXUP_HCALL: + case KVM_CAP_PPC_ENABLE_HCALL: +-- +2.19.1 + diff --git a/queue-4.14/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch b/queue-4.14/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch new file mode 100644 index 00000000000..223e119ee10 --- /dev/null +++ b/queue-4.14/kvm-s390-unregister-debug-feature-on-failing-arch-in.patch @@ -0,0 +1,65 @@ +From 798536c2da1d3d951a71807eb6f2978ff411f625 Mon Sep 17 00:00:00 2001 +From: Michael Mueller +Date: Fri, 30 Nov 2018 15:32:06 +0100 +Subject: KVM: s390: unregister debug feature on failing arch init + +[ Upstream commit 308c3e6673b012beecb96ef04cc65f4a0e7cdd99 ] + +Make sure the debug feature and its allocated resources get +released upon unsuccessful architecture initialization. + +A related indication of the issue will be reported as kernel +message. + +Signed-off-by: Michael Mueller +Reviewed-by: Cornelia Huck +Reviewed-by: Pierre Morel +Reviewed-by: David Hildenbrand +Message-Id: <20181130143215.69496-2-mimu@linux.ibm.com> +Signed-off-by: Christian Borntraeger +Signed-off-by: Sasha Levin +--- + arch/s390/kvm/kvm-s390.c | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c +index 4f6adbea592b..f674a81c8868 100644 +--- a/arch/s390/kvm/kvm-s390.c ++++ b/arch/s390/kvm/kvm-s390.c +@@ -361,19 +361,30 @@ static void kvm_s390_cpu_feat_init(void) + + int kvm_arch_init(void *opaque) + { ++ int rc; ++ + kvm_s390_dbf = debug_register("kvm-trace", 32, 1, 7 * sizeof(long)); + if (!kvm_s390_dbf) + return -ENOMEM; + + if (debug_register_view(kvm_s390_dbf, &debug_sprintf_view)) { +- debug_unregister(kvm_s390_dbf); +- return -ENOMEM; ++ rc = -ENOMEM; ++ goto out_debug_unreg; + } + + kvm_s390_cpu_feat_init(); + + /* Register floating interrupt controller interface. */ +- return kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC); ++ rc = kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC); ++ if (rc) { ++ pr_err("Failed to register FLIC rc=%d\n", rc); ++ goto out_debug_unreg; ++ } ++ return 0; ++ ++out_debug_unreg: ++ debug_unregister(kvm_s390_dbf); ++ return rc; + } + + void kvm_arch_exit(void) +-- +2.19.1 + diff --git a/queue-4.14/kvm-x86-svm-report-msr_ia32_mcg_ext_ctl-as-unsupport.patch b/queue-4.14/kvm-x86-svm-report-msr_ia32_mcg_ext_ctl-as-unsupport.patch new file mode 100644 index 00000000000..40486cc6765 --- /dev/null +++ b/queue-4.14/kvm-x86-svm-report-msr_ia32_mcg_ext_ctl-as-unsupport.patch @@ -0,0 +1,45 @@ +From 455db39fce93411afb01cd33f4eb43942f4e2316 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Wed, 19 Dec 2018 12:06:13 +0100 +Subject: KVM: x86: svm: report MSR_IA32_MCG_EXT_CTL as unsupported +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[ Upstream commit e87555e550cef4941579cd879759a7c0dee24e68 ] + +AMD doesn't seem to implement MSR_IA32_MCG_EXT_CTL and svm code in kvm +knows nothing about it, however, this MSR is among emulated_msrs and +thus returned with KVM_GET_MSR_INDEX_LIST. The consequent KVM_GET_MSRS, +of course, fails. + +Report the MSR as unsupported to not confuse userspace. + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: Radim Krčmář +Signed-off-by: Sasha Levin +--- + arch/x86/kvm/svm.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c +index 4dc79d139810..656ac12f5439 100644 +--- a/arch/x86/kvm/svm.c ++++ b/arch/x86/kvm/svm.c +@@ -5319,6 +5319,13 @@ static bool svm_cpu_has_accelerated_tpr(void) + + static bool svm_has_emulated_msr(int index) + { ++ switch (index) { ++ case MSR_IA32_MCG_EXT_CTL: ++ return false; ++ default: ++ break; ++ } ++ + return true; + } + +-- +2.19.1 + diff --git a/queue-4.14/mac80211-fix-radiotap-vendor-presence-bitmap-handlin.patch b/queue-4.14/mac80211-fix-radiotap-vendor-presence-bitmap-handlin.patch new file mode 100644 index 00000000000..0fe0abe1f58 --- /dev/null +++ b/queue-4.14/mac80211-fix-radiotap-vendor-presence-bitmap-handlin.patch @@ -0,0 +1,50 @@ +From 974b13933af2ef26cee76af6826c5f926bf51b8a Mon Sep 17 00:00:00 2001 +From: Johannes Berg +Date: Sat, 15 Dec 2018 11:03:12 +0200 +Subject: mac80211: fix radiotap vendor presence bitmap handling + +[ Upstream commit efc38dd7d5fa5c8cdd0c917c5d00947aa0539443 ] + +Due to the alignment handling, it actually matters where in the code +we add the 4 bytes for the presence bitmap to the length; the first +field is the timestamp with 8 byte alignment so we need to add the +space for the extra vendor namespace presence bitmap *before* we do +any alignment for the fields. + +Move the presence bitmap length accounting to the right place to fix +the alignment for the data properly. + +Signed-off-by: Johannes Berg +Signed-off-by: Luca Coelho +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + net/mac80211/rx.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c +index 9e19ddbcb06e..c7ac1a480b1d 100644 +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -141,6 +141,9 @@ ieee80211_rx_radiotap_hdrlen(struct ieee80211_local *local, + /* allocate extra bitmaps */ + if (status->chains) + len += 4 * hweight8(status->chains); ++ /* vendor presence bitmap */ ++ if (status->flag & RX_FLAG_RADIOTAP_VENDOR_DATA) ++ len += 4; + + if (ieee80211_have_rx_timestamp(status)) { + len = ALIGN(len, 8); +@@ -182,8 +185,6 @@ ieee80211_rx_radiotap_hdrlen(struct ieee80211_local *local, + if (status->flag & RX_FLAG_RADIOTAP_VENDOR_DATA) { + struct ieee80211_vendor_radiotap *rtap = (void *)skb->data; + +- /* vendor presence bitmap */ +- len += 4; + /* alignment for fixed 6-byte vendor data header */ + len = ALIGN(len, 2); + /* vendor data header */ +-- +2.19.1 + diff --git a/queue-4.14/md-fix-raid10-hang-issue-caused-by-barrier.patch b/queue-4.14/md-fix-raid10-hang-issue-caused-by-barrier.patch new file mode 100644 index 00000000000..7c30f15ee24 --- /dev/null +++ b/queue-4.14/md-fix-raid10-hang-issue-caused-by-barrier.patch @@ -0,0 +1,127 @@ +From 29370883ec6a7027da7f7a27a39d32ae645610cd Mon Sep 17 00:00:00 2001 +From: Guoqing Jiang +Date: Wed, 19 Dec 2018 14:19:25 +0800 +Subject: md: fix raid10 hang issue caused by barrier +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[ Upstream commit e820d55cb99dd93ac2dc949cf486bb187e5cd70d ] + +When both regular IO and resync IO happen at the same time, +and if we also need to split regular. Then we can see tasks +hang due to barrier. + +1. resync thread +[ 1463.757205] INFO: task md1_resync:5215 blocked for more than 480 seconds. +[ 1463.757207] Not tainted 4.19.5-1-default #1 +[ 1463.757209] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. +[ 1463.757212] md1_resync D 0 5215 2 0x80000000 +[ 1463.757216] Call Trace: +[ 1463.757223] ? __schedule+0x29a/0x880 +[ 1463.757231] ? raise_barrier+0x8d/0x140 [raid10] +[ 1463.757236] schedule+0x78/0x110 +[ 1463.757243] raise_barrier+0x8d/0x140 [raid10] +[ 1463.757248] ? wait_woken+0x80/0x80 +[ 1463.757257] raid10_sync_request+0x1f6/0x1e30 [raid10] +[ 1463.757265] ? _raw_spin_unlock_irq+0x22/0x40 +[ 1463.757284] ? is_mddev_idle+0x125/0x137 [md_mod] +[ 1463.757302] md_do_sync.cold.78+0x404/0x969 [md_mod] +[ 1463.757311] ? wait_woken+0x80/0x80 +[ 1463.757336] ? md_rdev_init+0xb0/0xb0 [md_mod] +[ 1463.757351] md_thread+0xe9/0x140 [md_mod] +[ 1463.757358] ? _raw_spin_unlock_irqrestore+0x2e/0x60 +[ 1463.757364] ? __kthread_parkme+0x4c/0x70 +[ 1463.757369] kthread+0x112/0x130 +[ 1463.757374] ? kthread_create_worker_on_cpu+0x40/0x40 +[ 1463.757380] ret_from_fork+0x3a/0x50 + +2. regular IO +[ 1463.760679] INFO: task kworker/0:8:5367 blocked for more than 480 seconds. +[ 1463.760683] Not tainted 4.19.5-1-default #1 +[ 1463.760684] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. +[ 1463.760687] kworker/0:8 D 0 5367 2 0x80000000 +[ 1463.760718] Workqueue: md submit_flushes [md_mod] +[ 1463.760721] Call Trace: +[ 1463.760731] ? __schedule+0x29a/0x880 +[ 1463.760741] ? wait_barrier+0xdd/0x170 [raid10] +[ 1463.760746] schedule+0x78/0x110 +[ 1463.760753] wait_barrier+0xdd/0x170 [raid10] +[ 1463.760761] ? wait_woken+0x80/0x80 +[ 1463.760768] raid10_write_request+0xf2/0x900 [raid10] +[ 1463.760774] ? wait_woken+0x80/0x80 +[ 1463.760778] ? mempool_alloc+0x55/0x160 +[ 1463.760795] ? md_write_start+0xa9/0x270 [md_mod] +[ 1463.760801] ? try_to_wake_up+0x44/0x470 +[ 1463.760810] raid10_make_request+0xc1/0x120 [raid10] +[ 1463.760816] ? wait_woken+0x80/0x80 +[ 1463.760831] md_handle_request+0x121/0x190 [md_mod] +[ 1463.760851] md_make_request+0x78/0x190 [md_mod] +[ 1463.760860] generic_make_request+0x1c6/0x470 +[ 1463.760870] raid10_write_request+0x77a/0x900 [raid10] +[ 1463.760875] ? wait_woken+0x80/0x80 +[ 1463.760879] ? mempool_alloc+0x55/0x160 +[ 1463.760895] ? md_write_start+0xa9/0x270 [md_mod] +[ 1463.760904] raid10_make_request+0xc1/0x120 [raid10] +[ 1463.760910] ? wait_woken+0x80/0x80 +[ 1463.760926] md_handle_request+0x121/0x190 [md_mod] +[ 1463.760931] ? _raw_spin_unlock_irq+0x22/0x40 +[ 1463.760936] ? finish_task_switch+0x74/0x260 +[ 1463.760954] submit_flushes+0x21/0x40 [md_mod] + +So resync io is waiting for regular write io to complete to +decrease nr_pending (conf->barrier++ is called before waiting). +The regular write io splits another bio after call wait_barrier +which call nr_pending++, then the splitted bio would continue +with raid10_write_request -> wait_barrier, so the splitted bio +has to wait for barrier to be zero, then deadlock happens as +follows. + + resync io regular io + + raise_barrier + wait_barrier + generic_make_request + wait_barrier + +To resolve the issue, we need to call allow_barrier to decrease +nr_pending before generic_make_request since regular IO is not +issued to underlying devices, and wait_barrier is called again +to ensure no internal IO happening. + +Fixes: fc9977dd069e ("md/raid10: simplify the splitting of requests.") +Reported-and-tested-by: SiniÅ¡a Bandin +Signed-off-by: Guoqing Jiang +Signed-off-by: Shaohua Li +Signed-off-by: Sasha Levin +--- + drivers/md/raid10.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c +index 52ddfa0fca94..2ce079a0b0bd 100644 +--- a/drivers/md/raid10.c ++++ b/drivers/md/raid10.c +@@ -1190,7 +1190,9 @@ static void raid10_read_request(struct mddev *mddev, struct bio *bio, + struct bio *split = bio_split(bio, max_sectors, + gfp, conf->bio_split); + bio_chain(split, bio); ++ allow_barrier(conf); + generic_make_request(bio); ++ wait_barrier(conf); + bio = split; + r10_bio->master_bio = bio; + r10_bio->sectors = max_sectors; +@@ -1479,7 +1481,9 @@ retry_write: + struct bio *split = bio_split(bio, r10_bio->sectors, + GFP_NOIO, conf->bio_split); + bio_chain(split, bio); ++ allow_barrier(conf); + generic_make_request(bio); ++ wait_barrier(conf); + bio = split; + r10_bio->master_bio = bio; + } +-- +2.19.1 + diff --git a/queue-4.14/media-adv-tc358743-ths8200-fill-in-min-width-height-.patch b/queue-4.14/media-adv-tc358743-ths8200-fill-in-min-width-height-.patch new file mode 100644 index 00000000000..7eb6311c49b --- /dev/null +++ b/queue-4.14/media-adv-tc358743-ths8200-fill-in-min-width-height-.patch @@ -0,0 +1,131 @@ +From d9aed2f8dc9182d09f94ac2a65f7032e065f4794 Mon Sep 17 00:00:00 2001 +From: Hans Verkuil +Date: Thu, 8 Nov 2018 04:51:51 -0500 +Subject: media: adv*/tc358743/ths8200: fill in min width/height/pixelclock + +[ Upstream commit 2912289a518077ddb8214e05336700148e97e235 ] + +The v4l2_dv_timings_cap struct is used to do sanity checks when setting and +enumerating DV timings, ensuring that only valid timings as per the HW +capabilities are allowed. + +However, many drivers just filled in 0 for the minimum width, height or +pixelclock frequency. This can cause timings with e.g. 0 as width and height +to be accepted, which will in turn lead to a potential division by zero. + +Fill in proper values are minimum boundaries. 640x350 was chosen since it is +the smallest resolution in v4l2-dv-timings.h. Same for 13 MHz as the lowest +pixelclock frequency (it's slightly below the minimum of 13.5 MHz in the +v4l2-dv-timings.h header). + +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/i2c/ad9389b.c | 2 +- + drivers/media/i2c/adv7511.c | 2 +- + drivers/media/i2c/adv7604.c | 4 ++-- + drivers/media/i2c/adv7842.c | 4 ++-- + drivers/media/i2c/tc358743.c | 2 +- + drivers/media/i2c/ths8200.c | 2 +- + 6 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/drivers/media/i2c/ad9389b.c b/drivers/media/i2c/ad9389b.c +index a056d6cdaaaa..f0b200ae2127 100644 +--- a/drivers/media/i2c/ad9389b.c ++++ b/drivers/media/i2c/ad9389b.c +@@ -590,7 +590,7 @@ static const struct v4l2_dv_timings_cap ad9389b_timings_cap = { + .type = V4L2_DV_BT_656_1120, + /* keep this initialization for compatibility with GCC < 4.4.6 */ + .reserved = { 0 }, +- V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, ++ V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000, + V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | + V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, + V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING | +diff --git a/drivers/media/i2c/adv7511.c b/drivers/media/i2c/adv7511.c +index 2817bafc67bf..80c20404334a 100644 +--- a/drivers/media/i2c/adv7511.c ++++ b/drivers/media/i2c/adv7511.c +@@ -142,7 +142,7 @@ static const struct v4l2_dv_timings_cap adv7511_timings_cap = { + .type = V4L2_DV_BT_656_1120, + /* keep this initialization for compatibility with GCC < 4.4.6 */ + .reserved = { 0 }, +- V4L2_INIT_BT_TIMINGS(0, ADV7511_MAX_WIDTH, 0, ADV7511_MAX_HEIGHT, ++ V4L2_INIT_BT_TIMINGS(640, ADV7511_MAX_WIDTH, 350, ADV7511_MAX_HEIGHT, + ADV7511_MIN_PIXELCLOCK, ADV7511_MAX_PIXELCLOCK, + V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | + V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, +diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c +index f289b8aca1da..d2108aad3c65 100644 +--- a/drivers/media/i2c/adv7604.c ++++ b/drivers/media/i2c/adv7604.c +@@ -778,7 +778,7 @@ static const struct v4l2_dv_timings_cap adv7604_timings_cap_analog = { + .type = V4L2_DV_BT_656_1120, + /* keep this initialization for compatibility with GCC < 4.4.6 */ + .reserved = { 0 }, +- V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, ++ V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000, + V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | + V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, + V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING | +@@ -789,7 +789,7 @@ static const struct v4l2_dv_timings_cap adv76xx_timings_cap_digital = { + .type = V4L2_DV_BT_656_1120, + /* keep this initialization for compatibility with GCC < 4.4.6 */ + .reserved = { 0 }, +- V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000, ++ V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 225000000, + V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | + V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, + V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING | +diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c +index 65f34e7e146f..f9c23173c9fa 100644 +--- a/drivers/media/i2c/adv7842.c ++++ b/drivers/media/i2c/adv7842.c +@@ -676,7 +676,7 @@ static const struct v4l2_dv_timings_cap adv7842_timings_cap_analog = { + .type = V4L2_DV_BT_656_1120, + /* keep this initialization for compatibility with GCC < 4.4.6 */ + .reserved = { 0 }, +- V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, ++ V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000, + V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | + V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, + V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING | +@@ -687,7 +687,7 @@ static const struct v4l2_dv_timings_cap adv7842_timings_cap_digital = { + .type = V4L2_DV_BT_656_1120, + /* keep this initialization for compatibility with GCC < 4.4.6 */ + .reserved = { 0 }, +- V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000, ++ V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 225000000, + V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | + V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, + V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING | +diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c +index e6f5c363ccab..c9647e24a4a3 100644 +--- a/drivers/media/i2c/tc358743.c ++++ b/drivers/media/i2c/tc358743.c +@@ -70,7 +70,7 @@ static const struct v4l2_dv_timings_cap tc358743_timings_cap = { + /* keep this initialization for compatibility with GCC < 4.4.6 */ + .reserved = { 0 }, + /* Pixel clock from REF_01 p. 20. Min/max height/width are unknown */ +- V4L2_INIT_BT_TIMINGS(1, 10000, 1, 10000, 0, 165000000, ++ V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 13000000, 165000000, + V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | + V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, + V4L2_DV_BT_CAP_PROGRESSIVE | +diff --git a/drivers/media/i2c/ths8200.c b/drivers/media/i2c/ths8200.c +index 498ad2368cbc..f5ee28058ea2 100644 +--- a/drivers/media/i2c/ths8200.c ++++ b/drivers/media/i2c/ths8200.c +@@ -49,7 +49,7 @@ static const struct v4l2_dv_timings_cap ths8200_timings_cap = { + .type = V4L2_DV_BT_656_1120, + /* keep this initialization for compatibility with GCC < 4.4.6 */ + .reserved = { 0 }, +- V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1080, 25000000, 148500000, ++ V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1080, 25000000, 148500000, + V4L2_DV_BT_STD_CEA861, V4L2_DV_BT_CAP_PROGRESSIVE) + }; + +-- +2.19.1 + diff --git a/queue-4.14/media-coda-fix-h.264-deblocking-filter-controls.patch b/queue-4.14/media-coda-fix-h.264-deblocking-filter-controls.patch new file mode 100644 index 00000000000..e5aa7e3e72e --- /dev/null +++ b/queue-4.14/media-coda-fix-h.264-deblocking-filter-controls.patch @@ -0,0 +1,134 @@ +From 6068839ca5ebcf8a06ac6456566a506793ba676e Mon Sep 17 00:00:00 2001 +From: Philipp Zabel +Date: Wed, 28 Nov 2018 08:01:22 -0500 +Subject: media: coda: fix H.264 deblocking filter controls + +[ Upstream commit 75fa6e4f83a0923fe753827d354998d448b4fd6a ] + +Add support for the third loop filter mode +V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY, +and fix V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA and +V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA controls. + +The filter offset controls are signed values in the -6 to 6 range and +are stored into the slice header fields slice_alpha_c0_offset_div2 and +slice_beta_offset_div2. The actual filter offsets FilterOffsetA/B are +double their value, in range of -12 to 12. + +Rename variables to more closely match the nomenclature in the H.264 +specification. + +Signed-off-by: Philipp Zabel +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/platform/coda/coda-bit.c | 19 +++++++++---------- + drivers/media/platform/coda/coda-common.c | 15 +++++++-------- + drivers/media/platform/coda/coda.h | 6 +++--- + drivers/media/platform/coda/coda_regs.h | 2 +- + 4 files changed, 20 insertions(+), 22 deletions(-) + +diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c +index 291c40933935..3457a5f1c8a8 100644 +--- a/drivers/media/platform/coda/coda-bit.c ++++ b/drivers/media/platform/coda/coda-bit.c +@@ -953,16 +953,15 @@ static int coda_start_encoding(struct coda_ctx *ctx) + else + coda_write(dev, CODA_STD_H264, + CODA_CMD_ENC_SEQ_COD_STD); +- if (ctx->params.h264_deblk_enabled) { +- value = ((ctx->params.h264_deblk_alpha & +- CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK) << +- CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET) | +- ((ctx->params.h264_deblk_beta & +- CODA_264PARAM_DEBLKFILTEROFFSETBETA_MASK) << +- CODA_264PARAM_DEBLKFILTEROFFSETBETA_OFFSET); +- } else { +- value = 1 << CODA_264PARAM_DISABLEDEBLK_OFFSET; +- } ++ value = ((ctx->params.h264_disable_deblocking_filter_idc & ++ CODA_264PARAM_DISABLEDEBLK_MASK) << ++ CODA_264PARAM_DISABLEDEBLK_OFFSET) | ++ ((ctx->params.h264_slice_alpha_c0_offset_div2 & ++ CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK) << ++ CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET) | ++ ((ctx->params.h264_slice_beta_offset_div2 & ++ CODA_264PARAM_DEBLKFILTEROFFSETBETA_MASK) << ++ CODA_264PARAM_DEBLKFILTEROFFSETBETA_OFFSET); + coda_write(dev, value, CODA_CMD_ENC_SEQ_264_PARA); + break; + case V4L2_PIX_FMT_JPEG: +diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c +index 99d138d3f87f..2e1472fadc2c 100644 +--- a/drivers/media/platform/coda/coda-common.c ++++ b/drivers/media/platform/coda/coda-common.c +@@ -1675,14 +1675,13 @@ static int coda_s_ctrl(struct v4l2_ctrl *ctrl) + ctx->params.h264_max_qp = ctrl->val; + break; + case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA: +- ctx->params.h264_deblk_alpha = ctrl->val; ++ ctx->params.h264_slice_alpha_c0_offset_div2 = ctrl->val; + break; + case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA: +- ctx->params.h264_deblk_beta = ctrl->val; ++ ctx->params.h264_slice_beta_offset_div2 = ctrl->val; + break; + case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE: +- ctx->params.h264_deblk_enabled = (ctrl->val == +- V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED); ++ ctx->params.h264_disable_deblocking_filter_idc = ctrl->val; + break; + case V4L2_CID_MPEG_VIDEO_H264_PROFILE: + /* TODO: switch between baseline and constrained baseline */ +@@ -1764,13 +1763,13 @@ static void coda_encode_ctrls(struct coda_ctx *ctx) + v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops, + V4L2_CID_MPEG_VIDEO_H264_MAX_QP, 0, 51, 1, 51); + v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops, +- V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA, 0, 15, 1, 0); ++ V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA, -6, 6, 1, 0); + v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops, +- V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA, 0, 15, 1, 0); ++ V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA, -6, 6, 1, 0); + v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops, + V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE, +- V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED, 0x0, +- V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED); ++ V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY, ++ 0x0, V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED); + v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops, + V4L2_CID_MPEG_VIDEO_H264_PROFILE, + V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE, 0x0, +diff --git a/drivers/media/platform/coda/coda.h b/drivers/media/platform/coda/coda.h +index c5f504d8cf67..389a882cc3da 100644 +--- a/drivers/media/platform/coda/coda.h ++++ b/drivers/media/platform/coda/coda.h +@@ -114,9 +114,9 @@ struct coda_params { + u8 h264_inter_qp; + u8 h264_min_qp; + u8 h264_max_qp; +- u8 h264_deblk_enabled; +- u8 h264_deblk_alpha; +- u8 h264_deblk_beta; ++ u8 h264_disable_deblocking_filter_idc; ++ s8 h264_slice_alpha_c0_offset_div2; ++ s8 h264_slice_beta_offset_div2; + u8 h264_profile_idc; + u8 h264_level_idc; + u8 mpeg4_intra_qp; +diff --git a/drivers/media/platform/coda/coda_regs.h b/drivers/media/platform/coda/coda_regs.h +index 38df5fd9a2fa..546f5762357c 100644 +--- a/drivers/media/platform/coda/coda_regs.h ++++ b/drivers/media/platform/coda/coda_regs.h +@@ -292,7 +292,7 @@ + #define CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET 8 + #define CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK 0x0f + #define CODA_264PARAM_DISABLEDEBLK_OFFSET 6 +-#define CODA_264PARAM_DISABLEDEBLK_MASK 0x01 ++#define CODA_264PARAM_DISABLEDEBLK_MASK 0x03 + #define CODA_264PARAM_CONSTRAINEDINTRAPREDFLAG_OFFSET 5 + #define CODA_264PARAM_CONSTRAINEDINTRAPREDFLAG_MASK 0x01 + #define CODA_264PARAM_CHROMAQPOFFSET_OFFSET 0 +-- +2.19.1 + diff --git a/queue-4.14/media-davinci-vpbe-fix-error-handling-in-vpbe_initia.patch b/queue-4.14/media-davinci-vpbe-fix-error-handling-in-vpbe_initia.patch new file mode 100644 index 00000000000..1f6405f6950 --- /dev/null +++ b/queue-4.14/media-davinci-vpbe-fix-error-handling-in-vpbe_initia.patch @@ -0,0 +1,55 @@ +From dd7eba9bb8c880d29c50af1bc2c42cce10d78be1 Mon Sep 17 00:00:00 2001 +From: Alexey Khoroshilov +Date: Fri, 23 Nov 2018 16:56:26 -0500 +Subject: media: DaVinci-VPBE: fix error handling in vpbe_initialize() + +[ Upstream commit aa35dc3c71950e3fec3e230c06c27c0fbd0067f8 ] + +If vpbe_set_default_output() or vpbe_set_default_mode() fails, +vpbe_initialize() returns error code without releasing resources. + +The patch adds error handling for that case. + +Found by Linux Driver Verification project (linuxtesting.org). + +Signed-off-by: Alexey Khoroshilov +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/platform/davinci/vpbe.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c +index 7f6462562579..1d3c13e36904 100644 +--- a/drivers/media/platform/davinci/vpbe.c ++++ b/drivers/media/platform/davinci/vpbe.c +@@ -739,7 +739,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev) + if (ret) { + v4l2_err(&vpbe_dev->v4l2_dev, "Failed to set default output %s", + def_output); +- return ret; ++ goto fail_kfree_amp; + } + + printk(KERN_NOTICE "Setting default mode to %s\n", def_mode); +@@ -747,12 +747,15 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev) + if (ret) { + v4l2_err(&vpbe_dev->v4l2_dev, "Failed to set default mode %s", + def_mode); +- return ret; ++ goto fail_kfree_amp; + } + vpbe_dev->initialized = 1; + /* TBD handling of bootargs for default output and mode */ + return 0; + ++fail_kfree_amp: ++ mutex_lock(&vpbe_dev->lock); ++ kfree(vpbe_dev->amp); + fail_kfree_encoders: + kfree(vpbe_dev->encoders); + fail_dev_unregister: +-- +2.19.1 + diff --git a/queue-4.14/media-mtk-vcodec-release-device-nodes-in-mtk_vcodec_.patch b/queue-4.14/media-mtk-vcodec-release-device-nodes-in-mtk_vcodec_.patch new file mode 100644 index 00000000000..884f8aa0c73 --- /dev/null +++ b/queue-4.14/media-mtk-vcodec-release-device-nodes-in-mtk_vcodec_.patch @@ -0,0 +1,62 @@ +From ff5eb4a4759b7c15bbe2986918a24a12c402e49f Mon Sep 17 00:00:00 2001 +From: Alexey Khoroshilov +Date: Sat, 20 Oct 2018 13:50:19 -0400 +Subject: media: mtk-vcodec: Release device nodes in mtk_vcodec_init_enc_pm() + +[ Upstream commit 8ea0f2ba0fa3f91ea1b8d823a54b042026ada6b3 ] + +of_parse_phandle() returns the device node with refcount incremented. +There are two nodes that are used temporary in mtk_vcodec_init_enc_pm(), +but their refcounts are not decremented. + +The patch adds one of_node_put() and fixes returning error codes. + +Found by Linux Driver Verification project (linuxtesting.org). + +Signed-off-by: Alexey Khoroshilov +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c +index 3e73e9db781f..7c025045ea90 100644 +--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c ++++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c +@@ -41,25 +41,27 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) + node = of_parse_phandle(dev->of_node, "mediatek,larb", 0); + if (!node) { + mtk_v4l2_err("no mediatek,larb found"); +- return -1; ++ return -ENODEV; + } + pdev = of_find_device_by_node(node); ++ of_node_put(node); + if (!pdev) { + mtk_v4l2_err("no mediatek,larb device found"); +- return -1; ++ return -ENODEV; + } + pm->larbvenc = &pdev->dev; + + node = of_parse_phandle(dev->of_node, "mediatek,larb", 1); + if (!node) { + mtk_v4l2_err("no mediatek,larb found"); +- return -1; ++ return -ENODEV; + } + + pdev = of_find_device_by_node(node); ++ of_node_put(node); + if (!pdev) { + mtk_v4l2_err("no mediatek,larb device found"); +- return -1; ++ return -ENODEV; + } + + pm->larbvenclt = &pdev->dev; +-- +2.19.1 + diff --git a/queue-4.14/memstick-prevent-memstick-host-from-getting-runtime-.patch b/queue-4.14/memstick-prevent-memstick-host-from-getting-runtime-.patch new file mode 100644 index 00000000000..9857a9c2ffc --- /dev/null +++ b/queue-4.14/memstick-prevent-memstick-host-from-getting-runtime-.patch @@ -0,0 +1,57 @@ +From ec2068d582818200eaece8c00e2c92b50e8548f6 Mon Sep 17 00:00:00 2001 +From: Kai-Heng Feng +Date: Mon, 5 Nov 2018 16:45:04 +0800 +Subject: memstick: Prevent memstick host from getting runtime suspended during + card detection + +[ Upstream commit e03e303edf1c63e6dd455ccd568c74e93ef3ba8c ] + +We can use MEMSTICK_POWER_{ON,OFF} along with pm_runtime_{get,put} +helpers to let memstick host support runtime pm. + +The rpm count may go down to zero before the memstick host powers on, so +the host can be runtime suspended. + +So before doing card detection, increment the rpm count to avoid the +host gets runtime suspended. Balance the rpm count after card detection +is done. + +Signed-off-by: Kai-Heng Feng +Tested-by: Oleksandr Natalenko +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/memstick/core/memstick.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c +index 76382c858c35..1246d69ba187 100644 +--- a/drivers/memstick/core/memstick.c ++++ b/drivers/memstick/core/memstick.c +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + + #define DRIVER_NAME "memstick" + +@@ -436,6 +437,7 @@ static void memstick_check(struct work_struct *work) + struct memstick_dev *card; + + dev_dbg(&host->dev, "memstick_check started\n"); ++ pm_runtime_get_noresume(host->dev.parent); + mutex_lock(&host->lock); + if (!host->card) { + if (memstick_power_on(host)) +@@ -479,6 +481,7 @@ out_power_off: + host->set_param(host, MEMSTICK_POWER, MEMSTICK_POWER_OFF); + + mutex_unlock(&host->lock); ++ pm_runtime_put(host->dev.parent); + dev_dbg(&host->dev, "memstick_check finished\n"); + } + +-- +2.19.1 + diff --git a/queue-4.14/mips-boston-disable-eg20t-prefetch.patch b/queue-4.14/mips-boston-disable-eg20t-prefetch.patch new file mode 100644 index 00000000000..8bcd35ac6b0 --- /dev/null +++ b/queue-4.14/mips-boston-disable-eg20t-prefetch.patch @@ -0,0 +1,49 @@ +From 999b2f248a640176069095a17c6bcbe223dc2b28 Mon Sep 17 00:00:00 2001 +From: Paul Burton +Date: Sat, 10 Nov 2018 00:12:06 +0000 +Subject: MIPS: Boston: Disable EG20T prefetch + +[ Upstream commit 5ec17af7ead09701e23d2065e16db6ce4e137289 ] + +The Intel EG20T Platform Controller Hub used on the MIPS Boston +development board supports prefetching memory to optimize DMA transfers. +Unfortunately for unknown reasons this doesn't work well with some MIPS +CPUs such as the P6600, particularly when using an I/O Coherence Unit +(IOCU) to provide cache-coherent DMA. In these systems it is common for +DMA data to be lost, resulting in broken access to EG20T devices such as +the MMC or SATA controllers. + +Support for a DT property to configure the prefetching was added a while +back by commit 549ce8f134bd ("misc: pch_phub: Read prefetch value from +device tree if passed") but we never added the DT snippet to make use of +it. Add that now in order to disable the prefetching & fix DMA on the +affected systems. + +Signed-off-by: Paul Burton +Patchwork: https://patchwork.linux-mips.org/patch/21068/ +Cc: linux-mips@linux-mips.org +Signed-off-by: Sasha Levin +--- + arch/mips/boot/dts/img/boston.dts | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/arch/mips/boot/dts/img/boston.dts b/arch/mips/boot/dts/img/boston.dts +index f7aad80c69ab..bebb0fa21369 100644 +--- a/arch/mips/boot/dts/img/boston.dts ++++ b/arch/mips/boot/dts/img/boston.dts +@@ -141,6 +141,12 @@ + #size-cells = <2>; + #interrupt-cells = <1>; + ++ eg20t_phub@2,0,0 { ++ compatible = "pci8086,8801"; ++ reg = <0x00020000 0 0 0 0>; ++ intel,eg20t-prefetch = <0>; ++ }; ++ + eg20t_mac@2,0,1 { + compatible = "pci8086,8802"; + reg = <0x00020100 0 0 0 0>; +-- +2.19.1 + diff --git a/queue-4.14/mips-bpf-fix-encoding-bug-for-mm_srlv32_op.patch b/queue-4.14/mips-bpf-fix-encoding-bug-for-mm_srlv32_op.patch new file mode 100644 index 00000000000..99e9f7b9d83 --- /dev/null +++ b/queue-4.14/mips-bpf-fix-encoding-bug-for-mm_srlv32_op.patch @@ -0,0 +1,47 @@ +From b3f9efb8759f9f132853f6442cd2a2a6c91e0c19 Mon Sep 17 00:00:00 2001 +From: Jiong Wang +Date: Mon, 3 Dec 2018 17:27:54 -0500 +Subject: mips: bpf: fix encoding bug for mm_srlv32_op + +[ Upstream commit 17f6c83fb5ebf7db4fcc94a5be4c22d5a7bfe428 ] + +For micro-mips, srlv inside POOL32A encoding space should use 0x50 +sub-opcode, NOT 0x90. + +Some early version ISA doc describes the encoding as 0x90 for both srlv and +srav, this looks to me was a typo. I checked Binutils libopcode +implementation which is using 0x50 for srlv and 0x90 for srav. + +v1->v2: + - Keep mm_srlv32_op sorted by value. + +Fixes: f31318fdf324 ("MIPS: uasm: Add srlv uasm instruction") +Cc: Markos Chandras +Cc: Paul Burton +Cc: linux-mips@vger.kernel.org +Acked-by: Jakub Kicinski +Acked-by: Song Liu +Signed-off-by: Jiong Wang +Signed-off-by: Alexei Starovoitov +Signed-off-by: Sasha Levin +--- + arch/mips/include/uapi/asm/inst.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/mips/include/uapi/asm/inst.h b/arch/mips/include/uapi/asm/inst.h +index c05dcf5ab414..273ef58f4d43 100644 +--- a/arch/mips/include/uapi/asm/inst.h ++++ b/arch/mips/include/uapi/asm/inst.h +@@ -369,8 +369,8 @@ enum mm_32a_minor_op { + mm_ext_op = 0x02c, + mm_pool32axf_op = 0x03c, + mm_srl32_op = 0x040, ++ mm_srlv32_op = 0x050, + mm_sra_op = 0x080, +- mm_srlv32_op = 0x090, + mm_rotr_op = 0x0c0, + mm_lwxs_op = 0x118, + mm_addu32_op = 0x150, +-- +2.19.1 + diff --git a/queue-4.14/mips-ralink-select-config_cpu_mipsr2_irq_vi-on-mt762.patch b/queue-4.14/mips-ralink-select-config_cpu_mipsr2_irq_vi-on-mt762.patch new file mode 100644 index 00000000000..ca819f15279 --- /dev/null +++ b/queue-4.14/mips-ralink-select-config_cpu_mipsr2_irq_vi-on-mt762.patch @@ -0,0 +1,54 @@ +From a6aa36108c8a9839a5ae57cc165492693dcee47d Mon Sep 17 00:00:00 2001 +From: Stefan Roese +Date: Mon, 17 Dec 2018 10:47:48 +0100 +Subject: MIPS: ralink: Select CONFIG_CPU_MIPSR2_IRQ_VI on MT7620/8 + +[ Upstream commit 0b15394475e3bcaf35ca4bf22fc55d56df67224e ] + +Testing has shown, that when using mainline U-Boot on MT7688 based +boards, the system may hang or crash while mounting the root-fs. The +main issue here is that mainline U-Boot configures EBase to a value +near the end of system memory. And with CONFIG_CPU_MIPSR2_IRQ_VI +disabled, trap_init() will not allocate a new area to place the +exception handler. The original value will be used and the handler +will be copied to this location, which might already be used by some +userspace application. + +The MT7688 supports VI - its config3 register is 0x00002420, so VInt +(Bit 5) is set. But without setting CONFIG_CPU_MIPSR2_IRQ_VI this +bit will not be evaluated to result in "cpu_has_vi" being set. This +patch now selects CONFIG_CPU_MIPSR2_IRQ_VI on MT7620/8 which results +trap_init() to allocate some memory for the exception handler. + +Please note that this issue was not seen with the Mediatek U-Boot +version, as it does not touch EBase (stays at default of 0x8000.0000). +This is strictly also not correct as the kernel (_text) resides +here. + +Signed-off-by: Stefan Roese +[paul.burton@mips.com: s/beeing/being/] +Signed-off-by: Paul Burton +Cc: John Crispin +Cc: Daniel Schwierzeck +Cc: Ralf Baechle +Cc: linux-mips@linux-mips.org +Signed-off-by: Sasha Levin +--- + arch/mips/ralink/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig +index f26736b7080b..fae36f0371d3 100644 +--- a/arch/mips/ralink/Kconfig ++++ b/arch/mips/ralink/Kconfig +@@ -39,6 +39,7 @@ choice + + config SOC_MT7620 + bool "MT7620/8" ++ select CPU_MIPSR2_IRQ_VI + select HW_HAS_PCI + + config SOC_MT7621 +-- +2.19.1 + diff --git a/queue-4.14/mlxsw-spectrum-properly-cleanup-lag-uppers-when-remo.patch b/queue-4.14/mlxsw-spectrum-properly-cleanup-lag-uppers-when-remo.patch new file mode 100644 index 00000000000..2f576727885 --- /dev/null +++ b/queue-4.14/mlxsw-spectrum-properly-cleanup-lag-uppers-when-remo.patch @@ -0,0 +1,127 @@ +From 3b659d59e601f82ba6f1ae4e2392e0ad365021b6 Mon Sep 17 00:00:00 2001 +From: Ido Schimmel +Date: Wed, 19 Dec 2018 06:08:45 +0000 +Subject: mlxsw: spectrum: Properly cleanup LAG uppers when removing port from + LAG + +[ Upstream commit be2d6f421f680e01d58f7cd452646e0d8586d49b ] + +When a LAG device or a VLAN device on top of it is enslaved to a bridge, +the driver propagates the CHANGEUPPER event to the LAG's slaves. + +This causes each physical port to increase the reference count of the +internal representation of the bridge port by calling +mlxsw_sp_port_bridge_join(). + +However, when a port is removed from a LAG, the corresponding leave() +function is not called and the reference count is not decremented. This +leads to ugly hacks such as mlxsw_sp_bridge_port_should_destroy() that +try to understand if the bridge port should be destroyed even when its +reference count is not 0. + +Instead, make sure that when a port is unlinked from a LAG it would see +the same events as if the LAG (or its uppers) were unlinked from a +bridge. + +The above is achieved by walking the LAG's uppers when a port is +unlinked and calling mlxsw_sp_port_bridge_leave() for each upper that is +enslaved to a bridge. + +Signed-off-by: Ido Schimmel +Reviewed-by: Petr Machata +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + .../net/ethernet/mellanox/mlxsw/spectrum.c | 23 ++++++++++++++++ + .../mellanox/mlxsw/spectrum_switchdev.c | 27 +------------------ + 2 files changed, 24 insertions(+), 26 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +index cf65b2ee8b95..7892e6b8d2e8 100644 +--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c ++++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +@@ -3907,6 +3907,25 @@ void mlxsw_sp_port_dev_put(struct mlxsw_sp_port *mlxsw_sp_port) + dev_put(mlxsw_sp_port->dev); + } + ++static void ++mlxsw_sp_port_lag_uppers_cleanup(struct mlxsw_sp_port *mlxsw_sp_port, ++ struct net_device *lag_dev) ++{ ++ struct net_device *br_dev = netdev_master_upper_dev_get(lag_dev); ++ struct net_device *upper_dev; ++ struct list_head *iter; ++ ++ if (netif_is_bridge_port(lag_dev)) ++ mlxsw_sp_port_bridge_leave(mlxsw_sp_port, lag_dev, br_dev); ++ ++ netdev_for_each_upper_dev_rcu(lag_dev, upper_dev, iter) { ++ if (!netif_is_bridge_port(upper_dev)) ++ continue; ++ br_dev = netdev_master_upper_dev_get(upper_dev); ++ mlxsw_sp_port_bridge_leave(mlxsw_sp_port, upper_dev, br_dev); ++ } ++} ++ + static int mlxsw_sp_lag_create(struct mlxsw_sp *mlxsw_sp, u16 lag_id) + { + char sldr_pl[MLXSW_REG_SLDR_LEN]; +@@ -4094,6 +4113,10 @@ static void mlxsw_sp_port_lag_leave(struct mlxsw_sp_port *mlxsw_sp_port, + + /* Any VLANs configured on the port are no longer valid */ + mlxsw_sp_port_vlan_flush(mlxsw_sp_port); ++ /* Make the LAG and its directly linked uppers leave bridges they ++ * are memeber in ++ */ ++ mlxsw_sp_port_lag_uppers_cleanup(mlxsw_sp_port, lag_dev); + + if (lag->ref_count == 1) + mlxsw_sp_lag_destroy(mlxsw_sp, lag_id); +diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +index 9052e93e1925..f33fb95c4189 100644 +--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c ++++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +@@ -291,30 +291,6 @@ mlxsw_sp_bridge_port_destroy(struct mlxsw_sp_bridge_port *bridge_port) + kfree(bridge_port); + } + +-static bool +-mlxsw_sp_bridge_port_should_destroy(const struct mlxsw_sp_bridge_port * +- bridge_port) +-{ +- struct net_device *dev = bridge_port->dev; +- struct mlxsw_sp *mlxsw_sp; +- +- if (is_vlan_dev(dev)) +- mlxsw_sp = mlxsw_sp_lower_get(vlan_dev_real_dev(dev)); +- else +- mlxsw_sp = mlxsw_sp_lower_get(dev); +- +- /* In case ports were pulled from out of a bridged LAG, then +- * it's possible the reference count isn't zero, yet the bridge +- * port should be destroyed, as it's no longer an upper of ours. +- */ +- if (!mlxsw_sp && list_empty(&bridge_port->vlans_list)) +- return true; +- else if (bridge_port->ref_count == 0) +- return true; +- else +- return false; +-} +- + static struct mlxsw_sp_bridge_port * + mlxsw_sp_bridge_port_get(struct mlxsw_sp_bridge *bridge, + struct net_device *brport_dev) +@@ -352,8 +328,7 @@ static void mlxsw_sp_bridge_port_put(struct mlxsw_sp_bridge *bridge, + { + struct mlxsw_sp_bridge_device *bridge_device; + +- bridge_port->ref_count--; +- if (!mlxsw_sp_bridge_port_should_destroy(bridge_port)) ++ if (--bridge_port->ref_count != 0) + return; + bridge_device = bridge_port->bridge_device; + mlxsw_sp_bridge_port_destroy(bridge_port); +-- +2.19.1 + diff --git a/queue-4.14/mmc-bcm2835-recover-from-mmc_send_ext_csd.patch b/queue-4.14/mmc-bcm2835-recover-from-mmc_send_ext_csd.patch new file mode 100644 index 00000000000..4fbb818e0fc --- /dev/null +++ b/queue-4.14/mmc-bcm2835-recover-from-mmc_send_ext_csd.patch @@ -0,0 +1,56 @@ +From 1b9bfb15f1452d48a5d245d548c70660a00e8a72 Mon Sep 17 00:00:00 2001 +From: Phil Elwell +Date: Sun, 11 Nov 2018 21:23:54 +0100 +Subject: mmc: bcm2835: Recover from MMC_SEND_EXT_CSD + +[ Upstream commit 07d405769afea5718529fc9e341f0b13b3189b6f ] + +If the user issues an "mmc extcsd read", the SD controller receives +what it thinks is a SEND_IF_COND command with an unexpected data block. +The resulting operations leave the FSM stuck in READWAIT, a state which +persists until the MMC framework resets the controller, by which point +the root filesystem is likely to have been unmounted. + +A less heavyweight solution is to detect the condition and nudge the +FSM by asserting the (self-clearing) FORCE_DATA_MODE bit. + +Link: https://github.com/raspberrypi/linux/issues/2728 +Signed-off-by: Phil Elwell +Signed-off-by: Stefan Wahren +Acked-by: Eric Anholt +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/bcm2835.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c +index 0d3b7473bc21..abf1f3c8b0c3 100644 +--- a/drivers/mmc/host/bcm2835.c ++++ b/drivers/mmc/host/bcm2835.c +@@ -772,6 +772,8 @@ static void bcm2835_finish_command(struct bcm2835_host *host) + + if (!(sdhsts & SDHSTS_CRC7_ERROR) || + (host->cmd->opcode != MMC_SEND_OP_COND)) { ++ u32 edm, fsm; ++ + if (sdhsts & SDHSTS_CMD_TIME_OUT) { + host->cmd->error = -ETIMEDOUT; + } else { +@@ -780,6 +782,13 @@ static void bcm2835_finish_command(struct bcm2835_host *host) + bcm2835_dumpregs(host); + host->cmd->error = -EILSEQ; + } ++ edm = readl(host->ioaddr + SDEDM); ++ fsm = edm & SDEDM_FSM_MASK; ++ if (fsm == SDEDM_FSM_READWAIT || ++ fsm == SDEDM_FSM_WRITESTART1) ++ /* Kick the FSM out of its wait */ ++ writel(edm | SDEDM_FORCE_DATA_MODE, ++ host->ioaddr + SDEDM); + bcm2835_finish_request(host); + return; + } +-- +2.19.1 + diff --git a/queue-4.14/mmc-bcm2835-reset-host-on-timeout.patch b/queue-4.14/mmc-bcm2835-reset-host-on-timeout.patch new file mode 100644 index 00000000000..f678629ecf9 --- /dev/null +++ b/queue-4.14/mmc-bcm2835-reset-host-on-timeout.patch @@ -0,0 +1,48 @@ +From b4591640fb834e3a9717b3972c8cca5e8889b97b Mon Sep 17 00:00:00 2001 +From: Michal Suchanek +Date: Sun, 11 Nov 2018 21:23:53 +0100 +Subject: mmc: bcm2835: reset host on timeout + +[ Upstream commit f6000a4eb34e6462bc0dd39809c1bb99f9633269 ] + +The bcm2835 mmc host tends to lock up for unknown reason so reset it on +timeout. The upper mmc block layer tries retransimitting with single +blocks which tends to work out after a long wait. + +This is better than giving up and leaving the machine broken for no +obvious reason. + +Fixes: 660fc733bd74 ("mmc: bcm2835: Add new driver for the sdhost controller.") +Signed-off-by: Michal Suchanek +Signed-off-by: Stefan Wahren +Acked-by: Eric Anholt +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/bcm2835.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c +index abf1f3c8b0c3..5301302fb531 100644 +--- a/drivers/mmc/host/bcm2835.c ++++ b/drivers/mmc/host/bcm2835.c +@@ -286,6 +286,7 @@ static void bcm2835_reset(struct mmc_host *mmc) + + if (host->dma_chan) + dmaengine_terminate_sync(host->dma_chan); ++ host->dma_chan = NULL; + bcm2835_reset_internal(host); + } + +@@ -846,6 +847,8 @@ static void bcm2835_timeout(struct work_struct *work) + dev_err(dev, "timeout waiting for hardware interrupt.\n"); + bcm2835_dumpregs(host); + ++ bcm2835_reset(host->mmc); ++ + if (host->data) { + host->data->error = -ETIMEDOUT; + bcm2835_finish_data(host); +-- +2.19.1 + diff --git a/queue-4.14/mmc-sdhci-of-esdhc-fix-timeout-checks.patch b/queue-4.14/mmc-sdhci-of-esdhc-fix-timeout-checks.patch new file mode 100644 index 00000000000..5a3a31683b4 --- /dev/null +++ b/queue-4.14/mmc-sdhci-of-esdhc-fix-timeout-checks.patch @@ -0,0 +1,54 @@ +From 3833395f7cf65d9ae53a2034310c3b0951787ce5 Mon Sep 17 00:00:00 2001 +From: Adrian Hunter +Date: Mon, 10 Dec 2018 10:56:24 +0200 +Subject: mmc: sdhci-of-esdhc: Fix timeout checks + +[ Upstream commit ea6d027312111c6d96309ad1a684b33cb37e6764 ] + +Always check the wait condition before returning timeout. + +Signed-off-by: Adrian Hunter +Reviewed-by: Yangbo Lu +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/sdhci-of-esdhc.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c +index 8332f56e6c0d..7b7d077e40fd 100644 +--- a/drivers/mmc/host/sdhci-of-esdhc.c ++++ b/drivers/mmc/host/sdhci-of-esdhc.c +@@ -481,8 +481,12 @@ static void esdhc_clock_enable(struct sdhci_host *host, bool enable) + /* Wait max 20 ms */ + timeout = ktime_add_ms(ktime_get(), 20); + val = ESDHC_CLOCK_STABLE; +- while (!(sdhci_readl(host, ESDHC_PRSSTAT) & val)) { +- if (ktime_after(ktime_get(), timeout)) { ++ while (1) { ++ bool timedout = ktime_after(ktime_get(), timeout); ++ ++ if (sdhci_readl(host, ESDHC_PRSSTAT) & val) ++ break; ++ if (timedout) { + pr_err("%s: Internal clock never stabilised.\n", + mmc_hostname(host->mmc)); + break; +@@ -558,8 +562,12 @@ static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock) + + /* Wait max 20 ms */ + timeout = ktime_add_ms(ktime_get(), 20); +- while (!(sdhci_readl(host, ESDHC_PRSSTAT) & ESDHC_CLOCK_STABLE)) { +- if (ktime_after(ktime_get(), timeout)) { ++ while (1) { ++ bool timedout = ktime_after(ktime_get(), timeout); ++ ++ if (sdhci_readl(host, ESDHC_PRSSTAT) & ESDHC_CLOCK_STABLE) ++ break; ++ if (timedout) { + pr_err("%s: Internal clock never stabilised.\n", + mmc_hostname(host->mmc)); + return; +-- +2.19.1 + diff --git a/queue-4.14/mmc-sdhci-xenon-fix-timeout-checks.patch b/queue-4.14/mmc-sdhci-xenon-fix-timeout-checks.patch new file mode 100644 index 00000000000..c24aae83a8a --- /dev/null +++ b/queue-4.14/mmc-sdhci-xenon-fix-timeout-checks.patch @@ -0,0 +1,63 @@ +From fe4c3ca057df345e31855e1c040d9696010fcbb1 Mon Sep 17 00:00:00 2001 +From: Adrian Hunter +Date: Mon, 10 Dec 2018 10:56:26 +0200 +Subject: mmc: sdhci-xenon: Fix timeout checks + +[ Upstream commit 0e6e7c2ff397e1bbebc882ca3132148aaaef1ddd ] + +Always check the wait condition before returning timeout. + +Signed-off-by: Adrian Hunter +Reviewed-by: Zhoujie Wu +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/sdhci-xenon-phy.c | 10 +++++++--- + drivers/mmc/host/sdhci-xenon.c | 10 +++++++--- + 2 files changed, 14 insertions(+), 6 deletions(-) + +diff --git a/drivers/mmc/host/sdhci-xenon-phy.c b/drivers/mmc/host/sdhci-xenon-phy.c +index ec8794335241..82051f2b7191 100644 +--- a/drivers/mmc/host/sdhci-xenon-phy.c ++++ b/drivers/mmc/host/sdhci-xenon-phy.c +@@ -357,9 +357,13 @@ static int xenon_emmc_phy_enable_dll(struct sdhci_host *host) + + /* Wait max 32 ms */ + timeout = ktime_add_ms(ktime_get(), 32); +- while (!(sdhci_readw(host, XENON_SLOT_EXT_PRESENT_STATE) & +- XENON_DLL_LOCK_STATE)) { +- if (ktime_after(ktime_get(), timeout)) { ++ while (1) { ++ bool timedout = ktime_after(ktime_get(), timeout); ++ ++ if (sdhci_readw(host, XENON_SLOT_EXT_PRESENT_STATE) & ++ XENON_DLL_LOCK_STATE) ++ break; ++ if (timedout) { + dev_err(mmc_dev(host->mmc), "Wait for DLL Lock time-out\n"); + return -ETIMEDOUT; + } +diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c +index 4d0791f6ec23..a0b5089b3274 100644 +--- a/drivers/mmc/host/sdhci-xenon.c ++++ b/drivers/mmc/host/sdhci-xenon.c +@@ -34,9 +34,13 @@ static int xenon_enable_internal_clk(struct sdhci_host *host) + sdhci_writel(host, reg, SDHCI_CLOCK_CONTROL); + /* Wait max 20 ms */ + timeout = ktime_add_ms(ktime_get(), 20); +- while (!((reg = sdhci_readw(host, SDHCI_CLOCK_CONTROL)) +- & SDHCI_CLOCK_INT_STABLE)) { +- if (ktime_after(ktime_get(), timeout)) { ++ while (1) { ++ bool timedout = ktime_after(ktime_get(), timeout); ++ ++ reg = sdhci_readw(host, SDHCI_CLOCK_CONTROL); ++ if (reg & SDHCI_CLOCK_INT_STABLE) ++ break; ++ if (timedout) { + dev_err(mmc_dev(host->mmc), "Internal clock never stabilised.\n"); + return -ETIMEDOUT; + } +-- +2.19.1 + diff --git a/queue-4.14/modpost-validate-symbol-names-also-in-find_elf_symbo.patch b/queue-4.14/modpost-validate-symbol-names-also-in-find_elf_symbo.patch new file mode 100644 index 00000000000..954ecdd7b32 --- /dev/null +++ b/queue-4.14/modpost-validate-symbol-names-also-in-find_elf_symbo.patch @@ -0,0 +1,102 @@ +From 50451b7c062eb77d9717c4070bb97cdf47645ba9 Mon Sep 17 00:00:00 2001 +From: Sami Tolvanen +Date: Tue, 23 Oct 2018 15:15:35 -0700 +Subject: modpost: validate symbol names also in find_elf_symbol + +[ Upstream commit 5818c683a619c534c113e1f66d24f636defc29bc ] + +If an ARM mapping symbol shares an address with a valid symbol, +find_elf_symbol can currently return the mapping symbol instead, as the +symbol is not validated. This can result in confusing warnings: + + WARNING: vmlinux.o(.text+0x18f4028): Section mismatch in reference + from the function set_reset_devices() to the variable .init.text:$x.0 + +This change adds a call to is_valid_name to find_elf_symbol, similarly +to how it's already used in find_elf_symbol2. + +Signed-off-by: Sami Tolvanen +Signed-off-by: Masahiro Yamada +Signed-off-by: Sasha Levin +--- + scripts/mod/modpost.c | 50 ++++++++++++++++++++++--------------------- + 1 file changed, 26 insertions(+), 24 deletions(-) + +diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c +index 18bc8738e989..e36a673833ae 100644 +--- a/scripts/mod/modpost.c ++++ b/scripts/mod/modpost.c +@@ -1215,6 +1215,30 @@ static int secref_whitelist(const struct sectioncheck *mismatch, + return 1; + } + ++static inline int is_arm_mapping_symbol(const char *str) ++{ ++ return str[0] == '$' && strchr("axtd", str[1]) ++ && (str[2] == '\0' || str[2] == '.'); ++} ++ ++/* ++ * If there's no name there, ignore it; likewise, ignore it if it's ++ * one of the magic symbols emitted used by current ARM tools. ++ * ++ * Otherwise if find_symbols_between() returns those symbols, they'll ++ * fail the whitelist tests and cause lots of false alarms ... fixable ++ * only by merging __exit and __init sections into __text, bloating ++ * the kernel (which is especially evil on embedded platforms). ++ */ ++static inline int is_valid_name(struct elf_info *elf, Elf_Sym *sym) ++{ ++ const char *name = elf->strtab + sym->st_name; ++ ++ if (!name || !strlen(name)) ++ return 0; ++ return !is_arm_mapping_symbol(name); ++} ++ + /** + * Find symbol based on relocation record info. + * In some cases the symbol supplied is a valid symbol so +@@ -1240,6 +1264,8 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr, + continue; + if (ELF_ST_TYPE(sym->st_info) == STT_SECTION) + continue; ++ if (!is_valid_name(elf, sym)) ++ continue; + if (sym->st_value == addr) + return sym; + /* Find a symbol nearby - addr are maybe negative */ +@@ -1258,30 +1284,6 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr, + return NULL; + } + +-static inline int is_arm_mapping_symbol(const char *str) +-{ +- return str[0] == '$' && strchr("axtd", str[1]) +- && (str[2] == '\0' || str[2] == '.'); +-} +- +-/* +- * If there's no name there, ignore it; likewise, ignore it if it's +- * one of the magic symbols emitted used by current ARM tools. +- * +- * Otherwise if find_symbols_between() returns those symbols, they'll +- * fail the whitelist tests and cause lots of false alarms ... fixable +- * only by merging __exit and __init sections into __text, bloating +- * the kernel (which is especially evil on embedded platforms). +- */ +-static inline int is_valid_name(struct elf_info *elf, Elf_Sym *sym) +-{ +- const char *name = elf->strtab + sym->st_name; +- +- if (!name || !strlen(name)) +- return 0; +- return !is_arm_mapping_symbol(name); +-} +- + /* + * Find symbols before or equal addr and after addr - in the section sec. + * If we find two symbols with equal offset prefer one with a valid name. +-- +2.19.1 + diff --git a/queue-4.14/net-mlx5-eq-use-the-right-place-to-store-read-irq-af.patch b/queue-4.14/net-mlx5-eq-use-the-right-place-to-store-read-irq-af.patch new file mode 100644 index 00000000000..54c1e461c6e --- /dev/null +++ b/queue-4.14/net-mlx5-eq-use-the-right-place-to-store-read-irq-af.patch @@ -0,0 +1,97 @@ +From cd36a6941ddc6f3639673077b859236627a22d3b Mon Sep 17 00:00:00 2001 +From: Saeed Mahameed +Date: Mon, 19 Nov 2018 10:52:31 -0800 +Subject: net/mlx5: EQ, Use the right place to store/read IRQ affinity hint + +[ Upstream commit 1e86ace4c140fd5a693e266c9b23409358f25381 ] + +Currently the cpu affinity hint mask for completion EQs is stored and +read from the wrong place, since reading and storing is done from the +same index, there is no actual issue with that, but internal irq_info +for completion EQs stars at MLX5_EQ_VEC_COMP_BASE offset in irq_info +array, this patch changes the code to use the correct offset to store +and read the IRQ affinity hint. + +Signed-off-by: Saeed Mahameed +Reviewed-by: Leon Romanovsky +Reviewed-by: Tariq Toukan +Signed-off-by: Leon Romanovsky +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 14 ++++++++------ + include/linux/mlx5/driver.h | 2 +- + 3 files changed, 10 insertions(+), 8 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +index bf34264c734b..14bab8a5550d 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +@@ -1605,7 +1605,7 @@ static void mlx5e_close_cq(struct mlx5e_cq *cq) + + static int mlx5e_get_cpu(struct mlx5e_priv *priv, int ix) + { +- return cpumask_first(priv->mdev->priv.irq_info[ix].mask); ++ return cpumask_first(priv->mdev->priv.irq_info[ix + MLX5_EQ_VEC_COMP_BASE].mask); + } + + static int mlx5e_open_tx_cqs(struct mlx5e_channel *c, +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c +index e99f1382a4f0..558fc6a05e2a 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c +@@ -619,18 +619,19 @@ u64 mlx5_read_internal_timer(struct mlx5_core_dev *dev) + static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i) + { + struct mlx5_priv *priv = &mdev->priv; +- int irq = pci_irq_vector(mdev->pdev, MLX5_EQ_VEC_COMP_BASE + i); ++ int vecidx = MLX5_EQ_VEC_COMP_BASE + i; ++ int irq = pci_irq_vector(mdev->pdev, vecidx); + +- if (!zalloc_cpumask_var(&priv->irq_info[i].mask, GFP_KERNEL)) { ++ if (!zalloc_cpumask_var(&priv->irq_info[vecidx].mask, GFP_KERNEL)) { + mlx5_core_warn(mdev, "zalloc_cpumask_var failed"); + return -ENOMEM; + } + + cpumask_set_cpu(cpumask_local_spread(i, priv->numa_node), +- priv->irq_info[i].mask); ++ priv->irq_info[vecidx].mask); + + if (IS_ENABLED(CONFIG_SMP) && +- irq_set_affinity_hint(irq, priv->irq_info[i].mask)) ++ irq_set_affinity_hint(irq, priv->irq_info[vecidx].mask)) + mlx5_core_warn(mdev, "irq_set_affinity_hint failed, irq 0x%.4x", irq); + + return 0; +@@ -638,11 +639,12 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i) + + static void mlx5_irq_clear_affinity_hint(struct mlx5_core_dev *mdev, int i) + { ++ int vecidx = MLX5_EQ_VEC_COMP_BASE + i; + struct mlx5_priv *priv = &mdev->priv; +- int irq = pci_irq_vector(mdev->pdev, MLX5_EQ_VEC_COMP_BASE + i); ++ int irq = pci_irq_vector(mdev->pdev, vecidx); + + irq_set_affinity_hint(irq, NULL); +- free_cpumask_var(priv->irq_info[i].mask); ++ free_cpumask_var(priv->irq_info[vecidx].mask); + } + + static int mlx5_irq_set_affinity_hints(struct mlx5_core_dev *mdev) +diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h +index fb677e4f902d..88f0c530fe9c 100644 +--- a/include/linux/mlx5/driver.h ++++ b/include/linux/mlx5/driver.h +@@ -1195,7 +1195,7 @@ enum { + static inline const struct cpumask * + mlx5_get_vector_affinity_hint(struct mlx5_core_dev *dev, int vector) + { +- return dev->priv.irq_info[vector].mask; ++ return dev->priv.irq_info[vector + MLX5_EQ_VEC_COMP_BASE].mask; + } + + #endif /* MLX5_DRIVER_H */ +-- +2.19.1 + diff --git a/queue-4.14/nfs-nfs_compare_mount_options-always-compare-auth-fl.patch b/queue-4.14/nfs-nfs_compare_mount_options-always-compare-auth-fl.patch new file mode 100644 index 00000000000..668a9a3e045 --- /dev/null +++ b/queue-4.14/nfs-nfs_compare_mount_options-always-compare-auth-fl.patch @@ -0,0 +1,55 @@ +From e2b79c06c8213e28db7f2caf028d82bf85ef8c4a Mon Sep 17 00:00:00 2001 +From: Chris Perl +Date: Mon, 17 Dec 2018 10:56:38 -0500 +Subject: NFS: nfs_compare_mount_options always compare auth flavors. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[ Upstream commit 594d1644cd59447f4fceb592448d5cd09eb09b5e ] + +This patch removes the check from nfs_compare_mount_options to see if a +`sec' option was passed for the current mount before comparing auth +flavors and instead just always compares auth flavors. + +Consider the following scenario: + +You have a server with the address 192.168.1.1 and two exports /export/a +and /export/b. The first export supports `sys' and `krb5' security, the +second just `sys'. + +Assume you start with no mounts from the server. + +The following results in EIOs being returned as the kernel nfs client +incorrectly thinks it can share the underlying `struct nfs_server's: + +$ mkdir /tmp/{a,b} +$ sudo mount -t nfs -o vers=3,sec=krb5 192.168.1.1:/export/a /tmp/a +$ sudo mount -t nfs -o vers=3 192.168.1.1:/export/b /tmp/b +$ df >/dev/null +df: ‘/tmp/b’: Input/output error + +Signed-off-by: Chris Perl +Signed-off-by: Anna Schumaker +Signed-off-by: Sasha Levin +--- + fs/nfs/super.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/fs/nfs/super.c b/fs/nfs/super.c +index 38de09b08e96..3c4aeb83e1c4 100644 +--- a/fs/nfs/super.c ++++ b/fs/nfs/super.c +@@ -2401,8 +2401,7 @@ static int nfs_compare_mount_options(const struct super_block *s, const struct n + goto Ebusy; + if (a->acdirmax != b->acdirmax) + goto Ebusy; +- if (b->auth_info.flavor_len > 0 && +- clnt_a->cl_auth->au_flavor != clnt_b->cl_auth->au_flavor) ++ if (clnt_a->cl_auth->au_flavor != clnt_b->cl_auth->au_flavor) + goto Ebusy; + return 1; + Ebusy: +-- +2.19.1 + diff --git a/queue-4.14/nfsd4-fix-crash-on-writing-v4_end_grace-before-nfsd-.patch b/queue-4.14/nfsd4-fix-crash-on-writing-v4_end_grace-before-nfsd-.patch new file mode 100644 index 00000000000..a23f0d8a1a3 --- /dev/null +++ b/queue-4.14/nfsd4-fix-crash-on-writing-v4_end_grace-before-nfsd-.patch @@ -0,0 +1,40 @@ +From 0a436c557fe921069d6be013aaad95943a689124 Mon Sep 17 00:00:00 2001 +From: "J. Bruce Fields" +Date: Tue, 27 Nov 2018 15:54:17 -0500 +Subject: nfsd4: fix crash on writing v4_end_grace before nfsd startup + +[ Upstream commit 62a063b8e7d1db684db3f207261a466fa3194e72 ] + +Anatoly Trosinenko reports that this: + +1) Checkout fresh master Linux branch (tested with commit e195ca6cb) +2) Copy x84_64-config-4.14 to .config, then enable NFS server v4 and build +3) From `kvm-xfstests shell`: + +results in NULL dereference in locks_end_grace. + +Check that nfsd has been started before trying to end the grace period. + +Reported-by: Anatoly Trosinenko +Signed-off-by: J. Bruce Fields +Signed-off-by: Sasha Levin +--- + fs/nfsd/nfsctl.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c +index 6493df6b1bd5..4b8ebcc6b183 100644 +--- a/fs/nfsd/nfsctl.c ++++ b/fs/nfsd/nfsctl.c +@@ -1126,6 +1126,8 @@ static ssize_t write_v4_end_grace(struct file *file, char *buf, size_t size) + case 'Y': + case 'y': + case '1': ++ if (nn->nfsd_serv) ++ return -EBUSY; + nfsd4_end_grace(nn); + break; + default: +-- +2.19.1 + diff --git a/queue-4.14/niu-fix-missing-checks-of-niu_pci_eeprom_read.patch b/queue-4.14/niu-fix-missing-checks-of-niu_pci_eeprom_read.patch new file mode 100644 index 00000000000..b714799e08c --- /dev/null +++ b/queue-4.14/niu-fix-missing-checks-of-niu_pci_eeprom_read.patch @@ -0,0 +1,49 @@ +From f0943e29cbcf5bfeb31409bf2f7401d812db10a7 Mon Sep 17 00:00:00 2001 +From: Kangjie Lu +Date: Tue, 25 Dec 2018 01:56:14 -0600 +Subject: niu: fix missing checks of niu_pci_eeprom_read + +[ Upstream commit 26fd962bde0b15e54234fe762d86bc0349df1de4 ] + +niu_pci_eeprom_read() may fail, so we should check its return value +before using the read data. + +Signed-off-by: Kangjie Lu +Acked-by: Shannon Nelson +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/sun/niu.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c +index e92f41d20a2c..411a69bea1d4 100644 +--- a/drivers/net/ethernet/sun/niu.c ++++ b/drivers/net/ethernet/sun/niu.c +@@ -8119,6 +8119,8 @@ static int niu_pci_vpd_scan_props(struct niu *np, u32 start, u32 end) + start += 3; + + prop_len = niu_pci_eeprom_read(np, start + 4); ++ if (prop_len < 0) ++ return prop_len; + err = niu_pci_vpd_get_propname(np, start + 5, namebuf, 64); + if (err < 0) + return err; +@@ -8163,8 +8165,12 @@ static int niu_pci_vpd_scan_props(struct niu *np, u32 start, u32 end) + netif_printk(np, probe, KERN_DEBUG, np->dev, + "VPD_SCAN: Reading in property [%s] len[%d]\n", + namebuf, prop_len); +- for (i = 0; i < prop_len; i++) +- *prop_buf++ = niu_pci_eeprom_read(np, off + i); ++ for (i = 0; i < prop_len; i++) { ++ err = niu_pci_eeprom_read(np, off + i); ++ if (err >= 0) ++ *prop_buf = err; ++ ++prop_buf; ++ } + } + + start += len; +-- +2.19.1 + diff --git a/queue-4.14/ocfs2-don-t-clear-bh-uptodate-for-block-read.patch b/queue-4.14/ocfs2-don-t-clear-bh-uptodate-for-block-read.patch new file mode 100644 index 00000000000..9ea20326823 --- /dev/null +++ b/queue-4.14/ocfs2-don-t-clear-bh-uptodate-for-block-read.patch @@ -0,0 +1,68 @@ +From 0c62d16a30887817e99877f76083144e5d845c49 Mon Sep 17 00:00:00 2001 +From: Junxiao Bi +Date: Fri, 28 Dec 2018 00:32:57 -0800 +Subject: ocfs2: don't clear bh uptodate for block read + +[ Upstream commit 70306d9dce75abde855cefaf32b3f71eed8602a3 ] + +For sync io read in ocfs2_read_blocks_sync(), first clear bh uptodate flag +and submit the io, second wait io done, last check whether bh uptodate, if +not return io error. + +If two sync io for the same bh were issued, it could be the first io done +and set uptodate flag, but just before check that flag, the second io came +in and cleared uptodate, then ocfs2_read_blocks_sync() for the first io +will return IO error. + +Indeed it's not necessary to clear uptodate flag, as the io end handler +end_buffer_read_sync() will set or clear it based on io succeed or failed. + +The following message was found from a nfs server but the underlying +storage returned no error. + +[4106438.567376] (nfsd,7146,3):ocfs2_get_suballoc_slot_bit:2780 ERROR: read block 1238823695 failed -5 +[4106438.567569] (nfsd,7146,3):ocfs2_get_suballoc_slot_bit:2812 ERROR: status = -5 +[4106438.567611] (nfsd,7146,3):ocfs2_test_inode_bit:2894 ERROR: get alloc slot and bit failed -5 +[4106438.567643] (nfsd,7146,3):ocfs2_test_inode_bit:2932 ERROR: status = -5 +[4106438.567675] (nfsd,7146,3):ocfs2_get_dentry:94 ERROR: test inode bit failed -5 + +Same issue in non sync read ocfs2_read_blocks(), fixed it as well. + +Link: http://lkml.kernel.org/r/20181121020023.3034-4-junxiao.bi@oracle.com +Signed-off-by: Junxiao Bi +Reviewed-by: Changwei Ge +Reviewed-by: Yiwen Jiang +Cc: Joel Becker +Cc: Joseph Qi +Cc: Jun Piao +Cc: Mark Fasheh +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + fs/ocfs2/buffer_head_io.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/fs/ocfs2/buffer_head_io.c b/fs/ocfs2/buffer_head_io.c +index 1d098c3c00e0..9f8250df99f1 100644 +--- a/fs/ocfs2/buffer_head_io.c ++++ b/fs/ocfs2/buffer_head_io.c +@@ -152,7 +152,6 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block, + #endif + } + +- clear_buffer_uptodate(bh); + get_bh(bh); /* for end_buffer_read_sync() */ + bh->b_end_io = end_buffer_read_sync; + submit_bh(REQ_OP_READ, 0, bh); +@@ -306,7 +305,6 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr, + continue; + } + +- clear_buffer_uptodate(bh); + get_bh(bh); /* for end_buffer_read_sync() */ + if (validate) + set_buffer_needs_validate(bh); +-- +2.19.1 + diff --git a/queue-4.14/ocfs2-improve-ocfs2-makefile.patch b/queue-4.14/ocfs2-improve-ocfs2-makefile.patch new file mode 100644 index 00000000000..d833819bddd --- /dev/null +++ b/queue-4.14/ocfs2-improve-ocfs2-makefile.patch @@ -0,0 +1,72 @@ +From 3a2f8d59d634f9772a5aab9548d136d0ab981e22 Mon Sep 17 00:00:00 2001 +From: Larry Chen +Date: Fri, 28 Dec 2018 00:32:46 -0800 +Subject: ocfs2: improve ocfs2 Makefile + +[ Upstream commit 9e6aea22802b5684c7e1d69822aeb0844dd01953 ] + +Included file path was hard-wired in the ocfs2 makefile, which might +causes some confusion when compiling ocfs2 as an external module. + +Say if we compile ocfs2 module as following. +cp -r /kernel/tree/fs/ocfs2 /other/dir/ocfs2 +cd /other/dir/ocfs2 +make -C /path/to/kernel_source M=`pwd` modules + +Acutally, the compiler wil try to find included file in +/kernel/tree/fs/ocfs2, rather than the directory /other/dir/ocfs2. + +To fix this little bug, we introduce the var $(src) provided by kbuild. +$(src) means the absolute path of the running kbuild file. + +Link: http://lkml.kernel.org/r/20181108085546.15149-1-lchen@suse.com +Signed-off-by: Larry Chen +Reviewed-by: Andrew Morton +Cc: Mark Fasheh +Cc: Joel Becker +Cc: Junxiao Bi +Cc: Joseph Qi +Cc: Changwei Ge +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + fs/ocfs2/Makefile | 2 +- + fs/ocfs2/dlm/Makefile | 2 +- + fs/ocfs2/dlmfs/Makefile | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/fs/ocfs2/Makefile b/fs/ocfs2/Makefile +index 99ee093182cb..cc9b32b9db7c 100644 +--- a/fs/ocfs2/Makefile ++++ b/fs/ocfs2/Makefile +@@ -1,5 +1,5 @@ + # SPDX-License-Identifier: GPL-2.0 +-ccflags-y := -Ifs/ocfs2 ++ccflags-y := -I$(src) + + obj-$(CONFIG_OCFS2_FS) += \ + ocfs2.o \ +diff --git a/fs/ocfs2/dlm/Makefile b/fs/ocfs2/dlm/Makefile +index bd1aab1f49a4..ef2854422a6e 100644 +--- a/fs/ocfs2/dlm/Makefile ++++ b/fs/ocfs2/dlm/Makefile +@@ -1,4 +1,4 @@ +-ccflags-y := -Ifs/ocfs2 ++ccflags-y := -I$(src)/.. + + obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o + +diff --git a/fs/ocfs2/dlmfs/Makefile b/fs/ocfs2/dlmfs/Makefile +index eed3db8c5b49..33431a0296a3 100644 +--- a/fs/ocfs2/dlmfs/Makefile ++++ b/fs/ocfs2/dlmfs/Makefile +@@ -1,4 +1,4 @@ +-ccflags-y := -Ifs/ocfs2 ++ccflags-y := -I$(src)/.. + + obj-$(CONFIG_OCFS2_FS) += ocfs2_dlmfs.o + +-- +2.19.1 + diff --git a/queue-4.14/opp-use-opp_table-regulators-to-verify-no-regulator-.patch b/queue-4.14/opp-use-opp_table-regulators-to-verify-no-regulator-.patch new file mode 100644 index 00000000000..c2557fc4673 --- /dev/null +++ b/queue-4.14/opp-use-opp_table-regulators-to-verify-no-regulator-.patch @@ -0,0 +1,65 @@ +From a1cd749f049a318a4ba33896f34604f383b24ae0 Mon Sep 17 00:00:00 2001 +From: Viresh Kumar +Date: Tue, 11 Dec 2018 16:32:47 +0530 +Subject: OPP: Use opp_table->regulators to verify no regulator case + +[ Upstream commit 90e3577b5feb42bac1269e16bb3d2bdd8f6df40f ] + +The value of opp_table->regulator_count is not very consistent right now +and it may end up being 0 while we do have a "opp-microvolt" property in +the OPP table. It was kept that way as we used to check if any +regulators are set with the OPP core for a device or not using value of +regulator_count. + +Lets use opp_table->regulators for that purpose as the meaning of +regulator_count is going to change in the later patches. + +Reported-by: Quentin Perret +Signed-off-by: Viresh Kumar +Signed-off-by: Sasha Levin +--- + drivers/base/power/opp/core.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c +index d4862775b9f6..d5e7e8cc4f22 100644 +--- a/drivers/base/power/opp/core.c ++++ b/drivers/base/power/opp/core.c +@@ -192,12 +192,12 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev) + if (IS_ERR(opp_table)) + return 0; + +- count = opp_table->regulator_count; +- + /* Regulator may not be required for the device */ +- if (!count) ++ if (!opp_table->regulators) + goto put_opp_table; + ++ count = opp_table->regulator_count; ++ + uV = kmalloc_array(count, sizeof(*uV), GFP_KERNEL); + if (!uV) + goto put_opp_table; +@@ -921,6 +921,9 @@ static bool _opp_supported_by_regulators(struct dev_pm_opp *opp, + struct regulator *reg; + int i; + ++ if (!opp_table->regulators) ++ return true; ++ + for (i = 0; i < opp_table->regulator_count; i++) { + reg = opp_table->regulators[i]; + +@@ -1226,7 +1229,7 @@ static int _allocate_set_opp_data(struct opp_table *opp_table) + struct dev_pm_set_opp_data *data; + int len, count = opp_table->regulator_count; + +- if (WARN_ON(!count)) ++ if (WARN_ON(!opp_table->regulators)) + return -EINVAL; + + /* space for set_opp_data */ +-- +2.19.1 + diff --git a/queue-4.14/percpu-convert-spin_lock_irq-to-spin_lock_irqsave.patch b/queue-4.14/percpu-convert-spin_lock_irq-to-spin_lock_irqsave.patch new file mode 100644 index 00000000000..ed0d1912490 --- /dev/null +++ b/queue-4.14/percpu-convert-spin_lock_irq-to-spin_lock_irqsave.patch @@ -0,0 +1,57 @@ +From 589ddbb32e8bd30a05bcdab070642c2a814b1daa Mon Sep 17 00:00:00 2001 +From: Dennis Zhou +Date: Tue, 18 Dec 2018 08:42:27 -0800 +Subject: percpu: convert spin_lock_irq to spin_lock_irqsave. + +[ Upstream commit 6ab7d47bcbf0144a8cb81536c2cead4cde18acfe ] + +From Michael Cree: + "Bisection lead to commit b38d08f3181c ("percpu: restructure + locking") as being the cause of lockups at initial boot on + the kernel built for generic Alpha. + + On a suggestion by Tejun Heo that: + + So, the only thing I can think of is that it's calling + spin_unlock_irq() while irq handling isn't set up yet. + Can you please try the followings? + + 1. Convert all spin_[un]lock_irq() to + spin_lock_irqsave/unlock_irqrestore()." + +Fixes: b38d08f3181c ("percpu: restructure locking") +Reported-and-tested-by: Michael Cree +Acked-by: Tejun Heo +Signed-off-by: Dennis Zhou +Signed-off-by: Sasha Levin +--- + mm/percpu-km.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/mm/percpu-km.c b/mm/percpu-km.c +index 0d88d7bd5706..c22d959105b6 100644 +--- a/mm/percpu-km.c ++++ b/mm/percpu-km.c +@@ -50,6 +50,7 @@ static struct pcpu_chunk *pcpu_create_chunk(gfp_t gfp) + const int nr_pages = pcpu_group_sizes[0] >> PAGE_SHIFT; + struct pcpu_chunk *chunk; + struct page *pages; ++ unsigned long flags; + int i; + + chunk = pcpu_alloc_chunk(gfp); +@@ -68,9 +69,9 @@ static struct pcpu_chunk *pcpu_create_chunk(gfp_t gfp) + chunk->data = pages; + chunk->base_addr = page_address(pages) - pcpu_group_offsets[0]; + +- spin_lock_irq(&pcpu_lock); ++ spin_lock_irqsave(&pcpu_lock, flags); + pcpu_chunk_populated(chunk, 0, nr_pages, false); +- spin_unlock_irq(&pcpu_lock); ++ spin_unlock_irqrestore(&pcpu_lock, flags); + + pcpu_stats_chunk_alloc(); + trace_percpu_create_chunk(chunk->base_addr); +-- +2.19.1 + diff --git a/queue-4.14/perf-header-fix-unchecked-usage-of-strncpy.patch b/queue-4.14/perf-header-fix-unchecked-usage-of-strncpy.patch new file mode 100644 index 00000000000..5559a0c716c --- /dev/null +++ b/queue-4.14/perf-header-fix-unchecked-usage-of-strncpy.patch @@ -0,0 +1,48 @@ +From 15a1b8ef0ca44efa2bd21c93438924ee6cb7794b Mon Sep 17 00:00:00 2001 +From: Arnaldo Carvalho de Melo +Date: Thu, 6 Dec 2018 11:02:57 -0300 +Subject: perf header: Fix unchecked usage of strncpy() + +[ Upstream commit 7572588085a13d5db02bf159542189f52fdb507e ] + +The strncpy() function may leave the destination string buffer +unterminated, better use strlcpy() that we have a __weak fallback +implementation for systems without it. + +This fixes this warning on an Alpine Linux Edge system with gcc 8.2: + + util/header.c: In function 'perf_event__synthesize_event_update_unit': + util/header.c:3586:2: error: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Werror=stringop-truncation] + strncpy(ev->data, evsel->unit, size); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + util/header.c:3579:16: note: length computed here + size_t size = strlen(evsel->unit); + ^~~~~~~~~~~~~~~~~~~ + +Cc: Adrian Hunter +Cc: Jiri Olsa +Cc: Namhyung Kim +Fixes: a6e5281780d1 ("perf tools: Add event_update event unit type") +Link: https://lkml.kernel.org/n/tip-fiikh5nay70bv4zskw2aa858@git.kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/util/header.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c +index 1ceb332575bd..696f2654826b 100644 +--- a/tools/perf/util/header.c ++++ b/tools/perf/util/header.c +@@ -3132,7 +3132,7 @@ perf_event__synthesize_event_update_unit(struct perf_tool *tool, + if (ev == NULL) + return -ENOMEM; + +- strncpy(ev->data, evsel->unit, size); ++ strlcpy(ev->data, evsel->unit, size + 1); + err = process(tool, (union perf_event *)ev, NULL, NULL); + free(ev); + return err; +-- +2.19.1 + diff --git a/queue-4.14/perf-probe-fix-unchecked-usage-of-strncpy.patch b/queue-4.14/perf-probe-fix-unchecked-usage-of-strncpy.patch new file mode 100644 index 00000000000..422ef4a82f4 --- /dev/null +++ b/queue-4.14/perf-probe-fix-unchecked-usage-of-strncpy.patch @@ -0,0 +1,53 @@ +From b428feac05c779813b97706574f4474f3285ba14 Mon Sep 17 00:00:00 2001 +From: Arnaldo Carvalho de Melo +Date: Thu, 6 Dec 2018 11:50:08 -0300 +Subject: perf probe: Fix unchecked usage of strncpy() + +[ Upstream commit bef0b8970f27da5ca223e522a174d03e2587761d ] + +The strncpy() function may leave the destination string buffer +unterminated, better use strlcpy() that we have a __weak fallback +implementation for systems without it. + +In this case the 'target' buffer is coming from a list of build-ids that +are expected to have a len of at most (SBUILD_ID_SIZE - 1) chars, so +probably we're safe, but since we're using strncpy() here, use strlcpy() +instead to provide the intended safety checking without the using the +problematic strncpy() function. + +This fixes this warning on an Alpine Linux Edge system with gcc 8.2: + + util/probe-file.c: In function 'probe_cache__open.isra.5': + util/probe-file.c:427:3: error: 'strncpy' specified bound 41 equals destination size [-Werror=stringop-truncation] + strncpy(sbuildid, target, SBUILD_ID_SIZE); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + cc1: all warnings being treated as errors + +Cc: Adrian Hunter +Cc: Jiri Olsa +Cc: Masami Hiramatsu +Cc: Namhyung Kim +Fixes: 1f3736c9c833 ("perf probe: Show all cached probes") +Link: https://lkml.kernel.org/n/tip-l7n8ggc9kl38qtdlouke5yp5@git.kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/util/probe-file.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c +index cdf8d83a484c..6ab9230ce8ee 100644 +--- a/tools/perf/util/probe-file.c ++++ b/tools/perf/util/probe-file.c +@@ -424,7 +424,7 @@ static int probe_cache__open(struct probe_cache *pcache, const char *target, + + if (target && build_id_cache__cached(target)) { + /* This is a cached buildid */ +- strncpy(sbuildid, target, SBUILD_ID_SIZE); ++ strlcpy(sbuildid, target, SBUILD_ID_SIZE); + dir_name = build_id_cache__linkname(sbuildid, NULL, 0); + goto found; + } +-- +2.19.1 + diff --git a/queue-4.14/perf-test-fix-perf_event_attr-test-failure.patch b/queue-4.14/perf-test-fix-perf_event_attr-test-failure.patch new file mode 100644 index 00000000000..51316e515d4 --- /dev/null +++ b/queue-4.14/perf-test-fix-perf_event_attr-test-failure.patch @@ -0,0 +1,46 @@ +From 0e1e57d999d1a0b8ed79ddbd6b3ff51fab600e78 Mon Sep 17 00:00:00 2001 +From: Adrian Hunter +Date: Thu, 22 Nov 2018 16:04:56 +0200 +Subject: perf test: Fix perf_event_attr test failure + +[ Upstream commit 741dad88dde296999da30332157ca47f0543747d ] + +Fix inconsistent use of tabs and spaces error: + + # perf test 16 -v + 16: Setup struct perf_event_attr : + --- start --- + test child forked, pid 20224 + File "/usr/libexec/perf-core/tests/attr.py", line 119 + log.warning("expected %s=%s, got %s" % (t, self[t], other[t])) + ^ + TabError: inconsistent use of tabs and spaces in indentation + test child finished with -1 + ---- end ---- + Setup struct perf_event_attr: FAILED! + +Signed-off-by: Adrian Hunter +Cc: Jiri Olsa +Link: http://lkml.kernel.org/r/20181122140456.16817-1-adrian.hunter@intel.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/tests/attr.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/perf/tests/attr.py b/tools/perf/tests/attr.py +index ff9b60b99f52..44090a9a19f3 100644 +--- a/tools/perf/tests/attr.py ++++ b/tools/perf/tests/attr.py +@@ -116,7 +116,7 @@ class Event(dict): + if not self.has_key(t) or not other.has_key(t): + continue + if not data_equal(self[t], other[t]): +- log.warning("expected %s=%s, got %s" % (t, self[t], other[t])) ++ log.warning("expected %s=%s, got %s" % (t, self[t], other[t])) + + # Test file description needs to have following sections: + # [config] +-- +2.19.1 + diff --git a/queue-4.14/perf-tools-add-hygon-dhyana-support.patch b/queue-4.14/perf-tools-add-hygon-dhyana-support.patch new file mode 100644 index 00000000000..0874decec8a --- /dev/null +++ b/queue-4.14/perf-tools-add-hygon-dhyana-support.patch @@ -0,0 +1,42 @@ +From 10a8b830453666085a5224e6b40ee32b97d7d497 Mon Sep 17 00:00:00 2001 +From: Pu Wen +Date: Mon, 12 Nov 2018 15:40:51 +0800 +Subject: perf tools: Add Hygon Dhyana support + +[ Upstream commit 4787eff3fa88f62fede6ed7afa06477ae6bf984d ] + +The tool perf is useful for the performance analysis on the Hygon Dhyana +platform. But right now there is no Hygon support for it to analyze the +KVM guest os data. So add Hygon Dhyana support to it by checking vendor +string to share the code path of AMD. + +Signed-off-by: Pu Wen +Acked-by: Borislav Petkov +Cc: Alexander Shishkin +Cc: Jiri Olsa +Cc: Namhyung Kim +Cc: Peter Zijlstra +Cc: Thomas Gleixner +Link: http://lkml.kernel.org/r/1542008451-31735-1-git-send-email-puwen@hygon.cn +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/arch/x86/util/kvm-stat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/perf/arch/x86/util/kvm-stat.c b/tools/perf/arch/x86/util/kvm-stat.c +index b32409a0e546..081353d7b095 100644 +--- a/tools/perf/arch/x86/util/kvm-stat.c ++++ b/tools/perf/arch/x86/util/kvm-stat.c +@@ -156,7 +156,7 @@ int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid) + if (strstr(cpuid, "Intel")) { + kvm->exit_reasons = vmx_exit_reasons; + kvm->exit_reasons_isa = "VMX"; +- } else if (strstr(cpuid, "AMD")) { ++ } else if (strstr(cpuid, "AMD") || strstr(cpuid, "Hygon")) { + kvm->exit_reasons = svm_exit_reasons; + kvm->exit_reasons_isa = "SVM"; + } else +-- +2.19.1 + diff --git a/queue-4.14/phy-sun4i-usb-add-support-for-missing-usb-phy-index.patch b/queue-4.14/phy-sun4i-usb-add-support-for-missing-usb-phy-index.patch new file mode 100644 index 00000000000..7b5ef96b90d --- /dev/null +++ b/queue-4.14/phy-sun4i-usb-add-support-for-missing-usb-phy-index.patch @@ -0,0 +1,55 @@ +From 4f70942ff3d532b37c2ff900f13bd5e312a0b399 Mon Sep 17 00:00:00 2001 +From: Icenowy Zheng +Date: Thu, 4 Oct 2018 20:28:47 +0800 +Subject: phy: sun4i-usb: add support for missing USB PHY index + +[ Upstream commit 2659392e5c08dff626e6db1d739adff58a94604d ] + +The new Allwinner H6 SoC's USB2 PHY has two holes -- USB1 (which is a +3.0 port with dedicated PHY) and USB2 (which doesn't exist at all). + +Add support for this kind of missing USB PHY index. + +Signed-off-by: Icenowy Zheng +Reviewed-by: Chen-Yu Tsai +Signed-off-by: Kishon Vijay Abraham I +Signed-off-by: Sasha Levin +--- + drivers/phy/allwinner/phy-sun4i-usb.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c +index afedb8cd1990..d1ccff527756 100644 +--- a/drivers/phy/allwinner/phy-sun4i-usb.c ++++ b/drivers/phy/allwinner/phy-sun4i-usb.c +@@ -125,6 +125,7 @@ struct sun4i_usb_phy_cfg { + bool dedicated_clocks; + bool enable_pmu_unk1; + bool phy0_dual_route; ++ int missing_phys; + }; + + struct sun4i_usb_phy_data { +@@ -645,6 +646,9 @@ static struct phy *sun4i_usb_phy_xlate(struct device *dev, + if (args->args[0] >= data->cfg->num_phys) + return ERR_PTR(-ENODEV); + ++ if (data->cfg->missing_phys & BIT(args->args[0])) ++ return ERR_PTR(-ENODEV); ++ + return data->phys[args->args[0]].phy; + } + +@@ -740,6 +744,9 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev) + struct sun4i_usb_phy *phy = data->phys + i; + char name[16]; + ++ if (data->cfg->missing_phys & BIT(i)) ++ continue; ++ + snprintf(name, sizeof(name), "usb%d_vbus", i); + phy->vbus = devm_regulator_get_optional(dev, name); + if (IS_ERR(phy->vbus)) { +-- +2.19.1 + diff --git a/queue-4.14/pinctrl-bcm2835-use-raw-spinlock-for-rt-compatibilit.patch b/queue-4.14/pinctrl-bcm2835-use-raw-spinlock-for-rt-compatibilit.patch new file mode 100644 index 00000000000..db381a76860 --- /dev/null +++ b/queue-4.14/pinctrl-bcm2835-use-raw-spinlock-for-rt-compatibilit.patch @@ -0,0 +1,102 @@ +From c69e65cfa2f434730f63867a12139f3fbe6fc49e Mon Sep 17 00:00:00 2001 +From: Lukas Wunner +Date: Sat, 27 Oct 2018 10:15:33 +0200 +Subject: pinctrl: bcm2835: Use raw spinlock for RT compatibility + +[ Upstream commit 3c7b30f704b6f5e53eed6bf89cf2c8d1b38b02c0 ] + +The BCM2835 pinctrl driver acquires a spinlock in its ->irq_enable, +->irq_disable and ->irq_set_type callbacks. Spinlocks become sleeping +locks with CONFIG_PREEMPT_RT_FULL=y, therefore invocation of one of the +callbacks in atomic context may cause a hard lockup if at least two GPIO +pins in the same bank are used as interrupts. The issue doesn't occur +with just a single interrupt pin per bank because the lock is never +contended. I'm experiencing such lockups with GPIO 8 and 28 used as +level-triggered interrupts, i.e. with ->irq_disable being invoked on +reception of every IRQ. + +The critical section protected by the spinlock is very small (one bitop +and one RMW of an MMIO register), hence converting to a raw spinlock +seems a better trade-off than converting the driver to threaded IRQ +handling (which would increase latency to handle an interrupt). + +Cc: Mathias Duckeck +Signed-off-by: Lukas Wunner +Acked-by: Julia Cartwright +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c +index ff782445dfb7..e72bf2502eca 100644 +--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c ++++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c +@@ -92,7 +92,7 @@ struct bcm2835_pinctrl { + struct gpio_chip gpio_chip; + struct pinctrl_gpio_range gpio_range; + +- spinlock_t irq_lock[BCM2835_NUM_BANKS]; ++ raw_spinlock_t irq_lock[BCM2835_NUM_BANKS]; + }; + + /* pins are just named GPIO0..GPIO53 */ +@@ -471,10 +471,10 @@ static void bcm2835_gpio_irq_enable(struct irq_data *data) + unsigned bank = GPIO_REG_OFFSET(gpio); + unsigned long flags; + +- spin_lock_irqsave(&pc->irq_lock[bank], flags); ++ raw_spin_lock_irqsave(&pc->irq_lock[bank], flags); + set_bit(offset, &pc->enabled_irq_map[bank]); + bcm2835_gpio_irq_config(pc, gpio, true); +- spin_unlock_irqrestore(&pc->irq_lock[bank], flags); ++ raw_spin_unlock_irqrestore(&pc->irq_lock[bank], flags); + } + + static void bcm2835_gpio_irq_disable(struct irq_data *data) +@@ -486,12 +486,12 @@ static void bcm2835_gpio_irq_disable(struct irq_data *data) + unsigned bank = GPIO_REG_OFFSET(gpio); + unsigned long flags; + +- spin_lock_irqsave(&pc->irq_lock[bank], flags); ++ raw_spin_lock_irqsave(&pc->irq_lock[bank], flags); + bcm2835_gpio_irq_config(pc, gpio, false); + /* Clear events that were latched prior to clearing event sources */ + bcm2835_gpio_set_bit(pc, GPEDS0, gpio); + clear_bit(offset, &pc->enabled_irq_map[bank]); +- spin_unlock_irqrestore(&pc->irq_lock[bank], flags); ++ raw_spin_unlock_irqrestore(&pc->irq_lock[bank], flags); + } + + static int __bcm2835_gpio_irq_set_type_disabled(struct bcm2835_pinctrl *pc, +@@ -594,7 +594,7 @@ static int bcm2835_gpio_irq_set_type(struct irq_data *data, unsigned int type) + unsigned long flags; + int ret; + +- spin_lock_irqsave(&pc->irq_lock[bank], flags); ++ raw_spin_lock_irqsave(&pc->irq_lock[bank], flags); + + if (test_bit(offset, &pc->enabled_irq_map[bank])) + ret = __bcm2835_gpio_irq_set_type_enabled(pc, gpio, type); +@@ -606,7 +606,7 @@ static int bcm2835_gpio_irq_set_type(struct irq_data *data, unsigned int type) + else + irq_set_handler_locked(data, handle_level_irq); + +- spin_unlock_irqrestore(&pc->irq_lock[bank], flags); ++ raw_spin_unlock_irqrestore(&pc->irq_lock[bank], flags); + + return ret; + } +@@ -1021,7 +1021,7 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) + for_each_set_bit(offset, &events, 32) + bcm2835_gpio_wr(pc, GPEDS0 + i * 4, BIT(offset)); + +- spin_lock_init(&pc->irq_lock[i]); ++ raw_spin_lock_init(&pc->irq_lock[i]); + } + + err = gpiochip_add_data(&pc->gpio_chip, pc); +-- +2.19.1 + diff --git a/queue-4.14/pinctrl-meson-meson8-fix-the-gpio-function-for-the-g.patch b/queue-4.14/pinctrl-meson-meson8-fix-the-gpio-function-for-the-g.patch new file mode 100644 index 00000000000..edba4a8091c --- /dev/null +++ b/queue-4.14/pinctrl-meson-meson8-fix-the-gpio-function-for-the-g.patch @@ -0,0 +1,49 @@ +From faa61cac7789d0544a7c8c29e7b1b95633223c14 Mon Sep 17 00:00:00 2001 +From: Martin Blumenstingl +Date: Sun, 9 Dec 2018 20:50:50 +0100 +Subject: pinctrl: meson: meson8: fix the GPIO function for the GPIOAO pins + +[ Upstream commit 42f9b48cc5402be11d2364275eb18c257d2a79e8 ] + +The GPIOAO pins (as well as the two exotic GPIO_BSD_EN and GPIO_TEST_N) +only belong to the pin controller in the AO domain. With the current +definition these pins cannot be referred to in .dts files as group +(which is possible on GXBB and GXL for example). + +Add a separate "gpio_aobus" function to fix the mapping between the pin +controller and the GPIO pins in the AO domain. This is similar to how +the GXBB and GXL drivers implement this functionality. + +Fixes: 9dab1868ec0db4 ("pinctrl: amlogic: Make driver independent from two-domain configuration") +Signed-off-by: Martin Blumenstingl +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/pinctrl/meson/pinctrl-meson8.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/pinctrl/meson/pinctrl-meson8.c b/drivers/pinctrl/meson/pinctrl-meson8.c +index 970f6f14502c..591b01657378 100644 +--- a/drivers/pinctrl/meson/pinctrl-meson8.c ++++ b/drivers/pinctrl/meson/pinctrl-meson8.c +@@ -808,7 +808,9 @@ static const char * const gpio_groups[] = { + "BOOT_5", "BOOT_6", "BOOT_7", "BOOT_8", "BOOT_9", + "BOOT_10", "BOOT_11", "BOOT_12", "BOOT_13", "BOOT_14", + "BOOT_15", "BOOT_16", "BOOT_17", "BOOT_18", ++}; + ++static const char * const gpio_aobus_groups[] = { + "GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3", + "GPIOAO_4", "GPIOAO_5", "GPIOAO_6", "GPIOAO_7", + "GPIOAO_8", "GPIOAO_9", "GPIOAO_10", "GPIOAO_11", +@@ -1030,6 +1032,7 @@ static struct meson_pmx_func meson8_cbus_functions[] = { + }; + + static struct meson_pmx_func meson8_aobus_functions[] = { ++ FUNCTION(gpio_aobus), + FUNCTION(uart_ao), + FUNCTION(remote), + FUNCTION(i2c_slave_ao), +-- +2.19.1 + diff --git a/queue-4.14/pinctrl-meson-meson8b-fix-the-gpio-function-for-the-.patch b/queue-4.14/pinctrl-meson-meson8b-fix-the-gpio-function-for-the-.patch new file mode 100644 index 00000000000..d523b5322bd --- /dev/null +++ b/queue-4.14/pinctrl-meson-meson8b-fix-the-gpio-function-for-the-.patch @@ -0,0 +1,63 @@ +From b7a96c26d37307b142fe7301fe1141dd2739e7ed Mon Sep 17 00:00:00 2001 +From: Martin Blumenstingl +Date: Sun, 9 Dec 2018 20:50:51 +0100 +Subject: pinctrl: meson: meson8b: fix the GPIO function for the GPIOAO pins + +[ Upstream commit 2b745ac3cceb8fc1d9985990c8241a821ea97e53 ] + +The GPIOAO pins (as well as the two exotic GPIO_BSD_EN and GPIO_TEST_N) +only belong to the pin controller in the AO domain. With the current +definition these pins cannot be referred to in .dts files as group +(which is possible on GXBB and GXL for example). + +Add a separate "gpio_aobus" function to fix the mapping between the pin +controller and the GPIO pins in the AO domain. This is similar to how +the GXBB and GXL drivers implement this functionality. + +Fixes: 9dab1868ec0db4 ("pinctrl: amlogic: Make driver independent from two-domain configuration") +Signed-off-by: Martin Blumenstingl +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/pinctrl/meson/pinctrl-meson8b.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c b/drivers/pinctrl/meson/pinctrl-meson8b.c +index 71f216b5b0b9..a6fff215e60f 100644 +--- a/drivers/pinctrl/meson/pinctrl-meson8b.c ++++ b/drivers/pinctrl/meson/pinctrl-meson8b.c +@@ -649,16 +649,18 @@ static const char * const gpio_groups[] = { + "BOOT_10", "BOOT_11", "BOOT_12", "BOOT_13", "BOOT_14", + "BOOT_15", "BOOT_16", "BOOT_17", "BOOT_18", + +- "GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3", +- "GPIOAO_4", "GPIOAO_5", "GPIOAO_6", "GPIOAO_7", +- "GPIOAO_8", "GPIOAO_9", "GPIOAO_10", "GPIOAO_11", +- "GPIOAO_12", "GPIOAO_13", "GPIO_BSD_EN", "GPIO_TEST_N", +- + "DIF_0_P", "DIF_0_N", "DIF_1_P", "DIF_1_N", + "DIF_2_P", "DIF_2_N", "DIF_3_P", "DIF_3_N", + "DIF_4_P", "DIF_4_N" + }; + ++static const char * const gpio_aobus_groups[] = { ++ "GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3", ++ "GPIOAO_4", "GPIOAO_5", "GPIOAO_6", "GPIOAO_7", ++ "GPIOAO_8", "GPIOAO_9", "GPIOAO_10", "GPIOAO_11", ++ "GPIOAO_12", "GPIOAO_13", "GPIO_BSD_EN", "GPIO_TEST_N" ++}; ++ + static const char * const sd_a_groups[] = { + "sd_d0_a", "sd_d1_a", "sd_d2_a", "sd_d3_a", "sd_clk_a", + "sd_cmd_a" +@@ -874,6 +876,7 @@ static struct meson_pmx_func meson8b_cbus_functions[] = { + }; + + static struct meson_pmx_func meson8b_aobus_functions[] = { ++ FUNCTION(gpio_aobus), + FUNCTION(uart_ao), + FUNCTION(uart_ao_b), + FUNCTION(i2c_slave_ao), +-- +2.19.1 + diff --git a/queue-4.14/pinctrl-sx150x-handle-failure-case-of-devm_kstrdup.patch b/queue-4.14/pinctrl-sx150x-handle-failure-case-of-devm_kstrdup.patch new file mode 100644 index 00000000000..fa506cede08 --- /dev/null +++ b/queue-4.14/pinctrl-sx150x-handle-failure-case-of-devm_kstrdup.patch @@ -0,0 +1,64 @@ +From 8dbef8479caea63f056744dbf667671ee28d49ff Mon Sep 17 00:00:00 2001 +From: Nicholas Mc Guire +Date: Sun, 2 Dec 2018 11:04:17 +0100 +Subject: pinctrl: sx150x: handle failure case of devm_kstrdup + +[ Upstream commit a9d9f6b83f1bb05da849b3540e6d1f70ef1c2343 ] + +devm_kstrdup() may return NULL if internal allocation failed. +Thus using label, name is unsafe without checking. Therefor +in the unlikely case of allocation failure, sx150x_probe() simply +returns -ENOMEM. + +Signed-off-by: Nicholas Mc Guire +Fixes: 9e80f9064e73 ("pinctrl: Add SX150X GPIO Extender Pinctrl Driver") +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/pinctrl/pinctrl-sx150x.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/drivers/pinctrl/pinctrl-sx150x.c b/drivers/pinctrl/pinctrl-sx150x.c +index 70a0228f4e7f..2d0f4f760326 100644 +--- a/drivers/pinctrl/pinctrl-sx150x.c ++++ b/drivers/pinctrl/pinctrl-sx150x.c +@@ -1166,7 +1166,6 @@ static int sx150x_probe(struct i2c_client *client, + } + + /* Register GPIO controller */ +- pctl->gpio.label = devm_kstrdup(dev, client->name, GFP_KERNEL); + pctl->gpio.base = -1; + pctl->gpio.ngpio = pctl->data->npins; + pctl->gpio.get_direction = sx150x_gpio_get_direction; +@@ -1180,6 +1179,10 @@ static int sx150x_probe(struct i2c_client *client, + pctl->gpio.of_node = dev->of_node; + #endif + pctl->gpio.can_sleep = true; ++ pctl->gpio.label = devm_kstrdup(dev, client->name, GFP_KERNEL); ++ if (!pctl->gpio.label) ++ return -ENOMEM; ++ + /* + * Setting multiple pins is not safe when all pins are not + * handled by the same regmap register. The oscio pin (present +@@ -1200,13 +1203,15 @@ static int sx150x_probe(struct i2c_client *client, + + /* Add Interrupt support if an irq is specified */ + if (client->irq > 0) { +- pctl->irq_chip.name = devm_kstrdup(dev, client->name, +- GFP_KERNEL); + pctl->irq_chip.irq_mask = sx150x_irq_mask; + pctl->irq_chip.irq_unmask = sx150x_irq_unmask; + pctl->irq_chip.irq_set_type = sx150x_irq_set_type; + pctl->irq_chip.irq_bus_lock = sx150x_irq_bus_lock; + pctl->irq_chip.irq_bus_sync_unlock = sx150x_irq_bus_sync_unlock; ++ pctl->irq_chip.name = devm_kstrdup(dev, client->name, ++ GFP_KERNEL); ++ if (!pctl->irq_chip.name) ++ return -ENOMEM; + + pctl->irq.masked = ~0; + pctl->irq.sense = 0; +-- +2.19.1 + diff --git a/queue-4.14/platform-chrome-don-t-report-ec_mkbp_event_sensor_fi.patch b/queue-4.14/platform-chrome-don-t-report-ec_mkbp_event_sensor_fi.patch new file mode 100644 index 00000000000..d6fee2caf47 --- /dev/null +++ b/queue-4.14/platform-chrome-don-t-report-ec_mkbp_event_sensor_fi.patch @@ -0,0 +1,74 @@ +From e6eee5773c013dcc25613f0a29f2a19e8037e061 Mon Sep 17 00:00:00 2001 +From: Brian Norris +Date: Wed, 7 Nov 2018 18:49:39 -0800 +Subject: platform/chrome: don't report EC_MKBP_EVENT_SENSOR_FIFO as wakeup + +[ Upstream commit 6ad16b78a039b45294b1ad5d69c14ac57b2fe706 ] + +EC_MKBP_EVENT_SENSOR_FIFO events can be triggered for a variety of +reasons, and there are very few cases in which they should be treated as +wakeup interrupts (particularly, when a certain +MOTIONSENSE_MODULE_FLAG_* is set, but this is not even supported in the +mainline cros_ec_sensor driver yet). Most of the time, they are benign +sensor readings. In any case, the top-level cros_ec device doesn't know +enough to determine that they should wake the system, and so it should +not report the event. This would be the job of the cros_ec_sensors +driver to parse. + +This patch adds checks to cros_ec_get_next_event() such that it doesn't +signal 'wakeup' for events of type EC_MKBP_EVENT_SENSOR_FIFO. + +This patch is particularly relevant on devices like Scarlet (Rockchip +RK3399 tablet, known as Acer Chromebook Tab 10), where the EC firmware +reports sensor events much more frequently. This was causing +/sys/power/wakeup_count to increase very frequently, often needlessly +interrupting our ability to suspend the system. + +Signed-off-by: Brian Norris +Signed-off-by: Benson Leung +Signed-off-by: Sasha Levin +--- + drivers/platform/chrome/cros_ec_proto.c | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c +index e7bbdf947bbc..2ac4a7178470 100644 +--- a/drivers/platform/chrome/cros_ec_proto.c ++++ b/drivers/platform/chrome/cros_ec_proto.c +@@ -551,6 +551,7 @@ static int get_keyboard_state_event(struct cros_ec_device *ec_dev) + + int cros_ec_get_next_event(struct cros_ec_device *ec_dev, bool *wake_event) + { ++ u8 event_type; + u32 host_event; + int ret; + +@@ -570,11 +571,22 @@ int cros_ec_get_next_event(struct cros_ec_device *ec_dev, bool *wake_event) + return ret; + + if (wake_event) { ++ event_type = ec_dev->event_data.event_type; + host_event = cros_ec_get_host_event(ec_dev); + +- /* Consider non-host_event as wake event */ +- *wake_event = !host_event || +- !!(host_event & ec_dev->host_event_wake_mask); ++ /* ++ * Sensor events need to be parsed by the sensor sub-device. ++ * Defer them, and don't report the wakeup here. ++ */ ++ if (event_type == EC_MKBP_EVENT_SENSOR_FIFO) ++ *wake_event = false; ++ /* Masked host-events should not count as wake events. */ ++ else if (host_event && ++ !(host_event & ec_dev->host_event_wake_mask)) ++ *wake_event = false; ++ /* Consider all other events as wake events. */ ++ else ++ *wake_event = true; + } + + return ret; +-- +2.19.1 + diff --git a/queue-4.14/powerpc-fadump-do-not-allow-hot-remove-memory-from-f.patch b/queue-4.14/powerpc-fadump-do-not-allow-hot-remove-memory-from-f.patch new file mode 100644 index 00000000000..84dce5dd72a --- /dev/null +++ b/queue-4.14/powerpc-fadump-do-not-allow-hot-remove-memory-from-f.patch @@ -0,0 +1,89 @@ +From 082d905afbbf8bfee861c933afe8b6763ebc21b4 Mon Sep 17 00:00:00 2001 +From: Mahesh Salgaonkar +Date: Mon, 20 Aug 2018 13:47:32 +0530 +Subject: powerpc/fadump: Do not allow hot-remove memory from fadump reserved + area. + +[ Upstream commit 0db6896ff6332ba694f1e61b93ae3b2640317633 ] + +For fadump to work successfully there should not be any holes in reserved +memory ranges where kernel has asked firmware to move the content of old +kernel memory in event of crash. Now that fadump uses CMA for reserved +area, this memory area is now not protected from hot-remove operations +unless it is cma allocated. Hence, fadump service can fail to re-register +after the hot-remove operation, if hot-removed memory belongs to fadump +reserved region. To avoid this make sure that memory from fadump reserved +area is not hot-removable if fadump is registered. + +However, if user still wants to remove that memory, he can do so by +manually stopping fadump service before hot-remove operation. + +Signed-off-by: Mahesh Salgaonkar +Signed-off-by: Michael Ellerman +Signed-off-by: Sasha Levin +--- + arch/powerpc/include/asm/fadump.h | 2 +- + arch/powerpc/kernel/fadump.c | 10 ++++++++-- + arch/powerpc/platforms/pseries/hotplug-memory.c | 7 +++++-- + 3 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/arch/powerpc/include/asm/fadump.h b/arch/powerpc/include/asm/fadump.h +index 1e7a33592e29..15bc07a31c46 100644 +--- a/arch/powerpc/include/asm/fadump.h ++++ b/arch/powerpc/include/asm/fadump.h +@@ -200,7 +200,7 @@ struct fad_crash_memory_ranges { + unsigned long long size; + }; + +-extern int is_fadump_boot_memory_area(u64 addr, ulong size); ++extern int is_fadump_memory_area(u64 addr, ulong size); + extern int early_init_dt_scan_fw_dump(unsigned long node, + const char *uname, int depth, void *data); + extern int fadump_reserve_mem(void); +diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c +index 5a6470383ca3..62d7ef6508de 100644 +--- a/arch/powerpc/kernel/fadump.c ++++ b/arch/powerpc/kernel/fadump.c +@@ -117,13 +117,19 @@ int __init early_init_dt_scan_fw_dump(unsigned long node, + + /* + * If fadump is registered, check if the memory provided +- * falls within boot memory area. ++ * falls within boot memory area and reserved memory area. + */ +-int is_fadump_boot_memory_area(u64 addr, ulong size) ++int is_fadump_memory_area(u64 addr, ulong size) + { ++ u64 d_start = fw_dump.reserve_dump_area_start; ++ u64 d_end = d_start + fw_dump.reserve_dump_area_size; ++ + if (!fw_dump.dump_registered) + return 0; + ++ if (((addr + size) > d_start) && (addr <= d_end)) ++ return 1; ++ + return (addr + size) > RMA_START && addr <= fw_dump.boot_memory_size; + } + +diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c +index 1d48ab424bd9..93e09f108ca1 100644 +--- a/arch/powerpc/platforms/pseries/hotplug-memory.c ++++ b/arch/powerpc/platforms/pseries/hotplug-memory.c +@@ -441,8 +441,11 @@ static bool lmb_is_removable(struct of_drconf_cell *lmb) + phys_addr = lmb->base_addr; + + #ifdef CONFIG_FA_DUMP +- /* Don't hot-remove memory that falls in fadump boot memory area */ +- if (is_fadump_boot_memory_area(phys_addr, block_sz)) ++ /* ++ * Don't hot-remove memory that falls in fadump boot memory area ++ * and memory that is reserved for capturing old kernel memory. ++ */ ++ if (is_fadump_memory_area(phys_addr, block_sz)) + return false; + #endif + +-- +2.19.1 + diff --git a/queue-4.14/powerpc-mm-fix-reporting-of-kernel-execute-faults-on.patch b/queue-4.14/powerpc-mm-fix-reporting-of-kernel-execute-faults-on.patch new file mode 100644 index 00000000000..e0e90f53a29 --- /dev/null +++ b/queue-4.14/powerpc-mm-fix-reporting-of-kernel-execute-faults-on.patch @@ -0,0 +1,39 @@ +From c11f90f67127a810692fdbd6b3dc383bb72d822f Mon Sep 17 00:00:00 2001 +From: Christophe Leroy +Date: Wed, 28 Nov 2018 09:27:04 +0000 +Subject: powerpc/mm: Fix reporting of kernel execute faults on the 8xx + +[ Upstream commit ffca395b11c4a5a6df6d6345f794b0e3d578e2d0 ] + +On the 8xx, no-execute is set via PPP bits in the PTE. Therefore +a no-exec fault generates DSISR_PROTFAULT error bits, +not DSISR_NOEXEC_OR_G. + +This patch adds DSISR_PROTFAULT in the test mask. + +Fixes: d3ca587404b3 ("powerpc/mm: Fix reporting of kernel execute faults") +Signed-off-by: Christophe Leroy +Signed-off-by: Michael Ellerman +Signed-off-by: Sasha Levin +--- + arch/powerpc/mm/fault.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c +index 6e1e39035380..52863deed65d 100644 +--- a/arch/powerpc/mm/fault.c ++++ b/arch/powerpc/mm/fault.c +@@ -215,7 +215,9 @@ static int mm_fault_error(struct pt_regs *regs, unsigned long addr, int fault) + static bool bad_kernel_fault(bool is_exec, unsigned long error_code, + unsigned long address) + { +- if (is_exec && (error_code & (DSISR_NOEXEC_OR_G | DSISR_KEYFAULT))) { ++ /* NX faults set DSISR_PROTFAULT on the 8xx, DSISR_NOEXEC_OR_G on others */ ++ if (is_exec && (error_code & (DSISR_NOEXEC_OR_G | DSISR_KEYFAULT | ++ DSISR_PROTFAULT))) { + printk_ratelimited(KERN_CRIT "kernel tried to execute" + " exec-protected page (%lx) -" + "exploit attempt? (uid: %d)\n", +-- +2.19.1 + diff --git a/queue-4.14/powerpc-perf-fix-thresholding-counter-data-for-unkno.patch b/queue-4.14/powerpc-perf-fix-thresholding-counter-data-for-unkno.patch new file mode 100644 index 00000000000..3c7a4ab90c8 --- /dev/null +++ b/queue-4.14/powerpc-perf-fix-thresholding-counter-data-for-unkno.patch @@ -0,0 +1,44 @@ +From 45689278b90c59463fd670dc36b19a2d265b0013 Mon Sep 17 00:00:00 2001 +From: Madhavan Srinivasan +Date: Sun, 9 Dec 2018 14:48:15 +0530 +Subject: powerpc/perf: Fix thresholding counter data for unknown type + +[ Upstream commit 17cfccc91545682513541924245abb876d296063 ] + +MMCRA[34:36] and MMCRA[38:44] expose the thresholding counter value. +Thresholding counter can be used to count latency cycles such as +load miss to reload. But threshold counter value is not relevant +when the sampled instruction type is unknown or reserved. Patch to +fix the thresholding counter value to zero when sampled instruction +type is unknown or reserved. + +Fixes: 170a315f41c6('powerpc/perf: Support to export MMCRA[TEC*] field to userspace') +Signed-off-by: Madhavan Srinivasan +Signed-off-by: Michael Ellerman +Signed-off-by: Sasha Levin +--- + arch/powerpc/perf/isa207-common.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/arch/powerpc/perf/isa207-common.c b/arch/powerpc/perf/isa207-common.c +index 2efee3f196f5..cf9c35aa0cf4 100644 +--- a/arch/powerpc/perf/isa207-common.c ++++ b/arch/powerpc/perf/isa207-common.c +@@ -228,8 +228,13 @@ void isa207_get_mem_weight(u64 *weight) + u64 mmcra = mfspr(SPRN_MMCRA); + u64 exp = MMCRA_THR_CTR_EXP(mmcra); + u64 mantissa = MMCRA_THR_CTR_MANT(mmcra); ++ u64 sier = mfspr(SPRN_SIER); ++ u64 val = (sier & ISA207_SIER_TYPE_MASK) >> ISA207_SIER_TYPE_SHIFT; + +- *weight = mantissa << (2 * exp); ++ if (val == 0 || val == 7) ++ *weight = 0; ++ else ++ *weight = mantissa << (2 * exp); + } + + int isa207_get_constraint(u64 event, unsigned long *maskp, unsigned long *valp) +-- +2.19.1 + diff --git a/queue-4.14/powerpc-pseries-add-of_node_put-in-dlpar_detach_node.patch b/queue-4.14/powerpc-pseries-add-of_node_put-in-dlpar_detach_node.patch new file mode 100644 index 00000000000..1b4d337079e --- /dev/null +++ b/queue-4.14/powerpc-pseries-add-of_node_put-in-dlpar_detach_node.patch @@ -0,0 +1,45 @@ +From 21d9889be7166d43039e1aeb52bf7a482e7706bb Mon Sep 17 00:00:00 2001 +From: Frank Rowand +Date: Thu, 4 Oct 2018 20:27:16 -0700 +Subject: powerpc/pseries: add of_node_put() in dlpar_detach_node() + +[ Upstream commit 5b3f5c408d8cc59b87e47f1ab9803dbd006e4a91 ] + +The previous commit, "of: overlay: add missing of_node_get() in +__of_attach_node_sysfs" added a missing of_node_get() to +__of_attach_node_sysfs(). This results in a refcount imbalance +for nodes attached with dlpar_attach_node(). The calling sequence +from dlpar_attach_node() to __of_attach_node_sysfs() is: + + dlpar_attach_node() + of_attach_node() + __of_attach_node_sysfs() + +For more detailed description of the node refcount, see +commit 68baf692c435 ("powerpc/pseries: Fix of_node_put() underflow +during DLPAR remove"). + +Tested-by: Alan Tull +Acked-by: Michael Ellerman +Signed-off-by: Frank Rowand +Signed-off-by: Sasha Levin +--- + arch/powerpc/platforms/pseries/dlpar.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c +index e9149d05d30b..f4e6565dd7a9 100644 +--- a/arch/powerpc/platforms/pseries/dlpar.c ++++ b/arch/powerpc/platforms/pseries/dlpar.c +@@ -284,6 +284,8 @@ int dlpar_detach_node(struct device_node *dn) + if (rc) + return rc; + ++ of_node_put(dn); ++ + return 0; + } + +-- +2.19.1 + diff --git a/queue-4.14/powerpc-uaccess-fix-warning-error-with-access_ok.patch b/queue-4.14/powerpc-uaccess-fix-warning-error-with-access_ok.patch new file mode 100644 index 00000000000..8bf94025772 --- /dev/null +++ b/queue-4.14/powerpc-uaccess-fix-warning-error-with-access_ok.patch @@ -0,0 +1,45 @@ +From abbc7c56efb1ac10258ab5bdc213c210518df67e Mon Sep 17 00:00:00 2001 +From: Christophe Leroy +Date: Mon, 10 Dec 2018 06:50:09 +0000 +Subject: powerpc/uaccess: fix warning/error with access_ok() + +[ Upstream commit 05a4ab823983d9136a460b7b5e0d49ee709a6f86 ] + +With the following piece of code, the following compilation warning +is encountered: + + if (_IOC_DIR(ioc) != _IOC_NONE) { + int verify = _IOC_DIR(ioc) & _IOC_READ ? VERIFY_WRITE : VERIFY_READ; + + if (!access_ok(verify, ioarg, _IOC_SIZE(ioc))) { + +drivers/platform/test/dev.c: In function 'my_ioctl': +drivers/platform/test/dev.c:219:7: warning: unused variable 'verify' [-Wunused-variable] + int verify = _IOC_DIR(ioc) & _IOC_READ ? VERIFY_WRITE : VERIFY_READ; + +This patch fixes it by referencing 'type' in the macro allthough +doing nothing with it. + +Signed-off-by: Christophe Leroy +Signed-off-by: Michael Ellerman +Signed-off-by: Sasha Levin +--- + arch/powerpc/include/asm/uaccess.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h +index 565cead12be2..cf26e62b268d 100644 +--- a/arch/powerpc/include/asm/uaccess.h ++++ b/arch/powerpc/include/asm/uaccess.h +@@ -54,7 +54,7 @@ + #endif + + #define access_ok(type, addr, size) \ +- (__chk_user_ptr(addr), \ ++ (__chk_user_ptr(addr), (void)(type), \ + __access_ok((__force unsigned long)(addr), (size), get_fs())) + + /* +-- +2.19.1 + diff --git a/queue-4.14/proc-sysctl-fix-return-error-for-proc_doulongvec_min.patch b/queue-4.14/proc-sysctl-fix-return-error-for-proc_doulongvec_min.patch new file mode 100644 index 00000000000..585ee6d38d6 --- /dev/null +++ b/queue-4.14/proc-sysctl-fix-return-error-for-proc_doulongvec_min.patch @@ -0,0 +1,104 @@ +From b030322467976fbd5653d72abc50ddb4c42b96f3 Mon Sep 17 00:00:00 2001 +From: Cheng Lin +Date: Thu, 3 Jan 2019 15:26:13 -0800 +Subject: proc/sysctl: fix return error for proc_doulongvec_minmax() + +[ Upstream commit 09be178400829dddc1189b50a7888495dd26aa84 ] + +If the number of input parameters is less than the total parameters, an +EINVAL error will be returned. + +For example, we use proc_doulongvec_minmax to pass up to two parameters +with kern_table: + +{ + .procname = "monitor_signals", + .data = &monitor_sigs, + .maxlen = 2*sizeof(unsigned long), + .mode = 0644, + .proc_handler = proc_doulongvec_minmax, +}, + +Reproduce: + +When passing two parameters, it's work normal. But passing only one +parameter, an error "Invalid argument"(EINVAL) is returned. + + [root@cl150 ~]# echo 1 2 > /proc/sys/kernel/monitor_signals + [root@cl150 ~]# cat /proc/sys/kernel/monitor_signals + 1 2 + [root@cl150 ~]# echo 3 > /proc/sys/kernel/monitor_signals + -bash: echo: write error: Invalid argument + [root@cl150 ~]# echo $? + 1 + [root@cl150 ~]# cat /proc/sys/kernel/monitor_signals + 3 2 + [root@cl150 ~]# + +The following is the result after apply this patch. No error is +returned when the number of input parameters is less than the total +parameters. + + [root@cl150 ~]# echo 1 2 > /proc/sys/kernel/monitor_signals + [root@cl150 ~]# cat /proc/sys/kernel/monitor_signals + 1 2 + [root@cl150 ~]# echo 3 > /proc/sys/kernel/monitor_signals + [root@cl150 ~]# echo $? + 0 + [root@cl150 ~]# cat /proc/sys/kernel/monitor_signals + 3 2 + [root@cl150 ~]# + +There are three processing functions dealing with digital parameters, +__do_proc_dointvec/__do_proc_douintvec/__do_proc_doulongvec_minmax. + +This patch deals with __do_proc_doulongvec_minmax, just as +__do_proc_dointvec does, adding a check for parameters 'left'. In +__do_proc_douintvec, its code implementation explicitly does not support +multiple inputs. + +static int __do_proc_douintvec(...){ + ... + /* + * Arrays are not supported, keep this simple. *Do not* add + * support for them. + */ + if (vleft != 1) { + *lenp = 0; + return -EINVAL; + } + ... +} + +So, just __do_proc_doulongvec_minmax has the problem. And most use of +proc_doulongvec_minmax/proc_doulongvec_ms_jiffies_minmax just have one +parameter. + +Link: http://lkml.kernel.org/r/1544081775-15720-1-git-send-email-cheng.lin130@zte.com.cn +Signed-off-by: Cheng Lin +Acked-by: Luis Chamberlain +Reviewed-by: Kees Cook +Cc: Alexey Dobriyan +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + kernel/sysctl.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/kernel/sysctl.c b/kernel/sysctl.c +index d330b1ce3b94..3ad00bf90b3d 100644 +--- a/kernel/sysctl.c ++++ b/kernel/sysctl.c +@@ -2708,6 +2708,8 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int + bool neg; + + left -= proc_skip_spaces(&p); ++ if (!left) ++ break; + + err = proc_get_long(&p, &left, &val, &neg, + proc_wspace_sep, +-- +2.19.1 + diff --git a/queue-4.14/ptp-check-gettime64-return-code-in-ptp_sys_offset-io.patch b/queue-4.14/ptp-check-gettime64-return-code-in-ptp_sys_offset-io.patch new file mode 100644 index 00000000000..55912a80dde --- /dev/null +++ b/queue-4.14/ptp-check-gettime64-return-code-in-ptp_sys_offset-io.patch @@ -0,0 +1,45 @@ +From 268bbf902e1f490f138007a9e1c25b8afa054ebd Mon Sep 17 00:00:00 2001 +From: Miroslav Lichvar +Date: Fri, 9 Nov 2018 11:14:43 +0100 +Subject: ptp: check gettime64 return code in PTP_SYS_OFFSET ioctl + +[ Upstream commit 83d0bdc7390b890905634186baaa294475cd6a06 ] + +If a gettime64 call fails, return the error and avoid copying data back +to user. + +Cc: Richard Cochran +Cc: Jacob Keller +Signed-off-by: Miroslav Lichvar +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/ptp/ptp_chardev.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c +index a421d6c551b6..ecb41eacd74b 100644 +--- a/drivers/ptp/ptp_chardev.c ++++ b/drivers/ptp/ptp_chardev.c +@@ -228,7 +228,9 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) + pct->sec = ts.tv_sec; + pct->nsec = ts.tv_nsec; + pct++; +- ptp->info->gettime64(ptp->info, &ts); ++ err = ptp->info->gettime64(ptp->info, &ts); ++ if (err) ++ goto out; + pct->sec = ts.tv_sec; + pct->nsec = ts.tv_nsec; + pct++; +@@ -281,6 +283,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) + break; + } + ++out: + kfree(sysoff); + return err; + } +-- +2.19.1 + diff --git a/queue-4.14/ptp-fix-pass-zero-to-err_ptr-in-ptp_clock_register.patch b/queue-4.14/ptp-fix-pass-zero-to-err_ptr-in-ptp_clock_register.patch new file mode 100644 index 00000000000..61dc815a32b --- /dev/null +++ b/queue-4.14/ptp-fix-pass-zero-to-err_ptr-in-ptp_clock_register.patch @@ -0,0 +1,51 @@ +From 7b6aa80e235d47864dba719547c7f5735c02e7a8 Mon Sep 17 00:00:00 2001 +From: YueHaibing +Date: Fri, 23 Nov 2018 09:54:55 +0800 +Subject: ptp: Fix pass zero to ERR_PTR() in ptp_clock_register + +[ Upstream commit aea0a897af9e44c258e8ab9296fad417f1bc063a ] + +Fix smatch warning: + +drivers/ptp/ptp_clock.c:298 ptp_clock_register() warn: + passing zero to 'ERR_PTR' + +'err' should be set while device_create_with_groups and +pps_register_source fails + +Fixes: 85a66e550195 ("ptp: create "pins" together with the rest of attributes") +Signed-off-by: YueHaibing +Acked-by: Richard Cochran +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/ptp/ptp_clock.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c +index 7eacc1c4b3b1..c64903a5978f 100644 +--- a/drivers/ptp/ptp_clock.c ++++ b/drivers/ptp/ptp_clock.c +@@ -253,8 +253,10 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, + ptp->dev = device_create_with_groups(ptp_class, parent, ptp->devid, + ptp, ptp->pin_attr_groups, + "ptp%d", ptp->index); +- if (IS_ERR(ptp->dev)) ++ if (IS_ERR(ptp->dev)) { ++ err = PTR_ERR(ptp->dev); + goto no_device; ++ } + + /* Register a new PPS source. */ + if (info->pps) { +@@ -265,6 +267,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, + pps.owner = info->owner; + ptp->pps_source = pps_register_source(&pps, PTP_PPS_DEFAULTS); + if (!ptp->pps_source) { ++ err = -EINVAL; + pr_err("failed to register pps source\n"); + goto no_pps; + } +-- +2.19.1 + diff --git a/queue-4.14/s390-zcrypt-improve-special-ap-message-cmd-handling.patch b/queue-4.14/s390-zcrypt-improve-special-ap-message-cmd-handling.patch new file mode 100644 index 00000000000..4e528805eb8 --- /dev/null +++ b/queue-4.14/s390-zcrypt-improve-special-ap-message-cmd-handling.patch @@ -0,0 +1,67 @@ +From e02c827f2154bd4b2ba155ea0f28866c7e5ef8f3 Mon Sep 17 00:00:00 2001 +From: Harald Freudenberger +Date: Mon, 19 Nov 2018 11:36:13 +0100 +Subject: s390/zcrypt: improve special ap message cmd handling + +[ Upstream commit be534791011100d204602e2e0496e9e6ce8edf63 ] + +There exist very few ap messages which need to have the 'special' flag +enabled. This flag tells the firmware layer to do some pre- and maybe +postprocessing. However, it may happen that this special flag is +enabled but the firmware is unable to deal with this kind of message +and thus returns with reply code 0x41. For example older firmware may +not know the newest messages triggered by the zcrypt device driver and +thus react with reject and the named reply code. Unfortunately this +reply code is not known to the zcrypt error routines and thus default +behavior is to switch the ap queue offline. + +This patch now makes the ap error routine aware of the reply code and +so userspace is informed about the bad processing result but the queue +is not switched to offline state any more. + +Signed-off-by: Harald Freudenberger +Signed-off-by: Martin Schwidefsky +Signed-off-by: Sasha Levin +--- + arch/s390/include/uapi/asm/zcrypt.h | 4 ++-- + drivers/s390/crypto/zcrypt_error.h | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/arch/s390/include/uapi/asm/zcrypt.h b/arch/s390/include/uapi/asm/zcrypt.h +index 137ef473584e..b9fb42089760 100644 +--- a/arch/s390/include/uapi/asm/zcrypt.h ++++ b/arch/s390/include/uapi/asm/zcrypt.h +@@ -161,8 +161,8 @@ struct ica_xcRB { + * @cprb_len: CPRB header length [0x0020] + * @cprb_ver_id: CPRB version id. [0x04] + * @pad_000: Alignment pad bytes +- * @flags: Admin cmd [0x80] or functional cmd [0x00] +- * @func_id: Function id / subtype [0x5434] ++ * @flags: Admin bit [0x80], Special bit [0x20] ++ * @func_id: Function id / subtype [0x5434] "T4" + * @source_id: Source id [originator id] + * @target_id: Target id [usage/ctrl domain id] + * @ret_code: Return code +diff --git a/drivers/s390/crypto/zcrypt_error.h b/drivers/s390/crypto/zcrypt_error.h +index 13df60209ed3..9499cd3a05f8 100644 +--- a/drivers/s390/crypto/zcrypt_error.h ++++ b/drivers/s390/crypto/zcrypt_error.h +@@ -65,6 +65,7 @@ struct error_hdr { + #define REP82_ERROR_FORMAT_FIELD 0x29 + #define REP82_ERROR_INVALID_COMMAND 0x30 + #define REP82_ERROR_MALFORMED_MSG 0x40 ++#define REP82_ERROR_INVALID_SPECIAL_CMD 0x41 + #define REP82_ERROR_INVALID_DOMAIN_PRECHECK 0x42 + #define REP82_ERROR_RESERVED_FIELDO 0x50 /* old value */ + #define REP82_ERROR_WORD_ALIGNMENT 0x60 +@@ -103,6 +104,7 @@ static inline int convert_error(struct zcrypt_queue *zq, + case REP88_ERROR_MESSAGE_MALFORMD: + case REP82_ERROR_INVALID_DOMAIN_PRECHECK: + case REP82_ERROR_INVALID_DOMAIN_PENDING: ++ case REP82_ERROR_INVALID_SPECIAL_CMD: + // REP88_ERROR_INVALID_KEY // '82' CEX2A + // REP88_ERROR_OPERAND // '84' CEX2A + // REP88_ERROR_OPERAND_EVEN_MOD // '85' CEX2A +-- +2.19.1 + diff --git a/queue-4.14/sata_rcar-fix-deferred-probing.patch b/queue-4.14/sata_rcar-fix-deferred-probing.patch new file mode 100644 index 00000000000..9a99909c239 --- /dev/null +++ b/queue-4.14/sata_rcar-fix-deferred-probing.patch @@ -0,0 +1,41 @@ +From c99c44a1499348d06f53571d73815fe12faf07f6 Mon Sep 17 00:00:00 2001 +From: Sergei Shtylyov +Date: Sat, 24 Nov 2018 21:14:16 +0300 +Subject: sata_rcar: fix deferred probing + +[ Upstream commit 9f83cfdb1ace3ef268ecc6fda50058d2ec37d603 ] + +The driver overrides the error codes returned by platform_get_irq() to +-EINVAL, so if it returns -EPROBE_DEFER, the driver would fail the probe +permanently instead of the deferred probing. Switch to propagating the +error code upstream, still checking/overriding IRQ0 as libata regards it +as "no IRQ" (thus polling) anyway... + +Fixes: 9ec36cafe43b ("of/irq: do irq resolution in platform_get_irq") +Reviewed-by: Simon Horman +Reviewed-by: Geert Uytterhoeven +Signed-off-by: Sergei Shtylyov +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/ata/sata_rcar.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c +index 537d11869069..3e82a4ac239e 100644 +--- a/drivers/ata/sata_rcar.c ++++ b/drivers/ata/sata_rcar.c +@@ -880,7 +880,9 @@ static int sata_rcar_probe(struct platform_device *pdev) + int ret = 0; + + irq = platform_get_irq(pdev, 0); +- if (irq <= 0) ++ if (irq < 0) ++ return irq; ++ if (!irq) + return -EINVAL; + + priv = devm_kzalloc(&pdev->dev, sizeof(struct sata_rcar_priv), +-- +2.19.1 + diff --git a/queue-4.14/scripts-decode_stacktrace-only-strip-base-path-when-.patch b/queue-4.14/scripts-decode_stacktrace-only-strip-base-path-when-.patch new file mode 100644 index 00000000000..997135da496 --- /dev/null +++ b/queue-4.14/scripts-decode_stacktrace-only-strip-base-path-when-.patch @@ -0,0 +1,48 @@ +From 907ff0cb4f00af35aa44af55fc1fb1b22231ebfa Mon Sep 17 00:00:00 2001 +From: Marc Zyngier +Date: Fri, 28 Dec 2018 00:31:25 -0800 +Subject: scripts/decode_stacktrace: only strip base path when a prefix of the + path + +[ Upstream commit 67a28de47faa83585dd644bd4c31e5a1d9346c50 ] + +Running something like: + + decodecode vmlinux . + +leads to interested results where not only the leading "." gets stripped +from the displayed paths, but also anywhere in the string, displaying +something like: + + kvm_vcpu_check_block (arch/arm64/kvm/virt/kvm/kvm_mainc:2141) + +which doesn't help further processing. + +Fix it by only stripping the base path if it is a prefix of the path. + +Link: http://lkml.kernel.org/r/20181210174659.31054-3-marc.zyngier@arm.com +Signed-off-by: Marc Zyngier +Cc: Will Deacon +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + scripts/decode_stacktrace.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/decode_stacktrace.sh b/scripts/decode_stacktrace.sh +index 64220e36ce3b..98a7d63a723e 100755 +--- a/scripts/decode_stacktrace.sh ++++ b/scripts/decode_stacktrace.sh +@@ -78,7 +78,7 @@ parse_symbol() { + fi + + # Strip out the base of the path +- code=${code//$basepath/""} ++ code=${code//^$basepath/""} + + # In the case of inlines, move everything to same line + code=${code//$'\n'/' '} +-- +2.19.1 + diff --git a/queue-4.14/scripts-gdb-fix-lx-version-string-output.patch b/queue-4.14/scripts-gdb-fix-lx-version-string-output.patch new file mode 100644 index 00000000000..97a2cef9872 --- /dev/null +++ b/queue-4.14/scripts-gdb-fix-lx-version-string-output.patch @@ -0,0 +1,56 @@ +From a1377270001749d1e58b7ebdb298d8971790f405 Mon Sep 17 00:00:00 2001 +From: Du Changbin +Date: Thu, 3 Jan 2019 15:28:27 -0800 +Subject: scripts/gdb: fix lx-version string output + +[ Upstream commit b058809bfc8faeb7b7cae047666e23375a060059 ] + +A bug is present in GDB which causes early string termination when +parsing variables. This has been reported [0], but we should ensure +that we can support at least basic printing of the core kernel strings. + +For current gdb version (has been tested with 7.3 and 8.1), 'lx-version' +only prints one character. + + (gdb) lx-version + L(gdb) + +This can be fixed by casting 'linux_banner' as (char *). + + (gdb) lx-version + Linux version 4.19.0-rc1+ (changbin@acer) (gcc version 7.3.0 (Ubuntu 7.3.0-16ubuntu3)) #21 SMP Sat Sep 1 21:43:30 CST 2018 + +[0] https://sourceware.org/bugzilla/show_bug.cgi?id=20077 + +[kbingham@kernel.org: add detail to commit message] +Link: http://lkml.kernel.org/r/20181111162035.8356-1-kieran.bingham@ideasonboard.com +Fixes: 2d061d999424 ("scripts/gdb: add version command") +Signed-off-by: Du Changbin +Signed-off-by: Kieran Bingham +Acked-by: Jan Kiszka +Cc: Jan Kiszka +Cc: Jason Wessel +Cc: Daniel Thompson +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + scripts/gdb/linux/proc.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/gdb/linux/proc.py b/scripts/gdb/linux/proc.py +index 086d27223c0c..0aebd7565b03 100644 +--- a/scripts/gdb/linux/proc.py ++++ b/scripts/gdb/linux/proc.py +@@ -41,7 +41,7 @@ class LxVersion(gdb.Command): + + def invoke(self, arg, from_tty): + # linux_banner should contain a newline +- gdb.write(gdb.parse_and_eval("linux_banner").string()) ++ gdb.write(gdb.parse_and_eval("(char *)linux_banner").string()) + + LxVersion() + +-- +2.19.1 + diff --git a/queue-4.14/scsi-lpfc-correct-lcb-rjt-handling.patch b/queue-4.14/scsi-lpfc-correct-lcb-rjt-handling.patch new file mode 100644 index 00000000000..5c9577af8e7 --- /dev/null +++ b/queue-4.14/scsi-lpfc-correct-lcb-rjt-handling.patch @@ -0,0 +1,37 @@ +From bfa9bd6fa3552dc1371f6c4ff0194cf557d64660 Mon Sep 17 00:00:00 2001 +From: James Smart +Date: Tue, 23 Oct 2018 13:41:07 -0700 +Subject: scsi: lpfc: Correct LCB RJT handling + +[ Upstream commit b114d9009d386276bfc3352289fc235781ae3353 ] + +When LCB's are rejected, if beaconing was already in progress, the +Reason Code Explanation was not being set. Should have been set to +command in progress. + +Signed-off-by: Dick Kennedy +Signed-off-by: James Smart +Reviewed-by: Hannes Reinecke +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/lpfc/lpfc_els.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c +index 91783dbdf10c..fffe8a643e25 100644 +--- a/drivers/scsi/lpfc/lpfc_els.c ++++ b/drivers/scsi/lpfc/lpfc_els.c +@@ -5696,6 +5696,9 @@ error: + stat = (struct ls_rjt *)(pcmd + sizeof(uint32_t)); + stat->un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC; + ++ if (shdr_add_status == ADD_STATUS_OPERATION_ALREADY_ACTIVE) ++ stat->un.b.lsRjtRsnCodeExp = LSEXP_CMD_IN_PROGRESS; ++ + elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp; + phba->fc_stat.elsXmitLSRJT++; + rc = lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0); +-- +2.19.1 + diff --git a/queue-4.14/scsi-lpfc-fix-logo-plogi-handling-when-triggerd-by-a.patch b/queue-4.14/scsi-lpfc-fix-logo-plogi-handling-when-triggerd-by-a.patch new file mode 100644 index 00000000000..b1723fa1bc3 --- /dev/null +++ b/queue-4.14/scsi-lpfc-fix-logo-plogi-handling-when-triggerd-by-a.patch @@ -0,0 +1,189 @@ +From fbf2df579ad6f24387530e9bb8cb88ecf1d93fe2 Mon Sep 17 00:00:00 2001 +From: James Smart +Date: Tue, 23 Oct 2018 13:41:03 -0700 +Subject: scsi: lpfc: Fix LOGO/PLOGI handling when triggerd by ABTS Timeout + event + +[ Upstream commit 30e196cacefdd9a38c857caed23cefc9621bc5c1 ] + +After a LOGO in response to an ABTS timeout, a PLOGI wasn't issued to +re-establish the login. An nlp_type check in the LOGO completion +handler failed to restart discovery for NVME targets. Revised the +nlp_type check for NVME as well as SCSI. + +While reviewing the LOGO handling a few other issues were seen and +were addressed: + +- Better lock synchronization around ndlp data types + +- When the ABTS times out, unregister the RPI before sending the LOGO + so that all local exchange contexts are cleared and nothing received + while awaiting LOGO/PLOGI handling will be accepted. + +- LOGO handling optimized to: + Wait only R_A_TOV for a response. + It doesn't need to be retried on timeout. If there wasn't a + response, a PLOGI will be sent, thus an implicit logout + applies as well when the other port sees it. + If there is a response, any kind of response is considered "good" + and the XRI quarantined for a exchange qualifier window. + +- PLOGI is issued as soon a LOGO state is resolved. + +Signed-off-by: Dick Kennedy +Signed-off-by: James Smart +Reviewed-by: Hannes Reinecke +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/lpfc/lpfc_els.c | 49 +++++++++++++----------------- + drivers/scsi/lpfc/lpfc_nportdisc.c | 5 +++ + 2 files changed, 26 insertions(+), 28 deletions(-) + +diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c +index fffe8a643e25..57cddbc4a977 100644 +--- a/drivers/scsi/lpfc/lpfc_els.c ++++ b/drivers/scsi/lpfc/lpfc_els.c +@@ -242,6 +242,8 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp, + icmd->ulpCommand = CMD_ELS_REQUEST64_CR; + if (elscmd == ELS_CMD_FLOGI) + icmd->ulpTimeout = FF_DEF_RATOV * 2; ++ else if (elscmd == ELS_CMD_LOGO) ++ icmd->ulpTimeout = phba->fc_ratov; + else + icmd->ulpTimeout = phba->fc_ratov * 2; + } else { +@@ -2674,16 +2676,15 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, + goto out; + } + ++ /* The LOGO will not be retried on failure. A LOGO was ++ * issued to the remote rport and a ACC or RJT or no Answer are ++ * all acceptable. Note the failure and move forward with ++ * discovery. The PLOGI will retry. ++ */ + if (irsp->ulpStatus) { +- /* Check for retry */ +- if (lpfc_els_retry(phba, cmdiocb, rspiocb)) { +- /* ELS command is being retried */ +- skip_recovery = 1; +- goto out; +- } + /* LOGO failed */ + lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS, +- "2756 LOGO failure DID:%06X Status:x%x/x%x\n", ++ "2756 LOGO failure, No Retry DID:%06X Status:x%x/x%x\n", + ndlp->nlp_DID, irsp->ulpStatus, + irsp->un.ulpWord[4]); + /* Do not call DSM for lpfc_els_abort'ed ELS cmds */ +@@ -2729,7 +2730,8 @@ out: + * For any other port type, the rpi is unregistered as an implicit + * LOGO. + */ +- if ((ndlp->nlp_type & NLP_FCP_TARGET) && (skip_recovery == 0)) { ++ if (ndlp->nlp_type & (NLP_FCP_TARGET | NLP_NVME_TARGET) && ++ skip_recovery == 0) { + lpfc_cancel_retry_delay_tmo(vport, ndlp); + spin_lock_irqsave(shost->host_lock, flags); + ndlp->nlp_flag |= NLP_NPR_2B_DISC; +@@ -2762,6 +2764,8 @@ out: + * will be stored into the context1 field of the IOCB for the completion + * callback function to the LOGO ELS command. + * ++ * Callers of this routine are expected to unregister the RPI first ++ * + * Return code + * 0 - successfully issued logo + * 1 - failed to issue logo +@@ -2803,22 +2807,6 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, + "Issue LOGO: did:x%x", + ndlp->nlp_DID, 0, 0); + +- /* +- * If we are issuing a LOGO, we may try to recover the remote NPort +- * by issuing a PLOGI later. Even though we issue ELS cmds by the +- * VPI, if we have a valid RPI, and that RPI gets unreg'ed while +- * that ELS command is in-flight, the HBA returns a IOERR_INVALID_RPI +- * for that ELS cmd. To avoid this situation, lets get rid of the +- * RPI right now, before any ELS cmds are sent. +- */ +- spin_lock_irq(shost->host_lock); +- ndlp->nlp_flag |= NLP_ISSUE_LOGO; +- spin_unlock_irq(shost->host_lock); +- if (lpfc_unreg_rpi(vport, ndlp)) { +- lpfc_els_free_iocb(phba, elsiocb); +- return 0; +- } +- + phba->fc_stat.elsXmitLOGO++; + elsiocb->iocb_cmpl = lpfc_cmpl_els_logo; + spin_lock_irq(shost->host_lock); +@@ -2826,7 +2814,6 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, + ndlp->nlp_flag &= ~NLP_ISSUE_LOGO; + spin_unlock_irq(shost->host_lock); + rc = lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0); +- + if (rc == IOCB_ERROR) { + spin_lock_irq(shost->host_lock); + ndlp->nlp_flag &= ~NLP_LOGO_SND; +@@ -2834,6 +2821,11 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, + lpfc_els_free_iocb(phba, elsiocb); + return 1; + } ++ ++ spin_lock_irq(shost->host_lock); ++ ndlp->nlp_prev_state = ndlp->nlp_state; ++ spin_unlock_irq(shost->host_lock); ++ lpfc_nlp_set_state(vport, ndlp, NLP_STE_LOGO_ISSUE); + return 0; + } + +@@ -9483,7 +9475,8 @@ lpfc_sli_abts_recover_port(struct lpfc_vport *vport, + "rport in state 0x%x\n", ndlp->nlp_state); + return; + } +- lpfc_printf_log(phba, KERN_INFO, LOG_SLI, ++ lpfc_printf_log(phba, KERN_ERR, ++ LOG_ELS | LOG_FCP_ERROR | LOG_NVME_IOERR, + "3094 Start rport recovery on shost id 0x%x " + "fc_id 0x%06x vpi 0x%x rpi 0x%x state 0x%x " + "flags 0x%x\n", +@@ -9496,8 +9489,8 @@ lpfc_sli_abts_recover_port(struct lpfc_vport *vport, + */ + spin_lock_irqsave(shost->host_lock, flags); + ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE; ++ ndlp->nlp_flag |= NLP_ISSUE_LOGO; + spin_unlock_irqrestore(shost->host_lock, flags); +- lpfc_issue_els_logo(vport, ndlp, 0); +- lpfc_nlp_set_state(vport, ndlp, NLP_STE_LOGO_ISSUE); ++ lpfc_unreg_rpi(vport, ndlp); + } + +diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c +index d489f6827cc1..36fb549eb4e8 100644 +--- a/drivers/scsi/lpfc/lpfc_nportdisc.c ++++ b/drivers/scsi/lpfc/lpfc_nportdisc.c +@@ -801,7 +801,9 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) + struct Scsi_Host *shost = lpfc_shost_from_vport(vport); + + if (!(ndlp->nlp_flag & NLP_RPI_REGISTERED)) { ++ spin_lock_irq(shost->host_lock); + ndlp->nlp_flag &= ~NLP_NPR_ADISC; ++ spin_unlock_irq(shost->host_lock); + return 0; + } + +@@ -816,7 +818,10 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) + return 1; + } + } ++ ++ spin_lock_irq(shost->host_lock); + ndlp->nlp_flag &= ~NLP_NPR_ADISC; ++ spin_unlock_irq(shost->host_lock); + lpfc_unreg_rpi(vport, ndlp); + return 0; + } +-- +2.19.1 + diff --git a/queue-4.14/scsi-mpt3sas-call-sas_remove_host-before-removing-th.patch b/queue-4.14/scsi-mpt3sas-call-sas_remove_host-before-removing-th.patch new file mode 100644 index 00000000000..dff49f2e4a8 --- /dev/null +++ b/queue-4.14/scsi-mpt3sas-call-sas_remove_host-before-removing-th.patch @@ -0,0 +1,72 @@ +From a70f8bdf75640e563d7045e551474ecf00339bb6 Mon Sep 17 00:00:00 2001 +From: Suganath Prabu +Date: Wed, 31 Oct 2018 18:53:35 +0530 +Subject: scsi: mpt3sas: Call sas_remove_host before removing the target + devices + +[ Upstream commit dc730212e8a378763cb182b889f90c8101331332 ] + +Call sas_remove_host() before removing the target devices in the driver's +.remove() callback function(i.e. during driver unload time). So that +driver can provide a way to allow SYNC CACHE, START STOP unit commands +etc. (which are issued from SML) to the target drives during driver unload +time. + +Once sas_remove_host() is called before removing the target drives then +driver can just clean up the resources allocated for target devices and no +need to call sas_port_delete_phy(), sas_port_delete() API's as these API's +internally called from sas_remove_host(). + +Signed-off-by: Suganath Prabu +Reviewed-by: Bjorn Helgaas +Reviewed-by: Andy Shevchenko +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 7 +++++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c +index ae5e579ac473..b28efddab7b1 100644 +--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c ++++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c +@@ -8260,6 +8260,7 @@ static void scsih_remove(struct pci_dev *pdev) + + /* release all the volumes */ + _scsih_ir_shutdown(ioc); ++ sas_remove_host(shost); + list_for_each_entry_safe(raid_device, next, &ioc->raid_device_list, + list) { + if (raid_device->starget) { +@@ -8296,7 +8297,6 @@ static void scsih_remove(struct pci_dev *pdev) + ioc->sas_hba.num_phys = 0; + } + +- sas_remove_host(shost); + mpt3sas_base_detach(ioc); + spin_lock(&gioc_lock); + list_del(&ioc->list); +diff --git a/drivers/scsi/mpt3sas/mpt3sas_transport.c b/drivers/scsi/mpt3sas/mpt3sas_transport.c +index 63dd9bc21ff2..66d9f04c4c0b 100644 +--- a/drivers/scsi/mpt3sas/mpt3sas_transport.c ++++ b/drivers/scsi/mpt3sas/mpt3sas_transport.c +@@ -846,10 +846,13 @@ mpt3sas_transport_port_remove(struct MPT3SAS_ADAPTER *ioc, u64 sas_address, + mpt3sas_port->remote_identify.sas_address, + mpt3sas_phy->phy_id); + mpt3sas_phy->phy_belongs_to_port = 0; +- sas_port_delete_phy(mpt3sas_port->port, mpt3sas_phy->phy); ++ if (!ioc->remove_host) ++ sas_port_delete_phy(mpt3sas_port->port, ++ mpt3sas_phy->phy); + list_del(&mpt3sas_phy->port_siblings); + } +- sas_port_delete(mpt3sas_port->port); ++ if (!ioc->remove_host) ++ sas_port_delete(mpt3sas_port->port); + kfree(mpt3sas_port); + } + +-- +2.19.1 + diff --git a/queue-4.14/scsi-smartpqi-correct-host-serial-num-for-ssa.patch b/queue-4.14/scsi-smartpqi-correct-host-serial-num-for-ssa.patch new file mode 100644 index 00000000000..b0d10050829 --- /dev/null +++ b/queue-4.14/scsi-smartpqi-correct-host-serial-num-for-ssa.patch @@ -0,0 +1,46 @@ +From dcd9c1e17ebe18c1508cb64289a2e92b5ec66efd Mon Sep 17 00:00:00 2001 +From: Mahesh Rajashekhara +Date: Fri, 7 Dec 2018 16:28:29 -0600 +Subject: scsi: smartpqi: correct host serial num for ssa + +[ Upstream commit b2346b5030cf9458f30a84028d9fe904b8c942a7 ] + +Reviewed-by: Scott Benesh +Reviewed-by: Ajish Koshy +Reviewed-by: Murthy Bhat +Reviewed-by: Mahesh Rajashekhara +Reviewed-by: Dave Carroll +Reviewed-by: Scott Teel +Reviewed-by: Kevin Barnett +Signed-off-by: Mahesh Rajashekhara +Signed-off-by: Don Brace +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/smartpqi/smartpqi_init.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c +index bc15999f1c7c..cc27ae2e8a2d 100644 +--- a/drivers/scsi/smartpqi/smartpqi_init.c ++++ b/drivers/scsi/smartpqi/smartpqi_init.c +@@ -653,6 +653,7 @@ struct bmic_host_wellness_driver_version { + u8 driver_version_tag[2]; + __le16 driver_version_length; + char driver_version[32]; ++ u8 dont_write_tag[2]; + u8 end_tag[2]; + }; + +@@ -682,6 +683,8 @@ static int pqi_write_driver_version_to_host_wellness( + strncpy(buffer->driver_version, "Linux " DRIVER_VERSION, + sizeof(buffer->driver_version) - 1); + buffer->driver_version[sizeof(buffer->driver_version) - 1] = '\0'; ++ buffer->dont_write_tag[0] = 'D'; ++ buffer->dont_write_tag[1] = 'W'; + buffer->end_tag[0] = 'Z'; + buffer->end_tag[1] = 'Z'; + +-- +2.19.1 + diff --git a/queue-4.14/scsi-smartpqi-correct-volume-status.patch b/queue-4.14/scsi-smartpqi-correct-volume-status.patch new file mode 100644 index 00000000000..ff16b0c49c9 --- /dev/null +++ b/queue-4.14/scsi-smartpqi-correct-volume-status.patch @@ -0,0 +1,43 @@ +From 279a07d2546e5d916b6ee28722fdd4d25ad10c97 Mon Sep 17 00:00:00 2001 +From: Dave Carroll +Date: Fri, 7 Dec 2018 16:29:45 -0600 +Subject: scsi: smartpqi: correct volume status + +[ Upstream commit 7ff44499bafbd376115f0bb6b578d980f56ee13b ] + +- fix race condition when a unit is deleted after an RLL, + and before we have gotten the LV_STATUS page of the unit. + - In this case we will get a standard inquiry, rather than + the desired page. This will result in a unit presented + which no longer exists. + - If we ask for LV_STATUS, insure we get LV_STATUS + +Reviewed-by: Murthy Bhat +Reviewed-by: Mahesh Rajashekhara +Reviewed-by: Scott Teel +Reviewed-by: Kevin Barnett +Signed-off-by: Dave Carroll +Signed-off-by: Don Brace +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/smartpqi/smartpqi_init.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c +index cc27ae2e8a2d..5ec2898d21cd 100644 +--- a/drivers/scsi/smartpqi/smartpqi_init.c ++++ b/drivers/scsi/smartpqi/smartpqi_init.c +@@ -1184,6 +1184,9 @@ static void pqi_get_volume_status(struct pqi_ctrl_info *ctrl_info, + if (rc) + goto out; + ++ if (vpd->page_code != CISS_VPD_LV_STATUS) ++ goto out; ++ + page_length = offsetof(struct ciss_vpd_logical_volume_status, + volume_status) + vpd->page_length; + if (page_length < sizeof(*vpd)) +-- +2.19.1 + diff --git a/queue-4.14/scsi-smartpqi-increase-fw-status-register-read-timeo.patch b/queue-4.14/scsi-smartpqi-increase-fw-status-register-read-timeo.patch new file mode 100644 index 00000000000..4fb9afd385b --- /dev/null +++ b/queue-4.14/scsi-smartpqi-increase-fw-status-register-read-timeo.patch @@ -0,0 +1,46 @@ +From eb09bc615a06931ea5b2374d45cfa4be0cb13ab4 Mon Sep 17 00:00:00 2001 +From: Mahesh Rajashekhara +Date: Tue, 18 Dec 2018 17:39:01 -0600 +Subject: scsi: smartpqi: increase fw status register read timeout + +[ Upstream commit 65111785acccb836ec75263b03b0e33f21e74f47 ] + +Problem: + - during the driver initialization, driver will poll fw + for KERNEL_UP in a 30 seconds timeout. + + - if the firmware is not ready after 30 seconds, + driver will not be loaded. + +Fix: + - change timeout from 30 seconds to 3 minutes. + +Reported-by: Feng Li +Reviewed-by: Ajish Koshy +Reviewed-by: Murthy Bhat +Reviewed-by: Dave Carroll +Reviewed-by: Kevin Barnett +Signed-off-by: Mahesh Rajashekhara +Signed-off-by: Don Brace +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/smartpqi/smartpqi_sis.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/smartpqi/smartpqi_sis.c b/drivers/scsi/smartpqi/smartpqi_sis.c +index 5141bd4c9f06..ca7dfb3a520f 100644 +--- a/drivers/scsi/smartpqi/smartpqi_sis.c ++++ b/drivers/scsi/smartpqi/smartpqi_sis.c +@@ -59,7 +59,7 @@ + + #define SIS_CTRL_KERNEL_UP 0x80 + #define SIS_CTRL_KERNEL_PANIC 0x100 +-#define SIS_CTRL_READY_TIMEOUT_SECS 30 ++#define SIS_CTRL_READY_TIMEOUT_SECS 180 + #define SIS_CTRL_READY_RESUME_TIMEOUT_SECS 90 + #define SIS_CTRL_READY_POLL_INTERVAL_MSECS 10 + +-- +2.19.1 + diff --git a/queue-4.14/selftests-bpf-use-__bpf_constant_htons-in-test_prog..patch b/queue-4.14/selftests-bpf-use-__bpf_constant_htons-in-test_prog..patch new file mode 100644 index 00000000000..182931f6832 --- /dev/null +++ b/queue-4.14/selftests-bpf-use-__bpf_constant_htons-in-test_prog..patch @@ -0,0 +1,58 @@ +From 51e1754283dd3bb342c8f1901d01fb447b66bb29 Mon Sep 17 00:00:00 2001 +From: Stanislav Fomichev +Date: Tue, 11 Dec 2018 19:20:52 -0800 +Subject: selftests/bpf: use __bpf_constant_htons in test_prog.c + +[ Upstream commit a0517a0f7ef23550b4484c37e2b9c2d32abebf64 ] + +For some reason, my older GCC (< 4.8) isn't smart enough to optimize the +!__builtin_constant_p() branch in bpf_htons, I see: + error: implicit declaration of function '__builtin_bswap16' + +Let's use __bpf_constant_htons as suggested by Daniel Borkmann. + +I tried to use simple htons, but it produces the following: + test_progs.c:54:17: error: braced-group within expression allowed only + inside a function + .eth.h_proto = htons(ETH_P_IP), + +Signed-off-by: Stanislav Fomichev +Signed-off-by: Daniel Borkmann +Signed-off-by: Alexei Starovoitov +Signed-off-by: Sasha Levin +--- + tools/testing/selftests/bpf/test_progs.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c +index 11ee25cea227..1903fb4f45d8 100644 +--- a/tools/testing/selftests/bpf/test_progs.c ++++ b/tools/testing/selftests/bpf/test_progs.c +@@ -43,10 +43,10 @@ static struct { + struct iphdr iph; + struct tcphdr tcp; + } __packed pkt_v4 = { +- .eth.h_proto = bpf_htons(ETH_P_IP), ++ .eth.h_proto = __bpf_constant_htons(ETH_P_IP), + .iph.ihl = 5, + .iph.protocol = 6, +- .iph.tot_len = bpf_htons(MAGIC_BYTES), ++ .iph.tot_len = __bpf_constant_htons(MAGIC_BYTES), + .tcp.urg_ptr = 123, + }; + +@@ -56,9 +56,9 @@ static struct { + struct ipv6hdr iph; + struct tcphdr tcp; + } __packed pkt_v6 = { +- .eth.h_proto = bpf_htons(ETH_P_IPV6), ++ .eth.h_proto = __bpf_constant_htons(ETH_P_IPV6), + .iph.nexthdr = 6, +- .iph.payload_len = bpf_htons(MAGIC_BYTES), ++ .iph.payload_len = __bpf_constant_htons(MAGIC_BYTES), + .tcp.urg_ptr = 123, + }; + +-- +2.19.1 + diff --git a/queue-4.14/seq_buf-make-seq_buf_puts-null-terminate-the-buffer.patch b/queue-4.14/seq_buf-make-seq_buf_puts-null-terminate-the-buffer.patch new file mode 100644 index 00000000000..13c8c0954d5 --- /dev/null +++ b/queue-4.14/seq_buf-make-seq_buf_puts-null-terminate-the-buffer.patch @@ -0,0 +1,69 @@ +From c3844a0aa4d93585655696a8d96529982b1e9b73 Mon Sep 17 00:00:00 2001 +From: Michael Ellerman +Date: Fri, 19 Oct 2018 15:21:08 +1100 +Subject: seq_buf: Make seq_buf_puts() null-terminate the buffer +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[ Upstream commit 0464ed24380905d640030d368cd84a4e4d1e15e2 ] + +Currently seq_buf_puts() will happily create a non null-terminated +string for you in the buffer. This is particularly dangerous if the +buffer is on the stack. + +For example: + + char buf[8]; + char secret = "secret"; + struct seq_buf s; + + seq_buf_init(&s, buf, sizeof(buf)); + seq_buf_puts(&s, "foo"); + printk("Message is %s\n", buf); + +Can result in: + + Message is fooªªªªªsecret + +We could require all users to memset() their buffer to zero before +use. But that seems likely to be forgotten and lead to bugs. + +Instead we can change seq_buf_puts() to always leave the buffer in a +null-terminated state. + +The only downside is that this makes the buffer 1 character smaller +for seq_buf_puts(), but that seems like a good trade off. + +Link: http://lkml.kernel.org/r/20181019042109.8064-1-mpe@ellerman.id.au + +Acked-by: Kees Cook +Signed-off-by: Michael Ellerman +Signed-off-by: Steven Rostedt (VMware) +Signed-off-by: Sasha Levin +--- + lib/seq_buf.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/lib/seq_buf.c b/lib/seq_buf.c +index 11f2ae0f9099..6aabb609dd87 100644 +--- a/lib/seq_buf.c ++++ b/lib/seq_buf.c +@@ -144,9 +144,13 @@ int seq_buf_puts(struct seq_buf *s, const char *str) + + WARN_ON(s->size == 0); + ++ /* Add 1 to len for the trailing null byte which must be there */ ++ len += 1; ++ + if (seq_buf_can_fit(s, len)) { + memcpy(s->buffer + s->len, str, len); +- s->len += len; ++ /* Don't count the trailing null byte against the capacity */ ++ s->len += len - 1; + return 0; + } + seq_buf_set_overflow(s); +-- +2.19.1 + diff --git a/queue-4.14/serial-fsl_lpuart-clear-parity-enable-bit-when-disab.patch b/queue-4.14/serial-fsl_lpuart-clear-parity-enable-bit-when-disab.patch new file mode 100644 index 00000000000..64d95f96483 --- /dev/null +++ b/queue-4.14/serial-fsl_lpuart-clear-parity-enable-bit-when-disab.patch @@ -0,0 +1,49 @@ +From 9b2e3dde710a0d07cb526413ea931a85ed9a058f Mon Sep 17 00:00:00 2001 +From: Andy Duan +Date: Tue, 16 Oct 2018 07:32:22 +0000 +Subject: serial: fsl_lpuart: clear parity enable bit when disable parity +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[ Upstream commit 397bd9211fe014b347ca8f95a8f4e1017bac1aeb ] + +Current driver only enable parity enable bit and never clear it +when user set the termios. The fix clear the parity enable bit when +PARENB flag is not set in termios->c_cflag. + +Cc: Lukas Wunner +Signed-off-by: Andy Duan +Reviewed-by: Fabio Estevam +Acked-by: Uwe Kleine-König +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/fsl_lpuart.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c +index fd64ac2c1a74..716c33b2a11c 100644 +--- a/drivers/tty/serial/fsl_lpuart.c ++++ b/drivers/tty/serial/fsl_lpuart.c +@@ -1482,6 +1482,8 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios, + else + cr1 &= ~UARTCR1_PT; + } ++ } else { ++ cr1 &= ~UARTCR1_PE; + } + + /* ask the core to calculate the divisor */ +@@ -1694,6 +1696,8 @@ lpuart32_set_termios(struct uart_port *port, struct ktermios *termios, + else + ctrl &= ~UARTCTRL_PT; + } ++ } else { ++ ctrl &= ~UARTCTRL_PE; + } + + /* ask the core to calculate the divisor */ +-- +2.19.1 + diff --git a/queue-4.14/series b/queue-4.14/series new file mode 100644 index 00000000000..0c7760beced --- /dev/null +++ b/queue-4.14/series @@ -0,0 +1,165 @@ +drm-bufs-fix-spectre-v1-vulnerability.patch +staging-iio-adc-ad7280a-handle-error-from-__ad7280_r.patch +drm-vgem-fix-vgem_init-to-get-drm-device-available.patch +pinctrl-bcm2835-use-raw-spinlock-for-rt-compatibilit.patch +asoc-intel-mrfld-fix-uninitialized-variable-access.patch +gpu-ipu-v3-image-convert-prevent-race-between-run-an.patch +ath9k-dynack-use-authentication-messages-for-late-ac.patch +scsi-lpfc-correct-lcb-rjt-handling.patch +scsi-mpt3sas-call-sas_remove_host-before-removing-th.patch +scsi-lpfc-fix-logo-plogi-handling-when-triggerd-by-a.patch +arm-8808-1-kexec-offline-panic_smp_self_stop-cpu.patch +clk-boston-fix-possible-memory-leak-in-clk_boston_se.patch +dlm-don-t-swamp-the-cpu-with-callbacks-queued-during.patch +x86-pci-fix-broadcom-cnb20le-unintended-sign-extensi.patch +powerpc-pseries-add-of_node_put-in-dlpar_detach_node.patch +crypto-aes_ti-disable-interrupts-while-accessing-s-b.patch +drm-vc4-x_scaling-1-should-never-be-set-to-vc4_scali.patch +serial-fsl_lpuart-clear-parity-enable-bit-when-disab.patch +ptp-check-gettime64-return-code-in-ptp_sys_offset-io.patch +mips-boston-disable-eg20t-prefetch.patch +staging-iio-ad2s90-make-probe-handle-spi_setup-failu.patch +fpga-altera-cvp-fix-registration-for-cvp-incapable-d.patch +tools-hv-kvp-fix-a-warning-of-buffer-overflow-with-g.patch +platform-chrome-don-t-report-ec_mkbp_event_sensor_fi.patch +staging-iio-ad7780-update-voltage-on-read.patch +usbnet-smsc95xx-fix-rx-packet-alignment.patch +drm-rockchip-fix-for-mailbox-read-size.patch +arm-omap2-hwmod-fix-some-section-annotations.patch +net-mlx5-eq-use-the-right-place-to-store-read-irq-af.patch +modpost-validate-symbol-names-also-in-find_elf_symbo.patch +perf-tools-add-hygon-dhyana-support.patch +soc-tegra-don-t-leak-device-tree-node-reference.patch +media-mtk-vcodec-release-device-nodes-in-mtk_vcodec_.patch +ptp-fix-pass-zero-to-err_ptr-in-ptp_clock_register.patch +dmaengine-xilinx_dma-remove-__aligned-attribute-on-z.patch +iio-adc-meson-saradc-check-for-devm_kasprintf-failur.patch +iio-adc-meson-saradc-fix-internal-clock-names.patch +iio-accel-kxcjk1013-add-kiox010a-acpi-hardware-id.patch +media-adv-tc358743-ths8200-fill-in-min-width-height-.patch +acpi-spcr-consider-baud-rate-0-as-preconfigured-stat.patch +staging-pi433-fix-potential-null-dereference.patch +f2fs-move-dir-data-flush-to-write-checkpoint-process.patch +f2fs-avoid-build-warn-of-fall_through.patch +f2fs-fix-race-between-write_checkpoint-and-write_beg.patch +f2fs-fix-wrong-return-value-of-f2fs_acl_create.patch +i2c-sh_mobile-add-support-for-r8a77990-r-car-e3.patch +arm64-io-ensure-calls-to-delay-routines-are-ordered-.patch +sunvdc-do-not-spin-in-an-infinite-loop-when-vio_ldc_.patch +soc-bcm-brcmstb-don-t-leak-device-tree-node-referenc.patch +nfsd4-fix-crash-on-writing-v4_end_grace-before-nfsd-.patch +drm-clear-state-acquire_ctx-before-leaving-drm_atomi.patch +arm64-io-ensure-value-passed-to-__iormb-is-held-in-a.patch +thermal-do-not-clear-passive-state-during-system-sle.patch +firmware-efi-add-null-pointer-checks-in-efivars-api-.patch +s390-zcrypt-improve-special-ap-message-cmd-handling.patch +arm64-ftrace-don-t-adjust-the-lr-value.patch +arm-dts-mmp2-fix-twsi2.patch +arm-mmp-mmp2-dt-enable-the-clock.patch +x86-fpu-add-might_fault-to-user_insn.patch +media-davinci-vpbe-fix-error-handling-in-vpbe_initia.patch +smack-fix-access-permissions-for-keyring.patch +usb-dwc3-correct-the-logic-for-checking-trb-full-in-.patch +usb-hub-delay-hub-autosuspend-if-usb3-port-is-still-.patch +timekeeping-use-proper-seqcount-initializer.patch +usb-mtu3-fix-the-issue-about-setfeature-u1-u2_enable.patch +clk-sunxi-ng-a33-set-clk_set_rate_parent-for-all-aud.patch +driver-core-move-async_synchronize_full-call.patch +kobject-return-error-code-if-writing-sys-.-uevent-fa.patch +ib-hfi1-unreserve-a-reserved-request-when-it-is-comp.patch +usb-dwc3-trace-add-missing-break-statement-to-make-c.patch +pinctrl-sx150x-handle-failure-case-of-devm_kstrdup.patch +iommu-amd-fix-amd_iommu-force_isolation.patch +arm-dts-fix-omap4430-sdp-ethernet-startup.patch +mips-bpf-fix-encoding-bug-for-mm_srlv32_op.patch +media-coda-fix-h.264-deblocking-filter-controls.patch +arm-dts-fix-up-the-d-link-dir-685-mtd-partition-info.patch +tracing-have-trace_stack-nr_entries-compare-not-be-s.patch +watchdog-renesas_wdt-don-t-set-divider-while-watchdo.patch +usb-dwc3-gadget-disable-csp-for-stream-out-ep.patch +iommu-arm-smmu-add-support-for-qcom-smmu-v2-variant.patch +iommu-arm-smmu-v3-use-explicit-mb-when-moving-cons-p.patch +sata_rcar-fix-deferred-probing.patch +clk-imx6sl-ensure-mmdc-ch0-handshake-is-bypassed.patch +cpuidle-big.little-fix-refcount-leak.patch +opp-use-opp_table-regulators-to-verify-no-regulator-.patch +i2c-axxia-check-for-error-conditions-first.patch +phy-sun4i-usb-add-support-for-missing-usb-phy-index.patch +udf-fix-bug-on-corrupted-inode.patch +switchtec-fix-switchtec_ioctl_event_idx_all-flags-ov.patch +selftests-bpf-use-__bpf_constant_htons-in-test_prog..patch +arm-pxa-avoid-section-mismatch-warning.patch +asoc-fsl-fix-snd_soc_eukrea_tlv320-build-error-on-i..patch +arm-mmp-fix-timer_init-calls.patch +kvm-ppc-book3s-only-report-kvm_cap_spapr_tce_vfio-on.patch +mmc-bcm2835-recover-from-mmc_send_ext_csd.patch +mmc-bcm2835-reset-host-on-timeout.patch +memstick-prevent-memstick-host-from-getting-runtime-.patch +mmc-sdhci-of-esdhc-fix-timeout-checks.patch +mmc-sdhci-xenon-fix-timeout-checks.patch +btrfs-harden-agaist-duplicate-fsid-on-scanned-device.patch +tty-serial-samsung-properly-set-flags-in-autocts-mod.patch +perf-test-fix-perf_event_attr-test-failure.patch +perf-header-fix-unchecked-usage-of-strncpy.patch +perf-probe-fix-unchecked-usage-of-strncpy.patch +kvm-s390-unregister-debug-feature-on-failing-arch-in.patch +arm64-kvm-skip-mmio-insn-after-emulation.patch +usb-musb-dsps-fix-otg-state-machine.patch +percpu-convert-spin_lock_irq-to-spin_lock_irqsave.patch +powerpc-uaccess-fix-warning-error-with-access_ok.patch +mac80211-fix-radiotap-vendor-presence-bitmap-handlin.patch +xfrm6_tunnel-fix-spi-check-in-__xfrm6_tunnel_alloc_s.patch +bluetooth-fix-unnecessary-error-message-for-hci-requ.patch +mlxsw-spectrum-properly-cleanup-lag-uppers-when-remo.patch +scsi-smartpqi-correct-host-serial-num-for-ssa.patch +scsi-smartpqi-correct-volume-status.patch +scsi-smartpqi-increase-fw-status-register-read-timeo.patch +cw1200-fix-concurrency-use-after-free-bugs-in-cw1200.patch +powerpc-perf-fix-thresholding-counter-data-for-unkno.patch +drbd-narrow-rcu_read_lock-in-drbd_sync_handshake.patch +drbd-disconnect-if-the-wrong-uuids-are-attached-on-a.patch +drbd-skip-spurious-timeout-ping-timeo-when-failing-p.patch +drbd-avoid-clang-warning-about-pointless-switch-stat.patch +video-clps711x-fb-release-disp-device-node-in-probe.patch +md-fix-raid10-hang-issue-caused-by-barrier.patch +fbdev-fbmem-behave-better-with-small-rotated-display.patch +i40e-define-proper-net_device-neigh_priv_len.patch +igb-fix-an-issue-that-pme-is-not-enabled-during-runt.patch +acpi-apei-clear-ghes-block_status-before-panic.patch +fbdev-fbcon-fix-unregister-crash-when-more-than-one-.patch +powerpc-mm-fix-reporting-of-kernel-execute-faults-on.patch +pinctrl-meson-meson8-fix-the-gpio-function-for-the-g.patch +pinctrl-meson-meson8b-fix-the-gpio-function-for-the-.patch +kvm-x86-svm-report-msr_ia32_mcg_ext_ctl-as-unsupport.patch +powerpc-fadump-do-not-allow-hot-remove-memory-from-f.patch +kvm-change-offset-in-kvm_write_guest_offset_cached-t.patch +nfs-nfs_compare_mount_options-always-compare-auth-fl.patch +hwmon-lm80-fix-a-missing-check-of-the-status-of-smbu.patch +hwmon-lm80-fix-a-missing-check-of-bus-read-in-lm80-p.patch +seq_buf-make-seq_buf_puts-null-terminate-the-buffer.patch +crypto-ux500-use-proper-enum-in-cryp_set_dma_transfe.patch +crypto-ux500-use-proper-enum-in-hash_set_dma_transfe.patch +mips-ralink-select-config_cpu_mipsr2_irq_vi-on-mt762.patch +cifs-check-ntwrk_buf_start-for-null-before-dereferen.patch +um-avoid-marking-pages-with-changed-protection.patch +niu-fix-missing-checks-of-niu_pci_eeprom_read.patch +f2fs-fix-sbi-extent_list-corruption-issue.patch +cgroup-fix-parsing-empty-mount-option-string.patch +scripts-decode_stacktrace-only-strip-base-path-when-.patch +ocfs2-don-t-clear-bh-uptodate-for-block-read.patch +ocfs2-improve-ocfs2-makefile.patch +isdn-hisax-hfc_pci-fix-a-possible-concurrency-use-af.patch +gdrom-fix-a-memory-leak-bug.patch +fsl-fman-use-gfp_atomic-in-memac-tgec-_add_hash_mac_.patch +block-swim3-fix-ebusy-error-when-re-opening-device-a.patch +thermal-bcm2835-enable-hwmon-explicitly.patch +kdb-don-t-back-trace-on-a-cpu-that-didn-t-round-up.patch +thermal-generic-adc-fix-adc-to-temp-interpolation.patch +hid-lenovo-add-checks-to-fix-of_led_classdev_registe.patch +fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch +kernel-hung_task.c-break-rcu-locks-based-on-jiffies.patch +proc-sysctl-fix-return-error-for-proc_doulongvec_min.patch +kernel-hung_task.c-force-console-verbose-before-pani.patch +fs-epoll-drop-ovflist-branch-prediction.patch +exec-load_script-don-t-blindly-truncate-shebang-stri.patch +scripts-gdb-fix-lx-version-string-output.patch diff --git a/queue-4.14/smack-fix-access-permissions-for-keyring.patch b/queue-4.14/smack-fix-access-permissions-for-keyring.patch new file mode 100644 index 00000000000..08ce6af196c --- /dev/null +++ b/queue-4.14/smack-fix-access-permissions-for-keyring.patch @@ -0,0 +1,66 @@ +From 31a1ab75210013b2ab3e8c5391608a2b6af4f3a6 Mon Sep 17 00:00:00 2001 +From: Zoran Markovic +Date: Wed, 17 Oct 2018 16:25:44 -0700 +Subject: smack: fix access permissions for keyring + +[ Upstream commit 5b841bfab695e3b8ae793172a9ff7990f99cc3e2 ] + +Function smack_key_permission() only issues smack requests for the +following operations: + - KEY_NEED_READ (issues MAY_READ) + - KEY_NEED_WRITE (issues MAY_WRITE) + - KEY_NEED_LINK (issues MAY_WRITE) + - KEY_NEED_SETATTR (issues MAY_WRITE) +A blank smack request is issued in all other cases, resulting in +smack access being granted if there is any rule defined between +subject and object, or denied with -EACCES otherwise. + +Request MAY_READ access for KEY_NEED_SEARCH and KEY_NEED_VIEW. +Fix the logic in the unlikely case when both MAY_READ and +MAY_WRITE are needed. Validate access permission field for valid +contents. + +Signed-off-by: Zoran Markovic +Signed-off-by: Casey Schaufler +Cc: Casey Schaufler +Cc: James Morris +Cc: "Serge E. Hallyn" +Signed-off-by: Sasha Levin +--- + security/smack/smack_lsm.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c +index c8fd5c10b7c6..0d5ce7190b17 100644 +--- a/security/smack/smack_lsm.c ++++ b/security/smack/smack_lsm.c +@@ -4356,6 +4356,12 @@ static int smack_key_permission(key_ref_t key_ref, + int request = 0; + int rc; + ++ /* ++ * Validate requested permissions ++ */ ++ if (perm & ~KEY_NEED_ALL) ++ return -EINVAL; ++ + keyp = key_ref_to_ptr(key_ref); + if (keyp == NULL) + return -EINVAL; +@@ -4375,10 +4381,10 @@ static int smack_key_permission(key_ref_t key_ref, + ad.a.u.key_struct.key = keyp->serial; + ad.a.u.key_struct.key_desc = keyp->description; + #endif +- if (perm & KEY_NEED_READ) +- request = MAY_READ; ++ if (perm & (KEY_NEED_READ | KEY_NEED_SEARCH | KEY_NEED_VIEW)) ++ request |= MAY_READ; + if (perm & (KEY_NEED_WRITE | KEY_NEED_LINK | KEY_NEED_SETATTR)) +- request = MAY_WRITE; ++ request |= MAY_WRITE; + rc = smk_access(tkp, keyp->security, request, &ad); + rc = smk_bu_note("key access", tkp, keyp->security, request, rc); + return rc; +-- +2.19.1 + diff --git a/queue-4.14/soc-bcm-brcmstb-don-t-leak-device-tree-node-referenc.patch b/queue-4.14/soc-bcm-brcmstb-don-t-leak-device-tree-node-referenc.patch new file mode 100644 index 00000000000..340ffaa2322 --- /dev/null +++ b/queue-4.14/soc-bcm-brcmstb-don-t-leak-device-tree-node-referenc.patch @@ -0,0 +1,47 @@ +From 72e3d211c63dc15d522aa350affb070899958a46 Mon Sep 17 00:00:00 2001 +From: Yangtao Li +Date: Sat, 24 Nov 2018 09:52:23 -0500 +Subject: soc: bcm: brcmstb: Don't leak device tree node reference + +[ Upstream commit 1861a7f07e02292830a1ca256328d370deefea30 ] + +of_find_node_by_path() acquires a reference to the node returned by it +and that reference needs to be dropped by its caller. soc_is_brcmstb() +doesn't do that, so fix it. + +[treding: slightly rewrite to avoid inline comparison] + +Fixes: d52fad262041 ("soc: add stubs for brcmstb SoC's") +Signed-off-by: Yangtao Li +Signed-off-by: Florian Fainelli +Signed-off-by: Sasha Levin +--- + drivers/soc/bcm/brcmstb/common.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/soc/bcm/brcmstb/common.c b/drivers/soc/bcm/brcmstb/common.c +index 22e98a90468c..2f5ec424a390 100644 +--- a/drivers/soc/bcm/brcmstb/common.c ++++ b/drivers/soc/bcm/brcmstb/common.c +@@ -31,13 +31,17 @@ static const struct of_device_id brcmstb_machine_match[] = { + + bool soc_is_brcmstb(void) + { ++ const struct of_device_id *match; + struct device_node *root; + + root = of_find_node_by_path("/"); + if (!root) + return false; + +- return of_match_node(brcmstb_machine_match, root) != NULL; ++ match = of_match_node(brcmstb_machine_match, root); ++ of_node_put(root); ++ ++ return match != NULL; + } + + static const struct of_device_id sun_top_ctrl_match[] = { +-- +2.19.1 + diff --git a/queue-4.14/soc-tegra-don-t-leak-device-tree-node-reference.patch b/queue-4.14/soc-tegra-don-t-leak-device-tree-node-reference.patch new file mode 100644 index 00000000000..e74f9e8901d --- /dev/null +++ b/queue-4.14/soc-tegra-don-t-leak-device-tree-node-reference.patch @@ -0,0 +1,44 @@ +From d5aea5565a89a7858f55f3ed67f0a639fa111085 Mon Sep 17 00:00:00 2001 +From: Yangtao Li +Date: Wed, 21 Nov 2018 07:49:12 -0500 +Subject: soc/tegra: Don't leak device tree node reference + +[ Upstream commit 9eb40fa2cd2d1f6829e7b49bb22692f754b9cfe0 ] + +of_find_node_by_path() acquires a reference to the node returned by it +and that reference needs to be dropped by its caller. soc_is_tegra() +doesn't do that, so fix it. + +Signed-off-by: Yangtao Li +Acked-by: Jon Hunter +[treding: slightly rewrite to avoid inline comparison] +Signed-off-by: Thierry Reding +Signed-off-by: Sasha Levin +--- + drivers/soc/tegra/common.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/soc/tegra/common.c b/drivers/soc/tegra/common.c +index cd8f41351add..7bfb154d6fa5 100644 +--- a/drivers/soc/tegra/common.c ++++ b/drivers/soc/tegra/common.c +@@ -22,11 +22,15 @@ static const struct of_device_id tegra_machine_match[] = { + + bool soc_is_tegra(void) + { ++ const struct of_device_id *match; + struct device_node *root; + + root = of_find_node_by_path("/"); + if (!root) + return false; + +- return of_match_node(tegra_machine_match, root) != NULL; ++ match = of_match_node(tegra_machine_match, root); ++ of_node_put(root); ++ ++ return match != NULL; + } +-- +2.19.1 + diff --git a/queue-4.14/staging-iio-ad2s90-make-probe-handle-spi_setup-failu.patch b/queue-4.14/staging-iio-ad2s90-make-probe-handle-spi_setup-failu.patch new file mode 100644 index 00000000000..ce2733563b4 --- /dev/null +++ b/queue-4.14/staging-iio-ad2s90-make-probe-handle-spi_setup-failu.patch @@ -0,0 +1,46 @@ +From 7bcbd2602ddf174867c9d1e0175510d1e4fa4484 Mon Sep 17 00:00:00 2001 +From: Matheus Tavares +Date: Sat, 3 Nov 2018 19:49:44 -0300 +Subject: staging:iio:ad2s90: Make probe handle spi_setup failure + +[ Upstream commit b3a3eafeef769c6982e15f83631dcbf8d1794efb ] + +Previously, ad2s90_probe ignored the return code from spi_setup, not +handling its possible failure. This patch makes ad2s90_probe check if +the code is an error code and, if so, do the following: + +- Call dev_err with an appropriate error message. +- Return the spi_setup's error code. + +Note: The 'return ret' statement could be out of the 'if' block, but +this whole block will be moved up in the function in the patch: +'staging:iio:ad2s90: Move device registration to the end of probe'. + +Signed-off-by: Matheus Tavares +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/staging/iio/resolver/ad2s90.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/drivers/staging/iio/resolver/ad2s90.c b/drivers/staging/iio/resolver/ad2s90.c +index b2270908f26f..cbee9ad00f0d 100644 +--- a/drivers/staging/iio/resolver/ad2s90.c ++++ b/drivers/staging/iio/resolver/ad2s90.c +@@ -86,7 +86,12 @@ static int ad2s90_probe(struct spi_device *spi) + /* need 600ns between CS and the first falling edge of SCLK */ + spi->max_speed_hz = 830000; + spi->mode = SPI_MODE_3; +- spi_setup(spi); ++ ret = spi_setup(spi); ++ ++ if (ret < 0) { ++ dev_err(&spi->dev, "spi_setup failed!\n"); ++ return ret; ++ } + + return 0; + } +-- +2.19.1 + diff --git a/queue-4.14/staging-iio-ad7780-update-voltage-on-read.patch b/queue-4.14/staging-iio-ad7780-update-voltage-on-read.patch new file mode 100644 index 00000000000..9b8130e7015 --- /dev/null +++ b/queue-4.14/staging-iio-ad7780-update-voltage-on-read.patch @@ -0,0 +1,44 @@ +From 27eb4f9d0fbb2b40b472e6ca13902ef73c80a392 Mon Sep 17 00:00:00 2001 +From: Renato Lui Geh +Date: Mon, 5 Nov 2018 17:14:58 -0200 +Subject: staging: iio: ad7780: update voltage on read + +[ Upstream commit 336650c785b62c3bea7c8cf6061c933a90241f67 ] + +The ad7780 driver previously did not read the correct device output, as +it read an outdated value set at initialization. It now updates its +voltage on read. + +Signed-off-by: Renato Lui Geh +Acked-by: Alexandru Ardelean +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/staging/iio/adc/ad7780.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c +index dec3ba6eba8a..52613f6a9dd8 100644 +--- a/drivers/staging/iio/adc/ad7780.c ++++ b/drivers/staging/iio/adc/ad7780.c +@@ -87,12 +87,16 @@ static int ad7780_read_raw(struct iio_dev *indio_dev, + long m) + { + struct ad7780_state *st = iio_priv(indio_dev); ++ int voltage_uv; + + switch (m) { + case IIO_CHAN_INFO_RAW: + return ad_sigma_delta_single_conversion(indio_dev, chan, val); + case IIO_CHAN_INFO_SCALE: +- *val = st->int_vref_mv * st->gain; ++ voltage_uv = regulator_get_voltage(st->reg); ++ if (voltage_uv < 0) ++ return voltage_uv; ++ *val = (voltage_uv / 1000) * st->gain; + *val2 = chan->scan_type.realbits - 1; + return IIO_VAL_FRACTIONAL_LOG2; + case IIO_CHAN_INFO_OFFSET: +-- +2.19.1 + diff --git a/queue-4.14/staging-iio-adc-ad7280a-handle-error-from-__ad7280_r.patch b/queue-4.14/staging-iio-adc-ad7280a-handle-error-from-__ad7280_r.patch new file mode 100644 index 00000000000..1a8a19be278 --- /dev/null +++ b/queue-4.14/staging-iio-adc-ad7280a-handle-error-from-__ad7280_r.patch @@ -0,0 +1,70 @@ +From d44c03af1097b3872bb79b919051ed047f003e43 Mon Sep 17 00:00:00 2001 +From: Slawomir Stepien +Date: Sat, 20 Oct 2018 23:04:11 +0200 +Subject: staging: iio: adc: ad7280a: handle error from __ad7280_read32() + +[ Upstream commit 0559ef7fde67bc6c83c6eb6329dbd6649528263e ] + +Inside __ad7280_read32(), the spi_sync_transfer() can fail with negative +error code. This change will ensure that this error is being passed up +in the call stack, so it can be handled. + +Signed-off-by: Slawomir Stepien +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/staging/iio/adc/ad7280a.c | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c +index f85dde9805e0..f17f700ea04f 100644 +--- a/drivers/staging/iio/adc/ad7280a.c ++++ b/drivers/staging/iio/adc/ad7280a.c +@@ -256,7 +256,9 @@ static int ad7280_read(struct ad7280_state *st, unsigned int devaddr, + if (ret) + return ret; + +- __ad7280_read32(st, &tmp); ++ ret = __ad7280_read32(st, &tmp); ++ if (ret) ++ return ret; + + if (ad7280_check_crc(st, tmp)) + return -EIO; +@@ -294,7 +296,9 @@ static int ad7280_read_channel(struct ad7280_state *st, unsigned int devaddr, + + ad7280_delay(st); + +- __ad7280_read32(st, &tmp); ++ ret = __ad7280_read32(st, &tmp); ++ if (ret) ++ return ret; + + if (ad7280_check_crc(st, tmp)) + return -EIO; +@@ -327,7 +331,9 @@ static int ad7280_read_all_channels(struct ad7280_state *st, unsigned int cnt, + ad7280_delay(st); + + for (i = 0; i < cnt; i++) { +- __ad7280_read32(st, &tmp); ++ ret = __ad7280_read32(st, &tmp); ++ if (ret) ++ return ret; + + if (ad7280_check_crc(st, tmp)) + return -EIO; +@@ -370,7 +376,10 @@ static int ad7280_chain_setup(struct ad7280_state *st) + return ret; + + for (n = 0; n <= AD7280A_MAX_CHAIN; n++) { +- __ad7280_read32(st, &val); ++ ret = __ad7280_read32(st, &val); ++ if (ret) ++ return ret; ++ + if (val == 0) + return n - 1; + +-- +2.19.1 + diff --git a/queue-4.14/staging-pi433-fix-potential-null-dereference.patch b/queue-4.14/staging-pi433-fix-potential-null-dereference.patch new file mode 100644 index 00000000000..2bbc78d2e61 --- /dev/null +++ b/queue-4.14/staging-pi433-fix-potential-null-dereference.patch @@ -0,0 +1,36 @@ +From 48f4f6835a0c749b412824711b86f11526e46f18 Mon Sep 17 00:00:00 2001 +From: Michael Straube +Date: Sun, 25 Nov 2018 10:22:25 +0100 +Subject: staging: pi433: fix potential null dereference + +[ Upstream commit 64c4c4ca6c129a4191e8e1e91b2d5d9b8d08c518 ] + +Add a test for successful call to cdev_alloc() to avoid +potential null dereference. Issue reported by smatch. + +Signed-off-by: Michael Straube +Fixes: 874bcba65f9a ("staging: pi433: New driver") +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/staging/pi433/pi433_if.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c +index 93c01680f016..5be40bdc191b 100644 +--- a/drivers/staging/pi433/pi433_if.c ++++ b/drivers/staging/pi433/pi433_if.c +@@ -1210,6 +1210,10 @@ static int pi433_probe(struct spi_device *spi) + + /* create cdev */ + device->cdev = cdev_alloc(); ++ if (!device->cdev) { ++ dev_dbg(device->dev, "allocation of cdev failed"); ++ goto cdev_failed; ++ } + device->cdev->owner = THIS_MODULE; + cdev_init(device->cdev, &pi433_fops); + retval = cdev_add(device->cdev, device->devt, 1); +-- +2.19.1 + diff --git a/queue-4.14/sunvdc-do-not-spin-in-an-infinite-loop-when-vio_ldc_.patch b/queue-4.14/sunvdc-do-not-spin-in-an-infinite-loop-when-vio_ldc_.patch new file mode 100644 index 00000000000..ee0871292b6 --- /dev/null +++ b/queue-4.14/sunvdc-do-not-spin-in-an-infinite-loop-when-vio_ldc_.patch @@ -0,0 +1,54 @@ +From 4a5881f6fb25115e7dd336733e0a17e038435309 Mon Sep 17 00:00:00 2001 +From: Young Xiao +Date: Wed, 28 Nov 2018 12:36:39 +0000 +Subject: sunvdc: Do not spin in an infinite loop when vio_ldc_send() returns + EAGAIN + +[ Upstream commit a11f6ca9aef989b56cd31ff4ee2af4fb31a172ec ] + +__vdc_tx_trigger should only loop on EAGAIN a finite +number of times. + +See commit adddc32d6fde ("sunvnet: Do not spin in an +infinite loop when vio_ldc_send() returns EAGAIN") for detail. + +Signed-off-by: Young Xiao +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/block/sunvdc.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c +index ad9749463d4f..ed4d6276e94f 100644 +--- a/drivers/block/sunvdc.c ++++ b/drivers/block/sunvdc.c +@@ -41,6 +41,8 @@ MODULE_VERSION(DRV_MODULE_VERSION); + #define WAITING_FOR_GEN_CMD 0x04 + #define WAITING_FOR_ANY -1 + ++#define VDC_MAX_RETRIES 10 ++ + static struct workqueue_struct *sunvdc_wq; + + struct vdc_req_entry { +@@ -427,6 +429,7 @@ static int __vdc_tx_trigger(struct vdc_port *port) + .end_idx = dr->prod, + }; + int err, delay; ++ int retries = 0; + + hdr.seq = dr->snd_nxt; + delay = 1; +@@ -439,6 +442,8 @@ static int __vdc_tx_trigger(struct vdc_port *port) + udelay(delay); + if ((delay <<= 1) > 128) + delay = 128; ++ if (retries++ > VDC_MAX_RETRIES) ++ break; + } while (err == -EAGAIN); + + if (err == -ENOTCONN) +-- +2.19.1 + diff --git a/queue-4.14/switchtec-fix-switchtec_ioctl_event_idx_all-flags-ov.patch b/queue-4.14/switchtec-fix-switchtec_ioctl_event_idx_all-flags-ov.patch new file mode 100644 index 00000000000..72bc5298c94 --- /dev/null +++ b/queue-4.14/switchtec-fix-switchtec_ioctl_event_idx_all-flags-ov.patch @@ -0,0 +1,50 @@ +From ef4495ff459cb165f283c46d4a50683817049aca Mon Sep 17 00:00:00 2001 +From: Joey Zhang +Date: Mon, 10 Dec 2018 17:12:22 +0800 +Subject: switchtec: Fix SWITCHTEC_IOCTL_EVENT_IDX_ALL flags overwrite + +[ Upstream commit e4a7dca5de625018b29417ecc39dc5037d9a5a36 ] + +In the ioctl_event_ctl() SWITCHTEC_IOCTL_EVENT_IDX_ALL case, we call +event_ctl() several times with the same "ctl" struct. Each call clobbers +ctl.flags, which leads to the problem that we may not actually enable or +disable all events as the user requested. + +Preserve the event flag value with a temporary variable. + +Fixes: 52eabba5bcdb ("switchtec: Add IOCTLs to the Switchtec driver") +Signed-off-by: Joey Zhang +Signed-off-by: Wesley Sheng +[bhelgaas: changelog] +Signed-off-by: Bjorn Helgaas +Reviewed-by: Logan Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/pci/switch/switchtec.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c +index 620f5b995a12..e3aefdafae89 100644 +--- a/drivers/pci/switch/switchtec.c ++++ b/drivers/pci/switch/switchtec.c +@@ -1064,6 +1064,7 @@ static int ioctl_event_ctl(struct switchtec_dev *stdev, + { + int ret; + int nr_idxs; ++ unsigned int event_flags; + struct switchtec_ioctl_event_ctl ctl; + + if (copy_from_user(&ctl, uctl, sizeof(ctl))) +@@ -1085,7 +1086,9 @@ static int ioctl_event_ctl(struct switchtec_dev *stdev, + else + return -EINVAL; + ++ event_flags = ctl.flags; + for (ctl.index = 0; ctl.index < nr_idxs; ctl.index++) { ++ ctl.flags = event_flags; + ret = event_ctl(stdev, &ctl); + if (ret < 0) + return ret; +-- +2.19.1 + diff --git a/queue-4.14/thermal-bcm2835-enable-hwmon-explicitly.patch b/queue-4.14/thermal-bcm2835-enable-hwmon-explicitly.patch new file mode 100644 index 00000000000..8761276529d --- /dev/null +++ b/queue-4.14/thermal-bcm2835-enable-hwmon-explicitly.patch @@ -0,0 +1,51 @@ +From 0ea38d8c1385b2c3d57a60e0bc2b81c8e40c8169 Mon Sep 17 00:00:00 2001 +From: Matthias Brugger +Date: Sun, 21 Oct 2018 23:58:48 +0200 +Subject: thermal: bcm2835: enable hwmon explicitly + +[ Upstream commit d56c19d07e0bc3ceff366a49b7d7a2440c967b1b ] + +By defaul of-based thermal driver do not enable hwmon. +This patch does this explicitly, so that the temperature can be read +through the common hwmon sysfs. + +Signed-off-by: Matthias Brugger +Acked-by: Stefan Wahren +Signed-off-by: Eduardo Valentin +Signed-off-by: Sasha Levin +--- + drivers/thermal/broadcom/bcm2835_thermal.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/drivers/thermal/broadcom/bcm2835_thermal.c b/drivers/thermal/broadcom/bcm2835_thermal.c +index 23ad4f9f2143..24b006a95142 100644 +--- a/drivers/thermal/broadcom/bcm2835_thermal.c ++++ b/drivers/thermal/broadcom/bcm2835_thermal.c +@@ -27,6 +27,8 @@ + #include + #include + ++#include "../thermal_hwmon.h" ++ + #define BCM2835_TS_TSENSCTL 0x00 + #define BCM2835_TS_TSENSSTAT 0x04 + +@@ -275,6 +277,15 @@ static int bcm2835_thermal_probe(struct platform_device *pdev) + + platform_set_drvdata(pdev, tz); + ++ /* ++ * Thermal_zone doesn't enable hwmon as default, ++ * enable it here ++ */ ++ tz->tzp->no_hwmon = false; ++ err = thermal_add_hwmon_sysfs(tz); ++ if (err) ++ goto err_tz; ++ + bcm2835_thermal_debugfs(pdev); + + return 0; +-- +2.19.1 + diff --git a/queue-4.14/thermal-do-not-clear-passive-state-during-system-sle.patch b/queue-4.14/thermal-do-not-clear-passive-state-during-system-sle.patch new file mode 100644 index 00000000000..73c19792528 --- /dev/null +++ b/queue-4.14/thermal-do-not-clear-passive-state-during-system-sle.patch @@ -0,0 +1,68 @@ +From cb9fbbbbdd8a664c72443710764e927ff88eebad Mon Sep 17 00:00:00 2001 +From: Wei Wang +Date: Wed, 7 Nov 2018 14:36:11 -0800 +Subject: Thermal: do not clear passive state during system sleep + +[ Upstream commit 964f4843a455d2ffb199512b08be8d5f077c4cac ] + +commit ff140fea847e ("Thermal: handle thermal zone device properly +during system sleep") added PM hook to call thermal zone reset during +sleep. However resetting thermal zone will also clear the passive state +and thus cancel the polling queue which leads the passive cooling device +state not being cleared properly after sleep. + +thermal_pm_notify => thermal_zone_device_reset set passive to 0 +thermal_zone_trip_update will skip update passive as `old_target == +instance->target'. +monitor_thermal_zone => thermal_zone_device_set_polling will cancel +tz->poll_queue, so the cooling device state will not be changed +afterwards. + +Reported-by: Kame Wang +Signed-off-by: Wei Wang +Signed-off-by: Zhang Rui +Signed-off-by: Sasha Levin +--- + drivers/thermal/thermal_core.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c +index 2b1b0ba393a4..17d6079c7642 100644 +--- a/drivers/thermal/thermal_core.c ++++ b/drivers/thermal/thermal_core.c +@@ -454,16 +454,20 @@ static void update_temperature(struct thermal_zone_device *tz) + tz->last_temperature, tz->temperature); + } + +-static void thermal_zone_device_reset(struct thermal_zone_device *tz) ++static void thermal_zone_device_init(struct thermal_zone_device *tz) + { + struct thermal_instance *pos; +- + tz->temperature = THERMAL_TEMP_INVALID; +- tz->passive = 0; + list_for_each_entry(pos, &tz->thermal_instances, tz_node) + pos->initialized = false; + } + ++static void thermal_zone_device_reset(struct thermal_zone_device *tz) ++{ ++ tz->passive = 0; ++ thermal_zone_device_init(tz); ++} ++ + void thermal_zone_device_update(struct thermal_zone_device *tz, + enum thermal_notify_event event) + { +@@ -1503,7 +1507,7 @@ static int thermal_pm_notify(struct notifier_block *nb, + case PM_POST_SUSPEND: + atomic_set(&in_suspend, 0); + list_for_each_entry(tz, &thermal_tz_list, node) { +- thermal_zone_device_reset(tz); ++ thermal_zone_device_init(tz); + thermal_zone_device_update(tz, + THERMAL_EVENT_UNSPECIFIED); + } +-- +2.19.1 + diff --git a/queue-4.14/thermal-generic-adc-fix-adc-to-temp-interpolation.patch b/queue-4.14/thermal-generic-adc-fix-adc-to-temp-interpolation.patch new file mode 100644 index 00000000000..ab95995911e --- /dev/null +++ b/queue-4.14/thermal-generic-adc-fix-adc-to-temp-interpolation.patch @@ -0,0 +1,63 @@ +From 480d3771eb4a34ad8f4240aa80d2a6b1711fa53c Mon Sep 17 00:00:00 2001 +From: Bjorn Andersson +Date: Sun, 23 Dec 2018 23:26:44 -0800 +Subject: thermal: generic-adc: Fix adc to temp interpolation + +[ Upstream commit 9d216211fded20fff301d0317af3238d8383634c ] + +First correct the edge case to return the last element if we're +outside the range, rather than at the last element, so that +interpolation is not omitted for points between the two last entries in +the table. + +Then correct the formula to perform linear interpolation based the two +points surrounding the read ADC value. The indices for temp are kept as +"hi" and "lo" to pair with the adc indices, but there's no requirement +that the temperature is provided in descendent order. mult_frac() is +used to prevent issues with overflowing the int. + +Cc: Laxman Dewangan +Signed-off-by: Bjorn Andersson +Signed-off-by: Eduardo Valentin +Signed-off-by: Sasha Levin +--- + drivers/thermal/thermal-generic-adc.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/drivers/thermal/thermal-generic-adc.c b/drivers/thermal/thermal-generic-adc.c +index 73f55d6a1721..ad601e5b4175 100644 +--- a/drivers/thermal/thermal-generic-adc.c ++++ b/drivers/thermal/thermal-generic-adc.c +@@ -26,7 +26,7 @@ struct gadc_thermal_info { + + static int gadc_thermal_adc_to_temp(struct gadc_thermal_info *gti, int val) + { +- int temp, adc_hi, adc_lo; ++ int temp, temp_hi, temp_lo, adc_hi, adc_lo; + int i; + + for (i = 0; i < gti->nlookup_table; i++) { +@@ -36,13 +36,17 @@ static int gadc_thermal_adc_to_temp(struct gadc_thermal_info *gti, int val) + + if (i == 0) { + temp = gti->lookup_table[0]; +- } else if (i >= (gti->nlookup_table - 1)) { ++ } else if (i >= gti->nlookup_table) { + temp = gti->lookup_table[2 * (gti->nlookup_table - 1)]; + } else { + adc_hi = gti->lookup_table[2 * i - 1]; + adc_lo = gti->lookup_table[2 * i + 1]; +- temp = gti->lookup_table[2 * i]; +- temp -= ((val - adc_lo) * 1000) / (adc_hi - adc_lo); ++ ++ temp_hi = gti->lookup_table[2 * i - 2]; ++ temp_lo = gti->lookup_table[2 * i]; ++ ++ temp = temp_hi + mult_frac(temp_lo - temp_hi, val - adc_hi, ++ adc_lo - adc_hi); + } + + return temp; +-- +2.19.1 + diff --git a/queue-4.14/timekeeping-use-proper-seqcount-initializer.patch b/queue-4.14/timekeeping-use-proper-seqcount-initializer.patch new file mode 100644 index 00000000000..cff0a1566eb --- /dev/null +++ b/queue-4.14/timekeeping-use-proper-seqcount-initializer.patch @@ -0,0 +1,45 @@ +From dc3bf866c4770e5af7109da10e5262f936b3f3e2 Mon Sep 17 00:00:00 2001 +From: Bart Van Assche +Date: Wed, 28 Nov 2018 15:43:09 -0800 +Subject: timekeeping: Use proper seqcount initializer + +[ Upstream commit ce10a5b3954f2514af726beb78ed8d7350c5e41c ] + +tk_core.seq is initialized open coded, but that misses to initialize the +lockdep map when lockdep is enabled. Lockdep splats involving tk_core seq +consequently lack a name and are hard to read. + +Use the proper initializer which takes care of the lockdep map +initialization. + +[ tglx: Massaged changelog ] + +Signed-off-by: Bart Van Assche +Signed-off-by: Thomas Gleixner +Cc: peterz@infradead.org +Cc: tj@kernel.org +Cc: johannes.berg@intel.com +Link: https://lkml.kernel.org/r/20181128234325.110011-12-bvanassche@acm.org +Signed-off-by: Sasha Levin +--- + kernel/time/timekeeping.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c +index 2cafb49aa65e..1ce7c404d0b0 100644 +--- a/kernel/time/timekeeping.c ++++ b/kernel/time/timekeeping.c +@@ -41,7 +41,9 @@ + static struct { + seqcount_t seq; + struct timekeeper timekeeper; +-} tk_core ____cacheline_aligned; ++} tk_core ____cacheline_aligned = { ++ .seq = SEQCNT_ZERO(tk_core.seq), ++}; + + static DEFINE_RAW_SPINLOCK(timekeeper_lock); + static struct timekeeper shadow_timekeeper; +-- +2.19.1 + diff --git a/queue-4.14/tools-hv-kvp-fix-a-warning-of-buffer-overflow-with-g.patch b/queue-4.14/tools-hv-kvp-fix-a-warning-of-buffer-overflow-with-g.patch new file mode 100644 index 00000000000..688361f25c0 --- /dev/null +++ b/queue-4.14/tools-hv-kvp-fix-a-warning-of-buffer-overflow-with-g.patch @@ -0,0 +1,65 @@ +From a60633336183a7a32e480faa70cd295f0ab40605 Mon Sep 17 00:00:00 2001 +From: Dexuan Cui +Date: Thu, 18 Oct 2018 05:09:32 +0000 +Subject: Tools: hv: kvp: Fix a warning of buffer overflow with gcc 8.0.1 + +[ Upstream commit 4fcba7802c3e15a6e56e255871d6c72f829b9dd8 ] + +The patch fixes: + +hv_kvp_daemon.c: In function 'kvp_set_ip_info': +hv_kvp_daemon.c:1305:2: note: 'snprintf' output between 41 and 4136 bytes +into a destination of size 4096 + +The "(unsigned int)str_len" is to avoid: + +hv_kvp_daemon.c:1309:30: warning: comparison of integer expressions of +different signedness: 'int' and 'long unsigned int' [-Wsign-compare] + +Signed-off-by: Dexuan Cui +Cc: K. Y. Srinivasan +Cc: Haiyang Zhang +Cc: Stephen Hemminger +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + tools/hv/hv_kvp_daemon.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c +index 3965186b375a..62c9a503ae05 100644 +--- a/tools/hv/hv_kvp_daemon.c ++++ b/tools/hv/hv_kvp_daemon.c +@@ -1172,6 +1172,7 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val) + FILE *file; + char cmd[PATH_MAX]; + char *mac_addr; ++ int str_len; + + /* + * Set the configuration for the specified interface with +@@ -1295,8 +1296,18 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val) + * invoke the external script to do its magic. + */ + +- snprintf(cmd, sizeof(cmd), KVP_SCRIPTS_PATH "%s %s", +- "hv_set_ifconfig", if_file); ++ str_len = snprintf(cmd, sizeof(cmd), KVP_SCRIPTS_PATH "%s %s", ++ "hv_set_ifconfig", if_file); ++ /* ++ * This is a little overcautious, but it's necessary to suppress some ++ * false warnings from gcc 8.0.1. ++ */ ++ if (str_len <= 0 || (unsigned int)str_len >= sizeof(cmd)) { ++ syslog(LOG_ERR, "Cmd '%s' (len=%d) may be too long", ++ cmd, str_len); ++ return HV_E_FAIL; ++ } ++ + if (system(cmd)) { + syslog(LOG_ERR, "Failed to execute cmd '%s'; error: %d %s", + cmd, errno, strerror(errno)); +-- +2.19.1 + diff --git a/queue-4.14/tracing-have-trace_stack-nr_entries-compare-not-be-s.patch b/queue-4.14/tracing-have-trace_stack-nr_entries-compare-not-be-s.patch new file mode 100644 index 00000000000..01630d95bc4 --- /dev/null +++ b/queue-4.14/tracing-have-trace_stack-nr_entries-compare-not-be-s.patch @@ -0,0 +1,65 @@ +From ad41aeaf4dd5895c7f0ab6b438373ee778dfb151 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Wed, 20 Jun 2018 14:08:00 +0300 +Subject: tracing: Have trace_stack nr_entries compare not be so subtle + +[ Upstream commit ca16b0fbb05242f18da9d810c07d3882ffed831c ] + +Dan Carpenter reviewed the trace_stack.c code and figured he found an off by +one bug. + + "From reviewing the code, it seems possible for + stack_trace_max.nr_entries to be set to .max_entries and in that case we + would be reading one element beyond the end of the stack_dump_trace[] + array. If it's not set to .max_entries then the bug doesn't affect + runtime." + +Although it looks to be the case, it is not. Because we have: + + static unsigned long stack_dump_trace[STACK_TRACE_ENTRIES+1] = + { [0 ... (STACK_TRACE_ENTRIES)] = ULONG_MAX }; + + struct stack_trace stack_trace_max = { + .max_entries = STACK_TRACE_ENTRIES - 1, + .entries = &stack_dump_trace[0], + }; + +And: + + stack_trace_max.nr_entries = x; + for (; x < i; x++) + stack_dump_trace[x] = ULONG_MAX; + +Even if nr_entries equals max_entries, indexing with it into the +stack_dump_trace[] array will not overflow the array. But if it is the case, +the second part of the conditional that tests stack_dump_trace[nr_entries] +to ULONG_MAX will always be true. + +By applying Dan's patch, it removes the subtle aspect of it and makes the if +conditional slightly more efficient. + +Link: http://lkml.kernel.org/r/20180620110758.crunhd5bfep7zuiz@kili.mountain + +Signed-off-by: Dan Carpenter +Signed-off-by: Steven Rostedt (VMware) +Signed-off-by: Sasha Levin +--- + kernel/trace/trace_stack.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c +index 719a52a4064a..ba662010542c 100644 +--- a/kernel/trace/trace_stack.c ++++ b/kernel/trace/trace_stack.c +@@ -282,7 +282,7 @@ __next(struct seq_file *m, loff_t *pos) + { + long n = *pos - 1; + +- if (n > stack_trace_max.nr_entries || stack_dump_trace[n] == ULONG_MAX) ++ if (n >= stack_trace_max.nr_entries || stack_dump_trace[n] == ULONG_MAX) + return NULL; + + m->private = (void *)n; +-- +2.19.1 + diff --git a/queue-4.14/tty-serial-samsung-properly-set-flags-in-autocts-mod.patch b/queue-4.14/tty-serial-samsung-properly-set-flags-in-autocts-mod.patch new file mode 100644 index 00000000000..8b9880e8bf1 --- /dev/null +++ b/queue-4.14/tty-serial-samsung-properly-set-flags-in-autocts-mod.patch @@ -0,0 +1,45 @@ +From ea817d796ee5b0d5228077d6598e7dec198a3da6 Mon Sep 17 00:00:00 2001 +From: Beomho Seo +Date: Fri, 14 Dec 2018 12:34:08 +0100 +Subject: tty: serial: samsung: Properly set flags in autoCTS mode + +[ Upstream commit 31e933645742ee6719d37573a27cce0761dcf92b ] + +Commit 391f93f2ec9f ("serial: core: Rework hw-assited flow control support") +has changed the way the autoCTS mode is handled. + +According to that change, serial drivers which enable H/W autoCTS mode must +set UPSTAT_AUTOCTS to prevent the serial core from inadvertently disabling +TX. This patch adds proper handling of UPSTAT_AUTOCTS flag. + +Signed-off-by: Beomho Seo +[mszyprow: rephrased commit message] +Signed-off-by: Marek Szyprowski +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/samsung.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c +index 57baa84ccf86..f4b8e4e17a86 100644 +--- a/drivers/tty/serial/samsung.c ++++ b/drivers/tty/serial/samsung.c +@@ -1343,11 +1343,14 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, + wr_regl(port, S3C2410_ULCON, ulcon); + wr_regl(port, S3C2410_UBRDIV, quot); + ++ port->status &= ~UPSTAT_AUTOCTS; ++ + umcon = rd_regl(port, S3C2410_UMCON); + if (termios->c_cflag & CRTSCTS) { + umcon |= S3C2410_UMCOM_AFC; + /* Disable RTS when RX FIFO contains 63 bytes */ + umcon &= ~S3C2412_UMCON_AFC_8; ++ port->status = UPSTAT_AUTOCTS; + } else { + umcon &= ~S3C2410_UMCOM_AFC; + } +-- +2.19.1 + diff --git a/queue-4.14/udf-fix-bug-on-corrupted-inode.patch b/queue-4.14/udf-fix-bug-on-corrupted-inode.patch new file mode 100644 index 00000000000..055117e2659 --- /dev/null +++ b/queue-4.14/udf-fix-bug-on-corrupted-inode.patch @@ -0,0 +1,38 @@ +From 3acd7f170510132873ad093946bb28356259aa02 Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Wed, 12 Dec 2018 14:29:20 +0100 +Subject: udf: Fix BUG on corrupted inode + +[ Upstream commit d288d95842f1503414b7eebce3773bac3390457e ] + +When inode is corrupted so that extent type is invalid, some functions +(such as udf_truncate_extents()) will just BUG. Check that extent type +is valid when loading the inode to memory. + +Reported-by: Anatoly Trosinenko +Signed-off-by: Jan Kara +Signed-off-by: Sasha Levin +--- + fs/udf/inode.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/fs/udf/inode.c b/fs/udf/inode.c +index 8dacf4f57414..28b9d7cca29b 100644 +--- a/fs/udf/inode.c ++++ b/fs/udf/inode.c +@@ -1357,6 +1357,12 @@ reread: + + iinfo->i_alloc_type = le16_to_cpu(fe->icbTag.flags) & + ICBTAG_FLAG_AD_MASK; ++ if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_SHORT && ++ iinfo->i_alloc_type != ICBTAG_FLAG_AD_LONG && ++ iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) { ++ ret = -EIO; ++ goto out; ++ } + iinfo->i_unique = 0; + iinfo->i_lenEAttr = 0; + iinfo->i_lenExtents = 0; +-- +2.19.1 + diff --git a/queue-4.14/um-avoid-marking-pages-with-changed-protection.patch b/queue-4.14/um-avoid-marking-pages-with-changed-protection.patch new file mode 100644 index 00000000000..1bb2b0b9148 --- /dev/null +++ b/queue-4.14/um-avoid-marking-pages-with-changed-protection.patch @@ -0,0 +1,56 @@ +From 81fae484f15758662e213560c3c950ef1020edab Mon Sep 17 00:00:00 2001 +From: Anton Ivanov +Date: Wed, 5 Dec 2018 12:37:41 +0000 +Subject: um: Avoid marking pages with "changed protection" + +[ Upstream commit 8892d8545f2d0342b9c550defbfb165db237044b ] + +Changing protection is a very high cost operation in UML +because in addition to an extra syscall it also interrupts +mmap merge sequences generated by the tlb. + +While the condition is not particularly common it is worth +avoiding. + +Signed-off-by: Anton Ivanov +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + arch/um/include/asm/pgtable.h | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/arch/um/include/asm/pgtable.h b/arch/um/include/asm/pgtable.h +index 7485398d0737..9c04562310b3 100644 +--- a/arch/um/include/asm/pgtable.h ++++ b/arch/um/include/asm/pgtable.h +@@ -197,12 +197,17 @@ static inline pte_t pte_mkold(pte_t pte) + + static inline pte_t pte_wrprotect(pte_t pte) + { +- pte_clear_bits(pte, _PAGE_RW); ++ if (likely(pte_get_bits(pte, _PAGE_RW))) ++ pte_clear_bits(pte, _PAGE_RW); ++ else ++ return pte; + return(pte_mknewprot(pte)); + } + + static inline pte_t pte_mkread(pte_t pte) + { ++ if (unlikely(pte_get_bits(pte, _PAGE_USER))) ++ return pte; + pte_set_bits(pte, _PAGE_USER); + return(pte_mknewprot(pte)); + } +@@ -221,6 +226,8 @@ static inline pte_t pte_mkyoung(pte_t pte) + + static inline pte_t pte_mkwrite(pte_t pte) + { ++ if (unlikely(pte_get_bits(pte, _PAGE_RW))) ++ return pte; + pte_set_bits(pte, _PAGE_RW); + return(pte_mknewprot(pte)); + } +-- +2.19.1 + diff --git a/queue-4.14/usb-dwc3-correct-the-logic-for-checking-trb-full-in-.patch b/queue-4.14/usb-dwc3-correct-the-logic-for-checking-trb-full-in-.patch new file mode 100644 index 00000000000..29f302aaea3 --- /dev/null +++ b/queue-4.14/usb-dwc3-correct-the-logic-for-checking-trb-full-in-.patch @@ -0,0 +1,74 @@ +From 8c6635836e271c9f899dedbcc09d898d4330fada Mon Sep 17 00:00:00 2001 +From: Anurag Kumar Vulisha +Date: Sat, 1 Dec 2018 16:43:29 +0530 +Subject: usb: dwc3: Correct the logic for checking TRB full in + __dwc3_prepare_one_trb() + +[ Upstream commit b7a4fbe2300a8965ea760c7e871507b84aea17f6 ] + +Availability of TRB's is calculated using dwc3_calc_trbs_left(), which +determines total available TRB's based on the HWO bit set in a TRB. + +In the present code, __dwc3_prepare_one_trb() is called with a TRB which +needs to be prepared for transfer. This __dwc3_prepare_one_trb() calls +dwc3_calc_trbs_left() to determine total available TRBs and set IOC bit +if the total available TRBs are zero. Since the present working TRB (which +is passed as an argument to __dwc3_prepare_one_trb() ) doesn't yet have +the HWO bit set before calling dwc3_calc_trbs_left(), there are chances +that dwc3_calc_trbs_left() wrongly calculates this present working TRB +as free(since the HWO bit is not yet set) and returns the total available +TRBs as greater than zero (including the present working TRB). This could +be a problem. + +This patch corrects the above mentioned problem in __dwc3_prepare_one_trb() +by increementing the dep->trb_enqueue at the last (after preparing the TRB) +instead of increementing at the start and setting the IOC bit only if the +total available TRBs returned by dwc3_calc_trbs_left() is 1 . Since we are +increementing the dep->trb_enqueue at the last, the present working TRB is +also considered as available by dwc3_calc_trbs_left() and non zero value is +returned . So, according to the modified logic, when the total available +TRBs is equal to 1 that means the total available TRBs in the pool are 0. + +Signed-off-by: Anurag Kumar Vulisha +Reviewed-by: Thinh Nguyen +Tested-by: Tejas Joglekar +Signed-off-by: Felipe Balbi +Signed-off-by: Sasha Levin +--- + drivers/usb/dwc3/gadget.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c +index 727bf3c9f53b..b80eefa355b6 100644 +--- a/drivers/usb/dwc3/gadget.c ++++ b/drivers/usb/dwc3/gadget.c +@@ -890,8 +890,6 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, + struct usb_gadget *gadget = &dwc->gadget; + enum usb_device_speed speed = gadget->speed; + +- dwc3_ep_inc_enq(dep); +- + trb->size = DWC3_TRB_SIZE_LENGTH(length); + trb->bpl = lower_32_bits(dma); + trb->bph = upper_32_bits(dma); +@@ -970,7 +968,7 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, + } + + if ((!no_interrupt && !chain) || +- (dwc3_calc_trbs_left(dep) == 0)) ++ (dwc3_calc_trbs_left(dep) == 1)) + trb->ctrl |= DWC3_TRB_CTRL_IOC; + + if (chain) +@@ -981,6 +979,8 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, + + trb->ctrl |= DWC3_TRB_CTRL_HWO; + ++ dwc3_ep_inc_enq(dep); ++ + trace_dwc3_prepare_trb(dep, trb); + } + +-- +2.19.1 + diff --git a/queue-4.14/usb-dwc3-gadget-disable-csp-for-stream-out-ep.patch b/queue-4.14/usb-dwc3-gadget-disable-csp-for-stream-out-ep.patch new file mode 100644 index 00000000000..a61e18f9226 --- /dev/null +++ b/queue-4.14/usb-dwc3-gadget-disable-csp-for-stream-out-ep.patch @@ -0,0 +1,50 @@ +From 244bfa60f942ed45d32c9637faf8762c430e0903 Mon Sep 17 00:00:00 2001 +From: Tejas Joglekar +Date: Mon, 10 Dec 2018 16:08:13 +0530 +Subject: usb: dwc3: gadget: Disable CSP for stream OUT ep + +[ Upstream commit 244add8ebfb231c39db9e33b204bd0ce8f24f782 ] + +In stream mode, when fast-forwarding TRBs, the stream number +is not cleared causing the new stream to not get assigned. So +we don't want controller to carry on transfers when short packet +is received. So disable the CSP for stream capable endpoint. + +This is based on the 3.30a Programming guide, where table 3-1 +device descriptor structure field definitions says for CSP bit +If this bit is 0, the controller generates an XferComplete event +and remove the stream. So if we keep CSP as 1 then switching between +streams would not happen as in stream mode, when fast-forwarding +TRBs, the stream number is not cleared causing the new stream to not get +assigned. + +Signed-off-by: Tejas Joglekar +Signed-off-by: Felipe Balbi +Signed-off-by: Sasha Levin +--- + drivers/usb/dwc3/gadget.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c +index b80eefa355b6..5b34994b7b08 100644 +--- a/drivers/usb/dwc3/gadget.c ++++ b/drivers/usb/dwc3/gadget.c +@@ -959,9 +959,13 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, + usb_endpoint_type(dep->endpoint.desc)); + } + +- /* always enable Continue on Short Packet */ ++ /* ++ * Enable Continue on Short Packet ++ * when endpoint is not a stream capable ++ */ + if (usb_endpoint_dir_out(dep->endpoint.desc)) { +- trb->ctrl |= DWC3_TRB_CTRL_CSP; ++ if (!dep->stream_capable) ++ trb->ctrl |= DWC3_TRB_CTRL_CSP; + + if (short_not_ok) + trb->ctrl |= DWC3_TRB_CTRL_ISP_IMI; +-- +2.19.1 + diff --git a/queue-4.14/usb-dwc3-trace-add-missing-break-statement-to-make-c.patch b/queue-4.14/usb-dwc3-trace-add-missing-break-statement-to-make-c.patch new file mode 100644 index 00000000000..0f2d658af7b --- /dev/null +++ b/queue-4.14/usb-dwc3-trace-add-missing-break-statement-to-make-c.patch @@ -0,0 +1,51 @@ +From 6f360f5a21efab9c3258d3465dd4a9f2d845be1d Mon Sep 17 00:00:00 2001 +From: Andy Shevchenko +Date: Mon, 3 Dec 2018 11:28:47 +0200 +Subject: usb: dwc3: trace: add missing break statement to make compiler happy +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[ Upstream commit 54d48183d21e03f780053d7129312049cb5dd591 ] + +The missed break statement in the outer switch makes the code fall through +always and thus always same value will be printed. + +Besides that, compiler warns about missed fall through marker: + +drivers/usb/dwc3/./trace.h: In function ‘trace_raw_output_dwc3_log_trb’: +drivers/usb/dwc3/./trace.h:246:4: warning: this statement may fall through [-Wimplicit-fallthrough=] + switch (pcm) { + ^~~~~~ + +Add the missing break statement to work correctly without compilation +warnings. + +Fixes: fa8d965d736b ("usb: dwc3: trace: pretty print high-bandwidth transfers too") +Cc: Felipe Balbi +Signed-off-by: Andy Shevchenko +Signed-off-by: Felipe Balbi +Signed-off-by: Sasha Levin +--- + drivers/usb/dwc3/trace.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/usb/dwc3/trace.h b/drivers/usb/dwc3/trace.h +index 6504b116da04..62ec20a26013 100644 +--- a/drivers/usb/dwc3/trace.h ++++ b/drivers/usb/dwc3/trace.h +@@ -262,9 +262,11 @@ DECLARE_EVENT_CLASS(dwc3_log_trb, + s = "2x "; + break; + case 3: ++ default: + s = "3x "; + break; + } ++ break; + default: + s = ""; + } s; }), +-- +2.19.1 + diff --git a/queue-4.14/usb-hub-delay-hub-autosuspend-if-usb3-port-is-still-.patch b/queue-4.14/usb-hub-delay-hub-autosuspend-if-usb3-port-is-still-.patch new file mode 100644 index 00000000000..31f552de4a9 --- /dev/null +++ b/queue-4.14/usb-hub-delay-hub-autosuspend-if-usb3-port-is-still-.patch @@ -0,0 +1,49 @@ +From d73a84fd26bfb54138a6da599e17dbc05f66bfbd Mon Sep 17 00:00:00 2001 +From: Mathias Nyman +Date: Wed, 28 Nov 2018 15:55:21 +0200 +Subject: usb: hub: delay hub autosuspend if USB3 port is still link training + +[ Upstream commit e86108940e541febf35813402ff29fa6f4a9ac0b ] + +When initializing a hub we want to give a USB3 port in link training +the same debounce delay time before autosuspening the hub as already +trained, connected enabled ports. + +USB3 ports won't reach the enabled state with "current connect status" and +"connect status change" bits set until the USB3 link training finishes. + +Catching the port in link training (polling) and adding the debounce delay +prevents unnecessary failed attempts to autosuspend the hub. + +Signed-off-by: Mathias Nyman +Acked-by: Alan Stern +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/core/hub.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c +index a073cb5be013..4a4e666a8e09 100644 +--- a/drivers/usb/core/hub.c ++++ b/drivers/usb/core/hub.c +@@ -1110,6 +1110,16 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) + USB_PORT_FEAT_ENABLE); + } + ++ /* ++ * Add debounce if USB3 link is in polling/link training state. ++ * Link will automatically transition to Enabled state after ++ * link training completes. ++ */ ++ if (hub_is_superspeed(hdev) && ++ ((portstatus & USB_PORT_STAT_LINK_STATE) == ++ USB_SS_PORT_LS_POLLING)) ++ need_debounce_delay = true; ++ + /* Clear status-change flags; we'll debounce later */ + if (portchange & USB_PORT_STAT_C_CONNECTION) { + need_debounce_delay = true; +-- +2.19.1 + diff --git a/queue-4.14/usb-mtu3-fix-the-issue-about-setfeature-u1-u2_enable.patch b/queue-4.14/usb-mtu3-fix-the-issue-about-setfeature-u1-u2_enable.patch new file mode 100644 index 00000000000..8019b51556b --- /dev/null +++ b/queue-4.14/usb-mtu3-fix-the-issue-about-setfeature-u1-u2_enable.patch @@ -0,0 +1,68 @@ +From aabf339e94eb6fdd6d73f6a5d4324f3fcb87abbf Mon Sep 17 00:00:00 2001 +From: Chunfeng Yun +Date: Thu, 29 Nov 2018 10:34:34 +0800 +Subject: usb: mtu3: fix the issue about SetFeature(U1/U2_Enable) + +[ Upstream commit a0678e2eed41e81004308693ac84ea95614b0920 ] + +Fix the issue: device doesn't accept LGO_U1/U2: +1. set SW_U1/U2_ACCEPT_ENABLE to eanble controller to accept LGO_U1/U2 + by default; +2. enable/disable controller to initiate requests for transition into + U1/U2 by SW_U1/U2_REQUEST_ENABLE instead of SW_U1/U2_ACCEPT_ENABLE; + +Signed-off-by: Chunfeng Yun +Signed-off-by: Felipe Balbi +Signed-off-by: Sasha Levin +--- + drivers/usb/mtu3/mtu3_core.c | 4 +++- + drivers/usb/mtu3/mtu3_gadget_ep0.c | 8 ++++---- + 2 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/drivers/usb/mtu3/mtu3_core.c b/drivers/usb/mtu3/mtu3_core.c +index 947579842ad7..95978e3b363e 100644 +--- a/drivers/usb/mtu3/mtu3_core.c ++++ b/drivers/usb/mtu3/mtu3_core.c +@@ -564,8 +564,10 @@ static void mtu3_regs_init(struct mtu3 *mtu) + if (mtu->is_u3_ip) { + /* disable LGO_U1/U2 by default */ + mtu3_clrbits(mbase, U3D_LINK_POWER_CONTROL, +- SW_U1_ACCEPT_ENABLE | SW_U2_ACCEPT_ENABLE | + SW_U1_REQUEST_ENABLE | SW_U2_REQUEST_ENABLE); ++ /* enable accept LGO_U1/U2 link command from host */ ++ mtu3_setbits(mbase, U3D_LINK_POWER_CONTROL, ++ SW_U1_ACCEPT_ENABLE | SW_U2_ACCEPT_ENABLE); + /* device responses to u3_exit from host automatically */ + mtu3_clrbits(mbase, U3D_LTSSM_CTRL, SOFT_U3_EXIT_EN); + /* automatically build U2 link when U3 detect fail */ +diff --git a/drivers/usb/mtu3/mtu3_gadget_ep0.c b/drivers/usb/mtu3/mtu3_gadget_ep0.c +index 958d74dd2b78..7997cf5f06fc 100644 +--- a/drivers/usb/mtu3/mtu3_gadget_ep0.c ++++ b/drivers/usb/mtu3/mtu3_gadget_ep0.c +@@ -335,9 +335,9 @@ static int ep0_handle_feature_dev(struct mtu3 *mtu, + + lpc = mtu3_readl(mbase, U3D_LINK_POWER_CONTROL); + if (set) +- lpc |= SW_U1_ACCEPT_ENABLE; ++ lpc |= SW_U1_REQUEST_ENABLE; + else +- lpc &= ~SW_U1_ACCEPT_ENABLE; ++ lpc &= ~SW_U1_REQUEST_ENABLE; + mtu3_writel(mbase, U3D_LINK_POWER_CONTROL, lpc); + + mtu->u1_enable = !!set; +@@ -350,9 +350,9 @@ static int ep0_handle_feature_dev(struct mtu3 *mtu, + + lpc = mtu3_readl(mbase, U3D_LINK_POWER_CONTROL); + if (set) +- lpc |= SW_U2_ACCEPT_ENABLE; ++ lpc |= SW_U2_REQUEST_ENABLE; + else +- lpc &= ~SW_U2_ACCEPT_ENABLE; ++ lpc &= ~SW_U2_REQUEST_ENABLE; + mtu3_writel(mbase, U3D_LINK_POWER_CONTROL, lpc); + + mtu->u2_enable = !!set; +-- +2.19.1 + diff --git a/queue-4.14/usb-musb-dsps-fix-otg-state-machine.patch b/queue-4.14/usb-musb-dsps-fix-otg-state-machine.patch new file mode 100644 index 00000000000..3b2af05b430 --- /dev/null +++ b/queue-4.14/usb-musb-dsps-fix-otg-state-machine.patch @@ -0,0 +1,51 @@ +From f9c5ed985271b0573afc49ee9bf334e76fce912d Mon Sep 17 00:00:00 2001 +From: Bin Liu +Date: Tue, 18 Dec 2018 07:58:04 -0600 +Subject: usb: musb: dsps: fix otg state machine + +[ Upstream commit 6010abf2c2c0e382d7e8ee44bd11f343aae90cce ] + +Due to lack of ID pin interrupt event on AM335x devices, the musb dsps +driver uses polling to detect usb device attach for dual-role port. + +But in the case if a micro-A cable adapter is attached without a USB device +attached to the cable, the musb state machine gets stuck in a_wait_vrise +state waiting for the MUSB_CONNECT interrupt which won't happen due to the +usb device is not attached. The state is stuck in a_wait_vrise even after +the micro-A cable is detached, which could cause VBUS retention if then the +dual-role port is attached to a host port. + +To fix the problem, make a_wait_vrise as a transient state, then move the +state to either a_wait_bcon for host port or a_idle state for dual-role +port, if no usb device is attached to the port. + +Signed-off-by: Bin Liu +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/musb/musb_dsps.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c +index dbb482b7e0ba..b7d460adaa61 100644 +--- a/drivers/usb/musb/musb_dsps.c ++++ b/drivers/usb/musb/musb_dsps.c +@@ -242,8 +242,13 @@ static int dsps_check_status(struct musb *musb, void *unused) + + switch (musb->xceiv->otg->state) { + case OTG_STATE_A_WAIT_VRISE: +- dsps_mod_timer_optional(glue); +- break; ++ if (musb->port_mode == MUSB_HOST) { ++ musb->xceiv->otg->state = OTG_STATE_A_WAIT_BCON; ++ dsps_mod_timer_optional(glue); ++ break; ++ } ++ /* fall through */ ++ + case OTG_STATE_A_WAIT_BCON: + /* keep VBUS on for host-only mode */ + if (musb->port_mode == MUSB_PORT_MODE_HOST) { +-- +2.19.1 + diff --git a/queue-4.14/usbnet-smsc95xx-fix-rx-packet-alignment.patch b/queue-4.14/usbnet-smsc95xx-fix-rx-packet-alignment.patch new file mode 100644 index 00000000000..0f227182fa0 --- /dev/null +++ b/queue-4.14/usbnet-smsc95xx-fix-rx-packet-alignment.patch @@ -0,0 +1,39 @@ +From 7a957c8733db86971f49f0172219dc2bb36cd8bb Mon Sep 17 00:00:00 2001 +From: Ben Dooks +Date: Wed, 14 Nov 2018 11:50:19 +0000 +Subject: usbnet: smsc95xx: fix rx packet alignment + +[ Upstream commit 810eeb1f41a9a272eedc94ca18c072e75678ede4 ] + +The smsc95xx driver already takes into account the NET_IP_ALIGN +parameter when setting up the receive packet data, which means +we do not need to worry about aligning the packets in the usbnet +driver. + +Adding the EVENT_NO_IP_ALIGN means that the IPv4 header is now +passed to the ip_rcv() routine with the start on an aligned address. + +Tested on Raspberry Pi B3. + +Signed-off-by: Ben Dooks +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/usb/smsc95xx.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c +index 2f65975a121f..fc48da1c702d 100644 +--- a/drivers/net/usb/smsc95xx.c ++++ b/drivers/net/usb/smsc95xx.c +@@ -1295,6 +1295,7 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf) + dev->net->features |= NETIF_F_RXCSUM; + + dev->net->hw_features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM; ++ set_bit(EVENT_NO_IP_ALIGN, &dev->flags); + + smsc95xx_init_mac_address(dev); + +-- +2.19.1 + diff --git a/queue-4.14/video-clps711x-fb-release-disp-device-node-in-probe.patch b/queue-4.14/video-clps711x-fb-release-disp-device-node-in-probe.patch new file mode 100644 index 00000000000..0a43088928c --- /dev/null +++ b/queue-4.14/video-clps711x-fb-release-disp-device-node-in-probe.patch @@ -0,0 +1,47 @@ +From 17355a855011e70cdda40188eb26f3022d89f5e0 Mon Sep 17 00:00:00 2001 +From: Alexey Khoroshilov +Date: Thu, 20 Dec 2018 19:13:07 +0100 +Subject: video: clps711x-fb: release disp device node in probe() + +[ Upstream commit fdac751355cd76e049f628afe6acb8ff4b1399f7 ] + +clps711x_fb_probe() increments refcnt of disp device node by +of_parse_phandle() and leaves it undecremented on both +successful and error paths. + +Found by Linux Driver Verification project (linuxtesting.org). + +Signed-off-by: Alexey Khoroshilov +Cc: Alexander Shiyan +Signed-off-by: Bartlomiej Zolnierkiewicz +Signed-off-by: Sasha Levin +--- + drivers/video/fbdev/clps711x-fb.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/video/fbdev/clps711x-fb.c b/drivers/video/fbdev/clps711x-fb.c +index ff561073ee4e..42f909618f04 100644 +--- a/drivers/video/fbdev/clps711x-fb.c ++++ b/drivers/video/fbdev/clps711x-fb.c +@@ -287,14 +287,17 @@ static int clps711x_fb_probe(struct platform_device *pdev) + } + + ret = of_get_fb_videomode(disp, &cfb->mode, OF_USE_NATIVE_MODE); +- if (ret) ++ if (ret) { ++ of_node_put(disp); + goto out_fb_release; ++ } + + of_property_read_u32(disp, "ac-prescale", &cfb->ac_prescale); + cfb->cmap_invert = of_property_read_bool(disp, "cmap-invert"); + + ret = of_property_read_u32(disp, "bits-per-pixel", + &info->var.bits_per_pixel); ++ of_node_put(disp); + if (ret) + goto out_fb_release; + +-- +2.19.1 + diff --git a/queue-4.14/watchdog-renesas_wdt-don-t-set-divider-while-watchdo.patch b/queue-4.14/watchdog-renesas_wdt-don-t-set-divider-while-watchdo.patch new file mode 100644 index 00000000000..5e83a4a507f --- /dev/null +++ b/queue-4.14/watchdog-renesas_wdt-don-t-set-divider-while-watchdo.patch @@ -0,0 +1,48 @@ +From f512cc4573621012c715aa330ae4c31a6431dc36 Mon Sep 17 00:00:00 2001 +From: Wolfram Sang +Date: Wed, 7 Nov 2018 20:46:02 +0100 +Subject: watchdog: renesas_wdt: don't set divider while watchdog is running + +[ Upstream commit e990e12741877e9bfac402ca468f4007a75f6e2a ] + +The datasheet says we must stop the timer before changing the clock +divider. This can happen when the restart handler is called while the +watchdog is running. + +Signed-off-by: Wolfram Sang +Reviewed-by: Fabrizio Castro +Reviewed-by: Guenter Roeck +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck +Signed-off-by: Sasha Levin +--- + drivers/watchdog/renesas_wdt.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/drivers/watchdog/renesas_wdt.c b/drivers/watchdog/renesas_wdt.c +index 831ef83f6de1..c4a17d72d025 100644 +--- a/drivers/watchdog/renesas_wdt.c ++++ b/drivers/watchdog/renesas_wdt.c +@@ -74,12 +74,17 @@ static int rwdt_init_timeout(struct watchdog_device *wdev) + static int rwdt_start(struct watchdog_device *wdev) + { + struct rwdt_priv *priv = watchdog_get_drvdata(wdev); ++ u8 val; + + pm_runtime_get_sync(wdev->parent); + +- rwdt_write(priv, 0, RWTCSRB); +- rwdt_write(priv, priv->cks, RWTCSRA); ++ /* Stop the timer before we modify any register */ ++ val = readb_relaxed(priv->base + RWTCSRA) & ~RWTCSRA_TME; ++ rwdt_write(priv, val, RWTCSRA); ++ + rwdt_init_timeout(wdev); ++ rwdt_write(priv, priv->cks, RWTCSRA); ++ rwdt_write(priv, 0, RWTCSRB); + + while (readb_relaxed(priv->base + RWTCSRA) & RWTCSRA_WRFLG) + cpu_relax(); +-- +2.19.1 + diff --git a/queue-4.14/x86-fpu-add-might_fault-to-user_insn.patch b/queue-4.14/x86-fpu-add-might_fault-to-user_insn.patch new file mode 100644 index 00000000000..a12550a146b --- /dev/null +++ b/queue-4.14/x86-fpu-add-might_fault-to-user_insn.patch @@ -0,0 +1,54 @@ +From 7fb467eea89a962d3f822b9bdc2201cca2b4bb88 Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior +Date: Wed, 28 Nov 2018 23:20:11 +0100 +Subject: x86/fpu: Add might_fault() to user_insn() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[ Upstream commit 6637401c35b2f327a35d27f44bda05e327f2f017 ] + +Every user of user_insn() passes an user memory pointer to this macro. + +Add might_fault() to user_insn() so we can spot users which are using +this macro in sections where page faulting is not allowed. + + [ bp: Space it out to make it more visible. ] + +Signed-off-by: Sebastian Andrzej Siewior +Signed-off-by: Borislav Petkov +Reviewed-by: Rik van Riel +Cc: "H. Peter Anvin" +Cc: "Jason A. Donenfeld" +Cc: Andy Lutomirski +Cc: Dave Hansen +Cc: Ingo Molnar +Cc: Jann Horn +Cc: Paolo Bonzini +Cc: Radim Krčmář +Cc: Thomas Gleixner +Cc: kvm ML +Cc: x86-ml +Link: https://lkml.kernel.org/r/20181128222035.2996-6-bigeasy@linutronix.de +Signed-off-by: Sasha Levin +--- + arch/x86/include/asm/fpu/internal.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/arch/x86/include/asm/fpu/internal.h b/arch/x86/include/asm/fpu/internal.h +index 69dcdf195b61..fa2c93cb42a2 100644 +--- a/arch/x86/include/asm/fpu/internal.h ++++ b/arch/x86/include/asm/fpu/internal.h +@@ -106,6 +106,9 @@ extern void fpstate_sanitize_xstate(struct fpu *fpu); + #define user_insn(insn, output, input...) \ + ({ \ + int err; \ ++ \ ++ might_fault(); \ ++ \ + asm volatile(ASM_STAC "\n" \ + "1:" #insn "\n\t" \ + "2: " ASM_CLAC "\n" \ +-- +2.19.1 + diff --git a/queue-4.14/x86-pci-fix-broadcom-cnb20le-unintended-sign-extensi.patch b/queue-4.14/x86-pci-fix-broadcom-cnb20le-unintended-sign-extensi.patch new file mode 100644 index 00000000000..ddf196538a2 --- /dev/null +++ b/queue-4.14/x86-pci-fix-broadcom-cnb20le-unintended-sign-extensi.patch @@ -0,0 +1,42 @@ +From beff4c8e85ee5550f1dc4e711eefa8fb669eecb9 Mon Sep 17 00:00:00 2001 +From: Colin Ian King +Date: Thu, 25 Oct 2018 14:52:31 +0100 +Subject: x86/PCI: Fix Broadcom CNB20LE unintended sign extension (redux) + +[ Upstream commit 53bb565fc5439f2c8c57a786feea5946804aa3e9 ] + +In the expression "word1 << 16", word1 starts as u16, but is promoted to a +signed int, then sign-extended to resource_size_t, which is probably not +what was intended. Cast to resource_size_t to avoid the sign extension. + +This fixes an identical issue as fixed by commit 0b2d70764bb3 ("x86/PCI: +Fix Broadcom CNB20LE unintended sign extension") back in 2014. + +Detected by CoverityScan, CID#138749, 138750 ("Unintended sign extension") + +Fixes: 3f6ea84a3035 ("PCI: read memory ranges out of Broadcom CNB20LE host bridge") +Signed-off-by: Colin Ian King +Signed-off-by: Bjorn Helgaas +Signed-off-by: Sasha Levin +--- + arch/x86/pci/broadcom_bus.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/x86/pci/broadcom_bus.c b/arch/x86/pci/broadcom_bus.c +index 526536c81ddc..ca1e8e6dccc8 100644 +--- a/arch/x86/pci/broadcom_bus.c ++++ b/arch/x86/pci/broadcom_bus.c +@@ -50,8 +50,8 @@ static void __init cnb20le_res(u8 bus, u8 slot, u8 func) + word1 = read_pci_config_16(bus, slot, func, 0xc0); + word2 = read_pci_config_16(bus, slot, func, 0xc2); + if (word1 != word2) { +- res.start = (word1 << 16) | 0x0000; +- res.end = (word2 << 16) | 0xffff; ++ res.start = ((resource_size_t) word1 << 16) | 0x0000; ++ res.end = ((resource_size_t) word2 << 16) | 0xffff; + res.flags = IORESOURCE_MEM; + update_res(info, res.start, res.end, res.flags, 0); + } +-- +2.19.1 + diff --git a/queue-4.14/xfrm6_tunnel-fix-spi-check-in-__xfrm6_tunnel_alloc_s.patch b/queue-4.14/xfrm6_tunnel-fix-spi-check-in-__xfrm6_tunnel_alloc_s.patch new file mode 100644 index 00000000000..c6e4237b837 --- /dev/null +++ b/queue-4.14/xfrm6_tunnel-fix-spi-check-in-__xfrm6_tunnel_alloc_s.patch @@ -0,0 +1,39 @@ +From 3ed84bf025fb60d82306d68259e42badd77b2b3c Mon Sep 17 00:00:00 2001 +From: YueHaibing +Date: Wed, 19 Dec 2018 14:45:09 +0800 +Subject: xfrm6_tunnel: Fix spi check in __xfrm6_tunnel_alloc_spi + +[ Upstream commit fa89a4593b927b3f59c3b69379f31d3b22272e4e ] + +gcc warn this: + +net/ipv6/xfrm6_tunnel.c:143 __xfrm6_tunnel_alloc_spi() warn: + always true condition '(spi <= 4294967295) => (0-u32max <= u32max)' + +'spi' is u32, which always not greater than XFRM6_TUNNEL_SPI_MAX +because of wrap around. So the second forloop will never reach. + +Signed-off-by: YueHaibing +Signed-off-by: Steffen Klassert +Signed-off-by: Sasha Levin +--- + net/ipv6/xfrm6_tunnel.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c +index 4e438bc7ee87..c28e3eaad7c2 100644 +--- a/net/ipv6/xfrm6_tunnel.c ++++ b/net/ipv6/xfrm6_tunnel.c +@@ -144,6 +144,9 @@ static u32 __xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr) + index = __xfrm6_tunnel_spi_check(net, spi); + if (index >= 0) + goto alloc_spi; ++ ++ if (spi == XFRM6_TUNNEL_SPI_MAX) ++ break; + } + for (spi = XFRM6_TUNNEL_SPI_MIN; spi < xfrm6_tn->spi; spi++) { + index = __xfrm6_tunnel_spi_check(net, spi); +-- +2.19.1 +