Skip to contentSkip to conversation

Linux 4.14.44

DISCUSSION Greg KH 1 participant 2 messages May 25, 2018 Stable branch

lore
Share & tools
lore

Greg KH

author maintainer
#0 lore raw

I'm announcing the release of the 4.14.44 kernel.

All users of the 4.14 kernel series must upgrade.

The updated 4.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Makefile                                              |    2 
 arch/arm/boot/dts/imx7d-sdb.dts                       |    2 
 arch/s390/crypto/crc32be-vx.S                         |    5 
 arch/s390/crypto/crc32le-vx.S                         |    4 
 arch/s390/include/asm/alternative-asm.h               |  108 ++++++
 arch/s390/include/asm/nospec-insn.h                   |  195 +++++++++++
 arch/s390/kernel/Makefile                             |    1 
 arch/s390/kernel/asm-offsets.c                        |    1 
 arch/s390/kernel/base.S                               |   24 -
 arch/s390/kernel/entry.S                              |  105 +-----
 arch/s390/kernel/mcount.S                             |   14 
 arch/s390/kernel/nospec-branch.c                      |   43 +-
 arch/s390/kernel/nospec-sysfs.c                       |   21 +
 arch/s390/kernel/reipl.S                              |    7 
 arch/s390/kernel/swsusp.S                             |   10 
 arch/s390/lib/mem.S                                   |   13 
 arch/s390/net/bpf_jit.S                               |   16 
 arch/s390/net/bpf_jit_comp.c                          |   63 +++
 arch/sparc/kernel/vio.c                               |    2 
 arch/x86/kernel/machine_kexec_32.c                    |    6 
 arch/x86/kernel/machine_kexec_64.c                    |    5 
 drivers/block/loop.c                                  |   71 ++--
 drivers/bluetooth/btusb.c                             |    6 
 drivers/clk/clk.c                                     |    3 
 drivers/clk/hisilicon/crg-hi3516cv300.c               |    2 
 drivers/clk/rockchip/clk-mmc-phase.c                  |   23 +
 drivers/clk/rockchip/clk-rk3228.c                     |    2 
 drivers/clk/samsung/clk-exynos3250.c                  |    4 
 drivers/clk/samsung/clk-exynos5250.c                  |    8 
 drivers/clk/samsung/clk-exynos5260.c                  |    2 
 drivers/clk/samsung/clk-exynos5433.c                  |   12 
 drivers/clk/samsung/clk-exynos7.c                     |    2 
 drivers/clk/samsung/clk-s3c2410.c                     |   16 
 drivers/clk/tegra/clk-pll.c                           |    2 
 drivers/crypto/atmel-aes.c                            |    2 
 drivers/crypto/ccp/ccp-debugfs.c                      |    7 
 drivers/crypto/inside-secure/safexcel.c               |    9 
 drivers/crypto/inside-secure/safexcel_cipher.c        |    2 
 drivers/crypto/inside-secure/safexcel_hash.c          |    8 
 drivers/crypto/sunxi-ss/sun4i-ss-core.c               |    1 
 drivers/media/dvb-core/dmxdev.c                       |    2 
 drivers/media/dvb-frontends/lgdt3306a.c               |   10 
 drivers/media/i2c/adv748x/adv748x-hdmi.c              |    3 
 drivers/media/i2c/ov5645.c                            |    5 
 drivers/media/i2c/tvp5150.c                           |   88 ++---
 drivers/media/pci/cx23885/cx23885-cards.c             |    4 
 drivers/media/pci/cx23885/cx23885-core.c              |   10 
 drivers/media/pci/cx25821/cx25821-core.c              |    7 
 drivers/media/platform/s3c-camif/camif-capture.c      |    7 
 drivers/media/platform/vivid/vivid-ctrls.c            |    2 
 drivers/media/platform/vsp1/vsp1_drm.c                |    9 
 drivers/media/usb/em28xx/em28xx-cards.c               |   22 -
 drivers/media/usb/em28xx/em28xx.h                     |    2 
 drivers/media/v4l2-core/videobuf2-vmalloc.c           |    2 
 drivers/message/fusion/mptctl.c                       |    2 
 drivers/net/ethernet/mellanox/mlx4/main.c             |    4 
 drivers/net/hyperv/hyperv_net.h                       |   11 
 drivers/net/hyperv/netvsc.c                           |  203 ++++++-----
 drivers/net/hyperv/netvsc_drv.c                       |  310 ++++++++++--------
 drivers/net/hyperv/rndis_filter.c                     |  210 ++++++------
 drivers/net/usb/qmi_wwan.c                            |    4 
 drivers/net/usb/usbnet.c                              |   10 
 drivers/net/vmxnet3/vmxnet3_drv.c                     |   72 ++--
 drivers/rtc/hctosys.c                                 |    5 
 drivers/rtc/rtc-goldfish.c                            |    2 
 drivers/rtc/rtc-m41t80.c                              |   18 -
 drivers/rtc/rtc-rk808.c                               |   14 
 drivers/rtc/rtc-rp5c01.c                              |   12 
 drivers/rtc/rtc-snvs.c                                |   15 
 drivers/rtc/rtc-tx4939.c                              |    6 
 drivers/s390/scsi/zfcp_dbf.c                          |   23 +
 drivers/s390/scsi/zfcp_ext.h                          |    5 
 drivers/s390/scsi/zfcp_scsi.c                         |   14 
 drivers/scsi/aacraid/commsup.c                        |    4 
 drivers/scsi/aacraid/linit.c                          |    5 
 drivers/scsi/bnx2fc/bnx2fc_io.c                       |    1 
 drivers/scsi/iscsi_tcp.c                              |    8 
 drivers/scsi/libsas/sas_scsi_host.c                   |   33 -
 drivers/scsi/lpfc/lpfc_attr.c                         |    5 
 drivers/scsi/lpfc/lpfc_hbadisc.c                      |    5 
 drivers/scsi/lpfc/lpfc_sli.c                          |    2 
 drivers/scsi/mpt3sas/mpt3sas_base.c                   |    5 
 drivers/scsi/mpt3sas/mpt3sas_scsih.c                  |    2 
 drivers/scsi/mvsas/mv_94xx.c                          |   23 -
 drivers/scsi/qedi/qedi_fw.c                           |    5 
 drivers/scsi/qedi/qedi_main.c                         |   24 -
 drivers/scsi/qla2xxx/qla_isr.c                        |    6 
 drivers/scsi/qla2xxx/qla_os.c                         |    2 
 drivers/scsi/qla4xxx/ql4_def.h                        |    2 
 drivers/scsi/qla4xxx/ql4_os.c                         |   46 ++
 drivers/scsi/scsi_lib.c                               |   11 
 drivers/scsi/sd.c                                     |    3 
 drivers/scsi/sg.c                                     |    2 
 drivers/scsi/storvsc_drv.c                            |    2 
 drivers/scsi/sym53c8xx_2/sym_hipd.c                   |    2 
 drivers/scsi/ufs/ufshcd.c                             |    2 
 drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c        |    6 
 drivers/staging/ks7010/ks_hostif.c                    |   31 -
 drivers/staging/ks7010/ks_hostif.h                    |    1 
 drivers/staging/lustre/lustre/include/obd.h           |    2 
 drivers/staging/lustre/lustre/lmv/lmv_obd.c           |    2 
 drivers/staging/lustre/lustre/osc/osc_cache.c         |    2 
 drivers/staging/rtl8192u/r8192U_core.c                |    2 
 drivers/staging/vc04_services/bcm2835-audio/bcm2835.c |   54 +--
 drivers/tty/serial/8250/8250_port.c                   |    3 
 drivers/tty/serial/altera_uart.c                      |   12 
 drivers/tty/serial/arc_uart.c                         |    5 
 drivers/tty/serial/fsl_lpuart.c                       |    4 
 drivers/tty/serial/imx.c                              |    6 
 drivers/tty/serial/mxs-auart.c                        |    4 
 drivers/tty/serial/samsung.c                          |    4 
 drivers/tty/serial/sh-sci.c                           |    4 
 drivers/tty/serial/xilinx_uartps.c                    |    2 
 drivers/usb/class/cdc-acm.c                           |    9 
 drivers/usb/dwc2/core.h                               |    2 
 drivers/usb/dwc2/gadget.c                             |   12 
 drivers/usb/dwc2/hcd.c                                |   32 +
 drivers/usb/dwc3/Makefile                             |    2 
 drivers/usb/dwc3/core.c                               |   16 
 drivers/usb/dwc3/core.h                               |    2 
 drivers/usb/dwc3/dwc3-omap.c                          |   16 
 drivers/usb/gadget/composite.c                        |   40 +-
 drivers/usb/gadget/function/f_fs.c                    |    6 
 drivers/usb/gadget/function/f_uac2.c                  |    2 
 drivers/usb/gadget/udc/core.c                         |    2 
 drivers/usb/gadget/udc/fsl_udc_core.c                 |    4 
 drivers/usb/gadget/udc/goku_udc.h                     |    2 
 drivers/usb/host/ohci-hcd.c                           |    3 
 drivers/usb/host/xhci-mem.c                           |    2 
 drivers/usb/host/xhci-plat.c                          |   11 
 drivers/usb/host/xhci.c                               |   14 
 drivers/usb/usbip/Kconfig                             |    2 
 fs/ext2/inode.c                                       |   10 
 fs/hfsplus/super.c                                    |    1 
 include/linux/u64_stats_sync.h                        |   22 +
 include/linux/usb/composite.h                         |    3 
 include/scsi/scsi.h                                   |    2 
 include/uapi/linux/nl80211.h                          |    2 
 net/core/dev.c                                        |    2 
 net/core/sock.c                                       |    2 
 net/ipv4/ip_output.c                                  |    3 
 net/ipv4/tcp_output.c                                 |    7 
 net/ipv6/ip6_output.c                                 |    3 
 net/packet/af_packet.c                                |    4 
 net/sched/act_vlan.c                                  |    2 
 net/sched/sch_red.c                                   |    5 
 net/sched/sch_tbf.c                                   |    5 
 net/smc/smc_pnet.c                                    |   71 ++--
 net/wireless/core.c                                   |    3 
 sound/soc/codecs/hdmi-codec.c                         |    7 
 sound/soc/rockchip/Kconfig                            |    3 
 sound/soc/samsung/i2s.c                               |   13 
 sound/soc/samsung/odroid.c                            |   11 
 sound/soc/soc-topology.c                              |    3 
 sound/usb/quirks.c                                    |   29 -
 155 files changed, 1784 insertions(+), 894 deletions(-)

Akinobu Mita (1):
media: ov5645: add missing of_node_put() in error path

Al Viro (1):
ext2: fix a block leak

Alexander Potapenko (1):
scsi: sg: allocate with __GFP_ZERO in sg_build_indirect()

Alexandre Belloni (4):
rtc: hctosys: Ensure system time doesn't overflow time_t
rtc: rk808: fix possible race condition
rtc: m41t80: fix race conditions
rtc: rp5c01: fix possible race condition

Amritha Nambiar (1):
net: Fix a bug in removing queues from XPS map

Andrew Vasquez (1):
scsi: qedi: Fix truncation of CHAP name and secret

Andrzej Hajda (6):
clk: samsung: s3c2410: Fix PLL rates
clk: samsung: exynos7: Fix PLL rates
clk: samsung: exynos5260: Fix PLL rates
clk: samsung: exynos5433: Fix PLL rates
clk: samsung: exynos5250: Fix PLL rates
clk: samsung: exynos3250: Fix PLL rates

Antoine Tenart (6):
crypto: inside-secure - wait for the request to complete if in the backlog
crypto: atmel-aes - fix the keys zeroing on errors
crypto: inside-secure - do not process request if no command was issued
crypto: inside-secure - fix the cache_len computation
crypto: inside-secure - fix the extra cache computation
crypto: inside-secure - fix the invalidation step during cra_exit

