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

Commit c161b2d1 authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android-4.19.113 (248555d6) into msm-4.19 



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

 Conflicts:
	arch/arm64/kernel/smp.c
	drivers/extcon/extcon.c
	include/linux/extcon.h
	include/linux/mm.h
	include/linux/mm_types.h
	include/linux/vm_event_item.h
	include/sound/core.h
	kernel/time/tick-sched.c
	mm/vmstat.c
	sound/core/init.c
	sound/soc/soc-core.c

Change-Id: Ibffc219e0859b7d5c9580c930664eea5b822a704
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents d120fe21 248555d6

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"

abi_gki_aarch64.xml

+39165 −38915

File changed.

Preview size limit exceeded, changes collapsed.

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/configs/gki_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -371,7 +371,6 @@ CONFIG_DEVFREQ_GOV_PERFORMANCE=y 
CONFIG_DEVFREQ_GOV_POWERSAVE=y

CONFIG_DEVFREQ_GOV_USERSPACE=y

CONFIG_DEVFREQ_GOV_PASSIVE=y

CONFIG_EXTCON=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_QCOM_PDC=y

arch/arm64/kernel/smp.c

+27 −5
Original line number Diff line number Diff line
@@ -970,11 +970,29 @@ 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;

}



static inline unsigned int num_other_active_cpus(void)

{

	unsigned int this_cpu_active = cpu_active(smp_processor_id());



	return num_active_cpus() - this_cpu_active;

}



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);
@@ -987,10 +1005,10 @@ void smp_send_stop(void) 


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

	timeout = USEC_PER_SEC;

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

	while (num_other_active_cpus() && timeout--)

		udelay(1);



	if (num_active_cpus() > 1)

	if (num_other_active_cpus())

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

			   cpumask_pr_args(cpu_online_mask));
@@ -1013,7 +1031,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;

	}
@@ -1021,7 +1043,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);