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

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

Merge 5.4.266 into android11-5.4-lts 



Changes in 5.4.266
	ALSA: hda/realtek: Enable headset on Lenovo M90 Gen5
	ksmbd: fix wrong name of SMB2_CREATE_ALLOCATION_SIZE
	ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init
	reset: Fix crash when freeing non-existent optional resets
	s390/vx: fix save/restore of fpu kernel context
	wifi: mac80211: mesh_plink: fix matches_local logic
	Revert "net/mlx5e: fix double free of encap_header"
	net/mlx5: improve some comments
	net/mlx5: Fix fw tracer first block check
	net/mlx5e: Correct snprintf truncation handling for fw_version buffer used by representors
	net: sched: ife: fix potential use-after-free
	ethernet: atheros: fix a memleak in atl1e_setup_ring_resources
	net/rose: fix races in rose_kill_by_device()
	net: check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev()
	afs: Fix the dynamic root's d_delete to always delete unused dentries
	afs: Fix dynamic root lookup DNS check
	net: warn if gso_type isn't set for a GSO SKB
	net: check dev->gso_max_size in gso_features_check()
	afs: Fix overwriting of result of DNS query
	i2c: aspeed: Handle the coalesced stop conditions with the start conditions.
	pinctrl: at91-pio4: use dedicated lock class for IRQ
	ALSA: hda/hdmi: Add quirk to force pin connectivity on NUC10
	ALSA: hda/hdmi: add force-connect quirk for NUC5CPYB
	smb: client: fix NULL deref in asn1_ber_decoder()
	btrfs: do not allow non subvolume root targets for snapshot
	interconnect: Treat xlate() returning NULL node as an error
	iio: imu: inv_mpu6050: fix an error code problem in inv_mpu6050_read_raw
	Input: ipaq-micro-keys - add error handling for devm_kmemdup
	scsi: bnx2fc: Fix skb double free in bnx2fc_rcv()
	iio: common: ms_sensors: ms_sensors_i2c: fix humidity conversion time table
	iio: adc: ti_am335x_adc: Fix return value check of tiadc_request_dma()
	wifi: cfg80211: Add my certificate
	wifi: cfg80211: fix certs build to not depend on file order
	USB: serial: ftdi_sio: update Actisense PIDs constant names
	USB: serial: option: add Quectel EG912Y module support
	USB: serial: option: add Foxconn T99W265 with new baseline
	USB: serial: option: add Quectel RM500Q R13 firmware support
	Bluetooth: hci_event: Fix not checking if HCI_OP_INQUIRY has been sent
	net: 9p: avoid freeing uninit memory in p9pdu_vreadf
	net: rfkill: gpio: set GPIO direction
	x86/alternatives: Sync core before enabling interrupts
	usb: fotg210-hcd: delete an incorrect bounds test
	smb: client: fix OOB in smbCalcSize()
	ring-buffer: Fix wake ups when buffer_percent is set to 100
	block: Don't invalidate pagecache for invalid falloc modes
	Linux 5.4.266

Change-Id: I472b7a8986c208b7d8232a9f2b13b154e13ac11e
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents e2be5133 4410df70

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 265

SUBLEVEL = 266

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/mach-omap2/id.c

+5 −0
Original line number Diff line number Diff line
@@ -797,10 +797,15 @@ void __init omap_soc_device_init(void) 


	soc_dev_attr->machine  = soc_name;

	soc_dev_attr->family   = omap_get_family();

	if (!soc_dev_attr->family) {

		kfree(soc_dev_attr);

		return;

	}

	soc_dev_attr->revision = soc_rev;



	soc_dev = soc_device_register(soc_dev_attr);

	if (IS_ERR(soc_dev)) {

		kfree(soc_dev_attr->family);

		kfree(soc_dev_attr);

		return;

	}

arch/s390/include/asm/fpu/api.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static inline int test_fp_ctl(u32 fpc) 
#define KERNEL_VXR_HIGH		(KERNEL_VXR_V16V23|KERNEL_VXR_V24V31)



#define KERNEL_VXR		(KERNEL_VXR_LOW|KERNEL_VXR_HIGH)

#define KERNEL_FPR		(KERNEL_FPC|KERNEL_VXR_V0V7)

#define KERNEL_FPR		(KERNEL_FPC|KERNEL_VXR_LOW)



struct kernel_fpu;

arch/x86/kernel/alternative.c

