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

Commit 248555d6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.113 into android-4.19 



Changes in 4.19.113
	drm/mediatek: Find the cursor plane instead of hard coding it
	spi: qup: call spi_qup_pm_resume_runtime before suspending
	powerpc: Include .BTF section
	ARM: dts: dra7: Add "dma-ranges" property to PCIe RC DT nodes
	spi: pxa2xx: Add CS control clock quirk
	spi/zynqmp: remove entry that causes a cs glitch
	drm/exynos: dsi: propagate error value and silence meaningless warning
	drm/exynos: dsi: fix workaround for the legacy clock name
	drivers/perf: arm_pmu_acpi: Fix incorrect checking of gicc pointer
	altera-stapl: altera_get_note: prevent write beyond end of 'key'
	dm bio record: save/restore bi_end_io and bi_integrity
	dm integrity: use dm_bio_record and dm_bio_restore
	riscv: avoid the PIC offset of static percpu data in module beyond 2G limits
	drm/amd/display: Clear link settings on MST disable connector
	drm/amd/display: fix dcc swath size calculations on dcn1
	xenbus: req->body should be updated before req->state
	xenbus: req->err should be updated before req->state
	block, bfq: fix overwrite of bfq_group pointer in bfq_find_set_group()
	parse-maintainers: Mark as executable
	USB: Disable LPM on WD19's Realtek Hub
	usb: quirks: add NO_LPM quirk for RTL8153 based ethernet adapters
	USB: serial: option: add ME910G1 ECM composition 0x110b
	usb: host: xhci-plat: add a shutdown
	USB: serial: pl2303: add device-id for HP LD381
	usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller 1022:145c
	ALSA: line6: Fix endless MIDI read loop
	ALSA: seq: virmidi: Fix running status after receiving sysex
	ALSA: seq: oss: Fix running status after receiving sysex
	ALSA: pcm: oss: Avoid plugin buffer overflow
	ALSA: pcm: oss: Remove WARNING from snd_pcm_plug_alloc() checks
	iio: st_sensors: remap SMO8840 to LIS2DH12
	iio: trigger: stm32-timer: disable master mode when stopping
	iio: magnetometer: ak8974: Fix negative raw values in sysfs
	iio: adc: at91-sama5d2_adc: fix differential channels in triggered mode
	mmc: rtsx_pci: Fix support for speed-modes that relies on tuning
	mmc: sdhci-of-at91: fix cd-gpios for SAMA5D2
	staging: rtl8188eu: Add device id for MERCUSYS MW150US v2
	staging: greybus: loopback_test: fix poll-mask build breakage
	staging/speakup: fix get_word non-space look-ahead
	intel_th: Fix user-visible error codes
	intel_th: pci: Add Elkhart Lake CPU support
	rtc: max8907: add missing select REGMAP_IRQ
	xhci: Do not open code __print_symbolic() in xhci trace events
	btrfs: fix log context list corruption after rename whiteout error
	drm/amd/amdgpu: Fix GPR read from debugfs (v2)
	drm/lease: fix WARNING in idr_destroy
	memcg: fix NULL pointer dereference in __mem_cgroup_usage_unregister_event
	mm: slub: be more careful about the double cmpxchg of freelist
	mm, slub: prevent kmalloc_node crashes and memory leaks
	page-flags: fix a crash at SetPageError(THP_SWAP)
	x86/mm: split vmalloc_sync_all()
	USB: cdc-acm: fix close_delay and closing_wait units in TIOCSSERIAL
	USB: cdc-acm: fix rounding error in TIOCSSERIAL
	iio: light: vcnl4000: update sampling periods for vcnl4200
	kbuild: Disable -Wpointer-to-enum-cast
	futex: Fix inode life-time issue
	futex: Unbreak futex hashing
	Revert "vrf: mark skb for multicast or link-local as enslaved to VRF"
	Revert "ipv6: Fix handling of LLA with VRF and sockets bound to VRF"
	ALSA: hda/realtek: Fix pop noise on ALC225
	arm64: smp: fix smp_send_stop() behaviour
	arm64: smp: fix crash_smp_send_stop() behaviour
	drm/bridge: dw-hdmi: fix AVI frame colorimetry
	staging: greybus: loopback_test: fix potential path truncation
	staging: greybus: loopback_test: fix potential path truncations
	Linux 4.19.113

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I90c48cd7189a964e59d199ecc0f32c0a68688ec5
parents 12a5867d 54b4fa6d

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 112

