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

Commit 874997f9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.143 into android11-5.4-lts 



Changes in 5.4.143
	ext4: fix EXT4_MAX_LOGICAL_BLOCK macro
	x86/fpu: Make init_fpstate correct with optimized XSAVE
	ath: Use safer key clearing with key cache entries
	ath9k: Clear key cache explicitly on disabling hardware
	ath: Export ath_hw_keysetmac()
	ath: Modify ath_key_delete() to not need full key entry
	ath9k: Postpone key cache entry deletion for TXQ frames reference it
	mtd: cfi_cmdset_0002: fix crash when erasing/writing AMD cards
	media: zr364xx: propagate errors from zr364xx_start_readpipe()
	media: zr364xx: fix memory leaks in probe()
	media: drivers/media/usb: fix memory leak in zr364xx_probe
	USB: core: Avoid WARNings for 0-length descriptor requests
	dmaengine: xilinx_dma: Fix read-after-free bug when terminating transfers
	dmaengine: usb-dmac: Fix PM reference leak in usb_dmac_probe()
	ARM: dts: am43x-epos-evm: Reduce i2c0 bus speed for tps65218
	dmaengine: of-dma: router_xlate to return -EPROBE_DEFER if controller is not yet available
	scsi: megaraid_mm: Fix end of loop tests for list_for_each_entry()
	scsi: scsi_dh_rdac: Avoid crash during rdac_bus_attach()
	scsi: core: Avoid printing an error if target_alloc() returns -ENXIO
	scsi: core: Fix capacity set to zero after offlinining device
	ARM: dts: nomadik: Fix up interrupt controller node names
	net: usb: lan78xx: don't modify phy_device state concurrently
	drm/amd/display: Fix Dynamic bpp issue with 8K30 with Navi 1X
	Bluetooth: hidp: use correct wait queue when removing ctrl_wait
	iommu: Check if group is NULL before remove device
	cpufreq: armada-37xx: forbid cpufreq for 1.2 GHz variant
	dccp: add do-while-0 stubs for dccp_pr_debug macros
	virtio: Protect vqs list access
	vhost: Fix the calculation in vhost_overflow()
	bpf: Clear zext_dst of dead insns
	bnxt: don't lock the tx queue from napi poll
	bnxt: disable napi before canceling DIM
	net: 6pack: fix slab-out-of-bounds in decode_data
	ptp_pch: Restore dependency on PCI
	bnxt_en: Add missing DMA memory barriers
	vrf: Reset skb conntrack connection on VRF rcv
	virtio-net: support XDP when not more queues
	virtio-net: use NETIF_F_GRO_HW instead of NETIF_F_LRO
	net: qlcnic: add missed unlock in qlcnic_83xx_flash_read32
	net: mdio-mux: Don't ignore memory allocation errors
	net: mdio-mux: Handle -EPROBE_DEFER correctly
	ovs: clear skb->tstamp in forwarding path
	i40e: Fix ATR queue selection
	iavf: Fix ping is lost after untrusted VF had tried to change MAC
	ovl: add splice file read write helper
	mmc: dw_mmc: Fix hang on data CRC error
	ALSA: hda - fix the 'Capture Switch' value change notifications
	tracing / histogram: Fix NULL pointer dereference on strcmp() on NULL event name
	slimbus: messaging: start transaction ids from 1 instead of zero
	slimbus: messaging: check for valid transaction id
	slimbus: ngd: reset dma setup during runtime pm
	ipack: tpci200: fix many double free issues in tpci200_pci_probe
	ipack: tpci200: fix memory leak in the tpci200_register
	btrfs: prevent rename2 from exchanging a subvol with a directory from different parents
	PCI: Increase D3 delay for AMD Renoir/Cezanne XHCI
	ASoC: intel: atom: Fix breakage for PCM buffer address setup
	mm, memcg: avoid stale protection values when cgroup is above protection
	mm: memcontrol: fix occasional OOMs due to proportional memory.low reclaim
	fs: warn about impending deprecation of mandatory locks
	netfilter: nft_exthdr: fix endianness of tcp option cast
	Linux 5.4.143

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I5220b773c51448c4b92f8b51dc002afe144a8499
parents 2d724dbd fd809232

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 142

