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

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

Merge 4.19.163 into android-4.19-stable 



Changes in 4.19.163
	pinctrl: baytrail: Replace WARN with dev_info_once when setting direct-irq pin to output
	pinctrl: baytrail: Fix pin being driven low for a while on gpiod_get(..., GPIOD_OUT_HIGH)
	usb: gadget: f_fs: Use local copy of descriptors for userspace copy
	USB: serial: kl5kusb105: fix memleak on open
	USB: serial: ch341: add new Product ID for CH341A
	USB: serial: ch341: sort device-id entries
	USB: serial: option: add Fibocom NL668 variants
	USB: serial: option: add support for Thales Cinterion EXS82
	USB: serial: option: fix Quectel BG96 matching
	tty: Fix ->pgrp locking in tiocspgrp()
	tty: Fix ->session locking
	ALSA: hda/realtek: Add mute LED quirk to yet another HP x360 model
	ALSA: hda/realtek: Enable headset of ASUS UX482EG & B9400CEA with ALC294
	ALSA: hda/realtek - Add new codec supported for ALC897
	ALSA: hda/generic: Add option to enforce preferred_dacs pairs
	ftrace: Fix updating FTRACE_FL_TRAMP
	cifs: fix potential use-after-free in cifs_echo_request()
	i2c: imx: Don't generate STOP condition if arbitration has been lost
	scsi: mpt3sas: Fix ioctl timeout
	dm writecache: fix the maximum number of arguments
	dm: remove invalid sparse __acquires and __releases annotations
	mm: list_lru: set shrinker map bit when child nr_items is not zero
	mm/swapfile: do not sleep with a spin lock held
	x86/uprobes: Do not use prefixes.nbytes when looping over prefixes.bytes
	i2c: imx: Fix reset of I2SR_IAL flag
	i2c: imx: Check for I2SR_IAL after every byte
	speakup: Reject setting the speakup line discipline outside of speakup
	iommu/amd: Set DTE[IntTabLen] to represent 512 IRTEs
	spi: Introduce device-managed SPI controller allocation
	spi: bcm-qspi: Fix use-after-free on unbind
	spi: bcm2835: Fix use-after-free on unbind
	spi: bcm2835: Release the DMA channel if probe fails after dma_init
	tracing: Fix userstacktrace option for instances
	gfs2: check for empty rgrp tree in gfs2_ri_update
	i2c: qup: Fix error return code in qup_i2c_bam_schedule_desc()
	dm writecache: remove BUG() and fail gracefully instead
	Input: i8042 - fix error return code in i8042_setup_aux()
	netfilter: nf_tables: avoid false-postive lockdep splat
	x86/insn-eval: Use new for_each_insn_prefix() macro to loop over prefixes bytes
	Revert "geneve: pull IP header before ECN decapsulation"
	Linux 4.19.163

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I65bc0b27c576e6d5c75f0bc085cb80e9a2f0a2d3
parents 87758b92 13d2ce42

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 162

SUBLEVEL = 163

EXTRAVERSION =

NAME = "People's Front"

arch/x86/include/asm/insn.h

+15 −0
Original line number Diff line number Diff line
@@ -208,6 +208,21 @@ static inline int insn_offset_immediate(struct insn *insn) 
	return insn_offset_displacement(insn) + insn->displacement.nbytes;

}



/**

 * for_each_insn_prefix() -- Iterate prefixes in the instruction

 * @insn: Pointer to struct insn.

 * @idx:  Index storage.

 * @prefix: Prefix byte.

 *

 * Iterate prefix bytes of given @insn. Each prefix byte is stored in @prefix

 * and the index is stored in @idx (note that this @idx is just for a cursor,

 * do not change it.)

 * Since prefixes.nbytes can be bigger than 4 if some prefixes

 * are repeated, it cannot be used for looping over the prefixes.

 */

#define for_each_insn_prefix(insn, idx, prefix)	\

	for (idx = 0; idx < ARRAY_SIZE(insn->prefixes.bytes) && (prefix = insn->prefixes.bytes[idx]) != 0; idx++)



#define POP_SS_OPCODE 0x1f

#define MOV_SREG_OPCODE 0x8e

arch/x86/kernel/uprobes.c

