From: Sasha Levin Date: Fri, 22 Nov 2019 06:51:08 +0000 (-0500) Subject: fixes for 4.14 X-Git-Tag: v5.3.13~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c12fdcf3f5f26ecc4a5445c46df0abbf22d458f8;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 4.14 Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/acpi-sbs-fix-rare-oops-when-removing-modules.patch b/queue-4.14/acpi-sbs-fix-rare-oops-when-removing-modules.patch new file mode 100644 index 00000000000..c8ff1cc71ee --- /dev/null +++ b/queue-4.14/acpi-sbs-fix-rare-oops-when-removing-modules.patch @@ -0,0 +1,66 @@ +From 83a54df960e51038c7eeff4774e071d8518dd512 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 30 Sep 2018 19:53:13 -0700 +Subject: ACPI / SBS: Fix rare oops when removing modules +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ronald Tschalär + +[ Upstream commit 757c968c442397f1249bb775a7c8c03842e3e0c7 ] + +There was a small race when removing the sbshc module where +smbus_alarm() had queued acpi_smbus_callback() for deferred execution +but it hadn't been run yet, so that when it did run hc had been freed +and the module unloaded, resulting in an invalid paging request. + +A similar race existed when removing the sbs module with regards to +acpi_sbs_callback() (which is called from acpi_smbus_callback()). + +We therefore need to ensure no callbacks are pending or executing before +the cleanups are done and the modules are removed. + +Signed-off-by: Ronald Tschalär +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/osl.c | 1 + + drivers/acpi/sbshc.c | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c +index 191e86c62037a..9da7e7d874bd8 100644 +--- a/drivers/acpi/osl.c ++++ b/drivers/acpi/osl.c +@@ -1116,6 +1116,7 @@ void acpi_os_wait_events_complete(void) + flush_workqueue(kacpid_wq); + flush_workqueue(kacpi_notify_wq); + } ++EXPORT_SYMBOL(acpi_os_wait_events_complete); + + struct acpi_hp_work { + struct work_struct work; +diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c +index 7a3431018e0ab..5008ead4609a4 100644 +--- a/drivers/acpi/sbshc.c ++++ b/drivers/acpi/sbshc.c +@@ -196,6 +196,7 @@ int acpi_smbus_unregister_callback(struct acpi_smb_hc *hc) + hc->callback = NULL; + hc->context = NULL; + mutex_unlock(&hc->lock); ++ acpi_os_wait_events_complete(); + return 0; + } + +@@ -292,6 +293,7 @@ static int acpi_smbus_hc_remove(struct acpi_device *device) + + hc = acpi_driver_data(device); + acpi_ec_remove_query_handler(hc->ec, hc->query_bit); ++ acpi_os_wait_events_complete(); + kfree(hc); + device->driver_data = NULL; + return 0; +-- +2.20.1 + diff --git a/queue-4.14/acpica-never-run-_reg-on-system_memory-and-system_io.patch b/queue-4.14/acpica-never-run-_reg-on-system_memory-and-system_io.patch new file mode 100644 index 00000000000..92d8c9bd60c --- /dev/null +++ b/queue-4.14/acpica-never-run-_reg-on-system_memory-and-system_io.patch @@ -0,0 +1,134 @@ +From 5032309f11c8274c6f597713fc29cf2c3c9245b8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Oct 2018 11:45:38 -0700 +Subject: ACPICA: Never run _REG on system_memory and system_IO + +From: Bob Moore + +[ Upstream commit 8b1cafdcb4b75c5027c52f1e82b47ebe727ad7ed ] + +These address spaces are defined by the ACPI spec to be +"always available", and thus _REG should never be run on them. +Provides compatibility with other ACPI implementations. + +Signed-off-by: Bob Moore +Signed-off-by: Erik Schmauss +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/acpica/acevents.h | 2 ++ + drivers/acpi/acpica/aclocal.h | 2 +- + drivers/acpi/acpica/evregion.c | 17 +++++++++++++++-- + drivers/acpi/acpica/evrgnini.c | 6 +----- + drivers/acpi/acpica/evxfregn.c | 1 - + 5 files changed, 19 insertions(+), 9 deletions(-) + +diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h +index a2adfd42f85cc..bfddcd989974f 100644 +--- a/drivers/acpi/acpica/acevents.h ++++ b/drivers/acpi/acpica/acevents.h +@@ -245,6 +245,8 @@ acpi_ev_default_region_setup(acpi_handle handle, + + acpi_status acpi_ev_initialize_region(union acpi_operand_object *region_obj); + ++u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node); ++ + /* + * evsci - SCI (System Control Interrupt) handling/dispatch + */ +diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h +index 0d45b8bb16789..b10e92de7dd84 100644 +--- a/drivers/acpi/acpica/aclocal.h ++++ b/drivers/acpi/acpica/aclocal.h +@@ -429,9 +429,9 @@ struct acpi_simple_repair_info { + /* Info for running the _REG methods */ + + struct acpi_reg_walk_info { +- acpi_adr_space_type space_id; + u32 function; + u32 reg_run_count; ++ acpi_adr_space_type space_id; + }; + + /***************************************************************************** +diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c +index 28b447ff92df6..3a3277f982923 100644 +--- a/drivers/acpi/acpica/evregion.c ++++ b/drivers/acpi/acpica/evregion.c +@@ -677,6 +677,19 @@ acpi_ev_execute_reg_methods(struct acpi_namespace_node *node, + + ACPI_FUNCTION_TRACE(ev_execute_reg_methods); + ++ /* ++ * These address spaces do not need a call to _REG, since the ACPI ++ * specification defines them as: "must always be accessible". Since ++ * they never change state (never become unavailable), no need to ever ++ * call _REG on them. Also, a data_table is not a "real" address space, ++ * so do not call _REG. September 2018. ++ */ ++ if ((space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) || ++ (space_id == ACPI_ADR_SPACE_SYSTEM_IO) || ++ (space_id == ACPI_ADR_SPACE_DATA_TABLE)) { ++ return_VOID; ++ } ++ + info.space_id = space_id; + info.function = function; + info.reg_run_count = 0; +@@ -738,8 +751,8 @@ acpi_ev_reg_run(acpi_handle obj_handle, + } + + /* +- * We only care about regions.and objects that are allowed to have address +- * space handlers ++ * We only care about regions and objects that are allowed to have ++ * address space handlers + */ + if ((node->type != ACPI_TYPE_REGION) && (node != acpi_gbl_root_node)) { + return (AE_OK); +diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c +index 93ec528bcd9a9..3b48f1ecb55b1 100644 +--- a/drivers/acpi/acpica/evrgnini.c ++++ b/drivers/acpi/acpica/evrgnini.c +@@ -50,9 +50,6 @@ + #define _COMPONENT ACPI_EVENTS + ACPI_MODULE_NAME("evrgnini") + +-/* Local prototypes */ +-static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node); +- + /******************************************************************************* + * + * FUNCTION: acpi_ev_system_memory_region_setup +@@ -67,7 +64,6 @@ static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node); + * DESCRIPTION: Setup a system_memory operation region + * + ******************************************************************************/ +- + acpi_status + acpi_ev_system_memory_region_setup(acpi_handle handle, + u32 function, +@@ -347,7 +343,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle, + * + ******************************************************************************/ + +-static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node) ++u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node) + { + acpi_status status; + struct acpi_pnp_device_id *hid; +diff --git a/drivers/acpi/acpica/evxfregn.c b/drivers/acpi/acpica/evxfregn.c +index beba9d56a0d87..742a9fe6e235d 100644 +--- a/drivers/acpi/acpica/evxfregn.c ++++ b/drivers/acpi/acpica/evxfregn.c +@@ -227,7 +227,6 @@ acpi_remove_address_space_handler(acpi_handle device, + */ + region_obj = + handler_obj->address_space.region_list; +- + } + + /* Remove this Handler object from the list */ +-- +2.20.1 + diff --git a/queue-4.14/alsa-hda-sigmatel-disable-automute-for-elo-vupoint.patch b/queue-4.14/alsa-hda-sigmatel-disable-automute-for-elo-vupoint.patch new file mode 100644 index 00000000000..17a2569dffc --- /dev/null +++ b/queue-4.14/alsa-hda-sigmatel-disable-automute-for-elo-vupoint.patch @@ -0,0 +1,85 @@ +From f7e92a2550ffd5f19af529738f84e776ebd11036 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Oct 2018 14:58:21 -0400 +Subject: ALSA: hda/sigmatel - Disable automute for Elo VuPoint + +From: Michael Pobega + +[ Upstream commit d153135e93a50cdb6f1b52e238909e9965b56056 ] + +The Elo VuPoint 15MX has two headphone jacks of which neither work by +default. Disabling automute allows ALSA to work normally with the +speakers & left headphone jack. + +Future pin configuration changes may be required in the future to get +the right headphone jack working in tandem. + +Signed-off-by: Michael Pobega +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/hda/patch_sigmatel.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c +index 63d15b545b333..7cd147411b22d 100644 +--- a/sound/pci/hda/patch_sigmatel.c ++++ b/sound/pci/hda/patch_sigmatel.c +@@ -77,6 +77,7 @@ enum { + STAC_DELL_M6_BOTH, + STAC_DELL_EQ, + STAC_ALIENWARE_M17X, ++ STAC_ELO_VUPOINT_15MX, + STAC_92HD89XX_HP_FRONT_JACK, + STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK, + STAC_92HD73XX_ASUS_MOBO, +@@ -1897,6 +1898,18 @@ static void stac92hd73xx_fixup_no_jd(struct hda_codec *codec, + codec->no_jack_detect = 1; + } + ++ ++static void stac92hd73xx_disable_automute(struct hda_codec *codec, ++ const struct hda_fixup *fix, int action) ++{ ++ struct sigmatel_spec *spec = codec->spec; ++ ++ if (action != HDA_FIXUP_ACT_PRE_PROBE) ++ return; ++ ++ spec->gen.suppress_auto_mute = 1; ++} ++ + static const struct hda_fixup stac92hd73xx_fixups[] = { + [STAC_92HD73XX_REF] = { + .type = HDA_FIXUP_FUNC, +@@ -1922,6 +1935,10 @@ static const struct hda_fixup stac92hd73xx_fixups[] = { + .type = HDA_FIXUP_FUNC, + .v.func = stac92hd73xx_fixup_alienware_m17x, + }, ++ [STAC_ELO_VUPOINT_15MX] = { ++ .type = HDA_FIXUP_FUNC, ++ .v.func = stac92hd73xx_disable_automute, ++ }, + [STAC_92HD73XX_INTEL] = { + .type = HDA_FIXUP_PINS, + .v.pins = intel_dg45id_pin_configs, +@@ -1960,6 +1977,7 @@ static const struct hda_model_fixup stac92hd73xx_models[] = { + { .id = STAC_DELL_M6_BOTH, .name = "dell-m6" }, + { .id = STAC_DELL_EQ, .name = "dell-eq" }, + { .id = STAC_ALIENWARE_M17X, .name = "alienware" }, ++ { .id = STAC_ELO_VUPOINT_15MX, .name = "elo-vupoint-15mx" }, + { .id = STAC_92HD73XX_ASUS_MOBO, .name = "asus-mobo" }, + {} + }; +@@ -2009,6 +2027,8 @@ static const struct snd_pci_quirk stac92hd73xx_fixup_tbl[] = { + "Alienware M17x", STAC_ALIENWARE_M17X), + SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0490, + "Alienware M17x R3", STAC_DELL_EQ), ++ SND_PCI_QUIRK(0x1059, 0x1011, ++ "ELO VuPoint 15MX", STAC_ELO_VUPOINT_15MX), + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1927, + "HP Z1 G2", STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK), + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2b17, +-- +2.20.1 + diff --git a/queue-4.14/arm-8802-1-call-syscall_trace_exit-even-when-system-.patch b/queue-4.14/arm-8802-1-call-syscall_trace_exit-even-when-system-.patch new file mode 100644 index 00000000000..ccb3310d4ab --- /dev/null +++ b/queue-4.14/arm-8802-1-call-syscall_trace_exit-even-when-system-.patch @@ -0,0 +1,57 @@ +From a4e7a4728097cbb999802bf9727a786a56af6082 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Oct 2018 19:26:48 +0100 +Subject: ARM: 8802/1: Call syscall_trace_exit even when system call skipped + +From: Timothy E Baldwin + +[ Upstream commit f18aef742c8fbd68e280dff0a63ba0ca6ee8ad85 ] + +On at least x86 and ARM64, and as documented in the ptrace man page +a skipped system call will still cause a syscall exit ptrace stop. + +Previous to this commit 32-bit ARM did not, resulting in strace +being confused when seccomp skips system calls. + +This change also impacts programs that use ptrace to skip system calls. + +Fixes: ad75b51459ae ("ARM: 7579/1: arch/allow a scno of -1 to not cause a SIGILL") +Signed-off-by: Timothy E Baldwin +Signed-off-by: Eugene Syromyatnikov +Reviewed-by: Kees Cook +Tested-by: Kees Cook +Tested-by: Eugene Syromyatnikov +Signed-off-by: Russell King +Signed-off-by: Sasha Levin +--- + arch/arm/kernel/entry-common.S | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S +index d7dc808a3d154..08a7132f56006 100644 +--- a/arch/arm/kernel/entry-common.S ++++ b/arch/arm/kernel/entry-common.S +@@ -282,16 +282,15 @@ __sys_trace: + cmp scno, #-1 @ skip the syscall? + bne 2b + add sp, sp, #S_OFF @ restore stack +- b ret_slow_syscall + +-__sys_trace_return: +- str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 ++__sys_trace_return_nosave: ++ enable_irq_notrace + mov r0, sp + bl syscall_trace_exit + b ret_slow_syscall + +-__sys_trace_return_nosave: +- enable_irq_notrace ++__sys_trace_return: ++ str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 + mov r0, sp + bl syscall_trace_exit + b ret_slow_syscall +-- +2.20.1 + diff --git a/queue-4.14/arm-dts-at91-at91sam9x5cm-fix-addressable-nand-flash.patch b/queue-4.14/arm-dts-at91-at91sam9x5cm-fix-addressable-nand-flash.patch new file mode 100644 index 00000000000..8a65cca42c2 --- /dev/null +++ b/queue-4.14/arm-dts-at91-at91sam9x5cm-fix-addressable-nand-flash.patch @@ -0,0 +1,35 @@ +From a44b3687602c1a3fb3c9721f1139a830d3d48b54 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Oct 2018 16:00:36 +0300 +Subject: ARM: dts: at91: at91sam9x5cm: fix addressable nand flash size + +From: Tudor Ambarus + +[ Upstream commit 6f270d88a0c4a11725afd8fd2001ae408733afbf ] + +at91sam9x5cm comes with a 2Gb NAND flash. Fix the rootfs size to +match this limit. + +Signed-off-by: Tudor Ambarus +Signed-off-by: Ludovic Desroches +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/at91sam9x5cm.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/at91sam9x5cm.dtsi b/arch/arm/boot/dts/at91sam9x5cm.dtsi +index bdeaa0b64a5bf..0a673a7082be1 100644 +--- a/arch/arm/boot/dts/at91sam9x5cm.dtsi ++++ b/arch/arm/boot/dts/at91sam9x5cm.dtsi +@@ -88,7 +88,7 @@ + + rootfs@800000 { + label = "rootfs"; +- reg = <0x800000 0x1f800000>; ++ reg = <0x800000 0x0f800000>; + }; + }; + }; +-- +2.20.1 + diff --git a/queue-4.14/arm-dts-at91-sama5d4_xplained-fix-addressable-nand-f.patch b/queue-4.14/arm-dts-at91-sama5d4_xplained-fix-addressable-nand-f.patch new file mode 100644 index 00000000000..86582a3f590 --- /dev/null +++ b/queue-4.14/arm-dts-at91-sama5d4_xplained-fix-addressable-nand-f.patch @@ -0,0 +1,35 @@ +From ba9ced968e4a4bb3fc7c2f2ea457bc6c910e2bcb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Oct 2018 16:00:35 +0300 +Subject: ARM: dts: at91: sama5d4_xplained: fix addressable nand flash size + +From: Tudor Ambarus + +[ Upstream commit df90fc64367ffdb6f1b5c0f0c4940d44832b0174 ] + +sama5d4_xplained comes with a 4Gb NAND flash. Increase the rootfs +size to match this limit. + +Signed-off-by: Tudor Ambarus +Signed-off-by: Ludovic Desroches +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/at91-sama5d4_xplained.dts +index cf712444b2c2c..10f2fb9e0ea61 100644 +--- a/arch/arm/boot/dts/at91-sama5d4_xplained.dts ++++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts +@@ -240,7 +240,7 @@ + + rootfs@800000 { + label = "rootfs"; +- reg = <0x800000 0x0f800000>; ++ reg = <0x800000 0x1f800000>; + }; + }; + }; +-- +2.20.1 + diff --git a/queue-4.14/arm-dts-dra7-enable-workaround-for-errata-i870-in-pc.patch b/queue-4.14/arm-dts-dra7-enable-workaround-for-errata-i870-in-pc.patch new file mode 100644 index 00000000000..6cdbc5be685 --- /dev/null +++ b/queue-4.14/arm-dts-dra7-enable-workaround-for-errata-i870-in-pc.patch @@ -0,0 +1,43 @@ +From 7fd8eafe14ba8cfd95d756552fee1f9e429f6961 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 28 Sep 2018 11:34:42 +0530 +Subject: ARM: dts: dra7: Enable workaround for errata i870 in PCIe host mode + +From: Vignesh R + +[ Upstream commit b830526f304764753fcb8b4a563a94080e982a6c ] + +Add ti,syscon-unaligned-access property to PCIe RC nodes to set +appropriate bits in CTRL_CORE_SMA_SW_7 register to enable workaround for +errata i870. + +Signed-off-by: Vignesh R +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/dra7.dtsi | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi +index 09686d73f9479..fec965009b9fc 100644 +--- a/arch/arm/boot/dts/dra7.dtsi ++++ b/arch/arm/boot/dts/dra7.dtsi +@@ -314,6 +314,7 @@ + <0 0 0 2 &pcie1_intc 2>, + <0 0 0 3 &pcie1_intc 3>, + <0 0 0 4 &pcie1_intc 4>; ++ ti,syscon-unaligned-access = <&scm_conf1 0x14 1>; + status = "disabled"; + pcie1_intc: interrupt-controller { + interrupt-controller; +@@ -367,6 +368,7 @@ + <0 0 0 2 &pcie2_intc 2>, + <0 0 0 3 &pcie2_intc 3>, + <0 0 0 4 &pcie2_intc 4>; ++ ti,syscon-unaligned-access = <&scm_conf1 0x14 2>; + pcie2_intc: interrupt-controller { + interrupt-controller; + #address-cells = <0>; +-- +2.20.1 + diff --git a/queue-4.14/arm-dts-omap5-enable-otg-role-for-dwc3-controller.patch b/queue-4.14/arm-dts-omap5-enable-otg-role-for-dwc3-controller.patch new file mode 100644 index 00000000000..e68bc6b2cff --- /dev/null +++ b/queue-4.14/arm-dts-omap5-enable-otg-role-for-dwc3-controller.patch @@ -0,0 +1,42 @@ +From 08d2783a03255712cf34f5322027fa97d7012fbe Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 28 Sep 2018 17:54:00 +0200 +Subject: ARM: dts: omap5: enable OTG role for DWC3 controller + +From: H. Nikolaus Schaller + +[ Upstream commit 656c1a65ab555ee5c7cd0d6aee8ab82ca3c1795f ] + +Since SMPS10 and OTG cable detection extcon are described here, and +work to enable OTG power when an OTG cable is plugged in, we can +define OTG mode in the controller (which is disabled by default in +omap5.dtsi). + +Tested on OMAP5EVM and Pyra. + +Suggested-by: Roger Quadros +Signed-off-by: H. Nikolaus Schaller +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/omap5-board-common.dtsi | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi +index 7824b2631cb6b..f65343f8e1d69 100644 +--- a/arch/arm/boot/dts/omap5-board-common.dtsi ++++ b/arch/arm/boot/dts/omap5-board-common.dtsi +@@ -694,6 +694,10 @@ + vbus-supply = <&smps10_out1_reg>; + }; + ++&dwc3 { ++ dr_mode = "otg"; ++}; ++ + &mcspi1 { + + }; +-- +2.20.1 + diff --git a/queue-4.14/arm-dts-omap5-fix-dual-role-mode-on-super-speed-port.patch b/queue-4.14/arm-dts-omap5-fix-dual-role-mode-on-super-speed-port.patch new file mode 100644 index 00000000000..3d4b54fa6f2 --- /dev/null +++ b/queue-4.14/arm-dts-omap5-fix-dual-role-mode-on-super-speed-port.patch @@ -0,0 +1,39 @@ +From d2fffd0ec1b0a9a3719ba798380f3ee6669e04d1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 5 Dec 2018 19:27:44 +0200 +Subject: ARM: dts: omap5: Fix dual-role mode on Super-Speed port + +From: Roger Quadros + +[ Upstream commit a763ecc15d0e37c3a15ff6825183061209832685 ] + +OMAP5's Super-Speed USB port has a software mailbox register +that needs to be fed with VBUS and ID events from an external +VBUS/ID comparator. + +Without this, Host role will not work correctly. + +Fixes: 656c1a65ab55 ("ARM: dts: omap5: enable OTG role for DWC3 controller") +Reported-by: H. Nikolaus Schaller +Signed-off-by: Roger Quadros +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/omap5-board-common.dtsi | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi +index f65343f8e1d69..c58f14de01451 100644 +--- a/arch/arm/boot/dts/omap5-board-common.dtsi ++++ b/arch/arm/boot/dts/omap5-board-common.dtsi +@@ -695,6 +695,7 @@ + }; + + &dwc3 { ++ extcon = <&extcon_usb3>; + dr_mode = "otg"; + }; + +-- +2.20.1 + diff --git a/queue-4.14/arm-dts-sun8i-h3-h5-ir-register-size-should-be-the-w.patch b/queue-4.14/arm-dts-sun8i-h3-h5-ir-register-size-should-be-the-w.patch new file mode 100644 index 00000000000..8066448b3d6 --- /dev/null +++ b/queue-4.14/arm-dts-sun8i-h3-h5-ir-register-size-should-be-the-w.patch @@ -0,0 +1,37 @@ +From 4759070be852e8f252f5c4db26dfb73357143185 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 Aug 2018 11:48:01 +0200 +Subject: ARM: dts: sun8i: h3-h5: ir register size should be the whole memory + block + +From: Philipp Rossak + +[ Upstream commit 6c700289a3e84d5d3f2a95cf27732a7f7fce105b ] + +The size of the register should be the size of the whole memory block, +not just the registers, that are needed. + +Signed-off-by: Philipp Rossak +Acked-by: Maxime Ripard +Signed-off-by: Chen-Yu Tsai +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi +index 11240a8313c26..03f37081fc64e 100644 +--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi ++++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi +@@ -594,7 +594,7 @@ + clock-names = "apb", "ir"; + resets = <&r_ccu RST_APB0_IR>; + interrupts = ; +- reg = <0x01f02000 0x40>; ++ reg = <0x01f02000 0x400>; + status = "disabled"; + }; + +-- +2.20.1 + diff --git a/queue-4.14/arm64-numa-report-correct-memblock-range-for-the-dum.patch b/queue-4.14/arm64-numa-report-correct-memblock-range-for-the-dum.patch new file mode 100644 index 00000000000..3a8fc0c5d3c --- /dev/null +++ b/queue-4.14/arm64-numa-report-correct-memblock-range-for-the-dum.patch @@ -0,0 +1,39 @@ +From e777869b24d6c2b65e16672854308ce23fa335ec Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 22 Sep 2018 21:09:55 +0530 +Subject: arm64/numa: Report correct memblock range for the dummy node + +From: Anshuman Khandual + +[ Upstream commit 77cfe950901e5c13aca2df6437a05f39dd9a929b ] + +The dummy node ID is marked into all memory ranges on the system. So the +dummy node really extends the entire memblock.memory. Hence report correct +extent information for the dummy node using memblock range helper functions +instead of the range [0LLU, PFN_PHYS(max_pfn) - 1)]. + +Fixes: 1a2db30034 ("arm64, numa: Add NUMA support for arm64 platforms") +Acked-by: Punit Agrawal +Signed-off-by: Anshuman Khandual +Signed-off-by: Catalin Marinas +Signed-off-by: Sasha Levin +--- + arch/arm64/mm/numa.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c +index dad128ba98bf8..e9c843e0c1727 100644 +--- a/arch/arm64/mm/numa.c ++++ b/arch/arm64/mm/numa.c +@@ -419,7 +419,7 @@ static int __init dummy_numa_init(void) + if (numa_off) + pr_info("NUMA disabled\n"); /* Forced off on command line. */ + pr_info("Faking a node at [mem %#018Lx-%#018Lx]\n", +- 0LLU, PFN_PHYS(max_pfn) - 1); ++ memblock_start_of_DRAM(), memblock_end_of_DRAM() - 1); + + for_each_memblock(memory, mblk) { + ret = numa_add_memblk(0, mblk->base, mblk->base + mblk->size); +-- +2.20.1 + diff --git a/queue-4.14/ata-ahci_brcm-allow-using-driver-or-dsl-socs.patch b/queue-4.14/ata-ahci_brcm-allow-using-driver-or-dsl-socs.patch new file mode 100644 index 00000000000..1bf7e17cf1b --- /dev/null +++ b/queue-4.14/ata-ahci_brcm-allow-using-driver-or-dsl-socs.patch @@ -0,0 +1,36 @@ +From 7d507ba2cb62cd5eb0377d0ab98898ae253c39bb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 1 Oct 2018 10:33:02 -0700 +Subject: ata: ahci_brcm: Allow using driver or DSL SoCs + +From: Florian Fainelli + +[ Upstream commit 7fb44929cb0e5cdcde143e1ca3ca57b5b8247db0 ] + +The Broadcom STB AHCI controller is the same as the one found on DSL +SoCs, so we will utilize the same driver on these systems as well. + +Signed-off-by: Florian Fainelli +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/ata/Kconfig | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig +index cb5339166563e..229a5ccd6b73b 100644 +--- a/drivers/ata/Kconfig ++++ b/drivers/ata/Kconfig +@@ -102,7 +102,8 @@ config SATA_AHCI_PLATFORM + + config AHCI_BRCM + tristate "Broadcom AHCI SATA support" +- depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_NSP ++ depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_NSP || \ ++ ARCH_BCM_63XX + help + This option enables support for the AHCI SATA3 controller found on + Broadcom SoC's. +-- +2.20.1 + diff --git a/queue-4.14/ata-ep93xx-use-proper-enums-for-directions.patch b/queue-4.14/ata-ep93xx-use-proper-enums-for-directions.patch new file mode 100644 index 00000000000..bc3e06d9332 --- /dev/null +++ b/queue-4.14/ata-ep93xx-use-proper-enums-for-directions.patch @@ -0,0 +1,89 @@ +From 5c558c8aceac542ce3d42fb725bd554c39eb6e68 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Oct 2018 19:37:54 -0700 +Subject: ata: ep93xx: Use proper enums for directions + +From: Nathan Chancellor + +[ Upstream commit 6adde4a36f1b6a562a1057fbb1065007851050e7 ] + +Clang warns when one enumerated type is implicitly converted to another. + +drivers/ata/pata_ep93xx.c:662:36: warning: implicit conversion from +enumeration type 'enum dma_data_direction' to different enumeration type +'enum dma_transfer_direction' [-Wenum-conversion] + drv_data->dma_rx_data.direction = DMA_FROM_DEVICE; + ~ ^~~~~~~~~~~~~~~ +drivers/ata/pata_ep93xx.c:670:36: warning: implicit conversion from +enumeration type 'enum dma_data_direction' to different enumeration type +'enum dma_transfer_direction' [-Wenum-conversion] + drv_data->dma_tx_data.direction = DMA_TO_DEVICE; + ~ ^~~~~~~~~~~~~ +drivers/ata/pata_ep93xx.c:681:19: warning: implicit conversion from +enumeration type 'enum dma_data_direction' to different enumeration type +'enum dma_transfer_direction' [-Wenum-conversion] + conf.direction = DMA_FROM_DEVICE; + ~ ^~~~~~~~~~~~~~~ +drivers/ata/pata_ep93xx.c:692:19: warning: implicit conversion from +enumeration type 'enum dma_data_direction' to different enumeration type +'enum dma_transfer_direction' [-Wenum-conversion] + conf.direction = DMA_TO_DEVICE; + ~ ^~~~~~~~~~~~~ + +Use the equivalent valued enums from the expected type so that Clang no +longer warns about a conversion. + +DMA_TO_DEVICE = DMA_MEM_TO_DEV = 1 +DMA_FROM_DEVICE = DMA_DEV_TO_MEM = 2 + +Acked-by: Bartlomiej Zolnierkiewicz +Signed-off-by: Nathan Chancellor +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/ata/pata_ep93xx.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c +index 0a550190955ad..cc6d06c1b2c70 100644 +--- a/drivers/ata/pata_ep93xx.c ++++ b/drivers/ata/pata_ep93xx.c +@@ -659,7 +659,7 @@ static void ep93xx_pata_dma_init(struct ep93xx_pata_data *drv_data) + * start of new transfer. + */ + drv_data->dma_rx_data.port = EP93XX_DMA_IDE; +- drv_data->dma_rx_data.direction = DMA_FROM_DEVICE; ++ drv_data->dma_rx_data.direction = DMA_DEV_TO_MEM; + drv_data->dma_rx_data.name = "ep93xx-pata-rx"; + drv_data->dma_rx_channel = dma_request_channel(mask, + ep93xx_pata_dma_filter, &drv_data->dma_rx_data); +@@ -667,7 +667,7 @@ static void ep93xx_pata_dma_init(struct ep93xx_pata_data *drv_data) + return; + + drv_data->dma_tx_data.port = EP93XX_DMA_IDE; +- drv_data->dma_tx_data.direction = DMA_TO_DEVICE; ++ drv_data->dma_tx_data.direction = DMA_MEM_TO_DEV; + drv_data->dma_tx_data.name = "ep93xx-pata-tx"; + drv_data->dma_tx_channel = dma_request_channel(mask, + ep93xx_pata_dma_filter, &drv_data->dma_tx_data); +@@ -678,7 +678,7 @@ static void ep93xx_pata_dma_init(struct ep93xx_pata_data *drv_data) + + /* Configure receive channel direction and source address */ + memset(&conf, 0, sizeof(conf)); +- conf.direction = DMA_FROM_DEVICE; ++ conf.direction = DMA_DEV_TO_MEM; + conf.src_addr = drv_data->udma_in_phys; + conf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; + if (dmaengine_slave_config(drv_data->dma_rx_channel, &conf)) { +@@ -689,7 +689,7 @@ static void ep93xx_pata_dma_init(struct ep93xx_pata_data *drv_data) + + /* Configure transmit channel direction and destination address */ + memset(&conf, 0, sizeof(conf)); +- conf.direction = DMA_TO_DEVICE; ++ conf.direction = DMA_MEM_TO_DEV; + conf.dst_addr = drv_data->udma_out_phys; + conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; + if (dmaengine_slave_config(drv_data->dma_tx_channel, &conf)) { +-- +2.20.1 + diff --git a/queue-4.14/ath10k-fix-vdev-start-timeout-on-error.patch b/queue-4.14/ath10k-fix-vdev-start-timeout-on-error.patch new file mode 100644 index 00000000000..9c9b4533eca --- /dev/null +++ b/queue-4.14/ath10k-fix-vdev-start-timeout-on-error.patch @@ -0,0 +1,117 @@ +From 262e7da6f2a06063f6ed4d81cb010116cb28ae9b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 6 Sep 2018 19:46:20 +0300 +Subject: ath10k: fix vdev-start timeout on error + +From: Ben Greear + +[ Upstream commit 833fd34d743c728afe6d127ef7bee67e7d9199a8 ] + +The vdev-start-response message should cause the +completion to fire, even in the error case. Otherwise, +the user still gets no useful information and everything +is blocked until the timeout period. + +Add some warning text to print out the invalid status +code to aid debugging, and propagate failure code. + +Signed-off-by: Ben Greear +Signed-off-by: Kalle Valo +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath10k/core.h | 1 + + drivers/net/wireless/ath/ath10k/mac.c | 2 +- + drivers/net/wireless/ath/ath10k/wmi.c | 19 ++++++++++++++++--- + drivers/net/wireless/ath/ath10k/wmi.h | 8 +++++++- + 4 files changed, 25 insertions(+), 5 deletions(-) + +diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h +index 949ebb3e967bb..be9ec265dfe55 100644 +--- a/drivers/net/wireless/ath/ath10k/core.h ++++ b/drivers/net/wireless/ath/ath10k/core.h +@@ -881,6 +881,7 @@ struct ath10k { + + struct completion install_key_done; + ++ int last_wmi_vdev_start_status; + struct completion vdev_setup_done; + + struct workqueue_struct *workqueue; +diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c +index 8c4bb56c262f6..dff34448588f0 100644 +--- a/drivers/net/wireless/ath/ath10k/mac.c ++++ b/drivers/net/wireless/ath/ath10k/mac.c +@@ -955,7 +955,7 @@ static inline int ath10k_vdev_setup_sync(struct ath10k *ar) + if (time_left == 0) + return -ETIMEDOUT; + +- return 0; ++ return ar->last_wmi_vdev_start_status; + } + + static int ath10k_monitor_vdev_start(struct ath10k *ar, int vdev_id) +diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c +index 4d6c2986c40dd..25f51ca060934 100644 +--- a/drivers/net/wireless/ath/ath10k/wmi.c ++++ b/drivers/net/wireless/ath/ath10k/wmi.c +@@ -3133,18 +3133,31 @@ void ath10k_wmi_event_vdev_start_resp(struct ath10k *ar, struct sk_buff *skb) + { + struct wmi_vdev_start_ev_arg arg = {}; + int ret; ++ u32 status; + + ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_VDEV_START_RESP_EVENTID\n"); + ++ ar->last_wmi_vdev_start_status = 0; ++ + ret = ath10k_wmi_pull_vdev_start(ar, skb, &arg); + if (ret) { + ath10k_warn(ar, "failed to parse vdev start event: %d\n", ret); +- return; ++ ar->last_wmi_vdev_start_status = ret; ++ goto out; + } + +- if (WARN_ON(__le32_to_cpu(arg.status))) +- return; ++ status = __le32_to_cpu(arg.status); ++ if (WARN_ON_ONCE(status)) { ++ ath10k_warn(ar, "vdev-start-response reports status error: %d (%s)\n", ++ status, (status == WMI_VDEV_START_CHAN_INVALID) ? ++ "chan-invalid" : "unknown"); ++ /* Setup is done one way or another though, so we should still ++ * do the completion, so don't return here. ++ */ ++ ar->last_wmi_vdev_start_status = -EINVAL; ++ } + ++out: + complete(&ar->vdev_setup_done); + } + +diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h +index d0e05aa437e36..947b74c64fec0 100644 +--- a/drivers/net/wireless/ath/ath10k/wmi.h ++++ b/drivers/net/wireless/ath/ath10k/wmi.h +@@ -6480,11 +6480,17 @@ struct wmi_ch_info_ev_arg { + __le32 rx_frame_count; + }; + ++/* From 10.4 firmware, not sure all have the same values. */ ++enum wmi_vdev_start_status { ++ WMI_VDEV_START_OK = 0, ++ WMI_VDEV_START_CHAN_INVALID, ++}; ++ + struct wmi_vdev_start_ev_arg { + __le32 vdev_id; + __le32 req_id; + __le32 resp_type; /* %WMI_VDEV_RESP_ */ +- __le32 status; ++ __le32 status; /* See wmi_vdev_start_status enum above */ + }; + + struct wmi_peer_kick_ev_arg { +-- +2.20.1 + diff --git a/queue-4.14/ath9k-fix-reporting-calculated-new-fft-upper-max.patch b/queue-4.14/ath9k-fix-reporting-calculated-new-fft-upper-max.patch new file mode 100644 index 00000000000..06f7ab9e4ee --- /dev/null +++ b/queue-4.14/ath9k-fix-reporting-calculated-new-fft-upper-max.patch @@ -0,0 +1,36 @@ +From 525a7f6e55bf519c5f5f1a40171db858ed15687b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 1 Oct 2018 17:26:59 +0300 +Subject: ath9k: fix reporting calculated new FFT upper max + +From: Simon Wunderlich + +[ Upstream commit 4fb5837ac2bd46a85620b297002c704e9958f64d ] + +Since the debug print code is outside of the loop, it shouldn't use the loop +iterator anymore but instead print the found maximum index. + +Cc: Nick Kossifidis +Signed-off-by: Simon Wunderlich +Signed-off-by: Kalle Valo +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath9k/common-spectral.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/ath/ath9k/common-spectral.c b/drivers/net/wireless/ath/ath9k/common-spectral.c +index a41bcbda1d9e8..37d5994eb1ccd 100644 +--- a/drivers/net/wireless/ath/ath9k/common-spectral.c ++++ b/drivers/net/wireless/ath/ath9k/common-spectral.c +@@ -411,7 +411,7 @@ ath_cmn_process_ht20_40_fft(struct ath_rx_status *rs, + + ath_dbg(common, SPECTRAL_SCAN, + "Calculated new upper max 0x%X at %i\n", +- tmp_mag, i); ++ tmp_mag, fft_sample_40.upper_max_index); + } else + for (i = dc_pos; i < SPECTRAL_HT20_40_NUM_BINS; i++) { + if (fft_sample_40.data[i] == (upper_mag >> max_exp)) +-- +2.20.1 + diff --git a/queue-4.14/backlight-lm3639-unconditionally-call-led_classdev_u.patch b/queue-4.14/backlight-lm3639-unconditionally-call-led_classdev_u.patch new file mode 100644 index 00000000000..2985ad08ffb --- /dev/null +++ b/queue-4.14/backlight-lm3639-unconditionally-call-led_classdev_u.patch @@ -0,0 +1,59 @@ +From 6d36d4bd081036482d2311b9dea3688f648539f8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 Sep 2018 13:21:31 -0700 +Subject: backlight: lm3639: Unconditionally call led_classdev_unregister + +From: Nathan Chancellor + +[ Upstream commit 7cea645ae9c5a54aa7904fddb2cdf250acd63a6c ] + +Clang warns that the address of a pointer will always evaluated as true +in a boolean context. + +drivers/video/backlight/lm3639_bl.c:403:14: warning: address of +'pchip->cdev_torch' will always evaluate to 'true' +[-Wpointer-bool-conversion] + if (&pchip->cdev_torch) + ~~ ~~~~~~~^~~~~~~~~~ +drivers/video/backlight/lm3639_bl.c:405:14: warning: address of +'pchip->cdev_flash' will always evaluate to 'true' +[-Wpointer-bool-conversion] + if (&pchip->cdev_flash) + ~~ ~~~~~~~^~~~~~~~~~ +2 warnings generated. + +These statements have been present since 2012, introduced by +commit 0f59858d5119 ("backlight: add new lm3639 backlight +driver"). Given that they have been called unconditionally since +then presumably without any issues, removing the always true if +statements to fix the warnings without any real world changes. + +Link: https://github.com/ClangBuiltLinux/linux/issues/119 +Signed-off-by: Nathan Chancellor +Reviewed-by: Daniel Thompson +Signed-off-by: Lee Jones +Signed-off-by: Sasha Levin +--- + drivers/video/backlight/lm3639_bl.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/drivers/video/backlight/lm3639_bl.c b/drivers/video/backlight/lm3639_bl.c +index cd50df5807ead..086611c7bc03c 100644 +--- a/drivers/video/backlight/lm3639_bl.c ++++ b/drivers/video/backlight/lm3639_bl.c +@@ -400,10 +400,8 @@ static int lm3639_remove(struct i2c_client *client) + + regmap_write(pchip->regmap, REG_ENABLE, 0x00); + +- if (&pchip->cdev_torch) +- led_classdev_unregister(&pchip->cdev_torch); +- if (&pchip->cdev_flash) +- led_classdev_unregister(&pchip->cdev_flash); ++ led_classdev_unregister(&pchip->cdev_torch); ++ led_classdev_unregister(&pchip->cdev_flash); + if (pchip->bled) + device_remove_file(&(pchip->bled->dev), &dev_attr_bled_mode); + return 0; +-- +2.20.1 + diff --git a/queue-4.14/bcache-recal-cached_dev_sectors-on-detach.patch b/queue-4.14/bcache-recal-cached_dev_sectors-on-detach.patch new file mode 100644 index 00000000000..6103645ceba --- /dev/null +++ b/queue-4.14/bcache-recal-cached_dev_sectors-on-detach.patch @@ -0,0 +1,38 @@ +From c3544ac5d26a1b20ccead167c43afd07f9365dfc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Oct 2018 20:41:15 +0800 +Subject: bcache: recal cached_dev_sectors on detach + +From: Shenghui Wang + +[ Upstream commit 46010141da6677b81cc77f9b47f8ac62bd1cbfd3 ] + +Recal cached_dev_sectors on cached_dev detached, as recal done on +cached_dev attached. + +Update the cached_dev_sectors before bcache_device_detach called +as bcache_device_detach will set bcache_device->c to NULL. + +Signed-off-by: Shenghui Wang +Signed-off-by: Coly Li +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/md/bcache/super.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c +index 1a270e2262f52..690aeb09bbf55 100644 +--- a/drivers/md/bcache/super.c ++++ b/drivers/md/bcache/super.c +@@ -905,6 +905,7 @@ static void cached_dev_detach_finish(struct work_struct *w) + bch_write_bdev_super(dc, &cl); + closure_sync(&cl); + ++ calc_cached_dev_sectors(dc->disk.c); + bcache_device_detach(&dc->disk); + list_move(&dc->list, &uncached_devices); + +-- +2.20.1 + diff --git a/queue-4.14/brcmfmac-fix-full-timeout-waiting-for-action-frame-o.patch b/queue-4.14/brcmfmac-fix-full-timeout-waiting-for-action-frame-o.patch new file mode 100644 index 00000000000..9201d081db2 --- /dev/null +++ b/queue-4.14/brcmfmac-fix-full-timeout-waiting-for-action-frame-o.patch @@ -0,0 +1,90 @@ +From cd4e6ad3c43ec8e8216bff54cb15f546149b8a15 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 27 Sep 2018 14:59:49 +0000 +Subject: brcmfmac: fix full timeout waiting for action frame on-channel tx + +From: Chung-Hsien Hsu + +[ Upstream commit fbf07000960d9c8a13fdc17c6de0230d681c7543 ] + +The driver sends an action frame down and waits for a completion signal +triggered by the received BRCMF_E_ACTION_FRAME_OFF_CHAN_COMPLETE event +to continue the process. However, the action frame could be transmitted +either on the current channel or on an off channel. For the on-channel +case, only BRCMF_E_ACTION_FRAME_COMPLETE event will be received when +the frame is transmitted, which make the driver always wait a full +timeout duration. This patch has the completion signal be triggered by +receiving the BRCMF_E_ACTION_FRAME_COMPLETE event for the on-channel +case. + +This change fixes WFA p2p certification 5.1.19 failure. + +Signed-off-by: Chung-Hsien Hsu +Signed-off-by: Chi-Hsien Lin +Signed-off-by: Kalle Valo +Signed-off-by: Sasha Levin +--- + .../wireless/broadcom/brcm80211/brcmfmac/p2p.c | 17 +++++++++++++++-- + .../wireless/broadcom/brcm80211/brcmfmac/p2p.h | 2 ++ + 2 files changed, 17 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +index c9566c9036721..4a883f4bbf885 100644 +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +@@ -1462,10 +1462,12 @@ int brcmf_p2p_notify_action_tx_complete(struct brcmf_if *ifp, + return 0; + + if (e->event_code == BRCMF_E_ACTION_FRAME_COMPLETE) { +- if (e->status == BRCMF_E_STATUS_SUCCESS) ++ if (e->status == BRCMF_E_STATUS_SUCCESS) { + set_bit(BRCMF_P2P_STATUS_ACTION_TX_COMPLETED, + &p2p->status); +- else { ++ if (!p2p->wait_for_offchan_complete) ++ complete(&p2p->send_af_done); ++ } else { + set_bit(BRCMF_P2P_STATUS_ACTION_TX_NOACK, &p2p->status); + /* If there is no ack, we don't need to wait for + * WLC_E_ACTION_FRAME_OFFCHAN_COMPLETE event +@@ -1516,6 +1518,17 @@ static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p, + p2p->af_sent_channel = le32_to_cpu(af_params->channel); + p2p->af_tx_sent_jiffies = jiffies; + ++ if (test_bit(BRCMF_P2P_STATUS_DISCOVER_LISTEN, &p2p->status) && ++ p2p->af_sent_channel == ++ ieee80211_frequency_to_channel(p2p->remain_on_channel.center_freq)) ++ p2p->wait_for_offchan_complete = false; ++ else ++ p2p->wait_for_offchan_complete = true; ++ ++ brcmf_dbg(TRACE, "Waiting for %s tx completion event\n", ++ (p2p->wait_for_offchan_complete) ? ++ "off-channel" : "on-channel"); ++ + timeout = wait_for_completion_timeout(&p2p->send_af_done, + P2P_AF_MAX_WAIT_TIME); + +diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h +index 0e8b34d2d85cb..39f0d02180882 100644 +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h +@@ -124,6 +124,7 @@ struct afx_hdl { + * @gon_req_action: about to send go negotiation requets frame. + * @block_gon_req_tx: drop tx go negotiation requets frame. + * @p2pdev_dynamically: is p2p device if created by module param or supplicant. ++ * @wait_for_offchan_complete: wait for off-channel tx completion event. + */ + struct brcmf_p2p_info { + struct brcmf_cfg80211_info *cfg; +@@ -144,6 +145,7 @@ struct brcmf_p2p_info { + bool gon_req_action; + bool block_gon_req_tx; + bool p2pdev_dynamically; ++ bool wait_for_offchan_complete; + }; + + s32 brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg, bool p2pdev_forced); +-- +2.20.1 + diff --git a/queue-4.14/brcmfmac-reduce-timeout-for-action-frame-scan.patch b/queue-4.14/brcmfmac-reduce-timeout-for-action-frame-scan.patch new file mode 100644 index 00000000000..8ddbf3340ce --- /dev/null +++ b/queue-4.14/brcmfmac-reduce-timeout-for-action-frame-scan.patch @@ -0,0 +1,77 @@ +From 8e4ccd2ebdecda4809fa2b1fd2bac33225ed17f3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 27 Sep 2018 14:59:44 +0000 +Subject: brcmfmac: reduce timeout for action frame scan + +From: Chung-Hsien Hsu + +[ Upstream commit edb6d6885bef82d1eac432dbeca9fbf4ec349d7e ] + +Finding a common channel to send an action frame out is required for +some action types. Since a loop with several scan retry is used to find +the channel, a short wait time could be considered for each attempt. +This patch reduces the wait time from 1500 to 450 msec for each action +frame scan. + +This patch fixes the WFA p2p certification 5.1.20 failure caused by the +long action frame send time. + +Signed-off-by: Chung-Hsien Hsu +Signed-off-by: Chi-Hsien Lin +Signed-off-by: Kalle Valo +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +index 450f2216fac2d..c9566c9036721 100644 +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +@@ -74,7 +74,7 @@ + #define P2P_AF_MAX_WAIT_TIME msecs_to_jiffies(2000) + #define P2P_INVALID_CHANNEL -1 + #define P2P_CHANNEL_SYNC_RETRY 5 +-#define P2P_AF_FRM_SCAN_MAX_WAIT msecs_to_jiffies(1500) ++#define P2P_AF_FRM_SCAN_MAX_WAIT msecs_to_jiffies(450) + #define P2P_DEFAULT_SLEEP_TIME_VSDB 200 + + /* WiFi P2P Public Action Frame OUI Subtypes */ +@@ -1139,7 +1139,6 @@ static s32 brcmf_p2p_af_searching_channel(struct brcmf_p2p_info *p2p) + { + struct afx_hdl *afx_hdl = &p2p->afx_hdl; + struct brcmf_cfg80211_vif *pri_vif; +- unsigned long duration; + s32 retry; + + brcmf_dbg(TRACE, "Enter\n"); +@@ -1155,7 +1154,6 @@ static s32 brcmf_p2p_af_searching_channel(struct brcmf_p2p_info *p2p) + * pending action frame tx is cancelled. + */ + retry = 0; +- duration = msecs_to_jiffies(P2P_AF_FRM_SCAN_MAX_WAIT); + while ((retry < P2P_CHANNEL_SYNC_RETRY) && + (afx_hdl->peer_chan == P2P_INVALID_CHANNEL)) { + afx_hdl->is_listen = false; +@@ -1163,7 +1161,8 @@ static s32 brcmf_p2p_af_searching_channel(struct brcmf_p2p_info *p2p) + retry); + /* search peer on peer's listen channel */ + schedule_work(&afx_hdl->afx_work); +- wait_for_completion_timeout(&afx_hdl->act_frm_scan, duration); ++ wait_for_completion_timeout(&afx_hdl->act_frm_scan, ++ P2P_AF_FRM_SCAN_MAX_WAIT); + if ((afx_hdl->peer_chan != P2P_INVALID_CHANNEL) || + (!test_bit(BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL, + &p2p->status))) +@@ -1176,7 +1175,7 @@ static s32 brcmf_p2p_af_searching_channel(struct brcmf_p2p_info *p2p) + afx_hdl->is_listen = true; + schedule_work(&afx_hdl->afx_work); + wait_for_completion_timeout(&afx_hdl->act_frm_scan, +- duration); ++ P2P_AF_FRM_SCAN_MAX_WAIT); + } + if ((afx_hdl->peer_chan != P2P_INVALID_CHANNEL) || + (!test_bit(BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL, +-- +2.20.1 + diff --git a/queue-4.14/clk-keystone-enable-tisci-clocks-if-k3_arch.patch b/queue-4.14/clk-keystone-enable-tisci-clocks-if-k3_arch.patch new file mode 100644 index 00000000000..858a8596649 --- /dev/null +++ b/queue-4.14/clk-keystone-enable-tisci-clocks-if-k3_arch.patch @@ -0,0 +1,49 @@ +From 60fb1bebb9f2b1252118ba780f711e3b2201c82e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Aug 2018 19:50:56 -0500 +Subject: clk: keystone: Enable TISCI clocks if K3_ARCH + +From: Nishanth Menon + +[ Upstream commit 2f149e6e14bcb5e581e49307b54aafcd6f74a74f ] + +K3_ARCH uses TISCI for clocks as well. Enable the same +for the driver support. + +Signed-off-by: Nishanth Menon +Acked-by: Santosh Shilimkar +Signed-off-by: Stephen Boyd +Signed-off-by: Sasha Levin +--- + drivers/clk/Makefile | 1 + + drivers/clk/keystone/Kconfig | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile +index f7f761b02beda..8ca03d9d693b0 100644 +--- a/drivers/clk/Makefile ++++ b/drivers/clk/Makefile +@@ -65,6 +65,7 @@ obj-$(CONFIG_ARCH_HISI) += hisilicon/ + obj-y += imgtec/ + obj-$(CONFIG_ARCH_MXC) += imx/ + obj-$(CONFIG_MACH_INGENIC) += ingenic/ ++obj-$(CONFIG_ARCH_K3) += keystone/ + obj-$(CONFIG_ARCH_KEYSTONE) += keystone/ + obj-$(CONFIG_MACH_LOONGSON32) += loongson1/ + obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/ +diff --git a/drivers/clk/keystone/Kconfig b/drivers/clk/keystone/Kconfig +index 7e9f0176578a6..b04927d06cd10 100644 +--- a/drivers/clk/keystone/Kconfig ++++ b/drivers/clk/keystone/Kconfig +@@ -7,7 +7,7 @@ config COMMON_CLK_KEYSTONE + + config TI_SCI_CLK + tristate "TI System Control Interface clock drivers" +- depends on (ARCH_KEYSTONE || COMPILE_TEST) && OF ++ depends on (ARCH_KEYSTONE || ARCH_K3 || COMPILE_TEST) && OF + depends on TI_SCI_PROTOCOL + default ARCH_KEYSTONE + ---help--- +-- +2.20.1 + diff --git a/queue-4.14/clk-samsung-exynos5420-define-clk_seckey-gate-clock-.patch b/queue-4.14/clk-samsung-exynos5420-define-clk_seckey-gate-clock-.patch new file mode 100644 index 00000000000..09a3ed5e7d2 --- /dev/null +++ b/queue-4.14/clk-samsung-exynos5420-define-clk_seckey-gate-clock-.patch @@ -0,0 +1,47 @@ +From 2ab7735dde6bcef22a36b954e7da98a230583d89 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 24 Sep 2018 13:00:56 +0200 +Subject: clk: samsung: exynos5420: Define CLK_SECKEY gate clock only or + Exynos5420 + +From: Joonyoung Shim + +[ Upstream commit d32dd2a1a0f80edad158c9a1ba5f47650d9504a0 ] + +The bit of GATE_BUS_PERIS1 for CLK_SECKEY is just reserved on +exynos5422/5800, not exynos5420. Define gate clk for exynos5420 to +handle the bit only on exynos5420. + +Signed-off-by: Joonyoung Shim +[m.szyprow: rewrote commit subject] +Signed-off-by: Marek Szyprowski +Signed-off-by: Sylwester Nawrocki +Signed-off-by: Sasha Levin +--- + drivers/clk/samsung/clk-exynos5420.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c +index 500a55415e900..a882f7038bcec 100644 +--- a/drivers/clk/samsung/clk-exynos5420.c ++++ b/drivers/clk/samsung/clk-exynos5420.c +@@ -633,6 +633,7 @@ static const struct samsung_div_clock exynos5420_div_clks[] __initconst = { + }; + + static const struct samsung_gate_clock exynos5420_gate_clks[] __initconst = { ++ GATE(CLK_SECKEY, "seckey", "aclk66_psgen", GATE_BUS_PERIS1, 1, 0, 0), + GATE(CLK_MAU_EPLL, "mau_epll", "mout_mau_epll_clk", + SRC_MASK_TOP7, 20, CLK_SET_RATE_PARENT, 0), + }; +@@ -1167,8 +1168,6 @@ static const struct samsung_gate_clock exynos5x_gate_clks[] __initconst = { + GATE(CLK_TMU, "tmu", "aclk66_psgen", GATE_IP_PERIS, 21, 0, 0), + GATE(CLK_TMU_GPU, "tmu_gpu", "aclk66_psgen", GATE_IP_PERIS, 22, 0, 0), + +- GATE(CLK_SECKEY, "seckey", "aclk66_psgen", GATE_BUS_PERIS1, 1, 0, 0), +- + /* GEN Block */ + GATE(CLK_ROTATOR, "rotator", "mout_user_aclk266", GATE_IP_GEN, 1, 0, 0), + GATE(CLK_JPEG, "jpeg", "aclk300_jpeg", GATE_IP_GEN, 2, 0, 0), +-- +2.20.1 + diff --git a/queue-4.14/clk-samsung-use-clk_hw-api-for-calling-clk-framework.patch b/queue-4.14/clk-samsung-use-clk_hw-api-for-calling-clk-framework.patch new file mode 100644 index 00000000000..8cfbcb34b4b --- /dev/null +++ b/queue-4.14/clk-samsung-use-clk_hw-api-for-calling-clk-framework.patch @@ -0,0 +1,71 @@ +From b4f50522faf9a98fb20e06de1a9b44f506e86d08 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Oct 2018 13:52:10 +0200 +Subject: clk: samsung: Use clk_hw API for calling clk framework from clk + notifiers + +From: Marek Szyprowski + +[ Upstream commit 1da220e3a5d22fccda0bc8542997abc1d1741268 ] + +clk_notifier_register() documentation states, that the provided notifier +callbacks associated with the notifier must not re-enter into the clk +framework by calling any top-level clk APIs. Fix this by replacing +clk_get_rate() calls with clk_hw_get_rate(), which is safe in this +context. + +Signed-off-by: Marek Szyprowski +Signed-off-by: Sylwester Nawrocki +Signed-off-by: Sasha Levin +--- + drivers/clk/samsung/clk-cpu.c | 6 +++--- + drivers/clk/samsung/clk-cpu.h | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/clk/samsung/clk-cpu.c b/drivers/clk/samsung/clk-cpu.c +index 6686e8ba61f9f..82f023f29a61f 100644 +--- a/drivers/clk/samsung/clk-cpu.c ++++ b/drivers/clk/samsung/clk-cpu.c +@@ -152,7 +152,7 @@ static int exynos_cpuclk_pre_rate_change(struct clk_notifier_data *ndata, + struct exynos_cpuclk *cpuclk, void __iomem *base) + { + const struct exynos_cpuclk_cfg_data *cfg_data = cpuclk->cfg; +- unsigned long alt_prate = clk_get_rate(cpuclk->alt_parent); ++ unsigned long alt_prate = clk_hw_get_rate(cpuclk->alt_parent); + unsigned long alt_div = 0, alt_div_mask = DIV_MASK; + unsigned long div0, div1 = 0, mux_reg; + unsigned long flags; +@@ -280,7 +280,7 @@ static int exynos5433_cpuclk_pre_rate_change(struct clk_notifier_data *ndata, + struct exynos_cpuclk *cpuclk, void __iomem *base) + { + const struct exynos_cpuclk_cfg_data *cfg_data = cpuclk->cfg; +- unsigned long alt_prate = clk_get_rate(cpuclk->alt_parent); ++ unsigned long alt_prate = clk_hw_get_rate(cpuclk->alt_parent); + unsigned long alt_div = 0, alt_div_mask = DIV_MASK; + unsigned long div0, div1 = 0, mux_reg; + unsigned long flags; +@@ -432,7 +432,7 @@ int __init exynos_register_cpu_clock(struct samsung_clk_provider *ctx, + else + cpuclk->clk_nb.notifier_call = exynos_cpuclk_notifier_cb; + +- cpuclk->alt_parent = __clk_lookup(alt_parent); ++ cpuclk->alt_parent = __clk_get_hw(__clk_lookup(alt_parent)); + if (!cpuclk->alt_parent) { + pr_err("%s: could not lookup alternate parent %s\n", + __func__, alt_parent); +diff --git a/drivers/clk/samsung/clk-cpu.h b/drivers/clk/samsung/clk-cpu.h +index d4b6b517fe1b4..bd38c6aa38970 100644 +--- a/drivers/clk/samsung/clk-cpu.h ++++ b/drivers/clk/samsung/clk-cpu.h +@@ -49,7 +49,7 @@ struct exynos_cpuclk_cfg_data { + */ + struct exynos_cpuclk { + struct clk_hw hw; +- struct clk *alt_parent; ++ struct clk_hw *alt_parent; + void __iomem *ctrl_base; + spinlock_t *lock; + const struct exynos_cpuclk_cfg_data *cfg; +-- +2.20.1 + diff --git a/queue-4.14/clocksource-drivers-sh_cmt-fix-clocksource-width-for.patch b/queue-4.14/clocksource-drivers-sh_cmt-fix-clocksource-width-for.patch new file mode 100644 index 00000000000..d17ef9c0710 --- /dev/null +++ b/queue-4.14/clocksource-drivers-sh_cmt-fix-clocksource-width-for.patch @@ -0,0 +1,60 @@ +From 7d9af3eaa61c2262f101199feb8491580dcd2732 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 10 Sep 2018 23:22:16 +0300 +Subject: clocksource/drivers/sh_cmt: Fix clocksource width for 32-bit machines + +From: Sergei Shtylyov + +[ Upstream commit 37e7742c55ba856eaec7e35673ee370f36eb17f3 ] + +The driver seems to abuse *unsigned long* not only for the (32-bit) +register values but also for the 'sh_cmt_channel::total_cycles' which +needs to always be 64-bit -- as a result, the clocksource's mask is +needlessly clamped down to 32-bits on the 32-bit machines... + +Fixes: 19bdc9d061bc ("clocksource: sh_cmt clocksource support") +Reported-by: Geert Uytterhoeven +Signed-off-by: Sergei Shtylyov +Reviewed-by: Simon Horman +Reviewed-by: Geert Uytterhoeven +Signed-off-by: Daniel Lezcano +Signed-off-by: Sasha Levin +--- + drivers/clocksource/sh_cmt.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c +index 560541f53c8d9..3cd62f7c33e30 100644 +--- a/drivers/clocksource/sh_cmt.c ++++ b/drivers/clocksource/sh_cmt.c +@@ -105,7 +105,7 @@ struct sh_cmt_channel { + raw_spinlock_t lock; + struct clock_event_device ced; + struct clocksource cs; +- unsigned long total_cycles; ++ u64 total_cycles; + bool cs_enabled; + }; + +@@ -607,8 +607,8 @@ static u64 sh_cmt_clocksource_read(struct clocksource *cs) + { + struct sh_cmt_channel *ch = cs_to_sh_cmt(cs); + unsigned long flags; +- unsigned long value; + u32 has_wrapped; ++ u64 value; + u32 raw; + + raw_spin_lock_irqsave(&ch->lock, flags); +@@ -682,7 +682,7 @@ static int sh_cmt_register_clocksource(struct sh_cmt_channel *ch, + cs->disable = sh_cmt_clocksource_disable; + cs->suspend = sh_cmt_clocksource_suspend; + cs->resume = sh_cmt_clocksource_resume; +- cs->mask = CLOCKSOURCE_MASK(sizeof(unsigned long) * 8); ++ cs->mask = CLOCKSOURCE_MASK(sizeof(u64) * 8); + cs->flags = CLOCK_SOURCE_IS_CONTINUOUS; + + dev_info(&ch->cmt->pdev->dev, "ch%u: used as clock source\n", +-- +2.20.1 + diff --git a/queue-4.14/clocksource-drivers-sh_cmt-fixup-for-64-bit-machines.patch b/queue-4.14/clocksource-drivers-sh_cmt-fixup-for-64-bit-machines.patch new file mode 100644 index 00000000000..cae913f41dd --- /dev/null +++ b/queue-4.14/clocksource-drivers-sh_cmt-fixup-for-64-bit-machines.patch @@ -0,0 +1,210 @@ +From 39794f733a32b63a4aad9bc0f828704eb69767c6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 8 Sep 2018 23:54:05 +0300 +Subject: clocksource/drivers/sh_cmt: Fixup for 64-bit machines + +From: Sergei Shtylyov + +[ Upstream commit 22627c6f3ed3d9d0df13eec3c831b08f8186c38e ] + +When trying to use CMT for clockevents on R-Car gen3 SoCs, I noticed +that 'max_delta_ns' for the broadcast timer (CMT) was shown as 1000 in +/proc/timer_list. It turned out that when calculating it, the driver did +1 << 32 (causing what I think was undefined behavior) resulting in a zero +delta, later clamped to 1000 by cev_delta2ns(). The root cause turned out +to be that the driver abused *unsigned long* for the CMT register values +(which are 16/32-bit), so that the calculation of 'ch->max_match_value' +in sh_cmt_setup_channel() used the wrong branch. Using more proper 'u32' +instead fixed 'max_delta_ns' and even fixed the switching an active +clocksource to CMT (which caused the system to turn non-interactive +before). + +Signed-off-by: Sergei Shtylyov +Reviewed-by: Geert Uytterhoeven +Signed-off-by: Daniel Lezcano +Signed-off-by: Sasha Levin +--- + drivers/clocksource/sh_cmt.c | 72 +++++++++++++++++------------------- + 1 file changed, 33 insertions(+), 39 deletions(-) + +diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c +index e09e8bf0bb9bf..560541f53c8d9 100644 +--- a/drivers/clocksource/sh_cmt.c ++++ b/drivers/clocksource/sh_cmt.c +@@ -75,18 +75,17 @@ struct sh_cmt_info { + enum sh_cmt_model model; + + unsigned long width; /* 16 or 32 bit version of hardware block */ +- unsigned long overflow_bit; +- unsigned long clear_bits; ++ u32 overflow_bit; ++ u32 clear_bits; + + /* callbacks for CMSTR and CMCSR access */ +- unsigned long (*read_control)(void __iomem *base, unsigned long offs); ++ u32 (*read_control)(void __iomem *base, unsigned long offs); + void (*write_control)(void __iomem *base, unsigned long offs, +- unsigned long value); ++ u32 value); + + /* callbacks for CMCNT and CMCOR access */ +- unsigned long (*read_count)(void __iomem *base, unsigned long offs); +- void (*write_count)(void __iomem *base, unsigned long offs, +- unsigned long value); ++ u32 (*read_count)(void __iomem *base, unsigned long offs); ++ void (*write_count)(void __iomem *base, unsigned long offs, u32 value); + }; + + struct sh_cmt_channel { +@@ -100,9 +99,9 @@ struct sh_cmt_channel { + + unsigned int timer_bit; + unsigned long flags; +- unsigned long match_value; +- unsigned long next_match_value; +- unsigned long max_match_value; ++ u32 match_value; ++ u32 next_match_value; ++ u32 max_match_value; + raw_spinlock_t lock; + struct clock_event_device ced; + struct clocksource cs; +@@ -157,24 +156,22 @@ struct sh_cmt_device { + #define SH_CMT32_CMCSR_CKS_RCLK1 (7 << 0) + #define SH_CMT32_CMCSR_CKS_MASK (7 << 0) + +-static unsigned long sh_cmt_read16(void __iomem *base, unsigned long offs) ++static u32 sh_cmt_read16(void __iomem *base, unsigned long offs) + { + return ioread16(base + (offs << 1)); + } + +-static unsigned long sh_cmt_read32(void __iomem *base, unsigned long offs) ++static u32 sh_cmt_read32(void __iomem *base, unsigned long offs) + { + return ioread32(base + (offs << 2)); + } + +-static void sh_cmt_write16(void __iomem *base, unsigned long offs, +- unsigned long value) ++static void sh_cmt_write16(void __iomem *base, unsigned long offs, u32 value) + { + iowrite16(value, base + (offs << 1)); + } + +-static void sh_cmt_write32(void __iomem *base, unsigned long offs, +- unsigned long value) ++static void sh_cmt_write32(void __iomem *base, unsigned long offs, u32 value) + { + iowrite32(value, base + (offs << 2)); + } +@@ -236,7 +233,7 @@ static const struct sh_cmt_info sh_cmt_info[] = { + #define CMCNT 1 /* channel register */ + #define CMCOR 2 /* channel register */ + +-static inline unsigned long sh_cmt_read_cmstr(struct sh_cmt_channel *ch) ++static inline u32 sh_cmt_read_cmstr(struct sh_cmt_channel *ch) + { + if (ch->iostart) + return ch->cmt->info->read_control(ch->iostart, 0); +@@ -244,8 +241,7 @@ static inline unsigned long sh_cmt_read_cmstr(struct sh_cmt_channel *ch) + return ch->cmt->info->read_control(ch->cmt->mapbase, 0); + } + +-static inline void sh_cmt_write_cmstr(struct sh_cmt_channel *ch, +- unsigned long value) ++static inline void sh_cmt_write_cmstr(struct sh_cmt_channel *ch, u32 value) + { + if (ch->iostart) + ch->cmt->info->write_control(ch->iostart, 0, value); +@@ -253,39 +249,35 @@ static inline void sh_cmt_write_cmstr(struct sh_cmt_channel *ch, + ch->cmt->info->write_control(ch->cmt->mapbase, 0, value); + } + +-static inline unsigned long sh_cmt_read_cmcsr(struct sh_cmt_channel *ch) ++static inline u32 sh_cmt_read_cmcsr(struct sh_cmt_channel *ch) + { + return ch->cmt->info->read_control(ch->ioctrl, CMCSR); + } + +-static inline void sh_cmt_write_cmcsr(struct sh_cmt_channel *ch, +- unsigned long value) ++static inline void sh_cmt_write_cmcsr(struct sh_cmt_channel *ch, u32 value) + { + ch->cmt->info->write_control(ch->ioctrl, CMCSR, value); + } + +-static inline unsigned long sh_cmt_read_cmcnt(struct sh_cmt_channel *ch) ++static inline u32 sh_cmt_read_cmcnt(struct sh_cmt_channel *ch) + { + return ch->cmt->info->read_count(ch->ioctrl, CMCNT); + } + +-static inline void sh_cmt_write_cmcnt(struct sh_cmt_channel *ch, +- unsigned long value) ++static inline void sh_cmt_write_cmcnt(struct sh_cmt_channel *ch, u32 value) + { + ch->cmt->info->write_count(ch->ioctrl, CMCNT, value); + } + +-static inline void sh_cmt_write_cmcor(struct sh_cmt_channel *ch, +- unsigned long value) ++static inline void sh_cmt_write_cmcor(struct sh_cmt_channel *ch, u32 value) + { + ch->cmt->info->write_count(ch->ioctrl, CMCOR, value); + } + +-static unsigned long sh_cmt_get_counter(struct sh_cmt_channel *ch, +- int *has_wrapped) ++static u32 sh_cmt_get_counter(struct sh_cmt_channel *ch, u32 *has_wrapped) + { +- unsigned long v1, v2, v3; +- int o1, o2; ++ u32 v1, v2, v3; ++ u32 o1, o2; + + o1 = sh_cmt_read_cmcsr(ch) & ch->cmt->info->overflow_bit; + +@@ -305,7 +297,8 @@ static unsigned long sh_cmt_get_counter(struct sh_cmt_channel *ch, + + static void sh_cmt_start_stop_ch(struct sh_cmt_channel *ch, int start) + { +- unsigned long flags, value; ++ unsigned long flags; ++ u32 value; + + /* start stop register shared by multiple timer channels */ + raw_spin_lock_irqsave(&ch->cmt->lock, flags); +@@ -412,11 +405,11 @@ static void sh_cmt_disable(struct sh_cmt_channel *ch) + static void sh_cmt_clock_event_program_verify(struct sh_cmt_channel *ch, + int absolute) + { +- unsigned long new_match; +- unsigned long value = ch->next_match_value; +- unsigned long delay = 0; +- unsigned long now = 0; +- int has_wrapped; ++ u32 value = ch->next_match_value; ++ u32 new_match; ++ u32 delay = 0; ++ u32 now = 0; ++ u32 has_wrapped; + + now = sh_cmt_get_counter(ch, &has_wrapped); + ch->flags |= FLAG_REPROGRAM; /* force reprogram */ +@@ -613,9 +606,10 @@ static struct sh_cmt_channel *cs_to_sh_cmt(struct clocksource *cs) + static u64 sh_cmt_clocksource_read(struct clocksource *cs) + { + struct sh_cmt_channel *ch = cs_to_sh_cmt(cs); +- unsigned long flags, raw; ++ unsigned long flags; + unsigned long value; +- int has_wrapped; ++ u32 has_wrapped; ++ u32 raw; + + raw_spin_lock_irqsave(&ch->lock, flags); + value = ch->total_cycles; +-- +2.20.1 + diff --git a/queue-4.14/cpu-smt-state-smt-is-disabled-even-with-nosmt-and-wi.patch b/queue-4.14/cpu-smt-state-smt-is-disabled-even-with-nosmt-and-wi.patch new file mode 100644 index 00000000000..9106f6d7125 --- /dev/null +++ b/queue-4.14/cpu-smt-state-smt-is-disabled-even-with-nosmt-and-wi.patch @@ -0,0 +1,41 @@ +From bb5798ba9d00cc95df9e5921e373c73dabc13953 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Oct 2018 19:22:27 +0200 +Subject: cpu/SMT: State SMT is disabled even with nosmt and without "=force" + +From: Borislav Petkov + +[ Upstream commit d0e7d14455d41163126afecd0fcce935463cc512 ] + +When booting with "nosmt=force" a message is issued into dmesg to +confirm that SMT has been force-disabled but such a message is not +issued when only "nosmt" is on the kernel command line. + +Fix that. + +Signed-off-by: Borislav Petkov +Cc: Linus Torvalds +Cc: Peter Zijlstra +Cc: Thomas Gleixner +Link: http://lkml.kernel.org/r/20181004172227.10094-1-bp@alien8.de +Signed-off-by: Ingo Molnar +Signed-off-by: Sasha Levin +--- + kernel/cpu.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kernel/cpu.c b/kernel/cpu.c +index 96f970d77339a..49273130e4f1e 100644 +--- a/kernel/cpu.c ++++ b/kernel/cpu.c +@@ -376,6 +376,7 @@ void __init cpu_smt_disable(bool force) + pr_info("SMT: Force disabled\n"); + cpu_smt_control = CPU_SMT_FORCE_DISABLED; + } else { ++ pr_info("SMT: disabled\n"); + cpu_smt_control = CPU_SMT_DISABLED; + } + } +-- +2.20.1 + diff --git a/queue-4.14/crypto-mxs-dcp-fix-aes-issues.patch b/queue-4.14/crypto-mxs-dcp-fix-aes-issues.patch new file mode 100644 index 00000000000..373525e8162 --- /dev/null +++ b/queue-4.14/crypto-mxs-dcp-fix-aes-issues.patch @@ -0,0 +1,121 @@ +From 93e217245b4b2175d24d71f846c699b87b43722e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Oct 2018 19:01:52 +0000 +Subject: crypto: mxs-dcp - Fix AES issues + +From: Radu Solea + +[ Upstream commit fadd7a6e616b89c7f4f7bfa7b824f290bab32c3c ] + +The DCP driver does not obey cryptlen, when doing android CTS this +results in passing to hardware input stream lengths which are not +multiple of block size. + +Add a check to prevent future erroneous stream lengths from reaching the +hardware and adjust the scatterlist walking code to obey cryptlen. + +Also properly copy-out the IV for chaining. + +Signed-off-by: Radu Solea +Signed-off-by: Franck LENORMAND +Signed-off-by: Leonard Crestez +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + drivers/crypto/mxs-dcp.c | 33 +++++++++++++++++++++++++++++++-- + 1 file changed, 31 insertions(+), 2 deletions(-) + +diff --git a/drivers/crypto/mxs-dcp.c b/drivers/crypto/mxs-dcp.c +index 4615dbee22d0a..e1e1e81107904 100644 +--- a/drivers/crypto/mxs-dcp.c ++++ b/drivers/crypto/mxs-dcp.c +@@ -225,6 +225,12 @@ static int mxs_dcp_run_aes(struct dcp_async_ctx *actx, + dma_addr_t dst_phys = dma_map_single(sdcp->dev, sdcp->coh->aes_out_buf, + DCP_BUF_SZ, DMA_FROM_DEVICE); + ++ if (actx->fill % AES_BLOCK_SIZE) { ++ dev_err(sdcp->dev, "Invalid block size!\n"); ++ ret = -EINVAL; ++ goto aes_done_run; ++ } ++ + /* Fill in the DMA descriptor. */ + desc->control0 = MXS_DCP_CONTROL0_DECR_SEMAPHORE | + MXS_DCP_CONTROL0_INTERRUPT | +@@ -254,6 +260,7 @@ static int mxs_dcp_run_aes(struct dcp_async_ctx *actx, + + ret = mxs_dcp_start_dma(actx); + ++aes_done_run: + dma_unmap_single(sdcp->dev, key_phys, 2 * AES_KEYSIZE_128, + DMA_TO_DEVICE); + dma_unmap_single(sdcp->dev, src_phys, DCP_BUF_SZ, DMA_TO_DEVICE); +@@ -280,13 +287,15 @@ static int mxs_dcp_aes_block_crypt(struct crypto_async_request *arq) + + uint8_t *out_tmp, *src_buf, *dst_buf = NULL; + uint32_t dst_off = 0; ++ uint32_t last_out_len = 0; + + uint8_t *key = sdcp->coh->aes_key; + + int ret = 0; + int split = 0; +- unsigned int i, len, clen, rem = 0; ++ unsigned int i, len, clen, rem = 0, tlen = 0; + int init = 0; ++ bool limit_hit = false; + + actx->fill = 0; + +@@ -305,6 +314,11 @@ static int mxs_dcp_aes_block_crypt(struct crypto_async_request *arq) + for_each_sg(req->src, src, nents, i) { + src_buf = sg_virt(src); + len = sg_dma_len(src); ++ tlen += len; ++ limit_hit = tlen > req->nbytes; ++ ++ if (limit_hit) ++ len = req->nbytes - (tlen - len); + + do { + if (actx->fill + len > out_off) +@@ -321,13 +335,15 @@ static int mxs_dcp_aes_block_crypt(struct crypto_async_request *arq) + * If we filled the buffer or this is the last SG, + * submit the buffer. + */ +- if (actx->fill == out_off || sg_is_last(src)) { ++ if (actx->fill == out_off || sg_is_last(src) || ++ limit_hit) { + ret = mxs_dcp_run_aes(actx, req, init); + if (ret) + return ret; + init = 0; + + out_tmp = out_buf; ++ last_out_len = actx->fill; + while (dst && actx->fill) { + if (!split) { + dst_buf = sg_virt(dst); +@@ -350,6 +366,19 @@ static int mxs_dcp_aes_block_crypt(struct crypto_async_request *arq) + } + } + } while (len); ++ ++ if (limit_hit) ++ break; ++ } ++ ++ /* Copy the IV for CBC for chaining */ ++ if (!rctx->ecb) { ++ if (rctx->enc) ++ memcpy(req->info, out_buf+(last_out_len-AES_BLOCK_SIZE), ++ AES_BLOCK_SIZE); ++ else ++ memcpy(req->info, in_buf+(last_out_len-AES_BLOCK_SIZE), ++ AES_BLOCK_SIZE); + } + + return ret; +-- +2.20.1 + diff --git a/queue-4.14/crypto-mxs-dcp-fix-sha-null-hashes-and-output-length.patch b/queue-4.14/crypto-mxs-dcp-fix-sha-null-hashes-and-output-length.patch new file mode 100644 index 00000000000..9d74d2b417f --- /dev/null +++ b/queue-4.14/crypto-mxs-dcp-fix-sha-null-hashes-and-output-length.patch @@ -0,0 +1,133 @@ +From fc7cb48d140e1d80d7656e4a944d6efaafc1d269 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Oct 2018 19:01:50 +0000 +Subject: crypto: mxs-dcp - Fix SHA null hashes and output length + +From: Radu Solea + +[ Upstream commit c709eebaf5c5faa8a0f140355f9cfe67e8f7afb1 ] + +DCP writes at least 32 bytes in the output buffer instead of hash length +as documented. Add intermediate buffer to prevent write out of bounds. + +When requested to produce null hashes DCP fails to produce valid output. +Add software workaround to bypass hardware and return valid output. + +Signed-off-by: Radu Solea +Signed-off-by: Leonard Crestez +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + drivers/crypto/mxs-dcp.c | 47 +++++++++++++++++++++++++++++++--------- + 1 file changed, 37 insertions(+), 10 deletions(-) + +diff --git a/drivers/crypto/mxs-dcp.c b/drivers/crypto/mxs-dcp.c +index a98a25733a222..4615dbee22d0a 100644 +--- a/drivers/crypto/mxs-dcp.c ++++ b/drivers/crypto/mxs-dcp.c +@@ -28,9 +28,24 @@ + + #define DCP_MAX_CHANS 4 + #define DCP_BUF_SZ PAGE_SIZE ++#define DCP_SHA_PAY_SZ 64 + + #define DCP_ALIGNMENT 64 + ++/* ++ * Null hashes to align with hw behavior on imx6sl and ull ++ * these are flipped for consistency with hw output ++ */ ++const uint8_t sha1_null_hash[] = ++ "\x09\x07\xd8\xaf\x90\x18\x60\x95\xef\xbf" ++ "\x55\x32\x0d\x4b\x6b\x5e\xee\xa3\x39\xda"; ++ ++const uint8_t sha256_null_hash[] = ++ "\x55\xb8\x52\x78\x1b\x99\x95\xa4" ++ "\x4c\x93\x9b\x64\xe4\x41\xae\x27" ++ "\x24\xb9\x6f\x99\xc8\xf4\xfb\x9a" ++ "\x14\x1c\xfc\x98\x42\xc4\xb0\xe3"; ++ + /* DCP DMA descriptor. */ + struct dcp_dma_desc { + uint32_t next_cmd_addr; +@@ -48,6 +63,7 @@ struct dcp_coherent_block { + uint8_t aes_in_buf[DCP_BUF_SZ]; + uint8_t aes_out_buf[DCP_BUF_SZ]; + uint8_t sha_in_buf[DCP_BUF_SZ]; ++ uint8_t sha_out_buf[DCP_SHA_PAY_SZ]; + + uint8_t aes_key[2 * AES_KEYSIZE_128]; + +@@ -513,8 +529,6 @@ static int mxs_dcp_run_sha(struct ahash_request *req) + struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); + struct dcp_async_ctx *actx = crypto_ahash_ctx(tfm); + struct dcp_sha_req_ctx *rctx = ahash_request_ctx(req); +- struct hash_alg_common *halg = crypto_hash_alg_common(tfm); +- + struct dcp_dma_desc *desc = &sdcp->coh->desc[actx->chan]; + + dma_addr_t digest_phys = 0; +@@ -536,10 +550,23 @@ static int mxs_dcp_run_sha(struct ahash_request *req) + desc->payload = 0; + desc->status = 0; + ++ /* ++ * Align driver with hw behavior when generating null hashes ++ */ ++ if (rctx->init && rctx->fini && desc->size == 0) { ++ struct hash_alg_common *halg = crypto_hash_alg_common(tfm); ++ const uint8_t *sha_buf = ++ (actx->alg == MXS_DCP_CONTROL1_HASH_SELECT_SHA1) ? ++ sha1_null_hash : sha256_null_hash; ++ memcpy(sdcp->coh->sha_out_buf, sha_buf, halg->digestsize); ++ ret = 0; ++ goto done_run; ++ } ++ + /* Set HASH_TERM bit for last transfer block. */ + if (rctx->fini) { +- digest_phys = dma_map_single(sdcp->dev, req->result, +- halg->digestsize, DMA_FROM_DEVICE); ++ digest_phys = dma_map_single(sdcp->dev, sdcp->coh->sha_out_buf, ++ DCP_SHA_PAY_SZ, DMA_FROM_DEVICE); + desc->control0 |= MXS_DCP_CONTROL0_HASH_TERM; + desc->payload = digest_phys; + } +@@ -547,9 +574,10 @@ static int mxs_dcp_run_sha(struct ahash_request *req) + ret = mxs_dcp_start_dma(actx); + + if (rctx->fini) +- dma_unmap_single(sdcp->dev, digest_phys, halg->digestsize, ++ dma_unmap_single(sdcp->dev, digest_phys, DCP_SHA_PAY_SZ, + DMA_FROM_DEVICE); + ++done_run: + dma_unmap_single(sdcp->dev, buf_phys, DCP_BUF_SZ, DMA_TO_DEVICE); + + return ret; +@@ -567,6 +595,7 @@ static int dcp_sha_req_to_buf(struct crypto_async_request *arq) + const int nents = sg_nents(req->src); + + uint8_t *in_buf = sdcp->coh->sha_in_buf; ++ uint8_t *out_buf = sdcp->coh->sha_out_buf; + + uint8_t *src_buf; + +@@ -621,11 +650,9 @@ static int dcp_sha_req_to_buf(struct crypto_async_request *arq) + + actx->fill = 0; + +- /* For some reason, the result is flipped. */ +- for (i = 0; i < halg->digestsize / 2; i++) { +- swap(req->result[i], +- req->result[halg->digestsize - i - 1]); +- } ++ /* For some reason the result is flipped */ ++ for (i = 0; i < halg->digestsize; i++) ++ req->result[i] = out_buf[halg->digestsize - i - 1]; + } + + return 0; +-- +2.20.1 + diff --git a/queue-4.14/cxgb4-use-proper-enum-in-cxgb4_dcb_handle_fw_update.patch b/queue-4.14/cxgb4-use-proper-enum-in-cxgb4_dcb_handle_fw_update.patch new file mode 100644 index 00000000000..2b38a9fe48e --- /dev/null +++ b/queue-4.14/cxgb4-use-proper-enum-in-cxgb4_dcb_handle_fw_update.patch @@ -0,0 +1,55 @@ +From d7af9b292a3f1edf7d91cb7b900695fd497b8eb4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 30 Sep 2018 20:51:43 -0700 +Subject: cxgb4: Use proper enum in cxgb4_dcb_handle_fw_update + +From: Nathan Chancellor + +[ Upstream commit 3b0b8f0d9a259f6a428af63e7a77547325f8e081 ] + +Clang warns when one enumerated type is implicitly converted to another. + +drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c:303:7: warning: implicit +conversion from enumeration type 'enum cxgb4_dcb_state' to different +enumeration type 'enum cxgb4_dcb_state_input' [-Wenum-conversion] + ? CXGB4_DCB_STATE_FW_ALLSYNCED + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ +drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c:304:7: warning: implicit +conversion from enumeration type 'enum cxgb4_dcb_state' to different +enumeration type 'enum cxgb4_dcb_state_input' [-Wenum-conversion] + : CXGB4_DCB_STATE_FW_INCOMPLETE); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +2 warnings generated. + +Use the equivalent value of the expected type to silence Clang while +resulting in no functional change. + +CXGB4_DCB_STATE_FW_INCOMPLETE = CXGB4_DCB_INPUT_FW_INCOMPLETE = 2 +CXGB4_DCB_STATE_FW_ALLSYNCED = CXGB4_DCB_INPUT_FW_ALLSYNCED = 3 + +Signed-off-by: Nathan Chancellor +Reviewed-by: Nick Desaulniers +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c +index 6ee2ed30626bf..306b4b3206168 100644 +--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c ++++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c +@@ -266,8 +266,8 @@ void cxgb4_dcb_handle_fw_update(struct adapter *adap, + enum cxgb4_dcb_state_input input = + ((pcmd->u.dcb.control.all_syncd_pkd & + FW_PORT_CMD_ALL_SYNCD_F) +- ? CXGB4_DCB_STATE_FW_ALLSYNCED +- : CXGB4_DCB_STATE_FW_INCOMPLETE); ++ ? CXGB4_DCB_INPUT_FW_ALLSYNCED ++ : CXGB4_DCB_INPUT_FW_INCOMPLETE); + + if (dcb->dcb_version != FW_PORT_DCB_VER_UNKNOWN) { + dcb_running_version = FW_PORT_CMD_DCB_VERSION_G( +-- +2.20.1 + diff --git a/queue-4.14/cxgb4-use-proper-enum-in-ieee_faux_sync.patch b/queue-4.14/cxgb4-use-proper-enum-in-ieee_faux_sync.patch new file mode 100644 index 00000000000..4d9db8c41d7 --- /dev/null +++ b/queue-4.14/cxgb4-use-proper-enum-in-ieee_faux_sync.patch @@ -0,0 +1,50 @@ +From 83e78b76616a645bcca00abbb9644fe760fe2fa2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 30 Sep 2018 20:47:38 -0700 +Subject: cxgb4: Use proper enum in IEEE_FAUX_SYNC + +From: Nathan Chancellor + +[ Upstream commit 258b6d141878530ba1f8fc44db683822389de914 ] + +Clang warns when one enumerated type is implicitly converted to another. + +drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c:390:4: warning: implicit +conversion from enumeration type 'enum cxgb4_dcb_state' to different +enumeration type 'enum cxgb4_dcb_state_input' [-Wenum-conversion] + IEEE_FAUX_SYNC(dev, dcb); + ^~~~~~~~~~~~~~~~~~~~~~~~ +drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h:70:10: note: expanded +from macro 'IEEE_FAUX_SYNC' + CXGB4_DCB_STATE_FW_ALLSYNCED); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Use the equivalent value of the expected type to silence Clang while +resulting in no functional change. + +CXGB4_DCB_STATE_FW_ALLSYNCED = CXGB4_DCB_INPUT_FW_ALLSYNCED = 3 + +Signed-off-by: Nathan Chancellor +Reviewed-by: Nick Desaulniers +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h +index ccf24d3dc9824..2c418c405c508 100644 +--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h ++++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h +@@ -67,7 +67,7 @@ + do { \ + if ((__dcb)->dcb_version == FW_PORT_DCB_VER_IEEE) \ + cxgb4_dcb_state_fsm((__dev), \ +- CXGB4_DCB_STATE_FW_ALLSYNCED); \ ++ CXGB4_DCB_INPUT_FW_ALLSYNCED); \ + } while (0) + + /* States we can be in for a port's Data Center Bridging. +-- +2.20.1 + diff --git a/queue-4.14/dmaengine-ep93xx-return-proper-enum-in-ep93xx_dma_ch.patch b/queue-4.14/dmaengine-ep93xx-return-proper-enum-in-ep93xx_dma_ch.patch new file mode 100644 index 00000000000..6605365a5b4 --- /dev/null +++ b/queue-4.14/dmaengine-ep93xx-return-proper-enum-in-ep93xx_dma_ch.patch @@ -0,0 +1,46 @@ +From 232f4069bc9032a2e33355c568bcd590c418d4b6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 11 Sep 2018 16:40:20 -0700 +Subject: dmaengine: ep93xx: Return proper enum in ep93xx_dma_chan_direction + +From: Nathan Chancellor + +[ Upstream commit 9524d6b265f9b2b9a61fceb2ee2ce1c2a83e39ca ] + +Clang warns when implicitly converting from one enumerated type to +another. Avoid this by using the equivalent value from the expected +type. + +In file included from drivers/dma/ep93xx_dma.c:30: +./include/linux/platform_data/dma-ep93xx.h:88:10: warning: implicit +conversion from enumeration type 'enum dma_data_direction' to different +enumeration type 'enum dma_transfer_direction' [-Wenum-conversion] + return DMA_NONE; + ~~~~~~ ^~~~~~~~ +1 warning generated. + +Reported-by: Nick Desaulniers +Signed-off-by: Nathan Chancellor +Reviewed-by: Nick Desaulniers +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + include/linux/platform_data/dma-ep93xx.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/linux/platform_data/dma-ep93xx.h b/include/linux/platform_data/dma-ep93xx.h +index f8f1f6b952a62..eb9805bb3fe8a 100644 +--- a/include/linux/platform_data/dma-ep93xx.h ++++ b/include/linux/platform_data/dma-ep93xx.h +@@ -85,7 +85,7 @@ static inline enum dma_transfer_direction + ep93xx_dma_chan_direction(struct dma_chan *chan) + { + if (!ep93xx_dma_chan_is_m2p(chan)) +- return DMA_NONE; ++ return DMA_TRANS_NONE; + + /* even channels are for TX, odd for RX */ + return (chan->chan_id % 2 == 0) ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM; +-- +2.20.1 + diff --git a/queue-4.14/dmaengine-ioat-fix-prototype-of-ioat_enumerate_chann.patch b/queue-4.14/dmaengine-ioat-fix-prototype-of-ioat_enumerate_chann.patch new file mode 100644 index 00000000000..7e84837b16d --- /dev/null +++ b/queue-4.14/dmaengine-ioat-fix-prototype-of-ioat_enumerate_chann.patch @@ -0,0 +1,58 @@ +From 8afb65c9973618bb61d6228802777f140f2dbcd2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Oct 2018 00:03:10 +0300 +Subject: dmaengine: ioat: fix prototype of ioat_enumerate_channels + +From: Rami Rosen + +[ Upstream commit f4d34aa8c887a8a2d23ef546da0efa10e3f77241 ] + +Signed-off-by: Rami Rosen +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/dma/ioat/init.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c +index 68680e4151eaa..9103a0425f752 100644 +--- a/drivers/dma/ioat/init.c ++++ b/drivers/dma/ioat/init.c +@@ -129,7 +129,7 @@ static void + ioat_init_channel(struct ioatdma_device *ioat_dma, + struct ioatdma_chan *ioat_chan, int idx); + static void ioat_intr_quirk(struct ioatdma_device *ioat_dma); +-static int ioat_enumerate_channels(struct ioatdma_device *ioat_dma); ++static void ioat_enumerate_channels(struct ioatdma_device *ioat_dma); + static int ioat3_dma_self_test(struct ioatdma_device *ioat_dma); + + static int ioat_dca_enabled = 1; +@@ -575,7 +575,7 @@ static void ioat_dma_remove(struct ioatdma_device *ioat_dma) + * ioat_enumerate_channels - find and initialize the device's channels + * @ioat_dma: the ioat dma device to be enumerated + */ +-static int ioat_enumerate_channels(struct ioatdma_device *ioat_dma) ++static void ioat_enumerate_channels(struct ioatdma_device *ioat_dma) + { + struct ioatdma_chan *ioat_chan; + struct device *dev = &ioat_dma->pdev->dev; +@@ -594,7 +594,7 @@ static int ioat_enumerate_channels(struct ioatdma_device *ioat_dma) + xfercap_log = readb(ioat_dma->reg_base + IOAT_XFERCAP_OFFSET); + xfercap_log &= 0x1f; /* bits [4:0] valid */ + if (xfercap_log == 0) +- return 0; ++ return; + dev_dbg(dev, "%s: xfercap = %d\n", __func__, 1 << xfercap_log); + + for (i = 0; i < dma->chancnt; i++) { +@@ -611,7 +611,6 @@ static int ioat_enumerate_channels(struct ioatdma_device *ioat_dma) + } + } + dma->chancnt = i; +- return i; + } + + /** +-- +2.20.1 + diff --git a/queue-4.14/dmaengine-rcar-dmac-set-scatter-gather-max-segment-s.patch b/queue-4.14/dmaengine-rcar-dmac-set-scatter-gather-max-segment-s.patch new file mode 100644 index 00000000000..2aa989431dd --- /dev/null +++ b/queue-4.14/dmaengine-rcar-dmac-set-scatter-gather-max-segment-s.patch @@ -0,0 +1,43 @@ +From 27fc33487d605177cd8530d20305eef08d9f94aa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 14 Sep 2018 17:43:28 +0200 +Subject: dmaengine: rcar-dmac: set scatter/gather max segment size + +From: Wolfram Sang + +[ Upstream commit 97d49c59e219acac576e16293a6b8cb99302f62f ] + +Fix warning when running with CONFIG_DMA_API_DEBUG_SG=y by allocating a +device_dma_parameters structure and filling in the max segment size. + +Signed-off-by: Wolfram Sang +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/dma/sh/rcar-dmac.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c +index 19c7433e83097..f7ca57125ac7c 100644 +--- a/drivers/dma/sh/rcar-dmac.c ++++ b/drivers/dma/sh/rcar-dmac.c +@@ -200,6 +200,7 @@ struct rcar_dmac { + struct dma_device engine; + struct device *dev; + void __iomem *iomem; ++ struct device_dma_parameters parms; + + unsigned int n_channels; + struct rcar_dmac_chan *channels; +@@ -1764,6 +1765,8 @@ static int rcar_dmac_probe(struct platform_device *pdev) + + dmac->dev = &pdev->dev; + platform_set_drvdata(pdev, dmac); ++ dmac->dev->dma_parms = &dmac->parms; ++ dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK); + dma_set_mask_and_coherent(dmac->dev, DMA_BIT_MASK(40)); + + ret = rcar_dmac_parse_of(&pdev->dev, dmac); +-- +2.20.1 + diff --git a/queue-4.14/dmaengine-timb_dma-use-proper-enum-in-td_prep_slave_.patch b/queue-4.14/dmaengine-timb_dma-use-proper-enum-in-td_prep_slave_.patch new file mode 100644 index 00000000000..7ce43c084a1 --- /dev/null +++ b/queue-4.14/dmaengine-timb_dma-use-proper-enum-in-td_prep_slave_.patch @@ -0,0 +1,45 @@ +From 93ad9f021e37ef7603a2ffa2f35cd73544ab8222 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 11 Sep 2018 16:20:25 -0700 +Subject: dmaengine: timb_dma: Use proper enum in td_prep_slave_sg + +From: Nathan Chancellor + +[ Upstream commit 5e621f5d538985f010035c6f3e28c22829d36db1 ] + +Clang warns when implicitly converting from one enumerated type to +another. Avoid this by using the equivalent value from the expected +type. + +drivers/dma/timb_dma.c:548:27: warning: implicit conversion from +enumeration type 'enum dma_transfer_direction' to different enumeration +type 'enum dma_data_direction' [-Wenum-conversion] + td_desc->desc_list_len, DMA_MEM_TO_DEV); + ^~~~~~~~~~~~~~ +1 warning generated. + +Reported-by: Nick Desaulniers +Signed-off-by: Nathan Chancellor +Reviewed-by: Nick Desaulniers +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/dma/timb_dma.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c +index 896bafb7a5324..cf6588cc3efdc 100644 +--- a/drivers/dma/timb_dma.c ++++ b/drivers/dma/timb_dma.c +@@ -545,7 +545,7 @@ static struct dma_async_tx_descriptor *td_prep_slave_sg(struct dma_chan *chan, + } + + dma_sync_single_for_device(chan2dmadev(chan), td_desc->txd.phys, +- td_desc->desc_list_len, DMA_MEM_TO_DEV); ++ td_desc->desc_list_len, DMA_TO_DEVICE); + + return &td_desc->txd; + } +-- +2.20.1 + diff --git a/queue-4.14/ext4-fix-build-error-when-dx_debug-is-defined.patch b/queue-4.14/ext4-fix-build-error-when-dx_debug-is-defined.patch new file mode 100644 index 00000000000..b3c582d5b75 --- /dev/null +++ b/queue-4.14/ext4-fix-build-error-when-dx_debug-is-defined.patch @@ -0,0 +1,44 @@ +From 2b63dd667a5405214824bb53c9390f2ea05bc657 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Oct 2018 12:43:51 -0400 +Subject: ext4: fix build error when DX_DEBUG is defined +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Gabriel Krisman Bertazi + +[ Upstream commit 799578ab16e86b074c184ec5abbda0bc698c7b0b ] + +Enabling DX_DEBUG triggers the build error below. info is an attribute +of the dxroot structure. + +linux/fs/ext4/namei.c:2264:12: error: ‘info’ +undeclared (first use in this function); did you mean ‘insl’? + info->indirect_levels)); + +Fixes: e08ac99fa2a2 ("ext4: add largedir feature") +Signed-off-by: Gabriel Krisman Bertazi +Signed-off-by: Theodore Ts'o +Reviewed-by: Lukas Czerner +Signed-off-by: Sasha Levin +--- + fs/ext4/namei.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c +index 162e853dc5d65..212b01861d941 100644 +--- a/fs/ext4/namei.c ++++ b/fs/ext4/namei.c +@@ -2293,7 +2293,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct ext4_filename *fname, + dxroot->info.indirect_levels += 1; + dxtrace(printk(KERN_DEBUG + "Creating %d level index...\n", +- info->indirect_levels)); ++ dxroot->info.indirect_levels)); + err = ext4_handle_dirty_dx_node(handle, dir, frame->bh); + if (err) + goto journal_error; +-- +2.20.1 + diff --git a/queue-4.14/f2fs-return-correct-errno-in-f2fs_gc.patch b/queue-4.14/f2fs-return-correct-errno-in-f2fs_gc.patch new file mode 100644 index 00000000000..9dd1c317f48 --- /dev/null +++ b/queue-4.14/f2fs-return-correct-errno-in-f2fs_gc.patch @@ -0,0 +1,34 @@ +From 8f065c163a63591d948d5282227110cec394ecae Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 25 Sep 2018 15:25:21 -0700 +Subject: f2fs: return correct errno in f2fs_gc + +From: Jaegeuk Kim + +[ Upstream commit 61f7725aa148ee870436a29d3a24d5c00ab7e9af ] + +This fixes overriding error number in f2fs_gc. + +Reviewed-by: Chao Yu +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +--- + fs/f2fs/gc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c +index ceb6023786bdf..67120181dc2af 100644 +--- a/fs/f2fs/gc.c ++++ b/fs/f2fs/gc.c +@@ -1091,7 +1091,7 @@ int f2fs_gc(struct f2fs_sb_info *sbi, bool sync, + + put_gc_inode(&gc_list); + +- if (sync) ++ if (sync && !ret) + ret = sec_freed ? 0 : -EAGAIN; + return ret; + } +-- +2.20.1 + diff --git a/queue-4.14/fbdev-sbuslib-integer-overflow-in-sbusfb_ioctl_helpe.patch b/queue-4.14/fbdev-sbuslib-integer-overflow-in-sbusfb_ioctl_helpe.patch new file mode 100644 index 00000000000..581eda27552 --- /dev/null +++ b/queue-4.14/fbdev-sbuslib-integer-overflow-in-sbusfb_ioctl_helpe.patch @@ -0,0 +1,38 @@ +From c9feb089ffc07043c301e71ec98c3db8bf334a82 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Oct 2018 12:57:36 +0200 +Subject: fbdev: sbuslib: integer overflow in sbusfb_ioctl_helper() + +From: Dan Carpenter + +[ Upstream commit e5017716adb8aa5c01c52386c1b7470101ffe9c5 ] + +The "index + count" addition can overflow. Both come directly from the +user. This bug leads to an information leak. + +Signed-off-by: Dan Carpenter +Cc: Peter Malone +Cc: Philippe Ombredanne +Cc: Mathieu Malaterre +Signed-off-by: Bartlomiej Zolnierkiewicz +Signed-off-by: Sasha Levin +--- + drivers/video/fbdev/sbuslib.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/video/fbdev/sbuslib.c b/drivers/video/fbdev/sbuslib.c +index 90c51330969c2..01a7110e61a76 100644 +--- a/drivers/video/fbdev/sbuslib.c ++++ b/drivers/video/fbdev/sbuslib.c +@@ -171,7 +171,7 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, + get_user(ublue, &c->blue)) + return -EFAULT; + +- if (index + count > cmap->len) ++ if (index > cmap->len || count > cmap->len - index) + return -EINVAL; + + for (i = 0; i < count; i++) { +-- +2.20.1 + diff --git a/queue-4.14/fbdev-sbuslib-use-checked-version-of-put_user.patch b/queue-4.14/fbdev-sbuslib-use-checked-version-of-put_user.patch new file mode 100644 index 00000000000..3f1928e4297 --- /dev/null +++ b/queue-4.14/fbdev-sbuslib-use-checked-version-of-put_user.patch @@ -0,0 +1,77 @@ +From 19f6803c5f1e2707dd01c83eef099e8f41e35563 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Oct 2018 12:57:36 +0200 +Subject: fbdev: sbuslib: use checked version of put_user() + +From: Dan Carpenter + +[ Upstream commit d8bad911e5e55e228d59c0606ff7e6b8131ca7bf ] + +I'm not sure why the code assumes that only the first put_user() needs +an access_ok() check. I have made all the put_user() and get_user() +calls checked. + +Signed-off-by: Dan Carpenter +Cc: Philippe Ombredanne +Cc: Mathieu Malaterre +Cc: Peter Malone , +Signed-off-by: Bartlomiej Zolnierkiewicz +Signed-off-by: Sasha Levin +--- + drivers/video/fbdev/sbuslib.c | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/drivers/video/fbdev/sbuslib.c b/drivers/video/fbdev/sbuslib.c +index a436d44f1b7fb..90c51330969c2 100644 +--- a/drivers/video/fbdev/sbuslib.c ++++ b/drivers/video/fbdev/sbuslib.c +@@ -106,11 +106,11 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, + struct fbtype __user *f = (struct fbtype __user *) arg; + + if (put_user(type, &f->fb_type) || +- __put_user(info->var.yres, &f->fb_height) || +- __put_user(info->var.xres, &f->fb_width) || +- __put_user(fb_depth, &f->fb_depth) || +- __put_user(0, &f->fb_cmsize) || +- __put_user(fb_size, &f->fb_cmsize)) ++ put_user(info->var.yres, &f->fb_height) || ++ put_user(info->var.xres, &f->fb_width) || ++ put_user(fb_depth, &f->fb_depth) || ++ put_user(0, &f->fb_cmsize) || ++ put_user(fb_size, &f->fb_cmsize)) + return -EFAULT; + return 0; + } +@@ -125,10 +125,10 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, + unsigned int index, count, i; + + if (get_user(index, &c->index) || +- __get_user(count, &c->count) || +- __get_user(ured, &c->red) || +- __get_user(ugreen, &c->green) || +- __get_user(ublue, &c->blue)) ++ get_user(count, &c->count) || ++ get_user(ured, &c->red) || ++ get_user(ugreen, &c->green) || ++ get_user(ublue, &c->blue)) + return -EFAULT; + + cmap.len = 1; +@@ -165,10 +165,10 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, + u8 red, green, blue; + + if (get_user(index, &c->index) || +- __get_user(count, &c->count) || +- __get_user(ured, &c->red) || +- __get_user(ugreen, &c->green) || +- __get_user(ublue, &c->blue)) ++ get_user(count, &c->count) || ++ get_user(ured, &c->red) || ++ get_user(ugreen, &c->green) || ++ get_user(ublue, &c->blue)) + return -EFAULT; + + if (index + count > cmap->len) +-- +2.20.1 + diff --git a/queue-4.14/gfs2-flush-the-gfs2-delete-workqueue-before-stopping.patch b/queue-4.14/gfs2-flush-the-gfs2-delete-workqueue-before-stopping.patch new file mode 100644 index 00000000000..3cd3f4ba54b --- /dev/null +++ b/queue-4.14/gfs2-flush-the-gfs2-delete-workqueue-before-stopping.patch @@ -0,0 +1,65 @@ +From 91103f9c6c50ec46b2bf12ba5a40b8468c056010 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Oct 2018 12:15:40 -0500 +Subject: GFS2: Flush the GFS2 delete workqueue before stopping the kernel + threads + +From: Tim Smith + +[ Upstream commit 1eb8d7387908022951792a46fa040ad3942b3b08 ] + +Flushing the workqueue can cause operations to happen which might +call gfs2_log_reserve(), or get stuck waiting for locks taken by such +operations. gfs2_log_reserve() can io_schedule(). If this happens, it +will never wake because the only thing which can wake it is gfs2_logd() +which was already stopped. + +This causes umount of a gfs2 filesystem to wedge permanently if, for +example, the umount immediately follows a large delete operation. + +When this occured, the following stack trace was obtained from the +umount command + +[] flush_workqueue+0x1c8/0x520 +[] gfs2_make_fs_ro+0x69/0x160 [gfs2] +[] gfs2_put_super+0xa9/0x1c0 [gfs2] +[] generic_shutdown_super+0x6f/0x100 +[] kill_block_super+0x27/0x70 +[] gfs2_kill_sb+0x71/0x80 [gfs2] +[] deactivate_locked_super+0x3b/0x70 +[] deactivate_super+0x59/0x60 +[] cleanup_mnt+0x58/0x80 +[] __cleanup_mnt+0x12/0x20 +[] task_work_run+0x7d/0xa0 +[] exit_to_usermode_loop+0x73/0x98 +[] syscall_return_slowpath+0x41/0x50 +[] int_ret_from_sys_call+0x25/0x8f +[] 0xffffffffffffffff + +Signed-off-by: Tim Smith +Signed-off-by: Mark Syms +Signed-off-by: Bob Peterson +Signed-off-by: Sasha Levin +--- + fs/gfs2/super.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c +index 8e54f2e3a3040..c3f3f1ae4e1b7 100644 +--- a/fs/gfs2/super.c ++++ b/fs/gfs2/super.c +@@ -845,10 +845,10 @@ static int gfs2_make_fs_ro(struct gfs2_sbd *sdp) + if (error && !test_bit(SDF_SHUTDOWN, &sdp->sd_flags)) + return error; + ++ flush_workqueue(gfs2_delete_workqueue); + kthread_stop(sdp->sd_quotad_process); + kthread_stop(sdp->sd_logd_process); + +- flush_workqueue(gfs2_delete_workqueue); + gfs2_quota_sync(sdp->sd_vfs, 0); + gfs2_statfs_sync(sdp->sd_vfs, 0); + +-- +2.20.1 + diff --git a/queue-4.14/gpio-syscon-fix-possible-null-ptr-usage.patch b/queue-4.14/gpio-syscon-fix-possible-null-ptr-usage.patch new file mode 100644 index 00000000000..7860a05e0e7 --- /dev/null +++ b/queue-4.14/gpio-syscon-fix-possible-null-ptr-usage.patch @@ -0,0 +1,37 @@ +From b287d2caa7276abea3a1964b1901b3cbf7df6b11 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Oct 2018 00:52:52 +0200 +Subject: gpio: syscon: Fix possible NULL ptr usage + +From: Marek Vasut + +[ Upstream commit 70728c29465bc4bfa7a8c14304771eab77e923c7 ] + +The priv->data->set can be NULL while flags contains GPIO_SYSCON_FEAT_OUT +and chip->set is valid pointer. This happens in case the controller uses +the default GPIO setter. Always use chip->set to access the setter to avoid +possible NULL pointer dereferencing. + +Signed-off-by: Marek Vasut +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/gpio/gpio-syscon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpio/gpio-syscon.c b/drivers/gpio/gpio-syscon.c +index 537cec7583fca..cf88a0bfe99ea 100644 +--- a/drivers/gpio/gpio-syscon.c ++++ b/drivers/gpio/gpio-syscon.c +@@ -122,7 +122,7 @@ static int syscon_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int val) + BIT(offs % SYSCON_REG_BITS)); + } + +- priv->data->set(chip, offset, val); ++ chip->set(chip, offset, val); + + return 0; + } +-- +2.20.1 + diff --git a/queue-4.14/hwmon-ina3221-fix-ina3221_config_mode-macros.patch b/queue-4.14/hwmon-ina3221-fix-ina3221_config_mode-macros.patch new file mode 100644 index 00000000000..090a87d1b7a --- /dev/null +++ b/queue-4.14/hwmon-ina3221-fix-ina3221_config_mode-macros.patch @@ -0,0 +1,43 @@ +From ba840d0ee4af6c219387a4e91007c39637584e94 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 29 Sep 2018 14:44:06 -0700 +Subject: hwmon: (ina3221) Fix INA3221_CONFIG_MODE macros + +From: Nicolin Chen + +[ Upstream commit 791ebc9d34e9d212fc03742c31654b017d385926 ] + +The three INA3221_CONFIG_MODE macros are not correctly defined here. +The MODE3-1 bits are located at BIT 2-0 according to the datasheet. + +So this patch just fixes them by shifting all of them with a correct +offset. However, this isn't a crital bug fix as the driver does not +use any of them at this point. + +Signed-off-by: Nicolin Chen +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +--- + drivers/hwmon/ina3221.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c +index e6b49500c52ae..8c9555313fc3d 100644 +--- a/drivers/hwmon/ina3221.c ++++ b/drivers/hwmon/ina3221.c +@@ -38,9 +38,9 @@ + #define INA3221_WARN3 0x0c + #define INA3221_MASK_ENABLE 0x0f + +-#define INA3221_CONFIG_MODE_SHUNT BIT(1) +-#define INA3221_CONFIG_MODE_BUS BIT(2) +-#define INA3221_CONFIG_MODE_CONTINUOUS BIT(3) ++#define INA3221_CONFIG_MODE_SHUNT BIT(0) ++#define INA3221_CONFIG_MODE_BUS BIT(1) ++#define INA3221_CONFIG_MODE_CONTINUOUS BIT(2) + + #define INA3221_RSHUNT_DEFAULT 10000 + +-- +2.20.1 + diff --git a/queue-4.14/hwmon-pwm-fan-silence-error-on-probe-deferral.patch b/queue-4.14/hwmon-pwm-fan-silence-error-on-probe-deferral.patch new file mode 100644 index 00000000000..a437cdfe241 --- /dev/null +++ b/queue-4.14/hwmon-pwm-fan-silence-error-on-probe-deferral.patch @@ -0,0 +1,41 @@ +From b8bfca65af56e36d4e01a4197d892d5db2b28fa2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 Sep 2018 12:10:47 +0200 +Subject: hwmon: (pwm-fan) Silence error on probe deferral + +From: Thierry Reding + +[ Upstream commit 9f67f7583e77fe5dc57aab3a6159c2642544eaad ] + +Probe deferrals aren't actual errors, so silence the error message in +case the PWM cannot yet be acquired. + +Signed-off-by: Thierry Reding +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +--- + drivers/hwmon/pwm-fan.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c +index 6d30bec04f2d8..f981da686d7eb 100644 +--- a/drivers/hwmon/pwm-fan.c ++++ b/drivers/hwmon/pwm-fan.c +@@ -221,8 +221,12 @@ static int pwm_fan_probe(struct platform_device *pdev) + + ctx->pwm = devm_of_pwm_get(&pdev->dev, pdev->dev.of_node, NULL); + if (IS_ERR(ctx->pwm)) { +- dev_err(&pdev->dev, "Could not get PWM\n"); +- return PTR_ERR(ctx->pwm); ++ ret = PTR_ERR(ctx->pwm); ++ ++ if (ret != -EPROBE_DEFER) ++ dev_err(&pdev->dev, "Could not get PWM: %d\n", ret); ++ ++ return ret; + } + + platform_set_drvdata(pdev, ctx); +-- +2.20.1 + diff --git a/queue-4.14/i2c-brcmstb-allow-enabling-the-driver-on-dsl-socs.patch b/queue-4.14/i2c-brcmstb-allow-enabling-the-driver-on-dsl-socs.patch new file mode 100644 index 00000000000..ce152186377 --- /dev/null +++ b/queue-4.14/i2c-brcmstb-allow-enabling-the-driver-on-dsl-socs.patch @@ -0,0 +1,44 @@ +From 3c0d4dfbfc33cdfc721f4a6fc539c97f2723e891 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 1 Oct 2018 10:43:47 -0700 +Subject: i2c: brcmstb: Allow enabling the driver on DSL SoCs + +From: Florian Fainelli + +[ Upstream commit e1eba2ea54a2de0e4c58d87270d25706bb77b844 ] + +ARCH_BCM_63XX which is used by ARM-based DSL SoCs from Broadcom uses the +same controller, make it possible to select the STB driver and update +the Kconfig and help text a bit. + +Signed-off-by: Florian Fainelli +Signed-off-by: Wolfram Sang +Signed-off-by: Sasha Levin +--- + drivers/i2c/busses/Kconfig | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig +index 45a3f3ca29b38..b72a25585d52b 100644 +--- a/drivers/i2c/busses/Kconfig ++++ b/drivers/i2c/busses/Kconfig +@@ -429,12 +429,13 @@ config I2C_BCM_KONA + If you do not need KONA I2C interface, say N. + + config I2C_BRCMSTB +- tristate "BRCM Settop I2C controller" +- depends on ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST ++ tristate "BRCM Settop/DSL I2C controller" ++ depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_63XX || \ ++ COMPILE_TEST + default y + help + If you say yes to this option, support will be included for the +- I2C interface on the Broadcom Settop SoCs. ++ I2C interface on the Broadcom Settop/DSL SoCs. + + If you do not need I2C interface, say N. + +-- +2.20.1 + diff --git a/queue-4.14/i40e-use-proper-enum-in-i40e_ndo_set_vf_link_state.patch b/queue-4.14/i40e-use-proper-enum-in-i40e_ndo_set_vf_link_state.patch new file mode 100644 index 00000000000..d4ac208056a --- /dev/null +++ b/queue-4.14/i40e-use-proper-enum-in-i40e_ndo_set_vf_link_state.patch @@ -0,0 +1,49 @@ +From 076526770c71383683dcc227acafeffa78107169 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 Sep 2018 03:13:59 -0700 +Subject: i40e: Use proper enum in i40e_ndo_set_vf_link_state + +From: Nathan Chancellor + +[ Upstream commit 43ade6ad18416b8fd5bb3c9e9789faa666527eec ] + +Clang warns when one enumerated type is converted implicitly to another. + +drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c:4214:42: warning: +implicit conversion from enumeration type 'enum i40e_aq_link_speed' to +different enumeration type 'enum virtchnl_link_speed' + [-Wenum-conversion] + pfe.event_data.link_event.link_speed = I40E_LINK_SPEED_40GB; + ~ ^~~~~~~~~~~~~~~~~~~~ +1 warning generated. + +Use the proper enum from virtchnl_link_speed, which has the same value +as I40E_LINK_SPEED_40GB, VIRTCHNL_LINK_SPEED_40GB. This appears to be +missed by commit ff3f4cc267f6 ("virtchnl: finish conversion to virtchnl +interface"). + +Link: https://github.com/ClangBuiltLinux/linux/issues/81 +Signed-off-by: Nathan Chancellor +Tested-by: Andrew Bowers +Signed-off-by: Jeff Kirsher +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +index b3307b1b3aac1..fae3625ec0b67 100644 +--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +@@ -3201,7 +3201,7 @@ int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link) + vf->link_forced = true; + vf->link_up = true; + pfe.event_data.link_event.link_status = true; +- pfe.event_data.link_event.link_speed = I40E_LINK_SPEED_40GB; ++ pfe.event_data.link_event.link_speed = VIRTCHNL_LINK_SPEED_40GB; + break; + case IFLA_VF_LINK_STATE_DISABLE: + vf->link_forced = true; +-- +2.20.1 + diff --git a/queue-4.14/ib-hfi1-ensure-ucast_dlid-access-doesnt-exceed-bound.patch b/queue-4.14/ib-hfi1-ensure-ucast_dlid-access-doesnt-exceed-bound.patch new file mode 100644 index 00000000000..1db1b87225a --- /dev/null +++ b/queue-4.14/ib-hfi1-ensure-ucast_dlid-access-doesnt-exceed-bound.patch @@ -0,0 +1,38 @@ +From bbb9a9f0e0d317b9edff3bb8235baff0945205a6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 Sep 2018 10:55:53 -0700 +Subject: IB/hfi1: Ensure ucast_dlid access doesnt exceed bounds + +From: Dennis Dalessandro + +[ Upstream commit 3144533bf667c8e53bb20656b78295960073e57b ] + +The dlid assignment made by looking into the u_ucast_dlid array does not +do an explicit check for the size of the array. The code path to arrive at +def_port, the index value is long and complicated so its best to just have +an explicit check here. + +Signed-off-by: Dennis Dalessandro +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c +index a72278e9cd274..9c8ddaaa6fbbf 100644 +--- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c ++++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c +@@ -351,7 +351,8 @@ static uint32_t opa_vnic_get_dlid(struct opa_vnic_adapter *adapter, + if (unlikely(!dlid)) + v_warn("Null dlid in MAC address\n"); + } else if (def_port != OPA_VNIC_INVALID_PORT) { +- dlid = info->vesw.u_ucast_dlid[def_port]; ++ if (def_port < OPA_VESW_MAX_NUM_DEF_PORT) ++ dlid = info->vesw.u_ucast_dlid[def_port]; + } + } + +-- +2.20.1 + diff --git a/queue-4.14/ib-mlx4-avoid-implicit-enumerated-type-conversion.patch b/queue-4.14/ib-mlx4-avoid-implicit-enumerated-type-conversion.patch new file mode 100644 index 00000000000..4aacb56ae0b --- /dev/null +++ b/queue-4.14/ib-mlx4-avoid-implicit-enumerated-type-conversion.patch @@ -0,0 +1,51 @@ +From 044572d105644e5d7659004b201d9173453333c9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 24 Sep 2018 12:57:16 -0700 +Subject: IB/mlx4: Avoid implicit enumerated type conversion + +From: Nathan Chancellor + +[ Upstream commit b56511c15713ba6c7572e77a41f7ddba9c1053ec ] + +Clang warns when one enumerated type is implicitly converted to another. + +drivers/infiniband/hw/mlx4/mad.c:1811:41: warning: implicit conversion +from enumeration type 'enum mlx4_ib_qp_flags' to different enumeration +type 'enum ib_qp_create_flags' [-Wenum-conversion] + qp_init_attr.init_attr.create_flags = MLX4_IB_SRIOV_TUNNEL_QP; + ~ ^~~~~~~~~~~~~~~~~~~~~~~ + +drivers/infiniband/hw/mlx4/mad.c:1819:41: warning: implicit conversion +from enumeration type 'enum mlx4_ib_qp_flags' to different enumeration +type 'enum ib_qp_create_flags' [-Wenum-conversion] + qp_init_attr.init_attr.create_flags = MLX4_IB_SRIOV_SQP; + ~ ^~~~~~~~~~~~~~~~~ + +The type mlx4_ib_qp_flags explicitly provides supplemental values to the +type ib_qp_create_flags. Make that clear to Clang by changing the +create_flags type to u32. + +Reported-by: Nick Desaulniers +Signed-off-by: Nathan Chancellor +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + include/rdma/ib_verbs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h +index 4a43193319894..73cc5cfb72e02 100644 +--- a/include/rdma/ib_verbs.h ++++ b/include/rdma/ib_verbs.h +@@ -1120,7 +1120,7 @@ struct ib_qp_init_attr { + struct ib_qp_cap cap; + enum ib_sig_type sq_sig_type; + enum ib_qp_type qp_type; +- enum ib_qp_create_flags create_flags; ++ u32 create_flags; + + /* + * Only needed for special QP types, or when using the RW API. +-- +2.20.1 + diff --git a/queue-4.14/ib-mthca-fix-error-return-code-in-__mthca_init_one.patch b/queue-4.14/ib-mthca-fix-error-return-code-in-__mthca_init_one.patch new file mode 100644 index 00000000000..d5669469151 --- /dev/null +++ b/queue-4.14/ib-mthca-fix-error-return-code-in-__mthca_init_one.patch @@ -0,0 +1,37 @@ +From 8a843ac54cb41fad160585584943d13b55ce7f5d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 29 Sep 2018 03:55:16 +0000 +Subject: IB/mthca: Fix error return code in __mthca_init_one() + +From: Wei Yongjun + +[ Upstream commit 39f2495618c5e980d2873ea3f2d1877dd253e07a ] + +Fix to return a negative error code from the mthca_cmd_init() error +handling case instead of 0, as done elsewhere in this function. + +Fixes: 80fd8238734c ("[PATCH] IB/mthca: Encapsulate command interface init") +Signed-off-by: Wei Yongjun +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/hw/mthca/mthca_main.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c +index e36a9bc52268d..ccf50dafce9ca 100644 +--- a/drivers/infiniband/hw/mthca/mthca_main.c ++++ b/drivers/infiniband/hw/mthca/mthca_main.c +@@ -986,7 +986,8 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type) + goto err_free_dev; + } + +- if (mthca_cmd_init(mdev)) { ++ err = mthca_cmd_init(mdev); ++ if (err) { + mthca_err(mdev, "Failed to init command interface, aborting.\n"); + goto err_free_dev; + } +-- +2.20.1 + diff --git a/queue-4.14/input-silead-try-firmware-reload-after-unsuccessful-.patch b/queue-4.14/input-silead-try-firmware-reload-after-unsuccessful-.patch new file mode 100644 index 00000000000..174fd3d80ae --- /dev/null +++ b/queue-4.14/input-silead-try-firmware-reload-after-unsuccessful-.patch @@ -0,0 +1,62 @@ +From 48feca1840ce90a83e17315b9668a0626a433b22 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Oct 2018 11:48:31 -0700 +Subject: Input: silead - try firmware reload after unsuccessful resume + +From: Julian Sax + +[ Upstream commit dde27443211062e841806feaf690674b7c3a599f ] + +A certain silead controller (Chip ID: 0x56810000) loses its firmware +after suspend, causing the resume to fail. This patch tries to load +the firmware, should a resume error occur and retries the resuming. + +Signed-off-by: Julian Sax +Acked-by: Hans de Goede +Signed-off-by: Dmitry Torokhov +Signed-off-by: Sasha Levin +--- + drivers/input/touchscreen/silead.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/drivers/input/touchscreen/silead.c b/drivers/input/touchscreen/silead.c +index 0dbcf105f7db3..7c0eeef29b3cb 100644 +--- a/drivers/input/touchscreen/silead.c ++++ b/drivers/input/touchscreen/silead.c +@@ -534,20 +534,33 @@ static int __maybe_unused silead_ts_suspend(struct device *dev) + static int __maybe_unused silead_ts_resume(struct device *dev) + { + struct i2c_client *client = to_i2c_client(dev); ++ bool second_try = false; + int error, status; + + silead_ts_set_power(client, SILEAD_POWER_ON); + ++ retry: + error = silead_ts_reset(client); + if (error) + return error; + ++ if (second_try) { ++ error = silead_ts_load_fw(client); ++ if (error) ++ return error; ++ } ++ + error = silead_ts_startup(client); + if (error) + return error; + + status = silead_ts_get_status(client); + if (status != SILEAD_STATUS_OK) { ++ if (!second_try) { ++ second_try = true; ++ dev_dbg(dev, "Reloading firmware after unsuccessful resume\n"); ++ goto retry; ++ } + dev_err(dev, "Resume error, status: 0x%02x\n", status); + return -ENODEV; + } +-- +2.20.1 + diff --git a/queue-4.14/input-st1232-set-input_prop_direct-property.patch b/queue-4.14/input-st1232-set-input_prop_direct-property.patch new file mode 100644 index 00000000000..91a9c5db886 --- /dev/null +++ b/queue-4.14/input-st1232-set-input_prop_direct-property.patch @@ -0,0 +1,33 @@ +From a031a8a4e0b0c40d7493a64063b4860dcadb7764 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Oct 2018 11:44:45 -0700 +Subject: Input: st1232 - set INPUT_PROP_DIRECT property + +From: Martin Kepplinger + +[ Upstream commit 20bbb312079494a406c10c90932e3c80837c9d94 ] + +This is how userspace checks for touchscreen devices most reliably. + +Signed-off-by: Martin Kepplinger +Signed-off-by: Dmitry Torokhov +Signed-off-by: Sasha Levin +--- + drivers/input/touchscreen/st1232.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c +index be5615c6bf8ff..482f97e1c9d37 100644 +--- a/drivers/input/touchscreen/st1232.c ++++ b/drivers/input/touchscreen/st1232.c +@@ -203,6 +203,7 @@ static int st1232_ts_probe(struct i2c_client *client, + input_dev->id.bustype = BUS_I2C; + input_dev->dev.parent = &client->dev; + ++ __set_bit(INPUT_PROP_DIRECT, input_dev->propbit); + __set_bit(EV_SYN, input_dev->evbit); + __set_bit(EV_KEY, input_dev->evbit); + __set_bit(EV_ABS, input_dev->evbit); +-- +2.20.1 + diff --git a/queue-4.14/iommu-io-pgtable-arm-fix-race-handling-in-split_blk_.patch b/queue-4.14/iommu-io-pgtable-arm-fix-race-handling-in-split_blk_.patch new file mode 100644 index 00000000000..0ef33d85746 --- /dev/null +++ b/queue-4.14/iommu-io-pgtable-arm-fix-race-handling-in-split_blk_.patch @@ -0,0 +1,58 @@ +From ffee02adca499d06c6f3368d0c8d726d61bfbb07 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 6 Sep 2018 17:59:50 +0100 +Subject: iommu/io-pgtable-arm: Fix race handling in split_blk_unmap() + +From: Robin Murphy + +[ Upstream commit 85c7a0f1ef624ef58173ef52ea77780257bdfe04 ] + +In removing the pagetable-wide lock, we gained the possibility of the +vanishingly unlikely case where we have a race between two concurrent +unmappers splitting the same block entry. The logic to handle this is +fairly straightforward - whoever loses the race frees their partial +next-level table and instead dereferences the winner's newly-installed +entry in order to fall back to a regular unmap, which intentionally +echoes the pre-existing case of recursively splitting a 1GB block down +to 4KB pages by installing a full table of 2MB blocks first. + +Unfortunately, the chump who implemented that logic failed to update the +condition check for that fallback, meaning that if said race occurs at +the last level (where the loser's unmap_idx is valid) then the unmap +won't actually happen. Fix that to properly account for both the race +and recursive cases. + +Fixes: 2c3d273eabe8 ("iommu/io-pgtable-arm: Support lockless operation") +Signed-off-by: Robin Murphy +[will: re-jig control flow to avoid duplicate cmpxchg test] +Signed-off-by: Will Deacon +Signed-off-by: Sasha Levin +--- + drivers/iommu/io-pgtable-arm.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c +index e8018a308868e..17a9225283dd1 100644 +--- a/drivers/iommu/io-pgtable-arm.c ++++ b/drivers/iommu/io-pgtable-arm.c +@@ -551,13 +551,12 @@ static int arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data, + return 0; + + tablep = iopte_deref(pte, data); ++ } else if (unmap_idx >= 0) { ++ io_pgtable_tlb_add_flush(&data->iop, iova, size, size, true); ++ return size; + } + +- if (unmap_idx < 0) +- return __arm_lpae_unmap(data, iova, size, lvl, tablep); +- +- io_pgtable_tlb_add_flush(&data->iop, iova, size, size, true); +- return size; ++ return __arm_lpae_unmap(data, iova, size, lvl, tablep); + } + + static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, +-- +2.20.1 + diff --git a/queue-4.14/irqchip-irq-mvebu-icu-fix-wrong-private-data-retriev.patch b/queue-4.14/irqchip-irq-mvebu-icu-fix-wrong-private-data-retriev.patch new file mode 100644 index 00000000000..83749037195 --- /dev/null +++ b/queue-4.14/irqchip-irq-mvebu-icu-fix-wrong-private-data-retriev.patch @@ -0,0 +1,46 @@ +From f56402c08bd7b1c34f7c7f4e8e892ccb77549820 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 1 Oct 2018 16:13:47 +0200 +Subject: irqchip/irq-mvebu-icu: Fix wrong private data retrieval + +From: Miquel Raynal + +[ Upstream commit 2b4dab69dcca13c5be2ddaf1337ae4accd087de6 ] + +The irq_domain structure has an host_data pointer that just stores +private data. It is meant to not be touched by the IRQ core. However, +when it comes to MSI, the MSI layer adds its own private data there +with a structure that also has a host_data pointer. + +Because this IRQ domain is an MSI domain, to access private data we +should do a d->host_data->host_data, also wrapped as +'platform_msi_get_host_data()'. + +This bug was lying there silently because the 'icu' structure retrieved +this way was just called by dev_err(), only producing a +'(NULL device *):' output on the console. + +Reviewed-by: Thomas Petazzoni +Signed-off-by: Miquel Raynal +Signed-off-by: Marc Zyngier +Signed-off-by: Sasha Levin +--- + drivers/irqchip/irq-mvebu-icu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/irqchip/irq-mvebu-icu.c b/drivers/irqchip/irq-mvebu-icu.c +index e18c48d3a92e7..6a77b9ea8e418 100644 +--- a/drivers/irqchip/irq-mvebu-icu.c ++++ b/drivers/irqchip/irq-mvebu-icu.c +@@ -92,7 +92,7 @@ static int + mvebu_icu_irq_domain_translate(struct irq_domain *d, struct irq_fwspec *fwspec, + unsigned long *hwirq, unsigned int *type) + { +- struct mvebu_icu *icu = d->host_data; ++ struct mvebu_icu *icu = platform_msi_get_host_data(d); + unsigned int icu_group; + + /* Check the count of the parameters in dt */ +-- +2.20.1 + diff --git a/queue-4.14/iwlwifi-mvm-don-t-send-keys-when-entering-d3.patch b/queue-4.14/iwlwifi-mvm-don-t-send-keys-when-entering-d3.patch new file mode 100644 index 00000000000..7311fc58937 --- /dev/null +++ b/queue-4.14/iwlwifi-mvm-don-t-send-keys-when-entering-d3.patch @@ -0,0 +1,42 @@ +From 833c901f962c2c1a3e4c4f95c2915b238e8417e9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 1 Jul 2018 14:52:06 +0300 +Subject: iwlwifi: mvm: don't send keys when entering D3 + +From: Sara Sharon + +[ Upstream commit 8c7fd6a365eb5b2647b2c01918730d0a485b9f85 ] + +In the past, we needed to program the keys when entering D3. This was +since we replaced the image. However, now that there is a single +image, this is no longer needed. Note that RSC is sent separately in +a new command. This solves issues with newer devices that support PN +offload. Since driver re-sent the keys, the PN got zeroed and the +receiver dropped the next packets, until PN caught up again. + +Signed-off-by: Sara Sharon +Signed-off-by: Luca Coelho +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c +index b205a7bfb828d..65c51c6983288 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c +@@ -947,8 +947,10 @@ int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm, + { + struct iwl_wowlan_kek_kck_material_cmd kek_kck_cmd = {}; + struct iwl_wowlan_tkip_params_cmd tkip_cmd = {}; ++ bool unified = fw_has_capa(&mvm->fw->ucode_capa, ++ IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG); + struct wowlan_key_data key_data = { +- .configure_keys = !d0i3, ++ .configure_keys = !d0i3 && !unified, + .use_rsc_tsc = false, + .tkip = &tkip_cmd, + .use_tkip = false, +-- +2.20.1 + diff --git a/queue-4.14/ixgbe-fix-crash-with-vfs-and-flow-director-on-interf.patch b/queue-4.14/ixgbe-fix-crash-with-vfs-and-flow-director-on-interf.patch new file mode 100644 index 00000000000..63eeb5eff1e --- /dev/null +++ b/queue-4.14/ixgbe-fix-crash-with-vfs-and-flow-director-on-interf.patch @@ -0,0 +1,56 @@ +From 8f8c4c011bfda52aa210cc35bffd0fc45f7b6c0b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 24 Sep 2018 09:24:20 +0200 +Subject: ixgbe: Fix crash with VFs and flow director on interface flap + +From: Radoslaw Tyl + +[ Upstream commit 5d826d209164b0752c883607be4cdbbcf7cab494 ] + +This patch fix crash when we have restore flow director filters after reset +adapter. In ixgbe_fdir_filter_restore() filter->action is outside of the +rx_ring array, as it has a VF identifier in the upper 32 bits. + +Signed-off-by: Radoslaw Tyl +Tested-by: Andrew Bowers +Signed-off-by: Jeff Kirsher +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +index d1472727ef882..4801d96c4fa91 100644 +--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c ++++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +@@ -5129,6 +5129,7 @@ static void ixgbe_fdir_filter_restore(struct ixgbe_adapter *adapter) + struct ixgbe_hw *hw = &adapter->hw; + struct hlist_node *node2; + struct ixgbe_fdir_filter *filter; ++ u64 action; + + spin_lock(&adapter->fdir_perfect_lock); + +@@ -5137,12 +5138,17 @@ static void ixgbe_fdir_filter_restore(struct ixgbe_adapter *adapter) + + hlist_for_each_entry_safe(filter, node2, + &adapter->fdir_filter_list, fdir_node) { ++ action = filter->action; ++ if (action != IXGBE_FDIR_DROP_QUEUE && action != 0) ++ action = ++ (action >> ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF) - 1; ++ + ixgbe_fdir_write_perfect_filter_82599(hw, + &filter->filter, + filter->sw_idx, +- (filter->action == IXGBE_FDIR_DROP_QUEUE) ? ++ (action == IXGBE_FDIR_DROP_QUEUE) ? + IXGBE_FDIR_DROP_QUEUE : +- adapter->rx_ring[filter->action]->reg_idx); ++ adapter->rx_ring[action]->reg_idx); + } + + spin_unlock(&adapter->fdir_perfect_lock); +-- +2.20.1 + diff --git a/queue-4.14/ixgbe-fix-ixgbe-tx-hangs-with-xdp_tx-beyond-queue-li.patch b/queue-4.14/ixgbe-fix-ixgbe-tx-hangs-with-xdp_tx-beyond-queue-li.patch new file mode 100644 index 00000000000..68749434b84 --- /dev/null +++ b/queue-4.14/ixgbe-fix-ixgbe-tx-hangs-with-xdp_tx-beyond-queue-li.patch @@ -0,0 +1,50 @@ +From 6ebf4272176afd988be99f886312eb0495813bb4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 5 Sep 2018 09:00:51 +0200 +Subject: ixgbe: Fix ixgbe TX hangs with XDP_TX beyond queue limit + +From: Radoslaw Tyl + +[ Upstream commit 8d7179b1e2d64b3493c0114916486fe92e6109a9 ] + +We have Tx hang when number Tx and XDP queues are more than 64. +In XDP always is MTQC == 0x0 (64TxQs). We need more space for Tx queues. + +Signed-off-by: Radoslaw Tyl +Tested-by: Andrew Bowers +Signed-off-by: Jeff Kirsher +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +index 01c120d656c54..d1472727ef882 100644 +--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c ++++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +@@ -3490,12 +3490,18 @@ static void ixgbe_setup_mtqc(struct ixgbe_adapter *adapter) + else + mtqc |= IXGBE_MTQC_64VF; + } else { +- if (tcs > 4) ++ if (tcs > 4) { + mtqc = IXGBE_MTQC_RT_ENA | IXGBE_MTQC_8TC_8TQ; +- else if (tcs > 1) ++ } else if (tcs > 1) { + mtqc = IXGBE_MTQC_RT_ENA | IXGBE_MTQC_4TC_4TQ; +- else +- mtqc = IXGBE_MTQC_64Q_1PB; ++ } else { ++ u8 max_txq = adapter->num_tx_queues + ++ adapter->num_xdp_queues; ++ if (max_txq > 63) ++ mtqc = IXGBE_MTQC_RT_ENA | IXGBE_MTQC_4TC_4TQ; ++ else ++ mtqc = IXGBE_MTQC_64Q_1PB; ++ } + } + + IXGBE_WRITE_REG(hw, IXGBE_MTQC, mtqc); +-- +2.20.1 + diff --git a/queue-4.14/kexec-allocate-decrypted-control-pages-for-kdump-if-.patch b/queue-4.14/kexec-allocate-decrypted-control-pages-for-kdump-if-.patch new file mode 100644 index 00000000000..770ad33702a --- /dev/null +++ b/queue-4.14/kexec-allocate-decrypted-control-pages-for-kdump-if-.patch @@ -0,0 +1,71 @@ +From 82f7916d60c1205de0ce73774248251dd4aa0234 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 30 Sep 2018 11:10:31 +0800 +Subject: kexec: Allocate decrypted control pages for kdump if SME is enabled + +From: Lianbo Jiang + +[ Upstream commit 9cf38d5559e813cccdba8b44c82cc46ba48d0896 ] + +When SME is enabled in the first kernel, it needs to allocate decrypted +pages for kdump because when the kdump kernel boots, these pages need to +be accessed decrypted in the initial boot stage, before SME is enabled. + + [ bp: clean up text. ] + +Signed-off-by: Lianbo Jiang +Signed-off-by: Borislav Petkov +Reviewed-by: Tom Lendacky +Cc: kexec@lists.infradead.org +Cc: tglx@linutronix.de +Cc: mingo@redhat.com +Cc: hpa@zytor.com +Cc: akpm@linux-foundation.org +Cc: dan.j.williams@intel.com +Cc: bhelgaas@google.com +Cc: baiyaowei@cmss.chinamobile.com +Cc: tiwai@suse.de +Cc: brijesh.singh@amd.com +Cc: dyoung@redhat.com +Cc: bhe@redhat.com +Cc: jroedel@suse.de +Link: https://lkml.kernel.org/r/20180930031033.22110-3-lijiang@redhat.com +Signed-off-by: Sasha Levin +--- + kernel/kexec_core.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c +index 8f15665ab6167..27cf24e285e0c 100644 +--- a/kernel/kexec_core.c ++++ b/kernel/kexec_core.c +@@ -473,6 +473,10 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, + } + } + ++ /* Ensure that these pages are decrypted if SME is enabled. */ ++ if (pages) ++ arch_kexec_post_alloc_pages(page_address(pages), 1 << order, 0); ++ + return pages; + } + +@@ -867,6 +871,7 @@ static int kimage_load_crash_segment(struct kimage *image, + result = -ENOMEM; + goto out; + } ++ arch_kexec_post_alloc_pages(page_address(page), 1, 0); + ptr = kmap(page); + ptr += maddr & ~PAGE_MASK; + mchunk = min_t(size_t, mbytes, +@@ -884,6 +889,7 @@ static int kimage_load_crash_segment(struct kimage *image, + result = copy_from_user(ptr, buf, uchunk); + kexec_flush_icache_page(page); + kunmap(page); ++ arch_kexec_pre_free_pages(page_address(page), 1); + if (result) { + result = -EFAULT; + goto out; +-- +2.20.1 + diff --git a/queue-4.14/kvm-arm-arm64-fix-stage2_flush_memslot-for-4-level-p.patch b/queue-4.14/kvm-arm-arm64-fix-stage2_flush_memslot-for-4-level-p.patch new file mode 100644 index 00000000000..af6c1a9da8f --- /dev/null +++ b/queue-4.14/kvm-arm-arm64-fix-stage2_flush_memslot-for-4-level-p.patch @@ -0,0 +1,41 @@ +From 3b3af1b20c524fcec5aba987e161e77e30674615 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 Sep 2018 17:32:37 +0100 +Subject: kvm: arm/arm64: Fix stage2_flush_memslot for 4 level page table + +From: Suzuki K Poulose + +[ Upstream commit d2db7773ba864df6b4e19643dfc54838550d8049 ] + +So far we have only supported 3 level page table with fixed IPA of +40bits, where PUD is folded. With 4 level page tables, we need +to check if the PUD entry is valid or not. Fix stage2_flush_memslot() +to do this check, before walking down the table. + +Acked-by: Christoffer Dall +Acked-by: Marc Zyngier +Reviewed-by: Eric Auger +Signed-off-by: Suzuki K Poulose +Signed-off-by: Marc Zyngier +Signed-off-by: Sasha Levin +--- + virt/kvm/arm/mmu.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c +index 1f4cac53b9234..9f69202d8e49b 100644 +--- a/virt/kvm/arm/mmu.c ++++ b/virt/kvm/arm/mmu.c +@@ -375,7 +375,8 @@ static void stage2_flush_memslot(struct kvm *kvm, + pgd = kvm->arch.pgd + stage2_pgd_index(addr); + do { + next = stage2_pgd_addr_end(addr, end); +- stage2_flush_puds(kvm, pgd, addr, next); ++ if (!stage2_pgd_none(*pgd)) ++ stage2_flush_puds(kvm, pgd, addr, next); + } while (pgd++, addr = next, addr != end); + } + +-- +2.20.1 + diff --git a/queue-4.14/kvm-ppc-book3s-pr-exiting-split-hack-mode-needs-to-f.patch b/queue-4.14/kvm-ppc-book3s-pr-exiting-split-hack-mode-needs-to-f.patch new file mode 100644 index 00000000000..ff484de1d3f --- /dev/null +++ b/queue-4.14/kvm-ppc-book3s-pr-exiting-split-hack-mode-needs-to-f.patch @@ -0,0 +1,45 @@ +From 42623563f185d569d80abb7873d0a9b371314a56 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 31 Jul 2018 07:39:21 -0700 +Subject: KVM: PPC: Book3S PR: Exiting split hack mode needs to fixup both PC + and LR + +From: Cameron Kaiser + +[ Upstream commit 1006284c5e411872333967b1970c2ca46a9e225f ] + +When an OS (currently only classic Mac OS) is running in KVM-PR and makes a +linked jump from code with split hack addressing enabled into code that does +not, LR is not correctly updated and reflects the previously munged PC. + +To fix this, this patch undoes the address munge when exiting split +hack mode so that code relying on LR being a proper address will now +execute. This does not affect OS X or other operating systems running +on KVM-PR. + +Signed-off-by: Cameron Kaiser +Signed-off-by: Paul Mackerras +Signed-off-by: Sasha Levin +--- + arch/powerpc/kvm/book3s.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c +index d38280b01ef08..1eda812499376 100644 +--- a/arch/powerpc/kvm/book3s.c ++++ b/arch/powerpc/kvm/book3s.c +@@ -79,8 +79,11 @@ void kvmppc_unfixup_split_real(struct kvm_vcpu *vcpu) + { + if (vcpu->arch.hflags & BOOK3S_HFLAG_SPLIT_HACK) { + ulong pc = kvmppc_get_pc(vcpu); ++ ulong lr = kvmppc_get_lr(vcpu); + if ((pc & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS) + kvmppc_set_pc(vcpu, pc & ~SPLIT_HACK_MASK); ++ if ((lr & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS) ++ kvmppc_set_lr(vcpu, lr & ~SPLIT_HACK_MASK); + vcpu->arch.hflags &= ~BOOK3S_HFLAG_SPLIT_HACK; + } + } +-- +2.20.1 + diff --git a/queue-4.14/kvm-ppc-inform-the-userspace-about-tce-update-failur.patch b/queue-4.14/kvm-ppc-inform-the-userspace-about-tce-update-failur.patch new file mode 100644 index 00000000000..d2609106144 --- /dev/null +++ b/queue-4.14/kvm-ppc-inform-the-userspace-about-tce-update-failur.patch @@ -0,0 +1,91 @@ +From 3be9ee8383c0fe0b97837813638da3e1d5b7b550 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 10 Sep 2018 18:29:09 +1000 +Subject: KVM: PPC: Inform the userspace about TCE update failures + +From: Alexey Kardashevskiy + +[ Upstream commit f7960e299f13f069d6f3d4e157d91bfca2669677 ] + +We return H_TOO_HARD from TCE update handlers when we think that +the next handler (realmode -> virtual mode -> user mode) has a chance to +handle the request; H_HARDWARE/H_CLOSED otherwise. + +This changes the handlers to return H_TOO_HARD on every error giving +the userspace an opportunity to handle any request or at least log +them all. + +Signed-off-by: Alexey Kardashevskiy +Reviewed-by: David Gibson +Signed-off-by: Michael Ellerman +Signed-off-by: Sasha Levin +--- + arch/powerpc/kvm/book3s_64_vio.c | 8 ++++---- + arch/powerpc/kvm/book3s_64_vio_hv.c | 6 +++--- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c +index 2c6cce8e7cfd0..5e44462960213 100644 +--- a/arch/powerpc/kvm/book3s_64_vio.c ++++ b/arch/powerpc/kvm/book3s_64_vio.c +@@ -404,7 +404,7 @@ static long kvmppc_tce_iommu_unmap(struct kvm *kvm, + long ret; + + if (WARN_ON_ONCE(iommu_tce_xchg(tbl, entry, &hpa, &dir))) +- return H_HARDWARE; ++ return H_TOO_HARD; + + if (dir == DMA_NONE) + return H_SUCCESS; +@@ -434,15 +434,15 @@ long kvmppc_tce_iommu_map(struct kvm *kvm, struct iommu_table *tbl, + return H_TOO_HARD; + + if (WARN_ON_ONCE(mm_iommu_ua_to_hpa(mem, ua, tbl->it_page_shift, &hpa))) +- return H_HARDWARE; ++ return H_TOO_HARD; + + if (mm_iommu_mapped_inc(mem)) +- return H_CLOSED; ++ return H_TOO_HARD; + + ret = iommu_tce_xchg(tbl, entry, &hpa, &dir); + if (WARN_ON_ONCE(ret)) { + mm_iommu_mapped_dec(mem); +- return H_HARDWARE; ++ return H_TOO_HARD; + } + + if (dir != DMA_NONE) +diff --git a/arch/powerpc/kvm/book3s_64_vio_hv.c b/arch/powerpc/kvm/book3s_64_vio_hv.c +index 23d6d1592f117..c75e5664fe3d8 100644 +--- a/arch/powerpc/kvm/book3s_64_vio_hv.c ++++ b/arch/powerpc/kvm/book3s_64_vio_hv.c +@@ -264,14 +264,14 @@ static long kvmppc_rm_tce_iommu_map(struct kvm *kvm, struct iommu_table *tbl, + + if (WARN_ON_ONCE_RM(mm_iommu_ua_to_hpa_rm(mem, ua, tbl->it_page_shift, + &hpa))) +- return H_HARDWARE; ++ return H_TOO_HARD; + + pua = (void *) vmalloc_to_phys(pua); + if (WARN_ON_ONCE_RM(!pua)) + return H_HARDWARE; + + if (WARN_ON_ONCE_RM(mm_iommu_mapped_inc(mem))) +- return H_CLOSED; ++ return H_TOO_HARD; + + ret = iommu_tce_xchg_rm(tbl, entry, &hpa, &dir); + if (ret) { +@@ -448,7 +448,7 @@ long kvmppc_rm_h_put_tce_indirect(struct kvm_vcpu *vcpu, + + rmap = (void *) vmalloc_to_phys(rmap); + if (WARN_ON_ONCE_RM(!rmap)) +- return H_HARDWARE; ++ return H_TOO_HARD; + + /* + * Synchronize with the MMU notifier callbacks in +-- +2.20.1 + diff --git a/queue-4.14/mac80211-minstrel-fix-cck-rate-group-streams-value.patch b/queue-4.14/mac80211-minstrel-fix-cck-rate-group-streams-value.patch new file mode 100644 index 00000000000..83ea57aaff8 --- /dev/null +++ b/queue-4.14/mac80211-minstrel-fix-cck-rate-group-streams-value.patch @@ -0,0 +1,34 @@ +From 8bca318a10a67b9570667423bba8f92fc13ae51e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 6 Oct 2018 19:35:04 +0200 +Subject: mac80211: minstrel: fix CCK rate group streams value + +From: Felix Fietkau + +[ Upstream commit 80df9be67c44cb636bbc92caeddad8caf334c53c ] + +Fixes a harmless underflow issue when CCK rates are actively being used + +Signed-off-by: Felix Fietkau +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + net/mac80211/rc80211_minstrel_ht.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c +index 25cb3e5f8b482..bc97d31907f60 100644 +--- a/net/mac80211/rc80211_minstrel_ht.c ++++ b/net/mac80211/rc80211_minstrel_ht.c +@@ -129,7 +129,7 @@ + + #define CCK_GROUP \ + [MINSTREL_CCK_GROUP] = { \ +- .streams = 0, \ ++ .streams = 1, \ + .flags = 0, \ + .duration = { \ + CCK_DURATION_LIST(false), \ +-- +2.20.1 + diff --git a/queue-4.14/mac80211-minstrel-fix-sampling-reporting-of-cck-rate.patch b/queue-4.14/mac80211-minstrel-fix-sampling-reporting-of-cck-rate.patch new file mode 100644 index 00000000000..5f9669bf8ca --- /dev/null +++ b/queue-4.14/mac80211-minstrel-fix-sampling-reporting-of-cck-rate.patch @@ -0,0 +1,71 @@ +From 4881a38cc7501ff74d0baf1b28a1b92fba635a47 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 6 Oct 2018 19:35:05 +0200 +Subject: mac80211: minstrel: fix sampling/reporting of CCK rates in HT mode + +From: Felix Fietkau + +[ Upstream commit 972b66b86f85f4e8201db454f4c3e9d990cf9836 ] + +Long/short preamble selection cannot be sampled separately, since it +depends on the BSS state. Because of that, sampling attempts to +currently not used preamble modes are not counted in the statistics, +which leads to CCK rates being sampled too often. + +Fix statistics accounting for long/short preamble by increasing the +index where necessary. +Fix excessive CCK rate sampling by dropping unsupported sample attempts. + +This improves throughput on 2.4 GHz channels + +Signed-off-by: Felix Fietkau +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + net/mac80211/rc80211_minstrel_ht.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c +index bc97d31907f60..e57811e4b91f6 100644 +--- a/net/mac80211/rc80211_minstrel_ht.c ++++ b/net/mac80211/rc80211_minstrel_ht.c +@@ -282,7 +282,8 @@ minstrel_ht_get_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi, + break; + + /* short preamble */ +- if (!(mi->supported[group] & BIT(idx))) ++ if ((mi->supported[group] & BIT(idx + 4)) && ++ (rate->flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)) + idx += 4; + } + return &mi->groups[group].rates[idx]; +@@ -1077,18 +1078,23 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta, + return; + + sample_group = &minstrel_mcs_groups[sample_idx / MCS_GROUP_RATES]; ++ sample_idx %= MCS_GROUP_RATES; ++ ++ if (sample_group == &minstrel_mcs_groups[MINSTREL_CCK_GROUP] && ++ (sample_idx >= 4) != txrc->short_preamble) ++ return; ++ + info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE; + rate->count = 1; + +- if (sample_idx / MCS_GROUP_RATES == MINSTREL_CCK_GROUP) { ++ if (sample_group == &minstrel_mcs_groups[MINSTREL_CCK_GROUP]) { + int idx = sample_idx % ARRAY_SIZE(mp->cck_rates); + rate->idx = mp->cck_rates[idx]; + } else if (sample_group->flags & IEEE80211_TX_RC_VHT_MCS) { + ieee80211_rate_set_vht(rate, sample_idx % MCS_GROUP_RATES, + sample_group->streams); + } else { +- rate->idx = sample_idx % MCS_GROUP_RATES + +- (sample_group->streams - 1) * 8; ++ rate->idx = sample_idx + (sample_group->streams - 1) * 8; + } + + rate->flags = sample_group->flags; +-- +2.20.1 + diff --git a/queue-4.14/mac80211-minstrel-fix-using-short-preamble-cck-rates.patch b/queue-4.14/mac80211-minstrel-fix-using-short-preamble-cck-rates.patch new file mode 100644 index 00000000000..dc7602e74a1 --- /dev/null +++ b/queue-4.14/mac80211-minstrel-fix-using-short-preamble-cck-rates.patch @@ -0,0 +1,47 @@ +From d03e46775e782d766959fd9e0f89fde279e92e48 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 6 Oct 2018 19:35:03 +0200 +Subject: mac80211: minstrel: fix using short preamble CCK rates on HT clients + +From: Felix Fietkau + +[ Upstream commit 37439f2d6e43ae79e22be9be159f0af157468f82 ] + +mi->supported[MINSTREL_CCK_GROUP] needs to be updated +short preamble rates need to be marked as supported regardless of +whether it's currently enabled. Its state can change at any time without +a rate_update call. + +Fixes: 782dda00ab8e ("mac80211: minstrel_ht: move short preamble check out of get_rate") +Signed-off-by: Felix Fietkau +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + net/mac80211/rc80211_minstrel_ht.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c +index 4a5bdad9f3030..25cb3e5f8b482 100644 +--- a/net/mac80211/rc80211_minstrel_ht.c ++++ b/net/mac80211/rc80211_minstrel_ht.c +@@ -1132,7 +1132,6 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband, + struct ieee80211_mcs_info *mcs = &sta->ht_cap.mcs; + u16 sta_cap = sta->ht_cap.cap; + struct ieee80211_sta_vht_cap *vht_cap = &sta->vht_cap; +- struct sta_info *sinfo = container_of(sta, struct sta_info, sta); + int use_vht; + int n_supported = 0; + int ack_dur; +@@ -1258,8 +1257,7 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband, + if (!n_supported) + goto use_legacy; + +- if (test_sta_flag(sinfo, WLAN_STA_SHORT_PREAMBLE)) +- mi->cck_supported_short |= mi->cck_supported_short << 4; ++ mi->supported[MINSTREL_CCK_GROUP] |= mi->cck_supported_short << 4; + + /* create an initial rate table with the lowest supported rates */ + minstrel_ht_update_stats(mp, mi); +-- +2.20.1 + diff --git a/queue-4.14/md-allow-metadata-updates-while-suspending-an-array-.patch b/queue-4.14/md-allow-metadata-updates-while-suspending-an-array-.patch new file mode 100644 index 00000000000..c6b211034da --- /dev/null +++ b/queue-4.14/md-allow-metadata-updates-while-suspending-an-array-.patch @@ -0,0 +1,74 @@ +From 25ae4f7d2b69a01312eb5045435bcdc205305d58 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Oct 2018 15:04:41 +1000 +Subject: md: allow metadata updates while suspending an array - fix + +From: NeilBrown + +[ Upstream commit 059421e041eb461fb2b3e81c9adaec18ef03ca3c ] + +Commit 35bfc52187f6 ("md: allow metadata update while suspending.") +added support for allowing md_check_recovery() to still perform +metadata updates while the array is entering the 'suspended' state. +This is needed to allow the processes of entering the state to +complete. + +Unfortunately, the patch doesn't really work. The test for +"mddev->suspended" at the start of md_check_recovery() means that the +function doesn't try to do anything at all while entering suspend. + +This patch moves the code of updating the metadata while suspending to +*before* the test on mddev->suspended. + +Reported-by: Jeff Mahoney +Fixes: 35bfc52187f6 ("md: allow metadata update while suspending.") +Signed-off-by: NeilBrown +Signed-off-by: Shaohua Li +Signed-off-by: Sasha Levin +--- + drivers/md/md.c | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) + +diff --git a/drivers/md/md.c b/drivers/md/md.c +index e529cef5483a8..b942c74f1ce83 100644 +--- a/drivers/md/md.c ++++ b/drivers/md/md.c +@@ -8736,6 +8736,18 @@ static void md_start_sync(struct work_struct *ws) + */ + void md_check_recovery(struct mddev *mddev) + { ++ if (test_bit(MD_ALLOW_SB_UPDATE, &mddev->flags) && mddev->sb_flags) { ++ /* Write superblock - thread that called mddev_suspend() ++ * holds reconfig_mutex for us. ++ */ ++ set_bit(MD_UPDATING_SB, &mddev->flags); ++ smp_mb__after_atomic(); ++ if (test_bit(MD_ALLOW_SB_UPDATE, &mddev->flags)) ++ md_update_sb(mddev, 0); ++ clear_bit_unlock(MD_UPDATING_SB, &mddev->flags); ++ wake_up(&mddev->sb_wait); ++ } ++ + if (mddev->suspended) + return; + +@@ -8896,16 +8908,6 @@ void md_check_recovery(struct mddev *mddev) + unlock: + wake_up(&mddev->sb_wait); + mddev_unlock(mddev); +- } else if (test_bit(MD_ALLOW_SB_UPDATE, &mddev->flags) && mddev->sb_flags) { +- /* Write superblock - thread that called mddev_suspend() +- * holds reconfig_mutex for us. +- */ +- set_bit(MD_UPDATING_SB, &mddev->flags); +- smp_mb__after_atomic(); +- if (test_bit(MD_ALLOW_SB_UPDATE, &mddev->flags)) +- md_update_sb(mddev, 0); +- clear_bit_unlock(MD_UPDATING_SB, &mddev->flags); +- wake_up(&mddev->sb_wait); + } + } + EXPORT_SYMBOL(md_check_recovery); +-- +2.20.1 + diff --git a/queue-4.14/media-cec-gpio-select-correct-signal-free-time.patch b/queue-4.14/media-cec-gpio-select-correct-signal-free-time.patch new file mode 100644 index 00000000000..e7310ea4a8f --- /dev/null +++ b/queue-4.14/media-cec-gpio-select-correct-signal-free-time.patch @@ -0,0 +1,63 @@ +From 95dab275c5646e5d6e770f5072ca62574557d4b9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Oct 2018 08:51:45 -0400 +Subject: media: cec-gpio: select correct Signal Free Time + +From: Hans Verkuil + +[ Upstream commit c439d5c1e13dbf66cff53455432f21d4d0536c51 ] + +If a receive is in progress or starts before the transmit has +a chance, then lower the Signal Free Time of the upcoming transmit +to no more than CEC_SIGNAL_FREE_TIME_NEW_INITIATOR. + +This is per the specification requirements. + +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/cec/cec-pin.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/drivers/media/cec/cec-pin.c b/drivers/media/cec/cec-pin.c +index c003b8eac6176..68fc6a24d0771 100644 +--- a/drivers/media/cec/cec-pin.c ++++ b/drivers/media/cec/cec-pin.c +@@ -529,6 +529,17 @@ static enum hrtimer_restart cec_pin_timer(struct hrtimer *timer) + /* Start bit, switch to receive state */ + pin->ts = ts; + pin->state = CEC_ST_RX_START_BIT_LOW; ++ /* ++ * If a transmit is pending, then that transmit should ++ * use a signal free time of no more than ++ * CEC_SIGNAL_FREE_TIME_NEW_INITIATOR since it will ++ * have a new initiator due to the receive that is now ++ * starting. ++ */ ++ if (pin->tx_msg.len && pin->tx_signal_free_time > ++ CEC_SIGNAL_FREE_TIME_NEW_INITIATOR) ++ pin->tx_signal_free_time = ++ CEC_SIGNAL_FREE_TIME_NEW_INITIATOR; + break; + } + if (pin->ts == 0) +@@ -690,6 +701,15 @@ static int cec_pin_adap_transmit(struct cec_adapter *adap, u8 attempts, + { + struct cec_pin *pin = adap->pin; + ++ /* ++ * If a receive is in progress, then this transmit should use ++ * a signal free time of max CEC_SIGNAL_FREE_TIME_NEW_INITIATOR ++ * since when it starts transmitting it will have a new initiator. ++ */ ++ if (pin->state != CEC_ST_IDLE && ++ signal_free_time > CEC_SIGNAL_FREE_TIME_NEW_INITIATOR) ++ signal_free_time = CEC_SIGNAL_FREE_TIME_NEW_INITIATOR; ++ + pin->tx_signal_free_time = signal_free_time; + pin->tx_msg = *msg; + pin->work_tx_status = 0; +-- +2.20.1 + diff --git a/queue-4.14/media-cx231xx-fix-potential-sign-extension-overflow-.patch b/queue-4.14/media-cx231xx-fix-potential-sign-extension-overflow-.patch new file mode 100644 index 00000000000..b9828c72f9c --- /dev/null +++ b/queue-4.14/media-cx231xx-fix-potential-sign-extension-overflow-.patch @@ -0,0 +1,43 @@ +From 06b6f4ba3b1a4a57ca6879251deda6d60d9bd949 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 6 Oct 2018 14:01:42 -0400 +Subject: media: cx231xx: fix potential sign-extension overflow on large shift + +From: Colin Ian King + +[ Upstream commit 32ae592036d7aeaabcccb2b1715373a68639a768 ] + +Shifting the u8 value[3] by an int can lead to sign-extension +overflow. For example, if value[3] is 0xff and the shift is 24 then it +is promoted to int and then the top bit is sign-extended so that all +upper 32 bits are set. Fix this by casting value[3] to a u32 before +the shift. + +Detected by CoverityScan, CID#1016522 ("Unintended sign extension") + +Fixes: e0d3bafd0258 ("V4L/DVB (10954): Add cx231xx USB driver") + +Signed-off-by: Colin Ian King +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c +index 179b8481a870d..fd33c2e9327da 100644 +--- a/drivers/media/usb/cx231xx/cx231xx-video.c ++++ b/drivers/media/usb/cx231xx/cx231xx-video.c +@@ -1389,7 +1389,7 @@ int cx231xx_g_register(struct file *file, void *priv, + ret = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, + (u16)reg->reg, value, 4); + reg->val = value[0] | value[1] << 8 | +- value[2] << 16 | value[3] << 24; ++ value[2] << 16 | (u32)value[3] << 24; + reg->size = 4; + break; + case 1: /* AFE - read byte */ +-- +2.20.1 + diff --git a/queue-4.14/media-dw9714-fix-error-handling-in-probe-function.patch b/queue-4.14/media-dw9714-fix-error-handling-in-probe-function.patch new file mode 100644 index 00000000000..53f259fe28e --- /dev/null +++ b/queue-4.14/media-dw9714-fix-error-handling-in-probe-function.patch @@ -0,0 +1,38 @@ +From e29394e54f2c5b6091a14676a68dad7f7f68baf1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Oct 2018 12:22:17 -0400 +Subject: media: dw9714: Fix error handling in probe function + +From: Rajmohan Mani + +[ Upstream commit f9a0b14240a2d0bd196d35e8aac73df6eabd6382 ] + +Fixed the case where v4l2_async_unregister_subdev() +is called unnecessarily in the error handling path +in probe function. + +Signed-off-by: Rajmohan Mani +Signed-off-by: Sakari Ailus +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/i2c/dw9714.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/media/i2c/dw9714.c b/drivers/media/i2c/dw9714.c +index 95af4fc99cd04..c1273bcd59011 100644 +--- a/drivers/media/i2c/dw9714.c ++++ b/drivers/media/i2c/dw9714.c +@@ -182,7 +182,8 @@ static int dw9714_probe(struct i2c_client *client) + return 0; + + err_cleanup: +- dw9714_subdev_cleanup(dw9714_dev); ++ v4l2_ctrl_handler_free(&dw9714_dev->ctrls_vcm); ++ media_entity_cleanup(&dw9714_dev->sd.entity); + dev_err(&client->dev, "Probe failed: %d\n", rval); + return rval; + } +-- +2.20.1 + diff --git a/queue-4.14/media-i2c-adv748x-support-probing-a-single-output.patch b/queue-4.14/media-i2c-adv748x-support-probing-a-single-output.patch new file mode 100644 index 00000000000..56080b756f6 --- /dev/null +++ b/queue-4.14/media-i2c-adv748x-support-probing-a-single-output.patch @@ -0,0 +1,151 @@ +From 2881483a02a81bd65b6f414448508c877df6d6e9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 17 Sep 2018 07:30:54 -0400 +Subject: media: i2c: adv748x: Support probing a single output + +From: Jacopo Mondi + +[ Upstream commit eccf442ce156ec2b4e06b1239d5fdcb0c732f63f ] + +Currently the adv748x driver will fail to probe unless both of its +output endpoints (TXA and TXB) are connected. + +Make the driver support probing provided that there is at least one +input, and one output connected and protect the clean-up function from +accessing un-initialized fields. + +Following patches will fix other uses of un-initialized TXs in the driver, +such as power management functions. + +Tested-by: Laurent Pinchart +Signed-off-by: Jacopo Mondi +Signed-off-by: Kieran Bingham +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/i2c/adv748x/adv748x-core.c | 25 +++++++++++++++++++++--- + drivers/media/i2c/adv748x/adv748x-csi2.c | 18 ++++++----------- + drivers/media/i2c/adv748x/adv748x.h | 2 ++ + 3 files changed, 30 insertions(+), 15 deletions(-) + +diff --git a/drivers/media/i2c/adv748x/adv748x-core.c b/drivers/media/i2c/adv748x/adv748x-core.c +index 5ee14f2c27478..cfec08593ac88 100644 +--- a/drivers/media/i2c/adv748x/adv748x-core.c ++++ b/drivers/media/i2c/adv748x/adv748x-core.c +@@ -642,7 +642,8 @@ static int adv748x_parse_dt(struct adv748x_state *state) + { + struct device_node *ep_np = NULL; + struct of_endpoint ep; +- bool found = false; ++ bool out_found = false; ++ bool in_found = false; + + for_each_endpoint_of_node(state->dev->of_node, ep_np) { + of_graph_parse_endpoint(ep_np, &ep); +@@ -667,10 +668,17 @@ static int adv748x_parse_dt(struct adv748x_state *state) + of_node_get(ep_np); + state->endpoints[ep.port] = ep_np; + +- found = true; ++ /* ++ * At least one input endpoint and one output endpoint shall ++ * be defined. ++ */ ++ if (ep.port < ADV748X_PORT_TXA) ++ in_found = true; ++ else ++ out_found = true; + } + +- return found ? 0 : -ENODEV; ++ return in_found && out_found ? 0 : -ENODEV; + } + + static void adv748x_dt_cleanup(struct adv748x_state *state) +@@ -702,6 +710,17 @@ static int adv748x_probe(struct i2c_client *client, + state->i2c_clients[ADV748X_PAGE_IO] = client; + i2c_set_clientdata(client, state); + ++ /* ++ * We can not use container_of to get back to the state with two TXs; ++ * Initialize the TXs's fields unconditionally on the endpoint ++ * presence to access them later. ++ */ ++ state->txa.state = state->txb.state = state; ++ state->txa.page = ADV748X_PAGE_TXA; ++ state->txb.page = ADV748X_PAGE_TXB; ++ state->txa.port = ADV748X_PORT_TXA; ++ state->txb.port = ADV748X_PORT_TXB; ++ + /* Discover and process ports declared by the Device tree endpoints */ + ret = adv748x_parse_dt(state); + if (ret) { +diff --git a/drivers/media/i2c/adv748x/adv748x-csi2.c b/drivers/media/i2c/adv748x/adv748x-csi2.c +index 979825d4a419b..0953ba0bcc09b 100644 +--- a/drivers/media/i2c/adv748x/adv748x-csi2.c ++++ b/drivers/media/i2c/adv748x/adv748x-csi2.c +@@ -265,19 +265,10 @@ static int adv748x_csi2_init_controls(struct adv748x_csi2 *tx) + + int adv748x_csi2_init(struct adv748x_state *state, struct adv748x_csi2 *tx) + { +- struct device_node *ep; + int ret; + +- /* We can not use container_of to get back to the state with two TXs */ +- tx->state = state; +- tx->page = is_txa(tx) ? ADV748X_PAGE_TXA : ADV748X_PAGE_TXB; +- +- ep = state->endpoints[is_txa(tx) ? ADV748X_PORT_TXA : ADV748X_PORT_TXB]; +- if (!ep) { +- adv_err(state, "No endpoint found for %s\n", +- is_txa(tx) ? "txa" : "txb"); +- return -ENODEV; +- } ++ if (!is_tx_enabled(tx)) ++ return 0; + + /* Initialise the virtual channel */ + adv748x_csi2_set_virtual_channel(tx, 0); +@@ -287,7 +278,7 @@ int adv748x_csi2_init(struct adv748x_state *state, struct adv748x_csi2 *tx) + is_txa(tx) ? "txa" : "txb"); + + /* Ensure that matching is based upon the endpoint fwnodes */ +- tx->sd.fwnode = of_fwnode_handle(ep); ++ tx->sd.fwnode = of_fwnode_handle(state->endpoints[tx->port]); + + /* Register internal ops for incremental subdev registration */ + tx->sd.internal_ops = &adv748x_csi2_internal_ops; +@@ -320,6 +311,9 @@ int adv748x_csi2_init(struct adv748x_state *state, struct adv748x_csi2 *tx) + + void adv748x_csi2_cleanup(struct adv748x_csi2 *tx) + { ++ if (!is_tx_enabled(tx)) ++ return; ++ + v4l2_async_unregister_subdev(&tx->sd); + media_entity_cleanup(&tx->sd.entity); + v4l2_ctrl_handler_free(&tx->ctrl_hdl); +diff --git a/drivers/media/i2c/adv748x/adv748x.h b/drivers/media/i2c/adv748x/adv748x.h +index cc4151b5b31e2..296c5f8a8c633 100644 +--- a/drivers/media/i2c/adv748x/adv748x.h ++++ b/drivers/media/i2c/adv748x/adv748x.h +@@ -94,6 +94,7 @@ struct adv748x_csi2 { + struct adv748x_state *state; + struct v4l2_mbus_framefmt format; + unsigned int page; ++ unsigned int port; + + struct media_pad pads[ADV748X_CSI2_NR_PADS]; + struct v4l2_ctrl_handler ctrl_hdl; +@@ -102,6 +103,7 @@ struct adv748x_csi2 { + + #define notifier_to_csi2(n) container_of(n, struct adv748x_csi2, notifier) + #define adv748x_sd_to_csi2(sd) container_of(sd, struct adv748x_csi2, sd) ++#define is_tx_enabled(_tx) ((_tx)->state->endpoints[(_tx)->port] != NULL) + + enum adv748x_hdmi_pads { + ADV748X_HDMI_SINK, +-- +2.20.1 + diff --git a/queue-4.14/media-isif-fix-a-null-pointer-dereference-bug.patch b/queue-4.14/media-isif-fix-a-null-pointer-dereference-bug.patch new file mode 100644 index 00000000000..4d962ac0fb2 --- /dev/null +++ b/queue-4.14/media-isif-fix-a-null-pointer-dereference-bug.patch @@ -0,0 +1,49 @@ +From 1daca625931e325274011ddb797e895ccf82e29c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Oct 2018 11:44:02 -0400 +Subject: media: isif: fix a NULL pointer dereference bug + +From: Wenwen Wang + +[ Upstream commit a26ac6c1bed951b2066cc4b2257facd919e35c0b ] + +In isif_probe(), there is a while loop to get the ISIF base address and +linearization table0 and table1 address. In the loop body, the function +platform_get_resource() is called to get the resource. If +platform_get_resource() returns NULL, the loop is terminated and the +execution goes to 'fail_nobase_res'. Suppose the loop is terminated at the +first iteration because platform_get_resource() returns NULL and the +execution goes to 'fail_nobase_res'. Given that there is another while loop +at 'fail_nobase_res' and i equals to 0, one iteration of the second while +loop will be executed. However, the second while loop does not check the +return value of platform_get_resource(). This can cause a NULL pointer +dereference bug if the return value is a NULL pointer. + +This patch avoids the above issue by adding a check in the second while +loop after the call to platform_get_resource(). + +Signed-off-by: Wenwen Wang +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/platform/davinci/isif.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/media/platform/davinci/isif.c b/drivers/media/platform/davinci/isif.c +index 5813b49391edb..90d0f13283ae9 100644 +--- a/drivers/media/platform/davinci/isif.c ++++ b/drivers/media/platform/davinci/isif.c +@@ -1102,7 +1102,8 @@ static int isif_probe(struct platform_device *pdev) + + while (i >= 0) { + res = platform_get_resource(pdev, IORESOURCE_MEM, i); +- release_mem_region(res->start, resource_size(res)); ++ if (res) ++ release_mem_region(res->start, resource_size(res)); + i--; + } + vpfe_unregister_ccdc_device(&isif_hw_dev); +-- +2.20.1 + diff --git a/queue-4.14/media-pxa_camera-fix-check-for-pdev-dev.of_node.patch b/queue-4.14/media-pxa_camera-fix-check-for-pdev-dev.of_node.patch new file mode 100644 index 00000000000..a29119918b8 --- /dev/null +++ b/queue-4.14/media-pxa_camera-fix-check-for-pdev-dev.of_node.patch @@ -0,0 +1,48 @@ +From 40122893af8e2c789a76904481c98de451b9e7ed Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 Sep 2018 06:00:45 -0400 +Subject: media: pxa_camera: Fix check for pdev->dev.of_node + +From: Nathan Chancellor + +[ Upstream commit 44d7f1a77d8c84f8e42789b5475b74ae0e6d4758 ] + +Clang warns that the address of a pointer will always evaluated as true +in a boolean context. + +drivers/media/platform/pxa_camera.c:2400:17: warning: address of +'pdev->dev.of_node' will always evaluate to 'true' +[-Wpointer-bool-conversion] + if (&pdev->dev.of_node && !pcdev->pdata) { + ~~~~~~~~~~^~~~~~~ ~~ +1 warning generated. + +Judging from the rest of the kernel, it seems like this was an error and +just the value of of_node should be checked rather than the address. + +Reported-by: Nick Desaulniers +Signed-off-by: Nathan Chancellor +Reviewed-by: Nick Desaulniers +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/platform/pxa_camera.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c +index edca993c2b1f0..d270a23299cc7 100644 +--- a/drivers/media/platform/pxa_camera.c ++++ b/drivers/media/platform/pxa_camera.c +@@ -2374,7 +2374,7 @@ static int pxa_camera_probe(struct platform_device *pdev) + pcdev->res = res; + + pcdev->pdata = pdev->dev.platform_data; +- if (&pdev->dev.of_node && !pcdev->pdata) { ++ if (pdev->dev.of_node && !pcdev->pdata) { + err = pxa_camera_pdata_from_dt(&pdev->dev, pcdev, &pcdev->asd); + } else { + pcdev->platform_flags = pcdev->pdata->flags; +-- +2.20.1 + diff --git a/queue-4.14/media-rc-ir-rc6-decoder-enable-toggle-bit-for-kathre.patch b/queue-4.14/media-rc-ir-rc6-decoder-enable-toggle-bit-for-kathre.patch new file mode 100644 index 00000000000..c3042ee46be --- /dev/null +++ b/queue-4.14/media-rc-ir-rc6-decoder-enable-toggle-bit-for-kathre.patch @@ -0,0 +1,59 @@ +From 69d079cf1eed38471c29485bc6c61af17d4b7aea Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 28 Aug 2018 09:49:42 -0400 +Subject: media: rc: ir-rc6-decoder: enable toggle bit for Kathrein RCU-676 + remote + +From: Matthias Reichl + +[ Upstream commit 85e4af0a7ae2f146769b7475ae531bf8a3f3afb4 ] + +The Kathrein RCU-676 remote uses the 32-bit rc6 protocol and toggles +bit 15 (0x8000) on repeated button presses, like MCE remotes. + +Add it's customer code 0x80460000 to the 32-bit rc6 toggle +handling code to get proper scancodes and toggle reports. + +Signed-off-by: Matthias Reichl +Signed-off-by: Sean Young +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/rc/ir-rc6-decoder.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c +index 5d0d2fe3b7a7f..90f7930444a1a 100644 +--- a/drivers/media/rc/ir-rc6-decoder.c ++++ b/drivers/media/rc/ir-rc6-decoder.c +@@ -40,6 +40,7 @@ + #define RC6_6A_MCE_TOGGLE_MASK 0x8000 /* for the body bits */ + #define RC6_6A_LCC_MASK 0xffff0000 /* RC6-6A-32 long customer code mask */ + #define RC6_6A_MCE_CC 0x800f0000 /* MCE customer code */ ++#define RC6_6A_KATHREIN_CC 0x80460000 /* Kathrein RCU-676 customer code */ + #ifndef CHAR_BIT + #define CHAR_BIT 8 /* Normally in */ + #endif +@@ -252,13 +253,17 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev) + toggle = 0; + break; + case 32: +- if ((scancode & RC6_6A_LCC_MASK) == RC6_6A_MCE_CC) { ++ switch (scancode & RC6_6A_LCC_MASK) { ++ case RC6_6A_MCE_CC: ++ case RC6_6A_KATHREIN_CC: + protocol = RC_PROTO_RC6_MCE; + toggle = !!(scancode & RC6_6A_MCE_TOGGLE_MASK); + scancode &= ~RC6_6A_MCE_TOGGLE_MASK; +- } else { ++ break; ++ default: + protocol = RC_PROTO_RC6_6A_32; + toggle = 0; ++ break; + } + break; + default: +-- +2.20.1 + diff --git a/queue-4.14/mei-samples-fix-a-signedness-bug-in-amt_host_if_call.patch b/queue-4.14/mei-samples-fix-a-signedness-bug-in-amt_host_if_call.patch new file mode 100644 index 00000000000..726e4c4e52b --- /dev/null +++ b/queue-4.14/mei-samples-fix-a-signedness-bug-in-amt_host_if_call.patch @@ -0,0 +1,34 @@ +From 8b80ebee9ef65f5c32db316089343654dac67157 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 1 Oct 2018 19:44:41 +0300 +Subject: mei: samples: fix a signedness bug in amt_host_if_call() + +From: Dan Carpenter + +[ Upstream commit 185647813cac080453cb73a2e034a8821049f2a7 ] + +"out_buf_sz" needs to be signed for the error handling to work. + +Signed-off-by: Dan Carpenter +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + samples/mei/mei-amt-version.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/samples/mei/mei-amt-version.c b/samples/mei/mei-amt-version.c +index bb9988914a563..32234481ad7db 100644 +--- a/samples/mei/mei-amt-version.c ++++ b/samples/mei/mei-amt-version.c +@@ -370,7 +370,7 @@ static uint32_t amt_host_if_call(struct amt_host_if *acmd, + unsigned int expected_sz) + { + uint32_t in_buf_sz; +- uint32_t out_buf_sz; ++ ssize_t out_buf_sz; + ssize_t written; + uint32_t status; + struct amt_host_if_resp_header *msg_hdr; +-- +2.20.1 + diff --git a/queue-4.14/mfd-ti_am335x_tscadc-keep-adc-interface-on-if-child-.patch b/queue-4.14/mfd-ti_am335x_tscadc-keep-adc-interface-on-if-child-.patch new file mode 100644 index 00000000000..824a6effaea --- /dev/null +++ b/queue-4.14/mfd-ti_am335x_tscadc-keep-adc-interface-on-if-child-.patch @@ -0,0 +1,53 @@ +From 0d970671a58d52f620a83e6e7e61754decec2838 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 30 Jun 2018 16:03:16 +0530 +Subject: mfd: ti_am335x_tscadc: Keep ADC interface on if child is wakeup + capable + +From: Vignesh R + +[ Upstream commit c974ac771479327b5424f60d58845e31daddadea ] + +If a child device like touchscreen is wakeup capable, then keep ADC +interface on, so that a touching resistive screen will generate wakeup +event to the system. + +Signed-off-by: Vignesh R +Signed-off-by: Lee Jones +Signed-off-by: Sasha Levin +--- + drivers/mfd/ti_am335x_tscadc.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c +index 5894d6c16fab8..ca9f0c8d1ed0f 100644 +--- a/drivers/mfd/ti_am335x_tscadc.c ++++ b/drivers/mfd/ti_am335x_tscadc.c +@@ -296,11 +296,24 @@ static int ti_tscadc_remove(struct platform_device *pdev) + return 0; + } + ++static int __maybe_unused ti_tscadc_can_wakeup(struct device *dev, void *data) ++{ ++ return device_may_wakeup(dev); ++} ++ + static int __maybe_unused tscadc_suspend(struct device *dev) + { + struct ti_tscadc_dev *tscadc = dev_get_drvdata(dev); + + regmap_write(tscadc->regmap, REG_SE, 0x00); ++ if (device_for_each_child(dev, NULL, ti_tscadc_can_wakeup)) { ++ u32 ctrl; ++ ++ regmap_read(tscadc->regmap, REG_CTRL, &ctrl); ++ ctrl &= ~(CNTRLREG_POWERDOWN); ++ ctrl |= CNTRLREG_TSCSSENB; ++ regmap_write(tscadc->regmap, REG_CTRL, ctrl); ++ } + pm_runtime_put_sync(dev); + + return 0; +-- +2.20.1 + diff --git a/queue-4.14/misc-cxl-fix-possible-null-pointer-dereference.patch b/queue-4.14/misc-cxl-fix-possible-null-pointer-dereference.patch new file mode 100644 index 00000000000..afca789a099 --- /dev/null +++ b/queue-4.14/misc-cxl-fix-possible-null-pointer-dereference.patch @@ -0,0 +1,37 @@ +From ddffcdc918ed694f8ae08694e4b405e2d0297d62 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Oct 2018 13:02:53 +0800 +Subject: misc: cxl: Fix possible null pointer dereference + +From: zhong jiang + +[ Upstream commit 3dac3583bf1a61db6aaf31dfd752c677a4400afd ] + +It is not safe to dereference an object before a null test. It is +not needed and just remove them. Ftrace can be used instead. + +Signed-off-by: zhong jiang +Acked-by: Andrew Donnellan +Acked-by: Frederic Barrat +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/misc/cxl/guest.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/drivers/misc/cxl/guest.c b/drivers/misc/cxl/guest.c +index 1a64eb185cfd5..de2ce55395454 100644 +--- a/drivers/misc/cxl/guest.c ++++ b/drivers/misc/cxl/guest.c +@@ -1028,8 +1028,6 @@ int cxl_guest_init_afu(struct cxl *adapter, int slice, struct device_node *afu_n + + void cxl_guest_remove_afu(struct cxl_afu *afu) + { +- pr_devel("in %s - AFU(%d)\n", __func__, afu->slice); +- + if (!afu) + return; + +-- +2.20.1 + diff --git a/queue-4.14/mlxsw-spectrum_switchdev-check-notification-relevanc.patch b/queue-4.14/mlxsw-spectrum_switchdev-check-notification-relevanc.patch new file mode 100644 index 00000000000..598161bbdb5 --- /dev/null +++ b/queue-4.14/mlxsw-spectrum_switchdev-check-notification-relevanc.patch @@ -0,0 +1,47 @@ +From ac38187ab8bdffc1bc2b34fb3adeabb20488bc08 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 11 Oct 2018 07:47:52 +0000 +Subject: mlxsw: spectrum_switchdev: Check notification relevance based on + upper device + +From: Ido Schimmel + +[ Upstream commit 5050f6ae253ad1307af3486c26fc4f94287078b7 ] + +VxLAN FDB updates are sent with the VxLAN device which is not our upper +and will therefore be ignored by current code. + +Solve this by checking whether the upper device (bridge) is our upper. + +Signed-off-by: Ido Schimmel +Reviewed-by: Petr Machata +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +index 8a1788108f52a..698de51b3fef0 100644 +--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c ++++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +@@ -1939,8 +1939,15 @@ static int mlxsw_sp_switchdev_event(struct notifier_block *unused, + struct net_device *dev = switchdev_notifier_info_to_dev(ptr); + struct mlxsw_sp_switchdev_event_work *switchdev_work; + struct switchdev_notifier_fdb_info *fdb_info = ptr; ++ struct net_device *br_dev; + +- if (!mlxsw_sp_port_dev_lower_find_rcu(dev)) ++ /* Tunnel devices are not our uppers, so check their master instead */ ++ br_dev = netdev_master_upper_dev_get_rcu(dev); ++ if (!br_dev) ++ return NOTIFY_DONE; ++ if (!netif_is_bridge_master(br_dev)) ++ return NOTIFY_DONE; ++ if (!mlxsw_sp_port_dev_lower_find_rcu(br_dev)) + return NOTIFY_DONE; + + switchdev_work = kzalloc(sizeof(*switchdev_work), GFP_ATOMIC); +-- +2.20.1 + diff --git a/queue-4.14/mmc-tmio-fix-scc-error-detection.patch b/queue-4.14/mmc-tmio-fix-scc-error-detection.patch new file mode 100644 index 00000000000..2c2f292ee14 --- /dev/null +++ b/queue-4.14/mmc-tmio-fix-scc-error-detection.patch @@ -0,0 +1,44 @@ +From 9f9332849206fcd4dc100f4763640c6ed3df8708 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 30 Aug 2018 01:32:07 +0200 +Subject: mmc: tmio: Fix SCC error detection +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Masaharu Hayakawa + +[ Upstream commit b85fb0a1c8aeaaa40d08945d51a6656b512173f0 ] + +SDR104, HS200 and HS400 need to check for SCC error. If SCC error is +detected, retuning is necessary. + +Signed-off-by: Masaharu Hayakawa +[Niklas: update commit message] +Signed-off-by: Niklas Söderlund +Reviewed-by: Wolfram Sang +Tested-by: Wolfram Sang +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/tmio_mmc_core.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c +index 2437fcde915a7..01e51b7945750 100644 +--- a/drivers/mmc/host/tmio_mmc_core.c ++++ b/drivers/mmc/host/tmio_mmc_core.c +@@ -914,8 +914,8 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host) + if (mrq->cmd->error || (mrq->data && mrq->data->error)) + tmio_mmc_abort_dma(host); + +- if (host->check_scc_error) +- host->check_scc_error(host); ++ if (host->check_scc_error && host->check_scc_error(host)) ++ mrq->cmd->error = -EILSEQ; + + /* If SET_BLOCK_COUNT, continue with main command */ + if (host->mrq && !mrq->cmd->error) { +-- +2.20.1 + diff --git a/queue-4.14/mmc-tmio-fix-scc-error-handling-to-avoid-false-posit.patch b/queue-4.14/mmc-tmio-fix-scc-error-handling-to-avoid-false-posit.patch new file mode 100644 index 00000000000..bef138c697e --- /dev/null +++ b/queue-4.14/mmc-tmio-fix-scc-error-handling-to-avoid-false-posit.patch @@ -0,0 +1,52 @@ +From 4dd302d1383e26112aa8f3e454a5d3adc2fd7aae Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 15 May 2019 20:23:46 +0200 +Subject: mmc: tmio: fix SCC error handling to avoid false positive CRC error + +From: Takeshi Saito + +[ Upstream commit 51b72656bb39fdcb8f3174f4007bcc83ad1d275f ] + +If an SCC error occurs during a read/write command execution, a false +positive CRC error message is output. + +mmcblk0: response CRC error sending r/w cmd command, card status 0x900 + +check_scc_error() checks SCC_RVSREQ.RVSERR bit. RVSERR detects a +correction error in the next (up or down) delay tap position. However, +since the command is successful, only retuning needs to be executed. +This has been confirmed by HW engineers. + +Thus, on SCC error, set retuning flag instead of setting an error code. + +Fixes: b85fb0a1c8ae ("mmc: tmio: Fix SCC error detection") +Signed-off-by: Takeshi Saito +[wsa: updated comment and commit message, removed some braces] +Signed-off-by: Wolfram Sang +Reviewed-by: Simon Horman +Reviewed-by: Yoshihiro Shimoda +Cc: stable@vger.kernel.org +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/tmio_mmc_core.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c +index 01e51b7945750..2fd862dc97701 100644 +--- a/drivers/mmc/host/tmio_mmc_core.c ++++ b/drivers/mmc/host/tmio_mmc_core.c +@@ -914,8 +914,9 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host) + if (mrq->cmd->error || (mrq->data && mrq->data->error)) + tmio_mmc_abort_dma(host); + ++ /* SCC error means retune, but executed command was still successful */ + if (host->check_scc_error && host->check_scc_error(host)) +- mrq->cmd->error = -EILSEQ; ++ mmc_retune_needed(host->mmc); + + /* If SET_BLOCK_COUNT, continue with main command */ + if (host->mrq && !mrq->cmd->error) { +-- +2.20.1 + diff --git a/queue-4.14/mtd-physmap_of-release-resources-on-error.patch b/queue-4.14/mtd-physmap_of-release-resources-on-error.patch new file mode 100644 index 00000000000..4a9124feeb3 --- /dev/null +++ b/queue-4.14/mtd-physmap_of-release-resources-on-error.patch @@ -0,0 +1,88 @@ +From a077a0afd59d6be721ab7a9e44abe5fdcab718d3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Oct 2018 15:34:45 +0200 +Subject: mtd: physmap_of: Release resources on error + +From: Ricardo Ribalda Delgado + +[ Upstream commit ef0de747f7ad179c7698a5b0e28db05f18ecbf57 ] + +During probe, if there was an error the memory region and the memory +map were not properly released.This can lead a system unusable if +deferred probe is in use. + +Replace mem_request and map with devm_ioremap_resource + +Signed-off-by: Ricardo Ribalda Delgado +Signed-off-by: Boris Brezillon +Signed-off-by: Sasha Levin +--- + drivers/mtd/maps/physmap_of_core.c | 27 +++++---------------------- + 1 file changed, 5 insertions(+), 22 deletions(-) + +diff --git a/drivers/mtd/maps/physmap_of_core.c b/drivers/mtd/maps/physmap_of_core.c +index b1bd4faecfb25..5d8399742c754 100644 +--- a/drivers/mtd/maps/physmap_of_core.c ++++ b/drivers/mtd/maps/physmap_of_core.c +@@ -30,7 +30,6 @@ + struct of_flash_list { + struct mtd_info *mtd; + struct map_info map; +- struct resource *res; + }; + + struct of_flash { +@@ -55,18 +54,10 @@ static int of_flash_remove(struct platform_device *dev) + mtd_concat_destroy(info->cmtd); + } + +- for (i = 0; i < info->list_size; i++) { ++ for (i = 0; i < info->list_size; i++) + if (info->list[i].mtd) + map_destroy(info->list[i].mtd); + +- if (info->list[i].map.virt) +- iounmap(info->list[i].map.virt); +- +- if (info->list[i].res) { +- release_resource(info->list[i].res); +- kfree(info->list[i].res); +- } +- } + return 0; + } + +@@ -214,10 +205,11 @@ static int of_flash_probe(struct platform_device *dev) + + err = -EBUSY; + res_size = resource_size(&res); +- info->list[i].res = request_mem_region(res.start, res_size, +- dev_name(&dev->dev)); +- if (!info->list[i].res) ++ info->list[i].map.virt = devm_ioremap_resource(&dev->dev, &res); ++ if (IS_ERR(info->list[i].map.virt)) { ++ err = PTR_ERR(info->list[i].map.virt); + goto err_out; ++ } + + err = -ENXIO; + width = of_get_property(dp, "bank-width", NULL); +@@ -240,15 +232,6 @@ static int of_flash_probe(struct platform_device *dev) + if (err) + goto err_out; + +- err = -ENOMEM; +- info->list[i].map.virt = ioremap(info->list[i].map.phys, +- info->list[i].map.size); +- if (!info->list[i].map.virt) { +- dev_err(&dev->dev, "Failed to ioremap() flash" +- " region\n"); +- goto err_out; +- } +- + simple_map_init(&info->list[i].map); + + /* +-- +2.20.1 + diff --git a/queue-4.14/mtd-rawnand-sh_flctl-use-proper-enum-for-flctl_dma_f.patch b/queue-4.14/mtd-rawnand-sh_flctl-use-proper-enum-for-flctl_dma_f.patch new file mode 100644 index 00000000000..4280e4e9bb5 --- /dev/null +++ b/queue-4.14/mtd-rawnand-sh_flctl-use-proper-enum-for-flctl_dma_f.patch @@ -0,0 +1,62 @@ +From 10c5c4b34961cf7c62d8eb8882d465d7a72d70f4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 20 Sep 2018 16:30:25 -0700 +Subject: mtd: rawnand: sh_flctl: Use proper enum for flctl_dma_fifo0_transfer + +From: Nathan Chancellor + +[ Upstream commit e2bfa4ca23d9b5a7bdfcf21319fad9b59e38a05c ] + +Clang warns when one enumerated type is converted implicitly to another: + +drivers/mtd/nand/raw/sh_flctl.c:483:46: warning: implicit conversion +from enumeration type 'enum dma_transfer_direction' to different +enumeration type 'enum dma_data_direction' [-Wenum-conversion] + flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_DEV_TO_MEM) > 0) + ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ +drivers/mtd/nand/raw/sh_flctl.c:542:46: warning: implicit conversion +from enumeration type 'enum dma_transfer_direction' to different +enumeration type 'enum dma_data_direction' [-Wenum-conversion] + flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_MEM_TO_DEV) > 0) + ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ +2 warnings generated. + +Use the proper enums from dma_data_direction to satisfy Clang. + +DMA_MEM_TO_DEV = DMA_TO_DEVICE = 1 +DMA_DEV_TO_MEM = DMA_FROM_DEVICE = 2 + +Reported-by: Nick Desaulniers +Signed-off-by: Nathan Chancellor +Reviewed-by: Nick Desaulniers +Signed-off-by: Miquel Raynal +Signed-off-by: Sasha Levin +--- + drivers/mtd/nand/sh_flctl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c +index e7f3c98487e62..43db80e5d994f 100644 +--- a/drivers/mtd/nand/sh_flctl.c ++++ b/drivers/mtd/nand/sh_flctl.c +@@ -480,7 +480,7 @@ static void read_fiforeg(struct sh_flctl *flctl, int rlen, int offset) + + /* initiate DMA transfer */ + if (flctl->chan_fifo0_rx && rlen >= 32 && +- flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_DEV_TO_MEM) > 0) ++ flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_FROM_DEVICE) > 0) + goto convert; /* DMA success */ + + /* do polling transfer */ +@@ -539,7 +539,7 @@ static void write_ec_fiforeg(struct sh_flctl *flctl, int rlen, + + /* initiate DMA transfer */ + if (flctl->chan_fifo0_tx && rlen >= 32 && +- flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_MEM_TO_DEV) > 0) ++ flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_TO_DEVICE) > 0) + return; /* DMA success */ + + /* do polling transfer */ +-- +2.20.1 + diff --git a/queue-4.14/net-hns3-fix-for-netdev-not-up-problem-when-setting-.patch b/queue-4.14/net-hns3-fix-for-netdev-not-up-problem-when-setting-.patch new file mode 100644 index 00000000000..8511d5adeaa --- /dev/null +++ b/queue-4.14/net-hns3-fix-for-netdev-not-up-problem-when-setting-.patch @@ -0,0 +1,49 @@ +From 5474bc0d561ca9d192d32433c3bb378267cfbf2f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 Sep 2018 19:28:37 +0100 +Subject: net: hns3: Fix for netdev not up problem when setting mtu + +From: Yunsheng Lin + +[ Upstream commit 93d8daf460183871a965dae339839d9e35d44309 ] + +Currently hns3_nic_change_mtu will try to down the netdev before +setting mtu, and it does not up the netdev when the setting fails, +which causes netdev not up problem. + +This patch fixes it by not returning when the setting fails. + +Fixes: a8e8b7ff3517 ("net: hns3: Add support to change MTU in HNS3 hardware") +Signed-off-by: Yunsheng Lin +Signed-off-by: Peng Li +Signed-off-by: Salil Mehta +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c +index 69726908e72c4..5483cb23c08a3 100644 +--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c ++++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c +@@ -1307,13 +1307,11 @@ static int hns3_nic_change_mtu(struct net_device *netdev, int new_mtu) + } + + ret = h->ae_algo->ops->set_mtu(h, new_mtu); +- if (ret) { ++ if (ret) + netdev_err(netdev, "failed to change MTU in hardware %d\n", + ret); +- return ret; +- } +- +- netdev->mtu = new_mtu; ++ else ++ netdev->mtu = new_mtu; + + /* if the netdev was running earlier, bring it up again */ + if (if_running && hns3_nic_net_open(netdev)) +-- +2.20.1 + diff --git a/queue-4.14/net-ovs-fix-return-type-of-ndo_start_xmit-function.patch b/queue-4.14/net-ovs-fix-return-type-of-ndo_start_xmit-function.patch new file mode 100644 index 00000000000..8ea5d86b1f6 --- /dev/null +++ b/queue-4.14/net-ovs-fix-return-type-of-ndo_start_xmit-function.patch @@ -0,0 +1,49 @@ +From 9bedfb737c1d479db6022921a9bb549eb7b2ae1f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 Sep 2018 17:15:38 +0800 +Subject: net: ovs: fix return type of ndo_start_xmit function + +From: YueHaibing + +[ Upstream commit eddf11e18dff0e8671e06ce54e64cfc843303ab9 ] + +The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', +which is a typedef for an enum type, so make sure the implementation in +this driver has returns 'netdev_tx_t' value, and change the function +return type to netdev_tx_t. + +Found by coccinelle. + +Signed-off-by: YueHaibing +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/openvswitch/vport-internal_dev.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c +index 1c09ad457d2a9..1083b5e901349 100644 +--- a/net/openvswitch/vport-internal_dev.c ++++ b/net/openvswitch/vport-internal_dev.c +@@ -44,7 +44,8 @@ static struct internal_dev *internal_dev_priv(struct net_device *netdev) + } + + /* Called with rcu_read_lock_bh. */ +-static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev) ++static netdev_tx_t ++internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev) + { + int len, err; + +@@ -63,7 +64,7 @@ static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev) + } else { + netdev->stats.tx_errors++; + } +- return 0; ++ return NETDEV_TX_OK; + } + + static int internal_dev_open(struct net_device *netdev) +-- +2.20.1 + diff --git a/queue-4.14/net-xen-netback-fix-return-type-of-ndo_start_xmit-fu.patch b/queue-4.14/net-xen-netback-fix-return-type-of-ndo_start_xmit-fu.patch new file mode 100644 index 00000000000..99dc3481f6b --- /dev/null +++ b/queue-4.14/net-xen-netback-fix-return-type-of-ndo_start_xmit-fu.patch @@ -0,0 +1,41 @@ +From e68a7ad2f37b87eda50dc83fe6d0bcfa6e224b22 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 Sep 2018 17:18:14 +0800 +Subject: net: xen-netback: fix return type of ndo_start_xmit function + +From: YueHaibing + +[ Upstream commit a9ca7f17c6d240e269a24cbcd76abf9a940309dd ] + +The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', +which is a typedef for an enum type, so make sure the implementation in +this driver has returns 'netdev_tx_t' value, and change the function +return type to netdev_tx_t. + +Found by coccinelle. + +Signed-off-by: YueHaibing +Acked-by: Wei Liu +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/xen-netback/interface.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c +index 2641e76d03d9d..b5fa910b47b70 100644 +--- a/drivers/net/xen-netback/interface.c ++++ b/drivers/net/xen-netback/interface.c +@@ -172,7 +172,8 @@ static u16 xenvif_select_queue(struct net_device *dev, struct sk_buff *skb, + return vif->hash.mapping[skb_get_hash_raw(skb) % size]; + } + +-static int xenvif_start_xmit(struct sk_buff *skb, struct net_device *dev) ++static netdev_tx_t ++xenvif_start_xmit(struct sk_buff *skb, struct net_device *dev) + { + struct xenvif *vif = netdev_priv(dev); + struct xenvif_queue *queue = NULL; +-- +2.20.1 + diff --git a/queue-4.14/netfilter-nft_compat-do-not-dump-private-area.patch b/queue-4.14/netfilter-nft_compat-do-not-dump-private-area.patch new file mode 100644 index 00000000000..aad974fe689 --- /dev/null +++ b/queue-4.14/netfilter-nft_compat-do-not-dump-private-area.patch @@ -0,0 +1,73 @@ +From abffd525981e805c42840a978f9c29b21e8ff55f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 9 Oct 2018 20:06:36 +0200 +Subject: netfilter: nft_compat: do not dump private area + +From: Pablo Neira Ayuso + +[ Upstream commit d701d8117200399d85e63a737d2e4e897932f3b6 ] + +Zero pad private area, otherwise we expose private kernel pointer to +userspace. This patch also zeroes the tail area after the ->matchsize +and ->targetsize that results from XT_ALIGN(). + +Fixes: 0ca743a55991 ("netfilter: nf_tables: add compatibility layer for x_tables") +Reported-by: Florian Westphal +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Sasha Levin +--- + net/netfilter/nft_compat.c | 24 ++++++++++++++++++++++-- + 1 file changed, 22 insertions(+), 2 deletions(-) + +diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c +index 7344ec7fff2a7..8281656808aee 100644 +--- a/net/netfilter/nft_compat.c ++++ b/net/netfilter/nft_compat.c +@@ -291,6 +291,24 @@ nft_target_destroy(const struct nft_ctx *ctx, const struct nft_expr *expr) + module_put(me); + } + ++static int nft_extension_dump_info(struct sk_buff *skb, int attr, ++ const void *info, ++ unsigned int size, unsigned int user_size) ++{ ++ unsigned int info_size, aligned_size = XT_ALIGN(size); ++ struct nlattr *nla; ++ ++ nla = nla_reserve(skb, attr, aligned_size); ++ if (!nla) ++ return -1; ++ ++ info_size = user_size ? : size; ++ memcpy(nla_data(nla), info, info_size); ++ memset(nla_data(nla) + info_size, 0, aligned_size - info_size); ++ ++ return 0; ++} ++ + static int nft_target_dump(struct sk_buff *skb, const struct nft_expr *expr) + { + const struct xt_target *target = expr->ops->data; +@@ -298,7 +316,8 @@ static int nft_target_dump(struct sk_buff *skb, const struct nft_expr *expr) + + if (nla_put_string(skb, NFTA_TARGET_NAME, target->name) || + nla_put_be32(skb, NFTA_TARGET_REV, htonl(target->revision)) || +- nla_put(skb, NFTA_TARGET_INFO, XT_ALIGN(target->targetsize), info)) ++ nft_extension_dump_info(skb, NFTA_TARGET_INFO, info, ++ target->targetsize, target->usersize)) + goto nla_put_failure; + + return 0; +@@ -534,7 +553,8 @@ static int __nft_match_dump(struct sk_buff *skb, const struct nft_expr *expr, + + if (nla_put_string(skb, NFTA_MATCH_NAME, match->name) || + nla_put_be32(skb, NFTA_MATCH_REV, htonl(match->revision)) || +- nla_put(skb, NFTA_MATCH_INFO, XT_ALIGN(match->matchsize), info)) ++ nft_extension_dump_info(skb, NFTA_MATCH_INFO, info, ++ match->matchsize, match->usersize)) + goto nla_put_failure; + + return 0; +-- +2.20.1 + diff --git a/queue-4.14/nfsv4.x-fix-lock-recovery-during-delegation-recall.patch b/queue-4.14/nfsv4.x-fix-lock-recovery-during-delegation-recall.patch new file mode 100644 index 00000000000..d6812d549fe --- /dev/null +++ b/queue-4.14/nfsv4.x-fix-lock-recovery-during-delegation-recall.patch @@ -0,0 +1,57 @@ +From 544ef5a69e75adc69e7dd1aa2a5e607a0b8a6731 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Oct 2018 14:45:00 -0400 +Subject: NFSv4.x: fix lock recovery during delegation recall + +From: Olga Kornievskaia + +[ Upstream commit 44f411c353bf6d98d5a34f8f1b8605d43b2e50b8 ] + +Running "./nfstest_delegation --runtest recall26" uncovers that +client doesn't recover the lock when we have an appending open, +where the initial open got a write delegation. + +Instead of checking for the passed in open context against +the file lock's open context. Check that the state is the same. + +Signed-off-by: Olga Kornievskaia +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + fs/nfs/delegation.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c +index 61bc0a6ba08b1..04d57e11577e0 100644 +--- a/fs/nfs/delegation.c ++++ b/fs/nfs/delegation.c +@@ -101,7 +101,7 @@ int nfs4_check_delegation(struct inode *inode, fmode_t flags) + return nfs4_do_check_delegation(inode, flags, false); + } + +-static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_state *state, const nfs4_stateid *stateid) ++static int nfs_delegation_claim_locks(struct nfs4_state *state, const nfs4_stateid *stateid) + { + struct inode *inode = state->inode; + struct file_lock *fl; +@@ -116,7 +116,7 @@ static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_ + spin_lock(&flctx->flc_lock); + restart: + list_for_each_entry(fl, list, fl_list) { +- if (nfs_file_open_context(fl->fl_file) != ctx) ++ if (nfs_file_open_context(fl->fl_file)->state != state) + continue; + spin_unlock(&flctx->flc_lock); + status = nfs4_lock_delegation_recall(fl, state, stateid); +@@ -163,7 +163,7 @@ static int nfs_delegation_claim_opens(struct inode *inode, + seq = raw_seqcount_begin(&sp->so_reclaim_seqcount); + err = nfs4_open_delegation_recall(ctx, state, stateid, type); + if (!err) +- err = nfs_delegation_claim_locks(ctx, state, stateid); ++ err = nfs_delegation_claim_locks(state, stateid); + if (!err && read_seqcount_retry(&sp->so_reclaim_seqcount, seq)) + err = -EAGAIN; + mutex_unlock(&sp->so_delegreturn_mutex); +-- +2.20.1 + diff --git a/queue-4.14/nl80211-fix-a-get_key-reply-attribute.patch b/queue-4.14/nl80211-fix-a-get_key-reply-attribute.patch new file mode 100644 index 00000000000..6a7f08b7a46 --- /dev/null +++ b/queue-4.14/nl80211-fix-a-get_key-reply-attribute.patch @@ -0,0 +1,36 @@ +From aec828e54420e019caf0c65f3d69dd075992f0b8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 24 Sep 2018 18:10:22 +0200 +Subject: nl80211: Fix a GET_KEY reply attribute + +From: Andrew Zaborowski + +[ Upstream commit efdfce7270de85a8706d1ea051bef3a7486809ff ] + +Use the NL80211_KEY_IDX attribute inside the NL80211_ATTR_KEY in +NL80211_CMD_GET_KEY responses to comply with nl80211_key_policy. +This is unlikely to affect existing userspace. + +Signed-off-by: Andrew Zaborowski +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + net/wireless/nl80211.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c +index 9627c52c3f937..df8c5312f26ad 100644 +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -3118,7 +3118,7 @@ static void get_key_callback(void *c, struct key_params *params) + params->cipher))) + goto nla_put_failure; + +- if (nla_put_u8(cookie->msg, NL80211_ATTR_KEY_IDX, cookie->idx)) ++ if (nla_put_u8(cookie->msg, NL80211_KEY_IDX, cookie->idx)) + goto nla_put_failure; + + nla_nest_end(cookie->msg, key); +-- +2.20.1 + diff --git a/queue-4.14/orangefs-rate-limit-the-client-not-running-info-mess.patch b/queue-4.14/orangefs-rate-limit-the-client-not-running-info-mess.patch new file mode 100644 index 00000000000..3c7b21eb182 --- /dev/null +++ b/queue-4.14/orangefs-rate-limit-the-client-not-running-info-mess.patch @@ -0,0 +1,40 @@ +From f70fb0bcd686deae070403f4884b07245bb22290 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 5 Sep 2018 15:54:01 +0100 +Subject: orangefs: rate limit the client not running info message + +From: Colin Ian King + +[ Upstream commit 2978d873471005577e7b68a528b4f256a529b030 ] + +Currently accessing various /sys/fs/orangefs files will spam the +kernel log with the following info message when the client is not +running: + +[ 491.489284] sysfs_service_op_show: Client not running :-5: + +Rate limit this info message to make it less spammy. + +Signed-off-by: Colin Ian King +Signed-off-by: Mike Marshall +Signed-off-by: Sasha Levin +--- + fs/orangefs/orangefs-sysfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/orangefs/orangefs-sysfs.c b/fs/orangefs/orangefs-sysfs.c +index 079a465796f3e..bc56df2ae705d 100644 +--- a/fs/orangefs/orangefs-sysfs.c ++++ b/fs/orangefs/orangefs-sysfs.c +@@ -323,7 +323,7 @@ static ssize_t sysfs_service_op_show(struct kobject *kobj, + /* Can't do a service_operation if the client is not running... */ + rc = is_daemon_in_service(); + if (rc) { +- pr_info("%s: Client not running :%d:\n", ++ pr_info_ratelimited("%s: Client not running :%d:\n", + __func__, + is_daemon_in_service()); + goto out; +-- +2.20.1 + diff --git a/queue-4.14/pinctrl-gemini-fix-up-tvc-clock-group.patch b/queue-4.14/pinctrl-gemini-fix-up-tvc-clock-group.patch new file mode 100644 index 00000000000..0d6754a5787 --- /dev/null +++ b/queue-4.14/pinctrl-gemini-fix-up-tvc-clock-group.patch @@ -0,0 +1,151 @@ +From 97cf380b753921411b0eb2d16a5df5f4e988a354 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 10 Oct 2018 20:39:18 +0200 +Subject: pinctrl: gemini: Fix up TVC clock group + +From: Linus Walleij + +[ Upstream commit a85c928f6a7856a09e47d9b37faa3407c7ac6a8e ] + +The previous fix made the TVC clock get muxed in on the +D-Link DIR-685 instead of giving nagging warnings of this +not working. Not good. We didn't want that, as it breaks +video. + +Create a specific group for the TVC CLK, and break out +a specific GPIO group for it on the SL3516 so we can use +that line as GPIO if we don't need the TVC CLK. + +Fixes: d17f477c5bc6 ("pinctrl: gemini: Mask and set properly") +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/pinctrl/pinctrl-gemini.c | 44 ++++++++++++++++++++++++++------ + 1 file changed, 36 insertions(+), 8 deletions(-) + +diff --git a/drivers/pinctrl/pinctrl-gemini.c b/drivers/pinctrl/pinctrl-gemini.c +index 05441dc2519d2..78fa26c1a89f3 100644 +--- a/drivers/pinctrl/pinctrl-gemini.c ++++ b/drivers/pinctrl/pinctrl-gemini.c +@@ -551,13 +551,16 @@ static const unsigned int tvc_3512_pins[] = { + 319, /* TVC_DATA[1] */ + 301, /* TVC_DATA[2] */ + 283, /* TVC_DATA[3] */ +- 265, /* TVC_CLK */ + 320, /* TVC_DATA[4] */ + 302, /* TVC_DATA[5] */ + 284, /* TVC_DATA[6] */ + 266, /* TVC_DATA[7] */ + }; + ++static const unsigned int tvc_clk_3512_pins[] = { ++ 265, /* TVC_CLK */ ++}; ++ + /* NAND flash pins */ + static const unsigned int nflash_3512_pins[] = { + 199, 200, 201, 202, 216, 217, 218, 219, 220, 234, 235, 236, 237, 252, +@@ -589,7 +592,7 @@ static const unsigned int pflash_3512_pins_extended[] = { + /* Serial flash pins CE0, CE1, DI, DO, CK */ + static const unsigned int sflash_3512_pins[] = { 230, 231, 232, 233, 211 }; + +-/* The GPIO0A (0) pin overlap with TVC and extended parallel flash */ ++/* The GPIO0A (0) pin overlap with TVC CLK and extended parallel flash */ + static const unsigned int gpio0a_3512_pins[] = { 265 }; + + /* The GPIO0B (1-4) pins overlap with TVC and ICE */ +@@ -772,7 +775,13 @@ static const struct gemini_pin_group gemini_3512_pin_groups[] = { + .num_pins = ARRAY_SIZE(tvc_3512_pins), + /* Conflict with character LCD and ICE */ + .mask = LCD_PADS_ENABLE, +- .value = TVC_PADS_ENABLE | TVC_CLK_PAD_ENABLE, ++ .value = TVC_PADS_ENABLE, ++ }, ++ { ++ .name = "tvcclkgrp", ++ .pins = tvc_clk_3512_pins, ++ .num_pins = ARRAY_SIZE(tvc_clk_3512_pins), ++ .value = TVC_CLK_PAD_ENABLE, + }, + /* + * The construction is done such that it is possible to use a serial +@@ -809,8 +818,8 @@ static const struct gemini_pin_group gemini_3512_pin_groups[] = { + .name = "gpio0agrp", + .pins = gpio0a_3512_pins, + .num_pins = ARRAY_SIZE(gpio0a_3512_pins), +- /* Conflict with TVC */ +- .mask = TVC_PADS_ENABLE, ++ /* Conflict with TVC CLK */ ++ .mask = TVC_CLK_PAD_ENABLE, + }, + { + .name = "gpio0bgrp", +@@ -1476,13 +1485,16 @@ static const unsigned int tvc_3516_pins[] = { + 311, /* TVC_DATA[1] */ + 394, /* TVC_DATA[2] */ + 374, /* TVC_DATA[3] */ +- 333, /* TVC_CLK */ + 354, /* TVC_DATA[4] */ + 395, /* TVC_DATA[5] */ + 312, /* TVC_DATA[6] */ + 334, /* TVC_DATA[7] */ + }; + ++static const unsigned int tvc_clk_3516_pins[] = { ++ 333, /* TVC_CLK */ ++}; ++ + /* NAND flash pins */ + static const unsigned int nflash_3516_pins[] = { + 243, 260, 261, 224, 280, 262, 281, 264, 300, 263, 282, 301, 320, 283, +@@ -1515,7 +1527,7 @@ static const unsigned int pflash_3516_pins_extended[] = { + static const unsigned int sflash_3516_pins[] = { 296, 338, 295, 359, 339 }; + + /* The GPIO0A (0-4) pins overlap with TVC and extended parallel flash */ +-static const unsigned int gpio0a_3516_pins[] = { 333, 354, 395, 312, 334 }; ++static const unsigned int gpio0a_3516_pins[] = { 354, 395, 312, 334 }; + + /* The GPIO0B (5-7) pins overlap with ICE */ + static const unsigned int gpio0b_3516_pins[] = { 375, 396, 376 }; +@@ -1547,6 +1559,9 @@ static const unsigned int gpio0j_3516_pins[] = { 359, 339 }; + /* The GPIO0K (30,31) pins overlap with NAND flash */ + static const unsigned int gpio0k_3516_pins[] = { 275, 298 }; + ++/* The GPIO0L (0) pins overlap with TVC_CLK */ ++static const unsigned int gpio0l_3516_pins[] = { 333 }; ++ + /* The GPIO1A (0-4) pins that overlap with IDE and parallel flash */ + static const unsigned int gpio1a_3516_pins[] = { 221, 200, 222, 201, 220 }; + +@@ -1693,7 +1708,13 @@ static const struct gemini_pin_group gemini_3516_pin_groups[] = { + .num_pins = ARRAY_SIZE(tvc_3516_pins), + /* Conflict with character LCD */ + .mask = LCD_PADS_ENABLE, +- .value = TVC_PADS_ENABLE | TVC_CLK_PAD_ENABLE, ++ .value = TVC_PADS_ENABLE, ++ }, ++ { ++ .name = "tvcclkgrp", ++ .pins = tvc_clk_3516_pins, ++ .num_pins = ARRAY_SIZE(tvc_clk_3516_pins), ++ .value = TVC_CLK_PAD_ENABLE, + }, + /* + * The construction is done such that it is possible to use a serial +@@ -1804,6 +1825,13 @@ static const struct gemini_pin_group gemini_3516_pin_groups[] = { + /* Conflict with parallel and NAND flash */ + .value = PFLASH_PADS_DISABLE | NAND_PADS_DISABLE, + }, ++ { ++ .name = "gpio0lgrp", ++ .pins = gpio0l_3516_pins, ++ .num_pins = ARRAY_SIZE(gpio0l_3516_pins), ++ /* Conflict with TVE CLK */ ++ .mask = TVC_CLK_PAD_ENABLE, ++ }, + { + .name = "gpio1agrp", + .pins = gpio1a_3516_pins, +-- +2.20.1 + diff --git a/queue-4.14/pinctrl-gemini-mask-and-set-properly.patch b/queue-4.14/pinctrl-gemini-mask-and-set-properly.patch new file mode 100644 index 00000000000..0afce631dd7 --- /dev/null +++ b/queue-4.14/pinctrl-gemini-mask-and-set-properly.patch @@ -0,0 +1,41 @@ +From c2aad878872d9be50078028208f9c86f13d1c4c7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 9 Oct 2018 10:11:53 +0200 +Subject: pinctrl: gemini: Mask and set properly + +From: Linus Walleij + +[ Upstream commit d17f477c5bc6b4a5dd9f51ae263870da132a8e89 ] + +The code was written under the assumption that the +regmap_update_bits() would mask the bits in the mask and +set the bits in the value. + +It missed the points that it will not set bits in the value +unless these are also masked in the mask. Set value bits +that are not in the mask will simply be ignored. + +Fixes: 06351d133dea ("pinctrl: add a Gemini SoC pin controller") +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/pinctrl/pinctrl-gemini.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/pinctrl/pinctrl-gemini.c b/drivers/pinctrl/pinctrl-gemini.c +index 39e6221e71000..05441dc2519d2 100644 +--- a/drivers/pinctrl/pinctrl-gemini.c ++++ b/drivers/pinctrl/pinctrl-gemini.c +@@ -2164,7 +2164,8 @@ static int gemini_pmx_set_mux(struct pinctrl_dev *pctldev, + func->name, grp->name); + + regmap_read(pmx->map, GLOBAL_MISC_CTRL, &before); +- regmap_update_bits(pmx->map, GLOBAL_MISC_CTRL, grp->mask, ++ regmap_update_bits(pmx->map, GLOBAL_MISC_CTRL, ++ grp->mask | grp->value, + grp->value); + regmap_read(pmx->map, GLOBAL_MISC_CTRL, &after); + +-- +2.20.1 + diff --git a/queue-4.14/pm-hibernate-check-the-success-of-generating-md5-dig.patch b/queue-4.14/pm-hibernate-check-the-success-of-generating-md5-dig.patch new file mode 100644 index 00000000000..a18eb758606 --- /dev/null +++ b/queue-4.14/pm-hibernate-check-the-success-of-generating-md5-dig.patch @@ -0,0 +1,66 @@ +From 35b4eb048e54a8f3785a243a3ecd86639ef1839f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 Sep 2018 14:26:38 +0800 +Subject: PM / hibernate: Check the success of generating md5 digest before + hibernation + +From: Chen Yu + +[ Upstream commit 749fa17093ff67b31dea864531a3698b6a95c26c ] + +Currently if get_e820_md5() fails, then it will hibernate nevertheless. +Actually the error code should be propagated to upper caller so that +the hibernation could be aware of the result and terminates the process +if md5 digest fails. + +Suggested-by: Thomas Gleixner +Acked-by: Pavel Machek +Signed-off-by: Chen Yu +Acked-by: Thomas Gleixner +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + arch/x86/power/hibernate_64.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c +index 9c80966c80bae..692a179b1ba32 100644 +--- a/arch/x86/power/hibernate_64.c ++++ b/arch/x86/power/hibernate_64.c +@@ -250,9 +250,9 @@ static int get_e820_md5(struct e820_table *table, void *buf) + return ret; + } + +-static void hibernation_e820_save(void *buf) ++static int hibernation_e820_save(void *buf) + { +- get_e820_md5(e820_table_firmware, buf); ++ return get_e820_md5(e820_table_firmware, buf); + } + + static bool hibernation_e820_mismatch(void *buf) +@@ -272,8 +272,9 @@ static bool hibernation_e820_mismatch(void *buf) + return memcmp(result, buf, MD5_DIGEST_SIZE) ? true : false; + } + #else +-static void hibernation_e820_save(void *buf) ++static int hibernation_e820_save(void *buf) + { ++ return 0; + } + + static bool hibernation_e820_mismatch(void *buf) +@@ -318,9 +319,7 @@ int arch_hibernation_header_save(void *addr, unsigned int max_size) + + rdr->magic = RESTORE_MAGIC; + +- hibernation_e820_save(rdr->e820_digest); +- +- return 0; ++ return hibernation_e820_save(rdr->e820_digest); + } + + /** +-- +2.20.1 + diff --git a/queue-4.14/powerpc-pseries-fix-dtl-buffer-registration.patch b/queue-4.14/powerpc-pseries-fix-dtl-buffer-registration.patch new file mode 100644 index 00000000000..cbced60308f --- /dev/null +++ b/queue-4.14/powerpc-pseries-fix-dtl-buffer-registration.patch @@ -0,0 +1,44 @@ +From e27ba3f1c12ae3a6fe79e4c7d94a2f99c537c302 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 27 Sep 2018 13:40:57 +0530 +Subject: powerpc/pseries: Fix DTL buffer registration + +From: Naveen N. Rao + +[ Upstream commit db787af1b8a6b4be428ee2ea7d409dafcaa4a43c ] + +When CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set, we register the DTL +buffer for a cpu when the associated file under powerpc/dtl in debugfs +is opened. When doing so, we need to set the size of the buffer being +registered in the second u32 word of the buffer. This needs to be in big +endian, but we are not doing the conversion resulting in the below error +showing up in dmesg: + + dtl_start: DTL registration for cpu 0 (hw 0) failed with -4 + +Fix this in the obvious manner. + +Fixes: 7c105b63bd98 ("powerpc: Add CONFIG_CPU_LITTLE_ENDIAN kernel config option.") +Signed-off-by: Naveen N. Rao +Signed-off-by: Michael Ellerman +Signed-off-by: Sasha Levin +--- + arch/powerpc/platforms/pseries/dtl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/powerpc/platforms/pseries/dtl.c b/arch/powerpc/platforms/pseries/dtl.c +index 18014cdeb590a..c762689e0eb33 100644 +--- a/arch/powerpc/platforms/pseries/dtl.c ++++ b/arch/powerpc/platforms/pseries/dtl.c +@@ -149,7 +149,7 @@ static int dtl_start(struct dtl *dtl) + + /* Register our dtl buffer with the hypervisor. The HV expects the + * buffer size to be passed in the second word of the buffer */ +- ((u32 *)dtl->buf)[1] = DISPATCH_LOG_BYTES; ++ ((u32 *)dtl->buf)[1] = cpu_to_be32(DISPATCH_LOG_BYTES); + + hwcpu = get_hard_smp_processor_id(dtl->cpu); + addr = __pa(dtl->buf); +-- +2.20.1 + diff --git a/queue-4.14/powerpc-pseries-fix-how-we-iterate-over-the-dtl-entr.patch b/queue-4.14/powerpc-pseries-fix-how-we-iterate-over-the-dtl-entr.patch new file mode 100644 index 00000000000..497f73c4a20 --- /dev/null +++ b/queue-4.14/powerpc-pseries-fix-how-we-iterate-over-the-dtl-entr.patch @@ -0,0 +1,40 @@ +From 91da9810c6bb79fa99ff9619d99adeea8f78747c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 27 Sep 2018 13:40:58 +0530 +Subject: powerpc/pseries: Fix how we iterate over the DTL entries + +From: Naveen N. Rao + +[ Upstream commit 9258227e9dd1da8feddb07ad9702845546a581c9 ] + +When CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set, we look up dtl_idx in +the lppaca to determine the number of entries in the buffer. Since +lppaca is in big endian, we need to do an endian conversion before using +this in our calculation to determine the number of entries in the +buffer. Without this, we do not iterate over the existing entries in the +DTL buffer properly. + +Fixes: 7c105b63bd98 ("powerpc: Add CONFIG_CPU_LITTLE_ENDIAN kernel config option.") +Signed-off-by: Naveen N. Rao +Signed-off-by: Michael Ellerman +Signed-off-by: Sasha Levin +--- + arch/powerpc/platforms/pseries/dtl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/powerpc/platforms/pseries/dtl.c b/arch/powerpc/platforms/pseries/dtl.c +index c762689e0eb33..ef6595153642e 100644 +--- a/arch/powerpc/platforms/pseries/dtl.c ++++ b/arch/powerpc/platforms/pseries/dtl.c +@@ -184,7 +184,7 @@ static void dtl_stop(struct dtl *dtl) + + static u64 dtl_current_index(struct dtl *dtl) + { +- return lppaca_of(dtl->cpu).dtl_idx; ++ return be64_to_cpu(lppaca_of(dtl->cpu).dtl_idx); + } + #endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */ + +-- +2.20.1 + diff --git a/queue-4.14/powerpc-time-fix-clockevent_decrementer-initalisatio.patch b/queue-4.14/powerpc-time-fix-clockevent_decrementer-initalisatio.patch new file mode 100644 index 00000000000..24acc5f702f --- /dev/null +++ b/queue-4.14/powerpc-time-fix-clockevent_decrementer-initalisatio.patch @@ -0,0 +1,49 @@ +From cb46b7f9ddb9da02630cfaebd4cc565de6fdf5ea Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 17 Oct 2018 23:39:41 +1100 +Subject: powerpc/time: Fix clockevent_decrementer initalisation for PR KVM + +From: Michael Ellerman + +[ Upstream commit b4d16ab58c41ff0125822464bdff074cebd0fe47 ] + +In the recent commit 8b78fdb045de ("powerpc/time: Use +clockevents_register_device(), fixing an issue with large +decrementer") we changed the way we initialise the decrementer +clockevent(s). + +We no longer initialise the mult & shift values of +decrementer_clockevent itself. + +This has the effect of breaking PR KVM, because it uses those values +in kvmppc_emulate_dec(). The symptom is guest kernels spin forever +mid-way through boot. + +For now fix it by assigning back to decrementer_clockevent the mult +and shift values. + +Fixes: 8b78fdb045de ("powerpc/time: Use clockevents_register_device(), fixing an issue with large decrementer") +Signed-off-by: Michael Ellerman +Signed-off-by: Sasha Levin +--- + arch/powerpc/kernel/time.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c +index 870e75d304591..7c7c5a16284d2 100644 +--- a/arch/powerpc/kernel/time.c ++++ b/arch/powerpc/kernel/time.c +@@ -988,6 +988,10 @@ static void register_decrementer_clockevent(int cpu) + + printk_once(KERN_DEBUG "clockevent: %s mult[%x] shift[%d] cpu[%d]\n", + dec->name, dec->mult, dec->shift, cpu); ++ ++ /* Set values for KVM, see kvm_emulate_dec() */ ++ decrementer_clockevent.mult = dec->mult; ++ decrementer_clockevent.shift = dec->shift; + } + + static void enable_large_decrementer(void) +-- +2.20.1 + diff --git a/queue-4.14/powerpc-time-use-clockevents_register_device-fixing-.patch b/queue-4.14/powerpc-time-use-clockevents_register_device-fixing-.patch new file mode 100644 index 00000000000..cc22c2c24d7 --- /dev/null +++ b/queue-4.14/powerpc-time-use-clockevents_register_device-fixing-.patch @@ -0,0 +1,62 @@ +From 01b96b03ead68e2db158afba851a79356cc1d802 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Oct 2018 09:01:04 +1000 +Subject: powerpc/time: Use clockevents_register_device(), fixing an issue with + large decrementer + +From: Anton Blanchard + +[ Upstream commit 8b78fdb045de60a4eb35460092bbd3cffa925353 ] + +We currently cap the decrementer clockevent at 4 seconds, even on systems +with large decrementer support. Fix this by converting the code to use +clockevents_register_device() which calculates the upper bound based on +the max_delta passed in. + +Signed-off-by: Anton Blanchard +Signed-off-by: Michael Ellerman +Signed-off-by: Sasha Levin +--- + arch/powerpc/kernel/time.c | 17 +++-------------- + 1 file changed, 3 insertions(+), 14 deletions(-) + +diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c +index fe6f3a2854557..870e75d304591 100644 +--- a/arch/powerpc/kernel/time.c ++++ b/arch/powerpc/kernel/time.c +@@ -984,10 +984,10 @@ static void register_decrementer_clockevent(int cpu) + *dec = decrementer_clockevent; + dec->cpumask = cpumask_of(cpu); + ++ clockevents_config_and_register(dec, ppc_tb_freq, 2, decrementer_max); ++ + printk_once(KERN_DEBUG "clockevent: %s mult[%x] shift[%d] cpu[%d]\n", + dec->name, dec->mult, dec->shift, cpu); +- +- clockevents_register_device(dec); + } + + static void enable_large_decrementer(void) +@@ -1035,18 +1035,7 @@ static void __init set_decrementer_max(void) + + static void __init init_decrementer_clockevent(void) + { +- int cpu = smp_processor_id(); +- +- clockevents_calc_mult_shift(&decrementer_clockevent, ppc_tb_freq, 4); +- +- decrementer_clockevent.max_delta_ns = +- clockevent_delta2ns(decrementer_max, &decrementer_clockevent); +- decrementer_clockevent.max_delta_ticks = decrementer_max; +- decrementer_clockevent.min_delta_ns = +- clockevent_delta2ns(2, &decrementer_clockevent); +- decrementer_clockevent.min_delta_ticks = 2; +- +- register_decrementer_clockevent(cpu); ++ register_decrementer_clockevent(smp_processor_id()); + } + + void secondary_cpu_time_init(void) +-- +2.20.1 + diff --git a/queue-4.14/powerpc-xive-move-a-dereference-below-a-null-test.patch b/queue-4.14/powerpc-xive-move-a-dereference-below-a-null-test.patch new file mode 100644 index 00000000000..9a2ce82fc15 --- /dev/null +++ b/queue-4.14/powerpc-xive-move-a-dereference-below-a-null-test.patch @@ -0,0 +1,42 @@ +From 26febe70451535b47e46fe75b5135e8a655e0374 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 Sep 2018 20:09:32 +0800 +Subject: powerpc/xive: Move a dereference below a NULL test + +From: zhong jiang + +[ Upstream commit cd5ff94577e004e0a4457e70d0ef3a030f4010b8 ] + +Move the dereference of xc below the NULL test. + +Signed-off-by: zhong jiang +Signed-off-by: Michael Ellerman +Signed-off-by: Sasha Levin +--- + arch/powerpc/sysdev/xive/common.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/arch/powerpc/sysdev/xive/common.c b/arch/powerpc/sysdev/xive/common.c +index 818fc5351591c..110d8bb16ebbb 100644 +--- a/arch/powerpc/sysdev/xive/common.c ++++ b/arch/powerpc/sysdev/xive/common.c +@@ -1008,12 +1008,13 @@ static void xive_ipi_eoi(struct irq_data *d) + { + struct xive_cpu *xc = __this_cpu_read(xive_cpu); + +- DBG_VERBOSE("IPI eoi: irq=%d [0x%lx] (HW IRQ 0x%x) pending=%02x\n", +- d->irq, irqd_to_hwirq(d), xc->hw_ipi, xc->pending_prio); +- + /* Handle possible race with unplug and drop stale IPIs */ + if (!xc) + return; ++ ++ DBG_VERBOSE("IPI eoi: irq=%d [0x%lx] (HW IRQ 0x%x) pending=%02x\n", ++ d->irq, irqd_to_hwirq(d), xc->hw_ipi, xc->pending_prio); ++ + xive_do_source_eoi(xc->hw_ipi, &xc->ipi_data); + xive_do_queue_eoi(xc); + } +-- +2.20.1 + diff --git a/queue-4.14/printk-give-error-on-attempt-to-set-log-buffer-lengt.patch b/queue-4.14/printk-give-error-on-attempt-to-set-log-buffer-lengt.patch new file mode 100644 index 00000000000..7e8355eb82c --- /dev/null +++ b/queue-4.14/printk-give-error-on-attempt-to-set-log-buffer-lengt.patch @@ -0,0 +1,89 @@ +From f2ee59b9c644da04f93b10525fe3fa3895e180e9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 30 Sep 2018 00:45:53 +0800 +Subject: printk: Give error on attempt to set log buffer length to over 2G + +From: He Zhe + +[ Upstream commit e6fe3e5b7d16e8f146a4ae7fe481bc6e97acde1e ] + +The current printk() is ready to handle log buffer size up to 2G. +Give an explicit error for users who want to use larger log buffer. + +Also fix printk formatting to show the 2G as a positive number. + +Link: http://lkml.kernel.org/r/20181008135916.gg4kkmoki5bgtco5@pathway.suse.cz +Cc: rostedt@goodmis.org +Cc: linux-kernel@vger.kernel.org +Suggested-by: Sergey Senozhatsky +Signed-off-by: He Zhe +Reviewed-by: Sergey Senozhatsky +[pmladek: Fixed to the really safe limit 2GB.] +Signed-off-by: Petr Mladek +Signed-off-by: Sasha Levin +--- + kernel/printk/printk.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c +index 5aa96098c64d3..5b33c14ab8b25 100644 +--- a/kernel/printk/printk.c ++++ b/kernel/printk/printk.c +@@ -432,6 +432,7 @@ static u32 clear_idx; + /* record buffer */ + #define LOG_ALIGN __alignof__(struct printk_log) + #define __LOG_BUF_LEN (1 << CONFIG_LOG_BUF_SHIFT) ++#define LOG_BUF_LEN_MAX (u32)(1 << 31) + static char __log_buf[__LOG_BUF_LEN] __aligned(LOG_ALIGN); + static char *log_buf = __log_buf; + static u32 log_buf_len = __LOG_BUF_LEN; +@@ -1032,18 +1033,23 @@ void log_buf_vmcoreinfo_setup(void) + static unsigned long __initdata new_log_buf_len; + + /* we practice scaling the ring buffer by powers of 2 */ +-static void __init log_buf_len_update(unsigned size) ++static void __init log_buf_len_update(u64 size) + { ++ if (size > (u64)LOG_BUF_LEN_MAX) { ++ size = (u64)LOG_BUF_LEN_MAX; ++ pr_err("log_buf over 2G is not supported.\n"); ++ } ++ + if (size) + size = roundup_pow_of_two(size); + if (size > log_buf_len) +- new_log_buf_len = size; ++ new_log_buf_len = (unsigned long)size; + } + + /* save requested log_buf_len since it's too early to process it */ + static int __init log_buf_len_setup(char *str) + { +- unsigned int size; ++ u64 size; + + if (!str) + return -EINVAL; +@@ -1113,7 +1119,7 @@ void __init setup_log_buf(int early) + } + + if (unlikely(!new_log_buf)) { +- pr_err("log_buf_len: %ld bytes not available\n", ++ pr_err("log_buf_len: %lu bytes not available\n", + new_log_buf_len); + return; + } +@@ -1126,8 +1132,8 @@ void __init setup_log_buf(int early) + memcpy(log_buf, __log_buf, __LOG_BUF_LEN); + logbuf_unlock_irqrestore(flags); + +- pr_info("log_buf_len: %d bytes\n", log_buf_len); +- pr_info("early log buf free: %d(%d%%)\n", ++ pr_info("log_buf_len: %u bytes\n", log_buf_len); ++ pr_info("early log buf free: %u(%u%%)\n", + free, (free * 100) / __LOG_BUF_LEN); + } + +-- +2.20.1 + diff --git a/queue-4.14/proc-vmcore-fix-i386-build-error-of-missing-copy_old.patch b/queue-4.14/proc-vmcore-fix-i386-build-error-of-missing-copy_old.patch new file mode 100644 index 00000000000..a7d68ac1eb9 --- /dev/null +++ b/queue-4.14/proc-vmcore-fix-i386-build-error-of-missing-copy_old.patch @@ -0,0 +1,50 @@ +From 31ea8e70ee9ee29955ce2bf9b106b041a6433aa0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Oct 2018 10:05:20 +0200 +Subject: proc/vmcore: Fix i386 build error of missing + copy_oldmem_page_encrypted() + +From: Borislav Petkov + +[ Upstream commit cf089611f4c446285046fcd426d90c18f37d2905 ] + +Lianbo reported a build error with a particular 32-bit config, see Link +below for details. + +Provide a weak copy_oldmem_page_encrypted() function which architectures +can override, in the same manner other functionality in that file is +supplied. + +Reported-by: Lianbo Jiang +Signed-off-by: Borislav Petkov +CC: x86@kernel.org +Link: http://lkml.kernel.org/r/710b9d95-2f70-eadf-c4a1-c3dc80ee4ebb@redhat.com +Signed-off-by: Sasha Levin +--- + fs/proc/vmcore.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c +index 885d445afa0d9..ce400f97370d3 100644 +--- a/fs/proc/vmcore.c ++++ b/fs/proc/vmcore.c +@@ -164,6 +164,16 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma, + return remap_pfn_range(vma, from, pfn, size, prot); + } + ++/* ++ * Architectures which support memory encryption override this. ++ */ ++ssize_t __weak ++copy_oldmem_page_encrypted(unsigned long pfn, char *buf, size_t csize, ++ unsigned long offset, int userbuf) ++{ ++ return copy_oldmem_page(pfn, buf, csize, offset, userbuf); ++} ++ + /* + * Copy to either kernel or user space + */ +-- +2.20.1 + diff --git a/queue-4.14/qtnfmac-drop-error-reports-for-out-of-bounds-key-ind.patch b/queue-4.14/qtnfmac-drop-error-reports-for-out-of-bounds-key-ind.patch new file mode 100644 index 00000000000..3cc95df0ac0 --- /dev/null +++ b/queue-4.14/qtnfmac-drop-error-reports-for-out-of-bounds-key-ind.patch @@ -0,0 +1,48 @@ +From 63d12c50ea0e92d22e79513b4c31fc759ecae495 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Oct 2018 10:11:40 +0000 +Subject: qtnfmac: drop error reports for out-of-bounds key indexes + +From: Sergey Matyukevich + +[ Upstream commit 35da3fe63b8647ce3cc52fccdf186a60710815fb ] + +On disconnect wireless core attempts to remove all the supported keys. +Following cfg80211_ops conventions, firmware returns -ENOENT code +for the out-of-bound key indexes. This is a normal behavior, +so no need to report errors for this case. + +Signed-off-by: Sergey Matyukevich +Signed-off-by: Kalle Valo +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +index a450bc6bc7745..d02f68792ce41 100644 +--- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c ++++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +@@ -509,9 +509,16 @@ static int qtnf_del_key(struct wiphy *wiphy, struct net_device *dev, + int ret; + + ret = qtnf_cmd_send_del_key(vif, key_index, pairwise, mac_addr); +- if (ret) +- pr_err("VIF%u.%u: failed to delete key: idx=%u pw=%u\n", +- vif->mac->macid, vif->vifid, key_index, pairwise); ++ if (ret) { ++ if (ret == -ENOENT) { ++ pr_debug("VIF%u.%u: key index %d out of bounds\n", ++ vif->mac->macid, vif->vifid, key_index); ++ } else { ++ pr_err("VIF%u.%u: failed to delete key: idx=%u pw=%u\n", ++ vif->mac->macid, vif->vifid, ++ key_index, pairwise); ++ } ++ } + + return ret; + } +-- +2.20.1 + diff --git a/queue-4.14/qtnfmac-pass-sgi-rate-info-flag-to-wireless-core.patch b/queue-4.14/qtnfmac-pass-sgi-rate-info-flag-to-wireless-core.patch new file mode 100644 index 00000000000..79dd6fb8269 --- /dev/null +++ b/queue-4.14/qtnfmac-pass-sgi-rate-info-flag-to-wireless-core.patch @@ -0,0 +1,37 @@ +From 8c7bc0fd4fb0d94c39500bf74befaf11b3ef02e6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Oct 2018 10:11:36 +0000 +Subject: qtnfmac: pass sgi rate info flag to wireless core + +From: Sergey Matyukevich + +[ Upstream commit d5657b709e2a92a0e581109010765d1d485580df ] + +SGI should be passed to wireless core as a part of rate structure. +Otherwise wireless core performs incorrect rate calculation when +SGI is enabled in hardware but not reported to host. + +Signed-off-by: Sergey Matyukevich +Signed-off-by: Kalle Valo +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c +index 4206886b110ce..ed087bbc6f631 100644 +--- a/drivers/net/wireless/quantenna/qtnfmac/commands.c ++++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c +@@ -485,6 +485,9 @@ qtnf_sta_info_parse_rate(struct rate_info *rate_dst, + rate_dst->flags |= RATE_INFO_FLAGS_MCS; + else if (rate_src->flags & QLINK_STA_INFO_RATE_FLAG_VHT_MCS) + rate_dst->flags |= RATE_INFO_FLAGS_VHT_MCS; ++ ++ if (rate_src->flags & QLINK_STA_INFO_RATE_FLAG_SHORT_GI) ++ rate_dst->flags |= RATE_INFO_FLAGS_SHORT_GI; + } + + static void +-- +2.20.1 + diff --git a/queue-4.14/remoteproc-check-for-null-firmwares-in-sysfs-interfa.patch b/queue-4.14/remoteproc-check-for-null-firmwares-in-sysfs-interfa.patch new file mode 100644 index 00000000000..a60dd8b6e82 --- /dev/null +++ b/queue-4.14/remoteproc-check-for-null-firmwares-in-sysfs-interfa.patch @@ -0,0 +1,43 @@ +From 3d54f0ffdd8f5677f18d63eb69797b79381ac3df Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 14 Sep 2018 19:37:22 -0500 +Subject: remoteproc: Check for NULL firmwares in sysfs interface + +From: Suman Anna + +[ Upstream commit faeadbb64094757150a8c2a3175ca418dbdd472c ] + +The remoteproc framework provides a sysfs file 'firmware' +for modifying the firmware image name from userspace. Add +an additional check to ensure NULL firmwares are errored +out right away, rather than getting a delayed error while +requesting a firmware during the start of a remoteproc +later on. + +Tested-by: Arnaud Pouliquen +Signed-off-by: Suman Anna +Signed-off-by: Bjorn Andersson +Signed-off-by: Sasha Levin +--- + drivers/remoteproc/remoteproc_sysfs.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/remoteproc/remoteproc_sysfs.c b/drivers/remoteproc/remoteproc_sysfs.c +index 47be411400e56..3a4c3d7cafca3 100644 +--- a/drivers/remoteproc/remoteproc_sysfs.c ++++ b/drivers/remoteproc/remoteproc_sysfs.c +@@ -48,6 +48,11 @@ static ssize_t firmware_store(struct device *dev, + } + + len = strcspn(buf, "\n"); ++ if (!len) { ++ dev_err(dev, "can't provide a NULL firmware\n"); ++ err = -EINVAL; ++ goto out; ++ } + + p = kstrndup(buf, len, GFP_KERNEL); + if (!p) { +-- +2.20.1 + diff --git a/queue-4.14/reset-fix-potential-use-after-free-in-__of_reset_con.patch b/queue-4.14/reset-fix-potential-use-after-free-in-__of_reset_con.patch new file mode 100644 index 00000000000..ea66ab3abb5 --- /dev/null +++ b/queue-4.14/reset-fix-potential-use-after-free-in-__of_reset_con.patch @@ -0,0 +1,69 @@ +From c84389eb7cb049eb98832c4c3f4075f768ba462b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Oct 2018 13:14:35 +0200 +Subject: reset: Fix potential use-after-free in __of_reset_control_get() + +From: Geert Uytterhoeven + +[ Upstream commit b790c8ea5593d6dc3580adfad8e117eeb56af874 ] + +Calling of_node_put() decreases the reference count of a device tree +object, and may free some data. + +However, the of_phandle_args structure embedding it is passed to +reset_controller_dev.of_xlate() after that, so it may still be accessed. + +Move the call to of_node_put() down to fix this. + +Signed-off-by: Geert Uytterhoeven +[p.zabel@pengutronix.de: moved of_node_put after mutex_unlock] +Signed-off-by: Philipp Zabel +Signed-off-by: Sasha Levin +--- + drivers/reset/core.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/drivers/reset/core.c b/drivers/reset/core.c +index da4292e9de978..72b96b5c75a8f 100644 +--- a/drivers/reset/core.c ++++ b/drivers/reset/core.c +@@ -466,28 +466,29 @@ struct reset_control *__of_reset_control_get(struct device_node *node, + break; + } + } +- of_node_put(args.np); + + if (!rcdev) { +- mutex_unlock(&reset_list_mutex); +- return ERR_PTR(-EPROBE_DEFER); ++ rstc = ERR_PTR(-EPROBE_DEFER); ++ goto out; + } + + if (WARN_ON(args.args_count != rcdev->of_reset_n_cells)) { +- mutex_unlock(&reset_list_mutex); +- return ERR_PTR(-EINVAL); ++ rstc = ERR_PTR(-EINVAL); ++ goto out; + } + + rstc_id = rcdev->of_xlate(rcdev, &args); + if (rstc_id < 0) { +- mutex_unlock(&reset_list_mutex); +- return ERR_PTR(rstc_id); ++ rstc = ERR_PTR(rstc_id); ++ goto out; + } + + /* reset_list_mutex also protects the rcdev's reset_control list */ + rstc = __reset_control_get_internal(rcdev, rstc_id, shared); + ++out: + mutex_unlock(&reset_list_mutex); ++ of_node_put(args.np); + + return rstc; + } +-- +2.20.1 + diff --git a/queue-4.14/s390-kasan-avoid-vdso-instrumentation.patch b/queue-4.14/s390-kasan-avoid-vdso-instrumentation.patch new file mode 100644 index 00000000000..5bfee32161e --- /dev/null +++ b/queue-4.14/s390-kasan-avoid-vdso-instrumentation.patch @@ -0,0 +1,56 @@ +From 5d7d8cea9ff94ad13ef62ea64ddfac82b8304988 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Nov 2017 13:02:36 +0100 +Subject: s390/kasan: avoid vdso instrumentation + +From: Vasily Gorbik + +[ Upstream commit 348498458505e202df41b6b9a78da448d39298b7 ] + +vdso is mapped into user space processes, which won't have kasan +shodow mapped. + +Reviewed-by: Martin Schwidefsky +Signed-off-by: Vasily Gorbik +Signed-off-by: Martin Schwidefsky +Signed-off-by: Sasha Levin +--- + arch/s390/kernel/vdso32/Makefile | 3 ++- + arch/s390/kernel/vdso64/Makefile | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile +index 101cadabfc89e..6d87f800b4f2c 100644 +--- a/arch/s390/kernel/vdso32/Makefile ++++ b/arch/s390/kernel/vdso32/Makefile +@@ -25,9 +25,10 @@ obj-y += vdso32_wrapper.o + extra-y += vdso32.lds + CPPFLAGS_vdso32.lds += -P -C -U$(ARCH) + +-# Disable gcov profiling and ubsan for VDSO code ++# Disable gcov profiling, ubsan and kasan for VDSO code + GCOV_PROFILE := n + UBSAN_SANITIZE := n ++KASAN_SANITIZE := n + + # Force dependency (incbin is bad) + $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so +diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Makefile +index 36bbafcf4a770..4bc166b8c0cbd 100644 +--- a/arch/s390/kernel/vdso64/Makefile ++++ b/arch/s390/kernel/vdso64/Makefile +@@ -25,9 +25,10 @@ obj-y += vdso64_wrapper.o + extra-y += vdso64.lds + CPPFLAGS_vdso64.lds += -P -C -U$(ARCH) + +-# Disable gcov profiling and ubsan for VDSO code ++# Disable gcov profiling, ubsan and kasan for VDSO code + GCOV_PROFILE := n + UBSAN_SANITIZE := n ++KASAN_SANITIZE := n + + # Force dependency (incbin is bad) + $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so +-- +2.20.1 + diff --git a/queue-4.14/series b/queue-4.14/series index 06e8233b67e..bb24163bbce 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -7,3 +7,116 @@ mm-memory_hotplug-don-t-access-uninitialized-memmaps-in-shrink_pgdat_span.patch mm-memory_hotplug-fix-updating-the-node-span.patch arm64-uaccess-ensure-pan-is-re-enabled-after-unhandled-uaccess-fault.patch fbdev-ditch-fb_edid_add_monspecs.patch +net-ovs-fix-return-type-of-ndo_start_xmit-function.patch +net-xen-netback-fix-return-type-of-ndo_start_xmit-fu.patch +arm-dts-dra7-enable-workaround-for-errata-i870-in-pc.patch +arm-dts-omap5-enable-otg-role-for-dwc3-controller.patch +net-hns3-fix-for-netdev-not-up-problem-when-setting-.patch +f2fs-return-correct-errno-in-f2fs_gc.patch +arm-dts-sun8i-h3-h5-ir-register-size-should-be-the-w.patch +sunrpc-fix-priority-queue-fairness.patch +ib-hfi1-ensure-ucast_dlid-access-doesnt-exceed-bound.patch +iommu-io-pgtable-arm-fix-race-handling-in-split_blk_.patch +kvm-arm-arm64-fix-stage2_flush_memslot-for-4-level-p.patch +arm64-numa-report-correct-memblock-range-for-the-dum.patch +ath10k-fix-vdev-start-timeout-on-error.patch +ata-ahci_brcm-allow-using-driver-or-dsl-socs.patch +ath9k-fix-reporting-calculated-new-fft-upper-max.patch +usb-gadget-udc-fotg210-udc-fix-a-sleep-in-atomic-con.patch +usb-dwc3-gadget-check-enblslpm-before-sending-ep-com.patch +nl80211-fix-a-get_key-reply-attribute.patch +irqchip-irq-mvebu-icu-fix-wrong-private-data-retriev.patch +watchdog-w83627hf_wdt-support-nct6796d-nct6797d-nct6.patch +kvm-ppc-inform-the-userspace-about-tce-update-failur.patch +dmaengine-ep93xx-return-proper-enum-in-ep93xx_dma_ch.patch +dmaengine-timb_dma-use-proper-enum-in-td_prep_slave_.patch +ext4-fix-build-error-when-dx_debug-is-defined.patch +clk-keystone-enable-tisci-clocks-if-k3_arch.patch +sunrpc-fix-connect-metrics.patch +mei-samples-fix-a-signedness-bug-in-amt_host_if_call.patch +cxgb4-use-proper-enum-in-cxgb4_dcb_handle_fw_update.patch +cxgb4-use-proper-enum-in-ieee_faux_sync.patch +powerpc-pseries-fix-dtl-buffer-registration.patch +powerpc-pseries-fix-how-we-iterate-over-the-dtl-entr.patch +powerpc-xive-move-a-dereference-below-a-null-test.patch +arm-dts-at91-sama5d4_xplained-fix-addressable-nand-f.patch +arm-dts-at91-at91sam9x5cm-fix-addressable-nand-flash.patch +mtd-rawnand-sh_flctl-use-proper-enum-for-flctl_dma_f.patch +pm-hibernate-check-the-success-of-generating-md5-dig.patch +tools-pci-fix-compilation-warnings.patch +clocksource-drivers-sh_cmt-fixup-for-64-bit-machines.patch +clocksource-drivers-sh_cmt-fix-clocksource-width-for.patch +md-allow-metadata-updates-while-suspending-an-array-.patch +ixgbe-fix-ixgbe-tx-hangs-with-xdp_tx-beyond-queue-li.patch +i40e-use-proper-enum-in-i40e_ndo_set_vf_link_state.patch +ixgbe-fix-crash-with-vfs-and-flow-director-on-interf.patch +ib-mthca-fix-error-return-code-in-__mthca_init_one.patch +ib-mlx4-avoid-implicit-enumerated-type-conversion.patch +acpica-never-run-_reg-on-system_memory-and-system_io.patch +powerpc-time-use-clockevents_register_device-fixing-.patch +ata-ep93xx-use-proper-enums-for-directions.patch +media-rc-ir-rc6-decoder-enable-toggle-bit-for-kathre.patch +media-pxa_camera-fix-check-for-pdev-dev.of_node.patch +media-i2c-adv748x-support-probing-a-single-output.patch +alsa-hda-sigmatel-disable-automute-for-elo-vupoint.patch +kvm-ppc-book3s-pr-exiting-split-hack-mode-needs-to-f.patch +usb-serial-cypress_m8-fix-interrupt-out-transfer-len.patch +mtd-physmap_of-release-resources-on-error.patch +cpu-smt-state-smt-is-disabled-even-with-nosmt-and-wi.patch +brcmfmac-reduce-timeout-for-action-frame-scan.patch +brcmfmac-fix-full-timeout-waiting-for-action-frame-o.patch +qtnfmac-pass-sgi-rate-info-flag-to-wireless-core.patch +qtnfmac-drop-error-reports-for-out-of-bounds-key-ind.patch +clk-samsung-exynos5420-define-clk_seckey-gate-clock-.patch +clk-samsung-use-clk_hw-api-for-calling-clk-framework.patch +i2c-brcmstb-allow-enabling-the-driver-on-dsl-socs.patch +nfsv4.x-fix-lock-recovery-during-delegation-recall.patch +dmaengine-ioat-fix-prototype-of-ioat_enumerate_chann.patch +media-cec-gpio-select-correct-signal-free-time.patch +input-st1232-set-input_prop_direct-property.patch +input-silead-try-firmware-reload-after-unsuccessful-.patch +remoteproc-check-for-null-firmwares-in-sysfs-interfa.patch +kexec-allocate-decrypted-control-pages-for-kdump-if-.patch +x86-olpc-fix-build-error-with-config_mfd_cs5535-m.patch +dmaengine-rcar-dmac-set-scatter-gather-max-segment-s.patch +crypto-mxs-dcp-fix-sha-null-hashes-and-output-length.patch +crypto-mxs-dcp-fix-aes-issues.patch +xfrm-use-correct-size-to-initialise-sp-ovec.patch +acpi-sbs-fix-rare-oops-when-removing-modules.patch +iwlwifi-mvm-don-t-send-keys-when-entering-d3.patch +x86-fsgsbase-64-fix-ptrace-to-read-the-fs-gs-base-ac.patch +mmc-tmio-fix-scc-error-detection.patch +fbdev-sbuslib-use-checked-version-of-put_user.patch +fbdev-sbuslib-integer-overflow-in-sbusfb_ioctl_helpe.patch +reset-fix-potential-use-after-free-in-__of_reset_con.patch +bcache-recal-cached_dev_sectors-on-detach.patch +media-dw9714-fix-error-handling-in-probe-function.patch +s390-kasan-avoid-vdso-instrumentation.patch +proc-vmcore-fix-i386-build-error-of-missing-copy_old.patch +backlight-lm3639-unconditionally-call-led_classdev_u.patch +mfd-ti_am335x_tscadc-keep-adc-interface-on-if-child-.patch +printk-give-error-on-attempt-to-set-log-buffer-lengt.patch +media-isif-fix-a-null-pointer-dereference-bug.patch +gfs2-flush-the-gfs2-delete-workqueue-before-stopping.patch +media-cx231xx-fix-potential-sign-extension-overflow-.patch +x86-kexec-correct-kexec_backup_src_end-off-by-one-er.patch +gpio-syscon-fix-possible-null-ptr-usage.patch +spi-fsl-lpspi-prevent-fifo-under-overrun-by-default.patch +pinctrl-gemini-mask-and-set-properly.patch +spi-spidev-fix-of-tree-warning-logic.patch +arm-8802-1-call-syscall_trace_exit-even-when-system-.patch +orangefs-rate-limit-the-client-not-running-info-mess.patch +pinctrl-gemini-fix-up-tvc-clock-group.patch +hwmon-pwm-fan-silence-error-on-probe-deferral.patch +hwmon-ina3221-fix-ina3221_config_mode-macros.patch +netfilter-nft_compat-do-not-dump-private-area.patch +misc-cxl-fix-possible-null-pointer-dereference.patch +mac80211-minstrel-fix-using-short-preamble-cck-rates.patch +mac80211-minstrel-fix-cck-rate-group-streams-value.patch +mac80211-minstrel-fix-sampling-reporting-of-cck-rate.patch +spi-rockchip-initialize-dma_slave_config-properly.patch +mlxsw-spectrum_switchdev-check-notification-relevanc.patch +arm-dts-omap5-fix-dual-role-mode-on-super-speed-port.patch +tools-pci-fix-broken-pcitest-compilation.patch +powerpc-time-fix-clockevent_decrementer-initalisatio.patch +mmc-tmio-fix-scc-error-handling-to-avoid-false-posit.patch diff --git a/queue-4.14/spi-fsl-lpspi-prevent-fifo-under-overrun-by-default.patch b/queue-4.14/spi-fsl-lpspi-prevent-fifo-under-overrun-by-default.patch new file mode 100644 index 00000000000..f7b7bf108a6 --- /dev/null +++ b/queue-4.14/spi-fsl-lpspi-prevent-fifo-under-overrun-by-default.patch @@ -0,0 +1,39 @@ +From b6f823a6855a12f2c877cf90a72a90d6e7aba4b8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Oct 2018 18:06:36 +0700 +Subject: spi: fsl-lpspi: Prevent FIFO under/overrun by default + +From: Hieu Tran Dang + +[ Upstream commit de8978c388c66b8fca192213ec9f0727e964c652 ] + +Certain devices don't work well when a transmit FIFO underrun or +receive FIFO overrun occurs. Example is the SAF400x radio chip when +running at high speed which leads to garbage being sent to/received from +the chip. In which case, it should stall waiting for further data to be +available before proceeding. This patch unset the NOSTALL bit in CFGR1 +by default to prevent this issue. + +Signed-off-by: Hieu Tran Dang +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spi-fsl-lpspi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c +index cb3c73007ca15..8fe51f7541bb3 100644 +--- a/drivers/spi/spi-fsl-lpspi.c ++++ b/drivers/spi/spi-fsl-lpspi.c +@@ -287,7 +287,7 @@ static int fsl_lpspi_config(struct fsl_lpspi_data *fsl_lpspi) + + fsl_lpspi_set_watermark(fsl_lpspi); + +- temp = CFGR1_PCSCFG | CFGR1_MASTER | CFGR1_NOSTALL; ++ temp = CFGR1_PCSCFG | CFGR1_MASTER; + if (fsl_lpspi->config.mode & SPI_CS_HIGH) + temp |= CFGR1_PCSPOL; + writel(temp, fsl_lpspi->base + IMX7ULP_CFGR1); +-- +2.20.1 + diff --git a/queue-4.14/spi-rockchip-initialize-dma_slave_config-properly.patch b/queue-4.14/spi-rockchip-initialize-dma_slave_config-properly.patch new file mode 100644 index 00000000000..b5514f2846c --- /dev/null +++ b/queue-4.14/spi-rockchip-initialize-dma_slave_config-properly.patch @@ -0,0 +1,38 @@ +From 3e562fe9861dde5fe3770834364eb99365497d03 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 10 Oct 2018 11:00:32 +0200 +Subject: spi: rockchip: initialize dma_slave_config properly + +From: Huibin Hong + +[ Upstream commit dd8fd2cbc73f8650f651da71fc61a6e4f30c1566 ] + +The rxconf and txconf structs are allocated on the +stack, so make sure we zero them before filling out +the relevant fields. + +Signed-off-by: Huibin Hong +Signed-off-by: Emil Renner Berthing +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spi-rockchip.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c +index fdcf3076681b5..185bbdce62b14 100644 +--- a/drivers/spi/spi-rockchip.c ++++ b/drivers/spi/spi-rockchip.c +@@ -445,6 +445,9 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs) + struct dma_slave_config rxconf, txconf; + struct dma_async_tx_descriptor *rxdesc, *txdesc; + ++ memset(&rxconf, 0, sizeof(rxconf)); ++ memset(&txconf, 0, sizeof(txconf)); ++ + spin_lock_irqsave(&rs->lock, flags); + rs->state &= ~RXBUSY; + rs->state &= ~TXBUSY; +-- +2.20.1 + diff --git a/queue-4.14/spi-spidev-fix-of-tree-warning-logic.patch b/queue-4.14/spi-spidev-fix-of-tree-warning-logic.patch new file mode 100644 index 00000000000..93677ce2b27 --- /dev/null +++ b/queue-4.14/spi-spidev-fix-of-tree-warning-logic.patch @@ -0,0 +1,55 @@ +From 979c2a37b07ba989f679433f9f7c1099a1bd8004 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 20 Sep 2018 19:18:34 +0000 +Subject: spi: spidev: Fix OF tree warning logic +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Trent Piepho + +[ Upstream commit 605b3bec73cbd74b4ac937b580cd0b47d1300484 ] + +spidev will make a big fuss if a device tree node binds a device by +using "spidev" as the node's compatible property. + +However, the logic for this isn't looking for "spidev" in the +compatible, but rather checking that the device is NOT compatible with +spidev's list of devices. + +This causes a false positive if a device not named "rohm,dh2228fv", etc. +binds to spidev, even if a means other than putting "spidev" in the +device tree was used. E.g., the sysfs driver_override attribute. + +Signed-off-by: Trent Piepho +Reviewed-by: Jan Kundrát +Tested-by: Jan Kundrát +Reviewed-by: Geert Uytterhoeven +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spidev.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c +index cda10719d1d1b..c5fe08bc34a0a 100644 +--- a/drivers/spi/spidev.c ++++ b/drivers/spi/spidev.c +@@ -724,11 +724,9 @@ static int spidev_probe(struct spi_device *spi) + * compatible string, it is a Linux implementation thing + * rather than a description of the hardware. + */ +- if (spi->dev.of_node && !of_match_device(spidev_dt_ids, &spi->dev)) { +- dev_err(&spi->dev, "buggy DT: spidev listed directly in DT\n"); +- WARN_ON(spi->dev.of_node && +- !of_match_device(spidev_dt_ids, &spi->dev)); +- } ++ WARN(spi->dev.of_node && ++ of_device_is_compatible(spi->dev.of_node, "spidev"), ++ "%pOF: buggy DT: spidev listed directly in DT\n", spi->dev.of_node); + + spidev_probe_acpi(spi); + +-- +2.20.1 + diff --git a/queue-4.14/sunrpc-fix-connect-metrics.patch b/queue-4.14/sunrpc-fix-connect-metrics.patch new file mode 100644 index 00000000000..17b23ca2d74 --- /dev/null +++ b/queue-4.14/sunrpc-fix-connect-metrics.patch @@ -0,0 +1,123 @@ +From 283c5b12745967d51719b815bd67ea054e004fff Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 1 Oct 2018 14:25:36 -0400 +Subject: sunrpc: Fix connect metrics + +From: Chuck Lever + +[ Upstream commit 3968a8a5310404c2f0b9e4d9f28cab13a12bc4fd ] + +For TCP, the logic in xprt_connect_status is currently never invoked +to record a successful connection. Commit 2a4919919a97 ("SUNRPC: +Return EAGAIN instead of ENOTCONN when waking up xprt->pending") +changed the way TCP xprt's are awoken after a connect succeeds. + +Instead, change connection-oriented transports to bump connect_count +and compute connect_time the moment that XPRT_CONNECTED is set. + +Signed-off-by: Chuck Lever +Signed-off-by: Anna Schumaker +Signed-off-by: Sasha Levin +--- + net/sunrpc/xprt.c | 14 ++++---------- + net/sunrpc/xprtrdma/transport.c | 6 +++++- + net/sunrpc/xprtsock.c | 10 ++++++---- + 3 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c +index d0282cc88b145..b852c34bb6373 100644 +--- a/net/sunrpc/xprt.c ++++ b/net/sunrpc/xprt.c +@@ -795,17 +795,11 @@ void xprt_connect(struct rpc_task *task) + + static void xprt_connect_status(struct rpc_task *task) + { +- struct rpc_xprt *xprt = task->tk_rqstp->rq_xprt; +- +- if (task->tk_status == 0) { +- xprt->stat.connect_count++; +- xprt->stat.connect_time += (long)jiffies - xprt->stat.connect_start; ++ switch (task->tk_status) { ++ case 0: + dprintk("RPC: %5u xprt_connect_status: connection established\n", + task->tk_pid); +- return; +- } +- +- switch (task->tk_status) { ++ break; + case -ECONNREFUSED: + case -ECONNRESET: + case -ECONNABORTED: +@@ -822,7 +816,7 @@ static void xprt_connect_status(struct rpc_task *task) + default: + dprintk("RPC: %5u xprt_connect_status: error %d connecting to " + "server %s\n", task->tk_pid, -task->tk_status, +- xprt->servername); ++ task->tk_rqstp->rq_xprt->servername); + task->tk_status = -EIO; + } + } +diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c +index 8cf5ccfe180d3..b1b40a1be8c57 100644 +--- a/net/sunrpc/xprtrdma/transport.c ++++ b/net/sunrpc/xprtrdma/transport.c +@@ -238,8 +238,12 @@ rpcrdma_connect_worker(struct work_struct *work) + if (++xprt->connect_cookie == 0) /* maintain a reserved value */ + ++xprt->connect_cookie; + if (ep->rep_connected > 0) { +- if (!xprt_test_and_set_connected(xprt)) ++ if (!xprt_test_and_set_connected(xprt)) { ++ xprt->stat.connect_count++; ++ xprt->stat.connect_time += (long)jiffies - ++ xprt->stat.connect_start; + xprt_wake_pending_tasks(xprt, 0); ++ } + } else { + if (xprt_test_and_clear_connected(xprt)) + xprt_wake_pending_tasks(xprt, -ENOTCONN); +diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c +index 05a58cc1b0cdb..a42871a59f3b9 100644 +--- a/net/sunrpc/xprtsock.c ++++ b/net/sunrpc/xprtsock.c +@@ -1592,6 +1592,9 @@ static void xs_tcp_state_change(struct sock *sk) + clear_bit(XPRT_SOCK_CONNECTING, &transport->sock_state); + xprt_clear_connecting(xprt); + ++ xprt->stat.connect_count++; ++ xprt->stat.connect_time += (long)jiffies - ++ xprt->stat.connect_start; + xprt_wake_pending_tasks(xprt, -EAGAIN); + } + spin_unlock(&xprt->transport_lock); +@@ -2008,8 +2011,6 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt, + } + + /* Tell the socket layer to start connecting... */ +- xprt->stat.connect_count++; +- xprt->stat.connect_start = jiffies; + return kernel_connect(sock, xs_addr(xprt), xprt->addrlen, 0); + } + +@@ -2041,6 +2042,9 @@ static int xs_local_setup_socket(struct sock_xprt *transport) + case 0: + dprintk("RPC: xprt %p connected to %s\n", + xprt, xprt->address_strings[RPC_DISPLAY_ADDR]); ++ xprt->stat.connect_count++; ++ xprt->stat.connect_time += (long)jiffies - ++ xprt->stat.connect_start; + xprt_set_connected(xprt); + case -ENOBUFS: + break; +@@ -2361,8 +2365,6 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock) + xs_set_memalloc(xprt); + + /* Tell the socket layer to start connecting... */ +- xprt->stat.connect_count++; +- xprt->stat.connect_start = jiffies; + set_bit(XPRT_SOCK_CONNECTING, &transport->sock_state); + ret = kernel_connect(sock, xs_addr(xprt), xprt->addrlen, O_NONBLOCK); + switch (ret) { +-- +2.20.1 + diff --git a/queue-4.14/sunrpc-fix-priority-queue-fairness.patch b/queue-4.14/sunrpc-fix-priority-queue-fairness.patch new file mode 100644 index 00000000000..cd1079d8f30 --- /dev/null +++ b/queue-4.14/sunrpc-fix-priority-queue-fairness.patch @@ -0,0 +1,226 @@ +From c9783f6d0850ad536eda30850be8dcc60e3830a5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 8 Sep 2018 22:09:48 -0400 +Subject: SUNRPC: Fix priority queue fairness + +From: Trond Myklebust + +[ Upstream commit f42f7c283078ce3c1e8368b140e270755b1ae313 ] + +Fix up the priority queue to not batch by owner, but by queue, so that +we allow '1 << priority' elements to be dequeued before switching to +the next priority queue. +The owner field is still used to wake up requests in round robin order +by owner to avoid single processes hogging the RPC layer by loading the +queues. + +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + include/linux/sunrpc/sched.h | 2 - + net/sunrpc/sched.c | 109 +++++++++++++++++------------------ + 2 files changed, 54 insertions(+), 57 deletions(-) + +diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h +index d96e74e114c06..c9548a63d09bb 100644 +--- a/include/linux/sunrpc/sched.h ++++ b/include/linux/sunrpc/sched.h +@@ -188,7 +188,6 @@ struct rpc_timer { + struct rpc_wait_queue { + spinlock_t lock; + struct list_head tasks[RPC_NR_PRIORITY]; /* task queue for each priority level */ +- pid_t owner; /* process id of last task serviced */ + unsigned char maxpriority; /* maximum priority (0 if queue is not a priority queue) */ + unsigned char priority; /* current priority */ + unsigned char nr; /* # tasks remaining for cookie */ +@@ -204,7 +203,6 @@ struct rpc_wait_queue { + * from a single cookie. The aim is to improve + * performance of NFS operations such as read/write. + */ +-#define RPC_BATCH_COUNT 16 + #define RPC_IS_PRIORITY(q) ((q)->maxpriority > 0) + + /* +diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c +index f9db5fe52d367..aff76fb434300 100644 +--- a/net/sunrpc/sched.c ++++ b/net/sunrpc/sched.c +@@ -99,64 +99,78 @@ __rpc_add_timer(struct rpc_wait_queue *queue, struct rpc_task *task) + list_add(&task->u.tk_wait.timer_list, &queue->timer_list.list); + } + +-static void rpc_rotate_queue_owner(struct rpc_wait_queue *queue) +-{ +- struct list_head *q = &queue->tasks[queue->priority]; +- struct rpc_task *task; +- +- if (!list_empty(q)) { +- task = list_first_entry(q, struct rpc_task, u.tk_wait.list); +- if (task->tk_owner == queue->owner) +- list_move_tail(&task->u.tk_wait.list, q); +- } +-} +- + static void rpc_set_waitqueue_priority(struct rpc_wait_queue *queue, int priority) + { + if (queue->priority != priority) { +- /* Fairness: rotate the list when changing priority */ +- rpc_rotate_queue_owner(queue); + queue->priority = priority; ++ queue->nr = 1U << priority; + } + } + +-static void rpc_set_waitqueue_owner(struct rpc_wait_queue *queue, pid_t pid) +-{ +- queue->owner = pid; +- queue->nr = RPC_BATCH_COUNT; +-} +- + static void rpc_reset_waitqueue_priority(struct rpc_wait_queue *queue) + { + rpc_set_waitqueue_priority(queue, queue->maxpriority); +- rpc_set_waitqueue_owner(queue, 0); + } + + /* +- * Add new request to a priority queue. ++ * Add a request to a queue list + */ +-static void __rpc_add_wait_queue_priority(struct rpc_wait_queue *queue, +- struct rpc_task *task, +- unsigned char queue_priority) ++static void ++__rpc_list_enqueue_task(struct list_head *q, struct rpc_task *task) + { +- struct list_head *q; + struct rpc_task *t; + +- INIT_LIST_HEAD(&task->u.tk_wait.links); +- if (unlikely(queue_priority > queue->maxpriority)) +- queue_priority = queue->maxpriority; +- if (queue_priority > queue->priority) +- rpc_set_waitqueue_priority(queue, queue_priority); +- q = &queue->tasks[queue_priority]; + list_for_each_entry(t, q, u.tk_wait.list) { + if (t->tk_owner == task->tk_owner) { +- list_add_tail(&task->u.tk_wait.list, &t->u.tk_wait.links); ++ list_add_tail(&task->u.tk_wait.links, ++ &t->u.tk_wait.links); ++ /* Cache the queue head in task->u.tk_wait.list */ ++ task->u.tk_wait.list.next = q; ++ task->u.tk_wait.list.prev = NULL; + return; + } + } ++ INIT_LIST_HEAD(&task->u.tk_wait.links); + list_add_tail(&task->u.tk_wait.list, q); + } + ++/* ++ * Remove request from a queue list ++ */ ++static void ++__rpc_list_dequeue_task(struct rpc_task *task) ++{ ++ struct list_head *q; ++ struct rpc_task *t; ++ ++ if (task->u.tk_wait.list.prev == NULL) { ++ list_del(&task->u.tk_wait.links); ++ return; ++ } ++ if (!list_empty(&task->u.tk_wait.links)) { ++ t = list_first_entry(&task->u.tk_wait.links, ++ struct rpc_task, ++ u.tk_wait.links); ++ /* Assume __rpc_list_enqueue_task() cached the queue head */ ++ q = t->u.tk_wait.list.next; ++ list_add_tail(&t->u.tk_wait.list, q); ++ list_del(&task->u.tk_wait.links); ++ } ++ list_del(&task->u.tk_wait.list); ++} ++ ++/* ++ * Add new request to a priority queue. ++ */ ++static void __rpc_add_wait_queue_priority(struct rpc_wait_queue *queue, ++ struct rpc_task *task, ++ unsigned char queue_priority) ++{ ++ if (unlikely(queue_priority > queue->maxpriority)) ++ queue_priority = queue->maxpriority; ++ __rpc_list_enqueue_task(&queue->tasks[queue_priority], task); ++} ++ + /* + * Add new request to wait queue. + * +@@ -194,13 +208,7 @@ static void __rpc_add_wait_queue(struct rpc_wait_queue *queue, + */ + static void __rpc_remove_wait_queue_priority(struct rpc_task *task) + { +- struct rpc_task *t; +- +- if (!list_empty(&task->u.tk_wait.links)) { +- t = list_entry(task->u.tk_wait.links.next, struct rpc_task, u.tk_wait.list); +- list_move(&t->u.tk_wait.list, &task->u.tk_wait.list); +- list_splice_init(&task->u.tk_wait.links, &t->u.tk_wait.links); +- } ++ __rpc_list_dequeue_task(task); + } + + /* +@@ -212,7 +220,8 @@ static void __rpc_remove_wait_queue(struct rpc_wait_queue *queue, struct rpc_tas + __rpc_disable_timer(queue, task); + if (RPC_IS_PRIORITY(queue)) + __rpc_remove_wait_queue_priority(task); +- list_del(&task->u.tk_wait.list); ++ else ++ list_del(&task->u.tk_wait.list); + queue->qlen--; + dprintk("RPC: %5u removed from queue %p \"%s\"\n", + task->tk_pid, queue, rpc_qname(queue)); +@@ -481,17 +490,9 @@ static struct rpc_task *__rpc_find_next_queued_priority(struct rpc_wait_queue *q + * Service a batch of tasks from a single owner. + */ + q = &queue->tasks[queue->priority]; +- if (!list_empty(q)) { +- task = list_entry(q->next, struct rpc_task, u.tk_wait.list); +- if (queue->owner == task->tk_owner) { +- if (--queue->nr) +- goto out; +- list_move_tail(&task->u.tk_wait.list, q); +- } +- /* +- * Check if we need to switch queues. +- */ +- goto new_owner; ++ if (!list_empty(q) && --queue->nr) { ++ task = list_first_entry(q, struct rpc_task, u.tk_wait.list); ++ goto out; + } + + /* +@@ -503,7 +504,7 @@ static struct rpc_task *__rpc_find_next_queued_priority(struct rpc_wait_queue *q + else + q = q - 1; + if (!list_empty(q)) { +- task = list_entry(q->next, struct rpc_task, u.tk_wait.list); ++ task = list_first_entry(q, struct rpc_task, u.tk_wait.list); + goto new_queue; + } + } while (q != &queue->tasks[queue->priority]); +@@ -513,8 +514,6 @@ static struct rpc_task *__rpc_find_next_queued_priority(struct rpc_wait_queue *q + + new_queue: + rpc_set_waitqueue_priority(queue, (unsigned int)(q - &queue->tasks[0])); +-new_owner: +- rpc_set_waitqueue_owner(queue, task->tk_owner); + out: + return task; + } +-- +2.20.1 + diff --git a/queue-4.14/tools-pci-fix-broken-pcitest-compilation.patch b/queue-4.14/tools-pci-fix-broken-pcitest-compilation.patch new file mode 100644 index 00000000000..c08d451dd0f --- /dev/null +++ b/queue-4.14/tools-pci-fix-broken-pcitest-compilation.patch @@ -0,0 +1,57 @@ +From 2dc759ccfad670cff7b3cc13fe10f2f2fd5a2330 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 23 May 2019 14:18:00 -0700 +Subject: tools: PCI: Fix broken pcitest compilation + +From: Alan Mikhak + +[ Upstream commit 8a5e0af240e07dd3d4897eb8ff52aab757da7fab ] + +pcitest is currently broken due to the following compiler error +and related warning. Fix by changing the run_test() function +signature to return an integer result. + +pcitest.c: In function run_test: +pcitest.c:143:9: warning: return with a value, in function +returning void + return (ret < 0) ? ret : 1 - ret; /* return 0 if test succeeded */ + +pcitest.c: In function main: +pcitest.c:232:9: error: void value not ignored as it ought to be + return run_test(test); + +Fixes: fef31ecaaf2c ("tools: PCI: Fix compilation warnings") +Signed-off-by: Alan Mikhak +Signed-off-by: Lorenzo Pieralisi +Reviewed-by: Paul Walmsley +Signed-off-by: Sasha Levin +--- + tools/pci/pcitest.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tools/pci/pcitest.c b/tools/pci/pcitest.c +index 8ca1c62bc06db..7002df55826f4 100644 +--- a/tools/pci/pcitest.c ++++ b/tools/pci/pcitest.c +@@ -42,15 +42,15 @@ struct pci_test { + unsigned long size; + }; + +-static void run_test(struct pci_test *test) ++static int run_test(struct pci_test *test) + { +- long ret; ++ int ret = -EINVAL; + int fd; + + fd = open(test->device, O_RDWR); + if (fd < 0) { + perror("can't open PCI Endpoint Test device"); +- return; ++ return -ENODEV; + } + + if (test->barnum >= 0 && test->barnum <= 5) { +-- +2.20.1 + diff --git a/queue-4.14/tools-pci-fix-compilation-warnings.patch b/queue-4.14/tools-pci-fix-compilation-warnings.patch new file mode 100644 index 00000000000..0da6352764f --- /dev/null +++ b/queue-4.14/tools-pci-fix-compilation-warnings.patch @@ -0,0 +1,77 @@ +From 11abf19e320263f4b9862f427e9d88e4764935f7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 23 Aug 2018 13:34:53 +0200 +Subject: tools: PCI: Fix compilation warnings + +From: Gustavo Pimentel + +[ Upstream commit fef31ecaaf2c5c54db85b35e893bf8abec96b93f ] + +Current compilation produces the following warnings: + +tools/pci/pcitest.c: In function 'run_test': +tools/pci/pcitest.c:56:9: warning: unused variable 'time' +[-Wunused-variable] + double time; + ^~~~ +tools/pci/pcitest.c:55:25: warning: unused variable 'end' +[-Wunused-variable] + struct timespec start, end; + ^~~ +tools/pci/pcitest.c:55:18: warning: unused variable 'start' +[-Wunused-variable] + struct timespec start, end; + ^~~~~ +tools/pci/pcitest.c:146:1: warning: control reaches end of non-void +function [-Wreturn-type] + } + ^ + +Fix them: + - remove unused variables + - change function return from int to void, since it's not used + +Signed-off-by: Gustavo Pimentel +[lorenzo.pieralisi@arm.com: rewrote the commit log] +Signed-off-by: Lorenzo Pieralisi +Reviewed-by: Kishon Vijay Abraham I +Signed-off-by: Sasha Levin +--- + tools/pci/pcitest.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/tools/pci/pcitest.c b/tools/pci/pcitest.c +index 9074b477bff0f..8ca1c62bc06db 100644 +--- a/tools/pci/pcitest.c ++++ b/tools/pci/pcitest.c +@@ -23,7 +23,6 @@ + #include + #include + #include +-#include + #include + + #include +@@ -43,17 +42,15 @@ struct pci_test { + unsigned long size; + }; + +-static int run_test(struct pci_test *test) ++static void run_test(struct pci_test *test) + { + long ret; + int fd; +- struct timespec start, end; +- double time; + + fd = open(test->device, O_RDWR); + if (fd < 0) { + perror("can't open PCI Endpoint Test device"); +- return fd; ++ return; + } + + if (test->barnum >= 0 && test->barnum <= 5) { +-- +2.20.1 + diff --git a/queue-4.14/usb-dwc3-gadget-check-enblslpm-before-sending-ep-com.patch b/queue-4.14/usb-dwc3-gadget-check-enblslpm-before-sending-ep-com.patch new file mode 100644 index 00000000000..49f164093b4 --- /dev/null +++ b/queue-4.14/usb-dwc3-gadget-check-enblslpm-before-sending-ep-com.patch @@ -0,0 +1,91 @@ +From 8fe64e81281c0d472ebf127f23dc220d548d5f76 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 11 Sep 2018 12:42:05 -0700 +Subject: usb: dwc3: gadget: Check ENBLSLPM before sending ep command + +From: Thinh Nguyen + +[ Upstream commit 87dd96111b0bb8e616fcbd74dbf4bb4182f2c596 ] + +When operating in USB 2.0 speeds (HS/FS), if GUSB2PHYCFG.ENBLSLPM or +GUSB2PHYCFG.SUSPHY is set, it must be cleared before issuing an endpoint +command. + +Current implementation only save and restore GUSB2PHYCFG.SUSPHY +configuration. We must save and clear both GUSB2PHYCFG.ENBLSLPM and +GUSB2PHYCFG.SUSPHY settings. Restore them after the command is +completed. + +DWC_usb3 3.30a and DWC_usb31 1.90a programming guide section 3.2.2 + +Signed-off-by: Thinh Nguyen +Signed-off-by: Felipe Balbi +Signed-off-by: Sasha Levin +--- + drivers/usb/dwc3/gadget.c | 29 +++++++++++++++++++---------- + 1 file changed, 19 insertions(+), 10 deletions(-) + +diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c +index 5916340c41621..e96b22d6fa52e 100644 +--- a/drivers/usb/dwc3/gadget.c ++++ b/drivers/usb/dwc3/gadget.c +@@ -277,27 +277,36 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd, + const struct usb_endpoint_descriptor *desc = dep->endpoint.desc; + struct dwc3 *dwc = dep->dwc; + u32 timeout = 1000; ++ u32 saved_config = 0; + u32 reg; + + int cmd_status = 0; +- int susphy = false; + int ret = -EINVAL; + + /* +- * Synopsys Databook 2.60a states, on section 6.3.2.5.[1-8], that if +- * we're issuing an endpoint command, we must check if +- * GUSB2PHYCFG.SUSPHY bit is set. If it is, then we need to clear it. ++ * When operating in USB 2.0 speeds (HS/FS), if GUSB2PHYCFG.ENBLSLPM or ++ * GUSB2PHYCFG.SUSPHY is set, it must be cleared before issuing an ++ * endpoint command. + * +- * We will also set SUSPHY bit to what it was before returning as stated +- * by the same section on Synopsys databook. ++ * Save and clear both GUSB2PHYCFG.ENBLSLPM and GUSB2PHYCFG.SUSPHY ++ * settings. Restore them after the command is completed. ++ * ++ * DWC_usb3 3.30a and DWC_usb31 1.90a programming guide section 3.2.2 + */ + if (dwc->gadget.speed <= USB_SPEED_HIGH) { + reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); + if (unlikely(reg & DWC3_GUSB2PHYCFG_SUSPHY)) { +- susphy = true; ++ saved_config |= DWC3_GUSB2PHYCFG_SUSPHY; + reg &= ~DWC3_GUSB2PHYCFG_SUSPHY; +- dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); + } ++ ++ if (reg & DWC3_GUSB2PHYCFG_ENBLSLPM) { ++ saved_config |= DWC3_GUSB2PHYCFG_ENBLSLPM; ++ reg &= ~DWC3_GUSB2PHYCFG_ENBLSLPM; ++ } ++ ++ if (saved_config) ++ dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); + } + + if (DWC3_DEPCMD_CMD(cmd) == DWC3_DEPCMD_STARTTRANSFER) { +@@ -395,9 +404,9 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd, + } + } + +- if (unlikely(susphy)) { ++ if (saved_config) { + reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); +- reg |= DWC3_GUSB2PHYCFG_SUSPHY; ++ reg |= saved_config; + dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); + } + +-- +2.20.1 + diff --git a/queue-4.14/usb-gadget-udc-fotg210-udc-fix-a-sleep-in-atomic-con.patch b/queue-4.14/usb-gadget-udc-fotg210-udc-fix-a-sleep-in-atomic-con.patch new file mode 100644 index 00000000000..4c77efa5aec --- /dev/null +++ b/queue-4.14/usb-gadget-udc-fotg210-udc-fix-a-sleep-in-atomic-con.patch @@ -0,0 +1,50 @@ +From 06ea0871e401d06d4c9f313c91f27f840939b3c0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 15 Sep 2018 11:04:40 +0800 +Subject: usb: gadget: udc: fotg210-udc: Fix a sleep-in-atomic-context bug in + fotg210_get_status() + +From: Jia-Ju Bai + +[ Upstream commit 2337a77c1cc86bc4e504ecf3799f947659c86026 ] + +The driver may sleep in an interrupt handler. +The function call path (from bottom to top) in Linux-4.17 is: + +[FUNC] fotg210_ep_queue(GFP_KERNEL) +drivers/usb/gadget/udc/fotg210-udc.c, 744: + fotg210_ep_queue in fotg210_get_status +drivers/usb/gadget/udc/fotg210-udc.c, 768: + fotg210_get_status in fotg210_setup_packet +drivers/usb/gadget/udc/fotg210-udc.c, 949: + fotg210_setup_packet in fotg210_irq (interrupt handler) + +To fix this bug, GFP_KERNEL is replaced with GFP_ATOMIC. +If possible, spin_unlock() and spin_lock() around fotg210_ep_queue() +can be also removed. + +This bug is found by my static analysis tool DSAC. + +Signed-off-by: Jia-Ju Bai +Signed-off-by: Felipe Balbi +Signed-off-by: Sasha Levin +--- + drivers/usb/gadget/udc/fotg210-udc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/usb/gadget/udc/fotg210-udc.c b/drivers/usb/gadget/udc/fotg210-udc.c +index d17d7052605ba..6866a0be249e4 100644 +--- a/drivers/usb/gadget/udc/fotg210-udc.c ++++ b/drivers/usb/gadget/udc/fotg210-udc.c +@@ -744,7 +744,7 @@ static void fotg210_get_status(struct fotg210_udc *fotg210, + fotg210->ep0_req->length = 2; + + spin_unlock(&fotg210->lock); +- fotg210_ep_queue(fotg210->gadget.ep0, fotg210->ep0_req, GFP_KERNEL); ++ fotg210_ep_queue(fotg210->gadget.ep0, fotg210->ep0_req, GFP_ATOMIC); + spin_lock(&fotg210->lock); + } + +-- +2.20.1 + diff --git a/queue-4.14/usb-serial-cypress_m8-fix-interrupt-out-transfer-len.patch b/queue-4.14/usb-serial-cypress_m8-fix-interrupt-out-transfer-len.patch new file mode 100644 index 00000000000..a0cb2f3d6e6 --- /dev/null +++ b/queue-4.14/usb-serial-cypress_m8-fix-interrupt-out-transfer-len.patch @@ -0,0 +1,38 @@ +From a3e9a72a7560cd74eea658f104f37ca90e03b08f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 30 Sep 2018 18:03:11 +0200 +Subject: USB: serial: cypress_m8: fix interrupt-out transfer length + +From: Johan Hovold + +[ Upstream commit 56445eef55cb5904096fed7a73cf87b755dfffc7 ] + +Fix interrupt-out transfer length which was being set to the +transfer-buffer length rather than the size of the outgoing packet. + +Note that no slab data was leaked as the whole transfer buffer is always +cleared before each transfer. + +Fixes: 9aa8dae7b1fa ("cypress_m8: use usb_fill_int_urb where appropriate") +Signed-off-by: Johan Hovold +Signed-off-by: Sasha Levin +--- + drivers/usb/serial/cypress_m8.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c +index 90110de715e01..d0aa4c853f56a 100644 +--- a/drivers/usb/serial/cypress_m8.c ++++ b/drivers/usb/serial/cypress_m8.c +@@ -773,7 +773,7 @@ static void cypress_send(struct usb_serial_port *port) + + usb_fill_int_urb(port->interrupt_out_urb, port->serial->dev, + usb_sndintpipe(port->serial->dev, port->interrupt_out_endpointAddress), +- port->interrupt_out_buffer, port->interrupt_out_size, ++ port->interrupt_out_buffer, actual_size, + cypress_write_int_callback, port, priv->write_urb_interval); + result = usb_submit_urb(port->interrupt_out_urb, GFP_ATOMIC); + if (result) { +-- +2.20.1 + diff --git a/queue-4.14/watchdog-w83627hf_wdt-support-nct6796d-nct6797d-nct6.patch b/queue-4.14/watchdog-w83627hf_wdt-support-nct6796d-nct6797d-nct6.patch new file mode 100644 index 00000000000..fd778e2f2b8 --- /dev/null +++ b/queue-4.14/watchdog-w83627hf_wdt-support-nct6796d-nct6797d-nct6.patch @@ -0,0 +1,70 @@ +From bd8e04b9a57cd2e30b2dbe9c11d6164043ca2efd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 23 Sep 2018 06:54:11 -0700 +Subject: watchdog: w83627hf_wdt: Support NCT6796D, NCT6797D, NCT6798D + +From: Guenter Roeck + +[ Upstream commit 57cbf0e3a0fd48e5ad8f3884562e8dde4827c1c8 ] + +The watchdog controller on NCT6796D, NCT6797D, and NCT6798D is compatible +with the wtachdog controller on other Nuvoton chips. + +Signed-off-by: Guenter Roeck +Reviewed-by: Wim Van Sebroeck +Signed-off-by: Wim Van Sebroeck +Signed-off-by: Sasha Levin +--- + drivers/watchdog/w83627hf_wdt.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c +index 7817836bff554..4b9365d4de7a9 100644 +--- a/drivers/watchdog/w83627hf_wdt.c ++++ b/drivers/watchdog/w83627hf_wdt.c +@@ -50,7 +50,7 @@ static int cr_wdt_csr; /* WDT control & status register */ + enum chips { w83627hf, w83627s, w83697hf, w83697ug, w83637hf, w83627thf, + w83687thf, w83627ehf, w83627dhg, w83627uhg, w83667hg, w83627dhg_p, + w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792, nct6793, +- nct6795, nct6102 }; ++ nct6795, nct6796, nct6102 }; + + static int timeout; /* in seconds */ + module_param(timeout, int, 0); +@@ -100,6 +100,7 @@ MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=0)"); + #define NCT6792_ID 0xc9 + #define NCT6793_ID 0xd1 + #define NCT6795_ID 0xd3 ++#define NCT6796_ID 0xd4 /* also NCT9697D, NCT9698D */ + + #define W83627HF_WDT_TIMEOUT 0xf6 + #define W83697HF_WDT_TIMEOUT 0xf4 +@@ -209,6 +210,7 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip) + case nct6792: + case nct6793: + case nct6795: ++ case nct6796: + case nct6102: + /* + * These chips have a fixed WDTO# output pin (W83627UHG), +@@ -407,6 +409,9 @@ static int wdt_find(int addr) + case NCT6795_ID: + ret = nct6795; + break; ++ case NCT6796_ID: ++ ret = nct6796; ++ break; + case NCT6102_ID: + ret = nct6102; + cr_wdt_timeout = NCT6102D_WDT_TIMEOUT; +@@ -450,6 +455,7 @@ static int __init wdt_init(void) + "NCT6792", + "NCT6793", + "NCT6795", ++ "NCT6796", + "NCT6102", + }; + +-- +2.20.1 + diff --git a/queue-4.14/x86-fsgsbase-64-fix-ptrace-to-read-the-fs-gs-base-ac.patch b/queue-4.14/x86-fsgsbase-64-fix-ptrace-to-read-the-fs-gs-base-ac.patch new file mode 100644 index 00000000000..606087fff25 --- /dev/null +++ b/queue-4.14/x86-fsgsbase-64-fix-ptrace-to-read-the-fs-gs-base-ac.patch @@ -0,0 +1,133 @@ +From d313fc02e5c45fa6a5787792181596537df45549 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 18 Sep 2018 16:08:52 -0700 +Subject: x86/fsgsbase/64: Fix ptrace() to read the FS/GS base accurately + +From: Andy Lutomirski + +[ Upstream commit 07e1d88adaaeab247b300926f78cc3f950dbeda3 ] + +On 64-bit kernels ptrace can read the FS/GS base using the register access +APIs (PTRACE_PEEKUSER, etc.) or PTRACE_ARCH_PRCTL. + +Make both of these mechanisms return the actual FS/GS base. + +This will improve debuggability by providing the correct information +to ptracer such as GDB. + +[ chang: Rebased and revised patch description. ] +[ mingo: Revised the changelog some more. ] + +Signed-off-by: Andy Lutomirski +Signed-off-by: Chang S. Bae +Cc: Andy Lutomirski +Cc: Borislav Petkov +Cc: Brian Gerst +Cc: Dave Hansen +Cc: Denys Vlasenko +Cc: H. Peter Anvin +Cc: Linus Torvalds +Cc: Markus T Metzger +Cc: Peter Zijlstra +Cc: Ravi Shankar +Cc: Rik van Riel +Cc: Thomas Gleixner +Link: http://lkml.kernel.org/r/1537312139-5580-2-git-send-email-chang.seok.bae@intel.com +Signed-off-by: Ingo Molnar +Signed-off-by: Sasha Levin +--- + arch/x86/kernel/ptrace.c | 62 +++++++++++++++++++++++++++++++++------- + 1 file changed, 52 insertions(+), 10 deletions(-) + +diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c +index 584cdd475bb31..734549492a18b 100644 +--- a/arch/x86/kernel/ptrace.c ++++ b/arch/x86/kernel/ptrace.c +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + #include "tls.h" + +@@ -343,6 +344,49 @@ static int set_segment_reg(struct task_struct *task, + return 0; + } + ++static unsigned long task_seg_base(struct task_struct *task, ++ unsigned short selector) ++{ ++ unsigned short idx = selector >> 3; ++ unsigned long base; ++ ++ if (likely((selector & SEGMENT_TI_MASK) == 0)) { ++ if (unlikely(idx >= GDT_ENTRIES)) ++ return 0; ++ ++ /* ++ * There are no user segments in the GDT with nonzero bases ++ * other than the TLS segments. ++ */ ++ if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) ++ return 0; ++ ++ idx -= GDT_ENTRY_TLS_MIN; ++ base = get_desc_base(&task->thread.tls_array[idx]); ++ } else { ++#ifdef CONFIG_MODIFY_LDT_SYSCALL ++ struct ldt_struct *ldt; ++ ++ /* ++ * If performance here mattered, we could protect the LDT ++ * with RCU. This is a slow path, though, so we can just ++ * take the mutex. ++ */ ++ mutex_lock(&task->mm->context.lock); ++ ldt = task->mm->context.ldt; ++ if (unlikely(idx >= ldt->nr_entries)) ++ base = 0; ++ else ++ base = get_desc_base(ldt->entries + idx); ++ mutex_unlock(&task->mm->context.lock); ++#else ++ base = 0; ++#endif ++ } ++ ++ return base; ++} ++ + #endif /* CONFIG_X86_32 */ + + static unsigned long get_flags(struct task_struct *task) +@@ -436,18 +480,16 @@ static unsigned long getreg(struct task_struct *task, unsigned long offset) + + #ifdef CONFIG_X86_64 + case offsetof(struct user_regs_struct, fs_base): { +- /* +- * XXX: This will not behave as expected if called on +- * current or if fsindex != 0. +- */ +- return task->thread.fsbase; ++ if (task->thread.fsindex == 0) ++ return task->thread.fsbase; ++ else ++ return task_seg_base(task, task->thread.fsindex); + } + case offsetof(struct user_regs_struct, gs_base): { +- /* +- * XXX: This will not behave as expected if called on +- * current or if fsindex != 0. +- */ +- return task->thread.gsbase; ++ if (task->thread.gsindex == 0) ++ return task->thread.gsbase; ++ else ++ return task_seg_base(task, task->thread.gsindex); + } + #endif + } +-- +2.20.1 + diff --git a/queue-4.14/x86-kexec-correct-kexec_backup_src_end-off-by-one-er.patch b/queue-4.14/x86-kexec-correct-kexec_backup_src_end-off-by-one-er.patch new file mode 100644 index 00000000000..e4ea2c84fc5 --- /dev/null +++ b/queue-4.14/x86-kexec-correct-kexec_backup_src_end-off-by-one-er.patch @@ -0,0 +1,67 @@ +From a0d1ab8ff5d9b7d7cc6f5685c6401a631e0dd5f2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 27 Sep 2018 09:21:55 -0500 +Subject: x86/kexec: Correct KEXEC_BACKUP_SRC_END off-by-one error + +From: Bjorn Helgaas + +[ Upstream commit 51fbf14f2528a8c6401290e37f1c893a2412f1d3 ] + +The only use of KEXEC_BACKUP_SRC_END is as an argument to +walk_system_ram_res(): + + int crash_load_segments(struct kimage *image) + { + ... + walk_system_ram_res(KEXEC_BACKUP_SRC_START, KEXEC_BACKUP_SRC_END, + image, determine_backup_region); + +walk_system_ram_res() expects "start, end" arguments that are inclusive, +i.e., the range to be walked includes both the start and end addresses. + +KEXEC_BACKUP_SRC_END was previously defined as (640 * 1024UL), which is the +first address *past* the desired 0-640KB range. + +Define KEXEC_BACKUP_SRC_END as (640 * 1024UL - 1) so the KEXEC_BACKUP_SRC +region is [0-0x9ffff], not [0-0xa0000]. + +Fixes: dd5f726076cc ("kexec: support for kexec on panic using new system call") +Signed-off-by: Bjorn Helgaas +Signed-off-by: Borislav Petkov +CC: "H. Peter Anvin" +CC: Andrew Morton +CC: Brijesh Singh +CC: Greg Kroah-Hartman +CC: Ingo Molnar +CC: Lianbo Jiang +CC: Takashi Iwai +CC: Thomas Gleixner +CC: Tom Lendacky +CC: Vivek Goyal +CC: baiyaowei@cmss.chinamobile.com +CC: bhe@redhat.com +CC: dan.j.williams@intel.com +CC: dyoung@redhat.com +CC: kexec@lists.infradead.org +Link: http://lkml.kernel.org/r/153805811578.1157.6948388946904655969.stgit@bhelgaas-glaptop.roam.corp.google.com +Signed-off-by: Sasha Levin +--- + arch/x86/include/asm/kexec.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h +index f327236f0fa71..5125fca472bb0 100644 +--- a/arch/x86/include/asm/kexec.h ++++ b/arch/x86/include/asm/kexec.h +@@ -67,7 +67,7 @@ struct kimage; + + /* Memory to backup during crash kdump */ + #define KEXEC_BACKUP_SRC_START (0UL) +-#define KEXEC_BACKUP_SRC_END (640 * 1024UL) /* 640K */ ++#define KEXEC_BACKUP_SRC_END (640 * 1024UL - 1) /* 640K */ + + /* + * CPU does not save ss and sp on stack if execution is already +-- +2.20.1 + diff --git a/queue-4.14/x86-olpc-fix-build-error-with-config_mfd_cs5535-m.patch b/queue-4.14/x86-olpc-fix-build-error-with-config_mfd_cs5535-m.patch new file mode 100644 index 00000000000..581b0ceed99 --- /dev/null +++ b/queue-4.14/x86-olpc-fix-build-error-with-config_mfd_cs5535-m.patch @@ -0,0 +1,47 @@ +From ee07b2ca5c0b14cdafa48e4dd4fe9bbd0ca7d1fb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Oct 2018 15:13:07 +0200 +Subject: x86/olpc: Fix build error with CONFIG_MFD_CS5535=m + +From: Borislav Petkov + +[ Upstream commit fa112cf1e8bc693d5a666b1c479a2859c8b6e0f1 ] + +When building a 32-bit config which has the above MFD item as module +but OLPC_XO1_PM is enabled =y - which is bool, btw - the kernel fails +building with: + + ld: arch/x86/platform/olpc/olpc-xo1-pm.o: in function `xo1_pm_remove': + /home/boris/kernel/linux/arch/x86/platform/olpc/olpc-xo1-pm.c:159: undefined reference to `mfd_cell_disable' + ld: arch/x86/platform/olpc/olpc-xo1-pm.o: in function `xo1_pm_probe': + /home/boris/kernel/linux/arch/x86/platform/olpc/olpc-xo1-pm.c:133: undefined reference to `mfd_cell_enable' + make: *** [Makefile:1030: vmlinux] Error 1 + +Force MFD_CS5535 to y if OLPC_XO1_PM is enabled. + +Signed-off-by: Borislav Petkov +Cc: Lubomir Rintel +Cc: x86@kernel.org +Link: http://lkml.kernel.org/r/20181005131750.GA5366@zn.tnic +Signed-off-by: Sasha Levin +--- + arch/x86/Kconfig | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig +index b58daecc591eb..c55870ac907eb 100644 +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig +@@ -2716,8 +2716,7 @@ config OLPC + + config OLPC_XO1_PM + bool "OLPC XO-1 Power Management" +- depends on OLPC && MFD_CS5535 && PM_SLEEP +- select MFD_CORE ++ depends on OLPC && MFD_CS5535=y && PM_SLEEP + ---help--- + Add support for poweroff and suspend of the OLPC XO-1 laptop. + +-- +2.20.1 + diff --git a/queue-4.14/xfrm-use-correct-size-to-initialise-sp-ovec.patch b/queue-4.14/xfrm-use-correct-size-to-initialise-sp-ovec.patch new file mode 100644 index 00000000000..44f5ac54853 --- /dev/null +++ b/queue-4.14/xfrm-use-correct-size-to-initialise-sp-ovec.patch @@ -0,0 +1,38 @@ +From 26c450dcf15d37d606308f11e20194f6990284b1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 7 Oct 2018 10:22:42 +0800 +Subject: xfrm: use correct size to initialise sp->ovec + +From: Li RongQing + +[ Upstream commit f1193e915748291fb205a908db33bd3debece6e2 ] + +This place should want to initialize array, not a element, +so it should be sizeof(array) instead of sizeof(element) + +but now this array only has one element, so no error in +this condition that XFRM_MAX_OFFLOAD_DEPTH is 1 + +Signed-off-by: Li RongQing +Signed-off-by: Steffen Klassert +Signed-off-by: Sasha Levin +--- + net/xfrm/xfrm_input.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c +index 06dec32503bd6..fc0a9ce1be18f 100644 +--- a/net/xfrm/xfrm_input.c ++++ b/net/xfrm/xfrm_input.c +@@ -130,7 +130,7 @@ struct sec_path *secpath_dup(struct sec_path *src) + sp->len = 0; + sp->olen = 0; + +- memset(sp->ovec, 0, sizeof(sp->ovec[XFRM_MAX_OFFLOAD_DEPTH])); ++ memset(sp->ovec, 0, sizeof(sp->ovec)); + + if (src) { + int i; +-- +2.20.1 +