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

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

Merge 4.19.232 into android-4.19-stable 



Changes in 4.19.232
	cgroup/cpuset: Fix a race between cpuset_attach() and cpu hotplug
	vhost/vsock: don't check owner in vhost_vsock_stop() while releasing
	parisc/unaligned: Fix fldd and fstd unaligned handlers on 32-bit kernel
	parisc/unaligned: Fix ldw() and stw() unalignment handlers
	sr9700: sanity check for packet length
	USB: zaurus: support another broken Zaurus
	ping: remove pr_err from ping_lookup
	net: __pskb_pull_tail() & pskb_carve_frag_list() drop_monitor friends
	tipc: Fix end of loop tests for list_for_each_entry()
	gso: do not skip outer ip header in case of ipip and net_failover
	openvswitch: Fix setting ipv6 fields causing hw csum failure
	drm/edid: Always set RGB444
	net/mlx5e: Fix wrong return value on ioctl EEPROM query failure
	configfs: fix a race in configfs_{,un}register_subsystem()
	RDMA/ib_srp: Fix a deadlock
	tty: n_gsm: fix proper link termination after failed open
	gpio: tegra186: Fix chip_data type confusion
	Revert "drm/nouveau/pmu/gm200-: avoid touching PMU outside of DEVINIT/PREOS/ACR"
	memblock: use kfree() to release kmalloced memblock regions
	fget: clarify and improve __fget_files() implementation
	tracing: Have traceon and traceoff trigger honor the instance
	iio: adc: men_z188_adc: Fix a resource leak in an error handling path
	ata: pata_hpt37x: disable primary channel on HPT371
	Revert "USB: serial: ch341: add new Product ID for CH341A"
	usb: gadget: rndis: add spinlock for rndis response list
	USB: gadget: validate endpoint index for xilinx udc
	tracefs: Set the group ownership in apply_options() not parse_options()
	USB: serial: option: add support for DW5829e
	USB: serial: option: add Telit LE910R1 compositions
	usb: dwc3: pci: Fix Bay Trail phy GPIO mappings
	usb: dwc3: gadget: Let the interrupt handler disable bottom halves.
	xhci: re-initialize the HC during resume if HCE was set
	xhci: Prevent futile URB re-submissions due to incorrect return value.
	tty: n_gsm: fix encoding of control signal octet bit DV
	Linux 4.19.232

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I7604e43e0d2cc019835f0508e0a0e5116d72bc85
parents 930ed74b d5b90e6e

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 231

SUBLEVEL = 232

EXTRAVERSION =

NAME = "People's Front"

arch/parisc/kernel/unaligned.c

+7 −7
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static int emulate_stw(struct pt_regs *regs, int frreg, int flop) 
	: "r" (val), "r" (regs->ior), "r" (regs->isr)

	: "r19", "r20", "r21", "r22", "r1", FIXUP_BRANCH_CLOBBER );



	return 0;

	return ret;

}

static int emulate_std(struct pt_regs *regs, int frreg, int flop)

{
@@ -411,7 +411,7 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop) 
	__asm__ __volatile__ (

"	mtsp	%4, %%sr1\n"

"	zdep	%2, 29, 2, %%r19\n"

"	dep	%%r0, 31, 2, %2\n"

"	dep	%%r0, 31, 2, %3\n"

"	mtsar	%%r19\n"

"	zvdepi	-2, 32, %%r19\n"

"1:	ldw	0(%%sr1,%3),%%r20\n"
@@ -423,7 +423,7 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop) 
"	andcm	%%r21, %%r19, %%r21\n"

"	or	%1, %%r20, %1\n"

"	or	%2, %%r21, %2\n"

"3:	stw	%1,0(%%sr1,%1)\n"

"3:	stw	%1,0(%%sr1,%3)\n"

"4:	stw	%%r1,4(%%sr1,%3)\n"

"5:	stw	%2,8(%%sr1,%3)\n"

"	copy	%%r0, %0\n"
@@ -610,7 +610,6 @@ void handle_unaligned(struct pt_regs *regs) 
		ret = ERR_NOTHANDLED;	/* "undefined", but lets kill them. */

		break;

	}

#ifdef CONFIG_PA20

	switch (regs->iir & OPCODE2_MASK)

	{

	case OPCODE_FLDD_L:
@@ -621,22 +620,23 @@ void handle_unaligned(struct pt_regs *regs) 
		flop=1;

		ret = emulate_std(regs, R2(regs->iir),1);

		break;

#ifdef CONFIG_PA20

	case OPCODE_LDD_L:

		ret = emulate_ldd(regs, R2(regs->iir),0);

		break;

	case OPCODE_STD_L:

		ret = emulate_std(regs, R2(regs->iir),0);

		break;

	}

