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

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

Merge 4.14.56 into android-4.14 



Changes in 4.14.56
	media: rc: mce_kbd decoder: fix stuck keys
	ASoC: mediatek: preallocate pages use platform device
	MIPS: Call dump_stack() from show_regs()
	MIPS: Use async IPIs for arch_trigger_cpumask_backtrace()
	MIPS: Fix ioremap() RAM check
	mmc: sdhci-esdhc-imx: allow 1.8V modes without 100/200MHz pinctrl states
	mmc: dw_mmc: fix card threshold control configuration
	ibmasm: don't write out of bounds in read handler
	staging: rtl8723bs: Prevent an underflow in rtw_check_beacon_data().
	staging: r8822be: Fix RTL8822be can't find any wireless AP
	ata: Fix ZBC_OUT command block check
	ata: Fix ZBC_OUT all bit handling
	vmw_balloon: fix inflation with batching
	ahci: Disable LPM on Lenovo 50 series laptops with a too old BIOS
	USB: serial: ch341: fix type promotion bug in ch341_control_in()
	USB: serial: cp210x: add another USB ID for Qivicon ZigBee stick
	USB: serial: keyspan_pda: fix modem-status error handling
	USB: yurex: fix out-of-bounds uaccess in read handler
	USB: serial: mos7840: fix status-register error handling
	usb: quirks: add delay quirks for Corsair Strafe
	xhci: xhci-mem: off by one in xhci_stream_id_to_ring()
	devpts: hoist out check for DEVPTS_SUPER_MAGIC
	devpts: resolve devpts bind-mounts
	Fix up non-directory creation in SGID directories
	genirq/affinity: assign vectors to all possible CPUs
	scsi: megaraid_sas: use adapter_type for all gen controllers
	scsi: megaraid_sas: replace instance->ctrl_context checks with instance->adapter_type
	scsi: megaraid_sas: replace is_ventura with adapter_type checks
	scsi: megaraid_sas: Create separate functions to allocate ctrl memory
	scsi: megaraid_sas: fix selection of reply queue
	ALSA: hda/realtek - two more lenovo models need fixup of MIC_LOCATION
	ALSA: hda - Handle pm failure during hotplug
	mm: do not drop unused pages when userfaultd is running
	fs/proc/task_mmu.c: fix Locked field in /proc/pid/smaps*
	fs, elf: make sure to page align bss in load_elf_library
	mm: do not bug_on on incorrect length in __mm_populate()
	tracing: Reorder display of TGID to be after PID
	kbuild: delete INSTALL_FW_PATH from kbuild documentation
	arm64: neon: Fix function may_use_simd() return error status
	tools build: fix # escaping in .cmd files for future Make
	IB/hfi1: Fix incorrect mixing of ERR_PTR and NULL return values
	i2c: tegra: Fix NACK error handling
	iw_cxgb4: correctly enforce the max reg_mr depth
	xen: setup pv irq ops vector earlier
	nvme-pci: Remap CMB SQ entries on every controller reset
	crypto: x86/salsa20 - remove x86 salsa20 implementations
	uprobes/x86: Remove incorrect WARN_ON() in uprobe_init_insn()
	netfilter: nf_queue: augment nfqa_cfg_policy
	netfilter: x_tables: initialise match/target check parameter struct
	loop: add recursion validation to LOOP_CHANGE_FD
	PM / hibernate: Fix oops at snapshot_write()
	RDMA/ucm: Mark UCM interface as BROKEN
	loop: remember whether sysfs_create_group() was done
	f2fs: give message and set need_fsck given broken node id
	Linux 4.14.56

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 0eb88fbe cff26c95

Documentation/kbuild/kbuild.txt

+0 −9
Original line number Diff line number Diff line
@@ -152,15 +152,6 @@ stripped after they are installed. If INSTALL_MOD_STRIP is '1', then 
the default option --strip-debug will be used.  Otherwise,

INSTALL_MOD_STRIP value will be used as the options to the strip command.



INSTALL_FW_PATH

--------------------------------------------------

INSTALL_FW_PATH specifies where to install the firmware blobs.

The default value is:



    $(INSTALL_MOD_PATH)/lib/firmware



The value can be overridden in which case the default value is ignored.



