Commit cf192765 authored Dec 08, 2023 by Greg Kroah-Hartman

Merge 4.19.301 into android-4.19-stable



Changes in 4.19.301
	driver core: Release all resources during unbind before updating device links
	RDMA/irdma: Prevent zero-length STAG registration
	drm/panel: simple: Fix Innolux G101ICE-L01 timings
	ata: pata_isapnp: Add missing error check for devm_ioport_map()
	drm/rockchip: vop: Fix color for RGB888/BGR888 format on VOP full
	HID: core: store the unique system identifier in hid_device
	HID: fix HID device resource race between HID core and debugging support
	ipv4: Correct/silence an endian warning in __ip_do_redirect
	net: usb: ax88179_178a: fix failed operations during ax88179_reset
	arm/xen: fix xen_vcpu_info allocation alignment
	amd-xgbe: handle corner-case during sfp hotplug
	amd-xgbe: handle the corner-case during tx completion
	amd-xgbe: propagate the correct speed and duplex status
	net: axienet: Fix check for partial TX checksum
	MIPS: KVM: Fix a build warning about variable set but not used
	arm64: cpufeature: Extract capped perfmon fields
	KVM: arm64: limit PMU version to PMUv3 for ARMv8.1
	mtd: rawnand: brcmnand: Fix ecc chunk calculation for erased page bitfips
	bcache: replace a mistaken IS_ERR() by IS_ERR_OR_NULL() in btree_gc_coalesce()
	s390/dasd: protect device queue against concurrent access
	USB: serial: option: add Luat Air72*U series products
	hv_netvsc: Fix race of register_netdevice_notifier and VF register
	hv_netvsc: Mark VF as slave before exposing it to user-mode
	dm-delay: fix a race between delay_presuspend and delay_bio
	bcache: check return value from btree_node_alloc_replacement()
	bcache: prevent potential division by zero error
	USB: serial: option: add Fibocom L7xx modules
	USB: serial: option: fix FM101R-GL defines
	USB: serial: option: don't claim interface 4 for ZTE MF290
	USB: dwc2: write HCINT with INTMASK applied
	usb: dwc3: set the dma max_seg_size
	USB: dwc3: qcom: fix wakeup after probe deferral
	pinctrl: avoid reload of p state in list iteration
	firewire: core: fix possible memory leak in create_units()
	mmc: block: Do not lose cache flush during CQE error recovery
	ALSA: hda: Disable power-save on KONTRON SinglePC
	ALSA: hda/realtek: Headset Mic VREF to 100%
	dm-verity: align struct dm_verity_fec_io properly
	dm verity: don't perform FEC for failed readahead IO
	bcache: revert replacing IS_ERR_OR_NULL with IS_ERR
	powerpc: Don't clobber f0/vs0 during fp|altivec register save
	btrfs: fix off-by-one when checking chunk map includes logical address
	btrfs: send: ensure send_fd is writable
	Input: xpad - add HyperX Clutch Gladiate Support
	ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet
	ravb: Fix races between ravb_tx_timeout_work() and net related ops
	net: ravb: Start TX queues after HW initialization succeeded
	smb3: fix touch -h of symlink
	s390/mm: fix phys vs virt confusion in mark_kernel_pXd() functions family
	s390/cmma: fix detection of DAT pages
	mtd: cfi_cmdset_0001: Support the absence of protection registers
	mtd: cfi_cmdset_0001: Byte swap OTP info
	fbdev: stifb: Make the STI next font pointer a 32-bit signed offset
	ima: annotate iint mutex to avoid lockdep false positive warnings
	ovl: skip overlayfs superblocks at global sync
	ima: detect changes to the backing overlay file
	cpufreq: imx6q: don't warn for disabling a non-existing frequency
	cpufreq: imx6q: Don't disable 792 Mhz OPP unnecessarily
	mmc: cqhci: Increase recovery halt timeout
	mmc: cqhci: Warn of halt or task clear failure
	mmc: cqhci: Fix task clearing in CQE error recovery
	mmc: core: convert comma to semicolon
	mmc: block: Retry commands in CQE error recovery
	Linux 4.19.301

Change-Id: I51ad863523191dbe636079135c4b706c1a317d26
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parents 11806753 3e205b99

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 19
		SUBLEVEL = 300
		SUBLEVEL = 301
		EXTRAVERSION =
		NAME = "People's Front"

arch/arm/xen/enlighten.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -388,7 +388,8 @@ static int __init xen_guest_init(void)
		* for secondary CPUs as they are brought up.
		* For uniformity we use VCPUOP_register_vcpu_info even on cpu0.
		*/
		xen_vcpu_info = alloc_percpu(struct vcpu_info);
		xen_vcpu_info = __alloc_percpu(sizeof(struct vcpu_info),
		1 << fls(sizeof(struct vcpu_info) - 1));
		if (xen_vcpu_info == NULL)
		return -ENOMEM;

arch/arm64/include/asm/cpufeature.h

+23 −0

Original line number	Diff line number	Diff line
		@@ -422,6 +422,29 @@ cpuid_feature_extract_unsigned_field(u64 features, int field)
		return cpuid_feature_extract_unsigned_field_width(features, field, 4);
		}

		/*
		* Fields that identify the version of the Performance Monitors Extension do
		* not follow the standard ID scheme. See ARM DDI 0487E.a page D13-2825,
		* "Alternative ID scheme used for the Performance Monitors Extension version".
		*/
		static inline u64 __attribute_const__
		cpuid_feature_cap_perfmon_field(u64 features, int field, u64 cap)
		{
		u64 val = cpuid_feature_extract_unsigned_field(features, field);
		u64 mask = GENMASK_ULL(field + 3, field);

		/* Treat IMPLEMENTATION DEFINED functionality as unimplemented */
		if (val == 0xf)
		val = 0;

		if (val > cap) {
		features &= ~mask;
		features \|= (cap << field) & mask;
		}

		return features;
		}

		static inline u64 arm64_ftr_mask(const struct arm64_ftr_bits *ftrp)
		{
		return (u64)GENMASK(ftrp->shift + ftrp->width - 1, ftrp->shift);

arch/arm64/include/asm/sysreg.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -632,6 +632,12 @@
		#define ID_AA64DFR0_TRACEVER_SHIFT 4
		#define ID_AA64DFR0_DEBUGVER_SHIFT 0

		#define ID_AA64DFR0_PMUVER_8_1 0x4

		#define ID_DFR0_PERFMON_SHIFT 24

		#define ID_DFR0_PERFMON_8_1 0x4

		#define ID_ISAR5_RDM_SHIFT 24
		#define ID_ISAR5_CRC32_SHIFT 16
		#define ID_ISAR5_SHA2_SHIFT 12

arch/arm64/kvm/sys_regs.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -1049,6 +1049,16 @@ static u64 read_id_reg(struct sys_reg_desc const *r, bool raz)
		kvm_debug("LORegions unsupported for guests, suppressing\n");

		val &= ~(0xfUL << ID_AA64MMFR1_LOR_SHIFT);
		} else if (id == SYS_ID_AA64DFR0_EL1) {
		/* Limit guests to PMUv3 for ARMv8.1 */
		val = cpuid_feature_cap_perfmon_field(val,
		ID_AA64DFR0_PMUVER_SHIFT,
		ID_AA64DFR0_PMUVER_8_1);
		} else if (id == SYS_ID_DFR0_EL1) {
		/* Limit guests to PMUv3 for ARMv8.1 */
		val = cpuid_feature_cap_perfmon_field(val,
		ID_DFR0_PERFMON_SHIFT,
		ID_DFR0_PERFMON_8_1);
		}

		return val;