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

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

Merge 5.4.51 into android11-5.4 



Changes in 5.4.51
	io_uring: make sure async workqueue is canceled on exit
	mm: fix swap cache node allocation mask
	EDAC/amd64: Read back the scrub rate PCI register on F15h
	usbnet: smsc95xx: Fix use-after-free after removal
	sched/debug: Make sd->flags sysctl read-only
	mm/slub.c: fix corrupted freechain in deactivate_slab()
	mm/slub: fix stack overruns with SLUB_STATS
	rxrpc: Fix race between incoming ACK parser and retransmitter
	usb: usbtest: fix missing kfree(dev->buf) in usbtest_disconnect
	tools lib traceevent: Add append() function helper for appending strings
	tools lib traceevent: Handle __attribute__((user)) in field names
	s390/debug: avoid kernel warning on too large number of pages
	nvme-multipath: set bdi capabilities once
	nvme-multipath: fix deadlock between ana_work and scan_work
	nvme-multipath: fix deadlock due to head->lock
	nvme-multipath: fix bogus request queue reference put
	kgdb: Avoid suspicious RCU usage warning
	selftests: tpm: Use /bin/sh instead of /bin/bash
	tpm: Fix TIS locality timeout problems
	crypto: af_alg - fix use-after-free in af_alg_accept() due to bh_lock_sock()
	drm/msm/dpu: fix error return code in dpu_encoder_init
	rxrpc: Fix afs large storage transmission performance drop
	RDMA/counter: Query a counter before release
	cxgb4: use unaligned conversion for fetching timestamp
	cxgb4: parse TC-U32 key values and masks natively
	cxgb4: fix endian conversions for L4 ports in filters
	cxgb4: use correct type for all-mask IP address comparison
	cxgb4: fix SGE queue dump destination buffer context
	hwmon: (max6697) Make sure the OVERT mask is set correctly
	hwmon: (acpi_power_meter) Fix potential memory leak in acpi_power_meter_add()
	thermal/drivers/mediatek: Fix bank number settings on mt8183
	thermal/drivers/rcar_gen3: Fix undefined temperature if negative
	nfsd4: fix nfsdfs reference count loop
	nfsd: fix nfsdfs inode reference count leak
	drm: sun4i: hdmi: Remove extra HPD polling
	virtio-blk: free vblk-vqs in error path of virtblk_probe()
	SMB3: Honor 'posix' flag for multiuser mounts
	nvme: fix identify error status silent ignore
	nvme: fix a crash in nvme_mpath_add_disk
	samples/vfs: avoid warning in statx override
	i2c: algo-pca: Add 0x78 as SCL stuck low status for PCA9665
	i2c: mlxcpld: check correct size of maximum RECV_LEN packet
	spi: spi-fsl-dspi: Fix external abort on interrupt in resume or exit paths
	nfsd: apply umask on fs without ACL support
	Revert "ALSA: usb-audio: Improve frames size computation"
	SMB3: Honor 'seal' flag for multiuser mounts
	SMB3: Honor persistent/resilient handle flags for multiuser mounts
	SMB3: Honor lease disabling for multiuser mounts
	SMB3: Honor 'handletimeout' flag for multiuser mounts
	cifs: Fix the target file was deleted when rename failed.
	MIPS: lantiq: xway: sysctrl: fix the GPHY clock alias names
	MIPS: Add missing EHB in mtc0 -> mfc0 sequence for DSPen
	drm/amd/display: Only revalidate bandwidth on medium and fast updates
	drm/amdgpu: use %u rather than %d for sclk/mclk
	drm/amdgpu/atomfirmware: fix vram_info fetching for renoir
	dma-buf: Move dma_buf_release() from fops to dentry_ops
	irqchip/gic: Atomically update affinity
	mm, compaction: fully assume capture is not NULL in compact_zone_order()
	mm, compaction: make capture control handling safe wrt interrupts
	x86/resctrl: Fix memory bandwidth counter width for AMD
	dm zoned: assign max_io_len correctly
	efi: Make it possible to disable efivar_ssdt entirely
	Linux 5.4.51

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib29e1b61540451995ee757cf90c9ba24e6b8d6b3
parents 7db97d43 1c54d3c1

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 50