SUBLEVEL = 113

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/dra7.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x20013000 0x13000 0 0xffed000>;

				dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;
@@ -376,6 +377,7 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x30013000 0x13000 0 0xffed000>;

				dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;

arch/arm64/kernel/smp.c

+20 −5
Original line number Diff line number Diff line
@@ -935,11 +935,22 @@ void tick_broadcast(const struct cpumask *mask) 
}

#endif



/*

 * The number of CPUs online, not counting this CPU (which may not be

 * fully online and so not counted in num_online_cpus()).

 */

static inline unsigned int num_other_online_cpus(void)

{

	unsigned int this_cpu_online = cpu_online(smp_processor_id());



	return num_online_cpus() - this_cpu_online;

}



void smp_send_stop(void)

{

	unsigned long timeout;



	if (num_online_cpus() > 1) {

	if (num_other_online_cpus()) {

		cpumask_t mask;



		cpumask_copy(&mask, cpu_online_mask);
@@ -952,10 +963,10 @@ void smp_send_stop(void) 


	/* Wait up to one second for other CPUs to stop */

	timeout = USEC_PER_SEC;

	while (num_online_cpus() > 1 && timeout--)

	while (num_other_online_cpus() && timeout--)

		udelay(1);



	if (num_online_cpus() > 1)

	if (num_other_online_cpus())

		pr_warning("SMP: failed to stop secondary CPUs %*pbl\n",

			   cpumask_pr_args(cpu_online_mask));
@@ -978,7 +989,11 @@ void crash_smp_send_stop(void) 


	cpus_stopped = 1;



	if (num_online_cpus() == 1) {

	/*

	 * If this cpu is the only one alive at this point in time, online or

	 * not, there are no stop messages to be sent around, so just back out.

	 */

	if (num_other_online_cpus() == 0) {

		sdei_mask_local_cpu();

		return;

	}
@@ -986,7 +1001,7 @@ void crash_smp_send_stop(void) 
	cpumask_copy(&mask, cpu_online_mask);

	cpumask_clear_cpu(smp_processor_id(), &mask);



	atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1);

	atomic_set(&waiting_for_crash_ipi, num_other_online_cpus());



	pr_crit("SMP: stopping secondary CPUs\n");

	smp_cross_call(&mask, IPI_CPU_CRASH_STOP);

arch/powerpc/kernel/vmlinux.lds.S

+6 −0
Original line number Diff line number Diff line
@@ -322,6 +322,12 @@ SECTIONS 
		*(.branch_lt)

	}



#ifdef CONFIG_DEBUG_INFO_BTF

	.BTF : AT(ADDR(.BTF) - LOAD_OFFSET) {

		*(.BTF)

	}

#endif



	.opd : AT(ADDR(.opd) - LOAD_OFFSET) {

		__start_opd = .;

		KEEP(*(.opd))

arch/riscv/kernel/module.c

+16 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 
#include <linux/err.h>

#include <linux/errno.h>

#include <linux/moduleloader.h>

#include <linux/vmalloc.h>

#include <linux/sizes.h>

#include <asm/pgtable.h>

#include <asm/sections.h>



static int apply_r_riscv_32_rela(struct module *me, u32 *location, Elf_Addr v)

{
@@ -394,3 +398,15 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, 


	return 0;

}



#if defined(CONFIG_MMU) && defined(CONFIG_64BIT)

#define VMALLOC_MODULE_START \

	 max(PFN_ALIGN((unsigned long)&_end - SZ_2G), VMALLOC_START)

void *module_alloc(unsigned long size)

{

	return __vmalloc_node_range(size, 1, VMALLOC_MODULE_START,

				    VMALLOC_END, GFP_KERNEL,

				    PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,

				    __builtin_return_address(0));

}

#endif