From: Greg Kroah-Hartman Date: Mon, 19 Mar 2018 09:08:52 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v4.15.12~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a41fa603f0738b8415906a2cfce57124363505c0;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: agp-intel-flush-all-chipset-writes-after-updating-the-ggtt.patch alsa-firewire-digi00x-handle-all-midi-messages-on-streaming-packets.patch apparmor-make-path_max-parameter-readonly.patch arm-dra7-hwmod_data-prevent-wait_target_disable-error-for-usb_otg_ss.patch arm-dts-adjust-moxart-irq-controller-and-flags.patch arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch arm-dts-exynos-correct-trats2-panel-reset-line.patch arm-dts-koelsch-correct-clock-frequency-of-x2-du-clock-input.patch arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch arm-dts-r8a7790-correct-parent-of-ssi-clocks.patch arm-dts-r8a7791-correct-parent-of-ssi-clocks.patch asoc-nuc900-fix-a-loop-timeout-test.patch asoc-rcar-ssi-don-t-set-ssicr.ckdv-000-with-ssiwsr.cont.patch ath10k-disallow-dfs-simulation-if-dfs-channel-is-not-enabled.patch ath10k-fix-a-warning-during-channel-switch-with-multiple-vaps.patch ath10k-fix-invalid-sts_cap_offset_mask.patch ath10k-update-tdls-teardown-state-to-target.patch batman-adv-handle-race-condition-for-claims-between-gateways.patch blk-throttle-make-sure-expire-time-isn-t-too-big.patch bonding-refine-bond_fold_stats-wrap-detection.patch braille-console-fix-value-returned-by-_braille_console_setup.patch clk-qcom-msm8916-fix-mnd_width-for-codec_digcodec.patch coresight-fixes-coresight-dt-parse-to-get-correct-output-port-id.patch cpufreq-fix-governor-module-removal-race.patch dmaengine-imx-sdma-add-1ms-delay-to-ensure-sdma-channel-is-stopped.patch driver-adm1275-set-the-m-b-and-r-coefficients-correctly-for-power.patch drivers-net-xgene-fix-hardware-checksum-setting.patch drivers-perf-arm_pmu-handle-no-platform_device.patch drm-amdgpu-fail-fb-creation-from-imported-dma-bufs.-v2.patch drm-amdkfd-fix-memory-leaks-in-kfd-topology.patch drm-defer-disabling-the-vblank-irq-until-the-next-interrupt-for-instant-off.patch drm-edid-set-eld-connector-type-in-drm_edid_to_eld.patch drm-qxl-don-t-alloc-fbdev-if-emulation-is-not-supported.patch drm-radeon-fail-fb-creation-from-imported-dma-bufs.patch drm-vmwgfx-fixes-to-vmwgfx_fb.patch f2fs-relax-node-version-check-for-victim-data-in-gc.patch fm10k-correctly-check-if-interface-is-removed.patch hid-clamp-input-to-logical-range-if-no-null-state.patch hid-elo-clear-btn_left-mapping.patch hid-reject-input-outside-logical-range-only-if-null-state-is-set.patch i40e-acquire-nvm-lock-before-reads-on-all-devices.patch i40e-fix-ethtool-to-get-eeprom-data-from-x722-interface.patch ima-relax-requiring-a-file-signature-for-new-files-with-zero-length.patch input-qt1070-add-of-device-id-table.patch input-tsc2007-check-for-presence-and-power-down-tsc2007-during-probe.patch iommu-iova-fix-underflow-bug-in-__alloc_and_insert_iova_range.patch ipvlan-add-l2-check-for-packets-arriving-via-virtual-devices.patch kprobes-x86-fix-kprobe-booster-not-to-boost-far-call-instructions.patch kprobes-x86-set-kprobes-pages-read-only.patch mac80211-remove-bug-when-interface-type-is-invalid.patch mac80211_hwsim-enforce-ps_manual_poll-to-be-set-after-ps_enabled.patch md-raid6-fix-anomily-when-recovering-a-single-device-in-raid6.patch media-cpia2-fix-a-couple-off-by-one-bugs.patch media-i2c-soc_camera-fix-ov6650-sensor-getting-wrong-clock.patch mips-bpf-fix-multiple-problems-in-jit-skb-access-helpers.patch mips-bpf-quit-clobbering-callee-saved-registers-in-jit-code.patch mips-r2-on-r6-emu-clear-bltzall-and-bgezall-debugfs-counters.patch mips-r2-on-r6-emu-fix-blezl-and-bgtzl-identification.patch mm-fix-false-positive-vm_bug_on-in-page_cache_-get-add-_speculative.patch mtd-nand-fix-interpretation-of-nand_cmd_none-in-nand_command.patch mtd-nand-ifc-update-bufnum-mask-for-ver-2.0.0.patch net-8021q-create-device-with-all-possible-features-in-wanted_features.patch net-faraday-add-missing-include-of-of.h.patch net-mvpp2-set-dma-mask-and-coherent-dma-mask-on-ppv2.2.patch net-xfrm-allow-clearing-socket-xfrm-policies.patch nfc-nfcmrvl-double-free-on-error-path.patch nfc-nfcmrvl-include-unaligned.h-instead-of-access_ok.h.patch of-fix-of_device_get_modalias-returned-length-when-truncating-buffers.patch pci-msi-stop-disabling-msi-msi-x-in-pci_device_shutdown.patch perf-inject-copy-events-when-reordering-events-in-pipe-mode.patch perf-probe-return-errno-when-not-hitting-any-event.patch perf-session-don-t-rely-on-evlist-in-pipe-mode.patch perf-sort-fix-segfault-with-basic-block-cycles-sort-dimension.patch perf-tools-make-perf_event__synthesize_mmap_events-scale.patch powerpc-avoid-taking-a-data-miss-on-every-userspace-instruction-miss.patch powerpc-mm-hugetlb-filter-out-hugepage-size-not-supported-by-page-table-layout.patch pwm-tegra-increase-precision-in-pwm-rate-calculation.patch rcutorture-configinit-fix-build-directory-error-message.patch regulator-isl9305-fix-array-size.patch reiserfs-make-cancel_old_flush-reliable.patch sched-act_csum-don-t-mangle-tcp-and-udp-gso-packets.patch sched-stop-resched_cpu-from-sending-ipis-to-offline-cpus.patch sched-stop-switched_to_rt-from-sending-ipis-to-offline-cpus.patch scsi-core-scsi_get_device_flags_keyed-always-return-device-flags.patch scsi-devinfo-apply-to-hp-xp-the-same-flags-as-hitachi-vsp.patch scsi-dh-add-new-rdac-devices.patch scsi-ipr-fix-missed-eh-wakeup.patch scsi-ses-don-t-get-power-status-of-ses-device-slot-on-probe.patch scsi-sg-check-for-valid-direction-before-starting-the-request.patch scsi-sg-close-race-condition-in-sg_remove_sfp_usercontext.patch selinux-check-for-address-length-in-selinux_socket_bind.patch solo6x10-release-vb2-buffers-in-solo_stop_streaming.patch spi-omap2-mcspi-poll-omap2_mcspi_chstat_rxs-for-pio-transfer.patch spi-sun6i-disable-unprepare-clocks-on-remove.patch staging-speakup-replace-bug_on-with-warn_on.patch staging-wilc1000-add-check-for-kmalloc-allocation-failure.patch sysrq-reset-the-watchdog-timers-while-displaying-high-resolution-timers.patch tcp-sysctl-fix-a-race-to-avoid-unexpected-0-window-from-space.patch test_firmware-fix-setting-old-custom-fw-path-back-on-exit.patch timers-sched_clock-update-timeout-for-clock-wrap.patch tools-usbip-fixes-build-with-musl-libc-toolchain.patch usb-dwc2-make-sure-we-disconnect-the-gadget-state.patch usb-gadget-dummy_hcd-fix-wrong-power-status-bit-clear-reset-in-dummy_hub_control.patch veth-set-peer-gso-values.patch video-arm-clcd-fix-dma-allocation-size.patch video-hdmi-allow-empty-hdmi-infoframes.patch vxlan-vxlan-dev-should-inherit-lowerdev-s-gso_max_size.patch wil6210-fix-memory-access-violation-in-wil_memcpy_from-toio_32.patch --- diff --git a/queue-4.4/agp-intel-flush-all-chipset-writes-after-updating-the-ggtt.patch b/queue-4.4/agp-intel-flush-all-chipset-writes-after-updating-the-ggtt.patch new file mode 100644 index 00000000000..9ac24fb69ac --- /dev/null +++ b/queue-4.4/agp-intel-flush-all-chipset-writes-after-updating-the-ggtt.patch @@ -0,0 +1,46 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Chris Wilson +Date: Fri, 8 Dec 2017 21:46:16 +0000 +Subject: agp/intel: Flush all chipset writes after updating the GGTT + +From: Chris Wilson + + +[ Upstream commit 8516673a996870ea0ceb337ee4f83c33c5ec3111 ] + +Before accessing the GGTT we must flush the PTE writes and make them +visible to the chipset, or else the indirect access may end up in the +wrong page. In commit 3497971a71d8 ("agp/intel: Flush chipset writes +after updating a single PTE"), we noticed corruption of the uploads for +pwrite and for capturing GPU error states, but it was presumed that the +explicit calls to intel_gtt_chipset_flush() were sufficient for the +execbuffer path. However, we have not been flushing the chipset between +the PTE writes and access via the GTT itself. + +For simplicity, do the flush after any PTE update rather than try and +batch the flushes on a just-in-time basis. + +References: 3497971a71d8 ("agp/intel: Flush chipset writes after updating a single PTE") +Signed-off-by: Chris Wilson +Cc: Tvrtko Ursulin +Cc: Mika Kuoppala +Cc: drm-intel-fixes@lists.freedesktop.org +Reviewed-by: Joonas Lahtinen +Link: https://patchwork.freedesktop.org/patch/msgid/20171208214616.30147-1-chris@chris-wilson.co.uk +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/char/agp/intel-gtt.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/char/agp/intel-gtt.c ++++ b/drivers/char/agp/intel-gtt.c +@@ -859,6 +859,8 @@ void intel_gtt_insert_sg_entries(struct + } + } + wmb(); ++ if (intel_private.driver->chipset_flush) ++ intel_private.driver->chipset_flush(); + } + EXPORT_SYMBOL(intel_gtt_insert_sg_entries); + diff --git a/queue-4.4/alsa-firewire-digi00x-handle-all-midi-messages-on-streaming-packets.patch b/queue-4.4/alsa-firewire-digi00x-handle-all-midi-messages-on-streaming-packets.patch new file mode 100644 index 00000000000..f43d49e67a2 --- /dev/null +++ b/queue-4.4/alsa-firewire-digi00x-handle-all-midi-messages-on-streaming-packets.patch @@ -0,0 +1,148 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Takashi Sakamoto +Date: Sun, 2 Apr 2017 23:48:25 +0900 +Subject: ALSA: firewire-digi00x: handle all MIDI messages on streaming packets + +From: Takashi Sakamoto + + +[ Upstream commit 8820a4cf0cb4cd5c6540a9a18b2cedbdfd5a6891 ] + +At a commit 9dc5d31cdceb ("ALSA: firewire-digi00x: handle MIDI messages in +isochronous packets"), a functionality to handle MIDI messages on +isochronous packet was supported. But this includes some of my +misunderstanding. This commit is to fix them. + +For digi00x series, first data channel of data blocks in rx/tx packet +includes MIDI messages. The data channel has 0x80 in 8 bit of its MSB, +however it's against IEC 61883-6. Unique data format is applied: + - Upper 4 bits of LSB represent port number. + - 0x0: port 1. + - 0x2: port 2. + - 0xe: console port. + - Lower 4 bits of LSB represent the number of included MIDI message bytes; + 0x0/0x1/0x2. + - Two bytes of middle of this data channel have MIDI bytes. + +Especially, MIDI messages from/to console surface are also transferred by +isochronous packets, as well as physical MIDI ports. + +Signed-off-by: Takashi Sakamoto +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + sound/firewire/digi00x/amdtp-dot.c | 53 +++++++++++++++++++++++++------------ + 1 file changed, 36 insertions(+), 17 deletions(-) + +--- a/sound/firewire/digi00x/amdtp-dot.c ++++ b/sound/firewire/digi00x/amdtp-dot.c +@@ -28,6 +28,9 @@ + */ + #define MAX_MIDI_RX_BLOCKS 8 + ++/* 3 = MAX(DOT_MIDI_IN_PORTS, DOT_MIDI_OUT_PORTS) + 1. */ ++#define MAX_MIDI_PORTS 3 ++ + /* + * The double-oh-three algorithm was discovered by Robin Gareus and Damien + * Zammit in 2012, with reverse-engineering for Digi 003 Rack. +@@ -42,10 +45,8 @@ struct amdtp_dot { + unsigned int pcm_channels; + struct dot_state state; + +- unsigned int midi_ports; +- /* 2 = MAX(DOT_MIDI_IN_PORTS, DOT_MIDI_OUT_PORTS) */ +- struct snd_rawmidi_substream *midi[2]; +- int midi_fifo_used[2]; ++ struct snd_rawmidi_substream *midi[MAX_MIDI_PORTS]; ++ int midi_fifo_used[MAX_MIDI_PORTS]; + int midi_fifo_limit; + + void (*transfer_samples)(struct amdtp_stream *s, +@@ -124,8 +125,8 @@ int amdtp_dot_set_parameters(struct amdt + return -EBUSY; + + /* +- * A first data channel is for MIDI conformant data channel, the rest is +- * Multi Bit Linear Audio data channel. ++ * A first data channel is for MIDI messages, the rest is Multi Bit ++ * Linear Audio data channel. + */ + err = amdtp_stream_set_parameters(s, rate, pcm_channels + 1); + if (err < 0) +@@ -135,11 +136,6 @@ int amdtp_dot_set_parameters(struct amdt + + p->pcm_channels = pcm_channels; + +- if (s->direction == AMDTP_IN_STREAM) +- p->midi_ports = DOT_MIDI_IN_PORTS; +- else +- p->midi_ports = DOT_MIDI_OUT_PORTS; +- + /* + * We do not know the actual MIDI FIFO size of most devices. Just + * assume two bytes, i.e., one byte can be received over the bus while +@@ -281,13 +277,25 @@ static void write_midi_messages(struct a + b = (u8 *)&buffer[0]; + + len = 0; +- if (port < p->midi_ports && ++ if (port < MAX_MIDI_PORTS && + midi_ratelimit_per_packet(s, port) && + p->midi[port] != NULL) + len = snd_rawmidi_transmit(p->midi[port], b + 1, 2); + + if (len > 0) { +- b[3] = (0x10 << port) | len; ++ /* ++ * Upper 4 bits of LSB represent port number. ++ * - 0000b: physical MIDI port 1. ++ * - 0010b: physical MIDI port 2. ++ * - 1110b: console MIDI port. ++ */ ++ if (port == 2) ++ b[3] = 0xe0; ++ else if (port == 1) ++ b[3] = 0x20; ++ else ++ b[3] = 0x00; ++ b[3] |= len; + midi_use_bytes(s, port, len); + } else { + b[1] = 0; +@@ -309,11 +317,22 @@ static void read_midi_messages(struct am + + for (f = 0; f < data_blocks; f++) { + b = (u8 *)&buffer[0]; +- port = b[3] >> 4; ++ + len = b[3] & 0x0f; ++ if (len > 0) { ++ /* ++ * Upper 4 bits of LSB represent port number. ++ * - 0000b: physical MIDI port 1. Use port 0. ++ * - 1110b: console MIDI port. Use port 2. ++ */ ++ if (b[3] >> 4 > 0) ++ port = 2; ++ else ++ port = 0; + +- if (port < p->midi_ports && p->midi[port] && len > 0) +- snd_rawmidi_receive(p->midi[port], b + 1, len); ++ if (port < MAX_MIDI_PORTS && p->midi[port]) ++ snd_rawmidi_receive(p->midi[port], b + 1, len); ++ } + + buffer += s->data_block_quadlets; + } +@@ -364,7 +383,7 @@ void amdtp_dot_midi_trigger(struct amdtp + { + struct amdtp_dot *p = s->protocol; + +- if (port < p->midi_ports) ++ if (port < MAX_MIDI_PORTS) + ACCESS_ONCE(p->midi[port]) = midi; + } + diff --git a/queue-4.4/apparmor-make-path_max-parameter-readonly.patch b/queue-4.4/apparmor-make-path_max-parameter-readonly.patch new file mode 100644 index 00000000000..f993f257f35 --- /dev/null +++ b/queue-4.4/apparmor-make-path_max-parameter-readonly.patch @@ -0,0 +1,83 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: John Johansen +Date: Thu, 6 Apr 2017 06:55:24 -0700 +Subject: apparmor: Make path_max parameter readonly + +From: John Johansen + + +[ Upstream commit 622f6e3265707ebf02ba776ac6e68003bcc31213 ] + +The path_max parameter determines the max size of buffers allocated +but it should not be setable at run time. If can be used to cause an +oops + +root@ubuntu:~# echo 16777216 > /sys/module/apparmor/parameters/path_max +root@ubuntu:~# cat /sys/module/apparmor/parameters/path_max +Killed + +[ 122.141911] BUG: unable to handle kernel paging request at ffff880080945fff +[ 122.143497] IP: [] d_absolute_path+0x44/0xa0 +[ 122.144742] PGD 220c067 PUD 0 +[ 122.145453] Oops: 0002 [#1] SMP +[ 122.146204] Modules linked in: vmw_vsock_vmci_transport vsock ppdev vmw_balloon snd_ens1371 btusb snd_ac97_codec gameport snd_rawmidi btrtl snd_seq_device ac97_bus btbcm btintel snd_pcm input_leds bluetooth snd_timer snd joydev soundcore serio_raw coretemp shpchp nfit parport_pc i2c_piix4 8250_fintek vmw_vmci parport mac_hid ib_iser rdma_cm iw_cm ib_cm ib_sa ib_mad ib_core ib_addr iscsi_tcp libiscsi_tcp libiscsi scsi_transport_iscsi autofs4 btrfs raid10 raid456 async_raid6_recov async_memcpy async_pq async_xor async_tx xor raid6_pq libcrc32c raid1 raid0 multipath linear hid_generic usbhid hid crct10dif_pclmul crc32_pclmul ghash_clmulni_intel aesni_intel aes_x86_64 lrw gf128mul glue_helper ablk_helper cryptd vmwgfx psmouse mptspi ttm mptscsih drm_kms_helper mptbase syscopyarea scsi_transport_spi sysfillrect +[ 122.163365] ahci sysimgblt e1000 fb_sys_fops libahci drm pata_acpi fjes +[ 122.164747] CPU: 3 PID: 1501 Comm: bash Not tainted 4.4.0-59-generic #80-Ubuntu +[ 122.166250] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 07/02/2015 +[ 122.168611] task: ffff88003496aa00 ti: ffff880076474000 task.ti: ffff880076474000 +[ 122.170018] RIP: 0010:[] [] d_absolute_path+0x44/0xa0 +[ 122.171525] RSP: 0018:ffff880076477b90 EFLAGS: 00010206 +[ 122.172462] RAX: ffff880080945fff RBX: 0000000000000000 RCX: 0000000001000000 +[ 122.173709] RDX: 0000000000ffffff RSI: ffff880080946000 RDI: ffff8800348a1010 +[ 122.174978] RBP: ffff880076477bb8 R08: ffff880076477c80 R09: 0000000000000000 +[ 122.176227] R10: 00007ffffffff000 R11: ffff88007f946000 R12: ffff88007f946000 +[ 122.177496] R13: ffff880076477c80 R14: ffff8800348a1010 R15: ffff8800348a2400 +[ 122.178745] FS: 00007fd459eb4700(0000) GS:ffff88007b6c0000(0000) knlGS:0000000000000000 +[ 122.180176] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ 122.181186] CR2: ffff880080945fff CR3: 0000000073422000 CR4: 00000000001406e0 +[ 122.182469] Stack: +[ 122.182843] 00ffffff00000001 ffff880080946000 0000000000000000 0000000000000000 +[ 122.184409] 00000000570f789c ffff880076477c30 ffffffff81385671 ffff88007a2e7a58 +[ 122.185810] 0000000000000000 ffff880076477c88 01000000008a1000 0000000000000000 +[ 122.187231] Call Trace: +[ 122.187680] [] aa_path_name+0x81/0x370 +[ 122.188637] [] profile_transition+0xbd/0xb80 +[ 122.190181] [] ? zone_statistics+0x7c/0xa0 +[ 122.191674] [] apparmor_bprm_set_creds+0x9b0/0xac0 +[ 122.193288] [] ? ext4_xattr_get+0x81/0x220 +[ 122.194793] [] ? ext4_xattr_security_get+0x1c/0x30 +[ 122.196392] [] ? get_vfs_caps_from_disk+0x69/0x110 +[ 122.198004] [] ? mnt_may_suid+0x3f/0x50 +[ 122.199737] [] ? cap_bprm_set_creds+0xa3/0x600 +[ 122.201377] [] security_bprm_set_creds+0x33/0x50 +[ 122.203024] [] prepare_binprm+0x85/0x190 +[ 122.204515] [] do_execveat_common.isra.33+0x485/0x710 +[ 122.206200] [] SyS_execve+0x3a/0x50 +[ 122.207615] [] stub_execve+0x5/0x5 +[ 122.208978] [] ? entry_SYSCALL_64_fastpath+0x16/0x71 +[ 122.210615] Code: f8 31 c0 48 63 c2 83 ea 01 48 c7 45 e8 00 00 00 00 48 01 c6 85 d2 48 c7 45 f0 00 00 00 00 48 89 75 e0 89 55 dc 78 0c 48 8d 46 ff 46 ff 00 48 89 45 e0 48 8d 55 e0 48 8d 4d dc 48 8d 75 e8 e8 +[ 122.217320] RIP [] d_absolute_path+0x44/0xa0 +[ 122.218860] RSP +[ 122.219919] CR2: ffff880080945fff +[ 122.220936] ---[ end trace 506cdbd85eb6c55e ]--- + +Reported-by: Tetsuo Handa +Signed-off-by: John Johansen +Signed-off-by: James Morris +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + security/apparmor/lsm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/security/apparmor/lsm.c ++++ b/security/apparmor/lsm.c +@@ -722,7 +722,7 @@ module_param_named(logsyscall, aa_g_logs + + /* Maximum pathname length before accesses will start getting rejected */ + unsigned int aa_g_path_max = 2 * PATH_MAX; +-module_param_named(path_max, aa_g_path_max, aauint, S_IRUSR | S_IWUSR); ++module_param_named(path_max, aa_g_path_max, aauint, S_IRUSR); + + /* Determines how paranoid loading of policy is and how much verification + * on the loaded policy is done. diff --git a/queue-4.4/arm-dra7-hwmod_data-prevent-wait_target_disable-error-for-usb_otg_ss.patch b/queue-4.4/arm-dra7-hwmod_data-prevent-wait_target_disable-error-for-usb_otg_ss.patch new file mode 100644 index 00000000000..490c46cfe6e --- /dev/null +++ b/queue-4.4/arm-dra7-hwmod_data-prevent-wait_target_disable-error-for-usb_otg_ss.patch @@ -0,0 +1,47 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Roger Quadros +Date: Mon, 13 Mar 2017 13:53:16 +0200 +Subject: ARM: DRA7: hwmod_data: Prevent wait_target_disable error for usb_otg_ss + +From: Roger Quadros + + +[ Upstream commit e2d54fe76997301b49311bde7ba8ef52b47896f9 ] + +It seems that if L3_INIT clkdomain is kept in HW_AUTO while usb_otg_ss +is in use then there are random chances that the usb_otg_ss module +will fail to completely idle. i.e. IDLEST = 0x2 instead of 0x3. + +Preventing L3_INIT from HW_AUTO while usb_otg_ss module is in use +fixes this issue. + +We don't know yet if usb_otg_ss instances 3 and 4 are affected by this +issue or not so don't add this flag for those instances. + +Cc: Tero Kristo +Signed-off-by: Roger Quadros +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c ++++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c +@@ -2240,6 +2240,7 @@ static struct omap_hwmod dra7xx_usb_otg_ + .class = &dra7xx_usb_otg_ss_hwmod_class, + .clkdm_name = "l3init_clkdm", + .main_clk = "dpll_core_h13x2_ck", ++ .flags = HWMOD_CLKDM_NOAUTO, + .prcm = { + .omap4 = { + .clkctrl_offs = DRA7XX_CM_L3INIT_USB_OTG_SS1_CLKCTRL_OFFSET, +@@ -2261,6 +2262,7 @@ static struct omap_hwmod dra7xx_usb_otg_ + .class = &dra7xx_usb_otg_ss_hwmod_class, + .clkdm_name = "l3init_clkdm", + .main_clk = "dpll_core_h13x2_ck", ++ .flags = HWMOD_CLKDM_NOAUTO, + .prcm = { + .omap4 = { + .clkctrl_offs = DRA7XX_CM_L3INIT_USB_OTG_SS2_CLKCTRL_OFFSET, diff --git a/queue-4.4/arm-dts-adjust-moxart-irq-controller-and-flags.patch b/queue-4.4/arm-dts-adjust-moxart-irq-controller-and-flags.patch new file mode 100644 index 00000000000..ab0b94af62f --- /dev/null +++ b/queue-4.4/arm-dts-adjust-moxart-irq-controller-and-flags.patch @@ -0,0 +1,119 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Linus Walleij +Date: Sat, 18 Mar 2017 17:40:01 +0100 +Subject: ARM: dts: Adjust moxart IRQ controller and flags + +From: Linus Walleij + + +[ Upstream commit c2a736b698008d296c5010ec39077eeb5796109f ] + +The moxart interrupt line flags were not respected in previous +driver: instead of assigning them per-consumer, a fixes mask +was set in the controller. + +With the migration to a standard Faraday driver we need to +set up and handle the consumer flags correctly. Also remove +the Moxart-specific flags when switching to using real consumer +flags. + +Extend the register window to 0x100 bytes as we may have a few +more registers in there and it doesn't hurt. + +Tested-by: Jonas Jensen +Signed-off-by: Jonas Jensen +Signed-off-by: Linus Walleij +Signed-off-by: Olof Johansson +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/boot/dts/moxart-uc7112lx.dts | 2 +- + arch/arm/boot/dts/moxart.dtsi | 17 +++++++++-------- + 2 files changed, 10 insertions(+), 9 deletions(-) + +--- a/arch/arm/boot/dts/moxart-uc7112lx.dts ++++ b/arch/arm/boot/dts/moxart-uc7112lx.dts +@@ -6,7 +6,7 @@ + */ + + /dts-v1/; +-/include/ "moxart.dtsi" ++#include "moxart.dtsi" + + / { + model = "MOXA UC-7112-LX"; +--- a/arch/arm/boot/dts/moxart.dtsi ++++ b/arch/arm/boot/dts/moxart.dtsi +@@ -6,6 +6,7 @@ + */ + + /include/ "skeleton.dtsi" ++#include + + / { + compatible = "moxa,moxart"; +@@ -36,8 +37,8 @@ + ranges; + + intc: interrupt-controller@98800000 { +- compatible = "moxa,moxart-ic"; +- reg = <0x98800000 0x38>; ++ compatible = "moxa,moxart-ic", "faraday,ftintc010"; ++ reg = <0x98800000 0x100>; + interrupt-controller; + #interrupt-cells = <2>; + interrupt-mask = <0x00080000>; +@@ -59,7 +60,7 @@ + timer: timer@98400000 { + compatible = "moxa,moxart-timer"; + reg = <0x98400000 0x42>; +- interrupts = <19 1>; ++ interrupts = <19 IRQ_TYPE_EDGE_FALLING>; + clocks = <&clk_apb>; + }; + +@@ -80,7 +81,7 @@ + dma: dma@90500000 { + compatible = "moxa,moxart-dma"; + reg = <0x90500080 0x40>; +- interrupts = <24 0>; ++ interrupts = <24 IRQ_TYPE_LEVEL_HIGH>; + #dma-cells = <1>; + }; + +@@ -93,7 +94,7 @@ + sdhci: sdhci@98e00000 { + compatible = "moxa,moxart-sdhci"; + reg = <0x98e00000 0x5C>; +- interrupts = <5 0>; ++ interrupts = <5 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk_apb>; + dmas = <&dma 5>, + <&dma 5>; +@@ -120,7 +121,7 @@ + mac0: mac@90900000 { + compatible = "moxa,moxart-mac"; + reg = <0x90900000 0x90>; +- interrupts = <25 0>; ++ interrupts = <25 IRQ_TYPE_LEVEL_HIGH>; + phy-handle = <ðphy0>; + phy-mode = "mii"; + status = "disabled"; +@@ -129,7 +130,7 @@ + mac1: mac@92000000 { + compatible = "moxa,moxart-mac"; + reg = <0x92000000 0x90>; +- interrupts = <27 0>; ++ interrupts = <27 IRQ_TYPE_LEVEL_HIGH>; + phy-handle = <ðphy1>; + phy-mode = "mii"; + status = "disabled"; +@@ -138,7 +139,7 @@ + uart0: uart@98200000 { + compatible = "ns16550a"; + reg = <0x98200000 0x20>; +- interrupts = <31 8>; ++ interrupts = <31 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <2>; + reg-io-width = <4>; + clock-frequency = <14745600>; diff --git a/queue-4.4/arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch b/queue-4.4/arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch new file mode 100644 index 00000000000..6f0572c117b --- /dev/null +++ b/queue-4.4/arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch @@ -0,0 +1,34 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: "Andrew F. Davis" +Date: Wed, 29 Nov 2017 11:13:56 -0600 +Subject: ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin + +From: "Andrew F. Davis" + + +[ Upstream commit e153db03c6b7a035c797bcdf35262586f003ee93 ] + +The correct DT property for specifying a GPIO used for reset +is "reset-gpios", fix this here. + +Fixes: 4341881d0562 ("ARM: dts: Add devicetree for Gumstix Pepper board") + +Signed-off-by: Andrew F. Davis +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/boot/dts/am335x-pepper.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/am335x-pepper.dts ++++ b/arch/arm/boot/dts/am335x-pepper.dts +@@ -139,7 +139,7 @@ + &audio_codec { + status = "okay"; + +- gpio-reset = <&gpio1 16 GPIO_ACTIVE_LOW>; ++ reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; + AVDD-supply = <&ldo3_reg>; + IOVDD-supply = <&ldo3_reg>; + DRVDD-supply = <&ldo3_reg>; diff --git a/queue-4.4/arm-dts-exynos-correct-trats2-panel-reset-line.patch b/queue-4.4/arm-dts-exynos-correct-trats2-panel-reset-line.patch new file mode 100644 index 00000000000..d049cfa1fe8 --- /dev/null +++ b/queue-4.4/arm-dts-exynos-correct-trats2-panel-reset-line.patch @@ -0,0 +1,35 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Simon Shields +Date: Tue, 21 Nov 2017 22:24:24 +1100 +Subject: ARM: dts: exynos: Correct Trats2 panel reset line + +From: Simon Shields + + +[ Upstream commit 1b377924841df1e13ab5b225be3a83f807a92b52 ] + +Trats2 uses gpf2-1 as the panel reset GPIO. gpy4-5 was only used +on early revisions of the board. + +Fixes: 420ae8451a22 ("ARM: dts: exynos4412-trats2: add panel node") +Signed-off-by: Simon Shields +Acked-by: Marek Szyprowski +Tested-by: Marek Szyprowski +Signed-off-by: Krzysztof Kozlowski +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/boot/dts/exynos4412-trats2.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/exynos4412-trats2.dts ++++ b/arch/arm/boot/dts/exynos4412-trats2.dts +@@ -359,7 +359,7 @@ + reg = <0>; + vdd3-supply = <&lcd_vdd3_reg>; + vci-supply = <&ldo25_reg>; +- reset-gpios = <&gpy4 5 GPIO_ACTIVE_HIGH>; ++ reset-gpios = <&gpf2 1 GPIO_ACTIVE_HIGH>; + power-on-delay= <50>; + reset-delay = <100>; + init-delay = <100>; diff --git a/queue-4.4/arm-dts-koelsch-correct-clock-frequency-of-x2-du-clock-input.patch b/queue-4.4/arm-dts-koelsch-correct-clock-frequency-of-x2-du-clock-input.patch new file mode 100644 index 00000000000..f3f2bae5de8 --- /dev/null +++ b/queue-4.4/arm-dts-koelsch-correct-clock-frequency-of-x2-du-clock-input.patch @@ -0,0 +1,35 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Geert Uytterhoeven +Date: Mon, 3 Apr 2017 11:55:19 +0200 +Subject: ARM: dts: koelsch: Correct clock frequency of X2 DU clock input + +From: Geert Uytterhoeven + + +[ Upstream commit ebf06af55c7594ed1fc18469a5cddf911c40e687 ] + +The X2 crystal oscillator on the Koelsch development board provides a +74.25 MHz clock, not a 148.5 MHz clock. + +Fixes: cd21cb46e14aae3a ("ARM: shmobile: koelsch: Add DU external pixel clocks to DT") +Signed-off-by: Geert Uytterhoeven +Acked-by: Laurent Pinchart +Tested-by: Niklas Söderlund +Signed-off-by: Simon Horman +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/r8a7791-koelsch.dts ++++ b/arch/arm/boot/dts/r8a7791-koelsch.dts +@@ -280,7 +280,7 @@ + x2_clk: x2-clock { + compatible = "fixed-clock"; + #clock-cells = <0>; +- clock-frequency = <148500000>; ++ clock-frequency = <74250000>; + }; + + x13_clk: x13-clock { diff --git a/queue-4.4/arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch b/queue-4.4/arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch new file mode 100644 index 00000000000..242f464f4a2 --- /dev/null +++ b/queue-4.4/arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch @@ -0,0 +1,43 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: "Andrew F. Davis" +Date: Wed, 29 Nov 2017 11:13:59 -0600 +Subject: ARM: dts: omap3-n900: Fix the audio CODEC's reset pin + +From: "Andrew F. Davis" + + +[ Upstream commit 7be4b5dc7ffa9499ac6ef33a5ffa9ff43f9b7057 ] + +The correct DT property for specifying a GPIO used for reset +is "reset-gpios", fix this here. + +Fixes: 14e3e295b2b9 ("ARM: dts: omap3-n900: Add TLV320AIC3X support") + +Signed-off-by: Andrew F. Davis +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/boot/dts/omap3-n900.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/arm/boot/dts/omap3-n900.dts ++++ b/arch/arm/boot/dts/omap3-n900.dts +@@ -488,7 +488,7 @@ + tlv320aic3x: tlv320aic3x@18 { + compatible = "ti,tlv320aic3x"; + reg = <0x18>; +- gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */ ++ reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */ + ai3x-gpio-func = < + 0 /* AIC3X_GPIO1_FUNC_DISABLED */ + 5 /* AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT */ +@@ -505,7 +505,7 @@ + tlv320aic3x_aux: tlv320aic3x@19 { + compatible = "ti,tlv320aic3x"; + reg = <0x19>; +- gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */ ++ reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */ + + AVDD-supply = <&vmmc2>; + DRVDD-supply = <&vmmc2>; diff --git a/queue-4.4/arm-dts-r8a7790-correct-parent-of-ssi-clocks.patch b/queue-4.4/arm-dts-r8a7790-correct-parent-of-ssi-clocks.patch new file mode 100644 index 00000000000..58224cce2d1 --- /dev/null +++ b/queue-4.4/arm-dts-r8a7790-correct-parent-of-ssi-clocks.patch @@ -0,0 +1,39 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Geert Uytterhoeven +Date: Mon, 3 Apr 2017 11:45:41 +0200 +Subject: ARM: dts: r8a7790: Correct parent of SSI[0-9] clocks + +From: Geert Uytterhoeven + + +[ Upstream commit d13d4e063d4a08eb1686e890e9183dde709871bf ] + +The SSI-ALL gate clock is located in between the P clock and the +individual SSI[0-9] clocks, hence the former should be listed as their +parent. + +Fixes: bcde372254386872 ("ARM: shmobile: r8a7790: add MSTP10 support on DTSI") +Signed-off-by: Geert Uytterhoeven +Signed-off-by: Simon Horman +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/boot/dts/r8a7790.dtsi | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/arch/arm/boot/dts/r8a7790.dtsi ++++ b/arch/arm/boot/dts/r8a7790.dtsi +@@ -1360,8 +1360,11 @@ + compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150998 0 4>, <0 0xe61509a8 0 4>; + clocks = <&p_clk>, +- <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, +- <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, ++ <&mstp10_clks R8A7790_CLK_SSI_ALL>, <&mstp10_clks R8A7790_CLK_SSI_ALL>, ++ <&mstp10_clks R8A7790_CLK_SSI_ALL>, <&mstp10_clks R8A7790_CLK_SSI_ALL>, ++ <&mstp10_clks R8A7790_CLK_SSI_ALL>, <&mstp10_clks R8A7790_CLK_SSI_ALL>, ++ <&mstp10_clks R8A7790_CLK_SSI_ALL>, <&mstp10_clks R8A7790_CLK_SSI_ALL>, ++ <&mstp10_clks R8A7790_CLK_SSI_ALL>, <&mstp10_clks R8A7790_CLK_SSI_ALL>, + <&p_clk>, + <&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>, + <&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>, diff --git a/queue-4.4/arm-dts-r8a7791-correct-parent-of-ssi-clocks.patch b/queue-4.4/arm-dts-r8a7791-correct-parent-of-ssi-clocks.patch new file mode 100644 index 00000000000..263840cffa1 --- /dev/null +++ b/queue-4.4/arm-dts-r8a7791-correct-parent-of-ssi-clocks.patch @@ -0,0 +1,39 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Geert Uytterhoeven +Date: Mon, 3 Apr 2017 11:45:42 +0200 +Subject: ARM: dts: r8a7791: Correct parent of SSI[0-9] clocks + +From: Geert Uytterhoeven + + +[ Upstream commit 16fe68dcab5702a024d85229ff7e98979cb701a5 ] + +The SSI-ALL gate clock is located in between the P clock and the +individual SSI[0-9] clocks, hence the former should be listed as their +parent. + +Fixes: ee9141522dcf13f8 ("ARM: shmobile: r8a7791: add MSTP10 support on DTSI") +Signed-off-by: Geert Uytterhoeven +Signed-off-by: Simon Horman +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/boot/dts/r8a7791.dtsi | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/arch/arm/boot/dts/r8a7791.dtsi ++++ b/arch/arm/boot/dts/r8a7791.dtsi +@@ -1374,8 +1374,11 @@ + compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; + reg = <0 0xe6150998 0 4>, <0 0xe61509a8 0 4>; + clocks = <&p_clk>, +- <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, +- <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, ++ <&mstp10_clks R8A7791_CLK_SSI_ALL>, <&mstp10_clks R8A7791_CLK_SSI_ALL>, ++ <&mstp10_clks R8A7791_CLK_SSI_ALL>, <&mstp10_clks R8A7791_CLK_SSI_ALL>, ++ <&mstp10_clks R8A7791_CLK_SSI_ALL>, <&mstp10_clks R8A7791_CLK_SSI_ALL>, ++ <&mstp10_clks R8A7791_CLK_SSI_ALL>, <&mstp10_clks R8A7791_CLK_SSI_ALL>, ++ <&mstp10_clks R8A7791_CLK_SSI_ALL>, <&mstp10_clks R8A7791_CLK_SSI_ALL>, + <&p_clk>, + <&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>, + <&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>, diff --git a/queue-4.4/asoc-nuc900-fix-a-loop-timeout-test.patch b/queue-4.4/asoc-nuc900-fix-a-loop-timeout-test.patch new file mode 100644 index 00000000000..ee79b6e237b --- /dev/null +++ b/queue-4.4/asoc-nuc900-fix-a-loop-timeout-test.patch @@ -0,0 +1,42 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Dan Carpenter +Date: Sat, 9 Dec 2017 14:52:28 +0300 +Subject: ASoC: nuc900: Fix a loop timeout test + +From: Dan Carpenter + + +[ Upstream commit 65a12b3aafed5fc59f4ce41b22b752b1729e6701 ] + +We should be finishing the loop with timeout set to zero but because +this is a post-op we finish with timeout == -1. + +Fixes: 1082e2703a2d ("ASoC: NUC900/audio: add nuc900 audio driver support") +Signed-off-by: Dan Carpenter +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + sound/soc/nuc900/nuc900-ac97.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sound/soc/nuc900/nuc900-ac97.c ++++ b/sound/soc/nuc900/nuc900-ac97.c +@@ -67,7 +67,7 @@ static unsigned short nuc900_ac97_read(s + + /* polling the AC_R_FINISH */ + while (!(AUDIO_READ(nuc900_audio->mmio + ACTL_ACCON) & AC_R_FINISH) +- && timeout--) ++ && --timeout) + mdelay(1); + + if (!timeout) { +@@ -121,7 +121,7 @@ static void nuc900_ac97_write(struct snd + + /* polling the AC_W_FINISH */ + while ((AUDIO_READ(nuc900_audio->mmio + ACTL_ACCON) & AC_W_FINISH) +- && timeout--) ++ && --timeout) + mdelay(1); + + if (!timeout) diff --git a/queue-4.4/asoc-rcar-ssi-don-t-set-ssicr.ckdv-000-with-ssiwsr.cont.patch b/queue-4.4/asoc-rcar-ssi-don-t-set-ssicr.ckdv-000-with-ssiwsr.cont.patch new file mode 100644 index 00000000000..ebe6fe87a49 --- /dev/null +++ b/queue-4.4/asoc-rcar-ssi-don-t-set-ssicr.ckdv-000-with-ssiwsr.cont.patch @@ -0,0 +1,43 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Kuninori Morimoto +Date: Wed, 22 Mar 2017 04:02:43 +0000 +Subject: ASoC: rcar: ssi: don't set SSICR.CKDV = 000 with SSIWSR.CONT + +From: Kuninori Morimoto + + +[ Upstream commit 6b8530cc056efd4a11b034ca5b1e9f7e9563f553 ] + +R-Car Datasheet is indicating "SSICR.CKDV = 000 is invalid when +SSIWSR.WS_MODE = 1 or SSIWSR.CONT = 1". +Current driver will set CONT, thus, we shouldn't use CKDV = 000. +This patch fixup it. + +Reported-by: Hiroyuki Yokoyama +Signed-off-by: Kuninori Morimoto +Tested-by: Hiroyuki Yokoyama +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + sound/soc/sh/rcar/ssi.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/sound/soc/sh/rcar/ssi.c ++++ b/sound/soc/sh/rcar/ssi.c +@@ -143,6 +143,15 @@ static int rsnd_ssi_master_clk_start(str + for (j = 0; j < ARRAY_SIZE(ssi_clk_mul_table); j++) { + + /* ++ * It will set SSIWSR.CONT here, but SSICR.CKDV = 000 ++ * with it is not allowed. (SSIWSR.WS_MODE with ++ * SSICR.CKDV = 000 is not allowed either). ++ * Skip it. See SSICR.CKDV ++ */ ++ if (j == 0) ++ continue; ++ ++ /* + * this driver is assuming that + * system word is 64fs (= 2 x 32bit) + * see rsnd_ssi_init() diff --git a/queue-4.4/ath10k-disallow-dfs-simulation-if-dfs-channel-is-not-enabled.patch b/queue-4.4/ath10k-disallow-dfs-simulation-if-dfs-channel-is-not-enabled.patch new file mode 100644 index 00000000000..ddc7e19c0b4 --- /dev/null +++ b/queue-4.4/ath10k-disallow-dfs-simulation-if-dfs-channel-is-not-enabled.patch @@ -0,0 +1,66 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Mohammed Shafi Shajakhan +Date: Wed, 22 Feb 2017 21:03:11 +0530 +Subject: ath10k: disallow DFS simulation if DFS channel is not enabled + +From: Mohammed Shafi Shajakhan + + +[ Upstream commit ca07baab0b1e627ae1d4a55d190fb1c9d32a3445 ] + +If DFS is not enabled in hostapd (ieee80211h=0) DFS channels shall +not be available for use even though the hardware may have the capability +to support DFS. With this configuration (DFS disabled in hostapd) trying to +bring up ath10k device in DFS channel for AP mode fails and trying to +simulate DFS in ath10k debugfs results in a warning in cfg80211 complaining +invalid channel and this should be avoided in the driver itself rather than +false propogating RADAR detection to mac80211/cfg80211. Fix this by +checking for the first vif 'is_started' state(should work for client mode +as well) as all the vifs shall be configured for the same channel + +sys/kernel/debug/ieee80211/phy1/ath10k# echo 1 > dfs_simulate_radar + +WARNING: at net/wireless/chan.c:265 cfg80211_radar_event+0x24/0x60 +Workqueue: phy0 ieee80211_dfs_radar_detected_work [mac80211] +[] (warn_slowpath_null) from +[] (cfg80211_radar_event+0x24/0x60 [cfg80211]) +[] (cfg80211_radar_event [cfg80211]) from +[] (ieee80211_dfs_radar_detected_work+0x94/0xa0 [mac80211]) +[] (ieee80211_dfs_radar_detected_work [mac80211]) from +[] (process_one_work+0x20c/0x32c) + +WARNING: at net/wireless/nl80211.c:2488 nl80211_get_mpath+0x13c/0x4cc + Workqueue: phy0 ieee80211_dfs_radar_detected_work [mac80211] +[] (warn_slowpath_null) from +[] (cfg80211_radar_event+0x24/0x60 [cfg80211]) +[] (cfg80211_radar_event [cfg80211]) from +[] (ieee80211_dfs_radar_detected_work+0x94/0xa0 [mac80211]) +[] (ieee80211_dfs_radar_detected_work [mac80211]) from +[] (process_one_work+0x20c/0x32c) + +Signed-off-by: Mohammed Shafi Shajakhan +Signed-off-by: Kalle Valo +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/ath/ath10k/debug.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/drivers/net/wireless/ath/ath10k/debug.c ++++ b/drivers/net/wireless/ath/ath10k/debug.c +@@ -1892,6 +1892,15 @@ static ssize_t ath10k_write_simulate_rad + size_t count, loff_t *ppos) + { + struct ath10k *ar = file->private_data; ++ struct ath10k_vif *arvif; ++ ++ /* Just check for for the first vif alone, as all the vifs will be ++ * sharing the same channel and if the channel is disabled, all the ++ * vifs will share the same 'is_started' state. ++ */ ++ arvif = list_first_entry(&ar->arvifs, typeof(*arvif), list); ++ if (!arvif->is_started) ++ return -EINVAL; + + ieee80211_radar_detected(ar->hw); + diff --git a/queue-4.4/ath10k-fix-a-warning-during-channel-switch-with-multiple-vaps.patch b/queue-4.4/ath10k-fix-a-warning-during-channel-switch-with-multiple-vaps.patch new file mode 100644 index 00000000000..44b0276cb4d --- /dev/null +++ b/queue-4.4/ath10k-fix-a-warning-during-channel-switch-with-multiple-vaps.patch @@ -0,0 +1,58 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Mohammed Shafi Shajakhan +Date: Wed, 8 Mar 2017 13:52:06 +0200 +Subject: ath10k: fix a warning during channel switch with multiple vaps + +From: Mohammed Shafi Shajakhan + + +[ Upstream commit c73f8c00330f59ce9b1ace9ff698aca83390d358 ] + +Doing a channel switch via hostapd_cli seems to update +the new channel context for each VAP's appropriately as below +in 'ath10k_mac_update_vif_chan', hence we can safely suppress the +warning that shows up during this operation and dump the warning only +if no vaps are available for channel switch + +hostapd_cli -i wlan0 chan_switch 5 5200 +OK + +ath10k_pci : mac chanctx switch n_vifs 3 mode 1 +ath10k_pci : mac chanctx switch vdev_id 2 freq 5180->5200 width 0->0 +ath10k_pci : mac chanctx switch vdev_id 1 freq 5180->5200 width 0->0 +ath10k_pci : mac chanctx switch vdev_id 0 freq 5180->5200 width 0->0 + +Call Trace: + +WARNING: backports-20161201-3.14.77-9ab3068/drivers/net/wireless/ath/ath10k/mac.c:7126 +[] (warn_slowpath_null) from [] +(ath10k_reconfig_complete+0xe4/0x25c [ath10k_core]) +[] (ath10k_reconfig_complete [ath10k_core]) +[] (ath10k_mac_vif_ap_csa_work+0x214/0x370 [ath10k_core]) +[] (ath10k_mac_op_change_chanctx+0x108/0x128 [ath10k_core]) +[] (ieee80211_recalc_chanctx_min_def+0x30c/0x430 [mac80211]) +[] (ieee80211_recalc_smps_chanctx+0x2ec/0x840 [mac80211]) +[] (ieee80211_vif_use_reserved_context+0x7c/0xf8 [mac80211]) +[] (ieee80211_vif_use_reserved_context [mac80211]) +[] (ieee80211_csa_finalize_work+0x5c/0x88 [mac80211]) + +Fixes: d7bf4b4aba05 ("ath10k: fix ar->rx_channel updating logic") +Signed-off-by: Mohammed Shafi Shajakhan +Signed-off-by: Kalle Valo +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/ath/ath10k/mac.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath/ath10k/mac.c ++++ b/drivers/net/wireless/ath/ath10k/mac.c +@@ -6427,7 +6427,7 @@ ath10k_mac_update_rx_channel(struct ath1 + lockdep_assert_held(&ar->data_lock); + + WARN_ON(ctx && vifs); +- WARN_ON(vifs && n_vifs != 1); ++ WARN_ON(vifs && !n_vifs); + + /* FIXME: Sort of an optimization and a workaround. Peers and vifs are + * on a linked list now. Doing a lookup peer -> vif -> chanctx for each diff --git a/queue-4.4/ath10k-fix-invalid-sts_cap_offset_mask.patch b/queue-4.4/ath10k-fix-invalid-sts_cap_offset_mask.patch new file mode 100644 index 00000000000..781a129a593 --- /dev/null +++ b/queue-4.4/ath10k-fix-invalid-sts_cap_offset_mask.patch @@ -0,0 +1,35 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Ben Greear +Date: Sat, 2 Dec 2017 16:50:49 +0200 +Subject: ath10k: fix invalid STS_CAP_OFFSET_MASK + +From: Ben Greear + + +[ Upstream commit 8cec57f5277ef0e354e37a0bf909dc71bc1f865b ] + +The 10.4 firmware defines this as a 3-bit field, as does the +mac80211 stack. The 4th bit is defined as CONF_IMPLICIT_BF +at least in the firmware header I have seen. This patch +fixes the ath10k wmi header to match the firmware. + +Signed-off-by: Ben Greear +Signed-off-by: Kalle Valo +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/ath/ath10k/wmi.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath/ath10k/wmi.h ++++ b/drivers/net/wireless/ath/ath10k/wmi.h +@@ -4826,7 +4826,8 @@ enum wmi_10_4_vdev_param { + #define WMI_VDEV_PARAM_TXBF_MU_TX_BFER BIT(3) + + #define WMI_TXBF_STS_CAP_OFFSET_LSB 4 +-#define WMI_TXBF_STS_CAP_OFFSET_MASK 0xf0 ++#define WMI_TXBF_STS_CAP_OFFSET_MASK 0x70 ++#define WMI_TXBF_CONF_IMPLICIT_BF BIT(7) + #define WMI_BF_SOUND_DIM_OFFSET_LSB 8 + #define WMI_BF_SOUND_DIM_OFFSET_MASK 0xf00 + diff --git a/queue-4.4/ath10k-update-tdls-teardown-state-to-target.patch b/queue-4.4/ath10k-update-tdls-teardown-state-to-target.patch new file mode 100644 index 00000000000..89cbf59aa06 --- /dev/null +++ b/queue-4.4/ath10k-update-tdls-teardown-state-to-target.patch @@ -0,0 +1,47 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Manikanta Pubbisetty +Date: Mon, 6 Nov 2017 13:39:31 +0530 +Subject: ath10k: update tdls teardown state to target + +From: Manikanta Pubbisetty + + +[ Upstream commit 424ea0d174e82365f85c6770225dba098b8f1d5f ] + +It is required to update the teardown state of the peer when +a tdls link with that peer is terminated. This information is +useful for the target to perform some cleanups wrt the tdls peer. + +Without proper cleanup, target assumes that the peer is connected and +blocks future connection requests, updating the teardown state of the +peer addresses the problem. + +Tested this change on QCA9888 with 10.4-3.5.1-00018 fw version. + +Signed-off-by: Manikanta Pubbisetty +Signed-off-by: Kalle Valo +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/ath/ath10k/mac.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/drivers/net/wireless/ath/ath10k/mac.c ++++ b/drivers/net/wireless/ath/ath10k/mac.c +@@ -5497,6 +5497,16 @@ static int ath10k_sta_state(struct ieee8 + "mac vdev %d peer delete %pM (sta gone)\n", + arvif->vdev_id, sta->addr); + ++ if (sta->tdls) { ++ ret = ath10k_mac_tdls_peer_update(ar, arvif->vdev_id, ++ sta, ++ WMI_TDLS_PEER_STATE_TEARDOWN); ++ if (ret) ++ ath10k_warn(ar, "failed to update tdls peer state for %pM state %d: %i\n", ++ sta->addr, ++ WMI_TDLS_PEER_STATE_TEARDOWN, ret); ++ } ++ + ret = ath10k_peer_delete(ar, arvif->vdev_id, sta->addr); + if (ret) + ath10k_warn(ar, "failed to delete peer %pM for vdev %d: %i\n", diff --git a/queue-4.4/batman-adv-handle-race-condition-for-claims-between-gateways.patch b/queue-4.4/batman-adv-handle-race-condition-for-claims-between-gateways.patch new file mode 100644 index 00000000000..c4504e71025 --- /dev/null +++ b/queue-4.4/batman-adv-handle-race-condition-for-claims-between-gateways.patch @@ -0,0 +1,71 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Andreas Pape +Date: Mon, 5 Sep 2016 13:20:29 +0200 +Subject: batman-adv: handle race condition for claims between gateways + +From: Andreas Pape + + +[ Upstream commit a3a5129e122709306cfa6409781716c2933df99b ] + +Consider the following situation which has been found in a test setup: +Gateway B has claimed client C and gateway A has the same backbone +network as B. C sends a broad- or multicast to B and directly after +this packet decides to send another packet to A due to a better TQ +value. B will forward the broad-/multicast into the backbone as it is +the responsible gw and after that A will claim C as it has been +chosen by C as the best gateway. If it now happens that A claims C +before it has received the broad-/multicast forwarded by B (due to +backbone topology or due to some delay in B when forwarding the +packet) we get a critical situation: in the current code A will +immediately unclaim C when receiving the multicast due to the +roaming client scenario although the position of C has not changed +in the mesh. If this happens the multi-/broadcast forwarded by B +will be sent back into the mesh by A and we have looping packets +until one of the gateways claims C again. +In order to prevent this, unclaiming of a client due to the roaming +client scenario is only done after a certain time is expired after +the last claim of the client. 100 ms are used here, which should be +slow enough for big backbones and slow gateways but fast enough not +to break the roaming client use case. + +Acked-by: Simon Wunderlich +Signed-off-by: Andreas Pape +[sven@narfation.org: fix conflicts with current version] +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + net/batman-adv/bridge_loop_avoidance.c | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +--- a/net/batman-adv/bridge_loop_avoidance.c ++++ b/net/batman-adv/bridge_loop_avoidance.c +@@ -1603,10 +1603,22 @@ int batadv_bla_tx(struct batadv_priv *ba + /* if yes, the client has roamed and we have + * to unclaim it. + */ +- batadv_handle_unclaim(bat_priv, primary_if, +- primary_if->net_dev->dev_addr, +- ethhdr->h_source, vid); +- goto allow; ++ if (batadv_has_timed_out(claim->lasttime, 100)) { ++ /* only unclaim if the last claim entry is ++ * older than 100 ms to make sure we really ++ * have a roaming client here. ++ */ ++ batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_tx(): Roaming client %pM detected. Unclaim it.\n", ++ ethhdr->h_source); ++ batadv_handle_unclaim(bat_priv, primary_if, ++ primary_if->net_dev->dev_addr, ++ ethhdr->h_source, vid); ++ goto allow; ++ } else { ++ batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_tx(): Race for claim %pM detected. Drop packet.\n", ++ ethhdr->h_source); ++ goto handled; ++ } + } + + /* check if it is a multicast/broadcast frame */ diff --git a/queue-4.4/blk-throttle-make-sure-expire-time-isn-t-too-big.patch b/queue-4.4/blk-throttle-make-sure-expire-time-isn-t-too-big.patch new file mode 100644 index 00000000000..cd5367d10b3 --- /dev/null +++ b/queue-4.4/blk-throttle-make-sure-expire-time-isn-t-too-big.patch @@ -0,0 +1,50 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Shaohua Li +Date: Mon, 27 Mar 2017 10:51:36 -0700 +Subject: blk-throttle: make sure expire time isn't too big + +From: Shaohua Li + + +[ Upstream commit 06cceedcca67a93ac7f7aa93bbd9980c7496d14e ] + +cgroup could be throttled to a limit but when all cgroups cross high +limit, queue enters a higher state and so the group should be throttled +to a higher limit. It's possible the cgroup is sleeping because of +throttle and other cgroups don't dispatch IO any more. In this case, +nobody can trigger current downgrade/upgrade logic. To fix this issue, +we could either set up a timer to wakeup the cgroup if other cgroups are +idle or make sure this cgroup doesn't sleep too long. Setting up a timer +means we must change the timer very frequently. This patch chooses the +latter. Making cgroup sleep time not too big wouldn't change cgroup +bps/iops, but could make it wakeup more frequently, which isn't a big +issue because throtl_slice * 8 is already quite big. + +Signed-off-by: Shaohua Li +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + block/blk-throttle.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +--- a/block/blk-throttle.c ++++ b/block/blk-throttle.c +@@ -505,6 +505,17 @@ static void throtl_dequeue_tg(struct thr + static void throtl_schedule_pending_timer(struct throtl_service_queue *sq, + unsigned long expires) + { ++ unsigned long max_expire = jiffies + 8 * throtl_slice; ++ ++ /* ++ * Since we are adjusting the throttle limit dynamically, the sleep ++ * time calculated according to previous limit might be invalid. It's ++ * possible the cgroup sleep time is very long and no other cgroups ++ * have IO running so notify the limit changes. Make sure the cgroup ++ * doesn't sleep too long to avoid the missed notification. ++ */ ++ if (time_after(expires, max_expire)) ++ expires = max_expire; + mod_timer(&sq->pending_timer, expires); + throtl_log(sq, "schedule timer. delay=%lu jiffies=%lu", + expires - jiffies, jiffies); diff --git a/queue-4.4/bonding-refine-bond_fold_stats-wrap-detection.patch b/queue-4.4/bonding-refine-bond_fold_stats-wrap-detection.patch new file mode 100644 index 00000000000..09347993de2 --- /dev/null +++ b/queue-4.4/bonding-refine-bond_fold_stats-wrap-detection.patch @@ -0,0 +1,55 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Eric Dumazet +Date: Wed, 29 Mar 2017 10:45:44 -0700 +Subject: bonding: refine bond_fold_stats() wrap detection + +From: Eric Dumazet + + +[ Upstream commit 142c6594acbcc32391af9c15f8cd65c6c177698f ] + +Some device drivers reset their stats at down/up events, possibly +fooling bonding stats, since they operate with relative deltas. + +It is nearly not possible to fix drivers, since some of them compute the +tx/rx counters based on per rx/tx queue stats, and the queues can be +reconfigured (ethtool -L) between the down/up sequence. + +Lets avoid accumulating 'negative' values that render bonding stats +useless. + +It is better to lose small deltas, assuming the bonding stats are +fetched at a reasonable frequency. + +Fixes: 5f0c5f73e5ef ("bonding: make global bonding stats more reliable") +Signed-off-by: Eric Dumazet +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/bonding/bond_main.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +--- a/drivers/net/bonding/bond_main.c ++++ b/drivers/net/bonding/bond_main.c +@@ -3276,12 +3276,17 @@ static void bond_fold_stats(struct rtnl_ + for (i = 0; i < sizeof(*_res) / sizeof(u64); i++) { + u64 nv = new[i]; + u64 ov = old[i]; ++ s64 delta = nv - ov; + + /* detects if this particular field is 32bit only */ + if (((nv | ov) >> 32) == 0) +- res[i] += (u32)nv - (u32)ov; +- else +- res[i] += nv - ov; ++ delta = (s64)(s32)((u32)nv - (u32)ov); ++ ++ /* filter anomalies, some drivers reset their stats ++ * at down/up events. ++ */ ++ if (delta > 0) ++ res[i] += delta; + } + } + diff --git a/queue-4.4/braille-console-fix-value-returned-by-_braille_console_setup.patch b/queue-4.4/braille-console-fix-value-returned-by-_braille_console_setup.patch new file mode 100644 index 00000000000..50d89800579 --- /dev/null +++ b/queue-4.4/braille-console-fix-value-returned-by-_braille_console_setup.patch @@ -0,0 +1,104 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Samuel Thibault +Date: Sun, 26 Mar 2017 22:47:36 +0200 +Subject: braille-console: Fix value returned by _braille_console_setup + +From: Samuel Thibault + + +[ Upstream commit 2ed2b8621be2708c0f6d61fe9841e9ad8b9753f0 ] + +commit bbeddf52adc1 ("printk: move braille console support into +separate braille.[ch] files") introduced _braille_console_setup() +to outline the braille initialization code. There was however some +confusion over the value it was supposed to return. commit 2cfe6c4ac7ee +("printk: Fix return of braille_register_console()") tried to fix it +but failed to. + +This fixes and documents the returned value according to the use +in printk.c: non-zero return means a parsing error, and thus this +console configuration should be ignored. + +Signed-off-by: Samuel Thibault +Cc: Aleksey Makarov +Cc: Joe Perches +Cc: Ming Lei +Cc: Steven Rostedt +Acked-by: Petr Mladek +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + kernel/printk/braille.c | 15 ++++++++------- + kernel/printk/braille.h | 13 ++++++++++--- + 2 files changed, 18 insertions(+), 10 deletions(-) + +--- a/kernel/printk/braille.c ++++ b/kernel/printk/braille.c +@@ -2,12 +2,13 @@ + + #include + #include ++#include + #include + + #include "console_cmdline.h" + #include "braille.h" + +-char *_braille_console_setup(char **str, char **brl_options) ++int _braille_console_setup(char **str, char **brl_options) + { + if (!strncmp(*str, "brl,", 4)) { + *brl_options = ""; +@@ -15,14 +16,14 @@ char *_braille_console_setup(char **str, + } else if (!strncmp(*str, "brl=", 4)) { + *brl_options = *str + 4; + *str = strchr(*brl_options, ','); +- if (!*str) ++ if (!*str) { + pr_err("need port name after brl=\n"); +- else +- *((*str)++) = 0; +- } else +- return NULL; ++ return -EINVAL; ++ } ++ *((*str)++) = 0; ++ } + +- return *str; ++ return 0; + } + + int +--- a/kernel/printk/braille.h ++++ b/kernel/printk/braille.h +@@ -9,7 +9,14 @@ braille_set_options(struct console_cmdli + c->brl_options = brl_options; + } + +-char * ++/* ++ * Setup console according to braille options. ++ * Return -EINVAL on syntax error, 0 on success (or no braille option was ++ * actually given). ++ * Modifies str to point to the serial options ++ * Sets brl_options to the parsed braille options. ++ */ ++int + _braille_console_setup(char **str, char **brl_options); + + int +@@ -25,10 +32,10 @@ braille_set_options(struct console_cmdli + { + } + +-static inline char * ++static inline int + _braille_console_setup(char **str, char **brl_options) + { +- return NULL; ++ return 0; + } + + static inline int diff --git a/queue-4.4/clk-qcom-msm8916-fix-mnd_width-for-codec_digcodec.patch b/queue-4.4/clk-qcom-msm8916-fix-mnd_width-for-codec_digcodec.patch new file mode 100644 index 00000000000..5f4ec233bcf --- /dev/null +++ b/queue-4.4/clk-qcom-msm8916-fix-mnd_width-for-codec_digcodec.patch @@ -0,0 +1,32 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Srinivas Kandagatla +Date: Wed, 6 Dec 2017 12:11:38 +0000 +Subject: clk: qcom: msm8916: fix mnd_width for codec_digcodec + +From: Srinivas Kandagatla + + +[ Upstream commit d8e488e8242ecf129eebc440c92d800a99ca109d ] + +This patch fixes missing mnd_width for codec_digital clk, this is now set to +8 inline with datasheet. + +Fixes: 3966fab8b6ab ("clk: qcom: Add MSM8916 Global Clock Controller support") +Signed-off-by: Srinivas Kandagatla +Signed-off-by: Stephen Boyd +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/clk/qcom/gcc-msm8916.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/clk/qcom/gcc-msm8916.c ++++ b/drivers/clk/qcom/gcc-msm8916.c +@@ -1437,6 +1437,7 @@ static const struct freq_tbl ftbl_codec_ + + static struct clk_rcg2 codec_digcodec_clk_src = { + .cmd_rcgr = 0x1c09c, ++ .mnd_width = 8, + .hid_width = 5, + .parent_map = gcc_xo_gpll1_emclk_sleep_map, + .freq_tbl = ftbl_codec_clk, diff --git a/queue-4.4/coresight-fixes-coresight-dt-parse-to-get-correct-output-port-id.patch b/queue-4.4/coresight-fixes-coresight-dt-parse-to-get-correct-output-port-id.patch new file mode 100644 index 00000000000..45974107727 --- /dev/null +++ b/queue-4.4/coresight-fixes-coresight-dt-parse-to-get-correct-output-port-id.patch @@ -0,0 +1,45 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Mike Leach +Date: Mon, 27 Mar 2017 11:09:33 -0600 +Subject: coresight: Fixes coresight DT parse to get correct output port ID. + +From: Mike Leach + + +[ Upstream commit eeedc5421dd3b51de73e6106405c5c77f920f281 ] + +Corrected to get the port numbering to allow programmable replicator driver +to operate correctly. + +By convention, CoreSight devices number ports, not endpoints in +the .dts files:- + +port { + reg + endpoint { + } +} + +Existing code read endpoint number - always 0x0, rather than the correct +port number. + +Signed-off-by: Mike Leach +Signed-off-by: Mathieu Poirier +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/hwtracing/coresight/of_coresight.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/hwtracing/coresight/of_coresight.c ++++ b/drivers/hwtracing/coresight/of_coresight.c +@@ -150,7 +150,7 @@ struct coresight_platform_data *of_get_c + continue; + + /* The local out port number */ +- pdata->outports[i] = endpoint.id; ++ pdata->outports[i] = endpoint.port; + + /* + * Get a handle on the remote port and parent diff --git a/queue-4.4/cpufreq-fix-governor-module-removal-race.patch b/queue-4.4/cpufreq-fix-governor-module-removal-race.patch new file mode 100644 index 00000000000..7b6132ed0a0 --- /dev/null +++ b/queue-4.4/cpufreq-fix-governor-module-removal-race.patch @@ -0,0 +1,56 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: "Rafael J. Wysocki" +Date: Thu, 23 Nov 2017 14:27:07 +0100 +Subject: cpufreq: Fix governor module removal race + +From: "Rafael J. Wysocki" + + +[ Upstream commit a8b149d32b663c1a4105273295184b78f53d33cf ] + +It is possible to remove a cpufreq governor module after +cpufreq_parse_governor() has returned success in +store_scaling_governor() and before cpufreq_set_policy() +acquires a reference to it, because the governor list is +not protected during that period and nothing prevents the +governor from being unregistered then. + +Prevent that from happening by acquiring an extra reference +to the governor module temporarily in cpufreq_parse_governor(), +under cpufreq_governor_mutex, and dropping it in +store_scaling_governor(), when cpufreq_set_policy() returns. + +Note that the second cpufreq_parse_governor() call site is fine, +because it only cares about the policy member of new_policy. + +Signed-off-by: Rafael J. Wysocki +Acked-by: Viresh Kumar +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/cpufreq/cpufreq.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/cpufreq/cpufreq.c ++++ b/drivers/cpufreq/cpufreq.c +@@ -551,6 +551,8 @@ static int cpufreq_parse_governor(char * + *governor = t; + err = 0; + } ++ if (t && !try_module_get(t->owner)) ++ t = NULL; + + mutex_unlock(&cpufreq_governor_mutex); + } +@@ -669,6 +671,10 @@ static ssize_t store_scaling_governor(st + return -EINVAL; + + ret = cpufreq_set_policy(policy, &new_policy); ++ ++ if (new_policy.governor) ++ module_put(new_policy.governor->owner); ++ + return ret ? ret : count; + } + diff --git a/queue-4.4/dmaengine-imx-sdma-add-1ms-delay-to-ensure-sdma-channel-is-stopped.patch b/queue-4.4/dmaengine-imx-sdma-add-1ms-delay-to-ensure-sdma-channel-is-stopped.patch new file mode 100644 index 00000000000..3ba31de013c --- /dev/null +++ b/queue-4.4/dmaengine-imx-sdma-add-1ms-delay-to-ensure-sdma-channel-is-stopped.patch @@ -0,0 +1,66 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Jiada Wang +Date: Thu, 16 Mar 2017 23:12:09 -0700 +Subject: dmaengine: imx-sdma: add 1ms delay to ensure SDMA channel is stopped + +From: Jiada Wang + + +[ Upstream commit 7f3ff14b7eb1ffad132117f08a1973b48e653d43 ] + +sdma_disable_channel() cannot ensure dma is stopped to access +module's FIFOs. There is chance SDMA core is running and accessing +BD when disable of corresponding channel, this may cause sometimes +even after call of .sdma_disable_channel(), SDMA core still be +running and accessing module's FIFOs. + +According to NXP R&D team a delay of one BD SDMA cost time (maximum +is 1ms) should be added after disable of the channel bit, to ensure +SDMA core has really been stopped after SDMA clients call +.device_terminate_all. + +This patch introduces adds a new function sdma_disable_channel_with_delay() +which simply adds 1ms delay after call sdma_disable_channel(), +and set it as .device_terminate_all. + +Signed-off-by: Jiada Wang +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/dma/imx-sdma.c | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +--- a/drivers/dma/imx-sdma.c ++++ b/drivers/dma/imx-sdma.c +@@ -911,6 +911,21 @@ static int sdma_disable_channel(struct d + return 0; + } + ++static int sdma_disable_channel_with_delay(struct dma_chan *chan) ++{ ++ sdma_disable_channel(chan); ++ ++ /* ++ * According to NXP R&D team a delay of one BD SDMA cost time ++ * (maximum is 1ms) should be added after disable of the channel ++ * bit, to ensure SDMA core has really been stopped after SDMA ++ * clients call .device_terminate_all. ++ */ ++ mdelay(1); ++ ++ return 0; ++} ++ + static void sdma_set_watermarklevel_for_p2p(struct sdma_channel *sdmac) + { + struct sdma_engine *sdma = sdmac->sdma; +@@ -1793,7 +1808,7 @@ static int sdma_probe(struct platform_de + sdma->dma_device.device_prep_slave_sg = sdma_prep_slave_sg; + sdma->dma_device.device_prep_dma_cyclic = sdma_prep_dma_cyclic; + sdma->dma_device.device_config = sdma_config; +- sdma->dma_device.device_terminate_all = sdma_disable_channel; ++ sdma->dma_device.device_terminate_all = sdma_disable_channel_with_delay; + sdma->dma_device.src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); + sdma->dma_device.dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); + sdma->dma_device.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); diff --git a/queue-4.4/driver-adm1275-set-the-m-b-and-r-coefficients-correctly-for-power.patch b/queue-4.4/driver-adm1275-set-the-m-b-and-r-coefficients-correctly-for-power.patch new file mode 100644 index 00000000000..4164ab353f5 --- /dev/null +++ b/queue-4.4/driver-adm1275-set-the-m-b-and-r-coefficients-correctly-for-power.patch @@ -0,0 +1,39 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Shikhar Dogra +Date: Mon, 27 Mar 2017 16:16:44 -0700 +Subject: driver: (adm1275) set the m,b and R coefficients correctly for power + +From: Shikhar Dogra + + +[ Upstream commit 6faecba0b3da7b617bf72bef422bf0d3bb6dfe7d ] + +Seems like coefficient values for m, b and R under power have been +put in the wrong order. Rearranging them properly to get correct +values of coefficients for power. + +For specs, please refer to table 7 (page 35) on +http://www.analog.com/media/en/technical-documentation/data-sheets/ADM1075.pdf + +Fixes: 904b296f308d ("hwmon: (adm1275) Introduce configuration data structure for coeffcients") +Signed-off-by: Shikhar Dogra +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/hwmon/pmbus/adm1275.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/hwmon/pmbus/adm1275.c ++++ b/drivers/hwmon/pmbus/adm1275.c +@@ -95,8 +95,8 @@ static const struct coefficients adm1075 + [0] = { 27169, 0, -1 }, /* voltage */ + [1] = { 806, 20475, -1 }, /* current, irange25 */ + [2] = { 404, 20475, -1 }, /* current, irange50 */ +- [3] = { 0, -1, 8549 }, /* power, irange25 */ +- [4] = { 0, -1, 4279 }, /* power, irange50 */ ++ [3] = { 8549, 0, -1 }, /* power, irange25 */ ++ [4] = { 4279, 0, -1 }, /* power, irange50 */ + }; + + static const struct coefficients adm1275_coefficients[] = { diff --git a/queue-4.4/drivers-net-xgene-fix-hardware-checksum-setting.patch b/queue-4.4/drivers-net-xgene-fix-hardware-checksum-setting.patch new file mode 100644 index 00000000000..022520d823f --- /dev/null +++ b/queue-4.4/drivers-net-xgene-fix-hardware-checksum-setting.patch @@ -0,0 +1,44 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Quan Nguyen +Date: Wed, 15 Mar 2017 13:27:16 -0700 +Subject: drivers: net: xgene: Fix hardware checksum setting + +From: Quan Nguyen + + +[ Upstream commit e026e700d940a1ea3d3bc84d92ac668b1f015462 ] + +This patch fixes the hardware checksum settings by properly program +the classifier. Otherwise, packet may be received with checksum error +on X-Gene1 SoC. + +Signed-off-by: Quan Nguyen +Signed-off-by: Iyappan Subramanian +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 1 + + drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 1 + + 2 files changed, 2 insertions(+) + +--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c ++++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c +@@ -604,6 +604,7 @@ static void xgene_enet_cle_bypass(struct + xgene_enet_rd_csr(pdata, CLE_BYPASS_REG0_0_ADDR, &cb); + cb |= CFG_CLE_BYPASS_EN0; + CFG_CLE_IP_PROTOCOL0_SET(&cb, 3); ++ CFG_CLE_IP_HDR_LEN_SET(&cb, 0); + xgene_enet_wr_csr(pdata, CLE_BYPASS_REG0_0_ADDR, cb); + + xgene_enet_rd_csr(pdata, CLE_BYPASS_REG1_0_ADDR, &cb); +--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h ++++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h +@@ -147,6 +147,7 @@ enum xgene_enet_rm { + #define CFG_RXCLK_MUXSEL0_SET(dst, val) xgene_set_bits(dst, val, 26, 3) + + #define CFG_CLE_IP_PROTOCOL0_SET(dst, val) xgene_set_bits(dst, val, 16, 2) ++#define CFG_CLE_IP_HDR_LEN_SET(dst, val) xgene_set_bits(dst, val, 8, 5) + #define CFG_CLE_DSTQID0_SET(dst, val) xgene_set_bits(dst, val, 0, 12) + #define CFG_CLE_FPSEL0_SET(dst, val) xgene_set_bits(dst, val, 16, 4) + #define CFG_MACMODE_SET(dst, val) xgene_set_bits(dst, val, 18, 2) diff --git a/queue-4.4/drivers-perf-arm_pmu-handle-no-platform_device.patch b/queue-4.4/drivers-perf-arm_pmu-handle-no-platform_device.patch new file mode 100644 index 00000000000..b4dc4070e7b --- /dev/null +++ b/queue-4.4/drivers-perf-arm_pmu-handle-no-platform_device.patch @@ -0,0 +1,60 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Mark Rutland +Date: Tue, 11 Apr 2017 09:39:49 +0100 +Subject: drivers/perf: arm_pmu: handle no platform_device + +From: Mark Rutland + + +[ Upstream commit 7654137071fa706e5c91f4f27bc2a5cd7e435a9b ] + +In armpmu_dispatch_irq() we look at arm_pmu::plat_device to acquire +platdata, so that we can defer to platform-specific IRQ handling, +required on some 32-bit parts. With the advent of ACPI we won't always +have a platform_device, and so we must avoid trying to dereference +fields from it. + +This patch fixes up armpmu_dispatch_irq() to avoid doing so, introducing +a new armpmu_get_platdata() helper. + +Signed-off-by: Mark Rutland +Tested-by: Jeremy Linton +Cc: Will Deacon +Signed-off-by: Will Deacon +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/perf/arm_pmu.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +--- a/drivers/perf/arm_pmu.c ++++ b/drivers/perf/arm_pmu.c +@@ -321,10 +321,16 @@ validate_group(struct perf_event *event) + return 0; + } + ++static struct arm_pmu_platdata *armpmu_get_platdata(struct arm_pmu *armpmu) ++{ ++ struct platform_device *pdev = armpmu->plat_device; ++ ++ return pdev ? dev_get_platdata(&pdev->dev) : NULL; ++} ++ + static irqreturn_t armpmu_dispatch_irq(int irq, void *dev) + { + struct arm_pmu *armpmu; +- struct platform_device *plat_device; + struct arm_pmu_platdata *plat; + int ret; + u64 start_clock, finish_clock; +@@ -336,8 +342,8 @@ static irqreturn_t armpmu_dispatch_irq(i + * dereference. + */ + armpmu = *(void **)dev; +- plat_device = armpmu->plat_device; +- plat = dev_get_platdata(&plat_device->dev); ++ ++ plat = armpmu_get_platdata(armpmu); + + start_clock = sched_clock(); + if (plat && plat->handle_irq) diff --git a/queue-4.4/drm-amdgpu-fail-fb-creation-from-imported-dma-bufs.-v2.patch b/queue-4.4/drm-amdgpu-fail-fb-creation-from-imported-dma-bufs.-v2.patch new file mode 100644 index 00000000000..4bd7c8ce0a2 --- /dev/null +++ b/queue-4.4/drm-amdgpu-fail-fb-creation-from-imported-dma-bufs.-v2.patch @@ -0,0 +1,41 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Christopher James Halse Rogers +Date: Wed, 29 Mar 2017 15:02:11 +1100 +Subject: drm/amdgpu: Fail fb creation from imported dma-bufs. (v2) + +From: Christopher James Halse Rogers + + +[ Upstream commit 1769152ac64b0b07583f696b621624df2ca4c840 ] + +Any use of the framebuffer will migrate it to VRAM, which is not sensible for +an imported dma-buf. + +v2: Use DRM_DEBUG_KMS to prevent userspace accidentally spamming dmesg. + +Reviewed-by: Michel Dänzer +Reviewed-by: Christian König +Signed-off-by: Christopher James Halse Rogers +CC: amd-gfx@lists.freedesktop.org +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +@@ -560,6 +560,12 @@ amdgpu_user_framebuffer_create(struct dr + return ERR_PTR(-ENOENT); + } + ++ /* Handle is imported dma-buf, so cannot be migrated to VRAM for scanout */ ++ if (obj->import_attach) { ++ DRM_DEBUG_KMS("Cannot create framebuffer from imported dma_buf\n"); ++ return ERR_PTR(-EINVAL); ++ } ++ + amdgpu_fb = kzalloc(sizeof(*amdgpu_fb), GFP_KERNEL); + if (amdgpu_fb == NULL) { + drm_gem_object_unreference_unlocked(obj); diff --git a/queue-4.4/drm-amdkfd-fix-memory-leaks-in-kfd-topology.patch b/queue-4.4/drm-amdkfd-fix-memory-leaks-in-kfd-topology.patch new file mode 100644 index 00000000000..82016b9e20e --- /dev/null +++ b/queue-4.4/drm-amdkfd-fix-memory-leaks-in-kfd-topology.patch @@ -0,0 +1,78 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Yong Zhao +Date: Fri, 8 Dec 2017 23:08:48 -0500 +Subject: drm/amdkfd: Fix memory leaks in kfd topology + +From: Yong Zhao + + +[ Upstream commit 5108d768408abc80e4e8d99f5b406a73cb04056b ] + +Kobject created using kobject_create_and_add() can be freed using +kobject_put() when there is no referenece any more. However, +kobject memory allocated with kzalloc() has to set up a release +callback in order to free it when the counter decreases to 0. +Otherwise it causes memory leak. + +Signed-off-by: Yong Zhao +Signed-off-by: Felix Kuehling +Reviewed-by: Oded Gabbay +Signed-off-by: Oded Gabbay +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +@@ -519,11 +519,17 @@ static ssize_t sysprops_show(struct kobj + return ret; + } + ++static void kfd_topology_kobj_release(struct kobject *kobj) ++{ ++ kfree(kobj); ++} ++ + static const struct sysfs_ops sysprops_ops = { + .show = sysprops_show, + }; + + static struct kobj_type sysprops_type = { ++ .release = kfd_topology_kobj_release, + .sysfs_ops = &sysprops_ops, + }; + +@@ -559,6 +565,7 @@ static const struct sysfs_ops iolink_ops + }; + + static struct kobj_type iolink_type = { ++ .release = kfd_topology_kobj_release, + .sysfs_ops = &iolink_ops, + }; + +@@ -586,6 +593,7 @@ static const struct sysfs_ops mem_ops = + }; + + static struct kobj_type mem_type = { ++ .release = kfd_topology_kobj_release, + .sysfs_ops = &mem_ops, + }; + +@@ -625,6 +633,7 @@ static const struct sysfs_ops cache_ops + }; + + static struct kobj_type cache_type = { ++ .release = kfd_topology_kobj_release, + .sysfs_ops = &cache_ops, + }; + +@@ -747,6 +756,7 @@ static const struct sysfs_ops node_ops = + }; + + static struct kobj_type node_type = { ++ .release = kfd_topology_kobj_release, + .sysfs_ops = &node_ops, + }; + diff --git a/queue-4.4/drm-defer-disabling-the-vblank-irq-until-the-next-interrupt-for-instant-off.patch b/queue-4.4/drm-defer-disabling-the-vblank-irq-until-the-next-interrupt-for-instant-off.patch new file mode 100644 index 00000000000..28fb3177291 --- /dev/null +++ b/queue-4.4/drm-defer-disabling-the-vblank-irq-until-the-next-interrupt-for-instant-off.patch @@ -0,0 +1,108 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Chris Wilson +Date: Wed, 15 Mar 2017 20:40:25 +0000 +Subject: drm: Defer disabling the vblank IRQ until the next interrupt (for instant-off) + +From: Chris Wilson + + +[ Upstream commit 608b20506941969ea30d8c08dc9ae02bb87dbf7d ] + +On vblank instant-off systems, we can get into a situation where the cost +of enabling and disabling the vblank IRQ around a drmWaitVblank query +dominates. And with the advent of even deeper hardware sleep state, +touching registers becomes ever more expensive. However, we know that if +the user wants the current vblank counter, they are also very likely to +immediately queue a vblank wait and so we can keep the interrupt around +and only turn it off if we have no further vblank requests queued within +the interrupt interval. + +After vblank event delivery, this patch adds a shadow of one vblank where +the interrupt is kept alive for the user to query and queue another vblank +event. Similarly, if the user is using blocking drmWaitVblanks, the +interrupt will be disabled on the IRQ following the wait completion. +However, if the user is simply querying the current vblank counter and +timestamp, the interrupt will be disabled after every IRQ and the user +will enabled it again on the first query following the IRQ. + +v2: Mario Kleiner - +After testing this, one more thing that would make sense is to move +the disable block at the end of drm_handle_vblank() instead of at the +top. + +Turns out that if high precision timestaming is disabled or doesn't +work for some reason (as can be simulated by echo 0 > +/sys/module/drm/parameters/timestamp_precision_usec), then with your +delayed disable code at its current place, the vblank counter won't +increment anymore at all for instant queries, ie. with your other +"instant query" patches. Clients which repeatedly query the counter +and wait for it to progress will simply hang, spinning in an endless +query loop. There's that comment in vblank_disable_and_save: + +"* Skip this step if there isn't any high precision timestamp + * available. In that case we can't account for this and just + * hope for the best. + */ + +With the disable happening after leading edge of vblank (== hw counter +increment already happened) but before the vblank counter/timestamp +handling in drm_handle_vblank, that step is needed to keep the counter +progressing, so skipping it is bad. + +Now without high precision timestamping support, a kms driver must not +set dev->vblank_disable_immediate = true, as this would cause problems +for clients, so this shouldn't matter, but it would be good to still +make this robust against a future kms driver which might have +unreliable high precision timestamping, e.g., high precision +timestamping that intermittently doesn't work. + +v3: Patch before coffee needs extra coffee. + +Testcase: igt/kms_vblank +Signed-off-by: Chris Wilson +Cc: Ville Syrjälä +Cc: Daniel Vetter +Cc: Michel Dänzer +Cc: Laurent Pinchart +Cc: Dave Airlie , +Cc: Mario Kleiner +Reviewed-by: Ville Syrjälä +Signed-off-by: Daniel Vetter +Link: http://patchwork.freedesktop.org/patch/msgid/20170315204027.20160-1-chris@chris-wilson.co.uk +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/drm_irq.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/drm_irq.c ++++ b/drivers/gpu/drm/drm_irq.c +@@ -1271,9 +1271,9 @@ void drm_vblank_put(struct drm_device *d + if (atomic_dec_and_test(&vblank->refcount)) { + if (drm_vblank_offdelay == 0) + return; +- else if (dev->vblank_disable_immediate || drm_vblank_offdelay < 0) ++ else if (drm_vblank_offdelay < 0) + vblank_disable_fn((unsigned long)vblank); +- else ++ else if (!dev->vblank_disable_immediate) + mod_timer(&vblank->disable_timer, + jiffies + ((drm_vblank_offdelay * HZ)/1000)); + } +@@ -1902,6 +1902,16 @@ bool drm_handle_vblank(struct drm_device + wake_up(&vblank->queue); + drm_handle_vblank_events(dev, pipe); + ++ /* With instant-off, we defer disabling the interrupt until after ++ * we finish processing the following vblank. The disable has to ++ * be last (after drm_handle_vblank_events) so that the timestamp ++ * is always accurate. ++ */ ++ if (dev->vblank_disable_immediate && ++ drm_vblank_offdelay > 0 && ++ !atomic_read(&vblank->refcount)) ++ vblank_disable_fn((unsigned long)vblank); ++ + spin_unlock_irqrestore(&dev->event_lock, irqflags); + + return true; diff --git a/queue-4.4/drm-edid-set-eld-connector-type-in-drm_edid_to_eld.patch b/queue-4.4/drm-edid-set-eld-connector-type-in-drm_edid_to_eld.patch new file mode 100644 index 00000000000..3e83e475f57 --- /dev/null +++ b/queue-4.4/drm-edid-set-eld-connector-type-in-drm_edid_to_eld.patch @@ -0,0 +1,70 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Jani Nikula +Date: Wed, 1 Nov 2017 16:20:58 +0200 +Subject: drm/edid: set ELD connector type in drm_edid_to_eld() + +From: Jani Nikula + + +[ Upstream commit 1d1c36650752b7fb81cee515a9bba4131cac4b7c ] + +Since drm_edid_to_eld() knows the connector type, we can set the type in +ELD while at it. Most connectors this gets called on are not DP +encoders, and with the HDMI type being 0, this does not change behaviour +for non-DP. + +For i915 having this in place earlier would have saved a considerable +amount of debugging that lead to the fix 2d8f63297b9f ("drm/i915: always +update ELD connector type after get modes"). I don't see other drivers, +even the ones calling drm_edid_to_eld() on DP connectors, setting the +connector type in ELD. + +Cc: Alex Deucher +Cc: Christian König +Cc: Archit Taneja +Cc: Andrzej Hajda +Cc: Russell King +Cc: CK Hu +Cc: Philipp Zabel +Cc: Ben Skeggs +Cc: Mark Yao +Cc: Benjamin Gaignard +Cc: Vincent Abriou +Cc: Thierry Reding +Cc: Eric Anholt +Reviewed-by: Ville Syrjälä +Reviewed-by: Alex Deucher +Acked-by: Thierry Reding +Signed-off-by: Jani Nikula +Link: https://patchwork.freedesktop.org/patch/msgid/d527b31619528c477c2c136f25cdf118bc0cfc1d.1509545641.git.jani.nikula@intel.com +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/drm_edid.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/drm_edid.c ++++ b/drivers/gpu/drm/drm_edid.c +@@ -3219,8 +3219,7 @@ monitor_name(struct detailed_timing *t, + * @edid: EDID to parse + * + * Fill the ELD (EDID-Like Data) buffer for passing to the audio driver. The +- * Conn_Type, HDCP and Port_ID ELD fields are left for the graphics driver to +- * fill in. ++ * HDCP and Port_ID ELD fields are left for the graphics driver to fill in. + */ + void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid) + { +@@ -3293,6 +3292,12 @@ void drm_edid_to_eld(struct drm_connecto + } + eld[5] |= sad_count << 4; + ++ if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort || ++ connector->connector_type == DRM_MODE_CONNECTOR_eDP) ++ eld[DRM_ELD_SAD_COUNT_CONN_TYPE] |= DRM_ELD_CONN_TYPE_DP; ++ else ++ eld[DRM_ELD_SAD_COUNT_CONN_TYPE] |= DRM_ELD_CONN_TYPE_HDMI; ++ + eld[DRM_ELD_BASELINE_ELD_LEN] = + DIV_ROUND_UP(drm_eld_calc_baseline_block_size(eld), 4); + diff --git a/queue-4.4/drm-qxl-don-t-alloc-fbdev-if-emulation-is-not-supported.patch b/queue-4.4/drm-qxl-don-t-alloc-fbdev-if-emulation-is-not-supported.patch new file mode 100644 index 00000000000..ca4419ec104 --- /dev/null +++ b/queue-4.4/drm-qxl-don-t-alloc-fbdev-if-emulation-is-not-supported.patch @@ -0,0 +1,116 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Gabriel Krisman Bertazi +Date: Mon, 27 Feb 2017 17:33:30 -0300 +Subject: drm: qxl: Don't alloc fbdev if emulation is not supported + +From: Gabriel Krisman Bertazi + + +[ Upstream commit 861078381ba56b56808113736000d9e7ead349c8 ] + +If fbdev emulation is disabled, the QXL shutdown path will try to clean +a framebuffer that wasn't initialized, hitting the Oops below. The +problem is that even when FBDEV_EMULATION is disabled we allocate the +qfbdev strutucture, but we don't initialize it. The fix is to stop +allocating the memory, since it won't be used. This allows the existing +verification in the cleanup hook to do it's job preventing the oops. + +Now that we don't allocate the unused fbdev structure, we need to be +careful when dereferencing it in the PM suspend hook. + +[ 24.284684] BUG: unable to handle kernel NULL pointer dereference at 00000000000002e0 +[ 24.285627] IP: mutex_lock+0x18/0x30 +[ 24.286049] PGD 78cdf067 +[ 24.286050] PUD 7940f067 +[ 24.286344] PMD 0 +[ 24.286649] +[ 24.287072] Oops: 0002 [#1] SMP +[ 24.287422] Modules linked in: qxl +[ 24.287806] CPU: 0 PID: 2328 Comm: bash Not tainted 4.10.0-rc5+ #97 +[ 24.288515] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.9.3-20161025_171302-gandalf 04/01/2014 +[ 24.289681] task: ffff88007c4c0000 task.stack: ffffc90001b58000 +[ 24.290354] RIP: 0010:mutex_lock+0x18/0x30 +[ 24.290812] RSP: 0018:ffffc90001b5bcb0 EFLAGS: 00010246 +[ 24.291401] RAX: 0000000000000000 RBX: 00000000000002e0 RCX: 0000000000000000 +[ 24.292209] RDX: ffff88007c4c0000 RSI: 0000000000000001 RDI: 00000000000002e0 +[ 24.292987] RBP: ffffc90001b5bcb8 R08: fffffffffffffffe R09: 0000000000000001 +[ 24.293797] R10: ffff880078d80b80 R11: 0000000000011400 R12: 0000000000000000 +[ 24.294601] R13: 00000000000002e0 R14: ffffffffa0009c28 R15: 0000000000000060 +[ 24.295439] FS: 00007f30e3acbb40(0000) GS:ffff88007fc00000(0000) knlGS:0000000000000000 +[ 24.296364] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ 24.296997] CR2: 00000000000002e0 CR3: 0000000078c7b000 CR4: 00000000000006f0 +[ 24.297813] Call Trace: +[ 24.298097] drm_framebuffer_cleanup+0x1f/0x70 +[ 24.298612] qxl_fbdev_fini+0x68/0x90 [qxl] +[ 24.299074] qxl_modeset_fini+0xd/0x30 [qxl] +[ 24.299562] qxl_pci_remove+0x22/0x50 [qxl] +[ 24.300025] pci_device_remove+0x34/0xb0 +[ 24.300507] device_release_driver_internal+0x150/0x200 +[ 24.301082] device_release_driver+0xd/0x10 +[ 24.301587] unbind_store+0x108/0x150 +[ 24.301993] drv_attr_store+0x20/0x30 +[ 24.302402] sysfs_kf_write+0x32/0x40 +[ 24.302827] kernfs_fop_write+0x108/0x190 +[ 24.303269] __vfs_write+0x23/0x120 +[ 24.303678] ? security_file_permission+0x36/0xb0 +[ 24.304193] ? rw_verify_area+0x49/0xb0 +[ 24.304636] vfs_write+0xb0/0x190 +[ 24.305004] SyS_write+0x41/0xa0 +[ 24.305362] entry_SYSCALL_64_fastpath+0x1a/0xa9 +[ 24.305887] RIP: 0033:0x7f30e31d9620 +[ 24.306285] RSP: 002b:00007ffc54b47e68 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 +[ 24.307128] RAX: ffffffffffffffda RBX: 00007f30e3497600 RCX: 00007f30e31d9620 +[ 24.307928] RDX: 000000000000000d RSI: 0000000000da2008 RDI: 0000000000000001 +[ 24.308727] RBP: 000000000070bc60 R08: 00007f30e3498760 R09: 00007f30e3acbb40 +[ 24.309504] R10: 0000000000000073 R11: 0000000000000246 R12: 0000000000000001 +[ 24.310295] R13: 0000000000000000 R14: 0000000000000000 R15: 00007ffc54b47f34 +[ 24.311095] Code: 0e 01 e9 7b fe ff ff 66 90 66 2e 0f 1f 84 00 00 00 00 00 +55 48 89 e5 53 48 89 fb e8 83 e8 ff ff 65 48 8b 14 25 40 c4 00 00 31 c0 <3e> +48 0f b1 13 48 85 c0 74 08 48 89 df e8 66 fd ff ff 5b 5d c3 +[ 24.313182] RIP: mutex_lock+0x18/0x30 RSP: ffffc90001b5bcb0 +[ 24.313811] CR2: 00000000000002e0 +[ 24.314208] ---[ end trace 29669c1593cae14b ]--- + +Signed-off-by: Gabriel Krisman Bertazi +Link: http://patchwork.freedesktop.org/patch/msgid/20170227203330.18542-1-krisman@collabora.co.uk +Signed-off-by: Gerd Hoffmann +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/qxl/qxl_fb.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/qxl/qxl_fb.c ++++ b/drivers/gpu/drm/qxl/qxl_fb.c +@@ -494,9 +494,11 @@ static const struct drm_fb_helper_funcs + + int qxl_fbdev_init(struct qxl_device *qdev) + { ++ int ret = 0; ++ ++#ifdef CONFIG_DRM_FBDEV_EMULATION + struct qxl_fbdev *qfbdev; + int bpp_sel = 32; /* TODO: parameter from somewhere? */ +- int ret; + + qfbdev = kzalloc(sizeof(struct qxl_fbdev), GFP_KERNEL); + if (!qfbdev) +@@ -531,6 +533,8 @@ fini: + drm_fb_helper_fini(&qfbdev->helper); + free: + kfree(qfbdev); ++#endif ++ + return ret; + } + +@@ -546,6 +550,9 @@ void qxl_fbdev_fini(struct qxl_device *q + + void qxl_fbdev_set_suspend(struct qxl_device *qdev, int state) + { ++ if (!qdev->mode_info.qfbdev) ++ return; ++ + drm_fb_helper_set_suspend(&qdev->mode_info.qfbdev->helper, state); + } + diff --git a/queue-4.4/drm-radeon-fail-fb-creation-from-imported-dma-bufs.patch b/queue-4.4/drm-radeon-fail-fb-creation-from-imported-dma-bufs.patch new file mode 100644 index 00000000000..6563c4cd2d5 --- /dev/null +++ b/queue-4.4/drm-radeon-fail-fb-creation-from-imported-dma-bufs.patch @@ -0,0 +1,41 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Christopher James Halse Rogers +Date: Wed, 29 Mar 2017 15:00:54 +1100 +Subject: drm/radeon: Fail fb creation from imported dma-bufs. + +From: Christopher James Halse Rogers + + +[ Upstream commit a294043b2fbd8de69d161457ed0c7a4026bbfa5a ] + +Any use of the framebuffer will migrate it to VRAM, which is not sensible for +an imported dma-buf. + +v2: Use DRM_DEBUG_KMS to prevent userspace accidentally spamming dmesg. + +Reviewed-by: Michel Dänzer +Reviewed-by: Christian König +Signed-off-by: Christopher James Halse Rogers +CC: amd-gfx@lists.freedesktop.org +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/radeon/radeon_display.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/gpu/drm/radeon/radeon_display.c ++++ b/drivers/gpu/drm/radeon/radeon_display.c +@@ -1374,6 +1374,12 @@ radeon_user_framebuffer_create(struct dr + return ERR_PTR(-ENOENT); + } + ++ /* Handle is imported dma-buf, so cannot be migrated to VRAM for scanout */ ++ if (obj->import_attach) { ++ DRM_DEBUG_KMS("Cannot create framebuffer from imported dma_buf\n"); ++ return ERR_PTR(-EINVAL); ++ } ++ + radeon_fb = kzalloc(sizeof(*radeon_fb), GFP_KERNEL); + if (radeon_fb == NULL) { + drm_gem_object_unreference_unlocked(obj); diff --git a/queue-4.4/drm-vmwgfx-fixes-to-vmwgfx_fb.patch b/queue-4.4/drm-vmwgfx-fixes-to-vmwgfx_fb.patch new file mode 100644 index 00000000000..34ba079fdaa --- /dev/null +++ b/queue-4.4/drm-vmwgfx-fixes-to-vmwgfx_fb.patch @@ -0,0 +1,45 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Sinclair Yeh +Date: Thu, 23 Mar 2017 14:28:21 -0700 +Subject: drm/vmwgfx: Fixes to vmwgfx_fb + +From: Sinclair Yeh + + +[ Upstream commit aa74f0687cfe998e59b20d6454f45e8aa4403c45 ] + +1. When unsetting a mode, num_connector should be set to zero +2. The pixel_format field needs to be initialized as newer DRM internal + functions checks this field +3. Take the drm_modeset_lock_all() because vmw_fb_kms_detach() can + change current mode + +Signed-off-by: Sinclair Yeh +Reviewed-by: Thomas Hellstrom +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c ++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +@@ -433,7 +433,7 @@ static int vmw_fb_kms_detach(struct vmw_ + set.y = 0; + set.mode = NULL; + set.fb = NULL; +- set.num_connectors = 1; ++ set.num_connectors = 0; + set.connectors = &par->con; + ret = drm_mode_set_config_internal(&set); + if (ret) { +@@ -821,7 +821,9 @@ int vmw_fb_off(struct vmw_private *vmw_p + flush_delayed_work(&par->local_work); + + mutex_lock(&par->bo_mutex); ++ drm_modeset_lock_all(vmw_priv->dev); + (void) vmw_fb_kms_detach(par, true, false); ++ drm_modeset_unlock_all(vmw_priv->dev); + mutex_unlock(&par->bo_mutex); + + return 0; diff --git a/queue-4.4/f2fs-relax-node-version-check-for-victim-data-in-gc.patch b/queue-4.4/f2fs-relax-node-version-check-for-victim-data-in-gc.patch new file mode 100644 index 00000000000..6bb0ca7ca5a --- /dev/null +++ b/queue-4.4/f2fs-relax-node-version-check-for-victim-data-in-gc.patch @@ -0,0 +1,51 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Jaegeuk Kim +Date: Tue, 21 Mar 2017 10:59:50 -0400 +Subject: f2fs: relax node version check for victim data in gc + +From: Jaegeuk Kim + + +[ Upstream commit c13ff37e359bb3eacf4e1760dcea8d9760aa7459 ] + +- has_not_enough_free_secs +node_secs: 0 dent_secs: 0 freed:0 free_segments:103 reserved:104 + + - f2fs_gc + - get_victim_by_default +alloc_mode 0, gc_mode 1, max_search 2672, offset 4654, ofs_unit 1 + + - do_garbage_collect +start_segno 3976, end_segno 3977 type 0 + + - is_alive +nid 22797, blkaddr 2131882, ofs_in_node 0, version 0x8/0x0 + + - gc_data_segment 766, segno 3976, block 512/426 not alive + +So, this patch fixes subtle corrupted case where node version does not match +to summary version which results in infinite loop by gc. + +Reported-by: Yunlei He +Signed-off-by: Jaegeuk Kim +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + fs/f2fs/gc.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/fs/f2fs/gc.c ++++ b/fs/f2fs/gc.c +@@ -522,8 +522,10 @@ static bool is_alive(struct f2fs_sb_info + get_node_info(sbi, nid, dni); + + if (sum->version != dni->version) { +- f2fs_put_page(node_page, 1); +- return false; ++ f2fs_msg(sbi->sb, KERN_WARNING, ++ "%s: valid data with mismatched node version.", ++ __func__); ++ set_sbi_flag(sbi, SBI_NEED_FSCK); + } + + *nofs = ofs_of_node(node_page); diff --git a/queue-4.4/fm10k-correctly-check-if-interface-is-removed.patch b/queue-4.4/fm10k-correctly-check-if-interface-is-removed.patch new file mode 100644 index 00000000000..d1d517a2baa --- /dev/null +++ b/queue-4.4/fm10k-correctly-check-if-interface-is-removed.patch @@ -0,0 +1,33 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Phil Turnbull +Date: Wed, 23 Nov 2016 13:33:58 -0500 +Subject: fm10k: correctly check if interface is removed + +From: Phil Turnbull + + +[ Upstream commit 540fca35e38d15777b310f450f63f056e63039f5 ] + +FM10K_REMOVED expects a hardware address, not a 'struct fm10k_hw'. + +Fixes: 5cb8db4a4cbc ("fm10k: Add support for VF") +Signed-off-by: Phil Turnbull +Tested-by: Krishneil Singh +Signed-off-by: Jeff Kirsher +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c ++++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c +@@ -983,7 +983,7 @@ static void fm10k_self_test(struct net_d + + memset(data, 0, sizeof(*data) * FM10K_TEST_LEN); + +- if (FM10K_REMOVED(hw)) { ++ if (FM10K_REMOVED(hw->hw_addr)) { + netif_err(interface, drv, dev, + "Interface removed - test blocked\n"); + eth_test->flags |= ETH_TEST_FL_FAILED; diff --git a/queue-4.4/hid-clamp-input-to-logical-range-if-no-null-state.patch b/queue-4.4/hid-clamp-input-to-logical-range-if-no-null-state.patch new file mode 100644 index 00000000000..074bcebd17e --- /dev/null +++ b/queue-4.4/hid-clamp-input-to-logical-range-if-no-null-state.patch @@ -0,0 +1,80 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Tomasz Kramkowski +Date: Tue, 14 Mar 2017 13:29:13 +0000 +Subject: HID: clamp input to logical range if no null state + +From: Tomasz Kramkowski + + +[ Upstream commit c3883fe06488a483658ba5d849b70e49bee15e7c ] + +This patch fixes an issue in drivers/hid/hid-input.c where values +outside of the logical range are not clamped when "null state" bit of +the input control is not set. + +This was discussed on the lists [1] and this change stems from the fact +due to the ambiguity of the HID specification it might be appropriate to +follow Microsoft's own interpretation of the specification. As noted in +Microsoft's documentation [2] in the section titled "Required HID usages +for digitizers" it is noted that values reported outside the logical +range "will be considered as invalid data and the value will be changed +to the nearest boundary value (logical min/max)." + +This patch fixes an issue where the (1292:4745) Innomedia INNEX +GENESIS/ATARI reports out of range values for its X and Y axis of the +DPad which, due to the null state bit being unset, are forwarded to +userspace as is. Now these values will get clamped to the logical range +before being forwarded to userspace. This device was also used to test +this patch. + +This patch expands on commit 3f3752705dbd ("HID: reject input outside +logical range only if null state is set"). + +[1]: http://lkml.kernel.org/r/20170307131036.GA853@gaia.local +[2]: https://msdn.microsoft.com/en-us/library/windows/hardware/dn672278(v=vs.85).asp + +Signed-off-by: Tomasz Kramkowski +Acked-by: Benjamin Tissoires +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/hid/hid-input.c | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +--- a/drivers/hid/hid-input.c ++++ b/drivers/hid/hid-input.c +@@ -1128,19 +1128,26 @@ void hidinput_hid_event(struct hid_devic + + /* + * Ignore out-of-range values as per HID specification, +- * section 5.10 and 6.2.25. ++ * section 5.10 and 6.2.25, when NULL state bit is present. ++ * When it's not, clamp the value to match Microsoft's input ++ * driver as mentioned in "Required HID usages for digitizers": ++ * https://msdn.microsoft.com/en-us/library/windows/hardware/dn672278(v=vs.85).asp + * + * The logical_minimum < logical_maximum check is done so that we + * don't unintentionally discard values sent by devices which + * don't specify logical min and max. + */ + if ((field->flags & HID_MAIN_ITEM_VARIABLE) && +- (field->flags & HID_MAIN_ITEM_NULL_STATE) && +- (field->logical_minimum < field->logical_maximum) && +- (value < field->logical_minimum || +- value > field->logical_maximum)) { +- dbg_hid("Ignoring out-of-range value %x\n", value); +- return; ++ (field->logical_minimum < field->logical_maximum)) { ++ if (field->flags & HID_MAIN_ITEM_NULL_STATE && ++ (value < field->logical_minimum || ++ value > field->logical_maximum)) { ++ dbg_hid("Ignoring out-of-range value %x\n", value); ++ return; ++ } ++ value = clamp(value, ++ field->logical_minimum, ++ field->logical_maximum); + } + + /* diff --git a/queue-4.4/hid-elo-clear-btn_left-mapping.patch b/queue-4.4/hid-elo-clear-btn_left-mapping.patch new file mode 100644 index 00000000000..d229754ecd0 --- /dev/null +++ b/queue-4.4/hid-elo-clear-btn_left-mapping.patch @@ -0,0 +1,38 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Jiri Kosina +Date: Wed, 22 Nov 2017 11:19:51 +0100 +Subject: HID: elo: clear BTN_LEFT mapping + +From: Jiri Kosina + + +[ Upstream commit 9abd04af951e5734c9d5cfee9b49790844b734cf ] + +ELO devices have one Button usage in GenDesk field, which makes hid-input map +it to BTN_LEFT; that confuses userspace, which then considers the device to be +a mouse/touchpad instead of touchscreen. + +Fix that by unmapping BTN_LEFT and keeping only BTN_TOUCH in place. + +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/hid/hid-elo.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/hid/hid-elo.c ++++ b/drivers/hid/hid-elo.c +@@ -42,6 +42,12 @@ static int elo_input_configured(struct h + { + struct input_dev *input = hidinput->input; + ++ /* ++ * ELO devices have one Button usage in GenDesk field, which makes ++ * hid-input map it to BTN_LEFT; that confuses userspace, which then ++ * considers the device to be a mouse/touchpad instead of touchscreen. ++ */ ++ clear_bit(BTN_LEFT, input->keybit); + set_bit(BTN_TOUCH, input->keybit); + set_bit(ABS_PRESSURE, input->absbit); + input_set_abs_params(input, ABS_PRESSURE, 0, 256, 0, 0); diff --git a/queue-4.4/hid-reject-input-outside-logical-range-only-if-null-state-is-set.patch b/queue-4.4/hid-reject-input-outside-logical-range-only-if-null-state-is-set.patch new file mode 100644 index 00000000000..a2fbcf71d6a --- /dev/null +++ b/queue-4.4/hid-reject-input-outside-logical-range-only-if-null-state-is-set.patch @@ -0,0 +1,38 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: "Valtteri Heikkilä" +Date: Tue, 14 Feb 2017 23:14:32 +0000 +Subject: HID: reject input outside logical range only if null state is set + +From: "Valtteri Heikkilä" + + +[ Upstream commit 3f3752705dbd50b66b66ad7b4d54fe33d2f746ed ] + +This patch fixes an issue in drivers/hid/hid-input.c where USB HID +control null state flag is not checked upon rejecting inputs outside +logical minimum-maximum range. The check should be made according to USB +HID specification 1.11, section 6.2.2.5, p.31. The fix will resolve +issues with some game controllers, such as: +https://bugzilla.kernel.org/show_bug.cgi?id=68621 + +[tk@the-tk.com: shortened and fixed spelling in commit message] +Signed-off-by: Valtteri Heikkilä +Signed-off-by: Tomasz Kramkowski +Acked-By: Benjamin Tissoires +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/hid/hid-input.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/hid/hid-input.c ++++ b/drivers/hid/hid-input.c +@@ -1135,6 +1135,7 @@ void hidinput_hid_event(struct hid_devic + * don't specify logical min and max. + */ + if ((field->flags & HID_MAIN_ITEM_VARIABLE) && ++ (field->flags & HID_MAIN_ITEM_NULL_STATE) && + (field->logical_minimum < field->logical_maximum) && + (value < field->logical_minimum || + value > field->logical_maximum)) { diff --git a/queue-4.4/i40e-acquire-nvm-lock-before-reads-on-all-devices.patch b/queue-4.4/i40e-acquire-nvm-lock-before-reads-on-all-devices.patch new file mode 100644 index 00000000000..4f276bd76b9 --- /dev/null +++ b/queue-4.4/i40e-acquire-nvm-lock-before-reads-on-all-devices.patch @@ -0,0 +1,47 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Aaron Salter +Date: Fri, 2 Dec 2016 12:33:02 -0800 +Subject: i40e: Acquire NVM lock before reads on all devices + +From: Aaron Salter + + +[ Upstream commit 96a39aed25e6559b160786117df124084feb9080 ] + +Acquire NVM lock before reads on all devices. Previously, locks were +only used for X722 and later. Fixes an issue where simultaneous X710 +NVM accesses were interfering with each other. + +Change-ID: If570bb7acf958cef58725ec2a2011cead6f80638 +Signed-off-by: Aaron Salter +Tested-by: Andrew Bowers +Signed-off-by: Jeff Kirsher +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c +@@ -292,14 +292,14 @@ i40e_status i40e_read_nvm_word(struct i4 + { + enum i40e_status_code ret_code = 0; + +- if (hw->flags & I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE) { +- ret_code = i40e_acquire_nvm(hw, I40E_RESOURCE_READ); +- if (!ret_code) { ++ ret_code = i40e_acquire_nvm(hw, I40E_RESOURCE_READ); ++ if (!ret_code) { ++ if (hw->flags & I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE) { + ret_code = i40e_read_nvm_word_aq(hw, offset, data); +- i40e_release_nvm(hw); ++ } else { ++ ret_code = i40e_read_nvm_word_srctl(hw, offset, data); + } +- } else { +- ret_code = i40e_read_nvm_word_srctl(hw, offset, data); ++ i40e_release_nvm(hw); + } + return ret_code; + } diff --git a/queue-4.4/i40e-fix-ethtool-to-get-eeprom-data-from-x722-interface.patch b/queue-4.4/i40e-fix-ethtool-to-get-eeprom-data-from-x722-interface.patch new file mode 100644 index 00000000000..cb08038a36f --- /dev/null +++ b/queue-4.4/i40e-fix-ethtool-to-get-eeprom-data-from-x722-interface.patch @@ -0,0 +1,39 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Lihong Yang +Date: Mon, 30 Jan 2017 12:29:32 -0800 +Subject: i40e: fix ethtool to get EEPROM data from X722 interface + +From: Lihong Yang + + +[ Upstream commit c271dd6c391b535226cf1a81aaad9f33cb5899d3 ] + +Currently ethtool -e will error out with a X722 interface +as its EEPROM has a scope limit at offset 0x5B9FFF. +This patch fixes the issue by setting the EEPROM length to +the scope limit to avoid NVM read failure beyond that. + +Change-ID: I0b7d4dd6c7f2a57cace438af5dffa0f44c229372 +Signed-off-by: Lihong Yang +Tested-by: Andrew Bowers +Signed-off-by: Jeff Kirsher +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +@@ -1073,6 +1073,11 @@ static int i40e_get_eeprom_len(struct ne + struct i40e_hw *hw = &np->vsi->back->hw; + u32 val; + ++#define X722_EEPROM_SCOPE_LIMIT 0x5B9FFF ++ if (hw->mac.type == I40E_MAC_X722) { ++ val = X722_EEPROM_SCOPE_LIMIT + 1; ++ return val; ++ } + val = (rd32(hw, I40E_GLPCI_LBARCTRL) + & I40E_GLPCI_LBARCTRL_FL_SIZE_MASK) + >> I40E_GLPCI_LBARCTRL_FL_SIZE_SHIFT; diff --git a/queue-4.4/ima-relax-requiring-a-file-signature-for-new-files-with-zero-length.patch b/queue-4.4/ima-relax-requiring-a-file-signature-for-new-files-with-zero-length.patch new file mode 100644 index 00000000000..8dc152d6c31 --- /dev/null +++ b/queue-4.4/ima-relax-requiring-a-file-signature-for-new-files-with-zero-length.patch @@ -0,0 +1,43 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Mimi Zohar +Date: Wed, 8 Nov 2017 07:38:28 -0500 +Subject: ima: relax requiring a file signature for new files with zero length + +From: Mimi Zohar + + +[ Upstream commit b7e27bc1d42e8e0cc58b602b529c25cd0071b336 ] + +Custom policies can require file signatures based on LSM labels. These +files are normally created and only afterwards labeled, requiring them +to be signed. + +Instead of requiring file signatures based on LSM labels, entire +filesystems could require file signatures. In this case, we need the +ability of writing new files without requiring file signatures. + +The definition of a "new" file was originally defined as any file with +a length of zero. Subsequent patches redefined a "new" file to be based +on the FILE_CREATE open flag. By combining the open flag with a file +size of zero, this patch relaxes the file signature requirement. + +Fixes: 1ac202e978e1 ima: accept previously set IMA_NEW_FILE +Signed-off-by: Mimi Zohar +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + security/integrity/ima/ima_appraise.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/security/integrity/ima/ima_appraise.c ++++ b/security/integrity/ima/ima_appraise.c +@@ -206,7 +206,8 @@ int ima_appraise_measurement(int func, s + if (opened & FILE_CREATED) + iint->flags |= IMA_NEW_FILE; + if ((iint->flags & IMA_NEW_FILE) && +- !(iint->flags & IMA_DIGSIG_REQUIRED)) ++ (!(iint->flags & IMA_DIGSIG_REQUIRED) || ++ (inode->i_size == 0))) + status = INTEGRITY_PASS; + goto out; + } diff --git a/queue-4.4/input-qt1070-add-of-device-id-table.patch b/queue-4.4/input-qt1070-add-of-device-id-table.patch new file mode 100644 index 00000000000..97b85fde14d --- /dev/null +++ b/queue-4.4/input-qt1070-add-of-device-id-table.patch @@ -0,0 +1,50 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Javier Martinez Canillas +Date: Thu, 23 Mar 2017 13:33:12 -0700 +Subject: Input: qt1070 - add OF device ID table + +From: Javier Martinez Canillas + + +[ Upstream commit cf5cd9d4480a87da78768718cac194a71079b5cb ] + +The driver doesn't have a struct of_device_id table but supported devices +are registered via Device Trees. This is working on the assumption that a +I2C device registered via OF will always match a legacy I2C device ID and +that the MODALIAS reported will always be of the form i2c:. + +But this could change in the future so the correct approach is to have an +OF device ID table if the devices are registered via OF. + +The compatible strings don't have a vendor prefix because that's how it's +used currently, and changing this will be a Device Tree ABI break. + +Signed-off-by: Javier Martinez Canillas +Signed-off-by: Dmitry Torokhov +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/keyboard/qt1070.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/drivers/input/keyboard/qt1070.c ++++ b/drivers/input/keyboard/qt1070.c +@@ -274,9 +274,18 @@ static const struct i2c_device_id qt1070 + }; + MODULE_DEVICE_TABLE(i2c, qt1070_id); + ++#ifdef CONFIG_OF ++static const struct of_device_id qt1070_of_match[] = { ++ { .compatible = "qt1070", }, ++ { }, ++}; ++MODULE_DEVICE_TABLE(of, qt1070_of_match); ++#endif ++ + static struct i2c_driver qt1070_driver = { + .driver = { + .name = "qt1070", ++ .of_match_table = of_match_ptr(qt1070_of_match), + .pm = &qt1070_pm_ops, + }, + .id_table = qt1070_id, diff --git a/queue-4.4/input-tsc2007-check-for-presence-and-power-down-tsc2007-during-probe.patch b/queue-4.4/input-tsc2007-check-for-presence-and-power-down-tsc2007-during-probe.patch new file mode 100644 index 00000000000..eb5912ab14d --- /dev/null +++ b/queue-4.4/input-tsc2007-check-for-presence-and-power-down-tsc2007-during-probe.patch @@ -0,0 +1,38 @@ +From foo@baz Mon Mar 19 09:58:11 CET 2018 +From: "H. Nikolaus Schaller" +Date: Fri, 17 Feb 2017 12:51:19 -0800 +Subject: Input: tsc2007 - check for presence and power down tsc2007 during probe + +From: "H. Nikolaus Schaller" + + +[ Upstream commit 934df23171e7c5b71d937104d4957891c39748ff ] + +1. check if chip is really present and don't succeed if it isn't. +2. if it succeeds, power down the chip until accessed + +Signed-off-by: H. Nikolaus Schaller +Signed-off-by: Dmitry Torokhov +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/touchscreen/tsc2007.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/drivers/input/touchscreen/tsc2007.c ++++ b/drivers/input/touchscreen/tsc2007.c +@@ -455,6 +455,14 @@ static int tsc2007_probe(struct i2c_clie + + tsc2007_stop(ts); + ++ /* power down the chip (TSC2007_SETUP does not ACK on I2C) */ ++ err = tsc2007_xfer(ts, PWRDOWN); ++ if (err < 0) { ++ dev_err(&client->dev, ++ "Failed to setup chip: %d\n", err); ++ return err; /* usually, chip does not respond */ ++ } ++ + err = input_register_device(input_dev); + if (err) { + dev_err(&client->dev, diff --git a/queue-4.4/iommu-iova-fix-underflow-bug-in-__alloc_and_insert_iova_range.patch b/queue-4.4/iommu-iova-fix-underflow-bug-in-__alloc_and_insert_iova_range.patch new file mode 100644 index 00000000000..beff31db070 --- /dev/null +++ b/queue-4.4/iommu-iova-fix-underflow-bug-in-__alloc_and_insert_iova_range.patch @@ -0,0 +1,68 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Nate Watterson +Date: Fri, 7 Apr 2017 01:36:20 -0400 +Subject: iommu/iova: Fix underflow bug in __alloc_and_insert_iova_range + +From: Nate Watterson + + +[ Upstream commit 5016bdb796b3726eec043ca0ce3be981f712c756 ] + +Normally, calling alloc_iova() using an iova_domain with insufficient +pfns remaining between start_pfn and dma_limit will fail and return a +NULL pointer. Unexpectedly, if such a "full" iova_domain contains an +iova with pfn_lo == 0, the alloc_iova() call will instead succeed and +return an iova containing invalid pfns. + +This is caused by an underflow bug in __alloc_and_insert_iova_range() +that occurs after walking the "full" iova tree when the search ends +at the iova with pfn_lo == 0 and limit_pfn is then adjusted to be just +below that (-1). This (now huge) limit_pfn gives the impression that a +vast amount of space is available between it and start_pfn and thus +a new iova is allocated with the invalid pfn_hi value, 0xFFF.... . + +To rememdy this, a check is introduced to ensure that adjustments to +limit_pfn will not underflow. + +This issue has been observed in the wild, and is easily reproduced with +the following sample code. + + struct iova_domain *iovad = kzalloc(sizeof(*iovad), GFP_KERNEL); + struct iova *rsvd_iova, *good_iova, *bad_iova; + unsigned long limit_pfn = 3; + unsigned long start_pfn = 1; + unsigned long va_size = 2; + + init_iova_domain(iovad, SZ_4K, start_pfn, limit_pfn); + rsvd_iova = reserve_iova(iovad, 0, 0); + good_iova = alloc_iova(iovad, va_size, limit_pfn, true); + bad_iova = alloc_iova(iovad, va_size, limit_pfn, true); + +Prior to the patch, this yielded: + *rsvd_iova == {0, 0} /* Expected */ + *good_iova == {2, 3} /* Expected */ + *bad_iova == {-2, -1} /* Oh no... */ + +After the patch, bad_iova is NULL as expected since inadequate +space remains between limit_pfn and start_pfn after allocating +good_iova. + +Signed-off-by: Nate Watterson +Signed-off-by: Joerg Roedel +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/iommu/iova.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/iommu/iova.c ++++ b/drivers/iommu/iova.c +@@ -126,7 +126,7 @@ static int __alloc_and_insert_iova_range + break; /* found a free slot */ + } + adjust_limit_pfn: +- limit_pfn = curr_iova->pfn_lo - 1; ++ limit_pfn = curr_iova->pfn_lo ? (curr_iova->pfn_lo - 1) : 0; + move_left: + prev = curr; + curr = rb_prev(curr); diff --git a/queue-4.4/ipvlan-add-l2-check-for-packets-arriving-via-virtual-devices.patch b/queue-4.4/ipvlan-add-l2-check-for-packets-arriving-via-virtual-devices.patch new file mode 100644 index 00000000000..b641fe93bf1 --- /dev/null +++ b/queue-4.4/ipvlan-add-l2-check-for-packets-arriving-via-virtual-devices.patch @@ -0,0 +1,55 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Mahesh Bandewar +Date: Thu, 7 Dec 2017 15:15:43 -0800 +Subject: ipvlan: add L2 check for packets arriving via virtual devices + +From: Mahesh Bandewar + + +[ Upstream commit 92ff42645028fa6f9b8aa767718457b9264316b4 ] + +Packets that don't have dest mac as the mac of the master device should +not be entertained by the IPvlan rx-handler. This is mostly true as the +packet path mostly takes care of that, except when the master device is +a virtual device. As demonstrated in the following case - + + ip netns add ns1 + ip link add ve1 type veth peer name ve2 + ip link add link ve2 name iv1 type ipvlan mode l2 + ip link set dev iv1 netns ns1 + ip link set ve1 up + ip link set ve2 up + ip -n ns1 link set iv1 up + ip addr add 192.168.10.1/24 dev ve1 + ip -n ns1 addr 192.168.10.2/24 dev iv1 + ping -c2 192.168.10.2 + + ip neigh show dev ve1 + ip neigh show 192.168.10.2 lladdr dev ve1 + ping -c2 192.168.10.2 + + +This patch adds that missing check in the IPvlan rx-handler. + +Reported-by: Amit Sikka +Signed-off-by: Mahesh Bandewar +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ipvlan/ipvlan_core.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/net/ipvlan/ipvlan_core.c ++++ b/drivers/net/ipvlan/ipvlan_core.c +@@ -282,6 +282,10 @@ static int ipvlan_rcv_frame(struct ipvl_ + if (dev_forward_skb(ipvlan->dev, skb) == NET_RX_SUCCESS) + success = true; + } else { ++ if (!ether_addr_equal_64bits(eth_hdr(skb)->h_dest, ++ ipvlan->phy_dev->dev_addr)) ++ skb->pkt_type = PACKET_OTHERHOST; ++ + ret = RX_HANDLER_ANOTHER; + success = true; + } diff --git a/queue-4.4/kprobes-x86-fix-kprobe-booster-not-to-boost-far-call-instructions.patch b/queue-4.4/kprobes-x86-fix-kprobe-booster-not-to-boost-far-call-instructions.patch new file mode 100644 index 00000000000..02340625741 --- /dev/null +++ b/queue-4.4/kprobes-x86-fix-kprobe-booster-not-to-boost-far-call-instructions.patch @@ -0,0 +1,52 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Masami Hiramatsu +Date: Wed, 29 Mar 2017 13:56:56 +0900 +Subject: kprobes/x86: Fix kprobe-booster not to boost far call instructions + +From: Masami Hiramatsu + + +[ Upstream commit bd0b90676c30fe640e7ead919b3e38846ac88ab7 ] + +Fix the kprobe-booster not to boost far call instruction, +because a call may store the address in the single-step +execution buffer to the stack, which should be modified +after single stepping. + +Currently, this instruction will be filtered as not +boostable in resume_execution(), so this is not a +critical issue. + +Signed-off-by: Masami Hiramatsu +Cc: Ananth N Mavinakayanahalli +Cc: Andrey Ryabinin +Cc: Anil S Keshavamurthy +Cc: Borislav Petkov +Cc: Brian Gerst +Cc: David S . Miller +Cc: Denys Vlasenko +Cc: H. Peter Anvin +Cc: Josh Poimboeuf +Cc: Linus Torvalds +Cc: Peter Zijlstra +Cc: Thomas Gleixner +Cc: Ye Xiaolong +Link: http://lkml.kernel.org/r/149076340615.22469.14066273186134229909.stgit@devbox +Signed-off-by: Ingo Molnar +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kernel/kprobes/core.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/x86/kernel/kprobes/core.c ++++ b/arch/x86/kernel/kprobes/core.c +@@ -196,6 +196,8 @@ retry: + return (opcode != 0x62 && opcode != 0x67); + case 0x70: + return 0; /* can't boost conditional jump */ ++ case 0x90: ++ return opcode != 0x9a; /* can't boost call far */ + case 0xc0: + /* can't boost software-interruptions */ + return (0xc1 < opcode && opcode < 0xcc) || opcode == 0xcf; diff --git a/queue-4.4/kprobes-x86-set-kprobes-pages-read-only.patch b/queue-4.4/kprobes-x86-set-kprobes-pages-read-only.patch new file mode 100644 index 00000000000..dd0f5107e60 --- /dev/null +++ b/queue-4.4/kprobes-x86-set-kprobes-pages-read-only.patch @@ -0,0 +1,89 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Masami Hiramatsu +Date: Wed, 29 Mar 2017 14:02:46 +0900 +Subject: kprobes/x86: Set kprobes pages read-only + +From: Masami Hiramatsu + + +[ Upstream commit d0381c81c2f782fa2131178d11e0cfb23d50d631 ] + +Set the pages which is used for kprobes' singlestep buffer +and optprobe's trampoline instruction buffer to readonly. +This can prevent unexpected (or unintended) instruction +modification. + +This also passes rodata_test as below. + +Without this patch, rodata_test shows a warning: + + WARNING: CPU: 0 PID: 1 at arch/x86/mm/dump_pagetables.c:235 note_page+0x7a9/0xa20 + x86/mm: Found insecure W+X mapping at address ffffffffa0000000/0xffffffffa0000000 + +With this fix, no W+X pages are found: + + x86/mm: Checked W+X mappings: passed, no W+X pages found. + rodata_test: all tests were successful + +Reported-by: Andrey Ryabinin +Signed-off-by: Masami Hiramatsu +Cc: Ananth N Mavinakayanahalli +Cc: Anil S Keshavamurthy +Cc: Borislav Petkov +Cc: Brian Gerst +Cc: David S . Miller +Cc: Denys Vlasenko +Cc: H. Peter Anvin +Cc: Josh Poimboeuf +Cc: Linus Torvalds +Cc: Peter Zijlstra +Cc: Thomas Gleixner +Cc: Ye Xiaolong +Link: http://lkml.kernel.org/r/149076375592.22469.14174394514338612247.stgit@devbox +Signed-off-by: Ingo Molnar +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kernel/kprobes/core.c | 4 ++++ + arch/x86/kernel/kprobes/opt.c | 3 +++ + 2 files changed, 7 insertions(+) + +--- a/arch/x86/kernel/kprobes/core.c ++++ b/arch/x86/kernel/kprobes/core.c +@@ -406,6 +406,8 @@ static int arch_copy_kprobe(struct kprob + { + int ret; + ++ set_memory_rw((unsigned long)p->ainsn.insn & PAGE_MASK, 1); ++ + /* Copy an instruction with recovering if other optprobe modifies it.*/ + ret = __copy_instruction(p->ainsn.insn, p->addr); + if (!ret) +@@ -420,6 +422,8 @@ static int arch_copy_kprobe(struct kprob + else + p->ainsn.boostable = -1; + ++ set_memory_ro((unsigned long)p->ainsn.insn & PAGE_MASK, 1); ++ + /* Check whether the instruction modifies Interrupt Flag or not */ + p->ainsn.if_modifier = is_IF_modifier(p->ainsn.insn); + +--- a/arch/x86/kernel/kprobes/opt.c ++++ b/arch/x86/kernel/kprobes/opt.c +@@ -370,6 +370,7 @@ int arch_prepare_optimized_kprobe(struct + } + + buf = (u8 *)op->optinsn.insn; ++ set_memory_rw((unsigned long)buf & PAGE_MASK, 1); + + /* Copy instructions into the out-of-line buffer */ + ret = copy_optimized_instructions(buf + TMPL_END_IDX, op->kp.addr); +@@ -392,6 +393,8 @@ int arch_prepare_optimized_kprobe(struct + synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size, + (u8 *)op->kp.addr + op->optinsn.size); + ++ set_memory_ro((unsigned long)buf & PAGE_MASK, 1); ++ + flush_icache_range((unsigned long) buf, + (unsigned long) buf + TMPL_END_IDX + + op->optinsn.size + RELATIVEJUMP_SIZE); diff --git a/queue-4.4/mac80211-remove-bug-when-interface-type-is-invalid.patch b/queue-4.4/mac80211-remove-bug-when-interface-type-is-invalid.patch new file mode 100644 index 00000000000..9f48e74d4c4 --- /dev/null +++ b/queue-4.4/mac80211-remove-bug-when-interface-type-is-invalid.patch @@ -0,0 +1,36 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Luca Coelho +Date: Sun, 29 Oct 2017 11:51:10 +0200 +Subject: mac80211: remove BUG() when interface type is invalid + +From: Luca Coelho + + +[ Upstream commit c7976f5272486e4ff406014c4b43e2fa3b70b052 ] + +In the ieee80211_setup_sdata() we check if the interface type is valid +and, if not, call BUG(). This should never happen, but if there is +something wrong with the code, it will not be caught until the bug +happens when an interface is being set up. Calling BUG() is too +extreme for this and a WARN_ON() would be better used instead. Change +that. + +Signed-off-by: Luca Coelho +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + net/mac80211/iface.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -1441,7 +1441,7 @@ static void ieee80211_setup_sdata(struct + break; + case NL80211_IFTYPE_UNSPECIFIED: + case NUM_NL80211_IFTYPES: +- BUG(); ++ WARN_ON(1); + break; + } + diff --git a/queue-4.4/mac80211_hwsim-enforce-ps_manual_poll-to-be-set-after-ps_enabled.patch b/queue-4.4/mac80211_hwsim-enforce-ps_manual_poll-to-be-set-after-ps_enabled.patch new file mode 100644 index 00000000000..cfe09e4cc9e --- /dev/null +++ b/queue-4.4/mac80211_hwsim-enforce-ps_manual_poll-to-be-set-after-ps_enabled.patch @@ -0,0 +1,60 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Adiel Aloni +Date: Fri, 1 Dec 2017 13:50:53 +0200 +Subject: mac80211_hwsim: enforce PS_MANUAL_POLL to be set after PS_ENABLED + +From: Adiel Aloni + + +[ Upstream commit e16ea4bb516bc21ea2202f2107718b29218bea59 ] + +Enforce using PS_MANUAL_POLL in ps hwsim debugfs to trigger a poll, +only if PS_ENABLED was set before. +This is required due to commit c9491367b759 ("mac80211: always update the +PM state of a peer on MGMT / DATA frames") that enforces the ap to +check only mgmt/data frames ps bit, and then update station's power save +accordingly. +When sending only ps-poll (control frame) the ap will not be aware that +the station entered power save. +Setting ps enable before triggering ps_poll, will send NDP with PM bit +enabled first. + +Signed-off-by: Adiel Aloni +Signed-off-by: Luca Coelho +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/mac80211_hwsim.c | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +--- a/drivers/net/wireless/mac80211_hwsim.c ++++ b/drivers/net/wireless/mac80211_hwsim.c +@@ -699,16 +699,21 @@ static int hwsim_fops_ps_write(void *dat + val != PS_MANUAL_POLL) + return -EINVAL; + +- old_ps = data->ps; +- data->ps = val; +- +- local_bh_disable(); + if (val == PS_MANUAL_POLL) { ++ if (data->ps != PS_ENABLED) ++ return -EINVAL; ++ local_bh_disable(); + ieee80211_iterate_active_interfaces_atomic( + data->hw, IEEE80211_IFACE_ITER_NORMAL, + hwsim_send_ps_poll, data); +- data->ps_poll_pending = true; +- } else if (old_ps == PS_DISABLED && val != PS_DISABLED) { ++ local_bh_enable(); ++ return 0; ++ } ++ old_ps = data->ps; ++ data->ps = val; ++ ++ local_bh_disable(); ++ if (old_ps == PS_DISABLED && val != PS_DISABLED) { + ieee80211_iterate_active_interfaces_atomic( + data->hw, IEEE80211_IFACE_ITER_NORMAL, + hwsim_send_nullfunc_ps, data); diff --git a/queue-4.4/md-raid6-fix-anomily-when-recovering-a-single-device-in-raid6.patch b/queue-4.4/md-raid6-fix-anomily-when-recovering-a-single-device-in-raid6.patch new file mode 100644 index 00000000000..f986698cc68 --- /dev/null +++ b/queue-4.4/md-raid6-fix-anomily-when-recovering-a-single-device-in-raid6.patch @@ -0,0 +1,65 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: NeilBrown +Date: Mon, 3 Apr 2017 12:11:32 +1000 +Subject: md/raid6: Fix anomily when recovering a single device in RAID6. + +From: NeilBrown + + +[ Upstream commit 7471fb77ce4dc4cb81291189947fcdf621a97987 ] + +When recoverying a single missing/failed device in a RAID6, +those stripes where the Q block is on the missing device are +handled a bit differently. In these cases it is easy to +check that the P block is correct, so we do. This results +in the P block be destroy. Consequently the P block needs +to be read a second time in order to compute Q. This causes +lots of seeks and hurts performance. + +It shouldn't be necessary to re-read P as it can be computed +from the DATA. But we only compute blocks on missing +devices, since c337869d9501 ("md: do not compute parity +unless it is on a failed drive"). + +So relax the change made in that commit to allow computing +of the P block in a RAID6 which it is the only missing that +block. + +This makes RAID6 recovery run much faster as the disk just +"before" the recovering device is no longer seeking +back-and-forth. + +Reported-by-tested-by: Brad Campbell +Reviewed-by: Dan Williams +Signed-off-by: NeilBrown +Signed-off-by: Shaohua Li +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/md/raid5.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +--- a/drivers/md/raid5.c ++++ b/drivers/md/raid5.c +@@ -3372,9 +3372,20 @@ static int fetch_block(struct stripe_hea + BUG_ON(test_bit(R5_Wantcompute, &dev->flags)); + BUG_ON(test_bit(R5_Wantread, &dev->flags)); + BUG_ON(sh->batch_head); ++ ++ /* ++ * In the raid6 case if the only non-uptodate disk is P ++ * then we already trusted P to compute the other failed ++ * drives. It is safe to compute rather than re-read P. ++ * In other cases we only compute blocks from failed ++ * devices, otherwise check/repair might fail to detect ++ * a real inconsistency. ++ */ ++ + if ((s->uptodate == disks - 1) && ++ ((sh->qd_idx >= 0 && sh->pd_idx == disk_idx) || + (s->failed && (disk_idx == s->failed_num[0] || +- disk_idx == s->failed_num[1]))) { ++ disk_idx == s->failed_num[1])))) { + /* have disk failed, and we're requested to fetch it; + * do compute it + */ diff --git a/queue-4.4/media-cpia2-fix-a-couple-off-by-one-bugs.patch b/queue-4.4/media-cpia2-fix-a-couple-off-by-one-bugs.patch new file mode 100644 index 00000000000..66784483508 --- /dev/null +++ b/queue-4.4/media-cpia2-fix-a-couple-off-by-one-bugs.patch @@ -0,0 +1,46 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Dan Carpenter +Date: Thu, 9 Nov 2017 16:28:14 -0500 +Subject: media: cpia2: Fix a couple off by one bugs + +From: Dan Carpenter + + +[ Upstream commit d5ac225c7d64c9c3ef821239edc035634e594ec9 ] + +The cam->buffers[] array has cam->num_frames elements so the > needs to +be changed to >= to avoid going beyond the end of the array. The +->buffers[] array is allocated in cpia2_allocate_buffers() if you want +to confirm. + +Fixes: ab33d5071de7 ("V4L/DVB (3376): Add cpia2 camera support") + +Signed-off-by: Dan Carpenter +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/media/usb/cpia2/cpia2_v4l.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/media/usb/cpia2/cpia2_v4l.c ++++ b/drivers/media/usb/cpia2/cpia2_v4l.c +@@ -812,7 +812,7 @@ static int cpia2_querybuf(struct file *f + struct camera_data *cam = video_drvdata(file); + + if(buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE || +- buf->index > cam->num_frames) ++ buf->index >= cam->num_frames) + return -EINVAL; + + buf->m.offset = cam->buffers[buf->index].data - cam->frame_buffer; +@@ -863,7 +863,7 @@ static int cpia2_qbuf(struct file *file, + + if(buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE || + buf->memory != V4L2_MEMORY_MMAP || +- buf->index > cam->num_frames) ++ buf->index >= cam->num_frames) + return -EINVAL; + + DBG("QBUF #%d\n", buf->index); diff --git a/queue-4.4/media-i2c-soc_camera-fix-ov6650-sensor-getting-wrong-clock.patch b/queue-4.4/media-i2c-soc_camera-fix-ov6650-sensor-getting-wrong-clock.patch new file mode 100644 index 00000000000..cd0d22147bb --- /dev/null +++ b/queue-4.4/media-i2c-soc_camera-fix-ov6650-sensor-getting-wrong-clock.patch @@ -0,0 +1,41 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Janusz Krzysztofik +Date: Wed, 15 Jun 2016 19:29:50 -0300 +Subject: [media] media: i2c/soc_camera: fix ov6650 sensor getting wrong clock + +From: Janusz Krzysztofik + + +[ Upstream commit 54449af0e0b2ea43a8166611c95b730c850c3184 ] + +After changes to v4l2_clk API introduced in v4.1 by commits a37462b919 +'[media] V4L: remove clock name from v4l2_clk API' and 4f528afcfb +'[media] V4L: add CCF support to the v4l2_clk API', ov6650 sensor +stopped responding because v4l2_clk_get(), still called with +depreciated V4L2 clock name "mclk", started to return respective CCF +clock instead of the V4l2 one registered by soc_camera. Fix it by +calling v4l2_clk_get() with NULL clock name. + +Created and tested on Amstrad Delta against Linux-4.7-rc3 with +omap1_camera fixes. + +Signed-off-by: Janusz Krzysztofik +Signed-off-by: Guennadi Liakhovetski +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/media/i2c/soc_camera/ov6650.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/media/i2c/soc_camera/ov6650.c ++++ b/drivers/media/i2c/soc_camera/ov6650.c +@@ -1033,7 +1033,7 @@ static int ov6650_probe(struct i2c_clien + priv->code = MEDIA_BUS_FMT_YUYV8_2X8; + priv->colorspace = V4L2_COLORSPACE_JPEG; + +- priv->clk = v4l2_clk_get(&client->dev, "mclk"); ++ priv->clk = v4l2_clk_get(&client->dev, NULL); + if (IS_ERR(priv->clk)) { + ret = PTR_ERR(priv->clk); + goto eclkget; diff --git a/queue-4.4/mips-bpf-fix-multiple-problems-in-jit-skb-access-helpers.patch b/queue-4.4/mips-bpf-fix-multiple-problems-in-jit-skb-access-helpers.patch new file mode 100644 index 00000000000..6fa9eb097b2 --- /dev/null +++ b/queue-4.4/mips-bpf-fix-multiple-problems-in-jit-skb-access-helpers.patch @@ -0,0 +1,87 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: David Daney +Date: Tue, 14 Mar 2017 14:21:44 -0700 +Subject: MIPS: BPF: Fix multiple problems in JIT skb access helpers. + +From: David Daney + + +[ Upstream commit a81507c79f4ae9a0f9fb1054b59b62a090620dd9 ] + +o Socket data is unsigned, so use unsigned accessors instructions. + + o Fix path result pointer generation arithmetic. + + o Fix half-word byte swapping code for unsigned semantics. + +Signed-off-by: David Daney +Cc: James Hogan +Cc: Alexei Starovoitov +Cc: Steven J. Hill +Cc: linux-mips@linux-mips.org +Cc: netdev@vger.kernel.org +Cc: linux-kernel@vger.kernel.org +Patchwork: https://patchwork.linux-mips.org/patch/15747/ +Signed-off-by: Ralf Baechle +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/mips/net/bpf_jit_asm.S | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +--- a/arch/mips/net/bpf_jit_asm.S ++++ b/arch/mips/net/bpf_jit_asm.S +@@ -90,18 +90,14 @@ FEXPORT(sk_load_half_positive) + is_offset_in_header(2, half) + /* Offset within header boundaries */ + PTR_ADDU t1, $r_skb_data, offset +- .set reorder +- lh $r_A, 0(t1) +- .set noreorder ++ lhu $r_A, 0(t1) + #ifdef CONFIG_CPU_LITTLE_ENDIAN + # if defined(__mips_isa_rev) && (__mips_isa_rev >= 2) +- wsbh t0, $r_A +- seh $r_A, t0 ++ wsbh $r_A, $r_A + # else +- sll t0, $r_A, 24 +- andi t1, $r_A, 0xff00 +- sra t0, t0, 16 +- srl t1, t1, 8 ++ sll t0, $r_A, 8 ++ srl t1, $r_A, 8 ++ andi t0, t0, 0xff00 + or $r_A, t0, t1 + # endif + #endif +@@ -115,7 +111,7 @@ FEXPORT(sk_load_byte_positive) + is_offset_in_header(1, byte) + /* Offset within header boundaries */ + PTR_ADDU t1, $r_skb_data, offset +- lb $r_A, 0(t1) ++ lbu $r_A, 0(t1) + jr $r_ra + move $r_ret, zero + END(sk_load_byte) +@@ -139,6 +135,11 @@ FEXPORT(sk_load_byte_positive) + * (void *to) is returned in r_s0 + * + */ ++#ifdef CONFIG_CPU_LITTLE_ENDIAN ++#define DS_OFFSET(SIZE) (4 * SZREG) ++#else ++#define DS_OFFSET(SIZE) ((4 * SZREG) + (4 - SIZE)) ++#endif + #define bpf_slow_path_common(SIZE) \ + /* Quick check. Are we within reasonable boundaries? */ \ + LONG_ADDIU $r_s1, $r_skb_len, -SIZE; \ +@@ -150,7 +151,7 @@ FEXPORT(sk_load_byte_positive) + PTR_LA t0, skb_copy_bits; \ + PTR_S $r_ra, (5 * SZREG)($r_sp); \ + /* Assign low slot to a2 */ \ +- move a2, $r_sp; \ ++ PTR_ADDIU a2, $r_sp, DS_OFFSET(SIZE); \ + jalr t0; \ + /* Reset our destination slot (DS but it's ok) */ \ + INT_S zero, (4 * SZREG)($r_sp); \ diff --git a/queue-4.4/mips-bpf-quit-clobbering-callee-saved-registers-in-jit-code.patch b/queue-4.4/mips-bpf-quit-clobbering-callee-saved-registers-in-jit-code.patch new file mode 100644 index 00000000000..d93a50a4753 --- /dev/null +++ b/queue-4.4/mips-bpf-quit-clobbering-callee-saved-registers-in-jit-code.patch @@ -0,0 +1,71 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: David Daney +Date: Tue, 14 Mar 2017 14:21:43 -0700 +Subject: MIPS: BPF: Quit clobbering callee saved registers in JIT code. + +From: David Daney + + +[ Upstream commit 1ef0910cfd681f0bd0b81f8809935b2006e9cfb9 ] + +If bpf_needs_clear_a() returns true, only actually clear it if it is +ever used. If it is not used, we don't save and restore it, so the +clearing has the nasty side effect of clobbering caller state. + +Also, don't emit stack pointer adjustment instructions if the +adjustment amount is zero. + +Signed-off-by: David Daney +Cc: James Hogan +Cc: Alexei Starovoitov +Cc: Steven J. Hill +Cc: linux-mips@linux-mips.org +Cc: netdev@vger.kernel.org +Cc: linux-kernel@vger.kernel.org +Patchwork: https://patchwork.linux-mips.org/patch/15745/ +Signed-off-by: Ralf Baechle +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/mips/net/bpf_jit.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +--- a/arch/mips/net/bpf_jit.c ++++ b/arch/mips/net/bpf_jit.c +@@ -527,7 +527,8 @@ static void save_bpf_jit_regs(struct jit + u32 sflags, tmp_flags; + + /* Adjust the stack pointer */ +- emit_stack_offset(-align_sp(offset), ctx); ++ if (offset) ++ emit_stack_offset(-align_sp(offset), ctx); + + tmp_flags = sflags = ctx->flags >> SEEN_SREG_SFT; + /* sflags is essentially a bitmap */ +@@ -579,7 +580,8 @@ static void restore_bpf_jit_regs(struct + emit_load_stack_reg(r_ra, r_sp, real_off, ctx); + + /* Restore the sp and discard the scrach memory */ +- emit_stack_offset(align_sp(offset), ctx); ++ if (offset) ++ emit_stack_offset(align_sp(offset), ctx); + } + + static unsigned int get_stack_depth(struct jit_ctx *ctx) +@@ -626,8 +628,14 @@ static void build_prologue(struct jit_ct + if (ctx->flags & SEEN_X) + emit_jit_reg_move(r_X, r_zero, ctx); + +- /* Do not leak kernel data to userspace */ +- if (bpf_needs_clear_a(&ctx->skf->insns[0])) ++ /* ++ * Do not leak kernel data to userspace, we only need to clear ++ * r_A if it is ever used. In fact if it is never used, we ++ * will not save/restore it, so clearing it in this case would ++ * corrupt the state of the caller. ++ */ ++ if (bpf_needs_clear_a(&ctx->skf->insns[0]) && ++ (ctx->flags & SEEN_A)) + emit_jit_reg_move(r_A, r_zero, ctx); + } + diff --git a/queue-4.4/mips-r2-on-r6-emu-clear-bltzall-and-bgezall-debugfs-counters.patch b/queue-4.4/mips-r2-on-r6-emu-clear-bltzall-and-bgezall-debugfs-counters.patch new file mode 100644 index 00000000000..86bbd469773 --- /dev/null +++ b/queue-4.4/mips-r2-on-r6-emu-clear-bltzall-and-bgezall-debugfs-counters.patch @@ -0,0 +1,49 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Aleksandar Markovic +Date: Mon, 13 Mar 2017 16:36:36 +0100 +Subject: MIPS: r2-on-r6-emu: Clear BLTZALL and BGEZALL debugfs counters + +From: Aleksandar Markovic + + +[ Upstream commit 411dac79cc2ed80f7e348ccc23eb4d8b0ba9f6d5 ] + +Add missing clearing of BLTZALL and BGEZALL emulation counters in +function mipsr2_stats_clear_show(). + +Previously, it was not possible to reset BLTZALL and BGEZALL +emulation counters - their value remained the same even after +explicit request via debugfs. As far as other related counters +are concerned, they all seem to be properly cleared. + +This change affects debugfs operation only, core R2 emulation +functionality is not affected. + +Signed-off-by: Aleksandar Markovic +Reviewed-by: Paul Burton +Cc: james.hogan@imgtec.com +Cc: leonid.yegoshin@imgtec.com +Cc: douglas.leung@imgtec.com +Cc: petar.jovanovic@imgtec.com +Cc: miodrag.dinic@imgtec.com +Cc: goran.ferenc@imgtec.com +Cc: linux-mips@linux-mips.org +Patchwork: https://patchwork.linux-mips.org/patch/15517/ +Signed-off-by: Ralf Baechle +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/mips/kernel/mips-r2-to-r6-emul.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/mips/kernel/mips-r2-to-r6-emul.c ++++ b/arch/mips/kernel/mips-r2-to-r6-emul.c +@@ -2340,6 +2340,8 @@ static int mipsr2_stats_clear_show(struc + __this_cpu_write((mipsr2bremustats).bgezl, 0); + __this_cpu_write((mipsr2bremustats).bltzll, 0); + __this_cpu_write((mipsr2bremustats).bgezll, 0); ++ __this_cpu_write((mipsr2bremustats).bltzall, 0); ++ __this_cpu_write((mipsr2bremustats).bgezall, 0); + __this_cpu_write((mipsr2bremustats).bltzal, 0); + __this_cpu_write((mipsr2bremustats).bgezal, 0); + __this_cpu_write((mipsr2bremustats).beql, 0); diff --git a/queue-4.4/mips-r2-on-r6-emu-fix-blezl-and-bgtzl-identification.patch b/queue-4.4/mips-r2-on-r6-emu-fix-blezl-and-bgtzl-identification.patch new file mode 100644 index 00000000000..1c5986ddbe2 --- /dev/null +++ b/queue-4.4/mips-r2-on-r6-emu-fix-blezl-and-bgtzl-identification.patch @@ -0,0 +1,72 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Leonid Yegoshin +Date: Mon, 13 Mar 2017 16:36:35 +0100 +Subject: MIPS: r2-on-r6-emu: Fix BLEZL and BGTZL identification + +From: Leonid Yegoshin + + +[ Upstream commit 5bba7aa4958e271c3ffceb70d47d3206524cf489 ] + +Fix the problem of inaccurate identification of instructions BLEZL and +BGTZL in R2 emulation code by making sure all necessary encoding +specifications are met. + +Previously, certain R6 instructions could be identified as BLEZL or +BGTZL. R2 emulation routine didn't take into account that both BLEZL +and BGTZL instructions require their rt field (bits 20 to 16 of +instruction encoding) to be 0, and that, at same time, if the value in +that field is not 0, the encoding may represent a legitimate MIPS R6 +instruction. + +This means that a problem could occur after emulation optimization, +when emulation routine tried to pipeline emulation, picked up a next +candidate, and subsequently misrecognized an R6 instruction as BLEZL +or BGTZL. + +It should be said that for single pass strategy, the problem does not +happen because CPU doesn't trap on branch-compacts which share opcode +space with BLEZL/BGTZL (but have rt field != 0, of course). + +Signed-off-by: Leonid Yegoshin +Signed-off-by: Miodrag Dinic +Signed-off-by: Aleksandar Markovic +Reported-by: Douglas Leung +Reviewed-by: Paul Burton +Cc: james.hogan@imgtec.com +Cc: petar.jovanovic@imgtec.com +Cc: goran.ferenc@imgtec.com +Cc: linux-mips@linux-mips.org +Patchwork: https://patchwork.linux-mips.org/patch/15456/ +Signed-off-by: Ralf Baechle +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/mips/kernel/mips-r2-to-r6-emul.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +--- a/arch/mips/kernel/mips-r2-to-r6-emul.c ++++ b/arch/mips/kernel/mips-r2-to-r6-emul.c +@@ -1097,10 +1097,20 @@ repeat: + } + break; + +- case beql_op: +- case bnel_op: + case blezl_op: + case bgtzl_op: ++ /* ++ * For BLEZL and BGTZL, rt field must be set to 0. If this ++ * is not the case, this may be an encoding of a MIPS R6 ++ * instruction, so return to CPU execution if this occurs ++ */ ++ if (MIPSInst_RT(inst)) { ++ err = SIGILL; ++ break; ++ } ++ /* fall through */ ++ case beql_op: ++ case bnel_op: + if (delay_slot(regs)) { + err = SIGILL; + break; diff --git a/queue-4.4/mm-fix-false-positive-vm_bug_on-in-page_cache_-get-add-_speculative.patch b/queue-4.4/mm-fix-false-positive-vm_bug_on-in-page_cache_-get-add-_speculative.patch new file mode 100644 index 00000000000..5ecd102e47d --- /dev/null +++ b/queue-4.4/mm-fix-false-positive-vm_bug_on-in-page_cache_-get-add-_speculative.patch @@ -0,0 +1,74 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: "Kirill A. Shutemov" +Date: Fri, 24 Mar 2017 14:13:05 +0300 +Subject: mm: Fix false-positive VM_BUG_ON() in page_cache_{get,add}_speculative() + +From: "Kirill A. Shutemov" + + +[ Upstream commit 591a3d7c09fa08baff48ad86c2347dbd28a52753 ] + +0day testing by Fengguang Wu triggered this crash while running Trinity: + + kernel BUG at include/linux/pagemap.h:151! + ... + CPU: 0 PID: 458 Comm: trinity-c0 Not tainted 4.11.0-rc2-00251-g2947ba0 #1 + ... + Call Trace: + __get_user_pages_fast() + get_user_pages_fast() + get_futex_key() + futex_requeue() + do_futex() + SyS_futex() + do_syscall_64() + entry_SYSCALL64_slow_path() + +It' VM_BUG_ON() due to false-negative in_atomic(). We call +page_cache_get_speculative() with disabled local interrupts. +It should be atomic enough. + +So let's check for disabled interrupts in the VM_BUG_ON() condition +too, to resolve this. + +( This got triggered by the conversion of the x86 GUP code to the + generic GUP code. ) + +Reported-by: Fengguang Wu +Signed-off-by: Kirill A. Shutemov +Cc: Andrew Morton +Cc: Aneesh Kumar K.V +Cc: Kirill A. Shutemov +Cc: LKP +Cc: Linus Torvalds +Cc: Peter Zijlstra +Cc: Thomas Gleixner +Cc: linux-mm@kvack.org +Link: http://lkml.kernel.org/r/20170324114709.pcytvyb3d6ajux33@black.fi.intel.com +Signed-off-by: Ingo Molnar +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + include/linux/pagemap.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/include/linux/pagemap.h ++++ b/include/linux/pagemap.h +@@ -153,7 +153,7 @@ static inline int page_cache_get_specula + + #ifdef CONFIG_TINY_RCU + # ifdef CONFIG_PREEMPT_COUNT +- VM_BUG_ON(!in_atomic()); ++ VM_BUG_ON(!in_atomic() && !irqs_disabled()); + # endif + /* + * Preempt must be disabled here - we rely on rcu_read_lock doing +@@ -191,7 +191,7 @@ static inline int page_cache_add_specula + + #if !defined(CONFIG_SMP) && defined(CONFIG_TREE_RCU) + # ifdef CONFIG_PREEMPT_COUNT +- VM_BUG_ON(!in_atomic()); ++ VM_BUG_ON(!in_atomic() && !irqs_disabled()); + # endif + VM_BUG_ON_PAGE(page_count(page) == 0, page); + atomic_add(count, &page->_count); diff --git a/queue-4.4/mtd-nand-fix-interpretation-of-nand_cmd_none-in-nand_command.patch b/queue-4.4/mtd-nand-fix-interpretation-of-nand_cmd_none-in-nand_command.patch new file mode 100644 index 00000000000..873aa0fecb2 --- /dev/null +++ b/queue-4.4/mtd-nand-fix-interpretation-of-nand_cmd_none-in-nand_command.patch @@ -0,0 +1,70 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Miquel Raynal +Date: Wed, 8 Nov 2017 17:00:27 +0100 +Subject: mtd: nand: fix interpretation of NAND_CMD_NONE in nand_command[_lp]() + +From: Miquel Raynal + + +[ Upstream commit df467899da0b71465760b4e35127bce837244eee ] + +Some drivers (like nand_hynix.c) call ->cmdfunc() with NAND_CMD_NONE +and a column address and expect the controller to only send address +cycles. Right now, the default ->cmdfunc() implementations provided by +the core do not filter out the command cycle in this case and forwards +the request to the controller driver through the ->cmd_ctrl() method. +The thing is, NAND controller drivers can get this wrong and send a +command cycle with a NAND_CMD_NONE opcode and since NAND_CMD_NONE is +-1, and the command field is usually casted to an u8, we end up sending +the 0xFF command which is actually a RESET operation. + +Add conditions in nand_command[_lp]() functions to sending the initial +command cycle when command == NAND_CMD_NONE. + +Signed-off-by: Miquel Raynal +Signed-off-by: Boris Brezillon +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mtd/nand/nand_base.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +--- a/drivers/mtd/nand/nand_base.c ++++ b/drivers/mtd/nand/nand_base.c +@@ -626,7 +626,8 @@ static void nand_command(struct mtd_info + chip->cmd_ctrl(mtd, readcmd, ctrl); + ctrl &= ~NAND_CTRL_CHANGE; + } +- chip->cmd_ctrl(mtd, command, ctrl); ++ if (command != NAND_CMD_NONE) ++ chip->cmd_ctrl(mtd, command, ctrl); + + /* Address cycle, when necessary */ + ctrl = NAND_CTRL_ALE | NAND_CTRL_CHANGE; +@@ -655,6 +656,7 @@ static void nand_command(struct mtd_info + */ + switch (command) { + ++ case NAND_CMD_NONE: + case NAND_CMD_PAGEPROG: + case NAND_CMD_ERASE1: + case NAND_CMD_ERASE2: +@@ -717,7 +719,9 @@ static void nand_command_lp(struct mtd_i + } + + /* Command latch cycle */ +- chip->cmd_ctrl(mtd, command, NAND_NCE | NAND_CLE | NAND_CTRL_CHANGE); ++ if (command != NAND_CMD_NONE) ++ chip->cmd_ctrl(mtd, command, ++ NAND_NCE | NAND_CLE | NAND_CTRL_CHANGE); + + if (column != -1 || page_addr != -1) { + int ctrl = NAND_CTRL_CHANGE | NAND_NCE | NAND_ALE; +@@ -750,6 +754,7 @@ static void nand_command_lp(struct mtd_i + */ + switch (command) { + ++ case NAND_CMD_NONE: + case NAND_CMD_CACHEDPROG: + case NAND_CMD_PAGEPROG: + case NAND_CMD_ERASE1: diff --git a/queue-4.4/mtd-nand-ifc-update-bufnum-mask-for-ver-2.0.0.patch b/queue-4.4/mtd-nand-ifc-update-bufnum-mask-for-ver-2.0.0.patch new file mode 100644 index 00000000000..9201aa17a87 --- /dev/null +++ b/queue-4.4/mtd-nand-ifc-update-bufnum-mask-for-ver-2.0.0.patch @@ -0,0 +1,40 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Jagdish Gediya +Date: Thu, 23 Nov 2017 17:04:31 +0530 +Subject: mtd: nand: ifc: update bufnum mask for ver >= 2.0.0 + +From: Jagdish Gediya + + +[ Upstream commit bccb06c353af3764ca86d9da47652458e6c2eb41 ] + +Bufnum mask is used to calculate page position in the internal SRAM. + +As IFC version 2.0.0 has 16KB of internal SRAM as compared to older +versions which had 8KB. Hence bufnum mask needs to be updated. + +Signed-off-by: Jagdish Gediya +Signed-off-by: Prabhakar Kushwaha +Signed-off-by: Boris Brezillon +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mtd/nand/fsl_ifc_nand.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/mtd/nand/fsl_ifc_nand.c ++++ b/drivers/mtd/nand/fsl_ifc_nand.c +@@ -988,6 +988,13 @@ static int fsl_ifc_chip_init(struct fsl_ + if (ctrl->version == FSL_IFC_VERSION_1_1_0) + fsl_ifc_sram_init(priv); + ++ /* ++ * As IFC version 2.0.0 has 16KB of internal SRAM as compared to older ++ * versions which had 8KB. Hence bufnum mask needs to be updated. ++ */ ++ if (ctrl->version >= FSL_IFC_VERSION_2_0_0) ++ priv->bufnum_mask = (priv->bufnum_mask * 2) + 1; ++ + return 0; + } + diff --git a/queue-4.4/net-8021q-create-device-with-all-possible-features-in-wanted_features.patch b/queue-4.4/net-8021q-create-device-with-all-possible-features-in-wanted_features.patch new file mode 100644 index 00000000000..d707cd2f812 --- /dev/null +++ b/queue-4.4/net-8021q-create-device-with-all-possible-features-in-wanted_features.patch @@ -0,0 +1,102 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Andrey Vagin +Date: Wed, 15 Mar 2017 17:41:14 -0700 +Subject: net/8021q: create device with all possible features in wanted_features + +From: Andrey Vagin + + +[ Upstream commit 88997e4208aea117627898e5f6f9801cf3cd42d2 ] + +wanted_features is a set of features which have to be enabled if a +hardware allows that. + +Currently when a vlan device is created, its wanted_features is set to +current features of its base device. + +The problem is that the base device can get new features and they are +not propagated to vlan-s of this device. + +If we look at bonding devices, they doesn't have this problem and this +patch suggests to fix this issue by the same way how it works for bonding +devices. + +We meet this problem, when we try to create a vlan device over a bonding +device. When a system are booting, real devices require time to be +initialized, so bonding devices created without slaves, then vlan +devices are created and only then ethernet devices are added to the +bonding device. As a result we have vlan devices with disabled +scatter-gather. + +* create a bonding device + $ ip link add bond0 type bond + $ ethtool -k bond0 | grep scatter + scatter-gather: off + tx-scatter-gather: off [requested on] + tx-scatter-gather-fraglist: off [requested on] + +* create a vlan device + $ ip link add link bond0 name bond0.10 type vlan id 10 + $ ethtool -k bond0.10 | grep scatter + scatter-gather: off + tx-scatter-gather: off + tx-scatter-gather-fraglist: off + +* Add a slave device to bond0 + $ ip link set dev eth0 master bond0 + +And now we can see that the bond0 device has got the scatter-gather +feature, but the bond0.10 hasn't got it. +[root@laptop linux-task-diag]# ethtool -k bond0 | grep scatter +scatter-gather: on + tx-scatter-gather: on + tx-scatter-gather-fraglist: on +[root@laptop linux-task-diag]# ethtool -k bond0.10 | grep scatter +scatter-gather: off + tx-scatter-gather: off + tx-scatter-gather-fraglist: off + +With this patch the vlan device will get all new features from the +bonding device. + +Here is a call trace how features which are set in this patch reach +dev->wanted_features. + +register_netdevice + vlan_dev_init + ... + dev->hw_features = NETIF_F_HW_CSUM | NETIF_F_SG | + NETIF_F_FRAGLIST | NETIF_F_GSO_SOFTWARE | + NETIF_F_HIGHDMA | NETIF_F_SCTP_CRC | + NETIF_F_ALL_FCOE; + + dev->features |= dev->hw_features; + ... + dev->wanted_features = dev->features & dev->hw_features; + __netdev_update_features(dev); + vlan_dev_fix_features + ... + +Cc: Alexey Kuznetsov +Cc: Patrick McHardy +Cc: "David S. Miller" +Signed-off-by: Andrei Vagin +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + net/8021q/vlan_dev.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/net/8021q/vlan_dev.c ++++ b/net/8021q/vlan_dev.c +@@ -559,8 +559,7 @@ static int vlan_dev_init(struct net_devi + NETIF_F_HIGHDMA | NETIF_F_SCTP_CSUM | + NETIF_F_ALL_FCOE; + +- dev->features |= real_dev->vlan_features | NETIF_F_LLTX | +- NETIF_F_GSO_SOFTWARE; ++ dev->features |= dev->hw_features | NETIF_F_LLTX; + dev->gso_max_size = real_dev->gso_max_size; + if (dev->features & NETIF_F_VLAN_FEATURES) + netdev_warn(real_dev, "VLAN features are set incorrectly. Q-in-Q configurations may not work correctly.\n"); diff --git a/queue-4.4/net-faraday-add-missing-include-of-of.h.patch b/queue-4.4/net-faraday-add-missing-include-of-of.h.patch new file mode 100644 index 00000000000..bef3a9983ff --- /dev/null +++ b/queue-4.4/net-faraday-add-missing-include-of-of.h.patch @@ -0,0 +1,33 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Andrew Lunn +Date: Sun, 2 Apr 2017 20:20:47 +0200 +Subject: net/faraday: Add missing include of of.h + +From: Andrew Lunn + + +[ Upstream commit d39004ab136ebb6949a7dda9d24376f3d6209295 ] + +Breaking the include loop netdevice.h, dsa.h, devlink.h broke this +driver, it depends on includes brought in by these headers. Adding +linux/of.h fixes it. + +Fixes: ed0e39e97d34 ("net: break include loop netdevice.h, dsa.h, devlink.h") +Signed-off-by: Andrew Lunn +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/faraday/ftgmac100.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/ethernet/faraday/ftgmac100.c ++++ b/drivers/net/ethernet/faraday/ftgmac100.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/queue-4.4/net-mvpp2-set-dma-mask-and-coherent-dma-mask-on-ppv2.2.patch b/queue-4.4/net-mvpp2-set-dma-mask-and-coherent-dma-mask-on-ppv2.2.patch new file mode 100644 index 00000000000..e42654e046f --- /dev/null +++ b/queue-4.4/net-mvpp2-set-dma-mask-and-coherent-dma-mask-on-ppv2.2.patch @@ -0,0 +1,48 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Thomas Petazzoni +Date: Tue, 7 Mar 2017 16:53:19 +0100 +Subject: net: mvpp2: set dma mask and coherent dma mask on PPv2.2 + +From: Thomas Petazzoni + + +[ Upstream commit 2067e0a13cfe0b1bdca7b91bc5e4f2740b07d478 ] + +On PPv2.2, the streaming mappings can be anywhere in the first 40 bits +of the physical address space. However, for the coherent mappings, we +still need them to be in the first 32 bits of the address space, +because all BM pools share a single register to store the high 32 bits +of the BM pool address, which means all BM pools must be allocated in +the same 4GB memory area. + +Signed-off-by: Thomas Petazzoni +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/marvell/mvpp2.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +--- a/drivers/net/ethernet/marvell/mvpp2.c ++++ b/drivers/net/ethernet/marvell/mvpp2.c +@@ -6448,6 +6448,20 @@ static int mvpp2_probe(struct platform_d + /* Get system's tclk rate */ + priv->tclk = clk_get_rate(priv->pp_clk); + ++ if (priv->hw_version == MVPP22) { ++ err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(40)); ++ if (err) ++ goto err_mg_clk; ++ /* Sadly, the BM pools all share the same register to ++ * store the high 32 bits of their address. So they ++ * must all have the same high 32 bits, which forces ++ * us to restrict coherent memory to DMA_BIT_MASK(32). ++ */ ++ err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); ++ if (err) ++ goto err_mg_clk; ++ } ++ + /* Initialize network controller */ + err = mvpp2_init(pdev, priv); + if (err < 0) { diff --git a/queue-4.4/net-xfrm-allow-clearing-socket-xfrm-policies.patch b/queue-4.4/net-xfrm-allow-clearing-socket-xfrm-policies.patch new file mode 100644 index 00000000000..221192f1070 --- /dev/null +++ b/queue-4.4/net-xfrm-allow-clearing-socket-xfrm-policies.patch @@ -0,0 +1,68 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Lorenzo Colitti +Date: Mon, 20 Nov 2017 19:26:02 +0900 +Subject: net: xfrm: allow clearing socket xfrm policies. + +From: Lorenzo Colitti + + +[ Upstream commit be8f8284cd897af2482d4e54fbc2bdfc15557259 ] + +Currently it is possible to add or update socket policies, but +not clear them. Therefore, once a socket policy has been applied, +the socket cannot be used for unencrypted traffic. + +This patch allows (privileged) users to clear socket policies by +passing in a NULL pointer and zero length argument to the +{IP,IPV6}_{IPSEC,XFRM}_POLICY setsockopts. This results in both +the incoming and outgoing policies being cleared. + +The simple approach taken in this patch cannot clear socket +policies in only one direction. If desired this could be added +in the future, for example by continuing to pass in a length of +zero (which currently is guaranteed to return EMSGSIZE) and +making the policy be a pointer to an integer that contains one +of the XFRM_POLICY_{IN,OUT} enum values. + +An alternative would have been to interpret the length as a +signed integer and use XFRM_POLICY_IN (i.e., 0) to clear the +input policy and -XFRM_POLICY_OUT (i.e., -1) to clear the output +policy. + +Tested: https://android-review.googlesource.com/539816 +Signed-off-by: Lorenzo Colitti +Signed-off-by: Steffen Klassert +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + net/xfrm/xfrm_policy.c | 2 +- + net/xfrm/xfrm_state.c | 7 +++++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +--- a/net/xfrm/xfrm_policy.c ++++ b/net/xfrm/xfrm_policy.c +@@ -1313,7 +1313,7 @@ EXPORT_SYMBOL(xfrm_policy_delete); + + int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol) + { +- struct net *net = xp_net(pol); ++ struct net *net = sock_net(sk); + struct xfrm_policy *old_pol; + + #ifdef CONFIG_XFRM_SUB_POLICY +--- a/net/xfrm/xfrm_state.c ++++ b/net/xfrm/xfrm_state.c +@@ -1845,6 +1845,13 @@ int xfrm_user_policy(struct sock *sk, in + struct xfrm_mgr *km; + struct xfrm_policy *pol = NULL; + ++ if (!optval && !optlen) { ++ xfrm_sk_policy_insert(sk, XFRM_POLICY_IN, NULL); ++ xfrm_sk_policy_insert(sk, XFRM_POLICY_OUT, NULL); ++ __sk_dst_reset(sk); ++ return 0; ++ } ++ + if (optlen <= 0 || optlen > PAGE_SIZE) + return -EMSGSIZE; + diff --git a/queue-4.4/nfc-nfcmrvl-double-free-on-error-path.patch b/queue-4.4/nfc-nfcmrvl-double-free-on-error-path.patch new file mode 100644 index 00000000000..c84f431a605 --- /dev/null +++ b/queue-4.4/nfc-nfcmrvl-double-free-on-error-path.patch @@ -0,0 +1,37 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Dan Carpenter +Date: Wed, 8 Mar 2017 08:22:37 +0300 +Subject: NFC: nfcmrvl: double free on error path + +From: Dan Carpenter + + +[ Upstream commit ca42fb9e52d155547e6cf18cf26bce3e1a6af4ea ] + +The nci_spi_send() function calls kfree_skb(skb) on both error and +success so this extra kfree_skb() is a double free. + +Fixes: caf6e49bf6d0 ("NFC: nfcmrvl: add spi driver") +Signed-off-by: Dan Carpenter +Signed-off-by: Samuel Ortiz +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/nfc/nfcmrvl/spi.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +--- a/drivers/nfc/nfcmrvl/spi.c ++++ b/drivers/nfc/nfcmrvl/spi.c +@@ -96,10 +96,9 @@ static int nfcmrvl_spi_nci_send(struct n + /* Send the SPI packet */ + err = nci_spi_send(drv_data->nci_spi, &drv_data->handshake_completion, + skb); +- if (err != 0) { ++ if (err) + nfc_err(priv->dev, "spi_send failed %d", err); +- kfree_skb(skb); +- } ++ + return err; + } + diff --git a/queue-4.4/nfc-nfcmrvl-include-unaligned.h-instead-of-access_ok.h.patch b/queue-4.4/nfc-nfcmrvl-include-unaligned.h-instead-of-access_ok.h.patch new file mode 100644 index 00000000000..fc1dc4b428f --- /dev/null +++ b/queue-4.4/nfc-nfcmrvl-include-unaligned.h-instead-of-access_ok.h.patch @@ -0,0 +1,52 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Tobias Klauser +Date: Wed, 26 Oct 2016 11:00:12 +0200 +Subject: NFC: nfcmrvl: Include unaligned.h instead of access_ok.h + +From: Tobias Klauser + + +[ Upstream commit d916d923724d59cde99ee588f15eec59dd863bbd ] + +Including linux/unaligned/access_ok.h causes the allmodconfig build on +ia64 (and maybe others) to fail with the following warnings: + +include/linux/unaligned/access_ok.h:7:19: error: redefinition of 'get_unaligned_le16' +include/linux/unaligned/access_ok.h:12:19: error: redefinition of 'get_unaligned_le32' +include/linux/unaligned/access_ok.h:17:19: error: redefinition of 'get_unaligned_le64' +include/linux/unaligned/access_ok.h:22:19: error: redefinition of 'get_unaligned_be16' +include/linux/unaligned/access_ok.h:27:19: error: redefinition of 'get_unaligned_be32' +include/linux/unaligned/access_ok.h:32:19: error: redefinition of 'get_unaligned_be64' +include/linux/unaligned/access_ok.h:37:20: error: redefinition of 'put_unaligned_le16' +include/linux/unaligned/access_ok.h:42:20: error: redefinition of 'put_unaligned_le32' +include/linux/unaligned/access_ok.h:42:20: error: redefinition of 'put_unaligned_le64' +include/linux/unaligned/access_ok.h:42:20: error: redefinition of 'put_unaligned_be16' +include/linux/unaligned/access_ok.h:42:20: error: redefinition of 'put_unaligned_be32' +include/linux/unaligned/access_ok.h:42:20: error: redefinition of 'put_unaligned_be64' + +Fix these by including asm/unaligned.h instead and leave it up to the +architecture to decide how to implement unaligned accesses. + +Fixes: 3194c6870158 ("NFC: nfcmrvl: add firmware download support") +Reported-by: kbuild test robot +Link: https://lkml.org/lkml/2016/10/22/247 +Cc: Vincent Cuissard +Signed-off-by: Tobias Klauser +Signed-off-by: Samuel Ortiz +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/nfc/nfcmrvl/fw_dnld.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/nfc/nfcmrvl/fw_dnld.c ++++ b/drivers/nfc/nfcmrvl/fw_dnld.c +@@ -17,7 +17,7 @@ + */ + + #include +-#include ++#include + #include + #include + #include diff --git a/queue-4.4/of-fix-of_device_get_modalias-returned-length-when-truncating-buffers.patch b/queue-4.4/of-fix-of_device_get_modalias-returned-length-when-truncating-buffers.patch new file mode 100644 index 00000000000..31838085722 --- /dev/null +++ b/queue-4.4/of-fix-of_device_get_modalias-returned-length-when-truncating-buffers.patch @@ -0,0 +1,37 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Rob Herring +Date: Mon, 16 Jan 2017 14:28:39 -0600 +Subject: of: fix of_device_get_modalias returned length when truncating buffers + +From: Rob Herring + + +[ Upstream commit bcf54d5385abaea9c8026aae6f4eeb348671a52d ] + +If the length of the modalias is greater than the buffer size, then the +modalias is truncated. However the untruncated length is returned which +will cause an error. Fix this to return the truncated length. If an error +in the case was desired, then then we should just return -ENOMEM. + +The reality is no device will ever have 4KB of compatible strings to hit +this case. + +Signed-off-by: Rob Herring +Cc: Frank Rowand +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/of/device.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/of/device.c ++++ b/drivers/of/device.c +@@ -223,7 +223,7 @@ ssize_t of_device_get_modalias(struct de + str[i] = '_'; + } + +- return tsize; ++ return repend; + } + EXPORT_SYMBOL_GPL(of_device_get_modalias); + diff --git a/queue-4.4/pci-msi-stop-disabling-msi-msi-x-in-pci_device_shutdown.patch b/queue-4.4/pci-msi-stop-disabling-msi-msi-x-in-pci_device_shutdown.patch new file mode 100644 index 00000000000..f7341e34f13 --- /dev/null +++ b/queue-4.4/pci-msi-stop-disabling-msi-msi-x-in-pci_device_shutdown.patch @@ -0,0 +1,69 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Prarit Bhargava +Date: Thu, 26 Jan 2017 14:07:47 -0500 +Subject: PCI/MSI: Stop disabling MSI/MSI-X in pci_device_shutdown() + +From: Prarit Bhargava + + +[ Upstream commit fda78d7a0ead144f4b2cdb582dcba47911f4952c ] + +The pci_bus_type .shutdown method, pci_device_shutdown(), is called from +device_shutdown() in the kernel restart and shutdown paths. + +Previously, pci_device_shutdown() called pci_msi_shutdown() and +pci_msix_shutdown(). This disables MSI and MSI-X, which causes the device +to fall back to raising interrupts via INTx. But the driver is still bound +to the device, it doesn't know about this change, and it likely doesn't +have an INTx handler, so these INTx interrupts cause "nobody cared" +warnings like this: + + irq 16: nobody cared (try booting with the "irqpoll" option) + CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.8.2-1.el7_UNSUPPORTED.x86_64 #1 + Hardware name: Hewlett-Packard HP Z820 Workstation/158B, BIOS J63 v03.90 06/ + ... + +The MSI disabling code was added by d52877c7b1af ("pci/irq: let +pci_device_shutdown to call pci_msi_shutdown v2") because a driver left MSI +enabled and kdump failed because the kexeced kernel wasn't prepared to +receive the MSI interrupts. + +Subsequent commits 1851617cd2da ("PCI/MSI: Disable MSI at enumeration even +if kernel doesn't support MSI") and e80e7edc55ba ("PCI/MSI: Initialize MSI +capability for all architectures") changed the kexeced kernel to disable +all MSIs itself so it no longer depends on the crashed kernel to clean up +after itself. + +Stop disabling MSI/MSI-X in pci_device_shutdown(). This resolves the +"nobody cared" unhandled IRQ issue above. It also allows PCI serial +devices, which may rely on the MSI interrupts, to continue outputting +messages during reboot/shutdown. + +[bhelgaas: changelog, drop pci_msi_shutdown() and pci_msix_shutdown() calls +altogether] +Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=187351 +Signed-off-by: Prarit Bhargava +Signed-off-by: Bjorn Helgaas +CC: Alex Williamson +CC: David Arcari +CC: Myron Stowe +CC: Lukas Wunner +CC: Keith Busch +CC: Mika Westerberg +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pci/pci-driver.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/drivers/pci/pci-driver.c ++++ b/drivers/pci/pci-driver.c +@@ -463,8 +463,6 @@ static void pci_device_shutdown(struct d + + if (drv && drv->shutdown) + drv->shutdown(pci_dev); +- pci_msi_shutdown(pci_dev); +- pci_msix_shutdown(pci_dev); + + #ifdef CONFIG_KEXEC_CORE + /* diff --git a/queue-4.4/perf-inject-copy-events-when-reordering-events-in-pipe-mode.patch b/queue-4.4/perf-inject-copy-events-when-reordering-events-in-pipe-mode.patch new file mode 100644 index 00000000000..720d6272cf8 --- /dev/null +++ b/queue-4.4/perf-inject-copy-events-when-reordering-events-in-pipe-mode.patch @@ -0,0 +1,101 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: David Carrillo-Cisneros +Date: Mon, 10 Apr 2017 13:14:27 -0700 +Subject: perf inject: Copy events when reordering events in pipe mode + +From: David Carrillo-Cisneros + + +[ Upstream commit 1e0d4f0200e4dbdfc38d818f329d8a0955f7c6f5 ] + +__perf_session__process_pipe_events reuses the same memory buffer to +process all events in the pipe. + +When reordering is needed (e.g. -b option), events are not immediately +flushed, but kept around until reordering is possible, causing +memory corruption. + +The problem is usually observed by a "Unknown sample error" output. It +can easily be reproduced by: + + perf record -o - noploop | perf inject -b > output + +Committer testing: + +Before: + + $ perf record -o - stress -t 2 -c 2 | perf inject -b > /dev/null + stress: info: [8297] dispatching hogs: 2 cpu, 0 io, 0 vm, 0 hdd + stress: info: [8297] successful run completed in 2s + [ perf record: Woken up 3 times to write data ] + [ perf record: Captured and wrote 0.000 MB - ] + Warning: + Found 1 unknown events! + + Is this an older tool processing a perf.data file generated by a more recent tool? + + If that is not the case, consider reporting to linux-kernel@vger.kernel.org. + + $ + +After: + + $ perf record -o - stress -t 2 -c 2 | perf inject -b > /dev/null + stress: info: [9027] dispatching hogs: 2 cpu, 0 io, 0 vm, 0 hdd + stress: info: [9027] successful run completed in 2s + [ perf record: Woken up 3 times to write data ] + [ perf record: Captured and wrote 0.000 MB - ] + no symbols found in /usr/bin/stress, maybe install a debug package? + no symbols found in /usr/bin/stress, maybe install a debug package? + $ + +Signed-off-by: David Carrillo-Cisneros +Tested-by: Arnaldo Carvalho de Melo +Acked-by: Jiri Olsa +Cc: Alexander Shishkin +Cc: Andi Kleen +Cc: He Kuang +Cc: Masami Hiramatsu +Cc: Paul Turner +Cc: Peter Zijlstra +Cc: Simon Que +Cc: Stephane Eranian +Cc: Wang Nan +Link: http://lkml.kernel.org/r/20170410201432.24807-3-davidcc@google.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + tools/perf/util/ordered-events.c | 3 ++- + tools/perf/util/session.c | 1 + + 2 files changed, 3 insertions(+), 1 deletion(-) + +--- a/tools/perf/util/ordered-events.c ++++ b/tools/perf/util/ordered-events.c +@@ -79,7 +79,7 @@ static union perf_event *dup_event(struc + + static void free_dup_event(struct ordered_events *oe, union perf_event *event) + { +- if (oe->copy_on_queue) { ++ if (event && oe->copy_on_queue) { + oe->cur_alloc_size -= event->header.size; + free(event); + } +@@ -150,6 +150,7 @@ void ordered_events__delete(struct order + list_move(&event->list, &oe->cache); + oe->nr_events--; + free_dup_event(oe, event->event); ++ event->event = NULL; + } + + int ordered_events__queue(struct ordered_events *oe, union perf_event *event, +--- a/tools/perf/util/session.c ++++ b/tools/perf/util/session.c +@@ -1437,6 +1437,7 @@ static int __perf_session__process_pipe_ + buf = malloc(cur_size); + if (!buf) + return -errno; ++ ordered_events__set_copy_on_queue(oe, true); + more: + event = buf; + err = readn(fd, event, sizeof(struct perf_event_header)); diff --git a/queue-4.4/perf-probe-return-errno-when-not-hitting-any-event.patch b/queue-4.4/perf-probe-return-errno-when-not-hitting-any-event.patch new file mode 100644 index 00000000000..3c9fd176839 --- /dev/null +++ b/queue-4.4/perf-probe-return-errno-when-not-hitting-any-event.patch @@ -0,0 +1,59 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Kefeng Wang +Date: Fri, 17 Mar 2017 16:16:32 +0800 +Subject: perf probe: Return errno when not hitting any event + +From: Kefeng Wang + + +[ Upstream commit 70946723eeb859466f026274b29c6196e39149c4 ] + +On old perf, when using 'perf probe -d' to delete an inexistent event, +it returns errno, eg, + + -bash-4.3# perf probe -d xxx || echo $? + Info: Event "*:xxx" does not exist. + Error: Failed to delete events. + 255 + +But now perf_del_probe_events() will always set ret = 0, different from +previous del_perf_probe_events(). After this, it returns errno again, +eg, + + -bash-4.3# ./perf probe -d xxx || echo $? + "xxx" does not hit any event. + Error: Failed to delete events. + 254 + +And it is more appropriate to return -ENOENT instead of -EPERM. + +Signed-off-by: Kefeng Wang +Acked-by: Masami Hiramatsu +Cc: Hanjun Guo +Cc: Jiri Olsa +Cc: Peter Zijlstra +Cc: Wang Nan +Fixes: dddc7ee32fa1 ("perf probe: Fix an error when deleting probes successfully") +Link: http://lkml.kernel.org/r/1489738592-61011-1-git-send-email-wangkefeng.wang@huawei.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + tools/perf/builtin-probe.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/tools/perf/builtin-probe.c ++++ b/tools/perf/builtin-probe.c +@@ -405,9 +405,9 @@ static int perf_del_probe_events(struct + } + + if (ret == -ENOENT && ret2 == -ENOENT) +- pr_debug("\"%s\" does not hit any event.\n", str); +- /* Note that this is silently ignored */ +- ret = 0; ++ pr_warning("\"%s\" does not hit any event.\n", str); ++ else ++ ret = 0; + + error: + if (kfd >= 0) diff --git a/queue-4.4/perf-session-don-t-rely-on-evlist-in-pipe-mode.patch b/queue-4.4/perf-session-don-t-rely-on-evlist-in-pipe-mode.patch new file mode 100644 index 00000000000..313dda02d49 --- /dev/null +++ b/queue-4.4/perf-session-don-t-rely-on-evlist-in-pipe-mode.patch @@ -0,0 +1,66 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: David Carrillo-Cisneros +Date: Mon, 10 Apr 2017 13:14:30 -0700 +Subject: perf session: Don't rely on evlist in pipe mode + +From: David Carrillo-Cisneros + + +[ Upstream commit 0973ad97c187e06aece61f685b9c3b2d93290a73 ] + +Session sets a number parameters that rely on evlist. These parameters +are not used in pipe-mode and should not be set, since evlist is +unavailable. Fix that. + +Signed-off-by: David Carrillo-Cisneros +Acked-by: Jiri Olsa +Cc: Alexander Shishkin +Cc: Andi Kleen +Cc: He Kuang +Cc: Masami Hiramatsu +Cc: Paul Turner +Cc: Peter Zijlstra +Cc: Simon Que +Cc: Stephane Eranian +Cc: Wang Nan +Link: http://lkml.kernel.org/r/20170410201432.24807-6-davidcc@google.com +[ Check if file != NULL in perf_session__new(), like when used by builtin-top.c ] +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + tools/perf/util/session.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +--- a/tools/perf/util/session.c ++++ b/tools/perf/util/session.c +@@ -135,8 +135,14 @@ struct perf_session *perf_session__new(s + if (perf_session__open(session) < 0) + goto out_close; + +- perf_session__set_id_hdr_size(session); +- perf_session__set_comm_exec(session); ++ /* ++ * set session attributes that are present in perf.data ++ * but not in pipe-mode. ++ */ ++ if (!file->is_pipe) { ++ perf_session__set_id_hdr_size(session); ++ perf_session__set_comm_exec(session); ++ } + } + } else { + session->machines.host.env = &perf_env; +@@ -151,7 +157,11 @@ struct perf_session *perf_session__new(s + pr_warning("Cannot read kernel map\n"); + } + +- if (tool && tool->ordering_requires_timestamps && ++ /* ++ * In pipe-mode, evlist is empty until PERF_RECORD_HEADER_ATTR is ++ * processed, so perf_evlist__sample_id_all is not meaningful here. ++ */ ++ if ((!file || !file->is_pipe) && tool && tool->ordering_requires_timestamps && + tool->ordered_events && !perf_evlist__sample_id_all(session->evlist)) { + dump_printf("WARNING: No sample_id_all support, falling back to unordered processing\n"); + tool->ordered_events = false; diff --git a/queue-4.4/perf-sort-fix-segfault-with-basic-block-cycles-sort-dimension.patch b/queue-4.4/perf-sort-fix-segfault-with-basic-block-cycles-sort-dimension.patch new file mode 100644 index 00000000000..e58c059fa94 --- /dev/null +++ b/queue-4.4/perf-sort-fix-segfault-with-basic-block-cycles-sort-dimension.patch @@ -0,0 +1,52 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Changbin Du +Date: Mon, 13 Mar 2017 16:31:48 +0800 +Subject: perf sort: Fix segfault with basic block 'cycles' sort dimension + +From: Changbin Du + + +[ Upstream commit 4b0b3aa6a2756e6115fdf275c521e4552a7082f3 ] + +Skip the sample which doesn't have branch_info to avoid segmentation +fault: + +The fault can be reproduced by: + + perf record -a + perf report -F cycles + +Signed-off-by: Changbin Du +Tested-by: Arnaldo Carvalho de Melo +Cc: Andi Kleen +Cc: Peter Zijlstra +Fixes: 0e332f033a82 ("perf tools: Add support for cycles, weight branch_info field") +Link: http://lkml.kernel.org/r/20170313083148.23568-1-changbin.du@intel.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + tools/perf/util/sort.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/tools/perf/util/sort.c ++++ b/tools/perf/util/sort.c +@@ -604,6 +604,9 @@ static int hist_entry__mispredict_snprin + static int64_t + sort__cycles_cmp(struct hist_entry *left, struct hist_entry *right) + { ++ if (!left->branch_info || !right->branch_info) ++ return cmp_null(left->branch_info, right->branch_info); ++ + return left->branch_info->flags.cycles - + right->branch_info->flags.cycles; + } +@@ -611,6 +614,8 @@ sort__cycles_cmp(struct hist_entry *left + static int hist_entry__cycles_snprintf(struct hist_entry *he, char *bf, + size_t size, unsigned int width) + { ++ if (!he->branch_info) ++ return scnprintf(bf, size, "%-.*s", width, "N/A"); + if (he->branch_info->flags.cycles == 0) + return repsep_snprintf(bf, size, "%-*s", width, "-"); + return repsep_snprintf(bf, size, "%-*hd", width, diff --git a/queue-4.4/perf-tools-make-perf_event__synthesize_mmap_events-scale.patch b/queue-4.4/perf-tools-make-perf_event__synthesize_mmap_events-scale.patch new file mode 100644 index 00000000000..c51a7970526 --- /dev/null +++ b/queue-4.4/perf-tools-make-perf_event__synthesize_mmap_events-scale.patch @@ -0,0 +1,62 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Stephane Eranian +Date: Wed, 15 Mar 2017 10:17:13 -0700 +Subject: perf tools: Make perf_event__synthesize_mmap_events() scale + +From: Stephane Eranian + + +[ Upstream commit 88b897a30c525c2eee6e7f16e1e8d0f18830845e ] + +This patch significantly improves the execution time of +perf_event__synthesize_mmap_events() when running perf record on systems +where processes have lots of threads. + +It just happens that cat /proc/pid/maps support uses a O(N^2) algorithm to +generate each map line in the maps file. If you have 1000 threads, then you +have necessarily 1000 stacks. For each vma, you need to check if it +corresponds to a thread's stack. With a large number of threads, this can take +a very long time. I have seen latencies >> 10mn. + +As of today, perf does not use the fact that a mapping is a stack, therefore we +can work around the issue by using /proc/pid/tasks/pid/maps. This entry does +not try to map a vma to stack and is thus much faster with no loss of +functonality. + +The proc-map-timeout logic is kept in case users still want some upper limit. + +In V2, we fix the file path from /proc/pid/tasks/pid/maps to actual +/proc/pid/task/pid/maps, tasks -> task. Thanks Arnaldo for catching this. + +Committer note: + +This problem seems to have been elliminated in the kernel since commit : +b18cb64ead40 ("fs/proc: Stop trying to report thread stacks"). + +Signed-off-by: Stephane Eranian +Acked-by: Jiri Olsa +Cc: Andy Lutomirski +Cc: Namhyung Kim +Cc: Peter Zijlstra +Link: http://lkml.kernel.org/r/20170315135059.GC2177@redhat.com +Link: http://lkml.kernel.org/r/1489598233-25586-1-git-send-email-eranian@google.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + tools/perf/util/event.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/tools/perf/util/event.c ++++ b/tools/perf/util/event.c +@@ -234,8 +234,8 @@ int perf_event__synthesize_mmap_events(s + if (machine__is_default_guest(machine)) + return 0; + +- snprintf(filename, sizeof(filename), "%s/proc/%d/maps", +- machine->root_dir, pid); ++ snprintf(filename, sizeof(filename), "%s/proc/%d/task/%d/maps", ++ machine->root_dir, pid, pid); + + fp = fopen(filename, "r"); + if (fp == NULL) { diff --git a/queue-4.4/powerpc-avoid-taking-a-data-miss-on-every-userspace-instruction-miss.patch b/queue-4.4/powerpc-avoid-taking-a-data-miss-on-every-userspace-instruction-miss.patch new file mode 100644 index 00000000000..b84d9c22d11 --- /dev/null +++ b/queue-4.4/powerpc-avoid-taking-a-data-miss-on-every-userspace-instruction-miss.patch @@ -0,0 +1,62 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Anton Blanchard +Date: Mon, 3 Apr 2017 16:41:02 +1000 +Subject: powerpc: Avoid taking a data miss on every userspace instruction miss + +From: Anton Blanchard + + +[ Upstream commit a7a9dcd882a67b68568868b988289fce5ffd8419 ] + +Early on in do_page_fault() we call store_updates_sp(), regardless of +the type of exception. For an instruction miss this doesn't make +sense, because we only use this information to detect if a data miss +is the result of a stack expansion instruction or not. + +Worse still, it results in a data miss within every userspace +instruction miss handler, because we try and load the very instruction +we are about to install a pte for! + +A simple exec microbenchmark runs 6% faster on POWER8 with this fix: + + #include + #include + #include + +int main(int argc, char *argv[]) +{ + unsigned long left = atol(argv[1]); + char leftstr[16]; + + if (left-- == 0) + return 0; + + sprintf(leftstr, "%ld", left); + execlp(argv[0], argv[0], leftstr, NULL); + perror("exec failed\n"); + + return 0; +} + +Pass the number of iterations on the command line (eg 10000) and time +how long it takes to execute. + +Signed-off-by: Anton Blanchard +Signed-off-by: Michael Ellerman +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/mm/fault.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/powerpc/mm/fault.c ++++ b/arch/powerpc/mm/fault.c +@@ -294,7 +294,7 @@ int __kprobes do_page_fault(struct pt_re + * can result in fault, which will cause a deadlock when called with + * mmap_sem held + */ +- if (user_mode(regs)) ++ if (!is_exec && user_mode(regs)) + store_update_sp = store_updates_sp(regs); + + if (user_mode(regs)) diff --git a/queue-4.4/powerpc-mm-hugetlb-filter-out-hugepage-size-not-supported-by-page-table-layout.patch b/queue-4.4/powerpc-mm-hugetlb-filter-out-hugepage-size-not-supported-by-page-table-layout.patch new file mode 100644 index 00000000000..1e1467408d7 --- /dev/null +++ b/queue-4.4/powerpc-mm-hugetlb-filter-out-hugepage-size-not-supported-by-page-table-layout.patch @@ -0,0 +1,64 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: "Aneesh Kumar K.V" +Date: Tue, 21 Mar 2017 22:59:56 +0530 +Subject: powerpc/mm/hugetlb: Filter out hugepage size not supported by page table layout + +From: "Aneesh Kumar K.V" + + +[ Upstream commit a525108cf1cc14651602d678da38fa627a76a724 ] + +Without this if firmware reports 1MB page size support we will crash +trying to use 1MB as hugetlb page size. + +echo 300 > /sys/kernel/mm/hugepages/hugepages-1024kB/nr_hugepages + +kernel BUG at ./arch/powerpc/include/asm/hugetlb.h:19! +..... +.... +[c0000000e2c27b30] c00000000029dae8 .hugetlb_fault+0x638/0xda0 +[c0000000e2c27c30] c00000000026fb64 .handle_mm_fault+0x844/0x1d70 +[c0000000e2c27d70] c00000000004805c .do_page_fault+0x3dc/0x7c0 +[c0000000e2c27e30] c00000000000ac98 handle_page_fault+0x10/0x30 + +With fix, we don't enable 1MB as hugepage size. + +bash-4.2# cd /sys/kernel/mm/hugepages/ +bash-4.2# ls +hugepages-16384kB hugepages-16777216kB + +Signed-off-by: Aneesh Kumar K.V +Signed-off-by: Michael Ellerman +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/mm/hugetlbpage.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +--- a/arch/powerpc/mm/hugetlbpage.c ++++ b/arch/powerpc/mm/hugetlbpage.c +@@ -828,6 +828,24 @@ static int __init add_huge_page_size(uns + if ((mmu_psize = shift_to_mmu_psize(shift)) < 0) + return -EINVAL; + ++#ifdef CONFIG_PPC_BOOK3S_64 ++ /* ++ * We need to make sure that for different page sizes reported by ++ * firmware we only add hugetlb support for page sizes that can be ++ * supported by linux page table layout. ++ * For now we have ++ * Radix: 2M ++ * Hash: 16M and 16G ++ */ ++ if (radix_enabled()) { ++ if (mmu_psize != MMU_PAGE_2M) ++ return -EINVAL; ++ } else { ++ if (mmu_psize != MMU_PAGE_16M && mmu_psize != MMU_PAGE_16G) ++ return -EINVAL; ++ } ++#endif ++ + BUG_ON(mmu_psize_defs[mmu_psize].shift != shift); + + /* Return if huge page size has already been setup */ diff --git a/queue-4.4/pwm-tegra-increase-precision-in-pwm-rate-calculation.patch b/queue-4.4/pwm-tegra-increase-precision-in-pwm-rate-calculation.patch new file mode 100644 index 00000000000..f64b8e0b04d --- /dev/null +++ b/queue-4.4/pwm-tegra-increase-precision-in-pwm-rate-calculation.patch @@ -0,0 +1,82 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Laxman Dewangan +Date: Fri, 7 Apr 2017 15:04:00 +0530 +Subject: pwm: tegra: Increase precision in PWM rate calculation + +From: Laxman Dewangan + + +[ Upstream commit 250b76f43f57d578ebff5e7211eb2c73aa5cd6ca ] + +The rate of the PWM calculated as follows: + + hz = NSEC_PER_SEC / period_ns; + rate = (rate + (hz / 2)) / hz; + +This has the precision loss in lower PWM rate. + +Change this to have more precision as: + + hz = DIV_ROUND_CLOSEST_ULL(NSEC_PER_SEC * 100, period_ns); + rate = DIV_ROUND_CLOSEST(rate * 100, hz) + +Example: + +1. period_ns = 16672000, PWM clock rate is 200 KHz. + + Based on old formula + hz = NSEC_PER_SEC / period_ns + = 1000000000ul/16672000 + = 59 (59.98) + rate = (200K + 59/2)/59 = 3390 + + Based on new method: + hz = 5998 + rate = DIV_ROUND_CLOSE(200000*100, 5998) = 3334 + + If we measure the PWM signal rate, we will get more accurate + period with rate value of 3334 instead of 3390. + +2. period_ns = 16803898, PWM clock rate is 200 KHz. + + Based on old formula: + hz = 59, rate = 3390 + + Based on new formula: + hz = 5951, rate = 3360 + + The PWM signal rate of 3360 is more near to requested period + than 3333. + +Signed-off-by: Laxman Dewangan +Signed-off-by: Thierry Reding +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pwm/pwm-tegra.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/drivers/pwm/pwm-tegra.c ++++ b/drivers/pwm/pwm-tegra.c +@@ -69,6 +69,7 @@ static int tegra_pwm_config(struct pwm_c + struct tegra_pwm_chip *pc = to_tegra_pwm_chip(chip); + unsigned long long c; + unsigned long rate, hz; ++ unsigned long long ns100 = NSEC_PER_SEC; + u32 val = 0; + int err; + +@@ -87,9 +88,11 @@ static int tegra_pwm_config(struct pwm_c + * cycles at the PWM clock rate will take period_ns nanoseconds. + */ + rate = clk_get_rate(pc->clk) >> PWM_DUTY_WIDTH; +- hz = NSEC_PER_SEC / period_ns; + +- rate = (rate + (hz / 2)) / hz; ++ /* Consider precision in PWM_SCALE_WIDTH rate calculation */ ++ ns100 *= 100; ++ hz = DIV_ROUND_CLOSEST_ULL(ns100, period_ns); ++ rate = DIV_ROUND_CLOSEST(rate * 100, hz); + + /* + * Since the actual PWM divider is the register's frequency divider diff --git a/queue-4.4/rcutorture-configinit-fix-build-directory-error-message.patch b/queue-4.4/rcutorture-configinit-fix-build-directory-error-message.patch new file mode 100644 index 00000000000..d26411a6af7 --- /dev/null +++ b/queue-4.4/rcutorture-configinit-fix-build-directory-error-message.patch @@ -0,0 +1,37 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: SeongJae Park +Date: Fri, 3 Nov 2017 19:17:20 +0900 +Subject: rcutorture/configinit: Fix build directory error message + +From: SeongJae Park + + +[ Upstream commit 2adfa4210f8f35cdfb4e08318cc06b99752964c2 ] + +The 'configinit.sh' script checks the format of optional argument for the +build directory, printing an error message if the format is not valid. +However, the error message uses the wrong variable, indicating an empty +string even though the user entered a non-empty (but erroneous) string. +This commit fixes the script to use the correct variable. + +Fixes: c87b9c601ac8 ("rcutorture: Add KVM-based test framework") + +Signed-off-by: SeongJae Park +Signed-off-by: Paul E. McKenney +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/rcutorture/bin/configinit.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/rcutorture/bin/configinit.sh ++++ b/tools/testing/selftests/rcutorture/bin/configinit.sh +@@ -51,7 +51,7 @@ then + mkdir $builddir + fi + else +- echo Bad build directory: \"$builddir\" ++ echo Bad build directory: \"$buildloc\" + exit 2 + fi + fi diff --git a/queue-4.4/regulator-isl9305-fix-array-size.patch b/queue-4.4/regulator-isl9305-fix-array-size.patch new file mode 100644 index 00000000000..78f7fce629e --- /dev/null +++ b/queue-4.4/regulator-isl9305-fix-array-size.patch @@ -0,0 +1,39 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: "Vincent Stehlé" +Date: Sun, 9 Apr 2017 22:05:05 +0200 +Subject: regulator: isl9305: fix array size + +From: "Vincent Stehlé" + + +[ Upstream commit 0c08aaf873174c95e674cf21ffcd041c589d2e5b ] + +ISL9305_MAX_REGULATOR is the last index used to access the init_data[] +array, so we need to add one to this last index to obtain the necessary +array size. + +This fixes the following smatch error: + + drivers/regulator/isl9305.c:160 isl9305_i2c_probe() error: buffer overflow 'pdata->init_data' 3 <= 3 + +Fixes: dec38b5ce6a9edb4 ("regulator: isl9305: Add Intersil ISL9305/H driver") +Signed-off-by: Vincent Stehlé +Cc: Mark Brown +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + include/linux/platform_data/isl9305.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/linux/platform_data/isl9305.h ++++ b/include/linux/platform_data/isl9305.h +@@ -24,7 +24,7 @@ + struct regulator_init_data; + + struct isl9305_pdata { +- struct regulator_init_data *init_data[ISL9305_MAX_REGULATOR]; ++ struct regulator_init_data *init_data[ISL9305_MAX_REGULATOR + 1]; + }; + + #endif diff --git a/queue-4.4/reiserfs-make-cancel_old_flush-reliable.patch b/queue-4.4/reiserfs-make-cancel_old_flush-reliable.patch new file mode 100644 index 00000000000..4861419740f --- /dev/null +++ b/queue-4.4/reiserfs-make-cancel_old_flush-reliable.patch @@ -0,0 +1,112 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Jan Kara +Date: Wed, 5 Apr 2017 14:09:48 +0200 +Subject: reiserfs: Make cancel_old_flush() reliable + +From: Jan Kara + + +[ Upstream commit 71b0576bdb862e964a82c73327cdd1a249c53e67 ] + +Currently canceling of delayed work that flushes old data using +cancel_old_flush() does not prevent work from being requeued. Thus +in theory new work can be queued after cancel_old_flush() from +reiserfs_freeze() has run. This will become larger problem once +flush_old_commits() can requeue the work itself. + +Fix the problem by recording in sbi->work_queue that flushing work is +canceled and should not be requeued. + +Signed-off-by: Jan Kara +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + fs/reiserfs/journal.c | 2 +- + fs/reiserfs/reiserfs.h | 1 + + fs/reiserfs/super.c | 21 +++++++++++++++------ + 3 files changed, 17 insertions(+), 7 deletions(-) + +--- a/fs/reiserfs/journal.c ++++ b/fs/reiserfs/journal.c +@@ -1961,7 +1961,7 @@ static int do_journal_release(struct rei + * will be requeued because superblock is being shutdown and doesn't + * have MS_ACTIVE set. + */ +- cancel_delayed_work_sync(&REISERFS_SB(sb)->old_work); ++ reiserfs_cancel_old_flush(sb); + /* wait for all commits to finish */ + cancel_delayed_work_sync(&SB_JOURNAL(sb)->j_work); + +--- a/fs/reiserfs/reiserfs.h ++++ b/fs/reiserfs/reiserfs.h +@@ -2948,6 +2948,7 @@ int reiserfs_allocate_list_bitmaps(struc + struct reiserfs_list_bitmap *, unsigned int); + + void reiserfs_schedule_old_flush(struct super_block *s); ++void reiserfs_cancel_old_flush(struct super_block *s); + void add_save_link(struct reiserfs_transaction_handle *th, + struct inode *inode, int truncate); + int remove_save_link(struct inode *inode, int truncate); +--- a/fs/reiserfs/super.c ++++ b/fs/reiserfs/super.c +@@ -90,7 +90,9 @@ static void flush_old_commits(struct wor + s = sbi->s_journal->j_work_sb; + + spin_lock(&sbi->old_work_lock); +- sbi->work_queued = 0; ++ /* Avoid clobbering the cancel state... */ ++ if (sbi->work_queued == 1) ++ sbi->work_queued = 0; + spin_unlock(&sbi->old_work_lock); + + reiserfs_sync_fs(s, 1); +@@ -117,21 +119,22 @@ void reiserfs_schedule_old_flush(struct + spin_unlock(&sbi->old_work_lock); + } + +-static void cancel_old_flush(struct super_block *s) ++void reiserfs_cancel_old_flush(struct super_block *s) + { + struct reiserfs_sb_info *sbi = REISERFS_SB(s); + +- cancel_delayed_work_sync(&REISERFS_SB(s)->old_work); + spin_lock(&sbi->old_work_lock); +- sbi->work_queued = 0; ++ /* Make sure no new flushes will be queued */ ++ sbi->work_queued = 2; + spin_unlock(&sbi->old_work_lock); ++ cancel_delayed_work_sync(&REISERFS_SB(s)->old_work); + } + + static int reiserfs_freeze(struct super_block *s) + { + struct reiserfs_transaction_handle th; + +- cancel_old_flush(s); ++ reiserfs_cancel_old_flush(s); + + reiserfs_write_lock(s); + if (!(s->s_flags & MS_RDONLY)) { +@@ -152,7 +155,13 @@ static int reiserfs_freeze(struct super_ + + static int reiserfs_unfreeze(struct super_block *s) + { ++ struct reiserfs_sb_info *sbi = REISERFS_SB(s); ++ + reiserfs_allow_writes(s); ++ spin_lock(&sbi->old_work_lock); ++ /* Allow old_work to run again */ ++ sbi->work_queued = 0; ++ spin_unlock(&sbi->old_work_lock); + return 0; + } + +@@ -2187,7 +2196,7 @@ error_unlocked: + if (sbi->commit_wq) + destroy_workqueue(sbi->commit_wq); + +- cancel_delayed_work_sync(&REISERFS_SB(s)->old_work); ++ reiserfs_cancel_old_flush(s); + + reiserfs_free_bitmap_cache(s); + if (SB_BUFFER_WITH_SB(s)) diff --git a/queue-4.4/sched-act_csum-don-t-mangle-tcp-and-udp-gso-packets.patch b/queue-4.4/sched-act_csum-don-t-mangle-tcp-and-udp-gso-packets.patch new file mode 100644 index 00000000000..11025c0f54b --- /dev/null +++ b/queue-4.4/sched-act_csum-don-t-mangle-tcp-and-udp-gso-packets.patch @@ -0,0 +1,80 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Davide Caratti +Date: Thu, 23 Mar 2017 10:39:40 +0100 +Subject: sched: act_csum: don't mangle TCP and UDP GSO packets + +From: Davide Caratti + + +[ Upstream commit add641e7dee31b36aee83412c29e39dd1f5e0c9c ] + +after act_csum computes the checksum on skbs carrying GSO TCP/UDP packets, +subsequent segmentation fails because skb_needs_check(skb, true) returns +true. Because of that, skb_warn_bad_offload() is invoked and the following +message is displayed: + +WARNING: CPU: 3 PID: 28 at net/core/dev.c:2553 skb_warn_bad_offload+0xf0/0xfd +<...> + + [] skb_warn_bad_offload+0xf0/0xfd + [] __skb_gso_segment+0xec/0x110 + [] validate_xmit_skb+0x12d/0x2b0 + [] validate_xmit_skb_list+0x42/0x70 + [] sch_direct_xmit+0xd0/0x1b0 + [] __qdisc_run+0x120/0x270 + [] __dev_queue_xmit+0x23d/0x690 + [] dev_queue_xmit+0x10/0x20 + +Since GSO is able to compute checksum on individual segments of such skbs, +we can simply skip mangling the packet. + +Signed-off-by: Davide Caratti +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + net/sched/act_csum.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +--- a/net/sched/act_csum.c ++++ b/net/sched/act_csum.c +@@ -175,6 +175,9 @@ static int tcf_csum_ipv4_tcp(struct sk_b + struct tcphdr *tcph; + const struct iphdr *iph; + ++ if (skb_is_gso(skb) && skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4) ++ return 1; ++ + tcph = tcf_csum_skb_nextlayer(skb, ihl, ipl, sizeof(*tcph)); + if (tcph == NULL) + return 0; +@@ -196,6 +199,9 @@ static int tcf_csum_ipv6_tcp(struct sk_b + struct tcphdr *tcph; + const struct ipv6hdr *ip6h; + ++ if (skb_is_gso(skb) && skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) ++ return 1; ++ + tcph = tcf_csum_skb_nextlayer(skb, ihl, ipl, sizeof(*tcph)); + if (tcph == NULL) + return 0; +@@ -219,6 +225,9 @@ static int tcf_csum_ipv4_udp(struct sk_b + const struct iphdr *iph; + u16 ul; + ++ if (skb_is_gso(skb) && skb_shinfo(skb)->gso_type & SKB_GSO_UDP) ++ return 1; ++ + /* + * Support both UDP and UDPLITE checksum algorithms, Don't use + * udph->len to get the real length without any protocol check, +@@ -272,6 +281,9 @@ static int tcf_csum_ipv6_udp(struct sk_b + const struct ipv6hdr *ip6h; + u16 ul; + ++ if (skb_is_gso(skb) && skb_shinfo(skb)->gso_type & SKB_GSO_UDP) ++ return 1; ++ + /* + * Support both UDP and UDPLITE checksum algorithms, Don't use + * udph->len to get the real length without any protocol check, diff --git a/queue-4.4/sched-stop-resched_cpu-from-sending-ipis-to-offline-cpus.patch b/queue-4.4/sched-stop-resched_cpu-from-sending-ipis-to-offline-cpus.patch new file mode 100644 index 00000000000..3f3153fffac --- /dev/null +++ b/queue-4.4/sched-stop-resched_cpu-from-sending-ipis-to-offline-cpus.patch @@ -0,0 +1,73 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: "Paul E. McKenney" +Date: Fri, 13 Oct 2017 16:24:28 -0700 +Subject: sched: Stop resched_cpu() from sending IPIs to offline CPUs + +From: "Paul E. McKenney" + + +[ Upstream commit a0982dfa03efca6c239c52cabebcea4afb93ea6b ] + +The rcutorture test suite occasionally provokes a splat due to invoking +resched_cpu() on an offline CPU: + +WARNING: CPU: 2 PID: 8 at /home/paulmck/public_git/linux-rcu/arch/x86/kernel/smp.c:128 native_smp_send_reschedule+0x37/0x40 +Modules linked in: +CPU: 2 PID: 8 Comm: rcu_preempt Not tainted 4.14.0-rc4+ #1 +Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Ubuntu-1.8.2-1ubuntu1 04/01/2014 +task: ffff902ede9daf00 task.stack: ffff96c50010c000 +RIP: 0010:native_smp_send_reschedule+0x37/0x40 +RSP: 0018:ffff96c50010fdb8 EFLAGS: 00010096 +RAX: 000000000000002e RBX: ffff902edaab4680 RCX: 0000000000000003 +RDX: 0000000080000003 RSI: 0000000000000000 RDI: 00000000ffffffff +RBP: ffff96c50010fdb8 R08: 0000000000000000 R09: 0000000000000001 +R10: 0000000000000000 R11: 00000000299f36ae R12: 0000000000000001 +R13: ffffffff9de64240 R14: 0000000000000001 R15: ffffffff9de64240 +FS: 0000000000000000(0000) GS:ffff902edfc80000(0000) knlGS:0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: 00000000f7d4c642 CR3: 000000001e0e2000 CR4: 00000000000006e0 +Call Trace: + resched_curr+0x8f/0x1c0 + resched_cpu+0x2c/0x40 + rcu_implicit_dynticks_qs+0x152/0x220 + force_qs_rnp+0x147/0x1d0 + ? sync_rcu_exp_select_cpus+0x450/0x450 + rcu_gp_kthread+0x5a9/0x950 + kthread+0x142/0x180 + ? force_qs_rnp+0x1d0/0x1d0 + ? kthread_create_on_node+0x40/0x40 + ret_from_fork+0x27/0x40 +Code: 14 01 0f 92 c0 84 c0 74 14 48 8b 05 14 4f f4 00 be fd 00 00 00 ff 90 a0 00 00 00 5d c3 89 fe 48 c7 c7 38 89 ca 9d e8 e5 56 08 00 <0f> ff 5d c3 0f 1f 44 00 00 8b 05 52 9e 37 02 85 c0 75 38 55 48 +---[ end trace 26df9e5df4bba4ac ]--- + +This splat cannot be generated by expedited grace periods because they +always invoke resched_cpu() on the current CPU, which is good because +expedited grace periods require that resched_cpu() unconditionally +succeed. However, other parts of RCU can tolerate resched_cpu() acting +as a no-op, at least as long as it doesn't happen too often. + +This commit therefore makes resched_cpu() invoke resched_curr() only if +the CPU is either online or is the current CPU. + +Signed-off-by: Paul E. McKenney +Cc: Ingo Molnar +Cc: Peter Zijlstra + +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + kernel/sched/core.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -601,7 +601,8 @@ void resched_cpu(int cpu) + unsigned long flags; + + raw_spin_lock_irqsave(&rq->lock, flags); +- resched_curr(rq); ++ if (cpu_online(cpu) || cpu == smp_processor_id()) ++ resched_curr(rq); + raw_spin_unlock_irqrestore(&rq->lock, flags); + } + diff --git a/queue-4.4/sched-stop-switched_to_rt-from-sending-ipis-to-offline-cpus.patch b/queue-4.4/sched-stop-switched_to_rt-from-sending-ipis-to-offline-cpus.patch new file mode 100644 index 00000000000..d6b420b6044 --- /dev/null +++ b/queue-4.4/sched-stop-switched_to_rt-from-sending-ipis-to-offline-cpus.patch @@ -0,0 +1,76 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: "Paul E. McKenney" +Date: Fri, 13 Oct 2017 17:00:18 -0700 +Subject: sched: Stop switched_to_rt() from sending IPIs to offline CPUs + +From: "Paul E. McKenney" + + +[ Upstream commit 2fe2582649aa2355f79acddb86bd4d6c5363eb63 ] + +The rcutorture test suite occasionally provokes a splat due to invoking +rt_mutex_lock() which needs to boost the priority of a task currently +sitting on a runqueue that belongs to an offline CPU: + +WARNING: CPU: 0 PID: 12 at /home/paulmck/public_git/linux-rcu/arch/x86/kernel/smp.c:128 native_smp_send_reschedule+0x37/0x40 +Modules linked in: +CPU: 0 PID: 12 Comm: rcub/7 Not tainted 4.14.0-rc4+ #1 +Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Ubuntu-1.8.2-1ubuntu1 04/01/2014 +task: ffff9ed3de5f8cc0 task.stack: ffffbbf80012c000 +RIP: 0010:native_smp_send_reschedule+0x37/0x40 +RSP: 0018:ffffbbf80012fd10 EFLAGS: 00010082 +RAX: 000000000000002f RBX: ffff9ed3dd9cb300 RCX: 0000000000000004 +RDX: 0000000080000004 RSI: 0000000000000086 RDI: 00000000ffffffff +RBP: ffffbbf80012fd10 R08: 000000000009da7a R09: 0000000000007b9d +R10: 0000000000000001 R11: ffffffffbb57c2cd R12: 000000000000000d +R13: ffff9ed3de5f8cc0 R14: 0000000000000061 R15: ffff9ed3ded59200 +FS: 0000000000000000(0000) GS:ffff9ed3dea00000(0000) knlGS:0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: 00000000080686f0 CR3: 000000001b9e0000 CR4: 00000000000006f0 +Call Trace: + resched_curr+0x61/0xd0 + switched_to_rt+0x8f/0xa0 + rt_mutex_setprio+0x25c/0x410 + task_blocks_on_rt_mutex+0x1b3/0x1f0 + rt_mutex_slowlock+0xa9/0x1e0 + rt_mutex_lock+0x29/0x30 + rcu_boost_kthread+0x127/0x3c0 + kthread+0x104/0x140 + ? rcu_report_unblock_qs_rnp+0x90/0x90 + ? kthread_create_on_node+0x40/0x40 + ret_from_fork+0x22/0x30 +Code: f0 00 0f 92 c0 84 c0 74 14 48 8b 05 34 74 c5 00 be fd 00 00 00 ff 90 a0 00 00 00 5d c3 89 fe 48 c7 c7 a0 c6 fc b9 e8 d5 b5 06 00 <0f> ff 5d c3 0f 1f 44 00 00 8b 05 a2 d1 13 02 85 c0 75 38 55 48 + +But the target task's priority has already been adjusted, so the only +purpose of switched_to_rt() invoking resched_curr() is to wake up the +CPU running some task that needs to be preempted by the boosted task. +But the CPU is offline, which presumably means that the task must be +migrated to some other CPU, and that this other CPU will undertake any +needed preemption at the time of migration. Because the runqueue lock +is held when resched_curr() is invoked, we know that the boosted task +cannot go anywhere, so it is not necessary to invoke resched_curr() +in this particular case. + +This commit therefore makes switched_to_rt() refrain from invoking +resched_curr() when the target CPU is offline. + +Signed-off-by: Paul E. McKenney +Cc: Ingo Molnar +Cc: Peter Zijlstra +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + kernel/sched/rt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/kernel/sched/rt.c ++++ b/kernel/sched/rt.c +@@ -2144,7 +2144,7 @@ static void switched_to_rt(struct rq *rq + if (p->nr_cpus_allowed > 1 && rq->rt.overloaded) + queue_push_tasks(rq); + #endif /* CONFIG_SMP */ +- if (p->prio < rq->curr->prio) ++ if (p->prio < rq->curr->prio && cpu_online(cpu_of(rq))) + resched_curr(rq); + } + } diff --git a/queue-4.4/scsi-core-scsi_get_device_flags_keyed-always-return-device-flags.patch b/queue-4.4/scsi-core-scsi_get_device_flags_keyed-always-return-device-flags.patch new file mode 100644 index 00000000000..cf5e7b3f6c2 --- /dev/null +++ b/queue-4.4/scsi-core-scsi_get_device_flags_keyed-always-return-device-flags.patch @@ -0,0 +1,50 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Bart Van Assche +Date: Mon, 4 Dec 2017 10:36:31 -0800 +Subject: scsi: core: scsi_get_device_flags_keyed(): Always return device flags + +From: Bart Van Assche + + +[ Upstream commit a44c9d36509c83cf64f33b93f6ab2e63822c01eb ] + +Since scsi_get_device_flags_keyed() callers do not check whether or not +the returned value is an error code, change that function such that it +returns a flags value even if the 'key' argument is invalid. Note: +since commit 28a0bc4120d3 ("scsi: sd: Implement blacklist option for +WRITE SAME w/ UNMAP") bit 31 is a valid device information flag so +checking whether bit 31 is set in the return value is not sufficient to +tell the difference between an error code and a flags value. + +Signed-off-by: Bart Van Assche +Cc: Christoph Hellwig +Cc: Hannes Reinecke +Cc: Johannes Thumshirn +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/scsi/scsi_devinfo.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +--- a/drivers/scsi/scsi_devinfo.c ++++ b/drivers/scsi/scsi_devinfo.c +@@ -589,17 +589,12 @@ int scsi_get_device_flags_keyed(struct s + int key) + { + struct scsi_dev_info_list *devinfo; +- int err; + + devinfo = scsi_dev_info_list_find(vendor, model, key); + if (!IS_ERR(devinfo)) + return devinfo->flags; + +- err = PTR_ERR(devinfo); +- if (err != -ENOENT) +- return err; +- +- /* nothing found, return nothing */ ++ /* key or device not found: return nothing */ + if (key != SCSI_DEVINFO_GLOBAL) + return 0; + diff --git a/queue-4.4/scsi-devinfo-apply-to-hp-xp-the-same-flags-as-hitachi-vsp.patch b/queue-4.4/scsi-devinfo-apply-to-hp-xp-the-same-flags-as-hitachi-vsp.patch new file mode 100644 index 00000000000..1f059511b21 --- /dev/null +++ b/queue-4.4/scsi-devinfo-apply-to-hp-xp-the-same-flags-as-hitachi-vsp.patch @@ -0,0 +1,45 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Xose Vazquez Perez +Date: Fri, 17 Nov 2017 21:31:36 +0100 +Subject: scsi: devinfo: apply to HP XP the same flags as Hitachi VSP + +From: Xose Vazquez Perez + + +[ Upstream commit b369a0471503130cfc74f9f62071db97f48948c3 ] + +Commit 56f3d383f37b ("scsi: scsi_devinfo: Add TRY_VPD_PAGES to HITACHI +OPEN-V blacklist entry") modified some Hitachi entries: + + HITACHI is always supporting VPD pages, even though it's claiming to + support SCSI Revision 3 only. + +The same should have been done also for HP-rebranded. + +[mkp: checkpatch and tweaked commit message] + +Cc: Hannes Reinecke +Cc: Takahiro Yasui +Cc: Matthias Rudolph +Cc: Martin K. Petersen +Cc: James E.J. Bottomley +Cc: SCSI ML +Signed-off-by: Xose Vazquez Perez +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/scsi/scsi_devinfo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/scsi/scsi_devinfo.c ++++ b/drivers/scsi/scsi_devinfo.c +@@ -180,7 +180,7 @@ static struct { + {"HITACHI", "6586-", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, + {"HITACHI", "6588-", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, + {"HP", "A6189A", NULL, BLIST_SPARSELUN | BLIST_LARGELUN}, /* HP VA7400 */ +- {"HP", "OPEN-", "*", BLIST_REPORTLUN2}, /* HP XP Arrays */ ++ {"HP", "OPEN-", "*", BLIST_REPORTLUN2 | BLIST_TRY_VPD_PAGES}, /* HP XP Arrays */ + {"HP", "NetRAID-4M", NULL, BLIST_FORCELUN}, + {"HP", "HSV100", NULL, BLIST_REPORTLUN2 | BLIST_NOSTARTONADD}, + {"HP", "C1557A", NULL, BLIST_FORCELUN}, diff --git a/queue-4.4/scsi-dh-add-new-rdac-devices.patch b/queue-4.4/scsi-dh-add-new-rdac-devices.patch new file mode 100644 index 00000000000..cb5ca5556c5 --- /dev/null +++ b/queue-4.4/scsi-dh-add-new-rdac-devices.patch @@ -0,0 +1,51 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Xose Vazquez Perez +Date: Fri, 17 Nov 2017 22:05:13 +0100 +Subject: scsi: dh: add new rdac devices + +From: Xose Vazquez Perez + + +[ Upstream commit 4b3aec2bbbce1c35f50e7475a9fd78d24b9ea4ea ] + +Add IBM 3542 and 3552, arrays: FAStT200 and FAStT500. + +Add full STK OPENstorage family, arrays: 9176, D173, D178, D210, D220, +D240 and D280. + +Add STK BladeCtlr family, arrays: B210, B220, B240 and B280. + +These changes were done in multipath-tools time ago. + +Cc: NetApp RDAC team +Cc: Hannes Reinecke +Cc: Christophe Varoqui +Cc: Martin K. Petersen +Cc: James E.J. Bottomley +Cc: SCSI ML +Cc: device-mapper development +Signed-off-by: Xose Vazquez Perez +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/scsi/scsi_dh.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/drivers/scsi/scsi_dh.c ++++ b/drivers/scsi/scsi_dh.c +@@ -56,10 +56,13 @@ static const struct scsi_dh_blist scsi_d + {"IBM", "1815", "rdac", }, + {"IBM", "1818", "rdac", }, + {"IBM", "3526", "rdac", }, ++ {"IBM", "3542", "rdac", }, ++ {"IBM", "3552", "rdac", }, + {"SGI", "TP9", "rdac", }, + {"SGI", "IS", "rdac", }, +- {"STK", "OPENstorage D280", "rdac", }, ++ {"STK", "OPENstorage", "rdac", }, + {"STK", "FLEXLINE 380", "rdac", }, ++ {"STK", "BladeCtlr", "rdac", }, + {"SUN", "CSM", "rdac", }, + {"SUN", "LCSM100", "rdac", }, + {"SUN", "STK6580_6780", "rdac", }, diff --git a/queue-4.4/scsi-ipr-fix-missed-eh-wakeup.patch b/queue-4.4/scsi-ipr-fix-missed-eh-wakeup.patch new file mode 100644 index 00000000000..701a07402f7 --- /dev/null +++ b/queue-4.4/scsi-ipr-fix-missed-eh-wakeup.patch @@ -0,0 +1,76 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Brian King +Date: Wed, 15 Mar 2017 16:58:36 -0500 +Subject: scsi: ipr: Fix missed EH wakeup + +From: Brian King + + +[ Upstream commit 66a0d59cdd12546ddf01d229de28b07ccf6d637f ] + +Following a command abort or device reset, ipr's EH handlers wait for +the commands getting aborted to get sent back from the adapter prior to +returning from the EH handler. This fixes up some cases where the +completion handler was not getting called, which would have resulted in +the EH thread waiting until it timed out, greatly extending EH time. + +Signed-off-by: Brian King +Reviewed-by: Wendy Xiong +Tested-by: Wendy Xiong +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/scsi/ipr.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +--- a/drivers/scsi/ipr.c ++++ b/drivers/scsi/ipr.c +@@ -835,8 +835,10 @@ static void ipr_sata_eh_done(struct ipr_ + + qc->err_mask |= AC_ERR_OTHER; + sata_port->ioasa.status |= ATA_BUSY; +- list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q); + ata_qc_complete(qc); ++ if (ipr_cmd->eh_comp) ++ complete(ipr_cmd->eh_comp); ++ list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q); + } + + /** +@@ -5864,8 +5866,10 @@ static void ipr_erp_done(struct ipr_cmnd + res->in_erp = 0; + } + scsi_dma_unmap(ipr_cmd->scsi_cmd); +- list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q); + scsi_cmd->scsi_done(scsi_cmd); ++ if (ipr_cmd->eh_comp) ++ complete(ipr_cmd->eh_comp); ++ list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q); + } + + /** +@@ -6255,8 +6259,10 @@ static void ipr_erp_start(struct ipr_ioa + } + + scsi_dma_unmap(ipr_cmd->scsi_cmd); +- list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q); + scsi_cmd->scsi_done(scsi_cmd); ++ if (ipr_cmd->eh_comp) ++ complete(ipr_cmd->eh_comp); ++ list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q); + } + + /** +@@ -6282,8 +6288,10 @@ static void ipr_scsi_done(struct ipr_cmn + scsi_dma_unmap(scsi_cmd); + + spin_lock_irqsave(ipr_cmd->hrrq->lock, lock_flags); +- list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q); + scsi_cmd->scsi_done(scsi_cmd); ++ if (ipr_cmd->eh_comp) ++ complete(ipr_cmd->eh_comp); ++ list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q); + spin_unlock_irqrestore(ipr_cmd->hrrq->lock, lock_flags); + } else { + spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); diff --git a/queue-4.4/scsi-ses-don-t-get-power-status-of-ses-device-slot-on-probe.patch b/queue-4.4/scsi-ses-don-t-get-power-status-of-ses-device-slot-on-probe.patch new file mode 100644 index 00000000000..e15b4546c86 --- /dev/null +++ b/queue-4.4/scsi-ses-don-t-get-power-status-of-ses-device-slot-on-probe.patch @@ -0,0 +1,117 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Mauricio Faria de Oliveira +Date: Wed, 5 Apr 2017 12:18:19 -0300 +Subject: scsi: ses: don't get power status of SES device slot on probe + +From: Mauricio Faria de Oliveira + + +[ Upstream commit 75106523f39751390b5789b36ee1d213b3af1945 ] + +The commit 08024885a2a3 ("ses: Add power_status to SES device slot") +introduced the 'power_status' attribute to enclosure components and +the associated callbacks. + +There are 2 callbacks available to get the power status of a device: +1) ses_get_power_status() for 'struct enclosure_component_callbacks' +2) get_component_power_status() for the sysfs device attribute +(these are available for kernel-space and user-space, respectively.) + +However, despite both methods being available to get power status +on demand, that commit also introduced a call to get power status +in ses_enclosure_data_process(). + +This dramatically increased the total probe time for SCSI devices +on larger configurations, because ses_enclosure_data_process() is +called several times during the SCSI devices probe and loops over +the component devices (but that is another problem, another patch). + +That results in a tremendous continuous hammering of SCSI Receive +Diagnostics commands to the enclosure-services device, which does +delay the total probe time for the SCSI devices __significantly__: + + Originally, ~34 minutes on a system attached to ~170 disks: + + [ 9214.490703] mpt3sas version 13.100.00.00 loaded + ... + [11256.580231] scsi 17:0:177:0: qdepth(16), tagged(1), simple(0), + ordered(0), scsi_level(6), cmd_que(1) + + With this patch, it decreased to ~2.5 minutes -- a 13.6x faster + + [ 1002.992533] mpt3sas version 13.100.00.00 loaded + ... + [ 1151.978831] scsi 11:0:177:0: qdepth(16), tagged(1), simple(0), + ordered(0), scsi_level(6), cmd_que(1) + +Back to the commit discussion.. on the ses_get_power_status() call +introduced in ses_enclosure_data_process(): impact of removing it. + +That may possibly be in place to initialize the power status value +on device probe. However, those 2 functions available to retrieve +that value _do_ automatically refresh/update it. So the potential +benefit would be a direct access of the 'power_status' field which +does not use the callbacks... + +But the only reader of 'struct enclosure_component::power_status' +is the get_component_power_status() callback for sysfs attribute, +and it _does_ check for and call the .get_power_status callback, +(which indeed is defined and implemented by that commit), so the +power status value is, again, automatically updated. + +So, the remaining potential for a direct/non-callback access to +the power_status attribute would be out-of-tree modules -- well, +for those, if they are for whatever reason interested in values +that are set during device probe and not up-to-date by the time +they need it.. well, that would be curious. + +Well, to handle that more properly, set the initial power state +value to '-1' (i.e., uninitialized) instead of '1' (power 'on'), +and check for it in that callback which may do an direct access +to the field value _if_ a callback function is not defined. + +Signed-off-by: Mauricio Faria de Oliveira +Fixes: 08024885a2a3 ("ses: Add power_status to SES device slot") +Reviewed-by: Dan Williams +Reviewed-by: Song Liu +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/misc/enclosure.c | 7 ++++++- + drivers/scsi/ses.c | 1 - + 2 files changed, 6 insertions(+), 2 deletions(-) + +--- a/drivers/misc/enclosure.c ++++ b/drivers/misc/enclosure.c +@@ -148,7 +148,7 @@ enclosure_register(struct device *dev, c + for (i = 0; i < components; i++) { + edev->component[i].number = -1; + edev->component[i].slot = -1; +- edev->component[i].power_status = 1; ++ edev->component[i].power_status = -1; + } + + mutex_lock(&container_list_lock); +@@ -600,6 +600,11 @@ static ssize_t get_component_power_statu + + if (edev->cb->get_power_status) + edev->cb->get_power_status(edev, ecomp); ++ ++ /* If still uninitialized, the callback failed or does not exist. */ ++ if (ecomp->power_status == -1) ++ return (edev->cb->get_power_status) ? -EIO : -ENOTTY; ++ + return snprintf(buf, 40, "%s\n", ecomp->power_status ? "on" : "off"); + } + +--- a/drivers/scsi/ses.c ++++ b/drivers/scsi/ses.c +@@ -546,7 +546,6 @@ static void ses_enclosure_data_process(s + ecomp = &edev->component[components++]; + + if (!IS_ERR(ecomp)) { +- ses_get_power_status(edev, ecomp); + if (addl_desc_ptr) + ses_process_descriptor( + ecomp, diff --git a/queue-4.4/scsi-sg-check-for-valid-direction-before-starting-the-request.patch b/queue-4.4/scsi-sg-check-for-valid-direction-before-starting-the-request.patch new file mode 100644 index 00000000000..2a48ce34de0 --- /dev/null +++ b/queue-4.4/scsi-sg-check-for-valid-direction-before-starting-the-request.patch @@ -0,0 +1,98 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Johannes Thumshirn +Date: Fri, 7 Apr 2017 09:34:15 +0200 +Subject: scsi: sg: check for valid direction before starting the request + +From: Johannes Thumshirn + + +[ Upstream commit 28676d869bbb5257b5f14c0c95ad3af3a7019dd5 ] + +Check for a valid direction before starting the request, otherwise we +risk running into an assertion in the scsi midlayer checking for valid +requests. + +[mkp: fixed typo] + +Signed-off-by: Johannes Thumshirn +Link: http://www.spinics.net/lists/linux-scsi/msg104400.html +Reported-by: Dmitry Vyukov +Signed-off-by: Hannes Reinecke +Tested-by: Johannes Thumshirn +Reviewed-by: Christoph Hellwig +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/scsi/sg.c | 46 ++++++++++++++++++++++++++++++++++------------ + 1 file changed, 34 insertions(+), 12 deletions(-) + +--- a/drivers/scsi/sg.c ++++ b/drivers/scsi/sg.c +@@ -674,18 +674,14 @@ sg_write(struct file *filp, const char _ + * is a non-zero input_size, so emit a warning. + */ + if (hp->dxfer_direction == SG_DXFER_TO_FROM_DEV) { +- static char cmd[TASK_COMM_LEN]; +- if (strcmp(current->comm, cmd)) { +- printk_ratelimited(KERN_WARNING +- "sg_write: data in/out %d/%d bytes " +- "for SCSI command 0x%x-- guessing " +- "data in;\n program %s not setting " +- "count and/or reply_len properly\n", +- old_hdr.reply_len - (int)SZ_SG_HEADER, +- input_size, (unsigned int) cmnd[0], +- current->comm); +- strcpy(cmd, current->comm); +- } ++ printk_ratelimited(KERN_WARNING ++ "sg_write: data in/out %d/%d bytes " ++ "for SCSI command 0x%x-- guessing " ++ "data in;\n program %s not setting " ++ "count and/or reply_len properly\n", ++ old_hdr.reply_len - (int)SZ_SG_HEADER, ++ input_size, (unsigned int) cmnd[0], ++ current->comm); + } + k = sg_common_write(sfp, srp, cmnd, sfp->timeout, blocking); + return (k < 0) ? k : count; +@@ -764,6 +760,29 @@ sg_new_write(Sg_fd *sfp, struct file *fi + return count; + } + ++static bool sg_is_valid_dxfer(sg_io_hdr_t *hp) ++{ ++ switch (hp->dxfer_direction) { ++ case SG_DXFER_NONE: ++ if (hp->dxferp || hp->dxfer_len > 0) ++ return false; ++ return true; ++ case SG_DXFER_TO_DEV: ++ case SG_DXFER_FROM_DEV: ++ case SG_DXFER_TO_FROM_DEV: ++ if (!hp->dxferp || hp->dxfer_len == 0) ++ return false; ++ return true; ++ case SG_DXFER_UNKNOWN: ++ if ((!hp->dxferp && hp->dxfer_len) || ++ (hp->dxferp && hp->dxfer_len == 0)) ++ return false; ++ return true; ++ default: ++ return false; ++ } ++} ++ + static int + sg_common_write(Sg_fd * sfp, Sg_request * srp, + unsigned char *cmnd, int timeout, int blocking) +@@ -784,6 +803,9 @@ sg_common_write(Sg_fd * sfp, Sg_request + "sg_common_write: scsi opcode=0x%02x, cmd_size=%d\n", + (int) cmnd[0], (int) hp->cmd_len)); + ++ if (!sg_is_valid_dxfer(hp)) ++ return -EINVAL; ++ + k = sg_start_req(srp, cmnd); + if (k) { + SCSI_LOG_TIMEOUT(1, sg_printk(KERN_INFO, sfp->parentdp, diff --git a/queue-4.4/scsi-sg-close-race-condition-in-sg_remove_sfp_usercontext.patch b/queue-4.4/scsi-sg-close-race-condition-in-sg_remove_sfp_usercontext.patch new file mode 100644 index 00000000000..c29666dfcfb --- /dev/null +++ b/queue-4.4/scsi-sg-close-race-condition-in-sg_remove_sfp_usercontext.patch @@ -0,0 +1,94 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Hannes Reinecke +Date: Fri, 7 Apr 2017 09:34:17 +0200 +Subject: scsi: sg: close race condition in sg_remove_sfp_usercontext() + +From: Hannes Reinecke + + +[ Upstream commit 97d27b0dd015e980ade63fda111fd1353276e28b ] + +sg_remove_sfp_usercontext() is clearing any sg requests, but needs to +take 'rq_list_lock' when modifying the list. + +Reported-by: Christoph Hellwig +Signed-off-by: Hannes Reinecke +Reviewed-by: Johannes Thumshirn +Tested-by: Johannes Thumshirn +Reviewed-by: Christoph Hellwig +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/scsi/sg.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +--- a/drivers/scsi/sg.c ++++ b/drivers/scsi/sg.c +@@ -535,6 +535,7 @@ sg_read(struct file *filp, char __user * + } else + count = (old_hdr->result == 0) ? 0 : -EIO; + sg_finish_rem_req(srp); ++ sg_remove_request(sfp, srp); + retval = count; + free_old_hdr: + kfree(old_hdr); +@@ -575,6 +576,7 @@ sg_new_read(Sg_fd * sfp, char __user *bu + } + err_out: + err2 = sg_finish_rem_req(srp); ++ sg_remove_request(sfp, srp); + return err ? : err2 ? : count; + } + +@@ -811,6 +813,7 @@ sg_common_write(Sg_fd * sfp, Sg_request + SCSI_LOG_TIMEOUT(1, sg_printk(KERN_INFO, sfp->parentdp, + "sg_common_write: start_req err=%d\n", k)); + sg_finish_rem_req(srp); ++ sg_remove_request(sfp, srp); + return k; /* probably out of space --> ENOMEM */ + } + if (atomic_read(&sdp->detaching)) { +@@ -823,6 +826,7 @@ sg_common_write(Sg_fd * sfp, Sg_request + } + + sg_finish_rem_req(srp); ++ sg_remove_request(sfp, srp); + return -ENODEV; + } + +@@ -1312,6 +1316,7 @@ sg_rq_end_io_usercontext(struct work_str + struct sg_fd *sfp = srp->parentfp; + + sg_finish_rem_req(srp); ++ sg_remove_request(sfp, srp); + kref_put(&sfp->f_ref, sg_remove_sfp); + } + +@@ -1856,8 +1861,6 @@ sg_finish_rem_req(Sg_request *srp) + else + sg_remove_scat(sfp, req_schp); + +- sg_remove_request(sfp, srp); +- + return ret; + } + +@@ -2204,12 +2207,17 @@ sg_remove_sfp_usercontext(struct work_st + struct sg_fd *sfp = container_of(work, struct sg_fd, ew.work); + struct sg_device *sdp = sfp->parentdp; + Sg_request *srp; ++ unsigned long iflags; + + /* Cleanup any responses which were never read(). */ ++ write_lock_irqsave(&sfp->rq_list_lock, iflags); + while (!list_empty(&sfp->rq_list)) { + srp = list_first_entry(&sfp->rq_list, Sg_request, entry); + sg_finish_rem_req(srp); ++ list_del(&srp->entry); ++ srp->parentfp = NULL; + } ++ write_unlock_irqrestore(&sfp->rq_list_lock, iflags); + + if (sfp->reserve.bufflen > 0) { + SCSI_LOG_TIMEOUT(6, sg_printk(KERN_INFO, sdp, diff --git a/queue-4.4/selinux-check-for-address-length-in-selinux_socket_bind.patch b/queue-4.4/selinux-check-for-address-length-in-selinux_socket_bind.patch new file mode 100644 index 00000000000..d13299e3cf1 --- /dev/null +++ b/queue-4.4/selinux-check-for-address-length-in-selinux_socket_bind.patch @@ -0,0 +1,106 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Alexander Potapenko +Date: Mon, 6 Mar 2017 19:46:14 +0100 +Subject: selinux: check for address length in selinux_socket_bind() + +From: Alexander Potapenko + + +[ Upstream commit e2f586bd83177d22072b275edd4b8b872daba924 ] + +KMSAN (KernelMemorySanitizer, a new error detection tool) reports use of +uninitialized memory in selinux_socket_bind(): + +================================================================== +BUG: KMSAN: use of unitialized memory +inter: 0 +CPU: 3 PID: 1074 Comm: packet2 Tainted: G B 4.8.0-rc6+ #1916 +Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 + 0000000000000000 ffff8800882ffb08 ffffffff825759c8 ffff8800882ffa48 + ffffffff818bf551 ffffffff85bab870 0000000000000092 ffffffff85bab550 + 0000000000000000 0000000000000092 00000000bb0009bb 0000000000000002 +Call Trace: + [< inline >] __dump_stack lib/dump_stack.c:15 + [] dump_stack+0x238/0x290 lib/dump_stack.c:51 + [] kmsan_report+0x276/0x2e0 mm/kmsan/kmsan.c:1008 + [] __msan_warning+0x5b/0xb0 mm/kmsan/kmsan_instr.c:424 + [] selinux_socket_bind+0xf41/0x1080 security/selinux/hooks.c:4288 + [] security_socket_bind+0x1ec/0x240 security/security.c:1240 + [] SYSC_bind+0x358/0x5f0 net/socket.c:1366 + [] SyS_bind+0x82/0xa0 net/socket.c:1356 + [] do_syscall_64+0x58/0x70 arch/x86/entry/common.c:292 + [] entry_SYSCALL64_slow_path+0x25/0x25 arch/x86/entry/entry_64.o:? +chained origin: 00000000ba6009bb + [] save_stack_trace+0x27/0x50 arch/x86/kernel/stacktrace.c:67 + [< inline >] kmsan_save_stack_with_flags mm/kmsan/kmsan.c:322 + [< inline >] kmsan_save_stack mm/kmsan/kmsan.c:337 + [] kmsan_internal_chain_origin+0x118/0x1e0 mm/kmsan/kmsan.c:530 + [] __msan_set_alloca_origin4+0xc3/0x130 mm/kmsan/kmsan_instr.c:380 + [] SYSC_bind+0x129/0x5f0 net/socket.c:1356 + [] SyS_bind+0x82/0xa0 net/socket.c:1356 + [] do_syscall_64+0x58/0x70 arch/x86/entry/common.c:292 + [] return_from_SYSCALL_64+0x0/0x6a arch/x86/entry/entry_64.o:? +origin description: ----address@SYSC_bind (origin=00000000b8c00900) +================================================================== + +(the line numbers are relative to 4.8-rc6, but the bug persists upstream) + +, when I run the following program as root: + +======================================================= + #include + #include + #include + + int main(int argc, char *argv[]) { + struct sockaddr addr; + int size = 0; + if (argc > 1) { + size = atoi(argv[1]); + } + memset(&addr, 0, sizeof(addr)); + int fd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP); + bind(fd, &addr, size); + return 0; + } +======================================================= + +(for different values of |size| other error reports are printed). + +This happens because bind() unconditionally copies |size| bytes of +|addr| to the kernel, leaving the rest uninitialized. Then +security_socket_bind() reads the IP address bytes, including the +uninitialized ones, to determine the port, or e.g. pass them further to +sel_netnode_find(), which uses them to calculate a hash. + +Signed-off-by: Alexander Potapenko +Acked-by: Eric Dumazet +[PM: fixed some whitespace damage] +Signed-off-by: Paul Moore +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + security/selinux/hooks.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/security/selinux/hooks.c ++++ b/security/selinux/hooks.c +@@ -4124,10 +4124,18 @@ static int selinux_socket_bind(struct so + u32 sid, node_perm; + + if (family == PF_INET) { ++ if (addrlen < sizeof(struct sockaddr_in)) { ++ err = -EINVAL; ++ goto out; ++ } + addr4 = (struct sockaddr_in *)address; + snum = ntohs(addr4->sin_port); + addrp = (char *)&addr4->sin_addr.s_addr; + } else { ++ if (addrlen < SIN6_LEN_RFC2133) { ++ err = -EINVAL; ++ goto out; ++ } + addr6 = (struct sockaddr_in6 *)address; + snum = ntohs(addr6->sin6_port); + addrp = (char *)&addr6->sin6_addr.s6_addr; diff --git a/queue-4.4/series b/queue-4.4/series index 24be1264b5c..5c144b2631a 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -1 +1,109 @@ blkcg-fix-double-free-of-new_blkg-in-blkcg_init_queue.patch +input-tsc2007-check-for-presence-and-power-down-tsc2007-during-probe.patch +staging-speakup-replace-bug_on-with-warn_on.patch +staging-wilc1000-add-check-for-kmalloc-allocation-failure.patch +hid-reject-input-outside-logical-range-only-if-null-state-is-set.patch +drm-qxl-don-t-alloc-fbdev-if-emulation-is-not-supported.patch +ath10k-fix-a-warning-during-channel-switch-with-multiple-vaps.patch +net-mvpp2-set-dma-mask-and-coherent-dma-mask-on-ppv2.2.patch +pci-msi-stop-disabling-msi-msi-x-in-pci_device_shutdown.patch +selinux-check-for-address-length-in-selinux_socket_bind.patch +perf-sort-fix-segfault-with-basic-block-cycles-sort-dimension.patch +i40e-acquire-nvm-lock-before-reads-on-all-devices.patch +i40e-fix-ethtool-to-get-eeprom-data-from-x722-interface.patch +perf-tools-make-perf_event__synthesize_mmap_events-scale.patch +drivers-net-xgene-fix-hardware-checksum-setting.patch +drm-defer-disabling-the-vblank-irq-until-the-next-interrupt-for-instant-off.patch +ath10k-disallow-dfs-simulation-if-dfs-channel-is-not-enabled.patch +perf-probe-return-errno-when-not-hitting-any-event.patch +hid-clamp-input-to-logical-range-if-no-null-state.patch +net-8021q-create-device-with-all-possible-features-in-wanted_features.patch +arm-dts-adjust-moxart-irq-controller-and-flags.patch +batman-adv-handle-race-condition-for-claims-between-gateways.patch +of-fix-of_device_get_modalias-returned-length-when-truncating-buffers.patch +solo6x10-release-vb2-buffers-in-solo_stop_streaming.patch +scsi-ipr-fix-missed-eh-wakeup.patch +media-i2c-soc_camera-fix-ov6650-sensor-getting-wrong-clock.patch +timers-sched_clock-update-timeout-for-clock-wrap.patch +sysrq-reset-the-watchdog-timers-while-displaying-high-resolution-timers.patch +input-qt1070-add-of-device-id-table.patch +sched-act_csum-don-t-mangle-tcp-and-udp-gso-packets.patch +asoc-rcar-ssi-don-t-set-ssicr.ckdv-000-with-ssiwsr.cont.patch +spi-omap2-mcspi-poll-omap2_mcspi_chstat_rxs-for-pio-transfer.patch +tcp-sysctl-fix-a-race-to-avoid-unexpected-0-window-from-space.patch +dmaengine-imx-sdma-add-1ms-delay-to-ensure-sdma-channel-is-stopped.patch +driver-adm1275-set-the-m-b-and-r-coefficients-correctly-for-power.patch +mm-fix-false-positive-vm_bug_on-in-page_cache_-get-add-_speculative.patch +blk-throttle-make-sure-expire-time-isn-t-too-big.patch +arm-dra7-hwmod_data-prevent-wait_target_disable-error-for-usb_otg_ss.patch +f2fs-relax-node-version-check-for-victim-data-in-gc.patch +bonding-refine-bond_fold_stats-wrap-detection.patch +powerpc-mm-hugetlb-filter-out-hugepage-size-not-supported-by-page-table-layout.patch +braille-console-fix-value-returned-by-_braille_console_setup.patch +drm-vmwgfx-fixes-to-vmwgfx_fb.patch +vxlan-vxlan-dev-should-inherit-lowerdev-s-gso_max_size.patch +nfc-nfcmrvl-include-unaligned.h-instead-of-access_ok.h.patch +nfc-nfcmrvl-double-free-on-error-path.patch +arm-dts-r8a7790-correct-parent-of-ssi-clocks.patch +arm-dts-r8a7791-correct-parent-of-ssi-clocks.patch +powerpc-avoid-taking-a-data-miss-on-every-userspace-instruction-miss.patch +net-faraday-add-missing-include-of-of.h.patch +arm-dts-koelsch-correct-clock-frequency-of-x2-du-clock-input.patch +reiserfs-make-cancel_old_flush-reliable.patch +alsa-firewire-digi00x-handle-all-midi-messages-on-streaming-packets.patch +fm10k-correctly-check-if-interface-is-removed.patch +scsi-ses-don-t-get-power-status-of-ses-device-slot-on-probe.patch +apparmor-make-path_max-parameter-readonly.patch +iommu-iova-fix-underflow-bug-in-__alloc_and_insert_iova_range.patch +video-arm-clcd-fix-dma-allocation-size.patch +drm-radeon-fail-fb-creation-from-imported-dma-bufs.patch +drm-amdgpu-fail-fb-creation-from-imported-dma-bufs.-v2.patch +coresight-fixes-coresight-dt-parse-to-get-correct-output-port-id.patch +mips-bpf-quit-clobbering-callee-saved-registers-in-jit-code.patch +mips-bpf-fix-multiple-problems-in-jit-skb-access-helpers.patch +mips-r2-on-r6-emu-fix-blezl-and-bgtzl-identification.patch +mips-r2-on-r6-emu-clear-bltzall-and-bgezall-debugfs-counters.patch +regulator-isl9305-fix-array-size.patch +md-raid6-fix-anomily-when-recovering-a-single-device-in-raid6.patch +usb-dwc2-make-sure-we-disconnect-the-gadget-state.patch +usb-gadget-dummy_hcd-fix-wrong-power-status-bit-clear-reset-in-dummy_hub_control.patch +drivers-perf-arm_pmu-handle-no-platform_device.patch +perf-inject-copy-events-when-reordering-events-in-pipe-mode.patch +perf-session-don-t-rely-on-evlist-in-pipe-mode.patch +scsi-sg-check-for-valid-direction-before-starting-the-request.patch +scsi-sg-close-race-condition-in-sg_remove_sfp_usercontext.patch +kprobes-x86-fix-kprobe-booster-not-to-boost-far-call-instructions.patch +kprobes-x86-set-kprobes-pages-read-only.patch +pwm-tegra-increase-precision-in-pwm-rate-calculation.patch +wil6210-fix-memory-access-violation-in-wil_memcpy_from-toio_32.patch +drm-edid-set-eld-connector-type-in-drm_edid_to_eld.patch +video-hdmi-allow-empty-hdmi-infoframes.patch +hid-elo-clear-btn_left-mapping.patch +arm-dts-exynos-correct-trats2-panel-reset-line.patch +sched-stop-switched_to_rt-from-sending-ipis-to-offline-cpus.patch +sched-stop-resched_cpu-from-sending-ipis-to-offline-cpus.patch +test_firmware-fix-setting-old-custom-fw-path-back-on-exit.patch +net-xfrm-allow-clearing-socket-xfrm-policies.patch +mtd-nand-fix-interpretation-of-nand_cmd_none-in-nand_command.patch +arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch +arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch +mtd-nand-ifc-update-bufnum-mask-for-ver-2.0.0.patch +ath10k-update-tdls-teardown-state-to-target.patch +cpufreq-fix-governor-module-removal-race.patch +clk-qcom-msm8916-fix-mnd_width-for-codec_digcodec.patch +ath10k-fix-invalid-sts_cap_offset_mask.patch +tools-usbip-fixes-build-with-musl-libc-toolchain.patch +spi-sun6i-disable-unprepare-clocks-on-remove.patch +scsi-core-scsi_get_device_flags_keyed-always-return-device-flags.patch +scsi-devinfo-apply-to-hp-xp-the-same-flags-as-hitachi-vsp.patch +scsi-dh-add-new-rdac-devices.patch +media-cpia2-fix-a-couple-off-by-one-bugs.patch +veth-set-peer-gso-values.patch +drm-amdkfd-fix-memory-leaks-in-kfd-topology.patch +agp-intel-flush-all-chipset-writes-after-updating-the-ggtt.patch +mac80211_hwsim-enforce-ps_manual_poll-to-be-set-after-ps_enabled.patch +mac80211-remove-bug-when-interface-type-is-invalid.patch +asoc-nuc900-fix-a-loop-timeout-test.patch +ipvlan-add-l2-check-for-packets-arriving-via-virtual-devices.patch +rcutorture-configinit-fix-build-directory-error-message.patch +ima-relax-requiring-a-file-signature-for-new-files-with-zero-length.patch diff --git a/queue-4.4/solo6x10-release-vb2-buffers-in-solo_stop_streaming.patch b/queue-4.4/solo6x10-release-vb2-buffers-in-solo_stop_streaming.patch new file mode 100644 index 00000000000..5eccb075044 --- /dev/null +++ b/queue-4.4/solo6x10-release-vb2-buffers-in-solo_stop_streaming.patch @@ -0,0 +1,80 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Anton Sviridenko +Date: Thu, 9 Mar 2017 10:46:18 -0300 +Subject: [media] solo6x10: release vb2 buffers in solo_stop_streaming() + +From: Anton Sviridenko + + +[ Upstream commit 6e4c8480bd2eb95309ad3c875e11d2cad98f9188 ] + +Fixes warning that appears in dmesg after closing V4L2 userspace +application that plays video from the display device +(first device from V4L2 device nodes provided by solo, usually /dev/video0 +when no other V4L2 devices are present). Encoder device nodes are not +affected. Can be reproduced by starting and closing + +ffplay -f video4linux2 /dev/video0 + +[ 8130.281251] ------------[ cut here ]------------ +[ 8130.281256] WARNING: CPU: 1 PID: 20414 at drivers/media/v4l2-core/videobuf2-core.c:1651 __vb2_queue_cancel+0x14b/0x230 +[ 8130.281257] Modules linked in: ipt_MASQUERADE nf_nat_masquerade_ipv4 iptable_nat solo6x10 x86_pkg_temp_thermal vboxpci(O) vboxnetadp(O) vboxnetflt(O) vboxdrv(O) +[ 8130.281264] CPU: 1 PID: 20414 Comm: ffplay Tainted: G O 4.10.0-gentoo #1 +[ 8130.281264] Hardware name: ASUS All Series/B85M-E, BIOS 2301 03/30/2015 +[ 8130.281265] Call Trace: +[ 8130.281267] dump_stack+0x4f/0x72 +[ 8130.281270] __warn+0xc7/0xf0 +[ 8130.281271] warn_slowpath_null+0x18/0x20 +[ 8130.281272] __vb2_queue_cancel+0x14b/0x230 +[ 8130.281273] vb2_core_streamoff+0x23/0x90 +[ 8130.281275] vb2_streamoff+0x24/0x50 +[ 8130.281276] vb2_ioctl_streamoff+0x3d/0x50 +[ 8130.281278] v4l_streamoff+0x15/0x20 +[ 8130.281279] __video_do_ioctl+0x25e/0x2f0 +[ 8130.281280] video_usercopy+0x279/0x520 +[ 8130.281282] ? v4l_enum_fmt+0x1330/0x1330 +[ 8130.281285] ? unmap_region+0xdf/0x110 +[ 8130.281285] video_ioctl2+0x10/0x20 +[ 8130.281286] v4l2_ioctl+0xce/0xe0 +[ 8130.281289] do_vfs_ioctl+0x8b/0x5b0 +[ 8130.281290] ? __fget+0x72/0xa0 +[ 8130.281291] SyS_ioctl+0x74/0x80 +[ 8130.281294] entry_SYSCALL_64_fastpath+0x13/0x94 +[ 8130.281295] RIP: 0033:0x7ff86fee6b27 +[ 8130.281296] RSP: 002b:00007ffe467f6a08 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 +[ 8130.281297] RAX: ffffffffffffffda RBX: 00000000d1a4d788 RCX: 00007ff86fee6b27 +[ 8130.281297] RDX: 00007ffe467f6a14 RSI: 0000000040045613 RDI: 0000000000000006 +[ 8130.281298] RBP: 000000000373f8d0 R08: 00000000ffffffff R09: 00007ff860001140 +[ 8130.281298] R10: 0000000000000243 R11: 0000000000000246 R12: 0000000000000000 +[ 8130.281299] R13: 00000000000000a0 R14: 00007ffe467f6530 R15: 0000000001f32228 +[ 8130.281300] ---[ end trace 00695dc96be646e7 ]--- + +Signed-off-by: Anton Sviridenko +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/media/pci/solo6x10/solo6x10-v4l2.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +--- a/drivers/media/pci/solo6x10/solo6x10-v4l2.c ++++ b/drivers/media/pci/solo6x10/solo6x10-v4l2.c +@@ -342,6 +342,17 @@ static void solo_stop_streaming(struct v + struct solo_dev *solo_dev = vb2_get_drv_priv(q); + + solo_stop_thread(solo_dev); ++ ++ spin_lock(&solo_dev->slock); ++ while (!list_empty(&solo_dev->vidq_active)) { ++ struct solo_vb2_buf *buf = list_entry( ++ solo_dev->vidq_active.next, ++ struct solo_vb2_buf, list); ++ ++ list_del(&buf->list); ++ vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR); ++ } ++ spin_unlock(&solo_dev->slock); + INIT_LIST_HEAD(&solo_dev->vidq_active); + } + diff --git a/queue-4.4/spi-omap2-mcspi-poll-omap2_mcspi_chstat_rxs-for-pio-transfer.patch b/queue-4.4/spi-omap2-mcspi-poll-omap2_mcspi_chstat_rxs-for-pio-transfer.patch new file mode 100644 index 00000000000..6e4d67c63d2 --- /dev/null +++ b/queue-4.4/spi-omap2-mcspi-poll-omap2_mcspi_chstat_rxs-for-pio-transfer.patch @@ -0,0 +1,60 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Akinobu Mita +Date: Wed, 22 Mar 2017 09:18:26 +0900 +Subject: spi: omap2-mcspi: poll OMAP2_MCSPI_CHSTAT_RXS for PIO transfer + +From: Akinobu Mita + + +[ Upstream commit 812613591cb652344186c4cd912304ed02138566 ] + +When running the spi-loopback-test with slower clock rate like 10 KHz, +the test for 251 bytes transfer was failed. This failure triggered an +spi-omap2-mcspi's error message "DMA RX last word empty". + +This message means that PIO for reading the remaining bytes due to the +DMA transfer length reduction is failed. This problem can be fixed by +polling OMAP2_MCSPI_CHSTAT_RXS bit in channel status register to wait +until the receive buffer register is filled. + +Cc: Mark Brown +Signed-off-by: Akinobu Mita +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/spi/spi-omap2-mcspi.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +--- a/drivers/spi/spi-omap2-mcspi.c ++++ b/drivers/spi/spi-omap2-mcspi.c +@@ -457,6 +457,8 @@ omap2_mcspi_rx_dma(struct spi_device *sp + int elements = 0; + int word_len, element_count; + struct omap2_mcspi_cs *cs = spi->controller_state; ++ void __iomem *chstat_reg = cs->base + OMAP2_MCSPI_CHSTAT0; ++ + mcspi = spi_master_get_devdata(spi->master); + mcspi_dma = &mcspi->dma_channels[spi->chip_select]; + count = xfer->len; +@@ -517,8 +519,8 @@ omap2_mcspi_rx_dma(struct spi_device *sp + if (l & OMAP2_MCSPI_CHCONF_TURBO) { + elements--; + +- if (likely(mcspi_read_cs_reg(spi, OMAP2_MCSPI_CHSTAT0) +- & OMAP2_MCSPI_CHSTAT_RXS)) { ++ if (!mcspi_wait_for_reg_bit(chstat_reg, ++ OMAP2_MCSPI_CHSTAT_RXS)) { + u32 w; + + w = mcspi_read_cs_reg(spi, OMAP2_MCSPI_RX0); +@@ -536,8 +538,7 @@ omap2_mcspi_rx_dma(struct spi_device *sp + return count; + } + } +- if (likely(mcspi_read_cs_reg(spi, OMAP2_MCSPI_CHSTAT0) +- & OMAP2_MCSPI_CHSTAT_RXS)) { ++ if (!mcspi_wait_for_reg_bit(chstat_reg, OMAP2_MCSPI_CHSTAT_RXS)) { + u32 w; + + w = mcspi_read_cs_reg(spi, OMAP2_MCSPI_RX0); diff --git a/queue-4.4/spi-sun6i-disable-unprepare-clocks-on-remove.patch b/queue-4.4/spi-sun6i-disable-unprepare-clocks-on-remove.patch new file mode 100644 index 00000000000..d086b30f3af --- /dev/null +++ b/queue-4.4/spi-sun6i-disable-unprepare-clocks-on-remove.patch @@ -0,0 +1,39 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Tobias Jordan +Date: Thu, 7 Dec 2017 15:04:53 +0100 +Subject: spi: sun6i: disable/unprepare clocks on remove + +From: Tobias Jordan + + +[ Upstream commit 2d9bbd02c54094ceffa555143b0d68cd06504d63 ] + +sun6i_spi_probe() uses sun6i_spi_runtime_resume() to prepare/enable +clocks, so sun6i_spi_remove() should use sun6i_spi_runtime_suspend() to +disable/unprepare them if we're not suspended. +Replacing pm_runtime_disable() by pm_runtime_force_suspend() will ensure +that sun6i_spi_runtime_suspend() is called if needed. + +Found by Linux Driver Verification project (linuxtesting.org). + +Fixes: 3558fe900e8af (spi: sunxi: Add Allwinner A31 SPI controller driver) +Signed-off-by: Tobias Jordan +Acked-by: Maxime Ripard +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/spi/spi-sun6i.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/spi/spi-sun6i.c ++++ b/drivers/spi/spi-sun6i.c +@@ -457,7 +457,7 @@ err_free_master: + + static int sun6i_spi_remove(struct platform_device *pdev) + { +- pm_runtime_disable(&pdev->dev); ++ pm_runtime_force_suspend(&pdev->dev); + + return 0; + } diff --git a/queue-4.4/staging-speakup-replace-bug_on-with-warn_on.patch b/queue-4.4/staging-speakup-replace-bug_on-with-warn_on.patch new file mode 100644 index 00000000000..04cfa062772 --- /dev/null +++ b/queue-4.4/staging-speakup-replace-bug_on-with-warn_on.patch @@ -0,0 +1,49 @@ +From foo@baz Mon Mar 19 09:58:11 CET 2018 +From: Varsha Rao +Date: Sat, 25 Feb 2017 17:53:58 +0530 +Subject: staging: speakup: Replace BUG_ON() with WARN_ON(). + +From: Varsha Rao + + +[ Upstream commit d351c2db5420bb17dcd2d9aac7ddb5f64c6d04b3 ] + +BUG_ON() is replaced with WARN_ON() and EINVAL is returned, when +WARN_ON() is true. This fixes the following checkpatch issue: + +Avoid crashing the kernel - try using WARN_ON & recovery code rather +than BUG() or BUG_ON(). + +Signed-off-by: Varsha Rao +Reviewed-by: Samuel Thibault +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/staging/speakup/kobjects.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/drivers/staging/speakup/kobjects.c ++++ b/drivers/staging/speakup/kobjects.c +@@ -831,7 +831,9 @@ static ssize_t message_show(struct kobje + struct msg_group_t *group = spk_find_msg_group(attr->attr.name); + unsigned long flags; + +- BUG_ON(!group); ++ if (WARN_ON(!group)) ++ return -EINVAL; ++ + spin_lock_irqsave(&speakup_info.spinlock, flags); + retval = message_show_helper(buf, group->start, group->end); + spin_unlock_irqrestore(&speakup_info.spinlock, flags); +@@ -843,7 +845,9 @@ static ssize_t message_store(struct kobj + { + struct msg_group_t *group = spk_find_msg_group(attr->attr.name); + +- BUG_ON(!group); ++ if (WARN_ON(!group)) ++ return -EINVAL; ++ + return message_store_helper(buf, count, group); + } + diff --git a/queue-4.4/staging-wilc1000-add-check-for-kmalloc-allocation-failure.patch b/queue-4.4/staging-wilc1000-add-check-for-kmalloc-allocation-failure.patch new file mode 100644 index 00000000000..2d1879422a7 --- /dev/null +++ b/queue-4.4/staging-wilc1000-add-check-for-kmalloc-allocation-failure.patch @@ -0,0 +1,34 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Colin Ian King +Date: Tue, 28 Feb 2017 11:47:33 +0000 +Subject: staging: wilc1000: add check for kmalloc allocation failure. + +From: Colin Ian King + + +[ Upstream commit 6cc0c259d034c6ab48f4e12f505213988e73d380 ] + +Add a sanity check that wid.val has been allocated, fixes a null +pointer deference on stamac when calling ether_add_copy. + +Detected by CoverityScan, CID#1369537 ("Dereference null return value") + +Signed-off-by: Colin Ian King +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/staging/wilc1000/host_interface.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/staging/wilc1000/host_interface.c ++++ b/drivers/staging/wilc1000/host_interface.c +@@ -2179,6 +2179,8 @@ static s32 Handle_Get_InActiveTime(struc + wid.type = WID_STR; + wid.size = ETH_ALEN; + wid.val = kmalloc(wid.size, GFP_KERNEL); ++ if (!wid.val) ++ return -ENOMEM; + + stamac = wid.val; + memcpy(stamac, strHostIfStaInactiveT->mac, ETH_ALEN); diff --git a/queue-4.4/sysrq-reset-the-watchdog-timers-while-displaying-high-resolution-timers.patch b/queue-4.4/sysrq-reset-the-watchdog-timers-while-displaying-high-resolution-timers.patch new file mode 100644 index 00000000000..41cf5882171 --- /dev/null +++ b/queue-4.4/sysrq-reset-the-watchdog-timers-while-displaying-high-resolution-timers.patch @@ -0,0 +1,71 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Tom Hromatka +Date: Wed, 4 Jan 2017 15:28:04 -0700 +Subject: sysrq: Reset the watchdog timers while displaying high-resolution timers + +From: Tom Hromatka + + +[ Upstream commit 0107042768658fea9f5f5a9c00b1c90f5dab6a06 ] + +On systems with a large number of CPUs, running sysrq- can cause +watchdog timeouts. There are two slow sections of code in the sysrq- +path in timer_list.c. + +1. print_active_timers() - This function is called by print_cpu() and + contains a slow goto loop. On a machine with hundreds of CPUs, this + loop took approximately 100ms for the first CPU in a NUMA node. + (Subsequent CPUs in the same node ran much quicker.) The total time + to print all of the CPUs is ultimately long enough to trigger the + soft lockup watchdog. + +2. print_tickdevice() - This function outputs a large amount of textual + information. This function also took approximately 100ms per CPU. + +Since sysrq- is not a performance critical path, there should be no +harm in touching the nmi watchdog in both slow sections above. Touching +it in just one location was insufficient on systems with hundreds of +CPUs as occasional timeouts were still observed during testing. + +This issue was observed on an Oracle T7 machine with 128 CPUs, but I +anticipate it may affect other systems with similarly large numbers of +CPUs. + +Signed-off-by: Tom Hromatka +Reviewed-by: Rob Gardner +Signed-off-by: John Stultz +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + kernel/time/timer_list.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/kernel/time/timer_list.c ++++ b/kernel/time/timer_list.c +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #include + +@@ -96,6 +97,9 @@ print_active_timers(struct seq_file *m, + + next_one: + i = 0; ++ ++ touch_nmi_watchdog(); ++ + raw_spin_lock_irqsave(&base->cpu_base->lock, flags); + + curr = timerqueue_getnext(&base->active); +@@ -207,6 +211,8 @@ print_tickdevice(struct seq_file *m, str + { + struct clock_event_device *dev = td->evtdev; + ++ touch_nmi_watchdog(); ++ + SEQ_printf(m, "Tick Device: mode: %d\n", td->mode); + if (cpu < 0) + SEQ_printf(m, "Broadcast device\n"); diff --git a/queue-4.4/tcp-sysctl-fix-a-race-to-avoid-unexpected-0-window-from-space.patch b/queue-4.4/tcp-sysctl-fix-a-race-to-avoid-unexpected-0-window-from-space.patch new file mode 100644 index 00000000000..293d0265486 --- /dev/null +++ b/queue-4.4/tcp-sysctl-fix-a-race-to-avoid-unexpected-0-window-from-space.patch @@ -0,0 +1,47 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Gao Feng +Date: Fri, 24 Mar 2017 07:05:12 +0800 +Subject: tcp: sysctl: Fix a race to avoid unexpected 0 window from space + +From: Gao Feng + + +[ Upstream commit c48367427a39ea0b85c7cf018fe4256627abfd9e ] + +Because sysctl_tcp_adv_win_scale could be changed any time, so there +is one race in tcp_win_from_space. +For example, +1.sysctl_tcp_adv_win_scale<=0 (sysctl_tcp_adv_win_scale is negative now) +2.space>>(-sysctl_tcp_adv_win_scale) (sysctl_tcp_adv_win_scale is postive now) + +As a result, tcp_win_from_space returns 0. It is unexpected. + +Certainly if the compiler put the sysctl_tcp_adv_win_scale into one +register firstly, then use the register directly, it would be ok. +But we could not depend on the compiler behavior. + +Signed-off-by: Gao Feng +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + include/net/tcp.h | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +--- a/include/net/tcp.h ++++ b/include/net/tcp.h +@@ -1199,9 +1199,11 @@ void tcp_select_initial_window(int __spa + + static inline int tcp_win_from_space(int space) + { +- return sysctl_tcp_adv_win_scale<=0 ? +- (space>>(-sysctl_tcp_adv_win_scale)) : +- space - (space>>sysctl_tcp_adv_win_scale); ++ int tcp_adv_win_scale = sysctl_tcp_adv_win_scale; ++ ++ return tcp_adv_win_scale <= 0 ? ++ (space>>(-tcp_adv_win_scale)) : ++ space - (space>>tcp_adv_win_scale); + } + + /* Note: caller must be prepared to deal with negative returns */ diff --git a/queue-4.4/test_firmware-fix-setting-old-custom-fw-path-back-on-exit.patch b/queue-4.4/test_firmware-fix-setting-old-custom-fw-path-back-on-exit.patch new file mode 100644 index 00000000000..32e16beb259 --- /dev/null +++ b/queue-4.4/test_firmware-fix-setting-old-custom-fw-path-back-on-exit.patch @@ -0,0 +1,48 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: "Luis R. Rodriguez" +Date: Mon, 20 Nov 2017 09:45:35 -0800 +Subject: test_firmware: fix setting old custom fw path back on exit + +From: "Luis R. Rodriguez" + + +[ Upstream commit 65c79230576873b312c3599479c1e42355c9f349 ] + +The file /sys/module/firmware_class/parameters/path can be used +to set a custom firmware path. The fw_filesystem.sh script creates +a temporary directory to add a test firmware file to be used during +testing, in order for this to work it uses the custom path syfs file +and it was supposed to reset back the file on execution exit. The +script failed to do this due to a typo, it was using OLD_PATH instead +of OLD_FWPATH, since its inception since v3.17. + +Its not as easy to just keep the old setting, it turns out that +resetting an empty setting won't actually do what we want, we need +to check if it was empty and set an empty space. + +Without this we end up having the temporary path always set after +we run these tests. + +Fixes: 0a8adf58475 ("test: add firmware_class loader test") +Signed-off-by: Luis R. Rodriguez +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/firmware/fw_filesystem.sh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/tools/testing/selftests/firmware/fw_filesystem.sh ++++ b/tools/testing/selftests/firmware/fw_filesystem.sh +@@ -28,7 +28,10 @@ test_finish() + if [ "$HAS_FW_LOADER_USER_HELPER" = "yes" ]; then + echo "$OLD_TIMEOUT" >/sys/class/firmware/timeout + fi +- echo -n "$OLD_PATH" >/sys/module/firmware_class/parameters/path ++ if [ "$OLD_FWPATH" = "" ]; then ++ OLD_FWPATH=" " ++ fi ++ echo -n "$OLD_FWPATH" >/sys/module/firmware_class/parameters/path + rm -f "$FW" + rmdir "$FWPATH" + } diff --git a/queue-4.4/timers-sched_clock-update-timeout-for-clock-wrap.patch b/queue-4.4/timers-sched_clock-update-timeout-for-clock-wrap.patch new file mode 100644 index 00000000000..e98911abbdd --- /dev/null +++ b/queue-4.4/timers-sched_clock-update-timeout-for-clock-wrap.patch @@ -0,0 +1,41 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: David Engraf +Date: Fri, 17 Feb 2017 08:51:03 +0100 +Subject: timers, sched_clock: Update timeout for clock wrap + +From: David Engraf + + +[ Upstream commit 1b8955bc5ac575009835e371ae55e7f3af2197a9 ] + +The scheduler clock framework may not use the correct timeout for the clock +wrap. This happens when a new clock driver calls sched_clock_register() +after the kernel called sched_clock_postinit(). In this case the clock wrap +timeout is too long thus sched_clock_poll() is called too late and the clock +already wrapped. + +On my ARM system the scheduler was no longer scheduling any other task than +the idle task because the sched_clock() wrapped. + +Signed-off-by: David Engraf +Signed-off-by: John Stultz +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + kernel/time/sched_clock.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/kernel/time/sched_clock.c ++++ b/kernel/time/sched_clock.c +@@ -205,6 +205,11 @@ sched_clock_register(u64 (*read)(void), + + update_clock_read_data(&rd); + ++ if (sched_clock_timer.function != NULL) { ++ /* update timeout for clock wrap */ ++ hrtimer_start(&sched_clock_timer, cd.wrap_kt, HRTIMER_MODE_REL); ++ } ++ + r = rate; + if (r >= 4000000) { + r /= 1000000; diff --git a/queue-4.4/tools-usbip-fixes-build-with-musl-libc-toolchain.patch b/queue-4.4/tools-usbip-fixes-build-with-musl-libc-toolchain.patch new file mode 100644 index 00000000000..c710be23e27 --- /dev/null +++ b/queue-4.4/tools-usbip-fixes-build-with-musl-libc-toolchain.patch @@ -0,0 +1,45 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Julien BOIBESSOT +Date: Tue, 5 Dec 2017 18:48:14 +0100 +Subject: tools/usbip: fixes build with musl libc toolchain + +From: Julien BOIBESSOT + + +[ Upstream commit 77be4c878c72e411ad22af96b6f81dd45c26450a ] + +Indeed musl doesn't define old SIGCLD signal name but only new one SIGCHLD. +SIGCHLD is the new POSIX name for that signal so it doesn't change +anything on other libcs. + +This fixes this kind of build error: + +usbipd.c: In function ‘set_signal’: +usbipd.c:459:12: error: 'SIGCLD' undeclared (first use in this function) + sigaction(SIGCLD, &act, NULL); + ^~~~~~ +usbipd.c:459:12: note: each undeclared identifier is reported only once + for each function it appears in +Makefile:407: recipe for target 'usbipd.o' failed +make[3]: *** [usbipd.o] Error 1 + +Signed-off-by: Julien BOIBESSOT +Acked-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + tools/usb/usbip/src/usbipd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/usb/usbip/src/usbipd.c ++++ b/tools/usb/usbip/src/usbipd.c +@@ -451,7 +451,7 @@ static void set_signal(void) + sigaction(SIGTERM, &act, NULL); + sigaction(SIGINT, &act, NULL); + act.sa_handler = SIG_IGN; +- sigaction(SIGCLD, &act, NULL); ++ sigaction(SIGCHLD, &act, NULL); + } + + static const char *pid_file; diff --git a/queue-4.4/usb-dwc2-make-sure-we-disconnect-the-gadget-state.patch b/queue-4.4/usb-dwc2-make-sure-we-disconnect-the-gadget-state.patch new file mode 100644 index 00000000000..6d18d1bd09d --- /dev/null +++ b/queue-4.4/usb-dwc2-make-sure-we-disconnect-the-gadget-state.patch @@ -0,0 +1,56 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: John Stultz +Date: Mon, 13 Feb 2017 20:08:08 -0800 +Subject: usb: dwc2: Make sure we disconnect the gadget state + +From: John Stultz + + +[ Upstream commit dad3f793f20fbb5c0c342f0f5a0bdf69a4d76089 ] + +I had seen some odd behavior with HiKey's usb-gadget interface +that I finally seemed to have chased down. Basically every other +time I plugged in the OTG port, the gadget interface would +properly initialize. The other times, I'd get a big WARN_ON +in dwc2_hsotg_init_fifo() about the fifo_map not being clear. + +Ends up if we don't disconnect the gadget state, the fifo-map +doesn't get cleared properly, which causes WARN_ON messages and +also results in the device not properly being setup as a gadget +every other time the OTG port is connected. + +So this patch adds a call to dwc2_hsotg_disconnect() in the +reset path so the state is properly cleared. + +With it, the gadget interface initializes properly on every +plug in. + +Cc: Wei Xu +Cc: Guodong Xu +Cc: Amit Pundir +Cc: Rob Herring +Cc: John Youn +Cc: Douglas Anderson +Cc: Chen Yu +Cc: Felipe Balbi +Cc: Greg Kroah-Hartman +Cc: linux-usb@vger.kernel.org +Acked-by: John Youn +Signed-off-by: John Stultz +Signed-off-by: Felipe Balbi +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/dwc2/hcd.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/dwc2/hcd.c ++++ b/drivers/usb/dwc2/hcd.c +@@ -1385,6 +1385,7 @@ static void dwc2_conn_id_status_change(s + dwc2_core_init(hsotg, false, -1); + dwc2_enable_global_interrupts(hsotg); + spin_lock_irqsave(&hsotg->lock, flags); ++ dwc2_hsotg_disconnect(hsotg); + dwc2_hsotg_core_init_disconnected(hsotg, false); + spin_unlock_irqrestore(&hsotg->lock, flags); + dwc2_hsotg_core_connect(hsotg); diff --git a/queue-4.4/usb-gadget-dummy_hcd-fix-wrong-power-status-bit-clear-reset-in-dummy_hub_control.patch b/queue-4.4/usb-gadget-dummy_hcd-fix-wrong-power-status-bit-clear-reset-in-dummy_hub_control.patch new file mode 100644 index 00000000000..b66f6144cd8 --- /dev/null +++ b/queue-4.4/usb-gadget-dummy_hcd-fix-wrong-power-status-bit-clear-reset-in-dummy_hub_control.patch @@ -0,0 +1,67 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Yuyang Du +Date: Fri, 24 Mar 2017 04:06:11 +0800 +Subject: usb: gadget: dummy_hcd: Fix wrong power status bit clear/reset in dummy_hub_control() + +From: Yuyang Du + + +[ Upstream commit 9f20dfb44d03745d0d3cef2ffb3abf8d8024fa61 ] + +This fixes the commit: 1cd8fd2887e1 ("usb: gadget: dummy_hcd: add +SuperSpeed support"). + +In the case of ClearPortFeature and USB_PORT_FEAT_POWER, simply clear +the right bit regardless of what the wValue is. + +Acked-by: Alan Stern +Signed-off-by: Yuyang Du +Signed-off-by: Felipe Balbi +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/gadget/udc/dummy_hcd.c | 20 ++++++++------------ + 1 file changed, 8 insertions(+), 12 deletions(-) + +--- a/drivers/usb/gadget/udc/dummy_hcd.c ++++ b/drivers/usb/gadget/udc/dummy_hcd.c +@@ -2105,16 +2105,13 @@ static int dummy_hub_control( + } + break; + case USB_PORT_FEAT_POWER: +- if (hcd->speed == HCD_USB3) { +- if (dum_hcd->port_status & USB_PORT_STAT_POWER) +- dev_dbg(dummy_dev(dum_hcd), +- "power-off\n"); +- } else +- if (dum_hcd->port_status & +- USB_SS_PORT_STAT_POWER) +- dev_dbg(dummy_dev(dum_hcd), +- "power-off\n"); +- /* FALLS THROUGH */ ++ dev_dbg(dummy_dev(dum_hcd), "power-off\n"); ++ if (hcd->speed == HCD_USB3) ++ dum_hcd->port_status &= ~USB_SS_PORT_STAT_POWER; ++ else ++ dum_hcd->port_status &= ~USB_PORT_STAT_POWER; ++ set_link_state(dum_hcd); ++ break; + default: + dum_hcd->port_status &= ~(1 << wValue); + set_link_state(dum_hcd); +@@ -2285,14 +2282,13 @@ static int dummy_hub_control( + if ((dum_hcd->port_status & + USB_SS_PORT_STAT_POWER) != 0) { + dum_hcd->port_status |= (1 << wValue); +- set_link_state(dum_hcd); + } + } else + if ((dum_hcd->port_status & + USB_PORT_STAT_POWER) != 0) { + dum_hcd->port_status |= (1 << wValue); +- set_link_state(dum_hcd); + } ++ set_link_state(dum_hcd); + } + break; + case GetPortErrorCount: diff --git a/queue-4.4/veth-set-peer-gso-values.patch b/queue-4.4/veth-set-peer-gso-values.patch new file mode 100644 index 00000000000..90e6afa5174 --- /dev/null +++ b/queue-4.4/veth-set-peer-gso-values.patch @@ -0,0 +1,39 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Stephen Hemminger +Date: Thu, 7 Dec 2017 15:40:20 -0800 +Subject: veth: set peer GSO values + +From: Stephen Hemminger + + +[ Upstream commit 72d24955b44a4039db54a1c252b5031969eeaac3 ] + +When new veth is created, and GSO values have been configured +on one device, clone those values to the peer. + +For example: + # ip link add dev vm1 gso_max_size 65530 type veth peer name vm2 + +This should create vm1 <--> vm2 with both having GSO maximum +size set to 65530. + +Signed-off-by: Stephen Hemminger +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/veth.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/net/veth.c ++++ b/drivers/net/veth.c +@@ -399,6 +399,9 @@ static int veth_newlink(struct net *src_ + if (ifmp && (dev->ifindex != 0)) + peer->ifindex = ifmp->ifi_index; + ++ peer->gso_max_size = dev->gso_max_size; ++ peer->gso_max_segs = dev->gso_max_segs; ++ + err = register_netdevice(peer); + put_net(net); + net = NULL; diff --git a/queue-4.4/video-arm-clcd-fix-dma-allocation-size.patch b/queue-4.4/video-arm-clcd-fix-dma-allocation-size.patch new file mode 100644 index 00000000000..0948ce5e13e --- /dev/null +++ b/queue-4.4/video-arm-clcd-fix-dma-allocation-size.patch @@ -0,0 +1,46 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Liam Beguin +Date: Fri, 7 Apr 2017 17:03:24 +0200 +Subject: video: ARM CLCD: fix dma allocation size + +From: Liam Beguin + + +[ Upstream commit 9a1c779e6b06855e41099caa6f15b3b584dfa88c ] + +This patch forces the frambuffer size to be aligned on kernel pages. + +During the board startup, the splash screed did appear; +the "ts_test" program or our application were not able to start. + +The following error message was reported: +error: failed to map framebuffer device to memory. +LinuxFB: driver cannot connect + +The issue was discovered, on the LPC32xx platform, during the migration +of the LCD definition from the board file to the device tree. + +Signed-off-by: Liam Beguin +Signed-off-by: Sylvain Lemieux +Cc: Vladimir Zapolskiy +Cc: Russell King +Signed-off-by: Bartlomiej Zolnierkiewicz +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/video/fbdev/amba-clcd.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/video/fbdev/amba-clcd.c ++++ b/drivers/video/fbdev/amba-clcd.c +@@ -759,8 +759,8 @@ static int clcdfb_of_dma_setup(struct cl + if (err) + return err; + +- framesize = fb->panel->mode.xres * fb->panel->mode.yres * +- fb->panel->bpp / 8; ++ framesize = PAGE_ALIGN(fb->panel->mode.xres * fb->panel->mode.yres * ++ fb->panel->bpp / 8); + fb->fb.screen_base = dma_alloc_coherent(&fb->dev->dev, framesize, + &dma, GFP_KERNEL); + if (!fb->fb.screen_base) diff --git a/queue-4.4/video-hdmi-allow-empty-hdmi-infoframes.patch b/queue-4.4/video-hdmi-allow-empty-hdmi-infoframes.patch new file mode 100644 index 00000000000..455c7c7a203 --- /dev/null +++ b/queue-4.4/video-hdmi-allow-empty-hdmi-infoframes.patch @@ -0,0 +1,135 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: "Ville Syrjälä" +Date: Mon, 13 Nov 2017 19:04:18 +0200 +Subject: video/hdmi: Allow "empty" HDMI infoframes + +From: "Ville Syrjälä" + + +[ Upstream commit 593f4b19a094c4426bd1e1e3cbab87a48bd13c71 ] + +HDMI 2.0 Appendix F suggest that we should keep sending the infoframe +when switching from 3D to 2D mode, even if the infoframe isn't strictly +necessary (ie. not needed to transmit the VIC or stereo information). +This is a workaround against some sinks that fail to realize that they +should switch from 3D to 2D mode when the source stop transmitting +the infoframe. + +v2: Handle unpack() as well + Pull the length calculation into a helper + +Cc: Shashank Sharma +Cc: Andrzej Hajda +Cc: Thierry Reding +Cc: Hans Verkuil +Cc: linux-media@vger.kernel.org +Reviewed-by: Andrzej Hajda #v1 +Signed-off-by: Ville Syrjälä +Link: https://patchwork.freedesktop.org/patch/msgid/20171113170427.4150-2-ville.syrjala@linux.intel.com +Reviewed-by: Shashank Sharma +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/video/hdmi.c | 51 +++++++++++++++++++++++++++++++-------------------- + 1 file changed, 31 insertions(+), 20 deletions(-) + +--- a/drivers/video/hdmi.c ++++ b/drivers/video/hdmi.c +@@ -321,6 +321,17 @@ int hdmi_vendor_infoframe_init(struct hd + } + EXPORT_SYMBOL(hdmi_vendor_infoframe_init); + ++static int hdmi_vendor_infoframe_length(const struct hdmi_vendor_infoframe *frame) ++{ ++ /* for side by side (half) we also need to provide 3D_Ext_Data */ ++ if (frame->s3d_struct >= HDMI_3D_STRUCTURE_SIDE_BY_SIDE_HALF) ++ return 6; ++ else if (frame->vic != 0 || frame->s3d_struct != HDMI_3D_STRUCTURE_INVALID) ++ return 5; ++ else ++ return 4; ++} ++ + /** + * hdmi_vendor_infoframe_pack() - write a HDMI vendor infoframe to binary buffer + * @frame: HDMI infoframe +@@ -341,19 +352,11 @@ ssize_t hdmi_vendor_infoframe_pack(struc + u8 *ptr = buffer; + size_t length; + +- /* empty info frame */ +- if (frame->vic == 0 && frame->s3d_struct == HDMI_3D_STRUCTURE_INVALID) +- return -EINVAL; +- + /* only one of those can be supplied */ + if (frame->vic != 0 && frame->s3d_struct != HDMI_3D_STRUCTURE_INVALID) + return -EINVAL; + +- /* for side by side (half) we also need to provide 3D_Ext_Data */ +- if (frame->s3d_struct >= HDMI_3D_STRUCTURE_SIDE_BY_SIDE_HALF) +- frame->length = 6; +- else +- frame->length = 5; ++ frame->length = hdmi_vendor_infoframe_length(frame); + + length = HDMI_INFOFRAME_HEADER_SIZE + frame->length; + +@@ -372,14 +375,16 @@ ssize_t hdmi_vendor_infoframe_pack(struc + ptr[5] = 0x0c; + ptr[6] = 0x00; + +- if (frame->vic) { +- ptr[7] = 0x1 << 5; /* video format */ +- ptr[8] = frame->vic; +- } else { ++ if (frame->s3d_struct != HDMI_3D_STRUCTURE_INVALID) { + ptr[7] = 0x2 << 5; /* video format */ + ptr[8] = (frame->s3d_struct & 0xf) << 4; + if (frame->s3d_struct >= HDMI_3D_STRUCTURE_SIDE_BY_SIDE_HALF) + ptr[9] = (frame->s3d_ext_data & 0xf) << 4; ++ } else if (frame->vic) { ++ ptr[7] = 0x1 << 5; /* video format */ ++ ptr[8] = frame->vic; ++ } else { ++ ptr[7] = 0x0 << 5; /* video format */ + } + + hdmi_infoframe_set_checksum(buffer, length); +@@ -1161,7 +1166,7 @@ hdmi_vendor_any_infoframe_unpack(union h + + if (ptr[0] != HDMI_INFOFRAME_TYPE_VENDOR || + ptr[1] != 1 || +- (ptr[2] != 5 && ptr[2] != 6)) ++ (ptr[2] != 4 && ptr[2] != 5 && ptr[2] != 6)) + return -EINVAL; + + length = ptr[2]; +@@ -1189,16 +1194,22 @@ hdmi_vendor_any_infoframe_unpack(union h + + hvf->length = length; + +- if (hdmi_video_format == 0x1) { +- hvf->vic = ptr[4]; +- } else if (hdmi_video_format == 0x2) { ++ if (hdmi_video_format == 0x2) { ++ if (length != 5 && length != 6) ++ return -EINVAL; + hvf->s3d_struct = ptr[4] >> 4; + if (hvf->s3d_struct >= HDMI_3D_STRUCTURE_SIDE_BY_SIDE_HALF) { +- if (length == 6) +- hvf->s3d_ext_data = ptr[5] >> 4; +- else ++ if (length != 6) + return -EINVAL; ++ hvf->s3d_ext_data = ptr[5] >> 4; + } ++ } else if (hdmi_video_format == 0x1) { ++ if (length != 5) ++ return -EINVAL; ++ hvf->vic = ptr[4]; ++ } else { ++ if (length != 4) ++ return -EINVAL; + } + + return 0; diff --git a/queue-4.4/vxlan-vxlan-dev-should-inherit-lowerdev-s-gso_max_size.patch b/queue-4.4/vxlan-vxlan-dev-should-inherit-lowerdev-s-gso_max_size.patch new file mode 100644 index 00000000000..ae148f1ef46 --- /dev/null +++ b/queue-4.4/vxlan-vxlan-dev-should-inherit-lowerdev-s-gso_max_size.patch @@ -0,0 +1,47 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Felix Manlunas +Date: Wed, 29 Mar 2017 17:56:43 -0700 +Subject: vxlan: vxlan dev should inherit lowerdev's gso_max_size + +From: Felix Manlunas + + +[ Upstream commit d6acfeb17d030bb3907e77c048b0e7783ad8e5a9 ] + +vxlan dev currently ignores lowerdev's gso_max_size, which adversely +affects TSO performance of liquidio if it's the lowerdev. Egress TCP +packets' skb->len often exceed liquidio's advertised gso_max_size. This +may happen on other NIC drivers. + +Fix it by assigning lowerdev's gso_max_size to that of vxlan dev. Might as +well do likewise for gso_max_segs. + +Single flow TSO throughput of liquidio as lowerdev (using iperf3): + + Before the patch: 139 Mbps + After the patch : 8.68 Gbps + Percent increase: 6,144 % + +Signed-off-by: Felix Manlunas +Signed-off-by: Satanand Burla +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/vxlan.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/net/vxlan.c ++++ b/drivers/net/vxlan.c +@@ -2834,6 +2834,11 @@ static int vxlan_dev_configure(struct ne + needed_headroom = lowerdev->hard_header_len; + } + ++ if (lowerdev) { ++ dev->gso_max_size = lowerdev->gso_max_size; ++ dev->gso_max_segs = lowerdev->gso_max_segs; ++ } ++ + if (conf->mtu) { + err = __vxlan_change_mtu(dev, lowerdev, dst, conf->mtu, false); + if (err) diff --git a/queue-4.4/wil6210-fix-memory-access-violation-in-wil_memcpy_from-toio_32.patch b/queue-4.4/wil6210-fix-memory-access-violation-in-wil_memcpy_from-toio_32.patch new file mode 100644 index 00000000000..d71b43086eb --- /dev/null +++ b/queue-4.4/wil6210-fix-memory-access-violation-in-wil_memcpy_from-toio_32.patch @@ -0,0 +1,64 @@ +From foo@baz Mon Mar 19 09:58:12 CET 2018 +From: Dedy Lansky +Date: Wed, 5 Apr 2017 14:58:11 +0300 +Subject: wil6210: fix memory access violation in wil_memcpy_from/toio_32 + +From: Dedy Lansky + + +[ Upstream commit 0f6edfe2bbbb59d161580cb4870fcc46f5490f85 ] + +In case count is not multiple of 4, there is a read access in +wil_memcpy_toio_32() from outside src buffer boundary. +In wil_memcpy_fromio_32(), in case count is not multiple of 4, there is +a write access to outside dst io memory boundary. + +Fix these issues with proper handling of the last 1 to 4 copied bytes. + +Signed-off-by: Dedy Lansky +Signed-off-by: Maya Erez +Signed-off-by: Kalle Valo +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/ath/wil6210/main.c | 20 +++++++++++++++++--- + 1 file changed, 17 insertions(+), 3 deletions(-) + +--- a/drivers/net/wireless/ath/wil6210/main.c ++++ b/drivers/net/wireless/ath/wil6210/main.c +@@ -125,9 +125,15 @@ void wil_memcpy_fromio_32(void *dst, con + u32 *d = dst; + const volatile u32 __iomem *s = src; + +- /* size_t is unsigned, if (count%4 != 0) it will wrap */ +- for (count += 4; count > 4; count -= 4) ++ for (; count >= 4; count -= 4) + *d++ = __raw_readl(s++); ++ ++ if (unlikely(count)) { ++ /* count can be 1..3 */ ++ u32 tmp = __raw_readl(s); ++ ++ memcpy(d, &tmp, count); ++ } + } + + void wil_memcpy_toio_32(volatile void __iomem *dst, const void *src, +@@ -136,8 +142,16 @@ void wil_memcpy_toio_32(volatile void __ + volatile u32 __iomem *d = dst; + const u32 *s = src; + +- for (count += 4; count > 4; count -= 4) ++ for (; count >= 4; count -= 4) + __raw_writel(*s++, d++); ++ ++ if (unlikely(count)) { ++ /* count can be 1..3 */ ++ u32 tmp = 0; ++ ++ memcpy(&tmp, s, count); ++ __raw_writel(tmp, d); ++ } + } + + static void wil_disconnect_cid(struct wil6210_priv *wil, int cid,