Arnd Bergmann (2):
clk: hisilicon: mark wdt_mux_p[] as const
media: s3c-camif: fix out-of-bounds array access

Arvind Yadav (1):
sparc: vio: use put_device() instead of kfree()

Bart Van Assche (1):
scsi: qla2xxx: Avoid triggering undefined behavior in qla2x00_mbx_completion()

Ben Hutchings (1):
usbip: Correct maximum value of CONFIG_USBIP_VHCI_HC_PORTS

Brad Love (6):
media: lgdt3306a: Fix module count mismatch on usb unplug
media: em28xx: USB bulk packet size fix
media: cx23885: Override 888 ImpactVCBe crystal frequency
media: cx23885: Set subdev host data to clk_freq pointer
media: lgdt3306a: Fix a double kfree on i2c device remove
media: em28xx: Add Hauppauge SoloHD/DualHD bulk models

Brian Norris (1):
usb: dwc3: Undo PHY init if soft reset fails

Bryan O'Donoghue (1):
rtc: snvs: Fix usage of snvs_rtc_enable

Chad Dupuis (1):
scsi: bnx2fc: Fix check in SCSI completion handler for timed out request

Chris Dickens (1):
usb: gadget: composite: fix incorrect handling of OS desc requests

Colin Ian King (3):
staging: rtl8192u: return -ENOMEM on failed allocation of priv->oldaddr
media: cx25821: prevent out-of-bounds read on array card
rtc: tx4939: avoid unintended sign extension on a 24 bit shift

Dan Carpenter (2):
scsi: sym53c8xx_2: iterator underflow in sym_getsync()
scsi: mptfusion: Add bounds check in mptctl_hp_targetinfo()

Dave Carroll (1):
scsi: aacraid: Insure command thread is not recursively stopped

Davide Caratti (1):
net/sched: fix refcnt leak in the error path of tcf_vlan_init()

Dominik Bozek (1):
usb: cdc_acm: prevent race at write to acm while system resumes

Douglas Gilbert (1):
scsi: core: Make SCSI Status CONDITION MET equivalent to GOOD

Eric Biggers (1):
net/smc: check for missing nlattrs in SMC_PNETID messages

Eric Dumazet (3):
sock_diag: fix use-after-free read in __sk_free
tcp: purge write queue in tcp_connect_init()
net: usbnet: fix potential deadlock on 32bit hosts

Ezequiel Garcia (1):
ASoC: rockchip: rk3288-hdmi-analog: Select needed codecs

Felipe Balbi (1):
usb: dwc3: Makefile: fix link error on randconfig

Fredrik Noring (1):
USB: OHCI: Fix NULL dereference in HCDs using HCD_LOCAL_MEM

Geert Uytterhoeven (7):
serial: xuartps: Fix out-of-bounds access through DT alias
serial: sh-sci: Fix out-of-bounds access through DT alias
serial: samsung: Fix out-of-bounds access through serial port index
serial: mxs-auart: Fix out-of-bounds access through serial port index
serial: imx: Fix out-of-bounds access through serial port index
serial: fsl_lpuart: Fix out-of-bounds access through DT alias
serial: arc_uart: Fix out-of-bounds access through DT alias

Giuseppe Lippolis (1):
net-usb: add qmi_wwan if on lte modem wistron neweb d18q1

Greg Kroah-Hartman (1):

      Linux 4.14.44

Grigor Tovmasyan (1):
usb: dwc2: Fix interval type issue

Haiyang Zhang (6):
hv_netvsc: Fix the real number of queues of non-vRSS cases
hv_netvsc: Rename ind_table to rx_table
hv_netvsc: Rename tx_send_table to tx_table
hv_netvsc: Add initialization of tx_table in netvsc_device_add()
hv_netvsc: Set tx_table to equal weight after subchannels open
hv_netvsc: Use the num_online_cpus() for channel limit

Hannes Reinecke (1):
scsi: mpt3sas: Do not mark fw_event workqueue as WQ_MEM_RECLAIM

Hans Verkuil (1):
media: vivid: fix incorrect capabilities for radio

Ioana Radulescu (1):
staging: fsl-dpaa2/eth: Fix incorrect casts

James Hogan (1):
rtc: goldfish: Add missing MODULE_LICENSE

James Smart (3):
scsi: lpfc: Fix issue_lip if link is disabled
scsi: lpfc: Fix soft lockup in lpfc worker thread during LIP testing
scsi: lpfc: Fix frequency of Release WQE CQEs

Jason Yan (1):
scsi: libsas: defer ata device eh commands to libata

Jens Remus (1):
scsi: zfcp: fix infinite iteration on ERP ready list

Jeremy Cline (1):
scsi: sd: Keep disk read-only when re-reading partition

Jianchao Wang (1):
scsi: iscsi_tcp: set BDI_CAP_STABLE_WRITES when data digest enabled

Johannes Berg (1):
cfg80211: limit wiphy names to 128 bytes

John Keeping (1):
usb: gadget: f_uac2: fix bFirstInterface in composite gadget

Kieran Bingham (1):
media: i2c: adv748x: fix HDMI field heights

Kirill Marinushkin (1):
staging: bcm2835-audio: Release resources on module_exit()

Larry Finger (1):
Bluetooth: btusb: Add device ID for RTL8822BE

Lars-Peter Clausen (2):
usb: gadget: ffs: Let setup() return USB_GADGET_DELAYED_STATUS
usb: gadget: ffs: Execute copy_to_user() with USER_DS set

Laurent Pinchart (1):
media: v4l: vsp1: Fix display stalls when requesting too many inputs

Leonard Crestez (1):
ARM: dts: imx7d-sdb: Fix regulator-usb-otg2-vbus node name

Manish Rangankar (2):
scsi: qla4xxx: skip error recovery in case of register disconnect.
scsi: qedi: Fix kernel crash during port toggle

Manu Gautam (1):
usb: gadget: core: Fix use-after-free of usb_request

Marcel Ziswiler (1):
clk: tegra: Fix pll_u rate configuration

Martin Schwidefsky (9):
s390: add assembler macros for CPU alternatives
s390: move expoline assembler macros to a header s390/crc32-vx: use expoline for indirect branches s390/lib: use expoline for indirect branches s390/ftrace: use expoline for indirect branches s390/kernel: use expoline for indirect branches
s390: move spectre sysfs attribute code
s390: extend expoline to BC instructions
s390: use expoline thunks in the BPF JIT

Masami Hiramatsu (1):
media: vb2: Fix videobuf2 to map correct area

Mathias Nyman (2):
xhci: zero usb device slot_id member when disabling and freeing a xhci slot
xhci: Show what USB release number the xHC supports from protocol capablity

Mauro Carvalho Chehab (2):
media: dmxdev: fix error code for invalid ioctls
media: Don't let tvp5150_get_vbi() go out of vbi_ram_default array

Meelis Roos (1):
scsi: aacraid: fix shutdown crash when init fails

Michael Kelley (EOSG) (1):
scsi: storvsc: Increase cmd_per_lun for higher speed devices

Minas Harutyunyan (2):
usb: dwc2: hcd: Fix host channel halt flow
usb: dwc2: host: Fix transaction errors in host mode

Mohammed Gamal (4):
hv_netvsc: Use Windows version instead of NVSP version on GPAD teardown
hv_netvsc: Split netvsc_revoke_buf() and netvsc_teardown_gpadl()
hv_netvsc: Ensure correct teardown message sequence order
hv_netvsc: Fix net device attach on older Windows hosts

NeilBrown (2):
staging: lustre: fix bug in osc_enter_cache_try
staging: lustre: lmv: correctly iput lmo_root

Nobutaka Okabe (1):
ALSA: usb-audio: Add native DSD support for Luxman DA-06

Omar Sandoval (2):
loop: don't call into filesystem while holding lo_ctl_mutex
loop: fix LOOP_GET_STATUS lock imbalance

Paolo Abeni (1):
net: sched: red: avoid hashing NULL child

Peter Robinson (1):
crypto: sunxi-ss - Add MODULE_ALIAS to sun4i-ss

Peter Ujfalusi (1):
ASoC: hdmi-codec: Fix module unloading caused kernel crash

Quinn Tran (1):
scsi: qla2xxx: Fix memory corruption during hba reset test

Quytelda Kahja (1):
staging: ks7010: Use constants from ieee80211_eid instead of literal ints.

Ranjani Sridharan (1):
ASoC: topology: create TLV data for dapm widgets

Roger Quadros (1):
usb: dwc3: omap: don't miss events during suspend/resume

Sebastian Andrzej Siewior (1):
crypto: ccp - don't disable interrupts while setting up debugfs

Shawn Lin (3):
clk: rockchip: Fix wrong parent for SDMMC phase clock for rk3228
clk: Don't show the incorrect clock phase
clk: rockchip: Prevent calculating mmc phase if clock rate is zero

Stefan Agner (1):
usb: gadget: fsl_udc_core: fix ep valid checks

Stephen Hemminger (11):
hv_netvsc: empty current transmit aggregation if flow blocked
hv_netvsc: avoid retry on send during shutdown
hv_netvsc: only wake transmit queue if link is up
hv_netvsc: fix error unwind handling if vmbus_open fails
hv_netvsc: cancel subchannel setup before halting device
hv_netvsc: fix race in napi poll when rescheduling
hv_netvsc: defer queue selection to VF
hv_netvsc: disable NAPI before channel close
hv_netvsc: use RCU to fix concurrent rx and queue changes
hv_netvsc: change GPAD teardown order on older versions
hv_netvsc: common detach logic

Sujit Reddy Thumma (1):
scsi: ufs: Enable quirk to ignore sending WRITE_SAME command

Sylwester Nawrocki (2):
ASoC: samsung: odroid: Fix 32000 sample rate handling
ASoC: samsung: i2s: Ensure the RCLK rate is properly determined

Tarick Bedeir (1):
net/mlx4_core: Fix error handling in mlx4_init_port_info.

Tetsuo Handa (2):
hfsplus: stop workqueue when fill_super() failed x86/kexec: Avoid double free_page() upon do_kexec_load() failure

Thinh Nguyen (2):
usb: dwc3: Add SoftReset PHY synchonization delay
usb: dwc3: Update DWC_usb31 GTXFIFOSIZ reg fields

Tomas Henzl (1):
scsi: mpt3sas: fix an out of bound write

Torsten Hilbrich (1):
net/usb/qmi_wwan.c: Add USB id for lt4120 modem

Uwe Kleine-König (1):

      serial: altera: ensure port->regshift is honored consistently

Vardan Mikayelyan (1):
usb: dwc2: Fix dwc2_hsotg_core_init_disconnected()

Vicente Bergas (1):
Bluetooth: btusb: Add USB ID 7392:a611 for Edimax EW-7611ULB

Vignesh R (1):
serial: 8250: Don't service RX FIFO if interrupts are disabled

Vitaly Kuznetsov (2):
hv_netvsc: netvsc_teardown_gpadl() split
hv_netvsc: preserve hw_features on mtu/channels/ringparam changes

Wilfried Weissmann (1):
scsi: mvsas: fix wrong endianness of sgpio api

Willem de Bruijn (2):
net: test tailroom before appending to linear skb
packet: in packet_snd start writing at link layer allocation

Wolfram Sang (1):
usb: gadget: udc: change comparison to bitshift when dealing with a mask

Yoshihiro Shimoda (1):
usb: host: xhci-plat: revert "usb: host: xhci-plat: enable clk in resume timing"

[email protected] (2):
vmxnet3: set the DMA mask before the first DMA map operation
vmxnet3: use DMA memory barriers where required

author maintainer
#1 lore raw
Makefile +1 -1
index 9be88c9d9fc9..787cf6605209 100644
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 4
 PATCHLEVEL = 14
