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

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

Merge 5.4.31 into android-5.4 



Changes in 5.4.31
	nvme-rdma: Avoid double freeing of async event data
	kconfig: introduce m32-flag and m64-flag
	drm/amd/display: Add link_rate quirk for Apple 15" MBP 2017
	drm/bochs: downgrade pci_request_region failure from error to warning
	initramfs: restore default compression behavior
	drm/amdgpu: fix typo for vcn1 idle check
	tools/power turbostat: Fix gcc build warnings
	tools/power turbostat: Fix missing SYS_LPI counter on some Chromebooks
	tools/power turbostat: Fix 32-bit capabilities warning
	net/mlx5e: kTLS, Fix TCP seq off-by-1 issue in TX resync flow
	XArray: Fix xa_find_next for large multi-index entries
	padata: fix uninitialized return value in padata_replace()
	brcmfmac: abort and release host after error
	misc: rtsx: set correct pcr_ops for rts522A
	misc: pci_endpoint_test: Fix to support > 10 pci-endpoint-test devices
	misc: pci_endpoint_test: Avoid using module parameter to determine irqtype
	PCI: sysfs: Revert "rescan" file renames
	coresight: do not use the BIT() macro in the UAPI header
	mei: me: add cedar fork device ids
	nvmem: check for NULL reg_read and reg_write before dereferencing
	extcon: axp288: Add wakeup support
	power: supply: axp288_charger: Add special handling for HP Pavilion x2 10
	Revert "dm: always call blk_queue_split() in dm_process_bio()"
	ALSA: hda/ca0132 - Add Recon3Di quirk to handle integrated sound on EVGA X99 Classified motherboard
	soc: mediatek: knows_txdone needs to be set in Mediatek CMDQ helper
	net/mlx5e: kTLS, Fix wrong value in record tracker enum
	iwlwifi: consider HE capability when setting LDPC
	iwlwifi: yoyo: don't add TLV offset when reading FIFOs
	iwlwifi: dbg: don't abort if sending DBGC_SUSPEND_RESUME fails
	rxrpc: Fix sendmsg(MSG_WAITALL) handling
	IB/hfi1: Ensure pq is not left on waitlist
	tcp: fix TFO SYNACK undo to avoid double-timestamp-undo
	watchdog: iTCO_wdt: Export vendorsupport
	watchdog: iTCO_wdt: Make ICH_RES_IO_SMI optional
	i2c: i801: Do not add ICH_RES_IO_SMI for the iTCO_wdt device
	net: Fix Tx hash bound checking
	padata: always acquire cpu_hotplug_lock before pinst->lock
	mm: mempolicy: require at least one nodeid for MPOL_PREFERRED
	Linux 5.4.31

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I9c87409ae13ad2da7a90be98586a85904a5cdb33
parents e93e4b4f de850633

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 30

SUBLEVEL = 31

EXTRAVERSION =

NAME = Kleptomaniac Octopus

drivers/extcon/extcon-axp288.c

+32 −0
Original line number Diff line number Diff line
@@ -423,9 +423,40 @@ static int axp288_extcon_probe(struct platform_device *pdev) 
	/* Start charger cable type detection */

	axp288_extcon_enable(info);



	device_init_wakeup(dev, true);

	platform_set_drvdata(pdev, info);



	return 0;

}



static int __maybe_unused axp288_extcon_suspend(struct device *dev)

{

	struct axp288_extcon_info *info = dev_get_drvdata(dev);



	if (device_may_wakeup(dev))

		enable_irq_wake(info->irq[VBUS_RISING_IRQ]);



	return 0;

}



static int __maybe_unused axp288_extcon_resume(struct device *dev)

{

	struct axp288_extcon_info *info = dev_get_drvdata(dev);



	/*

	 * Wakeup when a charger is connected to do charger-type

	 * connection and generate an extcon event which makes the

	 * axp288 charger driver set the input current limit.

	 */

	if (device_may_wakeup(dev))

		disable_irq_wake(info->irq[VBUS_RISING_IRQ]);



	return 0;

}



static SIMPLE_DEV_PM_OPS(axp288_extcon_pm_ops, axp288_extcon_suspend,

			 axp288_extcon_resume);



static const struct platform_device_id axp288_extcon_table[] = {

	{ .name = "axp288_extcon" },

	{},
@@ -437,6 +468,7 @@ static struct platform_driver axp288_extcon_driver = { 
	.id_table = axp288_extcon_table,

	.driver = {

		.name = "axp288_extcon",

		.pm = &axp288_extcon_pm_ops,

	},

};

drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c

+1 −1
Original line number Diff line number Diff line
@@ -1375,7 +1375,7 @@ static int vcn_v1_0_set_clockgating_state(void *handle, 


	if (enable) {

		/* wait for STATUS to clear */

		if (vcn_v1_0_is_idle(handle))

		if (!vcn_v1_0_is_idle(handle))

			return -EBUSY;

		vcn_v1_0_enable_clock_gating(adev);

	} else {

drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c

+11 −0
Original line number Diff line number Diff line
@@ -2879,6 +2879,17 @@ static bool retrieve_link_cap(struct dc_link *link) 
		sink_id.ieee_device_id,

		sizeof(sink_id.ieee_device_id));



	/* Quirk Apple MBP 2017 15" Retina panel: Wrong DP_MAX_LINK_RATE */

	{

		uint8_t str_mbp_2017[] = { 101, 68, 21, 101, 98, 97 };



		if ((link->dpcd_caps.sink_dev_id == 0x0010fa) &&

		    !memcmp(link->dpcd_caps.sink_dev_id_str, str_mbp_2017,

			    sizeof(str_mbp_2017))) {

			link->reported_link_cap.link_rate = 0x0c;

		}

	}



	core_link_read_dpcd(

		link,

		DP_SINK_HW_REVISION_START,

drivers/gpu/drm/bochs/bochs_hw.c

+2 −4
Original line number Diff line number Diff line
@@ -156,10 +156,8 @@ int bochs_hw_init(struct drm_device *dev) 
		size = min(size, mem);

	}



	if (pci_request_region(pdev, 0, "bochs-drm") != 0) {

		DRM_ERROR("Cannot request framebuffer\n");

		return -EBUSY;

	}

	if (pci_request_region(pdev, 0, "bochs-drm") != 0)

		DRM_WARN("Cannot request framebuffer, boot fb still active?\n");



	bochs->fb_map = ioremap(addr, size);

	if (bochs->fb_map == NULL) {