+6 −4
Original line number Diff line number Diff line
@@ -268,12 +268,13 @@ static volatile u32 good_2byte_insns[256 / 32] = { 


static bool is_prefix_bad(struct insn *insn)

{

	insn_byte_t p;

	int i;



	for (i = 0; i < insn->prefixes.nbytes; i++) {

	for_each_insn_prefix(insn, i, p) {

		insn_attr_t attr;



		attr = inat_get_opcode_attribute(insn->prefixes.bytes[i]);

		attr = inat_get_opcode_attribute(p);

		switch (attr) {

		case INAT_MAKE_PREFIX(INAT_PFX_ES):

		case INAT_MAKE_PREFIX(INAT_PFX_CS):
@@ -728,6 +729,7 @@ static const struct uprobe_xol_ops push_xol_ops = { 
static int branch_setup_xol_ops(struct arch_uprobe *auprobe, struct insn *insn)

{

	u8 opc1 = OPCODE1(insn);

	insn_byte_t p;

	int i;



	switch (opc1) {
@@ -758,8 +760,8 @@ static int branch_setup_xol_ops(struct arch_uprobe *auprobe, struct insn *insn) 
	 * Intel and AMD behavior differ in 64-bit mode: Intel ignores 66 prefix.

	 * No one uses these insns, reject any branch insns with such prefix.

	 */

	for (i = 0; i < insn->prefixes.nbytes; i++) {

		if (insn->prefixes.bytes[i] == 0x66)

	for_each_insn_prefix(insn, i, p) {

		if (p == 0x66)

			return -ENOTSUPP;

	}

arch/x86/lib/insn-eval.c

+3 −2
Original line number Diff line number Diff line
@@ -70,14 +70,15 @@ static int get_seg_reg_override_idx(struct insn *insn) 
{

	int idx = INAT_SEG_REG_DEFAULT;

	int num_overrides = 0, i;

	insn_byte_t p;



	insn_get_prefixes(insn);



	/* Look for any segment override prefixes. */

	for (i = 0; i < insn->prefixes.nbytes; i++) {

	for_each_insn_prefix(insn, i, p) {

		insn_attr_t attr;



		attr = inat_get_opcode_attribute(insn->prefixes.bytes[i]);

		attr = inat_get_opcode_attribute(p);

		switch (attr) {

		case INAT_MAKE_PREFIX(INAT_PFX_CS):

			idx = INAT_SEG_REG_CS;

drivers/i2c/busses/i2c-imx.c

+35 −7
Original line number Diff line number Diff line
@@ -404,6 +404,19 @@ static void i2c_imx_dma_free(struct imx_i2c_struct *i2c_imx) 
	dma->chan_using = NULL;

}



static void i2c_imx_clear_irq(struct imx_i2c_struct *i2c_imx, unsigned int bits)

{

	unsigned int temp;



	/*

	 * i2sr_clr_opcode is the value to clear all interrupts. Here we want to

	 * clear only <bits>, so we write ~i2sr_clr_opcode with just <bits>

	 * toggled. This is required because i.MX needs W0C and Vybrid uses W1C.

	 */

	temp = ~i2c_imx->hwdata->i2sr_clr_opcode ^ bits;

	imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2SR);

}



static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy)

{

	unsigned long orig_jiffies = jiffies;
@@ -416,8 +429,7 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy) 


		/* check for arbitration lost */

		if (temp & I2SR_IAL) {

			temp &= ~I2SR_IAL;

			imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2SR);

			i2c_imx_clear_irq(i2c_imx, I2SR_IAL);

			return -EAGAIN;

		}
@@ -448,6 +460,16 @@ static int i2c_imx_trx_complete(struct imx_i2c_struct *i2c_imx) 
		dev_dbg(&i2c_imx->adapter.dev, "<%s> Timeout\n", __func__);

		return -ETIMEDOUT;

	}



	/* check for arbitration lost */

	if (i2c_imx->i2csr & I2SR_IAL) {

		dev_dbg(&i2c_imx->adapter.dev, "<%s> Arbitration lost\n", __func__);

		i2c_imx_clear_irq(i2c_imx, I2SR_IAL);



		i2c_imx->i2csr = 0;

		return -EAGAIN;

	}



	dev_dbg(&i2c_imx->adapter.dev, "<%s> TRX complete\n", __func__);

	i2c_imx->i2csr = 0;

	return 0;
@@ -557,6 +579,8 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx) 
		/* Stop I2C transaction */

		dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__);

		temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2CR);

		if (!(temp & I2CR_MSTA))

			i2c_imx->stopped = 1;

		temp &= ~(I2CR_MSTA | I2CR_MTX);

		if (i2c_imx->dma)

			temp &= ~I2CR_DMAEN;
@@ -587,9 +611,7 @@ static irqreturn_t i2c_imx_isr(int irq, void *dev_id) 
	if (temp & I2SR_IIF) {

		/* save status register */

		i2c_imx->i2csr = temp;

		temp &= ~I2SR_IIF;

		temp |= (i2c_imx->hwdata->i2sr_clr_opcode & I2SR_IIF);

		imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2SR);

		i2c_imx_clear_irq(i2c_imx, I2SR_IIF);

		wake_up(&i2c_imx->queue);

		return IRQ_HANDLED;

	}
@@ -722,8 +744,11 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx, 
		 */

		dev_dbg(dev, "<%s> clear MSTA\n", __func__);

		temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2CR);

		if (!(temp & I2CR_MSTA))

			i2c_imx->stopped = 1;

		temp &= ~(I2CR_MSTA | I2CR_MTX);

		imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2CR);

		if (!i2c_imx->stopped)

			i2c_imx_bus_busy(i2c_imx, 0);

	} else {

		/*
@@ -847,8 +872,11 @@ static int i2c_imx_read(struct imx_i2c_struct *i2c_imx, struct i2c_msg *msgs, bo 
				dev_dbg(&i2c_imx->adapter.dev,

					"<%s> clear MSTA\n", __func__);

				temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2CR);

				if (!(temp & I2CR_MSTA))

					i2c_imx->stopped =  1;

				temp &= ~(I2CR_MSTA | I2CR_MTX);

				imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2CR);

				if (!i2c_imx->stopped)

					i2c_imx_bus_busy(i2c_imx, 0);

			} else {

				/*