Linux 4.16.12
Greg KH
maintainerI'm announcing the release of the 4.16.12 kernel.
All users of the 4.16 kernel series must upgrade.
The updated 4.16.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.16.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/powerpc/include/asm/exception-64s.h | 29 + arch/powerpc/include/asm/feature-fixups.h | 19 + arch/powerpc/include/asm/hvcall.h | 3 arch/powerpc/include/asm/security_features.h | 85 +++++ arch/powerpc/kernel/Makefile | 2 arch/powerpc/kernel/exceptions-64s.S | 19 + arch/powerpc/kernel/security.c | 237 +++++++++++++++ arch/powerpc/kernel/setup_64.c | 8 arch/powerpc/kernel/vmlinux.lds.S | 14 arch/powerpc/lib/feature-fixups.c | 115 +++++++ arch/powerpc/platforms/powernv/setup.c | 96 ++++-- arch/powerpc/platforms/pseries/setup.c | 71 +++- arch/s390/Kconfig | 3 arch/s390/Makefile | 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-branch.h | 7 arch/s390/include/asm/nospec-insn.h | 196 ++++++++++++ arch/s390/kernel/Makefile | 5 arch/s390/kernel/alternative.c | 24 - 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/module.c | 15 arch/s390/kernel/nospec-branch.c | 123 ++++++- arch/s390/kernel/nospec-sysfs.c | 21 + arch/s390/kernel/reipl.S | 7 arch/s390/kernel/setup.c | 3 arch/s390/kernel/swsusp.S | 10 arch/s390/lib/mem.S | 19 - 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 | 13 drivers/clk/clk.c | 3 drivers/clk/hisilicon/crg-hi3516cv300.c | 2 drivers/clk/meson/axg.c | 7 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 | 12 drivers/crypto/inside-secure/safexcel_cipher.c | 2 drivers/crypto/inside-secure/safexcel_hash.c | 38 +- drivers/crypto/sunxi-ss/sun4i-ss-core.c | 1 drivers/media/common/videobuf2/videobuf2-vmalloc.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/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/net/dsa/bcm_sf2_cfp.c | 36 +- drivers/net/ethernet/3com/3c59x.c | 104 +++--- drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h | 28 - drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 88 +---- drivers/net/ethernet/mellanox/mlx4/main.c | 4 drivers/net/ethernet/qlogic/qed/qed_ll2.c | 61 +++ drivers/net/tun.c | 27 - drivers/net/vmxnet3/vmxnet3_drv.c | 72 +++- drivers/net/vmxnet3/vmxnet3_int.h | 8 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 | 1 drivers/scsi/lpfc/lpfc_attr.c | 5 drivers/scsi/lpfc/lpfc_hbadisc.c | 5 drivers/scsi/lpfc/lpfc_nportdisc.c | 15 drivers/scsi/lpfc/lpfc_nvme.c | 28 - drivers/scsi/lpfc/lpfc_nvme.h | 2 drivers/scsi/lpfc/lpfc_sli.c | 2 drivers/scsi/mvsas/mv_94xx.c | 23 - drivers/scsi/scsi_devinfo.c | 1 drivers/scsi/scsi_lib.c | 11 drivers/scsi/sg.c | 2 drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 16 - 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/mvebu-uart.c | 2 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/dwc2/core.h | 2 drivers/usb/dwc2/hcd.c | 32 +- drivers/usb/dwc3/Makefile | 2 drivers/usb/dwc3/core.c | 13 drivers/usb/dwc3/core.h | 2 drivers/usb/gadget/composite.c | 40 +- drivers/usb/gadget/function/f_fs.c | 6 drivers/usb/gadget/udc/goku_udc.h | 2 drivers/usb/host/xhci-mem.c | 2 drivers/usb/host/xhci.c | 14 drivers/usb/usbip/Kconfig | 2 fs/ext2/inode.c | 10 fs/hfsplus/super.c | 1 include/linux/mlx5/driver.h | 12 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/dsa/dsa2.c | 9 net/ipv4/ip_output.c | 3 net/ipv4/tcp_output.c | 7 net/ipv6/ip6_gre.c | 281 ++++++++++++++---- 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/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 + 154 files changed, 2355 insertions(+), 845 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
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 (8):
crypto: inside-secure - move the digest to the request context
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 - do not overwrite the threshold value
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()
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
Bryan O'Donoghue (1):
rtc: snvs: Fix usage of snvs_rtc_enable
Chris Dickens (1):
usb: gadget: composite: fix incorrect handling of OS desc requests
Christoph Hellwig (1):
3c59x: convert to generic DMA API
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
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()
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 (2):
sock_diag: fix use-after-free read in __sk_free
tcp: purge write queue in tcp_connect_init()
Ezequiel Garcia (1):
ASoC: rockchip: rk3288-hdmi-analog: Select needed codecs
Felipe Balbi (1):
usb: dwc3: Makefile: fix link error on randconfig
Florian Fainelli (4):
net: dsa: bcm_sf2: Fix RX_CLS_LOC_ANY overwrite for last rule
net: dsa: Do not register devlink for unused ports
net: dsa: bcm_sf2: Fix IPv6 rules and chain ID
net: dsa: bcm_sf2: Fix IPv6 rule half deletion
Gabriel Matni (1):
serial: mvebu-uart: fix tx lost characters
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
Greg Kroah-Hartman (1):
Linux 4.16.12
Grigor Tovmasyan (1):
usb: dwc2: Fix interval type issue
Hans Verkuil (1):
media: vivid: fix incorrect capabilities for radio
Ioana Radulescu (2):
staging: fsl-dpaa2/eth: Fix incorrect kfree
staging: fsl-dpaa2/eth: Fix incorrect casts
James Hogan (1):
rtc: goldfish: Add missing MODULE_LICENSE
James Smart (6):
scsi: lpfc: Fix NVME Initiator FirstBurst
scsi: lpfc: Fix issue_lip if link is disabled
scsi: lpfc: Fix nonrecovery of NVME controller after cable swap.
scsi: lpfc: Fix soft lockup in lpfc worker thread during LIP testing
scsi: lpfc: Fix IO failure during hba reset testing with nvme io.
scsi: lpfc: Fix frequency of Release WQE CQEs
Jason Wang (2):
tun: fix use after free for ptr_ring
tuntap: fix use after free during release
Jens Remus (1):
scsi: zfcp: fix infinite iteration on ERP ready list
Jerome Brunet (1):
clk: meson: axg: add the fractional part of the fixed_pll
Johannes Berg (1):
cfg80211: limit wiphy names to 128 bytes
Kieran Bingham (1):
media: i2c: adv748x: fix HDMI field heights
Kirill Marinushkin (1):
staging: bcm2835-audio: Release resources on module_exit()
Kumar Sanghvi (1):
cxgb4: Correct ntuple mask validation for hash filters
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
Marcel Ziswiler (1):
clk: tegra: Fix pll_u rate configuration
Martin Schwidefsky (15):
s390: move nobp parameter functions to nospec-branch.c
s390: add automatic detection of the spectre defense
s390: report spectre mitigation via syslog
s390: add sysfs attributes for spectre
s390: add assembler macros for CPU alternatives
s390: correct nospec auto detection init order
s390: correct module section names for expoline code revert
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
Mauricio Faria de Oliveira (2):
powerpc/pseries: Fix clearing of security feature flags
powerpc: Move default security feature flags
Michael Ellerman (11):
powerpc/rfi-flush: Always enable fallback flush on pseries
powerpc: Add security feature flags for Spectre/Meltdown powerpc/pseries: Add new H_GET_CPU_CHARACTERISTICS flags powerpc/pseries: Set or clear security feature flags powerpc/powernv: Set or clear security feature flags powerpc/64s: Move cpu_show_meltdown()
powerpc/64s: Enhance the information in cpu_show_meltdown() powerpc/powernv: Use the security flags in pnv_setup_rfi_flush() powerpc/pseries: Use the security flags in pseries_setup_rfi_flush() powerpc/64s: Wire up cpu_show_spectre_v1()
powerpc/64s: Wire up cpu_show_spectre_v2()
Michal Kalderon (3):
qed: LL2 flush isles when connection is closed
qed: Fix possibility of list corruption during rmmod flows
qed: Fix LL2 race during connection terminate
Minas Harutyunyan (2):
usb: dwc2: hcd: Fix host channel halt flow
usb: dwc2: host: Fix transaction errors in host mode
NeilBrown (2):
staging: lustre: fix bug in osc_enter_cache_try
staging: lustre: lmv: correctly iput lmo_root
Nicholas Piggin (1):
powerpc/64s: Add support for a store forwarding barrier at kernel entry/exit
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
Petr Machata (7):
net: ip6_gre: Request headroom in __gre6_xmit()
net: ip6_gre: Fix headroom request in ip6erspan_tunnel_xmit()
net: ip6_gre: Split up ip6gre_tnl_link_config()
net: ip6_gre: Split up ip6gre_tnl_change()
net: ip6_gre: Split up ip6gre_newlink()
net: ip6_gre: Split up ip6gre_changelink()
net: ip6_gre: Fix ip6erspan hlen calculation
Quytelda Kahja (1):
staging: ks7010: Use constants from ieee80211_eid instead of literal ints.
Rahul Lakkireddy (1):
cxgb4: fix offset in collecting TX rate limit info
Ranjani Sridharan (1):
ASoC: topology: create TLV data for dapm widgets
Saeed Mahameed (1):
net/mlx5: Fix build break when CONFIG_SMP=n
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
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.
Tedd Ho-Jeong An (1):
Bluetooth: btusb: Add support for Intel Bluetooth device 22560 [8087:0026]
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
Uwe Kleine-König (1):
serial: altera: ensure port->regshift is honored consistently
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
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
William Tu (1):
net: ip6_gre: fix tunnel metadata device sharing.
Wolfram Sang (1):
usb: gadget: udc: change comparison to bitshift when dealing with a mask
Xose Vazquez Perez (1):
scsi: devinfo: add HP DISK-SUBSYSTEM device, for HP XP arrays
Yixun Lan (1):
clk: meson: axg: fix the od shift of the sys_pll
[email protected] (2):
vmxnet3: set the DMA mask before the first DMA map operation
vmxnet3: use DMA memory barriers where required
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 16 -SUBLEVEL = 11 +SUBLEVEL = 12 EXTRAVERSION = NAME = Fearless Coyote
arch/powerpc/include/asm/exception-64s.h +29 -0
@@ -74,6 +74,27 @@*/ #define EX_R3 EX_DAR +#define STF_ENTRY_BARRIER_SLOT \ + STF_ENTRY_BARRIER_FIXUP_SECTION; \ + nop; \ + nop; \ + nop + +#define STF_EXIT_BARRIER_SLOT \ + STF_EXIT_BARRIER_FIXUP_SECTION; \ + nop; \ + nop; \ + nop; \ + nop; \ + nop; \ + nop + +/* +* r10 must be free to use, r13 must be paca +*/ +#define INTERRUPT_TO_KERNEL \ + STF_ENTRY_BARRIER_SLOT +/* * Macros for annotating the expected destination of (h)rfid *
@@ -90,16 +111,19 @@ rfid#define RFI_TO_USER \ + STF_EXIT_BARRIER_SLOT; \ RFI_FLUSH_SLOT; \ rfid; \ b rfi_flush_fallback#define RFI_TO_USER_OR_KERNEL \ + STF_EXIT_BARRIER_SLOT; \ RFI_FLUSH_SLOT; \ rfid; \ b rfi_flush_fallback#define RFI_TO_GUEST \ + STF_EXIT_BARRIER_SLOT; \ RFI_FLUSH_SLOT; \ rfid; \ b rfi_flush_fallback
@@ -108,21 +132,25 @@ hrfid#define HRFI_TO_USER \ + STF_EXIT_BARRIER_SLOT; \ RFI_FLUSH_SLOT; \ hrfid; \ b hrfi_flush_fallback#define HRFI_TO_USER_OR_KERNEL \ + STF_EXIT_BARRIER_SLOT; \ RFI_FLUSH_SLOT; \ hrfid; \ b hrfi_flush_fallback#define HRFI_TO_GUEST \ + STF_EXIT_BARRIER_SLOT; \ RFI_FLUSH_SLOT; \ hrfid; \ b hrfi_flush_fallback#define HRFI_TO_UNKNOWN \ + STF_EXIT_BARRIER_SLOT; \ RFI_FLUSH_SLOT; \ hrfid; \ b hrfi_flush_fallback
@@ -254,6 +282,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)#define __EXCEPTION_PROLOG_1_PRE (area) \ OPT_SAVE_REG_TO_PACA(area+EX_PPR, r9, CPU_FTR_HAS_PPR); \ OPT_SAVE_REG_TO_PACA(area+EX_CFAR, r10, CPU_FTR_CFAR); \ + INTERRUPT_TO_KERNEL; \ SAVE_CTR(r10, area); \ mfcr r9;
arch/powerpc/include/asm/feature-fixups.h +19 -0
@@ -187,6 +187,22 @@ label##3: \ FTR_ENTRY_OFFSET label##1b-label##3b; \ .popsection; +#define STF_ENTRY_BARRIER_FIXUP_SECTION \ +953: \ + .pushsection __stf_entry_barrier_fixup,"a"; \ + .align 2; \ +954: \ + FTR_ENTRY_OFFSET 953b-954b; \ + .popsection; + +#define STF_EXIT_BARRIER_FIXUP_SECTION \ +955: \ + .pushsection __stf_exit_barrier_fixup,"a"; \ + .align 2; \ +956: \ + FTR_ENTRY_OFFSET 955b-956b; \ + .popsection; +#define RFI_FLUSH_FIXUP_SECTION \ 951: \ .pushsection __rfi_flush_fixup,"a"; \
@@ -199,6 +215,9 @@ label##3: \#ifndef __ASSEMBLY__#include <linux/types.h> +extern long stf_barrier_fallback; +extern long __start___stf_entry_barrier_fixup, __stop___stf_entry_barrier_fixup; +extern long __start___stf_exit_barrier_fixup, __stop___stf_exit_barrier_fixup;extern long __start___rfi_flush_fixup, __stop___rfi_flush_fixup;void apply_feature_fixups (void );
arch/powerpc/include/asm/hvcall.h +3 -0
@@ -337,6 +337,9 @@#define H_CPU_CHAR_L1D_FLUSH_ORI30 (1ull << 61) // IBM bit 2#define H_CPU_CHAR_L1D_FLUSH_TRIG2 (1ull << 60) // IBM bit 3#define H_CPU_CHAR_L1D_THREAD_PRIV (1ull << 59) // IBM bit 4 +#define H_CPU_CHAR_BRANCH_HINTS_HONORED (1ull << 58) // IBM bit 5 +#define H_CPU_CHAR_THREAD_RECONFIG_CTRL (1ull << 57) // IBM bit 6 +#define H_CPU_CHAR_COUNT_CACHE_DISABLED (1ull << 56) // IBM bit 7#define H_CPU_BEHAV_FAVOUR_SECURITY (1ull << 63) // IBM bit 0#define H_CPU_BEHAV_L1D_FLUSH_PR (1ull << 62) // IBM bit 1
arch/powerpc/include/asm/security_features.h new file +85 -0
85 lines not on this page · raw message
arch/powerpc/kernel/Makefile +1 -1
@@ -42,7 +42,7 @@ obj-$(CONFIG_VDSO32) += vdso32/ obj-$(CONFIG_PPC_WATCHDOG) += watchdog.o obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o obj-$(CONFIG_PPC_BOOK3S_64) += cpu_setup_ppc970.o cpu_setup_pa6t.o -obj-$(CONFIG_PPC_BOOK3S_64) += cpu_setup_power.o +obj-$(CONFIG_PPC_BOOK3S_64) += cpu_setup_power.o security.o obj-$(CONFIG_PPC_BOOK3S_64) += mce.o mce_power.o obj-$(CONFIG_PPC_BOOK3E_64) += exceptions-64e.o idle_book3e.o obj-$(CONFIG_PPC64) += vdso64/
arch/powerpc/kernel/exceptions-64s.S +17 -2
@@ -833,7 +833,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_TM) #endif -EXC_REAL_MASKABLE(decrementer, 0x900, 0x80, IRQS_DISABLED) +EXC_REAL_OOL_MASKABLE(decrementer, 0x900, 0x80, IRQS_DISABLED) EXC_VIRT_MASKABLE(decrementer, 0x4900, 0x80, 0x900, IRQS_DISABLED) TRAMP_KVM(PACA_EXGEN, 0x900) EXC_COMMON_ASYNC(decrementer_common, 0x900, timer_interrupt)
@@ -909,6 +909,7 @@ EXC_COMMON(trap_0b_common, 0xb00, unknown_exception) mtctr r13; \ GET_PACA(r13); \ std r10,PACA_EXGEN+EX_R10(r13); \ + INTERRUPT_TO_KERNEL; \ KVMTEST_PR(0xc00); /* uses r10, branch to do_kvm_0xc00_system_call */ \ HMT_MEDIUM; \ mfctr r9;
@@ -917,7 +918,8 @@ EXC_COMMON(trap_0b_common, 0xb00, unknown_exception) #define SYSCALL_KVMTEST \ HMT_MEDIUM; \ mr r9,r13; \ - GET_PACA(r13); + GET_PACA(r13); \ + INTERRUPT_TO_KERNEL; #endif #define LOAD_SYSCALL_HANDLER(reg) \
@@ -1455,6 +1457,19 @@ masked_##_H##interrupt: \ b .; \ MASKED_DEC_HANDLER(_H) +TRAMP_REAL_BEGIN(stf_barrier_fallback) + std r9,PACA_EXRFI+EX_R9(r13) + std r10,PACA_EXRFI+EX_R10(r13) + sync + ld r9,PACA_EXRFI+EX_R9(r13) + ld r10,PACA_EXRFI+EX_R10(r13) + ori 31,31,0 + .rept 14 + b 1f +1: + .endr + blr + TRAMP_REAL_BEGIN(rfi_flush_fallback) SET_SCRATCH0(r13); GET_PACA(r13);
arch/powerpc/kernel/security.c new file +237 -0
237 lines not on this page · raw message
arch/powerpc/kernel/setup_64.c +0 -8
@@ -927,12 +927,4 @@ static __init int rfi_flush_debugfs_init(void) }device_initcall (rfi_flush_debugfs_init);#endif - -ssize_t cpu_show_meltdown (struct device *dev,struct device_attribute *attr,char *buf) -{ -if (rfi_flush) -return sprintf (buf,"Mitigation: RFI Flush\n" ); - -return sprintf (buf,"Vulnerable\n" ); -}#endif /* CONFIG_PPC_BOOK3S_64 */
arch/powerpc/kernel/vmlinux.lds.S +14 -0
@@ -133,6 +133,20 @@ SECTIONS RO_DATA(PAGE_SIZE) #ifdef CONFIG_PPC64 + . = ALIGN(8); + __stf_entry_barrier_fixup : AT(ADDR(__stf_entry_barrier_fixup) - LOAD_OFFSET) { + __start___stf_entry_barrier_fixup = .; + *(__stf_entry_barrier_fixup) + __stop___stf_entry_barrier_fixup = .; + } + + . = ALIGN(8); + __stf_exit_barrier_fixup : AT(ADDR(__stf_exit_barrier_fixup) - LOAD_OFFSET) { + __start___stf_exit_barrier_fixup = .; + *(__stf_exit_barrier_fixup) + __stop___stf_exit_barrier_fixup = .; + } + . = ALIGN(8); __rfi_flush_fixup : AT(ADDR(__rfi_flush_fixup) - LOAD_OFFSET) { __start___rfi_flush_fixup = .;
arch/powerpc/lib/feature-fixups.c +115 -0
127 lines not on this page · raw message
arch/powerpc/platforms/powernv/setup.c +66 -30
129 lines not on this page · raw message
arch/powerpc/platforms/pseries/setup.c +52 -19
99 lines not on this page · raw message
arch/s390/Kconfig +2 -1
@@ -120,6 +120,7 @@ config S390 select GENERIC_CLOCKEVENTS select GENERIC_CPU_AUTOPROBE select GENERIC_CPU_DEVICES if !SMP + select GENERIC_CPU_VULNERABILITIES select GENERIC_FIND_FIRST_BIT select GENERIC_SMP_IDLE_THREAD select GENERIC_TIME_VSYSCALL
@@ -576,7 +577,7 @@ choice config EXPOLINE_OFF bool "spectre_v2=off" -config EXPOLINE_MEDIUM +config EXPOLINE_AUTO bool "spectre_v2=auto" config EXPOLINE_FULL
arch/s390/Makefile +1 -1
@@ -84,7 +84,7 @@ ifdef CONFIG_EXPOLINE CC_FLAGS_EXPOLINE += -mfunction-return=thunk CC_FLAGS_EXPOLINE += -mindirect-branch-table export CC_FLAGS_EXPOLINE - cflags-y += $(CC_FLAGS_EXPOLINE) + cflags-y += $(CC_FLAGS_EXPOLINE) -DCC_USING_EXPOLINE endif endif
arch/s390/crypto/crc32be-vx.S +4 -1
@@ -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
@@ -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-branch.h +3 -4
@@ -6,12 +6,11 @@#include <linux/types.h> -extern int nospec_call_disable; -extern int nospec_return_disable; +extern int nospec_disable;void nospec_init_branches (void ); -void nospec_call_revert (s32 *start,s32 *end); -void nospec_return_revert (s32 *start,s32 *end); +void nospec_auto_detect (void ); +void nospec_revert (s32 *start,s32 *end);#endif /* __ASSEMBLY__ */
arch/s390/include/asm/nospec-insn.h new file +196 -0
196 lines not on this page · raw message
arch/s390/kernel/Makefile +3 -2
@@ -61,11 +61,12 @@ obj-y += debug.o irq.o ipl.o dis.o diag.o vdso.o als.o obj-y += sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o pgm_check.o obj-y += runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sthyi.o obj-y += entry.o reipl.o relocate_kernel.o kdebugfs.o alternative.o +obj-y += nospec-branch.o extra-y += head.o head64.o vmlinux.lds -obj-$(CONFIG_EXPOLINE) += nospec-branch.o -CFLAGS_REMOVE_expoline.o += $(CC_FLAGS_EXPOLINE) +obj-$(CONFIG_SYSFS) += nospec-sysfs.o +CFLAGS_REMOVE_nospec-branch.o += $(CC_FLAGS_EXPOLINE) obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_SMP) += smp.o
arch/s390/kernel/alternative.c +1 -23
@@ -2,6 +2,7 @@#include <linux/module.h> #include <asm/alternative.h> #include <asm/facility.h> +#include <asm/nospec-branch.h> #define MAX_PATCH_LEN (255 - 1)
@@ -15,29 +16,6 @@ static int __init disable_alternative_instructions(char *str)early_param ("noaltinstr" , disable_alternative_instructions); -static int __init nobp_setup_early (char *str) -{ -bool enabled; -int rc; - - rc =kstrtobool (str, &enabled); -if (rc) -return rc; -if (enabled &&test_facility (82 )) -__set_facility (82 , S390_lowcore.alt_stfle_fac_list); -else -__clear_facility (82 , S390_lowcore.alt_stfle_fac_list); -return 0 ; -} -early_param ("nobp" , nobp_setup_early); - -static int __init nospec_setup_early (char *str) -{ -__clear_facility (82 , S390_lowcore.alt_stfle_fac_list); -return 0 ; -} -early_param ("nospec" , nospec_setup_early); -struct brcl_insn {u16 opc;s32 disp;
arch/s390/kernel/asm-offsets.c +1 -0
@@ -179,6 +179,7 @@ int main(void)OFFSET (__LC_MACHINE_FLAGS, lowcore, machine_flags);OFFSET (__LC_PREEMPT_COUNT, lowcore, preempt_count);OFFSET (__LC_GMAP, lowcore, gmap); +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
@@ -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
@@ -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/module.c +7 -8
@@ -159,7 +159,7 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, me->core_layout.size += me->arch.got_size; me->arch.plt_offset = me->core_layout.size;if (me->arch.plt_size) { -if (IS_ENABLED (CONFIG_EXPOLINE ) && !nospec_call_disable) +if (IS_ENABLED (CONFIG_EXPOLINE ) && !nospec_disable) me->arch.plt_size +=PLT_ENTRY_SIZE ; me->core_layout.size += me->arch.plt_size; }
@@ -318,8 +318,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab, info->plt_offset; ip[0 ] =0x0d10e310 ;/* basr 1,0 */ ip[1 ] =0x100a0004 ;/* lg 1,10(1) */ -if (IS_ENABLED (CONFIG_EXPOLINE ) && - !nospec_call_disable) { +if (IS_ENABLED (CONFIG_EXPOLINE ) && !nospec_disable) {unsigned int *ij; ij = me->core_layout.base + me->arch.plt_offset +
@@ -440,7 +439,7 @@ int module_finalize(const Elf_Ehdr *hdr,void *aseg;if (IS_ENABLED (CONFIG_EXPOLINE ) && - !nospec_call_disable && me->arch.plt_size) { + !nospec_disable && me->arch.plt_size) {unsigned int *ij; ij = me->core_layout.base + me->arch.plt_offset +
@@ -466,12 +465,12 @@ int module_finalize(const Elf_Ehdr *hdr,apply_alternatives (aseg, aseg + s->sh_size);if (IS_ENABLED (CONFIG_EXPOLINE ) && - (!strcmp (".nospec_call_table" , secname))) -nospec_call_revert (aseg, aseg + s->sh_size); + (!strncmp (".s390_indirect" , secname,14 ))) +nospec_revert (aseg, aseg + s->sh_size);if (IS_ENABLED (CONFIG_EXPOLINE ) && - (!strcmp (".nospec_return_table" , secname))) -nospec_return_revert (aseg, aseg + s->sh_size); + (!strncmp (".s390_return" , secname,12 ))) +nospec_revert (aseg, aseg + s->sh_size); }jump_label_apply_nops (me);
arch/s390/kernel/nospec-branch.c +94 -29
172 lines not on this page · raw message
arch/s390/kernel/nospec-sysfs.c new file +21 -0
@@ -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
@@ -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/setup.c +3 -0
@@ -893,6 +893,9 @@ void __init setup_arch(char **cmdline_p) init_mm.end_data = (unsigned long ) &_edata; init_mm.brk = (unsigned long ) &_end; +if (IS_ENABLED (CONFIG_EXPOLINE_AUTO )) +nospec_auto_detect (); +parse_early_param ();#ifdef CONFIG_CRASH_DUMP /* Deactivate elfcorehdr= kernel parameter */
arch/s390/kernel/swsusp.S +6 -4
@@ -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 +11 -8
@@ -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: cghi %r4,1 lgr %r1,%r2
@@ -95,10 +98,10 @@ ENTRY(memset) stc %r3,0(%r1) larl %r5,.Lmemset_mvc ex %r4,0(%r5) - br %r14 + BR_EX %r14 .Lmemset_fill_exit: stc %r3,0(%r1) - br %r14 + BR_EX %r14 .Lmemset_xc: xc 0(1,%r1),0(%r1) .Lmemset_mvc:
@@ -121,7 +124,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)
@@ -159,10 +162,10 @@ ENTRY(__memset\bits) \insn %r3,0(%r1) larl %r5,.L__memset_mvc\bits ex %r4,0(%r5) - br %r14 + BR_EX %r14 .L__memset_exit\bits: \insn %r3,0(%r2) - br %r14 + BR_EX %r14 .L__memset_mvc\bits: mvc \bytes(1,%r1),0(%r1) .endm
arch/s390/net/bpf_jit.S +10 -6
@@ -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
@@ -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
@@ -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
@@ -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 +13 -0
@@ -340,6 +340,7 @@ static const struct usb_device_id blacklist_table[] = {/* Intel Bluetooth devices */ { USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_NEW }, + { USB_DEVICE(0x8087, 0x0026), .driver_info = BTUSB_INTEL_NEW }, { USB_DEVICE(0x8087, 0x07da), .driver_info = BTUSB_CSR }, { USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL }, { USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL },
@@ -367,6 +368,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 },
@@ -374,6 +378,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 },
@@ -2080,6 +2087,8 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)case 0x0c :/* WsP */ case 0x11 :/* JfP */ case 0x12 :/* ThP */ +case 0x13 :/* HrP */ +case 0x14 :/* QnJ, IcP */ break ;default : BT_ERR("%s: Unsupported Intel hardware variant (%u)",
@@ -2172,6 +2181,8 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)break ;case 0x11 :/* JfP */ case 0x12 :/* ThP */ +case 0x13 :/* HrP */ +case 0x14 :/* QnJ, IcP */ snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u-%u.sfi", le16_to_cpu(ver.hw_variant), le16_to_cpu(ver.hw_revision),
@@ -2203,6 +2214,8 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)break ;case 0x11 :/* JfP */ case 0x12 :/* ThP */ +case 0x13 :/* HrP */ +case 0x14 :/* QnJ, IcP */ snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u-%u.ddc", le16_to_cpu(ver.hw_variant), le16_to_cpu(ver.hw_revision),
drivers/clk/clk.c +3 -0
@@ -2375,6 +2375,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
@@ -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/meson/axg.c +6 -1
@@ -129,6 +129,11 @@ static struct meson_clk_pll axg_fixed_pll = { .shift = 16, .width = 2, }, + .frac = { + .reg_off = HHI_MPLL_CNTL2, + .shift = 0, + .width = 12, + }, .lock = &meson_clk_lock, .hw.init = &(struct clk_init_data ){ .name ="fixed_pll" ,
@@ -151,7 +156,7 @@ static struct meson_clk_pll axg_sys_pll = { }, .od = { .reg_off = HHI_SYS_PLL_CNTL, - .shift = 10, + .shift = 16, .width = 2, }, .rate_table = sys_pll_rate_table,
drivers/clk/rockchip/clk-mmc-phase.c +23 -0
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -729,7 +729,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),
@@ -757,12 +757,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
@@ -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
@@ -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
@@ -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
@@ -2155,7 +2155,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
@@ -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 +10 -2
@@ -490,6 +490,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);
@@ -514,8 +523,7 @@ void safexcel_dequeue(struct safexcel_crypto_priv *priv, int ring)if (!priv->ring[ring].busy) { nreq -=safexcel_try_push_requests (priv, ring, nreq); -if (nreq) - priv->ring[ring].busy = true; + priv->ring[ring].busy = true; } priv->ring[ring].requests_left += nreq;
drivers/crypto/inside-secure/safexcel_cipher.c +1 -1
@@ -456,7 +456,7 @@ static int safexcel_cipher_exit_inv(struct crypto_tfm *tfm)queue_work (priv->ring[ring].workqueue, &priv->ring[ring].work_data.work); -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 +22 -16
@@ -21,7 +21,6 @@ struct safexcel_ahash_ctx {struct safexcel_crypto_priv *priv;u32 alg; -u32 digest;u32 ipad[SHA1_DIGEST_SIZE /sizeof (u32)];u32 opad[SHA1_DIGEST_SIZE /sizeof (u32)];
@@ -35,6 +34,8 @@ struct safexcel_ahash_req {int nents; +u32 digest; +u8 state_sz;/* expected sate size, only set once */ u32 state[SHA256_DIGEST_SIZE /sizeof (u32)]__aligned(sizeof(u32)) ;
@@ -49,6 +50,8 @@ struct safexcel_ahash_export_state {u64 len;u64 processed; +u32 digest; +u32 state[SHA256_DIGEST_SIZE /sizeof (u32)];u8 cache[SHA256_BLOCK_SIZE ]; };
@@ -82,9 +85,9 @@ static void safexcel_context_control(struct safexcel_ahash_ctx *ctx, cdesc->control_data.control0 |=CONTEXT_CONTROL_TYPE_HASH_OUT ; cdesc->control_data.control0 |= ctx->alg; - cdesc->control_data.control0 |= ctx->digest; + cdesc->control_data.control0 |= req->digest; -if (ctx->digest ==CONTEXT_CONTROL_DIGEST_PRECOMPUTED ) { +if (req->digest ==CONTEXT_CONTROL_DIGEST_PRECOMPUTED ) {if (req->processed) {if (ctx->alg ==CONTEXT_CONTROL_CRYPTO_ALG_SHA1 ) cdesc->control_data.control0 |=CONTEXT_CONTROL_SIZE (6 );
@@ -112,7 +115,7 @@ static void safexcel_context_control(struct safexcel_ahash_ctx *ctx,if (req->finish) ctx->base.ctxr->data[i] =cpu_to_le32 (req->processed / blocksize); } - }else if (ctx->digest ==CONTEXT_CONTROL_DIGEST_HMAC ) { + }else if (req->digest ==CONTEXT_CONTROL_DIGEST_HMAC ) { cdesc->control_data.control0 |=CONTEXT_CONTROL_SIZE (10 );memcpy (ctx->base.ctxr->data, ctx->ipad, digestsize);
@@ -184,7 +187,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;
@@ -198,7 +201,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),
@@ -493,7 +496,7 @@ static int safexcel_ahash_exit_inv(struct crypto_tfm *tfm)queue_work (priv->ring[ring].workqueue, &priv->ring[ring].work_data.work); -wait_for_completion_interruptible (&result.completion); +wait_for_completion (&result.completion);if (result.error) { dev_warn(priv->dev, "hash: completion error (%d)\n",
@@ -550,7 +553,7 @@ static int safexcel_ahash_enqueue(struct ahash_request *areq)if (ctx->base.ctxr) {if (priv->version ==EIP197 && !ctx->base.needs_inv && req->processed && - ctx->digest ==CONTEXT_CONTROL_DIGEST_PRECOMPUTED ) + req->digest ==CONTEXT_CONTROL_DIGEST_PRECOMPUTED )/* We're still setting needs_inv here, even though it is * cleared right away, because the needs_inv flag can be * set in other functions and we want to keep the same
@@ -585,7 +588,6 @@ static int safexcel_ahash_enqueue(struct ahash_request *areq)static int safexcel_ahash_update (struct ahash_request *areq) { -struct safexcel_ahash_ctx *ctx =crypto_ahash_ctx (crypto_ahash_reqtfm (areq));struct safexcel_ahash_req *req =ahash_request_ctx (areq);struct crypto_ahash *ahash =crypto_ahash_reqtfm (areq);
@@ -601,7 +603,7 @@ static int safexcel_ahash_update(struct ahash_request *areq)* We're not doing partial updates when performing an hmac request. * Everything will be handled by the final() call. */ -if (ctx->digest ==CONTEXT_CONTROL_DIGEST_HMAC ) +if (req->digest ==CONTEXT_CONTROL_DIGEST_HMAC )return 0 ;if (req->hmac)
@@ -660,6 +662,8 @@ static int safexcel_ahash_export(struct ahash_request *areq, void *out) export->len = req->len; export->processed = req->processed; + export->digest = req->digest; +memcpy (export->state, req->state, req->state_sz);memcpy (export->cache, req->cache,crypto_ahash_blocksize (ahash));
@@ -680,6 +684,8 @@ static int safexcel_ahash_import(struct ahash_request *areq, const void *in) req->len = export->len; req->processed = export->processed; + req->digest = export->digest; +memcpy (req->cache, export->cache,crypto_ahash_blocksize (ahash));memcpy (req->state, export->state, req->state_sz);
@@ -716,7 +722,7 @@ static int safexcel_sha1_init(struct ahash_request *areq) req->state[4 ] =SHA1_H4 ; ctx->alg =CONTEXT_CONTROL_CRYPTO_ALG_SHA1 ; - ctx->digest =CONTEXT_CONTROL_DIGEST_PRECOMPUTED ; + req->digest =CONTEXT_CONTROL_DIGEST_PRECOMPUTED ; req->state_sz =SHA1_DIGEST_SIZE ;return 0 ;
@@ -783,10 +789,10 @@ struct safexcel_alg_template safexcel_alg_sha1 = {static int safexcel_hmac_sha1_init (struct ahash_request *areq) { -struct safexcel_ahash_ctx *ctx =crypto_ahash_ctx (crypto_ahash_reqtfm (areq)); +struct safexcel_ahash_req *req =ahash_request_ctx (areq);safexcel_sha1_init (areq); - ctx->digest =CONTEXT_CONTROL_DIGEST_HMAC ; + req->digest =CONTEXT_CONTROL_DIGEST_HMAC ;return 0 ; }
@@ -839,7 +845,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; }
@@ -1024,7 +1030,7 @@ static int safexcel_sha256_init(struct ahash_request *areq) req->state[7 ] =SHA256_H7 ; ctx->alg =CONTEXT_CONTROL_CRYPTO_ALG_SHA256 ; - ctx->digest =CONTEXT_CONTROL_DIGEST_PRECOMPUTED ; + req->digest =CONTEXT_CONTROL_DIGEST_PRECOMPUTED ; req->state_sz =SHA256_DIGEST_SIZE ;return 0 ;
@@ -1086,7 +1092,7 @@ static int safexcel_sha224_init(struct ahash_request *areq) req->state[7 ] =SHA224_H7 ; ctx->alg =CONTEXT_CONTROL_CRYPTO_ALG_SHA224 ; - ctx->digest =CONTEXT_CONTROL_DIGEST_PRECOMPUTED ; + req->digest =CONTEXT_CONTROL_DIGEST_PRECOMPUTED ; req->state_sz =SHA256_DIGEST_SIZE ;return 0 ;
drivers/crypto/sunxi-ss/sun4i-ss-core.c +1 -0
@@ -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/common/videobuf2/videobuf2-vmalloc.c +1 -1
@@ -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/media/dvb-frontends/lgdt3306a.c +8 -2
@@ -1768,7 +1768,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;
@@ -2169,7 +2175,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
@@ -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
@@ -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/pci/cx23885/cx23885-cards.c +4 -0
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1208,6 +1208,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;
@@ -1282,6 +1283,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
@@ -530,6 +530,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
@@ -507,8 +507,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
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/3com/3c59x.c +51 -53
104 lines not on this page · raw message
drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h +9 -19
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c +30 -58
88 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx4/main.c +3 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/qlogic/qed/qed_ll2.c +50 -11
61 lines not on this page · raw message
drivers/net/vmxnet3/vmxnet3_drv.c +47 -25
72 lines not on this page · raw message
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c +9 -7
Lines of this file are not shown. View the raw message.
drivers/staging/lustre/lustre/include/obd.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/lustre/lustre/lmv/lmv_obd.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/lustre/lustre/osc/osc_cache.c +1 -1
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
net/ipv6/ip6_gre.c +222 -59
281 lines not on this page · raw message
net/smc/smc_pnet.c +40 -31
71 lines not on this page · 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.