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

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

Merge 5.4.150 into android11-5.4-lts 



Changes in 5.4.150
	ocfs2: drop acl cache for directories too
	usb: gadget: r8a66597: fix a loop in set_feature()
	usb: dwc2: gadget: Fix ISOC flow for BDMA and Slave
	usb: dwc2: gadget: Fix ISOC transfer complete handling for DDMA
	usb: musb: tusb6010: uninitialized data in tusb_fifo_write_unaligned()
	cifs: fix incorrect check for null pointer in header_assemble
	xen/x86: fix PV trap handling on secondary processors
	usb-storage: Add quirk for ScanLogic SL11R-IDE older than 2.6c
	USB: serial: cp210x: add ID for GW Instek GDM-834x Digital Multimeter
	USB: cdc-acm: fix minor-number release
	binder: make sure fd closes complete
	staging: greybus: uart: fix tty use after free
	Re-enable UAS for LaCie Rugged USB3-FW with fk quirk
	usb: core: hcd: Add support for deferring roothub registration
	USB: serial: mos7840: remove duplicated 0xac24 device ID
	USB: serial: option: add Telit LN920 compositions
	USB: serial: option: remove duplicate USB device ID
	USB: serial: option: add device id for Foxconn T99W265
	mcb: fix error handling in mcb_alloc_bus()
	erofs: fix up erofs_lookup tracepoint
	btrfs: prevent __btrfs_dump_space_info() to underflow its free space
	xhci: Set HCD flag to defer primary roothub registration
	serial: mvebu-uart: fix driver's tx_empty callback
	net: hso: fix muxed tty registration
	afs: Fix incorrect triggering of sillyrename on 3rd-party invalidation
	platform/x86/intel: punit_ipc: Drop wrong use of ACPI_PTR()
	enetc: Fix illegal access when reading affinity_hint
	bnxt_en: Fix TX timeout when TX ring size is set to the smallest
	net/smc: add missing error check in smc_clc_prfx_set()
	gpio: uniphier: Fix void functions to remove return value
	qed: rdma - don't wait for resources under hw error recovery flow
	net/mlx4_en: Don't allow aRFS for encapsulated packets
	scsi: iscsi: Adjust iface sysfs attr detection
	tty: synclink_gt, drop unneeded forward declarations
	tty: synclink_gt: rename a conflicting function name
	fpga: machxo2-spi: Return an error on failure
	fpga: machxo2-spi: Fix missing error code in machxo2_write_complete()
	thermal/core: Potential buffer overflow in thermal_build_list_of_policies()
	cifs: fix a sign extension bug
	scsi: qla2xxx: Restore initiator in dual mode
	scsi: lpfc: Use correct scnprintf() limit
	irqchip/goldfish-pic: Select GENERIC_IRQ_CHIP to fix build
	irqchip/gic-v3-its: Fix potential VPE leak on error
	md: fix a lock order reversal in md_alloc
	blktrace: Fix uaf in blk_trace access after removing by sysfs
	net: macb: fix use after free on rmmod
	net: stmmac: allow CSR clock of 300MHz
	m68k: Double cast io functions to unsigned long
	ipv6: delay fib6_sernum increase in fib6_add
	bpf: Add oversize check before call kvcalloc()
	xen/balloon: use a kernel thread instead a workqueue
	nvme-multipath: fix ANA state updates when a namespace is not present
	sparc32: page align size in arch_dma_alloc
	blk-cgroup: fix UAF by grabbing blkcg lock before destroying blkg pd
	compiler.h: Introduce absolute_pointer macro
	net: i825xx: Use absolute_pointer for memcpy from fixed memory location
	sparc: avoid stringop-overread errors
	qnx4: avoid stringop-overread errors
	parisc: Use absolute_pointer() to define PAGE0
	arm64: Mark __stack_chk_guard as __ro_after_init
	alpha: Declare virt_to_phys and virt_to_bus parameter as pointer to volatile
	net: 6pack: Fix tx timeout and slot time
	spi: Fix tegra20 build with CONFIG_PM=n
	EDAC/synopsys: Fix wrong value type assignment for edac_mode
	thermal/drivers/int340x: Do not set a wrong tcc offset on resume
	arm64: dts: marvell: armada-37xx: Extend PCIe MEM space
	xen/balloon: fix balloon kthread freezing
	qnx4: work around gcc false positive warning bug
	Linux 5.4.150

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I779eab319e88381a228b9956ce1d2d45d76f2d2c
parents 2abce4ec 3a7dc5b4

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 149