+1 −1
Original line number Diff line number Diff line
@@ -759,8 +759,8 @@ void __init_or_module text_poke_early(void *addr, const void *opcode, 
	} else {

		local_irq_save(flags);

		memcpy(addr, opcode, len);

		local_irq_restore(flags);

		sync_core();

		local_irq_restore(flags);



		/*

		 * Could also do a CLFLUSH here to speed up CPU recovery; but

drivers/i2c/busses/i2c-aspeed.c

+32 −16
Original line number Diff line number Diff line
@@ -250,18 +250,46 @@ static u32 aspeed_i2c_slave_irq(struct aspeed_i2c_bus *bus, u32 irq_status) 
	if (!slave)

		return 0;



	command = readl(bus->base + ASPEED_I2C_CMD_REG);

	/*

	 * Handle stop conditions early, prior to SLAVE_MATCH. Some masters may drive

	 * transfers with low enough latency between the nak/stop phase of the current

	 * command and the start/address phase of the following command that the

	 * interrupts are coalesced by the time we process them.

	 */

	if (irq_status & ASPEED_I2CD_INTR_NORMAL_STOP) {

		irq_handled |= ASPEED_I2CD_INTR_NORMAL_STOP;

		bus->slave_state = ASPEED_I2C_SLAVE_STOP;

	}



	if (irq_status & ASPEED_I2CD_INTR_TX_NAK &&

	    bus->slave_state == ASPEED_I2C_SLAVE_READ_PROCESSED) {

		irq_handled |= ASPEED_I2CD_INTR_TX_NAK;

		bus->slave_state = ASPEED_I2C_SLAVE_STOP;

	}



	/* Propagate any stop conditions to the slave implementation. */

	if (bus->slave_state == ASPEED_I2C_SLAVE_STOP) {

		i2c_slave_event(slave, I2C_SLAVE_STOP, &value);

		bus->slave_state = ASPEED_I2C_SLAVE_INACTIVE;

	}



	/* Slave was requested, restart state machine. */

	/*

	 * Now that we've dealt with any potentially coalesced stop conditions,

	 * address any start conditions.

	 */

	if (irq_status & ASPEED_I2CD_INTR_SLAVE_MATCH) {

		irq_handled |= ASPEED_I2CD_INTR_SLAVE_MATCH;

		bus->slave_state = ASPEED_I2C_SLAVE_START;

	}



	/* Slave is not currently active, irq was for someone else. */

	/*

	 * If the slave has been stopped and not started then slave interrupt

	 * handling is complete.

	 */

	if (bus->slave_state == ASPEED_I2C_SLAVE_INACTIVE)

		return irq_handled;



	command = readl(bus->base + ASPEED_I2C_CMD_REG);

	dev_dbg(bus->dev, "slave irq status 0x%08x, cmd 0x%08x\n",

		irq_status, command);
@@ -280,17 +308,6 @@ static u32 aspeed_i2c_slave_irq(struct aspeed_i2c_bus *bus, u32 irq_status) 
		irq_handled |= ASPEED_I2CD_INTR_RX_DONE;

	}



	/* Slave was asked to stop. */

	if (irq_status & ASPEED_I2CD_INTR_NORMAL_STOP) {

		irq_handled |= ASPEED_I2CD_INTR_NORMAL_STOP;

		bus->slave_state = ASPEED_I2C_SLAVE_STOP;

	}

	if (irq_status & ASPEED_I2CD_INTR_TX_NAK &&

	    bus->slave_state == ASPEED_I2C_SLAVE_READ_PROCESSED) {

		irq_handled |= ASPEED_I2CD_INTR_TX_NAK;

		bus->slave_state = ASPEED_I2C_SLAVE_STOP;

	}



	switch (bus->slave_state) {

	case ASPEED_I2C_SLAVE_READ_REQUESTED:

		if (unlikely(irq_status & ASPEED_I2CD_INTR_TX_ACK))
@@ -319,8 +336,7 @@ static u32 aspeed_i2c_slave_irq(struct aspeed_i2c_bus *bus, u32 irq_status) 
		i2c_slave_event(slave, I2C_SLAVE_WRITE_RECEIVED, &value);

		break;

	case ASPEED_I2C_SLAVE_STOP:

		i2c_slave_event(slave, I2C_SLAVE_STOP, &value);

		bus->slave_state = ASPEED_I2C_SLAVE_INACTIVE;

		/* Stop event handling is done early. Unreachable. */

		break;

	case ASPEED_I2C_SLAVE_START:

		/* Slave was just started. Waiting for the next event. */;