-SUBLEVEL = 43
+SUBLEVEL = 44
 EXTRAVERSION =
 NAME = Petit Gorille
 
arch/arm/boot/dts/imx7d-sdb.dts +1 -1
index 44637cabcc56..255e64ba32e2 100644
@@ -82,7 +82,7 @@
 		enable-active-high;
 	};
 
-	reg_usb_otg2_vbus: regulator-usb-otg1-vbus {
+	reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
 		compatible = "regulator-fixed";
 		regulator-name = "usb_otg2_vbus";
 		regulator-min-microvolt = <5000000>;
arch/s390/crypto/crc32be-vx.S +4 -1
index e8077f0971f8..2bf01ba44107 100644
@@ -13,6 +13,7 @@
  */
 
 #include <linux/linkage.h>
+#include <asm/nospec-insn.h>
 #include <asm/vx-insn.h>
 
 /* Vector register range containing CRC-32 constants */
@@ -67,6 +68,8 @@
 
 .previous
 
+	GEN_BR_THUNK %r14
+
 .text
 /*
  * The CRC-32 function(s) use these calling conventions:
@@ -203,6 +206,6 @@ ENTRY(crc32_be_vgfm_16)
 
 .Ldone:
 	VLGVF	%r2,%v2,3
-	br	%r14
+	BR_EX	%r14
 
 .previous
arch/s390/crypto/crc32le-vx.S +3 -1
index d8c67a58c0c5..7d6f568bd3ad 100644
@@ -14,6 +14,7 @@
  */
 
 #include <linux/linkage.h>
+#include <asm/nospec-insn.h>
 #include <asm/vx-insn.h>
 
 /* Vector register range containing CRC-32 constants */
@@ -76,6 +77,7 @@
 
 .previous
 
+	GEN_BR_THUNK %r14
 
 .text
 
@@ -264,6 +266,6 @@ crc32_le_vgfm_generic:
 
 .Ldone:
 	VLGVF	%r2,%v2,2
-	br	%r14
+	BR_EX	%r14
 
 .previous
arch/s390/include/asm/alternative-asm.h new file +108 -0

108 lines not on this page · raw message

arch/s390/include/asm/nospec-insn.h new file +195 -0

195 lines not on this page · raw message

arch/s390/kernel/Makefile +1 -0
index a3a4cafb6080..e0784fff07f5 100644
@@ -63,6 +63,7 @@ obj-y	+= nospec-branch.o
 
 extra-y				+= head.o head64.o vmlinux.lds
 
+obj-$(CONFIG_SYSFS)		+= nospec-sysfs.o
 CFLAGS_REMOVE_nospec-branch.o	+= $(CC_FLAGS_EXPOLINE)
 
 obj-$(CONFIG_MODULES)		+= module.o
arch/s390/kernel/asm-offsets.c +1 -0
index 0e6d2b032484..4e69bf909e87 100644
@@ -177,6 +177,7 @@ int main(void)
 	OFFSET(__LC_PREEMPT_COUNT, lowcore, preempt_count);
 	OFFSET(__LC_GMAP, lowcore, gmap);
 	OFFSET(__LC_PASTE, lowcore, paste);
+	OFFSET(__LC_BR_R1, lowcore, br_r1_trampoline);
 	/* software defined ABI-relevant lowcore locations 0xe00 - 0xe20 */
 	OFFSET(__LC_DUMP_REIPL, lowcore, ipib);
 	/* hardware defined lowcore locations 0x1000 - 0x18ff */
arch/s390/kernel/base.S +14 -10
index f6c56009e822..b65874b0b412 100644
@@ -9,18 +9,22 @@
 
 #include <linux/linkage.h>
 #include <asm/asm-offsets.h>
+#include <asm/nospec-insn.h>
 #include <asm/ptrace.h>
 #include <asm/sigp.h>
 
+	GEN_BR_THUNK %r9
+	GEN_BR_THUNK %r14
+
 ENTRY(s390_base_mcck_handler)
 	basr	%r13,0
 0:	lg	%r15,__LC_PANIC_STACK	# load panic stack
 	aghi	%r15,-STACK_FRAME_OVERHEAD
 	larl	%r1,s390_base_mcck_handler_fn
-	lg	%r1,0(%r1)
-	ltgr	%r1,%r1
+	lg	%r9,0(%r1)
+	ltgr	%r9,%r9
 	jz	1f
-	basr	%r14,%r1
+	BASR_EX	%r14,%r9
 1:	la	%r1,4095
 	lmg	%r0,%r15,__LC_GPREGS_SAVE_AREA-4095(%r1)
 	lpswe	__LC_MCK_OLD_PSW
@@ -37,10 +41,10 @@ ENTRY(s390_base_ext_handler)
 	basr	%r13,0
 0:	aghi	%r15,-STACK_FRAME_OVERHEAD
 	larl	%r1,s390_base_ext_handler_fn
-	lg	%r1,0(%r1)
-	ltgr	%r1,%r1
+	lg	%r9,0(%r1)
+	ltgr	%r9,%r9
 	jz	1f
-	basr	%r14,%r1
+	BASR_EX	%r14,%r9
 1:	lmg	%r0,%r15,__LC_SAVE_AREA_ASYNC
 	ni	__LC_EXT_OLD_PSW+1,0xfd	# clear wait state bit
 	lpswe	__LC_EXT_OLD_PSW
@@ -57,10 +61,10 @@ ENTRY(s390_base_pgm_handler)
 	basr	%r13,0
 0:	aghi	%r15,-STACK_FRAME_OVERHEAD
 	larl	%r1,s390_base_pgm_handler_fn
-	lg	%r1,0(%r1)
-	ltgr	%r1,%r1
+	lg	%r9,0(%r1)
+	ltgr	%r9,%r9
 	jz	1f
-	basr	%r14,%r1
+	BASR_EX	%r14,%r9
 	lmg	%r0,%r15,__LC_SAVE_AREA_SYNC
 	lpswe	__LC_PGM_OLD_PSW
 1:	lpswe	disabled_wait_psw-0b(%r13)
@@ -117,7 +121,7 @@ ENTRY(diag308_reset)
 	larl	%r4,.Lcontinue_psw	# Restore PSW flags
 	lpswe	0(%r4)
 .Lcontinue:
-	br	%r14
+	BR_EX	%r14
 .align 16
 .Lrestart_psw:
 	.long	0x00080000,0x80000000 + .Lrestart_part2
arch/s390/kernel/entry.S +24 -81

233 lines not on this page · raw message

arch/s390/kernel/mcount.S +9 -5
index 82df7d80fab2..27110f3294ed 100644
@@ -9,13 +9,17 @@
 #include <linux/linkage.h>
 #include <asm/asm-offsets.h>
 #include <asm/ftrace.h>
+#include <asm/nospec-insn.h>
 #include <asm/ptrace.h>
 #include <asm/export.h>
 
+	GEN_BR_THUNK %r1
+	GEN_BR_THUNK %r14
+
 	.section .kprobes.text, "ax"
 
 ENTRY(ftrace_stub)
-	br	%r14
+	BR_EX	%r14
 
 #define STACK_FRAME_SIZE  (STACK_FRAME_OVERHEAD + __PT_SIZE)
 #define STACK_PTREGS	  (STACK_FRAME_OVERHEAD)
@@ -23,7 +27,7 @@ ENTRY(ftrace_stub)
 #define STACK_PTREGS_PSW  (STACK_PTREGS + __PT_PSW)
 
 ENTRY(_mcount)
-	br	%r14
+	BR_EX	%r14
 
 EXPORT_SYMBOL(_mcount)
 
@@ -53,7 +57,7 @@ ENTRY(ftrace_caller)
 #endif
 	lgr	%r3,%r14
 	la	%r5,STACK_PTREGS(%r15)
-	basr	%r14,%r1
+	BASR_EX	%r14,%r1
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 # The j instruction gets runtime patched to a nop instruction.
 # See ftrace_enable_ftrace_graph_caller.
@@ -68,7 +72,7 @@ ftrace_graph_caller_end:
 #endif
 	lg	%r1,(STACK_PTREGS_PSW+8)(%r15)
 	lmg	%r2,%r15,(STACK_PTREGS_GPRS+2*8)(%r15)
-	br	%r1
+	BR_EX	%r1
 
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 
@@ -81,6 +85,6 @@ ENTRY(return_to_handler)
 	aghi	%r15,STACK_FRAME_OVERHEAD
 	lgr	%r14,%r2
 	lmg	%r2,%r5,32(%r15)
-	br	%r14
+	BR_EX	%r14
 
 #endif
arch/s390/kernel/nospec-branch.c +20 -23

69 lines not on this page · raw message

arch/s390/kernel/nospec-sysfs.c new file +21 -0
new file mode 100644
index 000000000000..8affad5f18cb
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <linux/device.h>
+#include <linux/cpu.h>
+#include <asm/facility.h>
+#include <asm/nospec-branch.h>
+
+ssize_t cpu_show_spectre_v1(struct device *dev,
+			    struct device_attribute *attr, char *buf)
+{
+	return sprintf(buf, "Mitigation: __user pointer sanitization\n");
+}
+
+ssize_t cpu_show_spectre_v2(struct device *dev,
+			    struct device_attribute *attr, char *buf)
+{
+	if (IS_ENABLED(CC_USING_EXPOLINE) && !nospec_disable)
+		return sprintf(buf, "Mitigation: execute trampolines\n");
+	if (__test_facility(82, S390_lowcore.alt_stfle_fac_list))
+		return sprintf(buf, "Mitigation: limited branch prediction\n");
+	return sprintf(buf, "Vulnerable\n");
+}
arch/s390/kernel/reipl.S +5 -2
index a40ebd1d29d0..8e954c102639 100644
@@ -7,8 +7,11 @@
 
 #include <linux/linkage.h>
 #include <asm/asm-offsets.h>
+#include <asm/nospec-insn.h>
 #include <asm/sigp.h>
 
+	GEN_BR_THUNK %r9
+
 #
 # Issue "store status" for the current CPU to its prefix page
 # and call passed function afterwards
@@ -67,9 +70,9 @@ ENTRY(store_status)
 	st	%r4,0(%r1)
 	st	%r5,4(%r1)
 	stg	%r2,8(%r1)
-	lgr	%r1,%r2
+	lgr	%r9,%r2
 	lgr	%r2,%r3
-	br	%r1
+	BR_EX	%r9
 
 	.section .bss
 	.align	8
arch/s390/kernel/swsusp.S +6 -4
index e99187149f17..a049a7b9d6e8 100644
@@ -13,6 +13,7 @@
 #include <asm/ptrace.h>
 #include <asm/thread_info.h>
 #include <asm/asm-offsets.h>
+#include <asm/nospec-insn.h>
 #include <asm/sigp.h>
 
 /*
@@ -24,6 +25,8 @@
  * (see below) in the resume process.
  * This function runs with disabled interrupts.
  */
+	GEN_BR_THUNK %r14
+
 	.section .text
 ENTRY(swsusp_arch_suspend)
 	stmg	%r6,%r15,__SF_GPRS(%r15)
@@ -103,7 +106,7 @@ ENTRY(swsusp_arch_suspend)
 	spx	0x318(%r1)
 	lmg	%r6,%r15,STACK_FRAME_OVERHEAD + __SF_GPRS(%r15)
 	lghi	%r2,0
-	br	%r14
+	BR_EX	%r14
 
 /*
  * Restore saved memory image to correct place and restore register context.
@@ -197,11 +200,10 @@ pgm_check_entry:
 	larl	%r15,init_thread_union
 	ahi	%r15,1<<(PAGE_SHIFT+THREAD_SIZE_ORDER)
 	larl	%r2,.Lpanic_string
-	larl	%r3,sclp_early_printk
 	lghi	%r1,0
 	sam31
 	sigp	%r1,%r0,SIGP_SET_ARCHITECTURE
-	basr	%r14,%r3
+	brasl	%r14,sclp_early_printk
 	larl	%r3,.Ldisabled_wait_31
 	lpsw	0(%r3)
 4:
@@ -267,7 +269,7 @@ restore_registers:
 	/* Return 0 */
 	lmg	%r6,%r15,STACK_FRAME_OVERHEAD + __SF_GPRS(%r15)
 	lghi	%r2,0
-	br	%r14
+	BR_EX	%r14
 
 	.section .data..nosave,"aw",@progbits
 	.align	8
arch/s390/lib/mem.S +8 -5
index d66751397e72..e1fa974ac500 100644
@@ -7,6 +7,9 @@
 
 #include <linux/linkage.h>
 #include <asm/export.h>
+#include <asm/nospec-insn.h>
+
+	GEN_BR_THUNK %r14
 
 /*
  * void *memmove(void *dest, const void *src, size_t n)
@@ -33,14 +36,14 @@ ENTRY(memmove)
 .Lmemmove_forward_remainder:
 	larl	%r5,.Lmemmove_mvc
 	ex	%r4,0(%r5)
-	br	%r14
+	BR_EX	%r14
 .Lmemmove_reverse:
 	ic	%r0,0(%r4,%r3)
 	stc	%r0,0(%r4,%r1)
 	brctg	%r4,.Lmemmove_reverse
 	ic	%r0,0(%r4,%r3)
 	stc	%r0,0(%r4,%r1)
-	br	%r14
+	BR_EX	%r14
 .Lmemmove_mvc:
 	mvc	0(1,%r1),0(%r3)
 EXPORT_SYMBOL(memmove)
@@ -77,7 +80,7 @@ ENTRY(memset)
 .Lmemset_clear_remainder:
 	larl	%r3,.Lmemset_xc
 	ex	%r4,0(%r3)
-	br	%r14
+	BR_EX	%r14
 .Lmemset_fill:
 	stc	%r3,0(%r2)
 	cghi	%r4,1
@@ -94,7 +97,7 @@ ENTRY(memset)
 .Lmemset_fill_remainder:
 	larl	%r3,.Lmemset_mvc
 	ex	%r4,0(%r3)
-	br	%r14
+	BR_EX	%r14
 .Lmemset_xc:
 	xc	0(1,%r1),0(%r1)
 .Lmemset_mvc:
@@ -117,7 +120,7 @@ ENTRY(memcpy)
 .Lmemcpy_remainder:
 	larl	%r5,.Lmemcpy_mvc
 	ex	%r4,0(%r5)
-	br	%r14
+	BR_EX	%r14
 .Lmemcpy_loop:
 	mvc	0(256,%r1),0(%r3)
 	la	%r1,256(%r1)
arch/s390/net/bpf_jit.S +10 -6
index 25bb4643c4f4..9f794869c1b0 100644
@@ -9,6 +9,7 @@
  */
 
 #include <linux/linkage.h>
+#include <asm/nospec-insn.h>
 #include "bpf_jit.h"
 
 /*
@@ -54,7 +55,7 @@ ENTRY(sk_load_##NAME##_pos);						\
 	clg	%r3,STK_OFF_HLEN(%r15);	/* Offset + SIZE > hlen? */	\
 	jh	sk_load_##NAME##_slow;					\
 	LOAD	%r14,-SIZE(%r3,%r12);	/* Get data from skb */		\
-	b	OFF_OK(%r6);		/* Return */			\
+	B_EX	OFF_OK,%r6;		/* Return */			\
 									\
 sk_load_##NAME##_slow:;							\
 	lgr	%r2,%r7;		/* Arg1 = skb pointer */	\
@@ -64,11 +65,14 @@ sk_load_##NAME##_slow:;							\
 	brasl	%r14,skb_copy_bits;	/* Get data from skb */		\
 	LOAD	%r14,STK_OFF_TMP(%r15);	/* Load from temp bufffer */	\
 	ltgr	%r2,%r2;		/* Set cc to (%r2 != 0) */	\
-	br	%r6;			/* Return */
+	BR_EX	%r6;			/* Return */
 
 sk_load_common(word, 4, llgf)	/* r14 = *(u32 *) (skb->data+offset) */
 sk_load_common(half, 2, llgh)	/* r14 = *(u16 *) (skb->data+offset) */
 
+	GEN_BR_THUNK %r6
+	GEN_B_THUNK OFF_OK,%r6
+
 /*
  * Load 1 byte from SKB (optimized version)
  */
@@ -80,7 +84,7 @@ ENTRY(sk_load_byte_pos)
 	clg	%r3,STK_OFF_HLEN(%r15)	# Offset >= hlen?
 	jnl	sk_load_byte_slow
 	llgc	%r14,0(%r3,%r12)	# Get byte from skb
-	b	OFF_OK(%r6)		# Return OK
+	B_EX	OFF_OK,%r6		# Return OK
 
 sk_load_byte_slow:
 	lgr	%r2,%r7			# Arg1 = skb pointer
@@ -90,7 +94,7 @@ sk_load_byte_slow:
 	brasl	%r14,skb_copy_bits	# Get data from skb
 	llgc	%r14,STK_OFF_TMP(%r15)	# Load result from temp buffer
 	ltgr	%r2,%r2			# Set cc to (%r2 != 0)
-	br	%r6			# Return cc
+	BR_EX	%r6			# Return cc
 
 #define sk_negative_common(NAME, SIZE, LOAD)				\
 sk_load_##NAME##_slow_neg:;						\
@@ -104,7 +108,7 @@ sk_load_##NAME##_slow_neg:;						\
 	jz	bpf_error;						\
 	LOAD	%r14,0(%r2);		/* Get data from pointer */	\
 	xr	%r3,%r3;		/* Set cc to zero */		\
-	br	%r6;			/* Return cc */
+	BR_EX	%r6;			/* Return cc */
 
 sk_negative_common(word, 4, llgf)
 sk_negative_common(half, 2, llgh)
@@ -113,4 +117,4 @@ sk_negative_common(byte, 1, llgc)
 bpf_error:
 # force a return 0 from jit handler
 	ltgr	%r15,%r15	# Set condition code
-	br	%r6
+	BR_EX	%r6
arch/s390/net/bpf_jit_comp.c +61 -2

95 lines not on this page · raw message

arch/sparc/kernel/vio.c +1 -1
index 1a0fa10cb6b7..32bae68e34c1 100644
@@ -403,7 +403,7 @@ static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp,
 	if (err) {
 		printk(KERN_ERR "VIO: Could not register device %s, err=%d\n",
 		       dev_name(&vdev->dev), err);
-		kfree(vdev);
+		put_device(&vdev->dev);
 		return NULL;
 	}
 	if (vdev->dp)
arch/x86/kernel/machine_kexec_32.c +5 -1
index edfede768688..5167f3f74136 100644
@@ -57,12 +57,17 @@ static void load_segments(void)
 static void machine_kexec_free_page_tables(struct kimage *image)
 {
 	free_page((unsigned long)image->arch.pgd);
+	image->arch.pgd = NULL;
 #ifdef CONFIG_X86_PAE
 	free_page((unsigned long)image->arch.pmd0);
+	image->arch.pmd0 = NULL;
 	free_page((unsigned long)image->arch.pmd1);
+	image->arch.pmd1 = NULL;
 #endif
 	free_page((unsigned long)image->arch.pte0);
+	image->arch.pte0 = NULL;
 	free_page((unsigned long)image->arch.pte1);
+	image->arch.pte1 = NULL;
 }
 
 static int machine_kexec_alloc_page_tables(struct kimage *image)
@@ -79,7 +84,6 @@ static int machine_kexec_alloc_page_tables(struct kimage *image)
 	    !image->arch.pmd0 || !image->arch.pmd1 ||
 #endif
 	    !image->arch.pte0 || !image->arch.pte1) {
-		machine_kexec_free_page_tables(image);
 		return -ENOMEM;
 	}
 	return 0;