SUBLEVEL = 150

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/alpha/include/asm/io.h

+3 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ extern inline void set_hae(unsigned long new_hae) 
 * Change virtual addresses to physical addresses and vv.

 */

#ifdef USE_48_BIT_KSEG

static inline unsigned long virt_to_phys(void *address)

static inline unsigned long virt_to_phys(volatile void *address)

{

	return (unsigned long)address - IDENT_ADDR;

}
@@ -71,7 +71,7 @@ static inline void * phys_to_virt(unsigned long address) 
	return (void *) (address + IDENT_ADDR);

}

#else

static inline unsigned long virt_to_phys(void *address)

static inline unsigned long virt_to_phys(volatile void *address)

{

        unsigned long phys = (unsigned long)address;
@@ -107,7 +107,7 @@ static inline void * phys_to_virt(unsigned long address) 
extern unsigned long __direct_map_base;

extern unsigned long __direct_map_size;



static inline unsigned long __deprecated virt_to_bus(void *address)

static inline unsigned long __deprecated virt_to_bus(volatile void *address)

{

	unsigned long phys = virt_to_phys(address);

	unsigned long bus = phys + __direct_map_base;

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

+17 −0
Original line number Diff line number Diff line
@@ -138,6 +138,23 @@ 
	max-link-speed = <2>;

	reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>;

	phys = <&comphy1 0>;

	/*

	 * 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

	 * 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.

	 * This bug is not present in U-Boot ports for other Armada 3700 devices and is fixed in

	 * U-Boot version 2021.07. See relevant U-Boot commits (the last one contains fix):

	 * 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

	 */

	#address-cells = <3>;

	#size-cells = <2>;

	ranges = <0x81000000 0 0xe8000000   0 0xe8000000   0 0x01000000   /* Port 0 IO */

		  0x82000000 0 0xe9000000   0 0xe9000000   0 0x07000000>; /* Port 0 MEM */



	/* enabled by U-Boot if PCIe module is present */

	status = "disabled";

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

+9 −2
Original line number Diff line number Diff line
@@ -487,8 +487,15 @@ 
			#interrupt-cells = <1>;

			msi-parent = <&pcie0>;

			msi-controller;

			ranges = <0x82000000 0 0xe8000000   0 0xe8000000 0 0x1000000 /* Port 0 MEM */

				  0x81000000 0 0xe9000000   0 0xe9000000 0 0x10000>; /* Port 0 IO*/

			/*

			 * The 128 MiB address range [0xe8000000-0xf0000000] is

			 * dedicated for PCIe and can be assigned to 8 windows

			 * with size a power of two. Use one 64 KiB window for

			 * IO at the end and the remaining seven windows

			 * (totaling 127 MiB) for MEM.

			 */

			ranges = <0x82000000 0 0xe8000000   0 0xe8000000   0 0x07f00000   /* Port 0 MEM */

				  0x81000000 0 0xefff0000   0 0xefff0000   0 0x00010000>; /* Port 0 IO */

			interrupt-map-mask = <0 0 0 7>;

			interrupt-map = <0 0 0 1 &pcie_intc 0>,

					<0 0 0 2 &pcie_intc 1>,

arch/arm64/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 


#if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_STACKPROTECTOR_PER_TASK)

#include <linux/stackprotector.h>

unsigned long __stack_chk_guard __read_mostly;

unsigned long __stack_chk_guard __ro_after_init;

EXPORT_SYMBOL(__stack_chk_guard);

#endif