Linux 5.1.4
Greg KH
maintainerI'm announcing the release of the 5.1.4 kernel.
All users of the 5.1 kernel series must upgrade.
The updated 5.1.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.1.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/devicetree/bindings/mmc/mmc.txt | 2 Documentation/x86/mds.rst | 44 --- Makefile | 4 arch/arm/boot/dts/exynos5260.dtsi | 2 arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 5 arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 2 arch/arm/boot/dts/imx6dl-riotboard.dts | 2 arch/arm/boot/dts/imx6q-ba16.dtsi | 2 arch/arm/boot/dts/imx6q-marsboard.dts | 2 arch/arm/boot/dts/imx6q-tbs2910.dts | 2 arch/arm/boot/dts/imx6qdl-apf6.dtsi | 2 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 arch/arm/boot/dts/imx6qdl-sr-som.dtsi | 2 arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 2 arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 arch/arm/boot/dts/imx6sx-sdb.dtsi | 2 arch/arm/boot/dts/imx7d-pico.dtsi | 2 arch/arm/boot/dts/qcom-ipq4019.dtsi | 4 arch/arm/crypto/aes-neonbs-glue.c | 2 arch/arm/mach-exynos/firmware.c | 1 arch/arm/mach-exynos/suspend.c | 2 arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 2 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 1 arch/arm64/crypto/aes-neonbs-glue.c | 2 arch/arm64/crypto/ghash-ce-glue.c | 10 arch/arm64/include/asm/arch_timer.h | 33 ++ arch/arm64/include/asm/processor.h | 8 arch/arm64/kernel/debug-monitors.c | 1 arch/arm64/kernel/sys.c | 2 arch/arm64/kernel/vdso/gettimeofday.S | 15 - arch/arm64/mm/proc.S | 34 +- arch/arm64/net/bpf_jit.h | 6 arch/arm64/net/bpf_jit_comp.c | 1 arch/powerpc/mm/hash_low_32.S | 3 arch/s390/Kconfig | 1 arch/s390/include/asm/pgtable.h | 79 +++-- arch/s390/mm/Makefile | 2 arch/s390/mm/gup.c | 300 --------------------- arch/x86/crypto/crct10dif-pclmul_glue.c | 13 arch/x86/entry/entry_32.S | 2 arch/x86/entry/entry_64.S | 2 arch/x86/include/asm/switch_to.h | 1 arch/x86/kernel/cpu/mce/amd.c | 52 ++- arch/x86/kernel/cpu/mce/core.c | 8 arch/x86/kernel/cpu/mce/genpool.c | 3 arch/x86/kernel/cpu/mce/internal.h | 9 arch/x86/kernel/process_32.c | 7 arch/x86/kernel/process_64.c | 8 arch/x86/kernel/traps.c | 8 arch/x86/kvm/lapic.c | 2 arch/x86/kvm/vmx/vmx.c | 25 - arch/x86/kvm/x86.c | 37 +- arch/x86/platform/pvh/enlighten.c | 8 arch/x86/xen/efi.c | 12 arch/x86/xen/enlighten_pv.c | 2 arch/x86/xen/enlighten_pvh.c | 7 arch/x86/xen/xen-ops.h | 4 crypto/ccm.c | 44 +-- crypto/chacha20poly1305.c | 4 crypto/chacha_generic.c | 2 crypto/crct10dif_generic.c | 11 crypto/gcm.c | 34 -- crypto/lrw.c | 4 crypto/salsa20_generic.c | 2 crypto/skcipher.c | 9 drivers/acpi/sleep.c | 4 drivers/char/ipmi/ipmi_dmi.c | 2 drivers/char/ipmi/ipmi_plat_data.c | 27 + drivers/char/ipmi/ipmi_plat_data.h | 3 drivers/char/ipmi/ipmi_si_hardcode.c | 1 drivers/char/ipmi/ipmi_si_hotmod.c | 1 drivers/char/ipmi/ipmi_ssif.c | 6 drivers/crypto/amcc/crypto4xx_alg.c | 12 drivers/crypto/amcc/crypto4xx_core.c | 31 +- drivers/crypto/caam/caamalg_qi2.c | 177 +++++------- drivers/crypto/caam/caamalg_qi2.h | 2 drivers/crypto/ccp/psp-dev.c | 2 drivers/crypto/ccree/cc_aead.c | 11 drivers/crypto/ccree/cc_buffer_mgr.c | 113 ++----- drivers/crypto/ccree/cc_driver.h | 1 drivers/crypto/ccree/cc_fips.c | 23 + drivers/crypto/ccree/cc_fips.h | 2 drivers/crypto/ccree/cc_hash.c | 28 + drivers/crypto/ccree/cc_ivgen.c | 9 drivers/crypto/ccree/cc_pm.c | 9 drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c | 25 + drivers/crypto/vmx/aesp8-ppc.pl | 4 drivers/dax/Kconfig | 3 drivers/dax/device.c | 6 drivers/edac/mce_amd.c | 4 drivers/md/bcache/journal.c | 11 drivers/md/bcache/super.c | 2 drivers/mmc/core/queue.c | 1 drivers/mmc/host/Kconfig | 1 drivers/mmc/host/sdhci-of-arasan.c | 5 drivers/mmc/host/sdhci-pci-core.c | 96 ++++++ drivers/mmc/host/sdhci-tegra.c | 1 drivers/mtd/maps/Kconfig | 2 drivers/mtd/maps/physmap-core.c | 2 drivers/mtd/spi-nor/intel-spi.c | 8 drivers/nvdimm/label.c | 29 +- drivers/nvdimm/namespace_devs.c | 15 + drivers/nvdimm/nd.h | 4 drivers/power/supply/axp288_charger.c | 4 drivers/power/supply/axp288_fuel_gauge.c | 20 + drivers/tty/hvc/hvc_riscv_sbi.c | 1 drivers/tty/vt/keyboard.c | 33 +- drivers/tty/vt/vt.c | 2 fs/btrfs/backref.c | 34 +- fs/btrfs/ctree.c | 10 fs/btrfs/ctree.h | 6 fs/btrfs/disk-io.c | 27 + fs/btrfs/disk-io.h | 3 fs/btrfs/extent-tree.c | 25 + fs/btrfs/ioctl.c | 19 + fs/btrfs/send.c | 62 ++++ fs/cifs/cifs_debug.c | 2 fs/dax.c | 6 fs/ext4/extents.c | 17 + fs/ext4/file.c | 7 fs/ext4/ioctl.c | 2 fs/ext4/mballoc.c | 2 fs/ext4/namei.c | 5 fs/ext4/resize.c | 1 fs/ext4/super.c | 62 ++-- fs/ext4/xattr.c | 2 fs/fs-writeback.c | 11 fs/hugetlbfs/inode.c | 7 fs/jbd2/journal.c | 53 ++- fs/jbd2/revoke.c | 32 +- fs/jbd2/transaction.c | 8 fs/ocfs2/export.c | 30 ++ include/acpi/platform/aclinux.h | 10 include/linux/huge_mm.h | 6 include/linux/hugetlb.h | 4 include/linux/jbd2.h | 8 include/linux/mfd/da9063/registers.h | 6 include/linux/mfd/max77620.h | 4 kernel/bpf/core.c | 4 kernel/fork.c | 31 ++ kernel/locking/rwsem-xadd.c | 44 ++- mm/compaction.c | 4 mm/huge_memory.c | 16 - mm/hugetlb.c | 25 - mm/mincore.c | 23 + mm/userfaultfd.c | 3 sound/pci/hda/patch_hdmi.c | 11 sound/pci/hda/patch_realtek.c | 68 ++-- sound/soc/codecs/hdac_hdmi.c | 11 sound/soc/codecs/max98090.c | 12 sound/soc/codecs/rt5677-spi.c | 35 +- sound/soc/fsl/fsl_esai.c | 2 sound/usb/line6/toneport.c | 16 - sound/usb/mixer.c | 2 tools/objtool/check.c | 3 virt/kvm/kvm_main.c | 2 157 files changed, 1360 insertions(+), 1078 deletions(-)
Adrian Hunter (1):
mmc: sdhci-pci: Fix BYT OCP setting
Alexander Sverdlin (1):
mtd: spi-nor: intel-spi: Avoid crossing 4K address boundary on read/write
Andrea Arcangeli (1):
userfaultfd: use RCU to free the task struct when fork fails
Andy Lutomirski (2):
x86/speculation/mds: Revert CPU buffer clear on double fault exit x86/speculation/mds: Improve CPU buffer clear documentation
Aneesh Kumar K.V (1):
drivers/dax: Allow to include DEV_DAX_PMEM as builtin
Anup Patel (1):
tty: Don't force RISCV SBI console as preferred console
Barret Rhoden (1):
ext4: fix use-after-free race with debug_want_extra_isize
Boyang Zhou (1):
arm64: mmap: Ensure file offset is treated as unsigned
Chengguang Xu (1):
jbd2: fix potential double free
Chris Packham (2):
mtd: maps: physmap: Store gpio_values correctly
mtd: maps: Allow MTD_PHYSMAP with MTD_RAM
Christian Lamparter (3):
ARM: dts: qcom: ipq4019: enlarge PCIe BAR range
crypto: crypto4xx - fix ctr-aes missing output IV
crypto: crypto4xx - fix cfb and ofb "overran dst buffer" issues
Christoph Muellner (3):
arm64: dts: rockchip: Disable DCMDs on RK3399's eMMC controller.
mmc: sdhci-of-arasan: Add DTS property to disable DCMDs.
dt-bindings: mmc: Add disable-cqe-dcmd property.
Christophe Leroy (1):
powerpc/32s: fix flush_hash_pages() on SMP
Coly Li (1):
bcache: never set KEY_PTRS of journal key to 0 in journal_reclaim()
Corey Minyard (1):
ipmi: Add the i2c-addr property for SSIF interfaces
Curtis Malainey (1):
ASoC: RT5677-SPI: Disable 16Bit SPI Transfers
Dan Williams (2):
mm/huge_memory: fix vmf_insert_pfn_{pmd, pud}() crash, handle unaligned addresses libnvdimm/namespace: Fix label tracking error
Daniel Axtens (1):
crypto: vmx - fix copy-paste error in CTR mode
Daniel Borkmann (2):
bpf, arm64: remove prefetch insn in xadd mapping
bpf: fix out of bounds backwards jmps due to dead code removal
Debabrata Banerjee (1):
ext4: fix ext4_show_options for file systems w/o journal
Dmitry Osipenko (1):
mfd: max77620: Fix swapped FPS_PERIOD_MAX_US values
Eric Biggers (12):
crypto: salsa20 - don't access already-freed walk.iv
crypto: lrw - don't access already-freed walk.iv
crypto: chacha-generic - fix use as arm64 no-NEON fallback
crypto: chacha20poly1305 - set cra_name correctly
crypto: ccm - fix incompatibility between "ccm" and "ccm_base"
crypto: skcipher - don't WARN on unprocessed data after slow walk step
crypto: crct10dif-generic - fix use via crypto_shash_digest()
crypto: x86/crct10dif-pcl - fix use via crypto_shash_digest()
crypto: arm64/gcm-aes-ce - fix no-NEON fallback code
crypto: gcm - fix incompatibility between "gcm" and "gcm_base"
crypto: arm/aes-neonbs - don't access already-freed walk.iv
crypto: arm64/aes-neonbs - don't access already-freed walk.iv
Erik Schmauss (1):
ACPICA: Linux: move ACPI_DEBUG_DEFAULT flag out of ifndef
Fabio Estevam (1):
ARM: dts: imx: Fix the AR803X phy-mode
Filipe Manana (4):
Btrfs: send, flush dellaloc in order to avoid data loss
Btrfs: do not start a transaction during fiemap
Btrfs: do not start a transaction at iterate_extent_inodes()
Btrfs: fix race between send and deduplication that lead to failures and crashes
Gilad Ben-Yossef (5):
crypto: ccree - remove special handling of chained sg
crypto: ccree - fix mem leak on error path
crypto: ccree - don't map MAC key on stack
crypto: ccree - use correct internal state sizes for export
crypto: ccree - don't map AEAD key and IV on stack
Greg Kroah-Hartman (1):
Linux 5.1.4
Gustavo A. R. Silva (1):
power: supply: axp288_charger: Fix unchecked return value
Hans de Goede (1):
power: supply: axp288_fuel_gauge: Add ACEPC T8 and T11 mini PCs to the blacklist
Horia Geantă (3):
crypto: caam/qi2 - fix zero-length buffer DMA mapping
crypto: caam/qi2 - fix DMA mapping of stack memory
crypto: caam/qi2 - generate hash keys in-place
Hui Wang (2):
ALSA: hda/hdmi - Read the pin sense from register when repolling
ALSA: hda/hdmi - Consider eld_valid when reporting jack event
Jan Kara (2):
ext4: make sanity check in mballoc more strict
ext4: avoid panic during forced reboot due to aborted journal
Jean-Philippe Brucker (2):
arm64: Clear OSDLR_EL1 on CPU boot
arm64: Save and restore OSDLR_EL1 across suspend/resume
Jeremy Soller (2):
ALSA: hdea/realtek - Headset fixup for System76 Gazelle (gaze14)
ALSA: hda/realtek - Corrected fixup for System76 Gazelle (gaze14)
Jiri Kosina (1):
mm/mincore.c: make mincore() more conservative
Jiufei Xue (2):
jbd2: check superblock mapped prior to committing
fs/writeback.c: use rcu_barrier() to wait for inflight wb switches going into workqueue when umount
Jon Hunter (1):
ASoC: max98090: Fix restore of DAPM Muxes
Josh Poimboeuf (1):
objtool: Fix function fallthrough detection
Kai Shen (1):
mm/hugetlb.c: don't put_page in lock of hugetlb_lock
Kailang Yang (2):
ALSA: hda/realtek - EAPD turn on later
ALSA: hda/realtek - Fixup headphone noise via runtime suspend
Kamlakant Patel (1):
ipmi:ssif: compare block number correctly for multi-part return messages
Katsuhiro Suzuki (1):
arm64: dts: rockchip: fix IO domain voltage setting of APIO5 on rockpro64
Kirill Tkhai (1):
ext4: actually request zeroing of inode table after grow
Liang Chen (1):
bcache: fix a race between cache register and cacheset unregister
Libin Yang (1):
ASoC: codec: hdac_hdmi add device_link to card device
Lukas Czerner (1):
ext4: fix data corruption caused by overlapping unaligned and aligned IO
Martin Schwidefsky (2):
s390/mm: make the pxd_offset functions more robust s390/mm: convert to the generic get_user_pages_fast code
Masahiro Yamada (1):
kbuild: turn auto.conf.cmd into a mandatory include file
Mel Gorman (1):
mm/compaction.c: correct zone boundary handling when isolating pages from a pageblock
Michał Wadowski (1):
ALSA: hda/realtek - Fix for Lenovo B50-70 inverted internal microphone bug
Mike Kravetz (1):
hugetlb: use same fault hash key for shared and private mappings
Nikolay Borisov (2):
btrfs: Correctly free extent buffer in case btree_read_extent_buffer_pages fails
btrfs: Honour FITRIM range constraints during free space trim
Ofir Drang (4):
crypto: ccree - pm resume first enable the source clk
crypto: ccree - HOST_POWER_DOWN_EN should be the last CC access during suspend
crypto: ccree - add function to handle cryptocell tee fips error
crypto: ccree - handle tee fips error during power management resume
Pan Bian (1):
ext4: avoid drop reference to iloc.bh twice
Peter Xu (1):
KVM: Fix the bitmap range to copy during clear dirty
Peter Zijlstra (1):
sched/x86: Save [ER]FLAGS on context switch
Qu Wenruo (1):
btrfs: Check the first key and level for cached extent buffer
Rajat Jain (1):
ACPI: PM: Set enable_for_wake for wakeup GPEs during suspend-to-idle
Raul E Rangel (1):
mmc: core: Fix tag set memory leak
Roger Pau Monne (2):
xen/pvh: set xen_domain_type to HVM in xen_pvh_init xen/pvh: correctly setup the PV EFI interface for dom0
S.j. Wang (1):
ASoC: fsl_esai: Fix missing break in switch statement
Sahitya Tummala (1):
ext4: fix use-after-free in dx_release()
Sean Christopherson (3):
Revert "KVM: nVMX: Expose RDPMC-exiting only when guest supports PMU"
KVM: x86: Skip EFER vs. guest CPUID checks for host-initiated writes
KVM: lapic: Busy wait for timer to expire when using hv_timer
Sergei Trofimovich (1):
tty/vt: fix write/write race in ioctl(KDSKBSENT) handler
Shuning Zhang (1):
ocfs2: fix ocfs2 read inode data panic in ocfs2_iget
Singh, Brijesh (1):
crypto: ccp - Do not free psp_master when PLATFORM_INIT fails
Sowjanya Komatineni (1):
mmc: tegra: fix ddr signaling for non-ddr modes
Sriram Rajagopalan (1):
ext4: zero out the unused memory region in the extent tree block
Steve French (1):
smb3: display session id in debug data
Steve Twiss (1):
mfd: da9063: Fix OTP control register names to match datasheets for DA9063/63L
Stuart Menefy (1):
ARM: dts: exynos: Fix interrupt for shared EINTs on Exynos5260
Sylwester Nawrocki (2):
ARM: dts: exynos: Fix audio routing on Odroid XU3
ARM: dts: exynos: Fix audio (microphone) routing on Odroid XU3
Takashi Iwai (1):
ALSA: line6: toneport: Fix broken usage of timer for delayed execution
Theodore Ts'o (1):
ext4: ignore e_value_offs for xattrs with value-in-ea-inode
Vincenzo Frascino (1):
arm64: compat: Reduce address limit
Waiman Long (1):
locking/rwsem: Prevent decrement of reader count before increment
Wen Yang (1):
ARM: exynos: Fix a leaked reference by adding missing of_node_put
Wenwen Wang (1):
ALSA: usb-audio: Fix a memory leak bug
Will Deacon (1):
arm64: arch_timer: Ensure counter register reads occur with seqlock held
Yazen Ghannam (2):
x86/MCE: Add an MCE-record filtering function x86/MCE/AMD: Don't report L1 BTB MCA errors on some family 17h models
Yifeng Li (1):
tty: vt.c: Fix TIOCL_BLANKSCREEN console blanking if blankinterval == 0
Zhang Zhijie (1):
crypto: rockchip - update IV buffer to contain the next IV
Greg KH
maintainerDocumentation/devicetree/bindings/mmc/mmc.txt +2 -0
@@ -64,6 +64,8 @@ Optional properties: whether pwrseq-simple is used. Default to 10ms if no available. - supports-cqe : The presence of this property indicates that the corresponding MMC host controller supports HW command queue feature. +- disable-cqe-dcmd: This property indicates that the MMC controller's command + queue engine (CQE) does not support direct commands (DCMDs). *NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line polarity properties, we have to fix the meaning of the "normal" and "inverted"
Documentation/x86/mds.rst +6 -38
51 lines not on this page · raw message
Makefile +2 -2
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 1 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = NAME = Shy Crocodile
@@ -636,7 +636,7 @@ ifeq ($(may-sync-config),1) # Read in dependencies to all Kconfig* files, make sure to run syncconfig if # changes are detected. This should be included after arch/$(SRCARCH)/Makefile # because some architectures define CROSS_COMPILE there. --include include/config/auto.conf.cmd +include include/config/auto.conf.cmd $(KCONFIG_CONFIG): @echo >&2 '***'
arch/arm/boot/dts/exynos5260.dtsi +1 -1
@@ -223,7 +223,7 @@ wakeup-interrupt-controller { compatible = "samsung,exynos4210-wakeup-eint"; interrupt-parent = <&gic>; - interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>; }; };
arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi +3 -2
@@ -22,11 +22,12 @@ "Headphone Jack", "HPL", "Headphone Jack", "HPR", "Headphone Jack", "MICBIAS", - "IN1", "Headphone Jack", + "IN12", "Headphone Jack", "Speakers", "SPKL", "Speakers", "SPKR", "I2S Playback", "Mixer DAI TX", - "HiFi Playback", "Mixer DAI TX"; + "HiFi Playback", "Mixer DAI TX", + "Mixer DAI RX", "HiFi Capture"; assigned-clocks = <&clock CLK_MOUT_EPLL>, <&clock CLK_MOUT_MAU_EPLL>,
arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi +1 -1
@@ -216,7 +216,7 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-reset-duration = <10>; phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>; phy-supply = <®_enet>;
arch/arm/boot/dts/imx6dl-riotboard.dts +1 -1
@@ -92,7 +92,7 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-reset-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
arch/arm/boot/dts/imx6q-ba16.dtsi +1 -1
@@ -171,7 +171,7 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; status = "okay"; };
arch/arm/boot/dts/imx6q-marsboard.dts +1 -1
@@ -110,7 +110,7 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-reset-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>; status = "okay"; };
arch/arm/boot/dts/imx6q-tbs2910.dts +1 -1
@@ -98,7 +98,7 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>; status = "okay"; };
arch/arm/boot/dts/imx6qdl-apf6.dtsi +1 -1
@@ -51,7 +51,7 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-reset-duration = <10>; phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>; status = "okay";
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +1 -1
@@ -292,7 +292,7 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; fsl,err006687-workaround-present;
arch/arm/boot/dts/imx6qdl-sabresd.dtsi +1 -1
@@ -202,7 +202,7 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>; status = "okay"; };
arch/arm/boot/dts/imx6qdl-sr-som.dtsi +1 -1
@@ -53,7 +53,7 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_microsom_enet_ar8035>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-reset-duration = <2>; phy-reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; status = "okay";
arch/arm/boot/dts/imx6qdl-wandboard.dtsi +1 -1
@@ -224,7 +224,7 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-reset-gpios = <&gpio3 29 GPIO_ACTIVE_LOW>; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
arch/arm/boot/dts/imx6sx-sabreauto.dts +1 -1
@@ -75,7 +75,7 @@ &fec1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet1>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-handle = <ðphy1>; fsl,magic-packet; status = "okay";
arch/arm/boot/dts/imx6sx-sdb.dtsi +1 -1
@@ -191,7 +191,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet1>; phy-supply = <®_enet_3v3>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-handle = <ðphy1>; phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>; status = "okay";
arch/arm/boot/dts/imx7d-pico.dtsi +1 -1
@@ -92,7 +92,7 @@ <&clks IMX7D_ENET1_TIME_ROOT_CLK>; assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>; assigned-clock-rates = <0>, <100000000>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-handle = <ðphy0>; fsl,magic-packet; phy-reset-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;
arch/arm/boot/dts/qcom-ipq4019.dtsi +2 -2
@@ -400,8 +400,8 @@ #address-cells = <3>; #size-cells = <2>; - ranges = <0x81000000 0 0x40200000 0x40200000 0 0x00100000 - 0x82000000 0 0x40300000 0x40300000 0 0x400000>; + ranges = <0x81000000 0 0x40200000 0x40200000 0 0x00100000>, + <0x82000000 0 0x40300000 0x40300000 0 0x00d00000>; interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi";
arch/arm/crypto/aes-neonbs-glue.c +2 -0
@@ -278,6 +278,8 @@ static int __xts_crypt(struct skcipher_request *req,int err; err =skcipher_walk_virt (&walk, req, true); +if (err) +return err;crypto_cipher_encrypt_one (ctx->tweak_tfm, walk.iv, walk.iv);
arch/arm/mach-exynos/firmware.c +1 -0
@@ -196,6 +196,7 @@ bool __init exynos_secure_firmware_available(void)return false; addr =of_get_address (nd,0 ,NULL ,NULL ); +of_node_put (nd);if (!addr) {pr_err ("%s: No address specified.\n" , __func__);return false;
arch/arm/mach-exynos/suspend.c +2 -0
@@ -639,8 +639,10 @@ void __init exynos_pm_init(void)if (WARN_ON (!of_find_property (np,"interrupt-controller" ,NULL ))) {pr_warn ("Outdated DT detected, suspend/resume will NOT work\n" ); +of_node_put (np);return ; } +of_node_put (np); pm_data = (const struct exynos_pm_data *) match->data;
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts +1 -1
@@ -504,7 +504,7 @@ status = "okay"; bt656-supply = <&vcc1v8_dvp>; - audio-supply = <&vcca1v8_codec>; + audio-supply = <&vcc_3v0>; sdmmc-supply = <&vcc_sdio>; gpio1830-supply = <&vcc_3v0>; };
arch/arm64/boot/dts/rockchip/rk3399.dtsi +1 -0
@@ -333,6 +333,7 @@ phys = <&emmc_phy>; phy-names = "phy_arasan"; power-domains = <&power RK3399_PD_EMMC>; + disable-cqe-dcmd; status = "disabled"; };
arch/arm64/crypto/aes-neonbs-glue.c +2 -0
@@ -304,6 +304,8 @@ static int __xts_crypt(struct skcipher_request *req,int err; err =skcipher_walk_virt (&walk, req, false); +if (err) +return err;kernel_neon_begin ();neon_aes_ecb_encrypt (walk.iv, walk.iv, ctx->twkey, ctx->key.rounds,1 );
arch/arm64/crypto/ghash-ce-glue.c +6 -4
@@ -473,9 +473,11 @@ static int gcm_encrypt(struct aead_request *req)put_unaligned_be32 (2 , iv +GCM_IV_SIZE ); while (walk.nbytes >= (2 * AES_BLOCK_SIZE)) { - int blocks = walk.nbytes / AES_BLOCK_SIZE; + const int blocks = + walk.nbytes / (2 * AES_BLOCK_SIZE) * 2; u8 *dst = walk.dst.virt.addr; u8 *src = walk.src.virt.addr; + int remaining = blocks; do { __aes_arm64_encrypt(ctx->aes_key.key_enc,
@@ -485,9 +487,9 @@ static int gcm_encrypt(struct aead_request *req) dst +=AES_BLOCK_SIZE ; src +=AES_BLOCK_SIZE ; - }while (--blocks >0 ); + }while (--remaining >0 ); -ghash_do_update (walk.nbytes /AES_BLOCK_SIZE , dg, +ghash_do_update (blocks, dg, walk.dst.virt.addr, &ctx->ghash_key,NULL , pmull_ghash_update_p64);
@@ -609,7 +611,7 @@ static int gcm_decrypt(struct aead_request *req)put_unaligned_be32 (2 , iv +GCM_IV_SIZE );while (walk.nbytes >= (2 *AES_BLOCK_SIZE )) { -int blocks = walk.nbytes /AES_BLOCK_SIZE ; +int blocks = walk.nbytes / (2 *AES_BLOCK_SIZE ) *2 ;u8 *dst = walk.dst.virt.addr;u8 *src = walk.src.virt.addr;
arch/arm64/include/asm/arch_timer.h +31 -2
@@ -148,18 +148,47 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl)isb (); } +/* +* Ensure that reads of the counter are treated the same as memory reads +* for the purposes of ordering by subsequent memory barriers. +* +* This insanity brought to you by speculative system register reads, +* out-of-order memory accesses, sequence locks and Thomas Gleixner. +* +* http://lists.infradead.org/pipermail/linux-arm-kernel/2019-February/631195.html +*/ +#define arch_counter_enforce_ordering (val) do { \ + u64 tmp, _val = (val); \ + \ + asm volatile( \ + " eor %0, %1, %1\n" \ + " add %0, sp, %0\n" \ + " ldr xzr, [%0]" \ + : "=r" (tmp) : "r" (_val)); \ +} while (0) +static inline u64 arch_counter_get_cntpct (void ) { +u64 cnt; +isb (); -return arch_timer_reg_read_stable (cntpct_el0); + cnt =arch_timer_reg_read_stable (cntpct_el0); +arch_counter_enforce_ordering (cnt); +return cnt; }static inline u64 arch_counter_get_cntvct (void ) { +u64 cnt; +isb (); -return arch_timer_reg_read_stable (cntvct_el0); + cnt =arch_timer_reg_read_stable (cntvct_el0); +arch_counter_enforce_ordering (cnt); +return cnt; } +#undef arch_counter_enforce_ordering +static inline int arch_timer_arch_init (void ) {return 0 ;
arch/arm64/include/asm/processor.h +8 -0
@@ -57,7 +57,15 @@#define TASK_SIZE_64 (UL(1) << vabits_user)#ifdef CONFIG_COMPAT +#ifdef CONFIG_ARM64_64K_PAGES +/* +* With CONFIG_ARM64_64K_PAGES enabled, the last page is occupied +* by the compat vectors page. +*/ #define TASK_SIZE_32 UL(0x100000000) +#else +#define TASK_SIZE_32 (UL(0x100000000) - PAGE_SIZE) +#endif /* CONFIG_ARM64_64K_PAGES */ #define TASK_SIZE (test_thread_flag(TIF_32BIT) ? \ TASK_SIZE_32 : TASK_SIZE_64)#define TASK_SIZE_OF (tsk) (test_tsk_thread_flag(tsk, TIF_32BIT) ? \
arch/arm64/kernel/debug-monitors.c +1 -0
@@ -135,6 +135,7 @@ NOKPROBE_SYMBOL(disable_debug_monitors);*/ static int clear_os_lock (unsigned int cpu) { +write_sysreg (0 , osdlr_el1);write_sysreg (0 , oslar_el1);isb ();return 0 ;
arch/arm64/kernel/sys.c +1 -1
@@ -31,7 +31,7 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len, unsigned long, prot, unsigned long, flags, - unsigned long, fd, off_t, off) + unsigned long, fd, unsigned long, off) {if (offset_in_page (off) !=0 )return -EINVAL ;
arch/arm64/kernel/vdso/gettimeofday.S +11 -4
@@ -73,6 +73,13 @@ x_tmp .req x8 movn x_tmp, #0xff00, lsl #48 and \res, x_tmp, \res mul \res, \res, \mult + /* + * Fake address dependency from the value computed from the counter + * register to subsequent data page accesses so that the sequence + * locking also orders the read of the counter. + */ + and x_tmp, \res, xzr + add vdso_data, vdso_data, x_tmp .endm /*
@@ -147,12 +154,12 @@ ENTRY(__kernel_gettimeofday) /* w11 = cs_mono_mult, w12 = cs_shift */ ldp w11, w12, [vdso_data, #VDSO_CS_MONO_MULT] ldp x13, x14, [vdso_data, #VDSO_XTIME_CLK_SEC] - seqcnt_check fail=1b get_nsec_per_sec res=x9 lsl x9, x9, x12 get_clock_shifted_nsec res=x15, cycle_last=x10, mult=x11 + seqcnt_check fail=1b get_ts_realtime res_sec=x10, res_nsec=x11, \ clock_nsec=x15, xtime_sec=x13, xtime_nsec=x14, nsec_to_sec=x9
@@ -211,13 +218,13 @@ realtime: /* w11 = cs_mono_mult, w12 = cs_shift */ ldp w11, w12, [vdso_data, #VDSO_CS_MONO_MULT] ldp x13, x14, [vdso_data, #VDSO_XTIME_CLK_SEC] - seqcnt_check fail=realtime /* All computations are done with left-shifted nsecs. */ get_nsec_per_sec res=x9 lsl x9, x9, x12 get_clock_shifted_nsec res=x15, cycle_last=x10, mult=x11 + seqcnt_check fail=realtime get_ts_realtime res_sec=x10, res_nsec=x11, \ clock_nsec=x15, xtime_sec=x13, xtime_nsec=x14, nsec_to_sec=x9 clock_gettime_return, shift=1
@@ -231,7 +238,6 @@ monotonic: ldp w11, w12, [vdso_data, #VDSO_CS_MONO_MULT] ldp x13, x14, [vdso_data, #VDSO_XTIME_CLK_SEC] ldp x3, x4, [vdso_data, #VDSO_WTM_CLK_SEC] - seqcnt_check fail=monotonic /* All computations are done with left-shifted nsecs. */ lsl x4, x4, x12
@@ -239,6 +245,7 @@ monotonic: lsl x9, x9, x12 get_clock_shifted_nsec res=x15, cycle_last=x10, mult=x11 + seqcnt_check fail=monotonic get_ts_realtime res_sec=x10, res_nsec=x11, \ clock_nsec=x15, xtime_sec=x13, xtime_nsec=x14, nsec_to_sec=x9
@@ -253,13 +260,13 @@ monotonic_raw: /* w11 = cs_raw_mult, w12 = cs_shift */ ldp w12, w11, [vdso_data, #VDSO_CS_SHIFT] ldp x13, x14, [vdso_data, #VDSO_RAW_TIME_SEC] - seqcnt_check fail=monotonic_raw /* All computations are done with left-shifted nsecs. */ get_nsec_per_sec res=x9 lsl x9, x9, x12 get_clock_shifted_nsec res=x15, cycle_last=x10, mult=x11 + seqcnt_check fail=monotonic_raw get_ts_clock_raw res_sec=x10, res_nsec=x11, \ clock_nsec=x15, nsec_to_sec=x9
arch/arm64/mm/proc.S +18 -16
@@ -65,24 +65,25 @@ ENTRY(cpu_do_suspend) mrs x2, tpidr_el0 mrs x3, tpidrro_el0 mrs x4, contextidr_el1 - mrs x5, cpacr_el1 - mrs x6, tcr_el1 - mrs x7, vbar_el1 - mrs x8, mdscr_el1 - mrs x9, oslsr_el1 - mrs x10, sctlr_el1 + mrs x5, osdlr_el1 + mrs x6, cpacr_el1 + mrs x7, tcr_el1 + mrs x8, vbar_el1 + mrs x9, mdscr_el1 + mrs x10, oslsr_el1 + mrs x11, sctlr_el1 alternative_if_not ARM64_HAS_VIRT_HOST_EXTN - mrs x11, tpidr_el1 + mrs x12, tpidr_el1 alternative_else - mrs x11, tpidr_el2 + mrs x12, tpidr_el2 alternative_endif - mrs x12, sp_el0 + mrs x13, sp_el0 stp x2, x3, [x0] - stp x4, xzr, [x0, #16] - stp x5, x6, [x0, #32] - stp x7, x8, [x0, #48] - stp x9, x10, [x0, #64] - stp x11, x12, [x0, #80] + stp x4, x5, [x0, #16] + stp x6, x7, [x0, #32] + stp x8, x9, [x0, #48] + stp x10, x11, [x0, #64] + stp x12, x13, [x0, #80] ret ENDPROC(cpu_do_suspend)
@@ -105,8 +106,8 @@ ENTRY(cpu_do_resume) msr cpacr_el1, x6 /* Don't change t0sz here, mask those bits when restoring */ - mrs x5, tcr_el1 - bfi x8, x5, TCR_T0SZ_OFFSET, TCR_TxSZ_WIDTH + mrs x7, tcr_el1 + bfi x8, x7, TCR_T0SZ_OFFSET, TCR_TxSZ_WIDTH msr tcr_el1, x8 msr vbar_el1, x9
@@ -130,6 +131,7 @@ alternative_endif /* * Restore oslsr_el1 by writing oslar_el1 */ + msr osdlr_el1, x5 ubfx x11, x11, #1, #1 msr oslar_el1, x11 reset_pmuserenr_el0 x0 // Disable PMU access from EL0
arch/arm64/net/bpf_jit.h +0 -6
@@ -100,12 +100,6 @@#define A64_STXR (sf, Rt, Rn, Rs) \ A64_LSX(sf, Rt, Rn, Rs, STORE_EX) -/* Prefetch */ -#define A64_PRFM (Rn, type, target, policy) \ - aarch64_insn_gen_prefetch(Rn, AARCH64_INSN_PRFM_TYPE_##type, \ - AARCH64_INSN_PRFM_TARGET_##target, \ - AARCH64_INSN_PRFM_POLICY_##policy) -/* Add/subtract (immediate) */ #define A64_ADDSUB_IMM (sf, Rd, Rn, imm12, type) \ aarch64_insn_gen_add_sub_imm(Rd, Rn, imm12, \
arch/arm64/net/bpf_jit_comp.c +0 -1
@@ -762,7 +762,6 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,case BPF_STX |BPF_XADD |BPF_DW :emit_a64_mov_i (1 , tmp, off, ctx);emit (A64_ADD (1 , tmp, tmp, dst), ctx); -emit (A64_PRFM (tmp,PST ,L1 ,STRM ), ctx);emit (A64_LDXR (isdw, tmp2, tmp), ctx);emit (A64_ADD (isdw, tmp2, tmp2, src), ctx);emit (A64_STXR (isdw, tmp2, tmp, tmp3), ctx);
arch/powerpc/mm/hash_low_32.S +2 -1
@@ -539,7 +539,8 @@ _GLOBAL(flush_hash_pages) #ifdef CONFIG_SMP lis r9, (mmu_hash_lock - PAGE_OFFSET)@ha addi r9, r9, (mmu_hash_lock - PAGE_OFFSET)@l - lwz r8,TASK_CPU(r2) + tophys (r8, r2) + lwz r8, TASK_CPU(r8) oris r8,r8,9 10: lwarx r0,0,r9 cmpi 0,r0,0
arch/s390/Kconfig +1 -0
@@ -149,6 +149,7 @@ config S390 select HAVE_FUNCTION_TRACER select HAVE_FUTEX_CMPXCHG if FUTEX select HAVE_GCC_PLUGINS + select HAVE_GENERIC_GUP select HAVE_KERNEL_BZIP2 select HAVE_KERNEL_GZIP select HAVE_KERNEL_LZ4
arch/s390/include/asm/pgtable.h +55 -24
109 lines not on this page · raw message
arch/s390/mm/Makefile +1 -1
@@ -4,7 +4,7 @@ # obj-y := init.o fault.o extmem.o mmap.o vmem.o maccess.o -obj-y += page-states.o gup.o pageattr.o pgtable.o pgalloc.o +obj-y += page-states.o pageattr.o pgtable.o pgalloc.o obj-$(CONFIG_CMM) += cmm.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
arch/s390/mm/gup.c deleted +0 -300
300 lines not on this page · raw message
arch/x86/crypto/crct10dif-pclmul_glue.c +5 -8
@@ -70,15 +70,14 @@ static int chksum_final(struct shash_desc *desc, u8 *out)return 0 ; } -static int __chksum_finup (__u16 *crcp,const u8 *data,unsigned int len, -u8 *out) +static int __chksum_finup (__u16 crc,const u8 *data,unsigned int len,u8 *out) {if (len >=16 &&irq_fpu_usable ()) {kernel_fpu_begin (); - *(__u16 *)out =crc_t10dif_pcl (*crcp, data, len); + *(__u16 *)out =crc_t10dif_pcl (crc, data, len);kernel_fpu_end (); }else - *(__u16 *)out =crc_t10dif_generic (*crcp, data, len); + *(__u16 *)out =crc_t10dif_generic (crc, data, len);return 0 ; }
@@ -87,15 +86,13 @@ static int chksum_finup(struct shash_desc *desc, const u8 *data, {struct chksum_desc_ctx *ctx =shash_desc_ctx (desc); -return __chksum_finup (&ctx->crc, data, len, out); +return __chksum_finup (ctx->crc, data, len, out); }static int chksum_digest (struct shash_desc *desc,const u8 *data,unsigned int length,u8 *out) { -struct chksum_desc_ctx *ctx =shash_desc_ctx (desc); - -return __chksum_finup (&ctx->crc, data, length, out); +return __chksum_finup (0 , data, length, out); }static struct shash_alg alg = {
arch/x86/entry/entry_32.S +2 -0
@@ -650,6 +650,7 @@ ENTRY(__switch_to_asm) pushl %ebx pushl %edi pushl %esi + pushfl /* switch stack */ movl %esp, TASK_threadsp(%eax)
@@ -672,6 +673,7 @@ ENTRY(__switch_to_asm) #endif /* restore callee-saved registers */ + popfl popl %esi popl %edi popl %ebx
arch/x86/entry/entry_64.S +2 -0
@@ -291,6 +291,7 @@ ENTRY(__switch_to_asm) pushq %r13 pushq %r14 pushq %r15 + pushfq /* switch stack */ movq %rsp, TASK_threadsp(%rdi)
@@ -313,6 +314,7 @@ ENTRY(__switch_to_asm) #endif /* restore callee-saved registers */ + popfq popq %r15 popq %r14 popq %r13
arch/x86/include/asm/switch_to.h +1 -0
@@ -40,6 +40,7 @@ asmlinkage void ret_from_fork(void);* order of the fields must match the code in __switch_to_asm(). */ struct inactive_task_frame { +unsigned long flags;#ifdef CONFIG_X86_64 unsigned long r15;unsigned long r14;
arch/x86/kernel/cpu/mce/amd.c +39 -13
84 lines not on this page · raw message
arch/x86/kernel/cpu/mce/core.c +8 -0
@@ -1771,6 +1771,14 @@ static void __mcheck_cpu_init_timer(void)mce_start_timer (t); } +bool filter_mce (struct mce *m) +{ +if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) +return amd_filter_mce (m); + +return false; +} +/* Handle unconfigured int18 (should never happen) */ static void unexpected_machine_check (struct pt_regs *regs,long error_code) {
arch/x86/kernel/cpu/mce/genpool.c +3 -0
@@ -99,6 +99,9 @@ int mce_gen_pool_add(struct mce *mce) {struct mce_evt_llist *node; +if (filter_mce (mce)) +return -EINVAL ; +if (!mce_evt_pool)return -EINVAL ;
arch/x86/kernel/cpu/mce/internal.h +9 -0
@@ -173,4 +173,13 @@ struct mca_msr_regs {extern struct mca_msr_regs msr_ops; +/* Decide whether to add MCE record to MCE event pool or filter it out. */ +extern bool filter_mce (struct mce *m); + +#ifdef CONFIG_X86_MCE_AMD +extern bool amd_filter_mce (struct mce *m); +#else +static inline bool amd_filter_mce (struct mce *m) {return false; }; +#endif +#endif /* __X86_MCE_INTERNAL_H__ */
arch/x86/kernel/process_32.c +7 -0
@@ -127,6 +127,13 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long sp,struct task_struct *tsk;int err; +/* +* For a new task use the RESET flags value since there is no before. +* All the status flags are zero; DF and all the system flags must also +* be 0, specifically IF must be 0 because we context switch to the new +* task with interrupts disabled. +*/ + frame->flags =X86_EFLAGS_FIXED ; frame->bp =0 ; frame->ret_addr = (unsigned long ) ret_from_fork; p->thread.sp = (unsigned long ) fork_frame;
arch/x86/kernel/process_64.c +8 -0
@@ -392,6 +392,14 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long sp, childregs =task_pt_regs (p); fork_frame = container_of(childregs, struct fork_frame, regs); frame = &fork_frame->frame; + +/* +* For a new task use the RESET flags value since there is no before. +* All the status flags are zero; DF and all the system flags must also +* be 0, specifically IF must be 0 because we context switch to the new +* task with interrupts disabled. +*/ + frame->flags =X86_EFLAGS_FIXED ; frame->bp =0 ; frame->ret_addr = (unsigned long ) ret_from_fork; p->thread.sp = (unsigned long ) fork_frame;
arch/x86/kernel/traps.c +0 -8
@@ -58,7 +58,6 @@#include <asm/alternative.h> #include <asm/fpu/xstate.h> #include <asm/trace/mpx.h> -#include <asm/nospec-branch.h> #include <asm/mpx.h> #include <asm/vm86.h> #include <asm/umip.h>
@@ -368,13 +367,6 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code) regs->ip = (unsigned long )general_protection; regs->sp = (unsigned long )&gpregs->orig_ax; -/* -* This situation can be triggered by userspace via -* modify_ldt(2) and the return does not take the regular -* user space exit, so a CPU buffer clear is required when -* MDS mitigation is enabled. -*/ -mds_user_clear_cpu_buffers (); return; }#endif
arch/x86/kvm/lapic.c +1 -1
@@ -1454,7 +1454,7 @@ static void apic_timer_expired(struct kvm_lapic *apic)if (swait_active (q))swake_up_one (q); -if (apic_lvtt_tscdeadline (apic)) +if (apic_lvtt_tscdeadline (apic) || ktimer->hv_timer_in_use) ktimer->expired_tscdeadline = ktimer->tscdeadline; }
arch/x86/kvm/vmx/vmx.c +0 -25
@@ -6856,30 +6856,6 @@ static void nested_vmx_entry_exit_ctls_update(struct kvm_vcpu *vcpu) } } -static bool guest_cpuid_has_pmu (struct kvm_vcpu *vcpu) -{ -struct kvm_cpuid_entry2 *entry; -union cpuid10_eax eax; - - entry =kvm_find_cpuid_entry (vcpu,0xa ,0 ); -if (!entry) -return false; - - eax.full = entry->eax; -return (eax.split.version_id >0 ); -} - -static void nested_vmx_procbased_ctls_update (struct kvm_vcpu *vcpu) -{ -struct vcpu_vmx *vmx =to_vmx (vcpu); -bool pmu_enabled =guest_cpuid_has_pmu (vcpu); - -if (pmu_enabled) - vmx->nested.msrs.procbased_ctls_high |=CPU_BASED_RDPMC_EXITING ; -else - vmx->nested.msrs.procbased_ctls_high &= ~CPU_BASED_RDPMC_EXITING ; -} -static void update_intel_pt_cfg (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu);
@@ -6968,7 +6944,6 @@ static void vmx_cpuid_update(struct kvm_vcpu *vcpu)if (nested_vmx_allowed (vcpu)) {nested_vmx_cr_fixed1_bits_update (vcpu);nested_vmx_entry_exit_ctls_update (vcpu); -nested_vmx_procbased_ctls_update (vcpu); } if (boot_cpu_has(X86_FEATURE_INTEL_PT) &&
arch/x86/kvm/x86.c +24 -13
@@ -1262,31 +1262,42 @@ static int do_get_msr_feature(struct kvm_vcpu *vcpu, unsigned index, u64 *data)return 0 ; } -bool kvm_valid_efer (struct kvm_vcpu *vcpu,u64 efer) +static bool __kvm_valid_efer (struct kvm_vcpu *vcpu,u64 efer) { -if (efer & efer_reserved_bits) -return false; -if (efer &EFER_FFXSR && !guest_cpuid_has (vcpu,X86_FEATURE_FXSR_OPT )) -return false; +return false;if (efer &EFER_SVME && !guest_cpuid_has (vcpu,X86_FEATURE_SVM )) -return false; +return false;return true; + +} +bool kvm_valid_efer (struct kvm_vcpu *vcpu,u64 efer) +{ +if (efer & efer_reserved_bits) +return false; + +return __kvm_valid_efer (vcpu, efer); }EXPORT_SYMBOL_GPL (kvm_valid_efer); -static int set_efer (struct kvm_vcpu *vcpu,u64 efer) +static int set_efer (struct kvm_vcpu *vcpu,struct msr_data *msr_info) {u64 old_efer = vcpu->arch.efer; +u64 efer = msr_info->data; -if (!kvm_valid_efer (vcpu, efer)) -return 1 ; +if (efer & efer_reserved_bits) +return false; -if (is_paging (vcpu) - && (vcpu->arch.efer &EFER_LME ) != (efer &EFER_LME )) -return 1 ; +if (!msr_info->host_initiated) { +if (!__kvm_valid_efer (vcpu, efer)) +return 1 ; + +if (is_paging (vcpu) && + (vcpu->arch.efer &EFER_LME ) != (efer &EFER_LME )) +return 1 ; + } efer &= ~EFER_LMA ; efer |= vcpu->arch.efer &EFER_LMA ;
@@ -2456,7 +2467,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) vcpu->arch.arch_capabilities = data;break ;case MSR_EFER : -return set_efer (vcpu, data); +return set_efer (vcpu, msr_info);case MSR_K7_HWCR : data &= ~(u64 )0x40 ;/* ignore flush filter disable */ data &= ~(u64 )0x100 ;/* ignore ignne emulation enable */
arch/x86/platform/pvh/enlighten.c +4 -4
@@ -44,8 +44,6 @@ void __init __weak mem_map_via_hcall(struct boot_params *ptr __maybe_unused)static void __init init_pvh_bootparams (bool xen_guest) { -memset (&pvh_bootparams,0 ,sizeof (pvh_bootparams)); -if ((pvh_start_info.version >0 ) && (pvh_start_info.memmap_entries)) {struct hvm_memmap_table_entry *ep;int i;
@@ -103,7 +101,7 @@ static void __init init_pvh_bootparams(bool xen_guest)* If we are trying to boot a Xen PVH guest, it is expected that the kernel * will have been configured to provide the required override for this routine. */ -void __init __weak xen_pvh_init (void ) +void __init __weak xen_pvh_init (struct boot_params *boot_params) {xen_raw_printk ("Error: Missing xen PVH initialization\n" );BUG ();
@@ -112,7 +110,7 @@ void __init __weak xen_pvh_init(void)static void hypervisor_specific_init (bool xen_guest) {if (xen_guest) -xen_pvh_init (); +xen_pvh_init (&pvh_bootparams); }/*
@@ -131,6 +129,8 @@ void __init xen_prepare_pvh(void)BUG (); } +memset (&pvh_bootparams,0 ,sizeof (pvh_bootparams)); +hypervisor_specific_init (xen_guest);init_pvh_bootparams (xen_guest);
arch/x86/xen/efi.c +6 -6
@@ -158,7 +158,7 @@ static enum efi_secureboot_mode xen_efi_get_secureboot(void)return efi_secureboot_mode_unknown; } -void __init xen_efi_init (void ) +void __init xen_efi_init (struct boot_params *boot_params) {efi_system_table_t *efi_systab_xen;
@@ -167,12 +167,12 @@ void __init xen_efi_init(void)if (efi_systab_xen ==NULL )return ; -strncpy ((char *)&boot_params.efi_info.efi_loader_signature,"Xen" , -sizeof (boot_params.efi_info.efi_loader_signature)); - boot_params.efi_info.efi_systab = (__u32 )__pa (efi_systab_xen); - boot_params.efi_info.efi_systab_hi = (__u32)(__pa (efi_systab_xen) >>32 ); +strncpy ((char *)&boot_params->efi_info.efi_loader_signature,"Xen" , +sizeof (boot_params->efi_info.efi_loader_signature)); + boot_params->efi_info.efi_systab = (__u32 )__pa (efi_systab_xen); + boot_params->efi_info.efi_systab_hi = (__u32)(__pa (efi_systab_xen) >>32 ); - boot_params.secure_boot =xen_efi_get_secureboot (); + boot_params->secure_boot =xen_efi_get_secureboot ();set_bit (EFI_BOOT , &efi.flags);set_bit (EFI_PARAVIRT , &efi.flags);
arch/x86/xen/enlighten_pv.c +1 -1
@@ -1403,7 +1403,7 @@ asmlinkage __visible void __init xen_start_kernel(void)/* We need this for printk timestamps */ xen_setup_runstate_info (0 ); -xen_efi_init (); +xen_efi_init (&boot_params);/* Start the world */ #ifdef CONFIG_X86_32
arch/x86/xen/enlighten_pvh.c +6 -1
@@ -13,6 +13,8 @@#include <xen/interface/memory.h> +#include "xen-ops.h" +/* * PVH variables. *
@@ -21,17 +23,20 @@*/ bool xen_pvh __attribute__((section(".data"))) = 0; -void __init xen_pvh_init (void ) +void __init xen_pvh_init (struct boot_params *boot_params) {u32 msr;u64 pfn; xen_pvh =1 ; + xen_domain_type =XEN_HVM_DOMAIN ; xen_start_flags = pvh_start_info.flags; msr =cpuid_ebx (xen_cpuid_base () +2 ); pfn =__pa (hypercall_page);wrmsr_safe (msr, (u32 )pfn, (u32)(pfn >>32 )); + +xen_efi_init (boot_params); }void __init mem_map_via_hcall (struct boot_params *boot_params_p)
arch/x86/xen/xen-ops.h +2 -2
@@ -122,9 +122,9 @@ static inline void __init xen_init_vga(const struct dom0_vga_console_info *info,void __init xen_init_apic (void );#ifdef CONFIG_XEN_EFI -extern void xen_efi_init (void ); +extern void xen_efi_init (struct boot_params *boot_params);#else -static inline void __init xen_efi_init (void ) +static inline void __init xen_efi_init (struct boot_params *boot_params) { }#endif
crypto/ccm.c +18 -26
97 lines not on this page · raw message
crypto/chacha20poly1305.c +2 -2
@@ -645,8 +645,8 @@ static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb, err = -ENAMETOOLONG ;if (snprintf (inst->alg.base.cra_name,CRYPTO_MAX_ALG_NAME , -"%s(%s,%s)" , name, chacha_name, - poly_name) >=CRYPTO_MAX_ALG_NAME ) +"%s(%s,%s)" , name, chacha->base.cra_name, + poly->cra_name) >=CRYPTO_MAX_ALG_NAME ) goto out_drop_chacha; if (snprintf(inst->alg.base.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s(%s,%s)", name, chacha->base.cra_driver_name,
crypto/chacha_generic.c +1 -1
@@ -52,7 +52,7 @@ static int chacha_stream_xor(struct skcipher_request *req,unsigned int nbytes = walk.nbytes;if (nbytes < walk.total) - nbytes =round_down (nbytes, walk.stride); + nbytes =round_down (nbytes,CHACHA_BLOCK_SIZE );chacha_docrypt (state, walk.dst.virt.addr, walk.src.virt.addr, nbytes, ctx->nrounds);
crypto/crct10dif_generic.c +4 -7
@@ -65,10 +65,9 @@ static int chksum_final(struct shash_desc *desc, u8 *out)return 0 ; } -static int __chksum_finup (__u16 *crcp,const u8 *data,unsigned int len, -u8 *out) +static int __chksum_finup (__u16 crc,const u8 *data,unsigned int len,u8 *out) { - *(__u16 *)out =crc_t10dif_generic (*crcp, data, len); + *(__u16 *)out =crc_t10dif_generic (crc, data, len);return 0 ; }
@@ -77,15 +76,13 @@ static int chksum_finup(struct shash_desc *desc, const u8 *data, {struct chksum_desc_ctx *ctx =shash_desc_ctx (desc); -return __chksum_finup (&ctx->crc, data, len, out); +return __chksum_finup (ctx->crc, data, len, out); }static int chksum_digest (struct shash_desc *desc,const u8 *data,unsigned int length,u8 *out) { -struct chksum_desc_ctx *ctx =shash_desc_ctx (desc); - -return __chksum_finup (&ctx->crc, data, length, out); +return __chksum_finup (0 , data, length, out); }static struct shash_alg alg = {
crypto/gcm.c +11 -23
@@ -597,7 +597,6 @@ static void crypto_gcm_free(struct aead_instance *inst)static int crypto_gcm_create_common (struct crypto_template *tmpl,struct rtattr **tb, -const char *full_name,const char *ctr_name,const char *ghash_name) {
@@ -638,7 +637,8 @@ static int crypto_gcm_create_common(struct crypto_template *tmpl, goto err_free_inst; err = -EINVAL ; -if (ghash->digestsize !=16 ) +if (strcmp (ghash->base.cra_name,"ghash" ) !=0 || + ghash->digestsize !=16 ) goto err_drop_ghash;crypto_set_skcipher_spawn (&ctx->ctr,aead_crypto_instance (inst));
@@ -650,24 +650,24 @@ static int crypto_gcm_create_common(struct crypto_template *tmpl, ctr =crypto_spawn_skcipher_alg (&ctx->ctr); -/* We only support 16-byte blocks. */ +/* The skcipher algorithm must be CTR mode, using 16-byte blocks. */ err = -EINVAL ; -if (crypto_skcipher_alg_ivsize (ctr) !=16 ) +if (strncmp (ctr->base.cra_name,"ctr(" ,4 ) !=0 || +crypto_skcipher_alg_ivsize (ctr) !=16 || + ctr->base.cra_blocksize !=1 ) goto out_put_ctr; -/* Not a stream cipher? */ -if (ctr->base.cra_blocksize !=1 ) + err = -ENAMETOOLONG ; +if (snprintf (inst->alg.base.cra_name,CRYPTO_MAX_ALG_NAME , +"gcm(%s" , ctr->base.cra_name +4 ) >=CRYPTO_MAX_ALG_NAME ) goto out_put_ctr; - err = -ENAMETOOLONG ;if (snprintf (inst->alg.base.cra_driver_name,CRYPTO_MAX_ALG_NAME ,"gcm_base(%s,%s)" , ctr->base.cra_driver_name, ghash_alg->cra_driver_name) >=CRYPTO_MAX_ALG_NAME ) goto out_put_ctr; -memcpy (inst->alg.base.cra_name, full_name,CRYPTO_MAX_ALG_NAME ); - inst->alg.base.cra_flags = (ghash->base.cra_flags | ctr->base.cra_flags) &CRYPTO_ALG_ASYNC ; inst->alg.base.cra_priority = (ghash->base.cra_priority +
@@ -709,7 +709,6 @@ static int crypto_gcm_create(struct crypto_template *tmpl, struct rtattr **tb) {const char *cipher_name;char ctr_name[CRYPTO_MAX_ALG_NAME ]; -char full_name[CRYPTO_MAX_ALG_NAME ]; cipher_name =crypto_attr_alg_name (tb[1 ]);if (IS_ERR (cipher_name))
@@ -719,12 +718,7 @@ static int crypto_gcm_create(struct crypto_template *tmpl, struct rtattr **tb) CRYPTO_MAX_ALG_NAME)return -ENAMETOOLONG ; -if (snprintf (full_name,CRYPTO_MAX_ALG_NAME ,"gcm(%s)" , cipher_name) >= -CRYPTO_MAX_ALG_NAME ) -return -ENAMETOOLONG ; - -return crypto_gcm_create_common (tmpl, tb, full_name, - ctr_name,"ghash" ); +return crypto_gcm_create_common (tmpl, tb, ctr_name,"ghash" ); } static int crypto_gcm_base_create(struct crypto_template *tmpl,
@@ -732,7 +726,6 @@ static int crypto_gcm_base_create(struct crypto_template *tmpl, {const char *ctr_name;const char *ghash_name; -char full_name[CRYPTO_MAX_ALG_NAME ]; ctr_name =crypto_attr_alg_name (tb[1 ]);if (IS_ERR (ctr_name))
@@ -742,12 +735,7 @@ static int crypto_gcm_base_create(struct crypto_template *tmpl,if (IS_ERR (ghash_name))return PTR_ERR (ghash_name); -if (snprintf (full_name,CRYPTO_MAX_ALG_NAME ,"gcm_base(%s,%s)" , - ctr_name, ghash_name) >=CRYPTO_MAX_ALG_NAME ) -return -ENAMETOOLONG ; - -return crypto_gcm_create_common (tmpl, tb, full_name, - ctr_name, ghash_name); +return crypto_gcm_create_common (tmpl, tb, ctr_name, ghash_name); } static int crypto_rfc4106_setkey(struct crypto_aead *parent, const u8 *key,
crypto/lrw.c +3 -1
@@ -162,8 +162,10 @@ static int xor_tweak(struct skcipher_request *req, bool second_pass) } err =skcipher_walk_virt (&w, req, false); - iv = (__be32 *)w.iv; +if (err) +return err; + iv = (__be32 *)w.iv; counter[0 ] =be32_to_cpu (iv[3 ]); counter[1 ] =be32_to_cpu (iv[2 ]); counter[2 ] =be32_to_cpu (iv[1 ]);
crypto/salsa20_generic.c +1 -1
@@ -161,7 +161,7 @@ static int salsa20_crypt(struct skcipher_request *req) err =skcipher_walk_virt (&walk, req, false); -salsa20_init (state, ctx, walk.iv); +salsa20_init (state, ctx, req->iv);while (walk.nbytes >0 ) {unsigned int nbytes = walk.nbytes;
crypto/skcipher.c +7 -2
@@ -131,8 +131,13 @@ int skcipher_walk_done(struct skcipher_walk *walk, int err)memcpy (walk->dst.virt.addr, walk->page, n);skcipher_unmap_dst (walk); }else if (unlikely (walk->flags &SKCIPHER_WALK_SLOW )) { -if (WARN_ON (err)) { -/* unexpected case; didn't process all bytes */ +if (err) { +/* +* Didn't process all bytes. Either the algorithm is +* broken, or this was the last step and it turned out +* the message wasn't evenly divisible into blocks but +* the algorithm requires it. +*/ err = -EINVAL ; goto finish; }
drivers/acpi/sleep.c +4 -0
@@ -977,6 +977,8 @@ static int acpi_s2idle_prepare(void)if (acpi_sci_irq_valid ())enable_irq_wake (acpi_sci_irq); +acpi_enable_wakeup_devices (ACPI_STATE_S0 ); +/* Change the configuration of GPEs to avoid spurious wakeup. */ acpi_enable_all_wakeup_gpes ();acpi_os_wait_events_complete ();
@@ -1027,6 +1029,8 @@ static void acpi_s2idle_restore(void) {acpi_enable_all_runtime_gpes (); +acpi_disable_wakeup_devices (ACPI_STATE_S0 ); +if (acpi_sci_irq_valid ())disable_irq_wake (acpi_sci_irq);
drivers/char/ipmi/ipmi_dmi.c +2 -0
@@ -47,9 +47,11 @@ static void __init dmi_add_platform_ipmi(unsigned long base_addr,memset (&p,0 ,sizeof (p)); name ="dmi-ipmi-si" ; + p.iftype =IPMI_PLAT_IF_SI ;switch (type) {case IPMI_DMI_TYPE_SSIF : name ="dmi-ipmi-ssif" ; + p.iftype =IPMI_PLAT_IF_SSIF ; p.type =SI_TYPE_INVALID ;break ;case IPMI_DMI_TYPE_BT :
drivers/char/ipmi/ipmi_plat_data.c +15 -12
@@ -12,7 +12,7 @@ struct platform_device *ipmi_platform_add(const char *name, unsigned int inst, struct ipmi_plat_data *p) {struct platform_device *pdev; -unsigned int num_r =1 , size, pidx =0 ; +unsigned int num_r =1 , size =0 , pidx =0 ;struct resource r[4 ];struct property_entry pr[6 ];u32 flags;
@@ -21,19 +21,22 @@ struct platform_device *ipmi_platform_add(const char *name, unsigned int inst,memset (pr,0 ,sizeof (pr));memset (r,0 ,sizeof (r)); -if (p->type ==SI_BT ) - size =3 ; -else if (p->type ==SI_TYPE_INVALID ) - size =0 ; -else - size =2 ; +if (p->iftype ==IPMI_PLAT_IF_SI ) { +if (p->type ==SI_BT ) + size =3 ; +else if (p->type !=SI_TYPE_INVALID ) + size =2 ; + +if (p->regsize ==0 ) + p->regsize =DEFAULT_REGSIZE ; +if (p->regspacing ==0 ) + p->regspacing = p->regsize; -if (p->regsize ==0 ) - p->regsize =DEFAULT_REGSIZE ; -if (p->regspacing ==0 ) - p->regspacing = p->regsize; + pr[pidx++] =PROPERTY_ENTRY_U8 ("ipmi-type" , p->type); + }else if (p->iftype ==IPMI_PLAT_IF_SSIF ) { + pr[pidx++] =PROPERTY_ENTRY_U16 ("i2c-addr" , p->addr); + } - pr[pidx++] =PROPERTY_ENTRY_U8 ("ipmi-type" , p->type);if (p->slave_addr) pr[pidx++] =PROPERTY_ENTRY_U8 ("slave-addr" , p->slave_addr); pr[pidx++] =PROPERTY_ENTRY_U8 ("addr-source" , p->addr_source);
drivers/char/ipmi/ipmi_plat_data.h +3 -0
@@ -6,7 +6,10 @@#include <linux/ipmi.h> +enum ipmi_plat_interface_type {IPMI_PLAT_IF_SI ,IPMI_PLAT_IF_SSIF }; +struct ipmi_plat_data { +enum ipmi_plat_interface_type iftype;unsigned int type;/* si_type for si, SI_INVALID for others */ unsigned int space;/* addr_space for si, intf# for ssif. */ unsigned long addr;
drivers/char/ipmi/ipmi_si_hardcode.c +1 -0
@@ -83,6 +83,7 @@ static void __init ipmi_hardcode_init_one(const char *si_type_str,memset (&p,0 ,sizeof (p)); + p.iftype =IPMI_PLAT_IF_SI ;if (!si_type_str || !*si_type_str ||strcmp (si_type_str,"kcs" ) ==0 ) { p.type =SI_KCS ; }else if (strcmp (si_type_str,"smic" ) ==0 ) {
drivers/char/ipmi/ipmi_si_hotmod.c +1 -0
@@ -108,6 +108,7 @@ static int parse_hotmod_str(const char *curr, enum hotmod_op *op,int rv;unsigned int ival; + h->iftype =IPMI_PLAT_IF_SI ; rv =parse_str (hotmod_ops, &ival,"operation" , &curr);if (rv)return rv;
drivers/char/ipmi/ipmi_ssif.c +5 -1
@@ -727,12 +727,16 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,/* End of read */ len = ssif_info->multi_len; data = ssif_info->data; - }else if (blocknum != ssif_info->multi_pos) { + }else if (blocknum +1 != ssif_info->multi_pos) {/* * Out of sequence block, just abort. Block * numbers start at zero for the second block, * but multi_pos starts at one, so the +1. */ +if (ssif_info->ssif_debug &SSIF_DEBUG_MSG ) +dev_dbg (&ssif_info->client->dev, +"Received message out of sequence, expected %u, got %u\n" , + ssif_info->multi_pos -1 , blocknum); result = -EIO ; }else {ssif_inc_stat (ssif_info, received_message_parts);
drivers/crypto/amcc/crypto4xx_alg.c +9 -3
@@ -141,9 +141,10 @@ static int crypto4xx_setkey_aes(struct crypto_skcipher *cipher,/* Setup SA */ sa = ctx->sa_in; - set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, (cm == CRYPTO_MODE_CBC ? - SA_SAVE_IV : SA_NOT_SAVE_IV), - SA_LOAD_HASH_FROM_SA, SA_LOAD_IV_FROM_STATE, + set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, (cm == CRYPTO_MODE_ECB ? + SA_NOT_SAVE_IV : SA_SAVE_IV), + SA_NOT_LOAD_HASH, (cm == CRYPTO_MODE_ECB ? + SA_LOAD_IV_FROM_SA : SA_LOAD_IV_FROM_STATE), SA_NO_HEADER_PROC, SA_HASH_ALG_NULL, SA_CIPHER_ALG_AES, SA_PAD_TYPE_ZERO, SA_OP_GROUP_BASIC, SA_OPCODE_DECRYPT,
@@ -162,6 +163,11 @@ static int crypto4xx_setkey_aes(struct crypto_skcipher *cipher,memcpy (ctx->sa_out, ctx->sa_in, ctx->sa_len *4 ); sa = ctx->sa_out; sa->sa_command_0.bf.dir =DIR_OUTBOUND ; +/* +* SA_OPCODE_ENCRYPT is the same value as SA_OPCODE_DECRYPT. +* it's the DIR_(IN|OUT)BOUND that matters +*/ + sa->sa_command_0.bf.opcode =SA_OPCODE_ENCRYPT ;return 0 ; }
drivers/crypto/amcc/crypto4xx_core.c +21 -10
@@ -714,7 +714,23 @@ int crypto4xx_build_pd(struct crypto_async_request *req,size_t offset_to_sr_ptr;u32 gd_idx =0 ;int tmp; -bool is_busy; +bool is_busy, force_sd; + +/* +* There's a very subtile/disguised "bug" in the hardware that +* gets indirectly mentioned in 18.1.3.5 Encryption/Decryption +* of the hardware spec: +* *drum roll* the AES/(T)DES OFB and CFB modes are listed as +* operation modes for >>> "Block ciphers" <<<. +* +* To workaround this issue and stop the hardware from causing +* "overran dst buffer" on crypttexts that are not a multiple +* of 16 (AES_BLOCK_SIZE), we force the driver to use the +* scatter buffers. +*/ + force_sd = (req_sa->sa_command_1.bf.crypto_mode9_8 ==CRYPTO_MODE_CFB + || req_sa->sa_command_1.bf.crypto_mode9_8 ==CRYPTO_MODE_OFB ) + && (datalen %AES_BLOCK_SIZE );/* figure how many gd are needed */ tmp =sg_nents_for_len (src, assoclen + datalen);
@@ -732,7 +748,7 @@ int crypto4xx_build_pd(struct crypto_async_request *req, }/* figure how many sd are needed */ -if (sg_is_last (dst)) { +if (sg_is_last (dst) && force_sd == false) { num_sd =0 ; }else {if (datalen >PPC4XX_SD_BUFFER_SIZE ) {
@@ -807,9 +823,10 @@ int crypto4xx_build_pd(struct crypto_async_request *req, pd->sa_len = sa_len; pd_uinfo = &dev->pdr_uinfo[pd_entry]; - pd_uinfo->async_req = req; pd_uinfo->num_gd = num_gd; pd_uinfo->num_sd = num_sd; + pd_uinfo->dest_va = dst; + pd_uinfo->async_req = req;if (iv_len)memcpy (pd_uinfo->sr_va->save_iv, iv, iv_len);
@@ -828,7 +845,6 @@ int crypto4xx_build_pd(struct crypto_async_request *req,/* get first gd we are going to use */ gd_idx = fst_gd; pd_uinfo->first_gd = fst_gd; - pd_uinfo->num_gd = num_gd; gd =crypto4xx_get_gdp (dev, &gd_dma, gd_idx); pd->src = gd_dma;/* enable gather */
@@ -865,17 +881,14 @@ int crypto4xx_build_pd(struct crypto_async_request *req,* Indicate gather array is not used */ pd_uinfo->first_gd =0xffffffff ; - pd_uinfo->num_gd =0 ; } -if (sg_is_last (dst)) { +if (!num_sd) {/* * we know application give us dst a whole piece of memory * no need to use scatter ring. */ pd_uinfo->using_sd =0 ; pd_uinfo->first_sd =0xffffffff ; - pd_uinfo->num_sd =0 ; - pd_uinfo->dest_va = dst; sa->sa_command_0.bf.scatter =0 ; pd->dest = (u32)dma_map_page(dev->core_dev->device, sg_page(dst), dst->offset,
@@ -889,9 +902,7 @@ int crypto4xx_build_pd(struct crypto_async_request *req, nbytes = datalen; sa->sa_command_0.bf.scatter =1 ; pd_uinfo->using_sd =1 ; - pd_uinfo->dest_va = dst; pd_uinfo->first_sd = fst_sd; - pd_uinfo->num_sd = num_sd; sd =crypto4xx_get_sdp (dev, &sd_dma, sd_idx); pd->dest = sd_dma;/* setup scatter descriptor */
drivers/crypto/caam/caamalg_qi2.c +78 -99
436 lines not on this page · raw message
drivers/crypto/caam/caamalg_qi2.h +0 -2
@@ -162,14 +162,12 @@ struct skcipher_edesc {/* * ahash_edesc - s/w-extended ahash descriptor -* @dst_dma: I/O virtual address of req->result * @qm_sg_dma: I/O virtual address of h/w link table * @src_nents: number of segments in input scatterlist * @qm_sg_bytes: length of dma mapped qm_sg space * @sgt: pointer to h/w link table */ struct ahash_edesc { -dma_addr_t dst_dma;dma_addr_t qm_sg_dma;int src_nents;int qm_sg_bytes;
drivers/crypto/ccp/psp-dev.c +1 -1
@@ -997,7 +997,7 @@ void psp_pci_init(void) rc =sev_platform_init (&error);if (rc) {dev_err (sp->dev,"SEV: failed to INIT error %#x\n" , error); - goto err; +return ; } dev_info(sp->dev, "SEV API:%d.%d build:%d\n", psp_master->api_major,
drivers/crypto/ccree/cc_aead.c +10 -1
@@ -424,7 +424,7 @@ static int validate_keys_sizes(struct cc_aead_ctx *ctx)/* This function prepers the user key so it can pass to the hmac processing * (copy to intenral buffer or hash in case of key longer than block */ -static int cc_get_plain_hmac_key (struct crypto_aead *tfm,const u8 *key, +static int cc_get_plain_hmac_key (struct crypto_aead *tfm,const u8 *authkey,unsigned int keylen) {dma_addr_t key_dma_addr =0 ;
@@ -437,6 +437,7 @@ static int cc_get_plain_hmac_key(struct crypto_aead *tfm, const u8 *key,unsigned int hashmode;unsigned int idx =0 ;int rc =0 ; +u8 *key =NULL ;struct cc_hw_desc desc[MAX_AEAD_SETKEY_SEQ ];dma_addr_t padded_authkey_dma_addr = ctx->auth_state.hmac.padded_authkey_dma_addr;
@@ -455,11 +456,17 @@ static int cc_get_plain_hmac_key(struct crypto_aead *tfm, const u8 *key, }if (keylen !=0 ) { + + key =kmemdup (authkey, keylen,GFP_KERNEL ); +if (!key) +return -ENOMEM ; + key_dma_addr =dma_map_single (dev, (void *)key, keylen,DMA_TO_DEVICE );if (dma_mapping_error (dev, key_dma_addr)) {dev_err (dev,"Mapping key va=0x%p len=%u for DMA failed\n" , key, keylen); +kzfree (key);return -ENOMEM ; }if (keylen > blocksize) {
@@ -542,6 +549,8 @@ static int cc_get_plain_hmac_key(struct crypto_aead *tfm, const u8 *key,if (key_dma_addr)dma_unmap_single (dev, key_dma_addr, keylen,DMA_TO_DEVICE ); +kzfree (key); +return rc; }
drivers/crypto/ccree/cc_buffer_mgr.c +34 -79
215 lines not on this page · raw message
drivers/crypto/ccree/cc_driver.h +1 -0
@@ -168,6 +168,7 @@ struct cc_alg_template {struct async_gen_req_ctx {dma_addr_t iv_dma_addr; +u8 *iv;enum drv_crypto_direction op_type; };
drivers/crypto/ccree/cc_fips.c +15 -8
@@ -72,20 +72,28 @@ static inline void tee_fips_error(struct device *dev)dev_err (dev,"TEE reported error!\n" ); } +/* +* This function check if cryptocell tee fips error occurred +* and in such case triggers system error +*/ +void cc_tee_handle_fips_error (struct cc_drvdata *p_drvdata) +{ +struct device *dev =drvdata_to_dev (p_drvdata); + +if (!cc_get_tee_fips_status (p_drvdata)) +tee_fips_error (dev); +} +/* Deferred service handler, run as interrupt-fired tasklet */ static void fips_dsr (unsigned long devarg) {struct cc_drvdata *drvdata = (struct cc_drvdata *)devarg; -struct device *dev =drvdata_to_dev (drvdata); -u32 irq, state, val; +u32 irq, val; irq = (drvdata->irq & (CC_GPR0_IRQ_MASK ));if (irq) { - state =cc_ioread (drvdata,CC_REG (GPR_HOST )); - -if (state != (CC_FIPS_SYNC_TEE_STATUS |CC_FIPS_SYNC_MODULE_OK )) -tee_fips_error (dev); +cc_tee_handle_fips_error (drvdata); }/* after verifing that there is nothing to do,
@@ -113,8 +121,7 @@ int cc_fips_init(struct cc_drvdata *p_drvdata)dev_dbg (dev,"Initializing fips tasklet\n" );tasklet_init (&fips_h->tasklet, fips_dsr, (unsigned long )p_drvdata); -if (!cc_get_tee_fips_status (p_drvdata)) -tee_fips_error (dev); +cc_tee_handle_fips_error (p_drvdata);return 0 ; }
drivers/crypto/ccree/cc_fips.h +2 -0
@@ -18,6 +18,7 @@ int cc_fips_init(struct cc_drvdata *p_drvdata);void cc_fips_fini (struct cc_drvdata *drvdata);void fips_handler (struct cc_drvdata *drvdata);void cc_set_ree_fips_status (struct cc_drvdata *drvdata,bool ok); +void cc_tee_handle_fips_error (struct cc_drvdata *p_drvdata);#else /* CONFIG_CRYPTO_FIPS */
@@ -30,6 +31,7 @@ static inline void cc_fips_fini(struct cc_drvdata *drvdata) {}static inline void cc_set_ree_fips_status (struct cc_drvdata *drvdata,bool ok) {}static inline void fips_handler (struct cc_drvdata *drvdata) {} +static inline void cc_tee_handle_fips_error (struct cc_drvdata *p_drvdata) {}#endif /* CONFIG_CRYPTO_FIPS */
drivers/crypto/ccree/cc_hash.c +23 -5
@@ -69,6 +69,7 @@ struct cc_hash_alg {struct hash_key_req_ctx {u32 keylen;dma_addr_t key_dma_addr; +u8 *key; };/* hash per-session context */
@@ -730,13 +731,20 @@ static int cc_hash_setkey(struct crypto_ahash *ahash, const u8 *key, ctx->key_params.keylen = keylen; ctx->key_params.key_dma_addr =0 ; ctx->is_hmac = true; + ctx->key_params.key =NULL ;if (keylen) { + ctx->key_params.key =kmemdup (key, keylen,GFP_KERNEL ); +if (!ctx->key_params.key) +return -ENOMEM ; + ctx->key_params.key_dma_addr = -dma_map_single (dev, (void *)key, keylen,DMA_TO_DEVICE ); +dma_map_single (dev, (void *)ctx->key_params.key, keylen, +DMA_TO_DEVICE );if (dma_mapping_error (dev, ctx->key_params.key_dma_addr)) {dev_err (dev,"Mapping key va=0x%p len=%u for DMA failed\n" , - key, keylen); + ctx->key_params.key, keylen); +kzfree (ctx->key_params.key);return -ENOMEM ; } dev_dbg(dev, "mapping key-buffer: key_dma_addr=%pad keylen=%u\n",
@@ -887,6 +895,9 @@ static int cc_hash_setkey(struct crypto_ahash *ahash, const u8 *key,dev_dbg (dev,"Unmapped key-buffer: key_dma_addr=%pad keylen=%u\n" , &ctx->key_params.key_dma_addr, ctx->key_params.keylen); } + +kzfree (ctx->key_params.key); +return rc; }
@@ -913,11 +924,16 @@ static int cc_xcbc_setkey(struct crypto_ahash *ahash, ctx->key_params.keylen = keylen; + ctx->key_params.key =kmemdup (key, keylen,GFP_KERNEL ); +if (!ctx->key_params.key) +return -ENOMEM ; + ctx->key_params.key_dma_addr = -dma_map_single (dev, (void *)key, keylen,DMA_TO_DEVICE ); +dma_map_single (dev, ctx->key_params.key, keylen,DMA_TO_DEVICE );if (dma_mapping_error (dev, ctx->key_params.key_dma_addr)) {dev_err (dev,"Mapping key va=0x%p len=%u for DMA failed\n" , key, keylen); +kzfree (ctx->key_params.key);return -ENOMEM ; } dev_dbg(dev, "mapping key-buffer: key_dma_addr=%pad keylen=%u\n",
@@ -969,6 +985,8 @@ static int cc_xcbc_setkey(struct crypto_ahash *ahash,dev_dbg (dev,"Unmapped key-buffer: key_dma_addr=%pad keylen=%u\n" , &ctx->key_params.key_dma_addr, ctx->key_params.keylen); +kzfree (ctx->key_params.key); +return rc; }
@@ -1621,7 +1639,7 @@ static struct cc_hash_template driver_hash[] = { .setkey = cc_hash_setkey, .halg = { .digestsize = SHA224_DIGEST_SIZE, - .statesize = CC_STATE_SIZE(SHA224_DIGEST_SIZE), + .statesize = CC_STATE_SIZE(SHA256_DIGEST_SIZE), }, }, .hash_mode = DRV_HASH_SHA224,
@@ -1648,7 +1666,7 @@ static struct cc_hash_template driver_hash[] = { .setkey = cc_hash_setkey, .halg = { .digestsize = SHA384_DIGEST_SIZE, - .statesize = CC_STATE_SIZE(SHA384_DIGEST_SIZE), + .statesize = CC_STATE_SIZE(SHA512_DIGEST_SIZE), }, }, .hash_mode = DRV_HASH_SHA384,
drivers/crypto/ccree/cc_ivgen.c +3 -6
@@ -154,9 +154,6 @@ void cc_ivgen_fini(struct cc_drvdata *drvdata) } ivgen_ctx->pool =NULL_SRAM_ADDR ; - -/* release "this" context */ -kfree (ivgen_ctx); }/*!
@@ -174,10 +171,12 @@ int cc_ivgen_init(struct cc_drvdata *drvdata)int rc;/* Allocate "this" context */ - ivgen_ctx =kzalloc (sizeof (*ivgen_ctx),GFP_KERNEL ); + ivgen_ctx =devm_kzalloc (device,sizeof (*ivgen_ctx),GFP_KERNEL );if (!ivgen_ctx)return -ENOMEM ; + drvdata->ivgen_handle = ivgen_ctx; +/* Allocate pool's header for initial enc. key/IV */ ivgen_ctx->pool_meta = dma_alloc_coherent(device, CC_IVPOOL_META_SIZE, &ivgen_ctx->pool_meta_dma,
@@ -196,8 +195,6 @@ int cc_ivgen_init(struct cc_drvdata *drvdata) goto out; } - drvdata->ivgen_handle = ivgen_ctx; -return cc_init_iv_sram (drvdata); out:
drivers/crypto/ccree/cc_pm.c +6 -3
@@ -11,6 +11,7 @@#include "cc_ivgen.h" #include "cc_hash.h" #include "cc_pm.h" +#include "cc_fips.h" #define POWER_DOWN_ENABLE 0x01#define POWER_DOWN_DISABLE 0x00
@@ -25,13 +26,13 @@ int cc_pm_suspend(struct device *dev)int rc;dev_dbg (dev,"set HOST_POWER_DOWN_EN\n" ); -cc_iowrite (drvdata,CC_REG (HOST_POWER_DOWN_EN ),POWER_DOWN_ENABLE ); rc =cc_suspend_req_queue (drvdata);if (rc) {dev_err (dev,"cc_suspend_req_queue (%x)\n" , rc);return rc; }fini_cc_regs (drvdata); +cc_iowrite (drvdata,CC_REG (HOST_POWER_DOWN_EN ),POWER_DOWN_ENABLE );cc_clk_off (drvdata);return 0 ; }
@@ -42,19 +43,21 @@ int cc_pm_resume(struct device *dev)struct cc_drvdata *drvdata =dev_get_drvdata (dev);dev_dbg (dev,"unset HOST_POWER_DOWN_EN\n" ); -cc_iowrite (drvdata,CC_REG (HOST_POWER_DOWN_EN ),POWER_DOWN_DISABLE ); - +/* Enables the device source clk */ rc =cc_clk_on (drvdata);if (rc) {dev_err (dev,"failed getting clock back on. We're toast.\n" );return rc; } +cc_iowrite (drvdata,CC_REG (HOST_POWER_DOWN_EN ),POWER_DOWN_DISABLE ); rc =init_cc_regs (drvdata, false);if (rc) {dev_err (dev,"init_cc_regs (%x)\n" , rc);return rc; } +/* check if tee fips error occurred during power down */ +cc_tee_handle_fips_error (drvdata); rc =cc_resume_req_queue (drvdata);if (rc) {
drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c +18 -7
@@ -250,9 +250,14 @@ static int rk_set_data_start(struct rk_crypto_info *dev)u8 *src_last_blk =page_address (sg_page (dev->sg_src)) + dev->sg_src->offset + dev->sg_src->length - ivsize; -/* store the iv that need to be updated in chain mode */ -if (ctx->mode &RK_CRYPTO_DEC ) +/* Store the iv that need to be updated in chain mode. +* And update the IV buffer to contain the next IV for decryption mode. +*/ +if (ctx->mode &RK_CRYPTO_DEC ) {memcpy (ctx->iv, src_last_blk, ivsize); +sg_pcopy_to_buffer (dev->first, dev->src_nents, req->info, + ivsize, dev->total - ivsize); + } err = dev->load_data (dev, dev->sg_src, dev->sg_dst);if (!err)
@@ -288,13 +293,19 @@ static void rk_iv_copyback(struct rk_crypto_info *dev)struct ablkcipher_request *req =ablkcipher_request_cast (dev->async_req);struct crypto_ablkcipher *tfm =crypto_ablkcipher_reqtfm (req); +struct rk_cipher_ctx *ctx =crypto_ablkcipher_ctx (tfm);u32 ivsize =crypto_ablkcipher_ivsize (tfm); -if (ivsize ==DES_BLOCK_SIZE ) -memcpy_fromio (req->info, dev->reg +RK_CRYPTO_TDES_IV_0 , - ivsize); -else if (ivsize ==AES_BLOCK_SIZE ) -memcpy_fromio (req->info, dev->reg +RK_CRYPTO_AES_IV_0 , ivsize); +/* Update the IV buffer to contain the next IV for encryption mode. */ +if (!(ctx->mode &RK_CRYPTO_DEC )) { +if (dev->aligned) { +memcpy (req->info,sg_virt (dev->sg_dst) + + dev->sg_dst->length - ivsize, ivsize); + }else { +memcpy (req->info, dev->addr_vir + + dev->count - ivsize, ivsize); + } + } }static void rk_update_iv (struct rk_crypto_info *dev)
drivers/crypto/vmx/aesp8-ppc.pl +2 -2
@@ -1854,7 +1854,7 @@ Lctr32_enc8x_three: stvx_u $out1,$x10,$out stvx_u $out2,$x20,$out addi $out,$out,0x30 - b Lcbc_dec8x_done + b Lctr32_enc8x_done .align 5 Lctr32_enc8x_two:
@@ -1866,7 +1866,7 @@ Lctr32_enc8x_two: stvx_u $out0,$x00,$out stvx_u $out1,$x10,$out addi $out,$out,0x20 - b Lcbc_dec8x_done + b Lctr32_enc8x_done .align 5 Lctr32_enc8x_one:
drivers/dax/Kconfig +1 -2
@@ -23,7 +23,6 @@ config DEV_DAX config DEV_DAX_PMEM tristate "PMEM DAX: direct access to persistent memory" depends on LIBNVDIMM && NVDIMM_DAX && DEV_DAX - depends on m # until we can kill DEV_DAX_PMEM_COMPAT default DEV_DAX help Support raw access to persistent memory. Note that this
@@ -50,7 +49,7 @@ config DEV_DAX_KMEM config DEV_DAX_PMEM_COMPAT tristate "PMEM DAX: support the deprecated /sys/class/dax interface" - depends on DEV_DAX_PMEM + depends on m && DEV_DAX_PMEM=m default DEV_DAX_PMEM help Older versions of the libdaxctl library expect to find all
drivers/dax/device.c +2 -4
@@ -184,8 +184,7 @@ static vm_fault_t __dev_dax_pmd_fault(struct dev_dax *dev_dax, *pfn =phys_to_pfn_t (phys, dax_region->pfn_flags); -return vmf_insert_pfn_pmd (vmf->vma, vmf->address, vmf->pmd, *pfn, - vmf->flags &FAULT_FLAG_WRITE ); +return vmf_insert_pfn_pmd (vmf, *pfn, vmf->flags &FAULT_FLAG_WRITE ); }#ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD
@@ -235,8 +234,7 @@ static vm_fault_t __dev_dax_pud_fault(struct dev_dax *dev_dax, *pfn =phys_to_pfn_t (phys, dax_region->pfn_flags); -return vmf_insert_pfn_pud (vmf->vma, vmf->address, vmf->pud, *pfn, - vmf->flags &FAULT_FLAG_WRITE ); +return vmf_insert_pfn_pud (vmf, *pfn, vmf->flags &FAULT_FLAG_WRITE ); }#else static vm_fault_t __dev_dax_pud_fault(struct dev_dax *dev_dax,
drivers/edac/mce_amd.c +2 -2
@@ -1004,7 +1004,7 @@ static inline void amd_decode_err_code(u16 ec)/* * Filter out unwanted MCE signatures here. */ -static bool amd_filter_mce (struct mce *m) +static bool ignore_mce (struct mce *m) {/* * NB GART TLB error reporting is disabled by default.
@@ -1038,7 +1038,7 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)unsigned int fam =x86_family (m->cpuid);int ecc; -if (amd_filter_mce (m)) +if (ignore_mce (m))return NOTIFY_STOP ;pr_emerg (HW_ERR "%s\n" ,decode_error_status (m));
drivers/md/bcache/journal.c +7 -4
@@ -540,11 +540,11 @@ static void journal_reclaim(struct cache_set *c) ca->sb.nr_this_dev); } -bkey_init (k); -SET_KEY_PTRS (k, n); - -if (n) +if (n) { +bkey_init (k); +SET_KEY_PTRS (k, n); c->journal.blocks_free = c->sb.bucket_size >> c->block_bits; + } out:if (!journal_full (&c->journal))__closure_wake_up (&c->journal.wait);
@@ -671,6 +671,9 @@ static void journal_write_unlocked(struct closure *cl) ca->journal.seq[ca->journal.cur_idx] = w->data->seq; } +/* If KEY_PTRS(k) == 0, this jset gets lost in air */ +BUG_ON (i ==0 ); +atomic_dec_bug (&fifo_back (&c->journal.pin));bch_journal_next (&c->journal);journal_reclaim (c);
drivers/md/bcache/super.c +1 -1
@@ -1516,6 +1516,7 @@ static void cache_set_free(struct closure *cl)bch_btree_cache_free (c);bch_journal_free (c); +mutex_lock (&bch_register_lock);for_each_cache (ca, c, i)if (ca) { ca->set =NULL ;
@@ -1534,7 +1535,6 @@ static void cache_set_free(struct closure *cl)mempool_exit (&c->search);kfree (c->devices); -mutex_lock (&bch_register_lock);list_del (&c->list);mutex_unlock (&bch_register_lock);
drivers/mmc/core/queue.c +1 -0
@@ -472,6 +472,7 @@ void mmc_cleanup_queue(struct mmc_queue *mq)blk_mq_unquiesce_queue (q);blk_cleanup_queue (q); +blk_mq_free_tag_set (&mq->tag_set);/* * A request can be completed before the next request, potentially
drivers/mmc/host/Kconfig +1 -0
@@ -92,6 +92,7 @@ config MMC_SDHCI_PCI tristate "SDHCI support on PCI bus" depends on MMC_SDHCI && PCI select MMC_CQHCI + select IOSF_MBI if X86 help This selects the PCI Secure Digital Host Controller Interface. Most controllers found today are PCI devices.
drivers/mmc/host/sdhci-of-arasan.c +4 -1
@@ -832,7 +832,10 @@ static int sdhci_arasan_probe(struct platform_device *pdev) host->mmc_host_ops.start_signal_voltage_switch = sdhci_arasan_voltage_switch; sdhci_arasan->has_cqe = true; - host->mmc->caps2 |=MMC_CAP2_CQE |MMC_CAP2_CQE_DCMD ; + host->mmc->caps2 |=MMC_CAP2_CQE ; + +if (!of_property_read_bool (np,"disable-cqe-dcmd" )) + host->mmc->caps2 |=MMC_CAP2_CQE_DCMD ; } ret =sdhci_arasan_add_host (sdhci_arasan);
drivers/mmc/host/sdhci-pci-core.c +96 -0
33 lines not on this page · raw message
drivers/power/supply/axp288_fuel_gauge.c +20 -0
Lines of this file are not shown. View the raw message.
fs/btrfs/send.c +62 -0
62 lines not on this page · raw message
fs/ext4/super.c +36 -26
62 lines not on this page · raw message
fs/jbd2/journal.c +35 -18
53 lines not on this page · raw message
kernel/locking/rwsem-xadd.c +30 -14
44 lines not on this page · raw message
sound/pci/hda/patch_realtek.c +41 -27
68 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.
Thanks, a bunch Greg!
Quoted 464 lines · Greg KH
I'm announcing the release of the 5.1.4 kernel.
All users of the 5.1 kernel series must upgrade.
The updated 5.1.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.gitlinux-5.1.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summarythanks,
greg k-h
------------
Documentation/devicetree/bindings/mmc/mmc.txt | 2 Documentation/x86/mds.rst | 44 --- Makefile | 4 arch/arm/boot/dts/exynos5260.dtsi | 2 arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 5 arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 2 arch/arm/boot/dts/imx6dl-riotboard.dts | 2 arch/arm/boot/dts/imx6q-ba16.dtsi | 2 arch/arm/boot/dts/imx6q-marsboard.dts | 2 arch/arm/boot/dts/imx6q-tbs2910.dts | 2 arch/arm/boot/dts/imx6qdl-apf6.dtsi | 2 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 arch/arm/boot/dts/imx6qdl-sr-som.dtsi | 2 arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 2 arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 arch/arm/boot/dts/imx6sx-sdb.dtsi | 2 arch/arm/boot/dts/imx7d-pico.dtsi | 2 arch/arm/boot/dts/qcom-ipq4019.dtsi | 4 arch/arm/crypto/aes-neonbs-glue.c | 2 arch/arm/mach-exynos/firmware.c | 1 arch/arm/mach-exynos/suspend.c | 2 arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 2 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 1 arch/arm64/crypto/aes-neonbs-glue.c | 2 arch/arm64/crypto/ghash-ce-glue.c | 10 arch/arm64/include/asm/arch_timer.h | 33 ++ arch/arm64/include/asm/processor.h | 8 arch/arm64/kernel/debug-monitors.c | 1 arch/arm64/kernel/sys.c | 2 arch/arm64/kernel/vdso/gettimeofday.S | 15 - arch/arm64/mm/proc.S | 34 +- arch/arm64/net/bpf_jit.h | 6 arch/arm64/net/bpf_jit_comp.c | 1 arch/powerpc/mm/hash_low_32.S | 3 arch/s390/Kconfig | 1 arch/s390/include/asm/pgtable.h | 79 +++-- arch/s390/mm/Makefile | 2 arch/s390/mm/gup.c | 300 --------------------- arch/x86/crypto/crct10dif-pclmul_glue.c | 13 arch/x86/entry/entry_32.S | 2 arch/x86/entry/entry_64.S | 2 arch/x86/include/asm/switch_to.h | 1 arch/x86/kernel/cpu/mce/amd.c | 52 ++- arch/x86/kernel/cpu/mce/core.c | 8 arch/x86/kernel/cpu/mce/genpool.c | 3 arch/x86/kernel/cpu/mce/internal.h | 9 arch/x86/kernel/process_32.c | 7 arch/x86/kernel/process_64.c | 8 arch/x86/kernel/traps.c | 8 arch/x86/kvm/lapic.c | 2 arch/x86/kvm/vmx/vmx.c | 25 - arch/x86/kvm/x86.c | 37 +- arch/x86/platform/pvh/enlighten.c | 8 arch/x86/xen/efi.c | 12 arch/x86/xen/enlighten_pv.c | 2 arch/x86/xen/enlighten_pvh.c | 7 arch/x86/xen/xen-ops.h | 4 crypto/ccm.c | 44 +-- crypto/chacha20poly1305.c | 4 crypto/chacha_generic.c | 2 crypto/crct10dif_generic.c | 11 crypto/gcm.c | 34 -- crypto/lrw.c | 4 crypto/salsa20_generic.c | 2 crypto/skcipher.c | 9 drivers/acpi/sleep.c | 4 drivers/char/ipmi/ipmi_dmi.c | 2 drivers/char/ipmi/ipmi_plat_data.c | 27 + drivers/char/ipmi/ipmi_plat_data.h | 3 drivers/char/ipmi/ipmi_si_hardcode.c | 1 drivers/char/ipmi/ipmi_si_hotmod.c | 1 drivers/char/ipmi/ipmi_ssif.c | 6 drivers/crypto/amcc/crypto4xx_alg.c | 12 drivers/crypto/amcc/crypto4xx_core.c | 31 +- drivers/crypto/caam/caamalg_qi2.c | 177 +++++------- drivers/crypto/caam/caamalg_qi2.h | 2 drivers/crypto/ccp/psp-dev.c | 2 drivers/crypto/ccree/cc_aead.c | 11 drivers/crypto/ccree/cc_buffer_mgr.c | 113 ++----- drivers/crypto/ccree/cc_driver.h | 1 drivers/crypto/ccree/cc_fips.c | 23 + drivers/crypto/ccree/cc_fips.h | 2 drivers/crypto/ccree/cc_hash.c | 28 + drivers/crypto/ccree/cc_ivgen.c | 9 drivers/crypto/ccree/cc_pm.c | 9 drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c | 25 + drivers/crypto/vmx/aesp8-ppc.pl | 4 drivers/dax/Kconfig | 3 drivers/dax/device.c | 6 drivers/edac/mce_amd.c | 4 drivers/md/bcache/journal.c | 11 drivers/md/bcache/super.c | 2 drivers/mmc/core/queue.c | 1 drivers/mmc/host/Kconfig | 1 drivers/mmc/host/sdhci-of-arasan.c | 5 drivers/mmc/host/sdhci-pci-core.c | 96 ++++++ drivers/mmc/host/sdhci-tegra.c | 1 drivers/mtd/maps/Kconfig | 2 drivers/mtd/maps/physmap-core.c | 2 drivers/mtd/spi-nor/intel-spi.c | 8 drivers/nvdimm/label.c | 29 +- drivers/nvdimm/namespace_devs.c | 15 + drivers/nvdimm/nd.h | 4 drivers/power/supply/axp288_charger.c | 4 drivers/power/supply/axp288_fuel_gauge.c | 20 + drivers/tty/hvc/hvc_riscv_sbi.c | 1 drivers/tty/vt/keyboard.c | 33 +- drivers/tty/vt/vt.c | 2 fs/btrfs/backref.c | 34 +- fs/btrfs/ctree.c | 10 fs/btrfs/ctree.h | 6 fs/btrfs/disk-io.c | 27 + fs/btrfs/disk-io.h | 3 fs/btrfs/extent-tree.c | 25 + fs/btrfs/ioctl.c | 19 + fs/btrfs/send.c | 62 ++++ fs/cifs/cifs_debug.c | 2 fs/dax.c | 6 fs/ext4/extents.c | 17 + fs/ext4/file.c | 7 fs/ext4/ioctl.c | 2 fs/ext4/mballoc.c | 2 fs/ext4/namei.c | 5 fs/ext4/resize.c | 1 fs/ext4/super.c | 62 ++-- fs/ext4/xattr.c | 2 fs/fs-writeback.c | 11 fs/hugetlbfs/inode.c | 7 fs/jbd2/journal.c | 53 ++- fs/jbd2/revoke.c | 32 +- fs/jbd2/transaction.c | 8 fs/ocfs2/export.c | 30 ++ include/acpi/platform/aclinux.h | 10 include/linux/huge_mm.h | 6 include/linux/hugetlb.h | 4 include/linux/jbd2.h | 8 include/linux/mfd/da9063/registers.h | 6 include/linux/mfd/max77620.h | 4 kernel/bpf/core.c | 4 kernel/fork.c | 31 ++ kernel/locking/rwsem-xadd.c | 44 ++- mm/compaction.c | 4 mm/huge_memory.c | 16 - mm/hugetlb.c | 25 - mm/mincore.c | 23 + mm/userfaultfd.c | 3 sound/pci/hda/patch_hdmi.c | 11 sound/pci/hda/patch_realtek.c | 68 ++-- sound/soc/codecs/hdac_hdmi.c | 11 sound/soc/codecs/max98090.c | 12 sound/soc/codecs/rt5677-spi.c | 35 +- sound/soc/fsl/fsl_esai.c | 2 sound/usb/line6/toneport.c | 16 - sound/usb/mixer.c | 2 tools/objtool/check.c | 3 virt/kvm/kvm_main.c | 2 157 files changed, 1360 insertions(+), 1078 deletions(-)Adrian Hunter (1):
mmc: sdhci-pci: Fix BYT OCP settingAlexander Sverdlin (1):
mtd: spi-nor: intel-spi: Avoid crossing 4K address boundary on read/writeAndrea Arcangeli (1):
userfaultfd: use RCU to free the task struct when fork failsAndy Lutomirski (2):
x86/speculation/mds: Revert CPU buffer clear on double fault exit x86/speculation/mds: Improve CPU buffer clear documentationAneesh Kumar K.V (1):
drivers/dax: Allow to includeDEV_DAX_PMEMas builtinAnup Patel (1):
tty: Don't force RISCV SBI console as preferred consoleBarret Rhoden (1):
ext4: fix use-after-free race withdebug_want_extra_isizeBoyang Zhou (1):
arm64: mmap: Ensure file offset is treated as unsignedChengguang Xu (1):
jbd2: fix potential double freeChris Packham (2):
mtd: maps: physmap: Storegpio_valuescorrectly
mtd: maps: AllowMTD_PHYSMAPwithMTD_RAMChristian Lamparter (3):
ARM: dts: qcom: ipq4019: enlarge PCIe BAR range
crypto: crypto4xx - fix ctr-aes missing output IV
crypto: crypto4xx - fix cfb and ofb "overran dst buffer" issuesChristoph Muellner (3):
arm64: dts: rockchip: Disable DCMDs on RK3399's eMMC controller.
mmc: sdhci-of-arasan: Add DTS property to disable DCMDs.
dt-bindings: mmc: Add disable-cqe-dcmd property.Christophe Leroy (1):
powerpc/32s: fixflush_hash_pages()on SMPColy Li (1):
bcache: never setKEY_PTRSof journal key to 0 injournal_reclaim()Corey Minyard (1):
ipmi: Add the i2c-addr property for SSIF interfacesCurtis Malainey (1):
ASoC: RT5677-SPI: Disable 16Bit SPI TransfersDan Williams (2):
mm/huge_memory: fix vmf_insert_pfn_{pmd, pud}() crash, handle unaligned addresses libnvdimm/namespace: Fix label tracking errorDaniel Axtens (1):
crypto: vmx - fix copy-paste error in CTR modeDaniel Borkmann (2):
bpf, arm64: remove prefetch insn in xadd mapping
bpf: fix out of bounds backwards jmps due to dead code removalDebabrata Banerjee (1):
ext4: fixext4_show_optionsfor file systems w/o journalDmitry Osipenko (1):
mfd: max77620: Fix swappedFPS_PERIOD_MAX_USvaluesEric Biggers (12):
crypto: salsa20 - don't access already-freed walk.iv
crypto: lrw - don't access already-freed walk.iv
crypto: chacha-generic - fix use as arm64 no-NEON fallback
crypto: chacha20poly1305 - setcra_namecorrectly
crypto: ccm - fix incompatibility between "ccm" and "ccm_base"
crypto: skcipher - don't WARN on unprocessed data after slow walk step
crypto: crct10dif-generic - fix use viacrypto_shash_digest()
crypto: x86/crct10dif-pcl - fix use viacrypto_shash_digest()
crypto: arm64/gcm-aes-ce - fix no-NEON fallback code
crypto: gcm - fix incompatibility between "gcm" and "gcm_base"
crypto: arm/aes-neonbs - don't access already-freed walk.iv
crypto: arm64/aes-neonbs - don't access already-freed walk.ivErik Schmauss (1):
ACPICA: Linux: moveACPI_DEBUG_DEFAULTflag out of ifndefFabio Estevam (1):
ARM: dts: imx: Fix the AR803X phy-modeFilipe Manana (4):
Btrfs: send, flush dellaloc in order to avoid data loss
Btrfs: do not start a transaction during fiemap
Btrfs: do not start a transaction atiterate_extent_inodes()
Btrfs: fix race between send and deduplication that lead to failures and crashesGilad Ben-Yossef (5):
crypto: ccree - remove special handling of chained sg
crypto: ccree - fix mem leak on error path
crypto: ccree - don't map MAC key on stack
crypto: ccree - use correct internal state sizes for export
crypto: ccree - don't map AEAD key and IV on stackGreg Kroah-Hartman (1):
Linux 5.1.4Gustavo A. R. Silva (1):
power: supply:axp288_charger: Fix unchecked return valueHans de Goede (1):
power: supply:axp288_fuel_gauge: Add ACEPC T8 and T11 mini PCs to the blacklistHoria Geantă (3):
crypto: caam/qi2 - fix zero-length buffer DMA mapping
crypto: caam/qi2 - fix DMA mapping of stack memory
crypto: caam/qi2 - generate hash keys in-placeHui Wang (2):
ALSA: hda/hdmi - Read the pin sense from register when repolling
ALSA: hda/hdmi - Considereld_validwhen reporting jack eventJan Kara (2):
ext4: make sanity check in mballoc more strict
ext4: avoid panic during forced reboot due to aborted journalJean-Philippe Brucker (2):
arm64: ClearOSDLR_EL1on CPU boot
arm64: Save and restoreOSDLR_EL1across suspend/resumeJeremy Soller (2):
ALSA: hdea/realtek - Headset fixup for System76 Gazelle (gaze14)
ALSA: hda/realtek - Corrected fixup for System76 Gazelle (gaze14)Jiri Kosina (1):
mm/mincore.c: makemincore()more conservativeJiufei Xue (2):
jbd2: check superblock mapped prior to committing
fs/writeback.c: usercu_barrier()to wait for inflight wb switches going into workqueue when umountJon Hunter (1):
ASoC: max98090: Fix restore of DAPM MuxesJosh Poimboeuf (1):
objtool: Fix function fallthrough detectionKai Shen (1):
mm/hugetlb.c: don'tput_pagein lock ofhugetlb_lockKailang Yang (2):
ALSA: hda/realtek - EAPD turn on later
ALSA: hda/realtek - Fixup headphone noise via runtime suspendKamlakant Patel (1):
ipmi:ssif: compare block number correctly for multi-part return messagesKatsuhiro Suzuki (1):
arm64: dts: rockchip: fix IO domain voltage setting of APIO5 on rockpro64Kirill Tkhai (1):
ext4: actually request zeroing of inode table after growLiang Chen (1):
bcache: fix a race between cache register and cacheset unregisterLibin Yang (1):
ASoC: codec:hdac_hdmiadddevice_linkto card deviceLukas Czerner (1):
ext4: fix data corruption caused by overlapping unaligned and aligned IOMartin Schwidefsky (2):
s390/mm: make thepxd_offsetfunctions more robust s390/mm: convert to the genericget_user_pages_fastcodeMasahiro Yamada (1):
kbuild: turn auto.conf.cmd into a mandatory include fileMel Gorman (1):
mm/compaction.c: correct zone boundary handling when isolating pages from a pageblockMichał Wadowski (1):
ALSA: hda/realtek - Fix for Lenovo B50-70 inverted internal microphone bugMike Kravetz (1):
hugetlb: use same fault hash key for shared and private mappingsNikolay Borisov (2):
btrfs: Correctly free extent buffer in casebtree_read_extent_buffer_pagesfails
btrfs: Honour FITRIM range constraints during free space trimOfir Drang (4):
crypto: ccree - pm resume first enable the source clk
crypto: ccree -HOST_POWER_DOWN_ENshould be the last CC access during suspend
crypto: ccree - add function to handle cryptocell tee fips error
crypto: ccree - handle tee fips error during power management resumePan Bian (1):
ext4: avoid drop reference to iloc.bh twicePeter Xu (1):
KVM: Fix the bitmap range to copy during clear dirtyPeter Zijlstra (1):
sched/x86: Save [ER]FLAGS on context switchQu Wenruo (1):
btrfs: Check the first key and level for cached extent bufferRajat Jain (1):
ACPI: PM: Setenable_for_wakefor wakeup GPEs during suspend-to-idleRaul E Rangel (1):
mmc: core: Fix tag set memory leakRoger Pau Monne (2):
xen/pvh: setxen_domain_typeto HVM inxen_pvh_initxen/pvh: correctly setup the PV EFI interface for dom0S.j. Wang (1):
ASoC:fsl_esai: Fix missing break in switch statementSahitya Tummala (1):
ext4: fix use-after-free indx_release()Sean Christopherson (3):
Revert "KVM: nVMX: Expose RDPMC-exiting only when guest supports PMU"
KVM: x86: Skip EFER vs. guest CPUID checks for host-initiated writes
KVM: lapic: Busy wait for timer to expire when usinghv_timerSergei Trofimovich (1):
tty/vt: fix write/write race in ioctl(KDSKBSENT) handlerShuning Zhang (1):
ocfs2: fix ocfs2 read inode data panic inocfs2_igetSingh, Brijesh (1):
crypto: ccp - Do not freepsp_masterwhenPLATFORM_INITfailsSowjanya Komatineni (1):
mmc: tegra: fix ddr signaling for non-ddr modesSriram Rajagopalan (1):
ext4: zero out the unused memory region in the extent tree blockSteve French (1):
smb3: display session id in debug dataSteve Twiss (1):
mfd: da9063: Fix OTP control register names to match datasheets for DA9063/63LStuart Menefy (1):
ARM: dts: exynos: Fix interrupt for shared EINTs on Exynos5260Sylwester Nawrocki (2):
ARM: dts: exynos: Fix audio routing on Odroid XU3
ARM: dts: exynos: Fix audio (microphone) routing on Odroid XU3Takashi Iwai (1):
ALSA: line6: toneport: Fix broken usage of timer for delayed executionTheodore Ts'o (1):
ext4: ignoree_value_offsfor xattrs with value-in-ea-inodeVincenzo Frascino (1):
arm64: compat: Reduce address limitWaiman Long (1):
locking/rwsem: Prevent decrement of reader count before incrementWen Yang (1):
ARM: exynos: Fix a leaked reference by adding missingof_node_putWenwen Wang (1):
ALSA: usb-audio: Fix a memory leak bugWill Deacon (1):
arm64:arch_timer: Ensure counter register reads occur with seqlock heldYazen Ghannam (2):
x86/MCE: Add an MCE-record filtering function x86/MCE/AMD: Don't report L1 BTB MCA errors on some family 17h modelsYifeng Li (1):
tty: vt.c: Fix TIOCL_BLANKSCREEN console blanking if blankinterval == 0Zhang Zhijie (1):
crypto: rockchip - update IV buffer to contain the next IV