SUBLEVEL = 143

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/boot/dts/am43x-epos-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	clock-frequency = <400000>;

	clock-frequency = <100000>;



	tps65218: tps65218@24 {

		reg = <0x24>;

arch/arm/boot/dts/ste-nomadik-stn8815.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -755,14 +755,14 @@ 
			status = "disabled";

		};



		vica: intc@10140000 {

		vica: interrupt-controller@10140000 {

			compatible = "arm,versatile-vic";

			interrupt-controller;

			#interrupt-cells = <1>;

			reg = <0x10140000 0x20>;

		};



		vicb: intc@10140020 {

		vicb: interrupt-controller@10140020 {

			compatible = "arm,versatile-vic";

			interrupt-controller;

			#interrupt-cells = <1>;

arch/x86/include/asm/fpu/internal.h

+8 −22
Original line number Diff line number Diff line
@@ -204,6 +204,14 @@ static inline void copy_fxregs_to_kernel(struct fpu *fpu) 
		asm volatile("fxsaveq %[fx]" : [fx] "=m" (fpu->state.fxsave));

}



static inline void fxsave(struct fxregs_state *fx)

{

	if (IS_ENABLED(CONFIG_X86_32))

		asm volatile( "fxsave %[fx]" : [fx] "=m" (*fx));

	else

		asm volatile("fxsaveq %[fx]" : [fx] "=m" (*fx));

}



/* These macros all use (%edi)/(%rdi) as the single memory argument. */

#define XSAVE		".byte " REX_PREFIX "0x0f,0xae,0x27"

#define XSAVEOPT	".byte " REX_PREFIX "0x0f,0xae,0x37"
@@ -272,28 +280,6 @@ static inline void copy_fxregs_to_kernel(struct fpu *fpu) 
		     : "D" (st), "m" (*st), "a" (lmask), "d" (hmask)	\

		     : "memory")



/*

 * This function is called only during boot time when x86 caps are not set

 * up and alternative can not be used yet.

 */

static inline void copy_xregs_to_kernel_booting(struct xregs_state *xstate)

{

	u64 mask = -1;

	u32 lmask = mask;

	u32 hmask = mask >> 32;

	int err;



	WARN_ON(system_state != SYSTEM_BOOTING);



	if (boot_cpu_has(X86_FEATURE_XSAVES))

		XSTATE_OP(XSAVES, xstate, lmask, hmask, err);

	else

		XSTATE_OP(XSAVE, xstate, lmask, hmask, err);



	/* We should never fault when copying to a kernel buffer: */

	WARN_ON_FPU(err);

}



/*

 * This function is called only during boot time when x86 caps are not set

 * up and alternative can not be used yet.

arch/x86/kernel/fpu/xstate.c

+35 −3
Original line number Diff line number Diff line
@@ -398,6 +398,24 @@ static void __init print_xstate_offset_size(void) 
	}

}



/*

 * All supported features have either init state all zeros or are

 * handled in setup_init_fpu() individually. This is an explicit

 * feature list and does not use XFEATURE_MASK*SUPPORTED to catch

 * newly added supported features at build time and make people

 * actually look at the init state for the new feature.

 */

#define XFEATURES_INIT_FPSTATE_HANDLED		\

	(XFEATURE_MASK_FP |			\

	 XFEATURE_MASK_SSE |			\

	 XFEATURE_MASK_YMM |			\

	 XFEATURE_MASK_OPMASK |			\

	 XFEATURE_MASK_ZMM_Hi256 |		\

	 XFEATURE_MASK_Hi16_ZMM	 |		\

	 XFEATURE_MASK_PKRU |			\

	 XFEATURE_MASK_BNDREGS |		\

	 XFEATURE_MASK_BNDCSR)



/*

 * setup the xstate image representing the init state

 */
@@ -405,6 +423,8 @@ static void __init setup_init_fpu_buf(void) 
{

	static int on_boot_cpu __initdata = 1;



	BUILD_BUG_ON(XCNTXT_MASK != XFEATURES_INIT_FPSTATE_HANDLED);



	WARN_ON_FPU(!on_boot_cpu);

	on_boot_cpu = 0;
@@ -423,10 +443,22 @@ static void __init setup_init_fpu_buf(void) 
	copy_kernel_to_xregs_booting(&init_fpstate.xsave);



	/*

	 * Dump the init state again. This is to identify the init state

	 * of any feature which is not represented by all zero's.

	 */

	copy_xregs_to_kernel_booting(&init_fpstate.xsave);

	 * All components are now in init state. Read the state back so

	 * that init_fpstate contains all non-zero init state. This only

	 * works with XSAVE, but not with XSAVEOPT and XSAVES because

	 * those use the init optimization which skips writing data for

	 * components in init state.

	 *

	 * XSAVE could be used, but that would require to reshuffle the

	 * data when XSAVES is available because XSAVES uses xstate

	 * compaction. But doing so is a pointless exercise because most

	 * components have an all zeros init state except for the legacy

	 * ones (FP and SSE). Those can be saved with FXSAVE into the

	 * legacy area. Adding new features requires to ensure that init

	 * state is all zeroes or if not to add the necessary handling

	 * here.

	 */

	fxsave(&init_fpstate.fxsave);

}



static int xfeature_uncompacted_offset(int xfeature_nr)