arch/x86/kernel/machine_kexec_64.c +4 -1
index 3b7427aa7d85..5bce2a88e8a3 100644
@@ -38,9 +38,13 @@ static struct kexec_file_ops *kexec_file_loaders[] = {
 static void free_transition_pgtable(struct kimage *image)
 {
 	free_page((unsigned long)image->arch.p4d);
+	image->arch.p4d = NULL;
 	free_page((unsigned long)image->arch.pud);
+	image->arch.pud = NULL;
 	free_page((unsigned long)image->arch.pmd);
+	image->arch.pmd = NULL;
 	free_page((unsigned long)image->arch.pte);
+	image->arch.pte = NULL;
 }
 
 static int init_transition_pgtable(struct kimage *image, pgd_t *pgd)
@@ -90,7 +94,6 @@ static int init_transition_pgtable(struct kimage *image, pgd_t *pgd)
 	set_pte(pte, pfn_pte(paddr >> PAGE_SHIFT, PAGE_KERNEL_EXEC_NOENC));
 	return 0;
 err:
-	free_transition_pgtable(image);
 	return result;
 }
 
drivers/block/loop.c +42 -29

127 lines not on this page · raw message

drivers/bluetooth/btusb.c +6 -0
index 7fcc4d7f4909..86d7975afaeb 100644
@@ -370,6 +370,9 @@ static const struct usb_device_id blacklist_table[] = {
 	{ USB_DEVICE(0x13d3, 0x3459), .driver_info = BTUSB_REALTEK },
 	{ USB_DEVICE(0x13d3, 0x3494), .driver_info = BTUSB_REALTEK },
 
+	/* Additional Realtek 8723BU Bluetooth devices */
+	{ USB_DEVICE(0x7392, 0xa611), .driver_info = BTUSB_REALTEK },
+
 	/* Additional Realtek 8821AE Bluetooth devices */
 	{ USB_DEVICE(0x0b05, 0x17dc), .driver_info = BTUSB_REALTEK },
 	{ USB_DEVICE(0x13d3, 0x3414), .driver_info = BTUSB_REALTEK },
@@ -377,6 +380,9 @@ static const struct usb_device_id blacklist_table[] = {
 	{ USB_DEVICE(0x13d3, 0x3461), .driver_info = BTUSB_REALTEK },
 	{ USB_DEVICE(0x13d3, 0x3462), .driver_info = BTUSB_REALTEK },
 
+	/* Additional Realtek 8822BE Bluetooth devices */
+	{ USB_DEVICE(0x0b05, 0x185c), .driver_info = BTUSB_REALTEK },
+
 	/* Silicon Wave based devices */
 	{ USB_DEVICE(0x0c10, 0x0000), .driver_info = BTUSB_SWAVE },
 
drivers/clk/clk.c +3 -0
index 60c7fde37d23..4e21f5bcd954 100644
@@ -1931,6 +1931,9 @@ static int clk_core_get_phase(struct clk_core *core)
 	int ret;
 
 	clk_prepare_lock();
+	/* Always try to update cached phase if possible */
+	if (core->ops->get_phase)
+		core->phase = core->ops->get_phase(core->hw);
 	ret = core->phase;
 	clk_prepare_unlock();
 
drivers/clk/hisilicon/crg-hi3516cv300.c +1 -1
index 2007123832bb..53450b651e4c 100644
@@ -204,7 +204,7 @@ static const struct hisi_crg_funcs hi3516cv300_crg_funcs = {
 /* hi3516CV300 sysctrl CRG */
 #define HI3516CV300_SYSCTRL_NR_CLKS 16
 
-static const char *wdt_mux_p[] __initconst = { "3m", "apb" };
+static const char *const wdt_mux_p[] __initconst = { "3m", "apb" };
 static u32 wdt_mux_table[] = {0, 1};
 
 static const struct hisi_mux_clock hi3516cv300_sysctrl_mux_clks[] = {
drivers/clk/rockchip/clk-mmc-phase.c +23 -0
index 077fcdc7908b..fe7d9ed1d436 100644
@@ -58,6 +58,12 @@ static int rockchip_mmc_get_phase(struct clk_hw *hw)
 	u16 degrees;
 	u32 delay_num = 0;
 
+	/* See the comment for rockchip_mmc_set_phase below */
+	if (!rate) {
+		pr_err("%s: invalid clk rate\n", __func__);
+		return -EINVAL;
+	}
+
 	raw_value = readl(mmc_clock->reg) >> (mmc_clock->shift);
 
 	degrees = (raw_value & ROCKCHIP_MMC_DEGREE_MASK) * 90;
@@ -84,6 +90,23 @@ static int rockchip_mmc_set_phase(struct clk_hw *hw, int degrees)
 	u32 raw_value;
 	u32 delay;
 
+	/*
+	 * The below calculation is based on the output clock from
+	 * MMC host to the card, which expects the phase clock inherits
+	 * the clock rate from its parent, namely the output clock
+	 * provider of MMC host. However, things may go wrong if
+	 * (1) It is orphan.
+	 * (2) It is assigned to the wrong parent.
+	 *
+	 * This check help debug the case (1), which seems to be the
+	 * most likely problem we often face and which makes it difficult
+	 * for people to debug unstable mmc tuning results.
+	 */
+	if (!rate) {
+		pr_err("%s: invalid clk rate\n", __func__);
+		return -EINVAL;
+	}
+
 	nineties = degrees / 90;
 	remainder = (degrees % 90);
 
drivers/clk/rockchip/clk-rk3228.c +1 -1
index 11e7f2d1c054..7af48184b022 100644
@@ -387,7 +387,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = {
 			RK2928_CLKSEL_CON(23), 5, 2, MFLAGS, 0, 6, DFLAGS,
 			RK2928_CLKGATE_CON(2), 15, GFLAGS),
 
-	COMPOSITE(SCLK_SDMMC, "sclk_sdmmc0", mux_mmc_src_p, 0,
+	COMPOSITE(SCLK_SDMMC, "sclk_sdmmc", mux_mmc_src_p, 0,
 			RK2928_CLKSEL_CON(11), 8, 2, MFLAGS, 0, 8, DFLAGS,
 			RK2928_CLKGATE_CON(2), 11, GFLAGS),
 
drivers/clk/samsung/clk-exynos3250.c +2 -2
index 1b81e283f605..ed36728424a2 100644
@@ -698,7 +698,7 @@ static const struct samsung_pll_rate_table exynos3250_epll_rates[] __initconst =
 	PLL_36XX_RATE(144000000,  96, 2, 3,     0),
 	PLL_36XX_RATE( 96000000, 128, 2, 4,     0),
 	PLL_36XX_RATE( 84000000, 112, 2, 4,     0),
-	PLL_36XX_RATE( 80000004, 106, 2, 4, 43691),
+	PLL_36XX_RATE( 80000003, 106, 2, 4, 43691),
 	PLL_36XX_RATE( 73728000,  98, 2, 4, 19923),
 	PLL_36XX_RATE( 67737598, 270, 3, 5, 62285),
 	PLL_36XX_RATE( 65535999, 174, 2, 5, 49982),
@@ -734,7 +734,7 @@ static const struct samsung_pll_rate_table exynos3250_vpll_rates[] __initconst =
 	PLL_36XX_RATE(148352005,  98, 2, 3, 59070),
 	PLL_36XX_RATE(108000000, 144, 2, 4,     0),
 	PLL_36XX_RATE( 74250000,  99, 2, 4,     0),
-	PLL_36XX_RATE( 74176002,  98, 3, 4, 59070),
+	PLL_36XX_RATE( 74176002,  98, 2, 4, 59070),
 	PLL_36XX_RATE( 54054000, 216, 3, 5, 14156),
 	PLL_36XX_RATE( 54000000, 144, 2, 5,     0),
 	{ /* sentinel */ }
drivers/clk/samsung/clk-exynos5250.c +4 -4
index 27a227d6620c..6a0cb8a515e8 100644
@@ -711,13 +711,13 @@ static const struct samsung_pll_rate_table epll_24mhz_tbl[] __initconst = {
 	/* sorted in descending order */
 	/* PLL_36XX_RATE(rate, m, p, s, k) */
 	PLL_36XX_RATE(192000000, 64, 2, 2, 0),
-	PLL_36XX_RATE(180633600, 90, 3, 2, 20762),
+	PLL_36XX_RATE(180633605, 90, 3, 2, 20762),
 	PLL_36XX_RATE(180000000, 90, 3, 2, 0),
 	PLL_36XX_RATE(73728000, 98, 2, 4, 19923),
-	PLL_36XX_RATE(67737600, 90, 2, 4, 20762),
+	PLL_36XX_RATE(67737602, 90, 2, 4, 20762),
 	PLL_36XX_RATE(49152000, 98, 3, 4, 19923),
-	PLL_36XX_RATE(45158400, 90, 3, 4, 20762),
-	PLL_36XX_RATE(32768000, 131, 3, 5, 4719),
+	PLL_36XX_RATE(45158401, 90, 3, 4, 20762),
+	PLL_36XX_RATE(32768001, 131, 3, 5, 4719),
 	{ },
 };
 
drivers/clk/samsung/clk-exynos5260.c +1 -1
index fd1d9bfc151b..8eae1752d700 100644
@@ -65,7 +65,7 @@ static const struct samsung_pll_rate_table pll2650_24mhz_tbl[] __initconst = {
 	PLL_36XX_RATE(480000000, 160, 2, 2, 0),
 	PLL_36XX_RATE(432000000, 144, 2, 2, 0),
 	PLL_36XX_RATE(400000000, 200, 3, 2, 0),
-	PLL_36XX_RATE(394073130, 459, 7, 2, 49282),
+	PLL_36XX_RATE(394073128, 459, 7, 2, 49282),
 	PLL_36XX_RATE(333000000, 111, 2, 2, 0),
 	PLL_36XX_RATE(300000000, 100, 2, 2, 0),
 	PLL_36XX_RATE(266000000, 266, 3, 3, 0),
drivers/clk/samsung/clk-exynos5433.c +6 -6
index 11343a597093..1d2265f9ee97 100644
@@ -725,7 +725,7 @@ static const struct samsung_pll_rate_table exynos5433_pll_rates[] __initconst =
 	PLL_35XX_RATE(800000000U,  400, 6,  1),
 	PLL_35XX_RATE(733000000U,  733, 12, 1),
 	PLL_35XX_RATE(700000000U,  175, 3,  1),
-	PLL_35XX_RATE(667000000U,  222, 4,  1),
+	PLL_35XX_RATE(666000000U,  222, 4,  1),
 	PLL_35XX_RATE(633000000U,  211, 4,  1),
 	PLL_35XX_RATE(600000000U,  500, 5,  2),
 	PLL_35XX_RATE(552000000U,  460, 5,  2),
@@ -753,12 +753,12 @@ static const struct samsung_pll_rate_table exynos5433_pll_rates[] __initconst =
 /* AUD_PLL */
 static const struct samsung_pll_rate_table exynos5433_aud_pll_rates[] __initconst = {
 	PLL_36XX_RATE(400000000U, 200, 3, 2,      0),
-	PLL_36XX_RATE(393216000U, 197, 3, 2, -25690),
+	PLL_36XX_RATE(393216003U, 197, 3, 2, -25690),
 	PLL_36XX_RATE(384000000U, 128, 2, 2,      0),
-	PLL_36XX_RATE(368640000U, 246, 4, 2, -15729),
-	PLL_36XX_RATE(361507200U, 181, 3, 2, -16148),
-	PLL_36XX_RATE(338688000U, 113, 2, 2,  -6816),
-	PLL_36XX_RATE(294912000U,  98, 1, 3,  19923),
+	PLL_36XX_RATE(368639991U, 246, 4, 2, -15729),
+	PLL_36XX_RATE(361507202U, 181, 3, 2, -16148),
+	PLL_36XX_RATE(338687988U, 113, 2, 2,  -6816),
+	PLL_36XX_RATE(294912002U,  98, 1, 3,  19923),
 	PLL_36XX_RATE(288000000U,  96, 1, 3,      0),
 	PLL_36XX_RATE(252000000U,  84, 1, 3,      0),
 	{ /* sentinel */ }
drivers/clk/samsung/clk-exynos7.c +1 -1
index 5931a4140c3d..bbfa57b4e017 100644
@@ -140,7 +140,7 @@ static const struct samsung_div_clock topc_div_clks[] __initconst = {
 };
 
 static const struct samsung_pll_rate_table pll1460x_24mhz_tbl[] __initconst = {
-	PLL_36XX_RATE(491520000, 20, 1, 0, 31457),
+	PLL_36XX_RATE(491519897, 20, 1, 0, 31457),
 	{},
 };
 
drivers/clk/samsung/clk-s3c2410.c +8 -8
index e0650c33863b..d8e58a659467 100644
@@ -168,7 +168,7 @@ static struct samsung_pll_rate_table pll_s3c2410_12mhz_tbl[] __initdata = {
 	PLL_35XX_RATE(226000000, 105, 1, 1),
 	PLL_35XX_RATE(210000000, 132, 2, 1),
 	/* 2410 common */
-	PLL_35XX_RATE(203000000, 161, 3, 1),
+	PLL_35XX_RATE(202800000, 161, 3, 1),
 	PLL_35XX_RATE(192000000, 88, 1, 1),
 	PLL_35XX_RATE(186000000, 85, 1, 1),
 	PLL_35XX_RATE(180000000, 82, 1, 1),
@@ -178,18 +178,18 @@ static struct samsung_pll_rate_table pll_s3c2410_12mhz_tbl[] __initdata = {
 	PLL_35XX_RATE(147000000, 90, 2, 1),
 	PLL_35XX_RATE(135000000, 82, 2, 1),
 	PLL_35XX_RATE(124000000, 116, 1, 2),
-	PLL_35XX_RATE(118000000, 150, 2, 2),
+	PLL_35XX_RATE(118500000, 150, 2, 2),
 	PLL_35XX_RATE(113000000, 105, 1, 2),
-	PLL_35XX_RATE(101000000, 127, 2, 2),
+	PLL_35XX_RATE(101250000, 127, 2, 2),
 	PLL_35XX_RATE(90000000, 112, 2, 2),
-	PLL_35XX_RATE(85000000, 105, 2, 2),
+	PLL_35XX_RATE(84750000, 105, 2, 2),
 	PLL_35XX_RATE(79000000, 71, 1, 2),
-	PLL_35XX_RATE(68000000, 82, 2, 2),
-	PLL_35XX_RATE(56000000, 142, 2, 3),
+	PLL_35XX_RATE(67500000, 82, 2, 2),
+	PLL_35XX_RATE(56250000, 142, 2, 3),
 	PLL_35XX_RATE(48000000, 120, 2, 3),
-	PLL_35XX_RATE(51000000, 161, 3, 3),
+	PLL_35XX_RATE(50700000, 161, 3, 3),
 	PLL_35XX_RATE(45000000, 82, 1, 3),
-	PLL_35XX_RATE(34000000, 82, 2, 3),
+	PLL_35XX_RATE(33750000, 82, 2, 3),
 	{ /* sentinel */ },
 };
 
drivers/clk/tegra/clk-pll.c +2 -0
index 7c369e21c91c..830d1c87fa7c 100644
@@ -1151,6 +1151,8 @@ static const struct clk_ops tegra_clk_pllu_ops = {
 	.enable = clk_pllu_enable,
 	.disable = clk_pll_disable,
 	.recalc_rate = clk_pll_recalc_rate,
+	.round_rate = clk_pll_round_rate,
+	.set_rate = clk_pll_set_rate,
 };
 
 static int _pll_fixed_mdiv(struct tegra_clk_pll_params *pll_params,
drivers/crypto/atmel-aes.c +1 -1
index 29e20c37f3a6..11129b796dda 100644
@@ -2145,7 +2145,7 @@ static int atmel_aes_authenc_setkey(struct crypto_aead *tfm, const u8 *key,
 
 badkey:
 	crypto_aead_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
-	memzero_explicit(&key, sizeof(keys));
+	memzero_explicit(&keys, sizeof(keys));
 	return -EINVAL;
 }
 
drivers/crypto/ccp/ccp-debugfs.c +3 -4
index 59d4ca4e72d8..1a734bd2070a 100644
@@ -278,7 +278,7 @@ static const struct file_operations ccp_debugfs_stats_ops = {
 };
 
 static struct dentry *ccp_debugfs_dir;
-static DEFINE_RWLOCK(ccp_debugfs_lock);
+static DEFINE_MUTEX(ccp_debugfs_lock);
 
 #define	MAX_NAME_LEN	20
 
@@ -290,16 +290,15 @@ void ccp5_debugfs_setup(struct ccp_device *ccp)
 	struct dentry *debugfs_stats;
 	struct dentry *debugfs_q_instance;
 	struct dentry *debugfs_q_stats;
-	unsigned long flags;
 	int i;
 
 	if (!debugfs_initialized())
 		return;
 
-	write_lock_irqsave(&ccp_debugfs_lock, flags);
+	mutex_lock(&ccp_debugfs_lock);
 	if (!ccp_debugfs_dir)
 		ccp_debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
-	write_unlock_irqrestore(&ccp_debugfs_lock, flags);
+	mutex_unlock(&ccp_debugfs_lock);
 	if (!ccp_debugfs_dir)
 		return;
 
drivers/crypto/inside-secure/safexcel.c +9 -0
index d4c81cb73bee..3ee68ecde9ec 100644
@@ -462,6 +462,15 @@ void safexcel_dequeue(struct safexcel_crypto_priv *priv, int ring)
 		if (backlog)
 			backlog->complete(backlog, -EINPROGRESS);
 
+		/* In case the send() helper did not issue any command to push
+		 * to the engine because the input data was cached, continue to
+		 * dequeue other requests as this is valid and not an error.
+		 */
+		if (!commands && !results) {
+			kfree(request);
+			continue;
+		}
+
 		spin_lock_bh(&priv->ring[ring].egress_lock);
 		list_add_tail(&request->list, &priv->ring[ring].list);
 		spin_unlock_bh(&priv->ring[ring].egress_lock);
drivers/crypto/inside-secure/safexcel_cipher.c +1 -1
index fcc0a606d748..29cf7e00b574 100644
@@ -446,7 +446,7 @@ static int safexcel_cipher_exit_inv(struct crypto_tfm *tfm)
 	if (!priv->ring[ring].need_dequeue)
 		safexcel_dequeue(priv, ring);
 
-	wait_for_completion_interruptible(&result.completion);
+	wait_for_completion(&result.completion);
 
 	if (result.error) {
 		dev_warn(priv->dev,
drivers/crypto/inside-secure/safexcel_hash.c +4 -4
index d626aa485a76..69f29776591a 100644
@@ -185,7 +185,7 @@ static int safexcel_ahash_send_req(struct crypto_async_request *async, int ring,
 	int i, queued, len, cache_len, extra, n_cdesc = 0, ret = 0;
 
 	queued = len = req->len - req->processed;
-	if (queued < crypto_ahash_blocksize(ahash))
+	if (queued <= crypto_ahash_blocksize(ahash))
 		cache_len = queued;
 	else
 		cache_len = queued - areq->nbytes;
@@ -199,7 +199,7 @@ static int safexcel_ahash_send_req(struct crypto_async_request *async, int ring,
 			/* If this is not the last request and the queued data
 			 * is a multiple of a block, cache the last one for now.
 			 */
-			extra = queued - crypto_ahash_blocksize(ahash);
+			extra = crypto_ahash_blocksize(ahash);
 
 		if (extra) {
 			sg_pcopy_to_buffer(areq->src, sg_nents(areq->src),
@@ -494,7 +494,7 @@ static int safexcel_ahash_exit_inv(struct crypto_tfm *tfm)
 	if (!priv->ring[ring].need_dequeue)
 		safexcel_dequeue(priv, ring);
 
-	wait_for_completion_interruptible(&result.completion);
+	wait_for_completion(&result.completion);
 
 	if (result.error) {
 		dev_warn(priv->dev, "hash: completion error (%d)\n",
@@ -819,7 +819,7 @@ static int safexcel_hmac_init_pad(struct ahash_request *areq,
 		init_completion(&result.completion);
 
 		ret = crypto_ahash_digest(areq);
-		if (ret == -EINPROGRESS) {
+		if (ret == -EINPROGRESS || ret == -EBUSY) {
 			wait_for_completion_interruptible(&result.completion);
 			ret = result.error;
 		}
drivers/crypto/sunxi-ss/sun4i-ss-core.c +1 -0
index 1547cbe13dc2..a81d89b3b7d8 100644
@@ -451,6 +451,7 @@ static struct platform_driver sun4i_ss_driver = {
 
 module_platform_driver(sun4i_ss_driver);
 
+MODULE_ALIAS("platform:sun4i-ss");
 MODULE_DESCRIPTION("Allwinner Security System cryptographic accelerator");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Corentin LABBE <[email protected]>");
drivers/media/dvb-core/dmxdev.c +1 -1
index 18e4230865be..51009b2718a3 100644
@@ -1055,7 +1055,7 @@ static int dvb_demux_do_ioctl(struct file *file,
 		break;
 
 	default:
-		ret = -EINVAL;
+		ret = -ENOTTY;
 		break;
 	}
 	mutex_unlock(&dmxdev->mutex);
drivers/media/dvb-frontends/lgdt3306a.c +8 -2
index c9b1eb38444e..fbb3b2f49d2d 100644
@@ -1767,7 +1767,13 @@ static void lgdt3306a_release(struct dvb_frontend *fe)
 	struct lgdt3306a_state *state = fe->demodulator_priv;
 
 	dbg_info("\n");
-	kfree(state);
+
+	/*
+	 * If state->muxc is not NULL, then we are an i2c device
+	 * and lgdt3306a_remove will clean up state
+	 */
+	if (!state->muxc)
+		kfree(state);
 }
 
 static const struct dvb_frontend_ops lgdt3306a_ops;
@@ -2168,7 +2174,7 @@ static int lgdt3306a_probe(struct i2c_client *client,
 			sizeof(struct lgdt3306a_config));
 
 	config->i2c_addr = client->addr;
-	fe = lgdt3306a_attach(config, client->adapter);
+	fe = dvb_attach(lgdt3306a_attach, config, client->adapter);
 	if (fe == NULL) {
 		ret = -ENODEV;
 		goto err_fe;
drivers/media/i2c/adv748x/adv748x-hdmi.c +3 -0
index 4da4253553fc..10d229a4f088 100644
@@ -105,6 +105,9 @@ static void adv748x_hdmi_fill_format(struct adv748x_hdmi *hdmi,
 
 	fmt->width = hdmi->timings.bt.width;
 	fmt->height = hdmi->timings.bt.height;
+
+	if (fmt->field == V4L2_FIELD_ALTERNATE)
+		fmt->height /= 2;
 }
 
 static void adv748x_fill_optional_dv_timings(struct v4l2_dv_timings *timings)
drivers/media/i2c/ov5645.c +3 -2
index d28845f7356f..a31fe18c71d6 100644
@@ -1131,13 +1131,14 @@ static int ov5645_probe(struct i2c_client *client,
 
 	ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint),
 					 &ov5645->ep);
+
+	of_node_put(endpoint);
+
 	if (ret < 0) {
 		dev_err(dev, "parsing endpoint node failed\n");
 		return ret;
 	}
 
-	of_node_put(endpoint);
-
 	if (ov5645->ep.bus_type != V4L2_MBUS_CSI2) {
 		dev_err(dev, "invalid bus type, must be CSI2\n");
 		return -EINVAL;
drivers/media/i2c/tvp5150.c +45 -43

239 lines not on this page · raw message

drivers/media/pci/cx23885/cx23885-cards.c +4 -0
index 78a8836d03e4..6c0fd9438dd9 100644
@@ -2286,6 +2286,10 @@ void cx23885_card_setup(struct cx23885_dev *dev)
 				&dev->i2c_bus[2].i2c_adap,
 				"cx25840", 0x88 >> 1, NULL);
 		if (dev->sd_cx25840) {
+			/* set host data for clk_freq configuration */
+			v4l2_set_subdev_hostdata(dev->sd_cx25840,
+						&dev->clk_freq);
+
 			dev->sd_cx25840->grp_id = CX23885_HW_AV_CORE;
 			v4l2_subdev_call(dev->sd_cx25840, core, load_fw);
 		}
drivers/media/pci/cx23885/cx23885-core.c +10 -0
index 8f63df1cb418..4612f26fcd6d 100644
@@ -873,6 +873,16 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
 	if (cx23885_boards[dev->board].clk_freq > 0)
 		dev->clk_freq = cx23885_boards[dev->board].clk_freq;
 
+	if (dev->board == CX23885_BOARD_HAUPPAUGE_IMPACTVCBE &&
+		dev->pci->subsystem_device == 0x7137) {
+		/* Hauppauge ImpactVCBe device ID 0x7137 is populated
+		 * with an 888, and a 25Mhz crystal, instead of the
+		 * usual third overtone 50Mhz. The default clock rate must
+		 * be overridden so the cx25840 is properly configured
+		 */
+		dev->clk_freq = 25000000;
+	}
+
 	dev->pci_bus  = dev->pci->bus->number;
 	dev->pci_slot = PCI_SLOT(dev->pci->devfn);
 	cx23885_irq_add(dev, 0x001f00);
drivers/media/pci/cx25821/cx25821-core.c +4 -3
index 04aa4a68a0ae..040c6c251d3a 100644
@@ -867,6 +867,10 @@ static int cx25821_dev_setup(struct cx25821_dev *dev)
 	dev->nr = ++cx25821_devcount;
 	sprintf(dev->name, "cx25821[%d]", dev->nr);
 
+	if (dev->nr >= ARRAY_SIZE(card)) {
+		CX25821_INFO("dev->nr >= %zd", ARRAY_SIZE(card));
+		return -ENODEV;
+	}
 	if (dev->pci->device != 0x8210) {
 		pr_info("%s(): Exiting. Incorrect Hardware device = 0x%02x\n",
 			__func__, dev->pci->device);
@@ -882,9 +886,6 @@ static int cx25821_dev_setup(struct cx25821_dev *dev)
 		dev->channels[i].sram_channels = &cx25821_sram_channels[i];
 	}
 
-	if (dev->nr > 1)
-		CX25821_INFO("dev->nr > 1!");
-
 	/* board config */
 	dev->board = 1;		/* card[dev->nr]; */
 	dev->_max_num_decoders = MAX_DECODERS;
drivers/media/platform/s3c-camif/camif-capture.c +4 -3
index 25c7a7d42292..0f0324a14d51 100644
@@ -1256,16 +1256,17 @@ static void __camif_subdev_try_format(struct camif_dev *camif,
 {
 	const struct s3c_camif_variant *variant = camif->variant;
 	const struct vp_pix_limits *pix_lim;
-	int i = ARRAY_SIZE(camif_mbus_formats);
+	unsigned int i;
 
 	/* FIXME: constraints against codec or preview path ? */
 	pix_lim = &variant->vp_pix_limits[VP_CODEC];
 
-	while (i-- >= 0)
+	for (i = 0; i < ARRAY_SIZE(camif_mbus_formats); i++)
 		if (camif_mbus_formats[i] == mf->code)
 			break;
 
-	mf->code = camif_mbus_formats[i];
+	if (i == ARRAY_SIZE(camif_mbus_formats))
+		mf->code = camif_mbus_formats[0];
 
 	if (pad == CAMIF_SD_PAD_SINK) {
 		v4l_bound_align_image(&mf->width, 8, CAMIF_MAX_PIX_WIDTH,
drivers/media/platform/vivid/vivid-ctrls.c +2 -0
index 34731f71cc00..8ca9343b6730 100644
@@ -1191,6 +1191,7 @@ static int vivid_radio_rx_s_ctrl(struct v4l2_ctrl *ctrl)
 		v4l2_ctrl_activate(dev->radio_rx_rds_ta, dev->radio_rx_rds_controls);
 		v4l2_ctrl_activate(dev->radio_rx_rds_tp, dev->radio_rx_rds_controls);
 		v4l2_ctrl_activate(dev->radio_rx_rds_ms, dev->radio_rx_rds_controls);
+		dev->radio_rx_dev.device_caps = dev->radio_rx_caps;
 		break;
 	case V4L2_CID_RDS_RECEPTION:
 		dev->radio_rx_rds_enabled = ctrl->val;
@@ -1265,6 +1266,7 @@ static int vivid_radio_tx_s_ctrl(struct v4l2_ctrl *ctrl)
 		dev->radio_tx_caps &= ~V4L2_CAP_READWRITE;
 		if (!dev->radio_tx_rds_controls)
 			dev->radio_tx_caps |= V4L2_CAP_READWRITE;
+		dev->radio_tx_dev.device_caps = dev->radio_tx_caps;
 		break;
 	case V4L2_CID_RDS_TX_PTY:
 		if (dev->radio_rx_rds_controls)
drivers/media/platform/vsp1/vsp1_drm.c +9 -0
index 4dfbeac8f42c..d3cd57f6ba52 100644
@@ -504,6 +504,15 @@ void vsp1_du_atomic_flush(struct device *dev, unsigned int pipe_index)
 		struct vsp1_rwpf *rpf = vsp1->rpf[i];
 		unsigned int j;
 
+		/*
+		 * Make sure we don't accept more inputs than the hardware can
+		 * handle. This is a temporary fix to avoid display stall, we
+		 * need to instead allocate the BRU or BRS to display pipelines
+		 * dynamically based on the number of planes they each use.
+		 */
+		if (pipe->num_inputs >= pipe->bru->source_pad)
+			pipe->inputs[i] = NULL;
+
 		if (!pipe->inputs[i])
 			continue;
 
drivers/media/usb/em28xx/em28xx-cards.c +17 -5
index 4c57fd7929cb..11a59854a0a6 100644
@@ -508,8 +508,10 @@ static struct em28xx_reg_seq plex_px_bcud[] = {
 };
 
 /*
- * 2040:0265 Hauppauge WinTV-dualHD DVB
- * 2040:026d Hauppauge WinTV-dualHD ATSC/QAM
+ * 2040:0265 Hauppauge WinTV-dualHD DVB Isoc
+ * 2040:8265 Hauppauge WinTV-dualHD DVB Bulk
+ * 2040:026d Hauppauge WinTV-dualHD ATSC/QAM Isoc
+ * 2040:826d Hauppauge WinTV-dualHD ATSC/QAM Bulk
  * reg 0x80/0x84:
  * GPIO_0: Yellow LED tuner 1, 0=on, 1=off
  * GPIO_1: Green LED tuner 1, 0=on, 1=off
@@ -2392,7 +2394,8 @@ struct em28xx_board em28xx_boards[] = {
 		.has_dvb       = 1,
 	},
 	/*
-	 * 2040:0265 Hauppauge WinTV-dualHD (DVB version).
+	 * 2040:0265 Hauppauge WinTV-dualHD (DVB version) Isoc.
+	 * 2040:8265 Hauppauge WinTV-dualHD (DVB version) Bulk.
 	 * Empia EM28274, 2x Silicon Labs Si2168, 2x Silicon Labs Si2157
 	 */
 	[EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_DVB] = {
@@ -2407,7 +2410,8 @@ struct em28xx_board em28xx_boards[] = {
 		.leds          = hauppauge_dualhd_leds,
 	},
 	/*
-	 * 2040:026d Hauppauge WinTV-dualHD (model 01595 - ATSC/QAM).
+	 * 2040:026d Hauppauge WinTV-dualHD (model 01595 - ATSC/QAM) Isoc.
+	 * 2040:826d Hauppauge WinTV-dualHD (model 01595 - ATSC/QAM) Bulk.
 	 * Empia EM28274, 2x LG LGDT3306A, 2x Silicon Labs Si2157
 	 */
 	[EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_01595] = {
@@ -2548,8 +2552,12 @@ struct usb_device_id em28xx_id_table[] = {
 			.driver_info = EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850 },
 	{ USB_DEVICE(0x2040, 0x0265),
 			.driver_info = EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_DVB },
+	{ USB_DEVICE(0x2040, 0x8265),
+			.driver_info = EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_DVB },
 	{ USB_DEVICE(0x2040, 0x026d),
 			.driver_info = EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_01595 },
+	{ USB_DEVICE(0x2040, 0x826d),
+			.driver_info = EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_01595 },
 	{ USB_DEVICE(0x0438, 0xb002),
 			.driver_info = EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600 },
 	{ USB_DEVICE(0x2001, 0xf112),
@@ -2610,7 +2618,11 @@ struct usb_device_id em28xx_id_table[] = {
 			.driver_info = EM28178_BOARD_PCTV_461E },
 	{ USB_DEVICE(0x2013, 0x025f),
 			.driver_info = EM28178_BOARD_PCTV_292E },
-	{ USB_DEVICE(0x2040, 0x0264), /* Hauppauge WinTV-soloHD */
+	{ USB_DEVICE(0x2040, 0x0264), /* Hauppauge WinTV-soloHD Isoc */
+			.driver_info = EM28178_BOARD_PCTV_292E },
+	{ USB_DEVICE(0x2040, 0x8264), /* Hauppauge OEM Generic WinTV-soloHD Bulk */
+			.driver_info = EM28178_BOARD_PCTV_292E },
+	{ USB_DEVICE(0x2040, 0x8268), /* Hauppauge Retail WinTV-soloHD Bulk */
 			.driver_info = EM28178_BOARD_PCTV_292E },
 	{ USB_DEVICE(0x0413, 0x6f07),
 			.driver_info = EM2861_BOARD_LEADTEK_VC100 },
drivers/media/usb/em28xx/em28xx.h +1 -1
index 88084f24f033..094e83b6908d 100644
@@ -191,7 +191,7 @@
    USB 2.0 spec says bulk packet size is always 512 bytes
  */
 #define EM28XX_BULK_PACKET_MULTIPLIER 384
-#define EM28XX_DVB_BULK_PACKET_MULTIPLIER 384
+#define EM28XX_DVB_BULK_PACKET_MULTIPLIER 94
 
 #define EM28XX_INTERLACED_DEFAULT 1
 
drivers/media/v4l2-core/videobuf2-vmalloc.c +1 -1
index 3a7c80cd1a17..359fb9804d16 100644
@@ -106,7 +106,7 @@ static void *vb2_vmalloc_get_userptr(struct device *dev, unsigned long vaddr,
 			if (nums[i-1] + 1 != nums[i])
 				goto fail_map;
 		buf->vaddr = (__force void *)
-				ioremap_nocache(nums[0] << PAGE_SHIFT, size);
+			ioremap_nocache(__pfn_to_phys(nums[0]), size + offset);
 	} else {
 		buf->vaddr = vm_map_ram(frame_vector_pages(vec), n_pages, -1,
 					PAGE_KERNEL);
drivers/message/fusion/mptctl.c +2 -0
index 7b3b41368931..cf6ce9f600ca 100644
@@ -2698,6 +2698,8 @@ mptctl_hp_targetinfo(unsigned long arg)
 				__FILE__, __LINE__, iocnum);
 		return -ENODEV;
 	}
+	if (karg.hdr.id >= MPT_MAX_FC_DEVICES)
+		return -EINVAL;
 	dctlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "mptctl_hp_targetinfo called.\n",
 	    ioc->name));
 
drivers/net/ethernet/mellanox/mlx4/main.c +3 -1
index e61c99ef741d..c273a3ebb8e8 100644
@@ -3007,6 +3007,7 @@ static int mlx4_init_port_info(struct mlx4_dev *dev, int port)
 		mlx4_err(dev, "Failed to create file for port %d\n", port);
 		devlink_port_unregister(&info->devlink_port);
 		info->port = -1;
+		return err;
 	}
 
 	sprintf(info->dev_mtu_name, "mlx4_port%d_mtu", port);
@@ -3028,9 +3029,10 @@ static int mlx4_init_port_info(struct mlx4_dev *dev, int port)
 				   &info->port_attr);
 		devlink_port_unregister(&info->devlink_port);
 		info->port = -1;
+		return err;
 	}
 
-	return err;
+	return 0;
 }
 
 static void mlx4_cleanup_port_info(struct mlx4_port_info *info)
drivers/net/hyperv/hyperv_net.h +7 -4
index 4f3afcf92a7c..01017dd88802 100644
@@ -179,7 +179,7 @@ struct rndis_device {
 
 	u8 hw_mac_adr[ETH_ALEN];
 	u8 rss_key[NETVSC_HASH_KEYLEN];
-	u16 ind_table[ITAB_NUM];
+	u16 rx_table[ITAB_NUM];
 };
 
 
@@ -192,7 +192,7 @@ struct netvsc_device *netvsc_device_add(struct hv_device *device,
 					const struct netvsc_device_info *info);
 int netvsc_alloc_recv_comp_ring(struct netvsc_device *net_device, u32 q_idx);
 void netvsc_device_remove(struct hv_device *device);
-int netvsc_send(struct net_device_context *ndc,
+int netvsc_send(struct net_device *net,
 		struct hv_netvsc_packet *packet,
 		struct rndis_message *rndis_msg,
 		struct hv_page_buffer *page_buffer,
@@ -208,7 +208,6 @@ void netvsc_channel_cb(void *context);
 int netvsc_poll(struct napi_struct *napi, int budget);
 
 void rndis_set_subchannel(struct work_struct *w);
-bool rndis_filter_opened(const struct netvsc_device *nvdev);
 int rndis_filter_open(struct netvsc_device *nvdev);
 int rndis_filter_close(struct netvsc_device *nvdev);
 struct netvsc_device *rndis_filter_device_add(struct hv_device *dev,
@@ -659,6 +658,10 @@ struct nvsp_message {
 #define NETVSC_RECEIVE_BUFFER_ID		0xcafe
 #define NETVSC_SEND_BUFFER_ID			0
 
+#define NETVSC_SUPPORTED_HW_FEATURES (NETIF_F_RXCSUM | NETIF_F_IP_CSUM | \
+				      NETIF_F_TSO | NETIF_F_IPV6_CSUM | \
+				      NETIF_F_TSO6)
+
 #define VRSS_SEND_TAB_SIZE 16  /* must be power of 2 */
 #define VRSS_CHANNEL_MAX 64
 #define VRSS_CHANNEL_DEFAULT 8
@@ -734,7 +737,7 @@ struct net_device_context {
 
 	u32 tx_checksum_mask;
 
-	u32 tx_send_table[VRSS_SEND_TAB_SIZE];
+	u32 tx_table[VRSS_SEND_TAB_SIZE];
 
 	/* Ethtool settings */
 	bool udp4_l4_hash;
drivers/net/hyperv/netvsc.c +118 -85

381 lines not on this page · raw message

drivers/net/hyperv/netvsc_drv.c +179 -131

487 lines not on this page · raw message

drivers/net/hyperv/rndis_filter.c +111 -99

64 lines not on this page · raw message

drivers/net/usb/qmi_wwan.c +4 -0
index 2f828eb9ace6..e522085ecbf7 100644

Lines of this file are not shown. View the raw message.

drivers/net/usb/usbnet.c +6 -4
index 42baad125a7d..32fc69539126 100644

Lines of this file are not shown. View the raw message.

drivers/net/vmxnet3/vmxnet3_drv.c +47 -25

72 lines not on this page · raw message

drivers/rtc/hctosys.c +5 -0
index e1cfa06810ef..e79f2a181ad2 100644

Lines of this file are not shown. View the raw message.

drivers/rtc/rtc-goldfish.c +2 -0
index d67769265185..a1c44d0c8557 100644

Lines of this file are not shown. View the raw message.

drivers/rtc/rtc-m41t80.c +11 -7
index c90fba3ed861..6620016869cf 100644

Lines of this file are not shown. View the raw message.

drivers/rtc/rtc-rk808.c +7 -7
index 35c9aada07c8..79c8da54e922 100644

Lines of this file are not shown. View the raw message.

drivers/rtc/rtc-rp5c01.c +10 -2
index 026035373ae6..38a12435b5a0 100644

Lines of this file are not shown. View the raw message.

drivers/rtc/rtc-snvs.c +11 -4
index d8ef9e052c4f..9af591d5223c 100644

Lines of this file are not shown. View the raw message.

drivers/rtc/rtc-tx4939.c +4 -2
index 560d9a5e0225..a9528083061d 100644

Lines of this file are not shown. View the raw message.

drivers/s390/scsi/zfcp_dbf.c +22 -1
index a8b831000b2d..18c4f933e8b9 100644

Lines of this file are not shown. View the raw message.

drivers/s390/scsi/zfcp_ext.h +4 -1
index 8ca2ab7deaa9..b1cbb14fb2ae 100644

Lines of this file are not shown. View the raw message.

drivers/s390/scsi/zfcp_scsi.c +7 -7
index 4d2ba5682493..22f9562f415c 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/aacraid/commsup.c +3 -1
index 3696f9ded252..998788a967be 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/aacraid/linit.c +4 -1
index 509fe23fafe1..4917649cacd5 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/bnx2fc/bnx2fc_io.c +1 -0
index 5b6153f23f01..6626b28ba8fe 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/iscsi_tcp.c +8 -0
index 4d934d6c3e13..e11eff6b0e97 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/libsas/sas_scsi_host.c +13 -20
index 10b17da20176..0c4b186c852a 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/lpfc/lpfc_attr.c +5 -0
index dc6519b2c53a..3da242201cb4 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/lpfc/lpfc_hbadisc.c +3 -2
index d9a03beb76a4..4962d665b4d2 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/lpfc/lpfc_sli.c +2 -0
index 455f3ce9fda9..dc83498024dc 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/mpt3sas/mpt3sas_base.c +4 -1
index 6efa739a1912..9b716c8c558a 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/mpt3sas/mpt3sas_scsih.c +1 -1
index 139219c994e9..ae5e579ac473 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/mvsas/mv_94xx.c +12 -11
index 7de5d8d75480..eb5471bc7263 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/qedi/qedi_fw.c +5 -0
index 93d54acd4a22..2e5e04a7623f 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/qedi/qedi_main.c +12 -12
index cccc34adc0e0..1573749fe615 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/qla2xxx/qla_isr.c +4 -2
index d95b879c2bca..13a00a42b3ca 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/qla2xxx/qla_os.c +2 -0
index 8e7c0626f8b5..1be76695e692 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/qla4xxx/ql4_def.h +2 -0
index fc233717355f..817f312023a9 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/qla4xxx/ql4_os.c +46 -0

46 lines not on this page · raw message

drivers/scsi/scsi_lib.c +11 -0
index 359386730523..bfd8f12d4e9a 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/sd.c +2 -1
index 2f9912de2212..4a532318b211 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/sg.c +1 -1
index aa28874e8fb9..17a4cc138b00 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/storvsc_drv.c +1 -1
index a3e480e7a257..c44de0b4a995 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/sym53c8xx_2/sym_hipd.c +1 -1
index ca360daa6a25..378af306fda1 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/ufs/ufshcd.c +2 -0
index d344fef01f1d..3bb1f6cc297a 100644

Lines of this file are not shown. View the raw message.

drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c +3 -3
index 8e84b2e7f5bd..b83d17db06bd 100644

Lines of this file are not shown. View the raw message.

drivers/staging/ks7010/ks_hostif.c +15 -16
index 975dbbb3abd0..7da3eb4ca4be 100644

Lines of this file are not shown. View the raw message.

drivers/staging/ks7010/ks_hostif.h +1 -0
index 5bae8d468e23..9ac317e4b507 100644

Lines of this file are not shown. View the raw message.

drivers/staging/lustre/lustre/include/obd.h +1 -1
index a986737ec010..82a499fb23bb 100644

Lines of this file are not shown. View the raw message.

drivers/staging/lustre/lustre/lmv/lmv_obd.c +1 -1
index 6e16c930a021..c2aadb2d1fea 100644

Lines of this file are not shown. View the raw message.

drivers/staging/lustre/lustre/osc/osc_cache.c +1 -1
index e1207c227b79..c356d00d87a5 100644

Lines of this file are not shown. View the raw message.

drivers/staging/rtl8192u/r8192U_core.c +2 -0
index 46b3f19e0878..db3eb7ec5809 100644

Lines of this file are not shown. View the raw message.

drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +25 -29

54 lines not on this page · raw message

drivers/tty/serial/8250/8250_port.c +2 -1
index e32c51d549c3..be456ea27ab2 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/altera_uart.c +6 -6
index 3e4b717670d7..59cb62de236b 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/arc_uart.c +5 -0
index 77fe306690c4..71e37abb6bcb 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/fsl_lpuart.c +4 -0
index f0252184291e..7a3db9378fa3 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/imx.c +6 -0
index 521500c575c8..8deaf2ad8b34 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/mxs-auart.c +4 -0
index be94246b6fcc..673c8fd7e34f 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/samsung.c +4 -0
index 8aca18c4cdea..bedd4bdec4ab 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/sh-sci.c +4 -0
index 22f60239026c..8a58ee32ff61 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/xilinx_uartps.c +1 -1
index 31a630ae0870..21c35ad72b99 100644

Lines of this file are not shown. View the raw message.

drivers/usb/class/cdc-acm.c +6 -3
index 4149a965516e..22952d70b981 100644

Lines of this file are not shown. View the raw message.

drivers/usb/dwc2/core.h +1 -1
index 8367d4f985c1..ec965ac5f1f5 100644

Lines of this file are not shown. View the raw message.

drivers/usb/dwc2/gadget.c +6 -6
index 0d8e09ccb59c..6ef001a83fe2 100644

Lines of this file are not shown. View the raw message.

drivers/usb/dwc2/hcd.c +31 -1
index 9bd60ec83ac6..87484f71b2ab 100644

Lines of this file are not shown. View the raw message.

drivers/usb/dwc3/Makefile +1 -1
index 7ac725038f8d..025bc68094fc 100644

Lines of this file are not shown. View the raw message.

drivers/usb/dwc3/core.c +15 -1
index c3f3f1a89b0f..dca78bb20e5d 100644

Lines of this file are not shown. View the raw message.

drivers/usb/dwc3/core.h +2 -0
index fc28819253f7..b782ba58a7fc 100644

Lines of this file are not shown. View the raw message.

drivers/usb/dwc3/dwc3-omap.c +16 -0
index 3530795bbb8f..fdd0d5aa1f5e 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/composite.c +19 -21
index ed9346f0b000..940de04ed72a 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/function/f_fs.c +5 -1
index 0904cb6ce4de..7b53ac548b1a 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/function/f_uac2.c +2 -0
index f05c3f3e6103..97cb2dfd6369 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/udc/core.c +1 -1
index 5bab09294a8a..ad315c4c6f35 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/udc/fsl_udc_core.c +2 -2
index 6f2f71c054be..7874c112f3fd 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/udc/goku_udc.h +1 -1
index 86d2adafe149..64eb0f2b5ea0 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/ohci-hcd.c +2 -1
index 1099465b27f0..b4599aa428f3 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/xhci-mem.c +2 -0
index ccdc971283d0..efd7e4882d66 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/xhci-plat.c +1 -10
index 7d9e085f7b85..830dd0dbbce0 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/xhci.c +11 -3
index bcf315b32bff..d8b185b0d0f9 100644

Lines of this file are not shown. View the raw message.

drivers/usb/usbip/Kconfig +1 -1
index eeefa29f8aa2..a20b65cb6678 100644

Lines of this file are not shown. View the raw message.

fs/ext2/inode.c +0 -10
index 1442a4c734c8..a7c87d593083 100644

Lines of this file are not shown. View the raw message.

fs/hfsplus/super.c +1 -0
index e5bb2de2262a..3cba08c931ee 100644

Lines of this file are not shown. View the raw message.

include/linux/u64_stats_sync.h +22 -0
index 5bdbd9f49395..07ee0f84a46c 100644

Lines of this file are not shown. View the raw message.

include/linux/usb/composite.h +3 -0
index f665d2ceac20..590d313b5f39 100644

Lines of this file are not shown. View the raw message.

include/scsi/scsi.h +2 -0
index cb85eddb47ea..eb7853c1a23b 100644

Lines of this file are not shown. View the raw message.

include/uapi/linux/nl80211.h +2 -0
index 51626b4175c0..3fab6c81917f 100644

Lines of this file are not shown. View the raw message.

net/core/dev.c +1 -1
index e7d56c5adde6..6ca771f2f25b 100644

Lines of this file are not shown. View the raw message.

net/core/sock.c +1 -1
index ec6eb546b228..68d08ed5521e 100644

Lines of this file are not shown. View the raw message.

net/ipv4/ip_output.c +2 -1
index e8e675be60ec..63d5d66e040a 100644

Lines of this file are not shown. View the raw message.

net/ipv4/tcp_output.c +5 -2
index 83d11cd2eb65..abae5196cd3a 100644

Lines of this file are not shown. View the raw message.

net/ipv6/ip6_output.c +2 -1
index ffbb81609016..0f2d74885bcb 100644

Lines of this file are not shown. View the raw message.

net/packet/af_packet.c +3 -1
index 3994b71f8197..8351faabba62 100644

Lines of this file are not shown. View the raw message.

net/sched/act_vlan.c +2 -0
index 16eb067a8d8f..5c10a0fce35b 100644

Lines of this file are not shown. View the raw message.

net/sched/sch_red.c +3 -2
index d87c41e82917..c453b8d81c9e 100644

Lines of this file are not shown. View the raw message.

net/sched/sch_tbf.c +3 -2
index 120f4f365967..b36ecb58aa6e 100644

Lines of this file are not shown. View the raw message.

net/smc/smc_pnet.c +40 -31

71 lines not on this page · raw message

net/wireless/core.c +3 -0
index 33ce0484b2a0..45cbade9ad68 100644

Lines of this file are not shown. View the raw message.

sound/soc/codecs/hdmi-codec.c +1 -6
index 3abf82563408..cf3b905b4ead 100644

Lines of this file are not shown. View the raw message.

sound/soc/rockchip/Kconfig +3 -0
index b0825370d262..957046ac6c8c 100644

Lines of this file are not shown. View the raw message.

sound/soc/samsung/i2s.c +11 -2
index 10a4da06c0a1..f058f2bdd519 100644

Lines of this file are not shown. View the raw message.

sound/soc/samsung/odroid.c +7 -4
index 44b6de5a331a..06a31a9585a0 100644

Lines of this file are not shown. View the raw message.

sound/soc/soc-topology.c +3 -0
index 782c580b7aa3..e5049fbfc4f1 100644

Lines of this file are not shown. View the raw message.

sound/usb/quirks.c +16 -13
index 58f94f399efb..ad14d6b78bdc 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.