INSTALL_HDR_PATH

--------------------------------------------------

INSTALL_HDR_PATH specifies where to install user space headers when

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 55

SUBLEVEL = 56

EXTRAVERSION =

NAME = Petit Gorille

arch/arm64/include/asm/simd.h

+7 −12
Original line number Diff line number Diff line
@@ -29,20 +29,15 @@ DECLARE_PER_CPU(bool, kernel_neon_busy); 
static __must_check inline bool may_use_simd(void)

{

	/*

	 * The raw_cpu_read() is racy if called with preemption enabled.

	 * This is not a bug: kernel_neon_busy is only set when

	 * preemption is disabled, so we cannot migrate to another CPU

	 * while it is set, nor can we migrate to a CPU where it is set.

	 * So, if we find it clear on some CPU then we're guaranteed to

	 * find it clear on any CPU we could migrate to.

	 *

	 * If we are in between kernel_neon_begin()...kernel_neon_end(),

	 * the flag will be set, but preemption is also disabled, so we

	 * can't migrate to another CPU and spuriously see it become

	 * false.

	 * kernel_neon_busy is only set while preemption is disabled,

	 * and is clear whenever preemption is enabled. Since

	 * this_cpu_read() is atomic w.r.t. preemption, kernel_neon_busy

	 * cannot change under our feet -- if it's set we cannot be

	 * migrated, and if it's clear we cannot be migrated to a CPU

	 * where it is set.

	 */

	return !in_irq() && !irqs_disabled() && !in_nmi() &&

		!raw_cpu_read(kernel_neon_busy);

		!this_cpu_read(kernel_neon_busy);

}



#else /* ! CONFIG_KERNEL_MODE_NEON */

arch/mips/kernel/process.c

+29 −14
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/kallsyms.h>

#include <linux/random.h>

#include <linux/prctl.h>

#include <linux/nmi.h>



#include <asm/asm.h>

#include <asm/bootinfo.h>
@@ -655,28 +656,42 @@ unsigned long arch_align_stack(unsigned long sp) 
	return sp & ALMASK;

}



static void arch_dump_stack(void *info)

static DEFINE_PER_CPU(call_single_data_t, backtrace_csd);

static struct cpumask backtrace_csd_busy;



static void handle_backtrace(void *info)

{

	struct pt_regs *regs;

	nmi_cpu_backtrace(get_irq_regs());

	cpumask_clear_cpu(smp_processor_id(), &backtrace_csd_busy);

}



	regs = get_irq_regs();

static void raise_backtrace(cpumask_t *mask)

{

	call_single_data_t *csd;

	int cpu;



	if (regs)

		show_regs(regs);

	for_each_cpu(cpu, mask) {

		/*

		 * If we previously sent an IPI to the target CPU & it hasn't

		 * cleared its bit in the busy cpumask then it didn't handle

		 * our previous IPI & it's not safe for us to reuse the

		 * call_single_data_t.

		 */

		if (cpumask_test_and_set_cpu(cpu, &backtrace_csd_busy)) {

			pr_warn("Unable to send backtrace IPI to CPU%u - perhaps it hung?\n",

				cpu);

			continue;

		}



	dump_stack();

		csd = &per_cpu(backtrace_csd, cpu);

		csd->func = handle_backtrace;

		smp_call_function_single_async(cpu, csd);

	}

}



void arch_trigger_cpumask_backtrace(const cpumask_t *mask, bool exclude_self)

{

	long this_cpu = get_cpu();



	if (cpumask_test_cpu(this_cpu, mask) && !exclude_self)

		dump_stack();



	smp_call_function_many(mask, arch_dump_stack, NULL, 1);



	put_cpu();

	nmi_trigger_cpumask_backtrace(mask, exclude_self, raise_backtrace);

}



int mips_get_process_fp_mode(struct task_struct *task)

arch/mips/kernel/traps.c

+1 −0
Original line number Diff line number Diff line
@@ -351,6 +351,7 @@ static void __show_regs(const struct pt_regs *regs) 
void show_regs(struct pt_regs *regs)

{

	__show_regs((struct pt_regs *)regs);

	dump_stack();

}



void show_registers(struct pt_regs *regs)