Commit f3b9aac7 authored Sep 06, 2019 by Greg Kroah-Hartman

Merge 4.14.142 into android-4.14-q



Changes in 4.14.142
	dmaengine: ste_dma40: fix unneeded variable warning
	auxdisplay: panel: need to delete scan_timer when misc_register fails in panel_attach
	iommu/dma: Handle SG length overflow better
	usb: gadget: composite: Clear "suspended" on reset/disconnect
	usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt
	xen/blkback: fix memory leaks
	i2c: rcar: avoid race when unregistering slave client
	i2c: emev2: avoid race when unregistering slave client
	drm/ast: Fixed reboot test may cause system hanged
	usb: host: fotg2: restart hcd after port reset
	tools: hv: fix KVP and VSS daemons exit code
	watchdog: bcm2835_wdt: Fix module autoload
	drm/bridge: tfp410: fix memleak in get_modes()
	scsi: ufs: Fix RX_TERMINATION_FORCE_ENABLE define value
	drm/tilcdc: Register cpufreq notifier after we have initialized crtc
	tcp: fix tcp_rtx_queue_tail in case of empty retransmit queue
	ALSA: usb-audio: Fix a stack buffer overflow bug in check_input_term
	ALSA: usb-audio: Fix an OOB bug in parse_audio_mixer_unit
	net/smc: make sure EPOLLOUT is raised
	tcp: make sure EPOLLOUT wont be missed
	mm/zsmalloc.c: fix build when CONFIG_COMPACTION=n
	ALSA: line6: Fix memory leak at line6_init_pcm() error path
	ALSA: seq: Fix potential concurrent access to the deleted pool
	kvm: x86: skip populating logical dest map if apic is not sw enabled
	KVM: x86: Don't update RIP or do single-step on faulting emulation
	x86/apic: Do not initialize LDR and DFR for bigsmp
	x86/apic: Include the LDR when clearing out APIC registers
	ftrace: Fix NULL pointer dereference in t_probe_next()
	ftrace: Check for successful allocation of hash
	ftrace: Check for empty hash and comment the race with registering probes
	usb-storage: Add new JMS567 revision to unusual_devs
	USB: cdc-wdm: fix race between write and disconnect due to flag abuse
	usb: chipidea: udc: don't do hardware access if gadget has stopped
	usb: host: ohci: fix a race condition between shutdown and irq
	usb: host: xhci: rcar: Fix typo in compatible string matching
	USB: storage: ums-realtek: Update module parameter description for auto_delink_en
	USB: storage: ums-realtek: Whitelist auto-delink support
	uprobes/x86: Fix detection of 32-bit user mode
	mmc: sdhci-of-at91: add quirk for broken HS200
	mmc: core: Fix init of SD cards reporting an invalid VDD range
	stm class: Fix a double free of stm_source_device
	intel_th: pci: Add support for another Lewisburg PCH
	intel_th: pci: Add Tiger Lake support
	drm/i915: Don't deballoon unused ggtt drm_mm_node in linux guest
	VMCI: Release resource if the work is already queued
	crypto: ccp - Ignore unconfigured CCP device on suspend/resume
	Revert "cfg80211: fix processing world regdomain when non modular"
	mac80211: fix possible sta leak
	KVM: PPC: Book3S: Fix incorrect guest-to-user-translation error handling
	KVM: arm/arm64: vgic: Fix potential deadlock when ap_list is long
	KVM: arm/arm64: vgic-v2: Handle SGI bits in GICD_I{S,C}PENDR0 as WI
	NFS: Clean up list moves of struct nfs_page
	NFSv4/pnfs: Fix a page lock leak in nfs_pageio_resend()
	NFS: Pass error information to the pgio error cleanup routine
	NFS: Ensure O_DIRECT reports an error if the bytes read/written is 0
	i2c: piix4: Fix port selection for AMD Family 16h Model 30h
	x86/ptrace: fix up botched merge of spectrev1 fix
	Revert "ASoC: Fail card instantiation if DAI format setup fails"
	Linux 4.14.142

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

parents 7055ef02 414510bc

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 14
		SUBLEVEL = 141
		SUBLEVEL = 142
		EXTRAVERSION =
		NAME = Petit Gorille

arch/powerpc/kvm/book3s_64_vio.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -566,8 +566,10 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu,

		if (kvmppc_gpa_to_ua(vcpu->kvm,
		tce & ~(TCE_PCI_READ \| TCE_PCI_WRITE),
		&ua, NULL))
		return H_PARAMETER;
		&ua, NULL)) {
		ret = H_PARAMETER;
		goto unlock_exit;
		}

		list_for_each_entry_lockless(stit, &stt->iommu_tables, next) {
		ret = kvmppc_tce_iommu_map(vcpu->kvm,

arch/powerpc/kvm/book3s_64_vio_hv.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -475,8 +475,10 @@ long kvmppc_rm_h_put_tce_indirect(struct kvm_vcpu *vcpu,
		ua = 0;
		if (kvmppc_gpa_to_ua(vcpu->kvm,
		tce & ~(TCE_PCI_READ \| TCE_PCI_WRITE),
		&ua, NULL))
		return H_PARAMETER;
		&ua, NULL)) {
		ret = H_PARAMETER;
		goto unlock_exit;
		}

		list_for_each_entry_lockless(stit, &stt->iommu_tables, next) {
		ret = kvmppc_rm_tce_iommu_map(vcpu->kvm,

arch/x86/kernel/apic/apic.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1148,6 +1148,10 @@ void clear_local_APIC(void)
		apic_write(APIC_LVT0, v \| APIC_LVT_MASKED);
		v = apic_read(APIC_LVT1);
		apic_write(APIC_LVT1, v \| APIC_LVT_MASKED);
		if (!x2apic_enabled()) {
		v = apic_read(APIC_LDR) & ~APIC_LDR_MASK;
		apic_write(APIC_LDR, v);
		}
		if (maxlvt >= 4) {
		v = apic_read(APIC_LVTPC);
		apic_write(APIC_LVTPC, v \| APIC_LVT_MASKED);

arch/x86/kernel/apic/bigsmp_32.c

+2 −22

Original line number	Diff line number	Diff line
		@@ -38,32 +38,12 @@ static int bigsmp_early_logical_apicid(int cpu)
		return early_per_cpu(x86_cpu_to_apicid, cpu);
		}

		static inline unsigned long calculate_ldr(int cpu)
		{
		unsigned long val, id;

		val = apic_read(APIC_LDR) & ~APIC_LDR_MASK;
		id = per_cpu(x86_bios_cpu_apicid, cpu);
		val \|= SET_APIC_LOGICAL_ID(id);

		return val;
		}

		/*
		* Set up the logical destination ID.
		*
		* Intel recommends to set DFR, LDR and TPR before enabling
		* an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel
		* document number 292116). So here it goes...
		* bigsmp enables physical destination mode
		* and doesn't use LDR and DFR
		*/
		static void bigsmp_init_apic_ldr(void)
		{
		unsigned long val;
		int cpu = smp_processor_id();

		apic_write(APIC_DFR, APIC_DFR_FLAT);
		val = calculate_ldr(cpu);
		apic_write(APIC_LDR, val);
		}

		static void bigsmp_setup_apic_routing(void)