SUBLEVEL = 51

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/mips/kernel/traps.c

+1 −0
Original line number Diff line number Diff line
@@ -2126,6 +2126,7 @@ static void configure_status(void) 


	change_c0_status(ST0_CU|ST0_MX|ST0_RE|ST0_FR|ST0_BEV|ST0_TS|ST0_KX|ST0_SX|ST0_UX,

			 status_set);

	back_to_back_c0_hazard();

}



unsigned int hwrena;

arch/mips/lantiq/xway/sysctrl.c

+4 −4
Original line number Diff line number Diff line
@@ -514,8 +514,8 @@ void __init ltq_soc_init(void) 
		clkdev_add_pmu("1e10b308.eth", NULL, 0, 0, PMU_SWITCH |

			       PMU_PPE_DP | PMU_PPE_TC);

		clkdev_add_pmu("1da00000.usif", "NULL", 1, 0, PMU_USIF);

		clkdev_add_pmu("1e108000.gswip", "gphy0", 0, 0, PMU_GPHY);

		clkdev_add_pmu("1e108000.gswip", "gphy1", 0, 0, PMU_GPHY);

		clkdev_add_pmu("1e108000.switch", "gphy0", 0, 0, PMU_GPHY);

		clkdev_add_pmu("1e108000.switch", "gphy1", 0, 0, PMU_GPHY);

		clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);

		clkdev_add_pmu("1e116000.mei", "afe", 1, 2, PMU_ANALOG_DSL_AFE);

		clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);
@@ -538,8 +538,8 @@ void __init ltq_soc_init(void) 
				PMU_SWITCH | PMU_PPE_DPLUS | PMU_PPE_DPLUM |

				PMU_PPE_EMA | PMU_PPE_TC | PMU_PPE_SLL01 |

				PMU_PPE_QSB | PMU_PPE_TOP);

		clkdev_add_pmu("1e108000.gswip", "gphy0", 0, 0, PMU_GPHY);

		clkdev_add_pmu("1e108000.gswip", "gphy1", 0, 0, PMU_GPHY);

		clkdev_add_pmu("1e108000.switch", "gphy0", 0, 0, PMU_GPHY);

		clkdev_add_pmu("1e108000.switch", "gphy1", 0, 0, PMU_GPHY);

		clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_SDIO);

		clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);

		clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);

arch/s390/kernel/debug.c

+2 −1
Original line number Diff line number Diff line
@@ -198,9 +198,10 @@ static debug_entry_t ***debug_areas_alloc(int pages_per_area, int nr_areas) 
	if (!areas)

		goto fail_malloc_areas;

	for (i = 0; i < nr_areas; i++) {

		/* GFP_NOWARN to avoid user triggerable WARN, we handle fails */

		areas[i] = kmalloc_array(pages_per_area,

					 sizeof(debug_entry_t *),

					 GFP_KERNEL);

					 GFP_KERNEL | __GFP_NOWARN);

		if (!areas[i])

			goto fail_malloc_areas2;

		for (j = 0; j < pages_per_area; j++) {

arch/x86/kernel/cpu/resctrl/core.c

+2 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ static bool __get_mem_config_intel(struct rdt_resource *r) 
	r->num_closid = edx.split.cos_max + 1;

	r->membw.max_delay = eax.split.max_delay + 1;

	r->default_ctrl = MAX_MBA_BW;

	r->membw.mbm_width = MBM_CNTR_WIDTH;

	if (ecx & MBA_IS_LINEAR) {

		r->membw.delay_linear = true;

		r->membw.min_bw = MAX_MBA_BW - r->membw.max_delay;
@@ -289,6 +290,7 @@ static bool __rdt_get_mem_config_amd(struct rdt_resource *r) 
	/* AMD does not use delay */

	r->membw.delay_linear = false;



	r->membw.mbm_width = MBM_CNTR_WIDTH_AMD;

	r->membw.min_bw = 0;

	r->membw.bw_gran = 1;

	/* Max value is 2048, Data width should be 4 in decimal */