Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80b62a22 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.185 into android11-5.4-lts 



Changes in 5.4.185
	clk: qcom: gdsc: Add support to update GDSC transition delay
	arm64: dts: armada-3720-turris-mox: Add missing ethernet0 alias
	virtio-blk: Don't use MAX_DISCARD_SEGMENTS if max_discard_seg is zero
	net: qlogic: check the return value of dma_alloc_coherent() in qed_vf_hw_prepare()
	qed: return status of qed_iov_get_link
	drm/sun4i: mixer: Fix P010 and P210 format numbers
	ARM: dts: aspeed: Fix AST2600 quad spi group
	ethernet: Fix error handling in xemaclite_of_probe
	net: ethernet: ti: cpts: Handle error for clk_enable
	net: ethernet: lpc_eth: Handle error for clk_enable
	ax25: Fix NULL pointer dereference in ax25_kill_by_device
	net/mlx5: Fix size field in bufferx_reg struct
	net/mlx5: Fix a race on command flush flow
	NFC: port100: fix use-after-free in port100_send_complete
	selftests: pmtu.sh: Kill tcpdump processes launched by subshell.
	gpio: ts4900: Do not set DAT and OE together
	gianfar: ethtool: Fix refcount leak in gfar_get_ts_info
	net: phy: DP83822: clear MISR2 register to disable interrupts
	sctp: fix kernel-infoleak for SCTP sockets
	net: bcmgenet: Don't claim WOL when its not available
	selftests/bpf: Add test for bpf_timer overwriting crash
	net-sysfs: add check for netdevice being present to speed_show
	Revert "xen-netback: remove 'hotplug-status' once it has served its purpose"
	Revert "xen-netback: Check for hotplug-status existence before watching"
	ipv6: prevent a possible race condition with lifetimes
	tracing: Ensure trace buffer is at least 4096 bytes large
	selftest/vm: fix map_fixed_noreplace test failure
	selftests/memfd: clean up mapping in mfd_fail_write
	ARM: Spectre-BHB: provide empty stub for non-config
	fuse: fix pipe buffer lifetime for direct_io
	staging: gdm724x: fix use after free in gdm_lte_rx()
	net: macb: Fix lost RX packet wakeup race in NAPI receive
	mmc: meson: Fix usage of meson_mmc_post_req()
	riscv: Fix auipc+jalr relocation range checks
	arm64: dts: marvell: armada-37xx: Remap IO space to bus address 0x0
	virtio: unexport virtio_finalize_features
	virtio: acknowledge all features before access
	ARM: fix Thumb2 regression with Spectre BHB
	ext4: add check to prevent attempting to resize an fs with sparse_super2
	x86/cpufeatures: Mark two free bits in word 3
	x86/cpu: Add hardware-enforced cache coherency as a CPUID feature
	x86/mm/pat: Don't flush cache if hardware enforces cache coherency across encryption domnains
	KVM: SVM: Don't flush cache if hardware enforces cache coherency across encryption domains
	Linux 5.4.185

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I35a63fb952ac7b80888f54bbef02dbf6d11f2e93
parents 9ed911a0 70f77a2c

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 184

SUBLEVEL = 185

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ 
	};



	pinctrl_fwqspid_default: fwqspid_default {

		function = "FWQSPID";

		function = "FWSPID";

		groups = "FWQSPID";

	};

arch/arm/include/asm/spectre.h

+6 −0
Original line number Diff line number Diff line
@@ -25,7 +25,13 @@ enum { 
	SPECTRE_V2_METHOD_LOOP8 = BIT(__SPECTRE_V2_METHOD_LOOP8),

};



#ifdef CONFIG_GENERIC_CPU_VULNERABILITIES

void spectre_v2_update_state(unsigned int state, unsigned int methods);

#else

static inline void spectre_v2_update_state(unsigned int state,

					   unsigned int methods)

{}

#endif



int spectre_bhb_update_vectors(unsigned int method);

arch/arm/kernel/entry-armv.S

+2 −2
Original line number Diff line number Diff line
@@ -1043,9 +1043,9 @@ vector_bhb_loop8_\name: 


	@ bhb workaround

	mov	r0, #8

1:	b	. + 4

3:	b	. + 4

	subs	r0, r0, #1

	bne	1b

	bne	3b

	dsb

	isb

	b	2b

arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts

+7 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


	aliases {

		spi0 = &spi0;

		ethernet0 = &eth0;

		ethernet1 = &eth1;

	};
@@ -137,7 +138,9 @@ 
	/*

	 * U-Boot port for Turris Mox has a bug which always expects that "ranges" DT property

	 * contains exactly 2 ranges with 3 (child) address cells, 2 (parent) address cells and

	 * 2 size cells and also expects that the second range starts at 16 MB offset. If these

	 * 2 size cells and also expects that the second range starts at 16 MB offset. Also it

	 * expects that first range uses same address for PCI (child) and CPU (parent) cells (so

	 * no remapping) and that this address is the lowest from all specified ranges. If these

	 * conditions are not met then U-Boot crashes during loading kernel DTB file. PCIe address

	 * space is 128 MB long, so the best split between MEM and IO is to use fixed 16 MB window

	 * for IO and the rest 112 MB (64+32+16) for MEM, despite that maximal IO size is just 64 kB.
@@ -146,6 +149,9 @@ 
	 * https://source.denx.de/u-boot/u-boot/-/commit/cb2ddb291ee6fcbddd6d8f4ff49089dfe580f5d7

	 * https://source.denx.de/u-boot/u-boot/-/commit/c64ac3b3185aeb3846297ad7391fc6df8ecd73bf

	 * https://source.denx.de/u-boot/u-boot/-/commit/4a82fca8e330157081fc132a591ebd99ba02ee33

	 * Bug related to requirement of same child and parent addresses for first range is fixed

	 * in U-Boot version 2022.04 by following commit:

	 * https://source.denx.de/u-boot/u-boot/-/commit/1fd54253bca7d43d046bba4853fe5fafd034bc17

	 */

	#address-cells = <3>;

	#size-cells = <2>;