#endif

	}

	switch (regs->iir & OPCODE3_MASK)

	{

	case OPCODE_FLDW_L:

		flop=1;

		ret = emulate_ldw(regs, R2(regs->iir),0);

		ret = emulate_ldw(regs, R2(regs->iir), 1);

		break;

	case OPCODE_LDW_M:

		ret = emulate_ldw(regs, R2(regs->iir),1);

		ret = emulate_ldw(regs, R2(regs->iir), 0);

		break;



	case OPCODE_FSTW_L:

drivers/ata/pata_hpt37x.c

+14 −0
Original line number Diff line number Diff line
@@ -916,6 +916,20 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) 
	irqmask &= ~0x10;

	pci_write_config_byte(dev, 0x5a, irqmask);



	/*

	 * HPT371 chips physically have only one channel, the secondary one,

	 * but the primary channel registers do exist!  Go figure...

	 * So,  we manually disable the non-existing channel here

	 * (if the BIOS hasn't done this already).

	 */

	if (dev->device == PCI_DEVICE_ID_TTI_HPT371) {

		u8 mcr1;



		pci_read_config_byte(dev, 0x50, &mcr1);

		mcr1 &= ~0x04;

		pci_write_config_byte(dev, 0x50, mcr1);

	}



	/*

	 * default to pci clock. make sure MA15/16 are set to output

	 * to prevent drives having problems with 40-pin cables. Needed

drivers/gpio/gpio-tegra186.c

+10 −4
Original line number Diff line number Diff line
@@ -237,9 +237,12 @@ static int tegra186_gpio_of_xlate(struct gpio_chip *chip, 
	return offset + pin;

}



#define to_tegra_gpio(x) container_of((x), struct tegra_gpio, gpio)



static void tegra186_irq_ack(struct irq_data *data)

{

	struct tegra_gpio *gpio = irq_data_get_irq_chip_data(data);

	struct gpio_chip *gc = irq_data_get_irq_chip_data(data);

	struct tegra_gpio *gpio = to_tegra_gpio(gc);

	void __iomem *base;



	base = tegra186_gpio_get_base(gpio, data->hwirq);
@@ -251,7 +254,8 @@ static void tegra186_irq_ack(struct irq_data *data) 


static void tegra186_irq_mask(struct irq_data *data)

{

	struct tegra_gpio *gpio = irq_data_get_irq_chip_data(data);

	struct gpio_chip *gc = irq_data_get_irq_chip_data(data);

	struct tegra_gpio *gpio = to_tegra_gpio(gc);

	void __iomem *base;

	u32 value;
@@ -266,7 +270,8 @@ static void tegra186_irq_mask(struct irq_data *data) 


static void tegra186_irq_unmask(struct irq_data *data)

{

	struct tegra_gpio *gpio = irq_data_get_irq_chip_data(data);

	struct gpio_chip *gc = irq_data_get_irq_chip_data(data);

	struct tegra_gpio *gpio = to_tegra_gpio(gc);

	void __iomem *base;

	u32 value;
@@ -281,7 +286,8 @@ static void tegra186_irq_unmask(struct irq_data *data) 


static int tegra186_irq_set_type(struct irq_data *data, unsigned int flow)

{

	struct tegra_gpio *gpio = irq_data_get_irq_chip_data(data);

	struct gpio_chip *gc = irq_data_get_irq_chip_data(data);

	struct tegra_gpio *gpio = to_tegra_gpio(gc);

	void __iomem *base;

	u32 value;

drivers/gpu/drm/drm_edid.c

+1 −1
Original line number Diff line number Diff line
@@ -4899,6 +4899,7 @@ u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edi 
	if (!(edid->input & DRM_EDID_INPUT_DIGITAL))

		return quirks;



	info->color_formats |= DRM_COLOR_FORMAT_RGB444;

	drm_parse_cea_ext(connector, edid);



	/*
@@ -4952,7 +4953,6 @@ u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edi 
	DRM_DEBUG("%s: Assigning EDID-1.4 digital sink color depth as %d bpc.\n",

			  connector->name, info->bpc);



	info->color_formats |= DRM_COLOR_FORMAT_RGB444;

	if (edid->features & DRM_EDID_FEATURE_RGB_YCRCB444)

		info->color_formats |= DRM_COLOR_FORMAT_YCRCB444;

	if (edid->features & DRM_EDID_FEATURE_RGB_YCRCB422)