Commit 6fdca0f1 authored Oct 23, 2019 by jianzhou

Merge android-4.9.191 (9ca86082) into msm-4.9



* refs/heads/tmp-9ca86082:
  Linux 4.9.191
  mm/zsmalloc.c: fix build when CONFIG_COMPACTION=n
  x86/ptrace: fix up botched merge of spectrev1 fix
  i2c: piix4: Fix port selection for AMD Family 16h Model 30h
  KVM: arm/arm64: vgic-v2: Handle SGI bits in GICD_I{S,C}PENDR0 as WI
  KVM: arm/arm64: vgic: Fix potential deadlock when ap_list is long
  mac80211: fix possible sta leak
  Revert "cfg80211: fix processing world regdomain when non modular"
  VMCI: Release resource if the work is already queued
  stm class: Fix a double free of stm_source_device
  mmc: core: Fix init of SD cards reporting an invalid VDD range
  mmc: sdhci-of-at91: add quirk for broken HS200
  uprobes/x86: Fix detection of 32-bit user mode
  ptrace,x86: Make user_64bit_mode() available to 32-bit builds
  USB: storage: ums-realtek: Whitelist auto-delink support
  USB: storage: ums-realtek: Update module parameter description for auto_delink_en
  usb: host: xhci: rcar: Fix typo in compatible string matching
  usb: host: ohci: fix a race condition between shutdown and irq
  usb: chipidea: udc: don't do hardware access if gadget has stopped
  USB: cdc-wdm: fix race between write and disconnect due to flag abuse
  usb-storage: Add new JMS567 revision to unusual_devs
  mm/zsmalloc.c: fix race condition in zs_destroy_pool
  x86/apic: Include the LDR when clearing out APIC registers
  x86/apic: Do not initialize LDR and DFR for bigsmp
  KVM: x86: Don't update RIP or do single-step on faulting emulation
  ALSA: seq: Fix potential concurrent access to the deleted pool
  ALSA: line6: Fix memory leak at line6_init_pcm() error path
  tcp: make sure EPOLLOUT wont be missed
  ALSA: usb-audio: Fix an OOB bug in parse_audio_mixer_unit
  ALSA: usb-audio: Fix a stack buffer overflow bug in check_input_term
  tcp: fix tcp_rtx_queue_tail in case of empty retransmit queue
  scsi: ufs: Fix RX_TERMINATION_FORCE_ENABLE define value
  watchdog: bcm2835_wdt: Fix module autoload
  tools: hv: fix KVP and VSS daemons exit code
  usb: host: fotg2: restart hcd after port reset
  i2c: emev2: avoid race when unregistering slave client
  xen/blkback: fix memory leaks
  usb: gadget: composite: Clear "suspended" on reset/disconnect
  iommu/dma: Handle SG length overflow better
  dmaengine: ste_dma40: fix unneeded variable warning
  x86/CPU/AMD: Clear RDRAND CPUID bit on AMD family 15h/16h
  Revert "perf test 6: Fix missing kvm module load for s390"
  xfs: fix missing ILOCK unlock when xfs_setattr_nonsize fails due to EDQUOT
  mm/zsmalloc.c: migration can leave pages in ZS_EMPTY indefinitely
  mm, page_owner: handle THP splits correctly
  genirq: Properly pair kobject_del() with kobject_add()
  dm table: fix invalid memory accesses with too high sector number
  dm space map metadata: fix missing store of apply_bops() return value
  dm btree: fix order of block initialization in btree_split_beneath
  x86/boot: Fix boot regression caused by bootparam sanitizing
  x86/boot: Save fields explicitly, zero out everything else
  x86/apic: Handle missing global clockevent gracefully
  x86/retpoline: Don't clobber RFLAGS during CALL_NOSPEC on i386
  userfaultfd_release: always remove uffd flags and clear vm_userfaultfd_ctx
  gpiolib: never report open-drain/source lines as 'input' to user-space
  Revert "dm bufio: fix deadlock with loop device"
  HID: wacom: Correct distance scale for 2nd-gen Intuos devices
  HID: wacom: correct misreported EKR ring values
  selftests: kvm: Adding config fragments
  perf pmu-events: Fix missing "cpu_clk_unhalted.core" event
  drm/vmwgfx: fix memory leak when too many retries have occurred
  x86/lib/cpu: Address missing prototypes warning
  libata: add SG safety checks in SFF pio transfers
  net: hisilicon: Fix dma_map_single failed on arm64
  net: hisilicon: fix hip04-xmit never return TX_BUSY
  net: hisilicon: make hip04_tx_reclaim non-reentrant
  net: cxgb3_main: Fix a resource leak in a error path in 'init_one()'
  HID: input: fix a4tech horizontal wheel custom usage
  NFSv4: Fix a potential sleep while atomic in nfs4_do_reclaim()
  can: peak_usb: force the string buffer NULL-terminated
  can: sja1000: force the string buffer NULL-terminated
  perf bench numa: Fix cpu0 binding
  isdn: hfcsusb: Fix mISDN driver crash caused by transfer buffer on the stack
  isdn: mISDN: hfcsusb: Fix possible null-pointer dereferences in start_isoc_chain()
  net: usb: qmi_wwan: Add the BroadMobi BM818 card
  ASoC: ti: davinci-mcasp: Correct slot_width posed constraint
  st_nci_hci_connectivity_event_received: null check the allocation
  st21nfca_connectivity_event_received: null check the allocation
  can: dev: call netif_carrier_off() in register_candev()
  bonding: Force slave speed check after link state recovery for 802.3ad
  ASoC: dapm: Fix handling of custom_stop_condition on DAPM graph walks
  netfilter: ebtables: fix a memory leak bug in compat
  MIPS: kernel: only use i8253 clocksource with periodic clockevent
  HID: Add 044f:b320 ThrustMaster, Inc. 2 in 1 DT
  ANDROID: sched: Disallow WALT with CFS bandwidth control
  ANDROID: fiq_debugger: remove
  ANDROID: Add a tracepoint for mapping inode to full path

Conflicts:
	drivers/staging/android/fiq_debugger/fiq_debugger.c
	drivers/usb/gadget/composite.c
	fs/userfaultfd.c
	sound/usb/mixer.c

Change-Id: I1731d5df58f9f2679bfcfa4ecbfaa9a9c273ed77
Signed-off-by: jianzhou <jianzhou@codeaurora.org>

parents dca3398e 9ca86082

Documentation/kernel-parameters.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -3855,6 +3855,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		Run specified binary instead of /init from the ramdisk,
		used for early userspace startup. See initrd.

		rdrand= [X86]
		force - Override the decision by the kernel to hide the
		advertisement of RDRAND support (this affects
		certain AMD processors because of buggy BIOS
		support, specifically around the suspend/resume
		path).

		reboot= [KNL]
		Format (x86 or x86_64):
		[w[arm] \| c[old] \| h[ard] \| s[oft] \| g[pio]] \

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 190
		SUBLEVEL = 191
		EXTRAVERSION =
		NAME = Roaring Lionus

arch/arm/common/Kconfig

+0 −4

Original line number	Diff line number	Diff line
		@@ -17,7 +17,3 @@ config SHARP_PARAM

		config SHARP_SCOOP
		bool

		config FIQ_GLUE
		bool
		select FIQ

arch/arm/common/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@

		obj-y += firmware.o

		obj-$(CONFIG_FIQ_GLUE) += fiq_glue.o fiq_glue_setup.o
		obj-$(CONFIG_ICST) += icst.o
		obj-$(CONFIG_SA1111) += sa1111.o
		obj-$(CONFIG_DMABOUNCE) += dmabounce.o

arch/arm/common/fiq_glue.S

deleted100644 → 0

+0 −118

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 Google, Inc.
		*
		* This software is licensed under the terms of the GNU General Public
		* License version 2, as published by the Free Software Foundation, and
		* may be copied, distributed, and modified under those terms.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		*/

		#include <linux/linkage.h>
		#include <asm/assembler.h>

		.text

		.global fiq_glue_end

		/* fiq stack: r0-r15,cpsr,spsr of interrupted mode */

		ENTRY(fiq_glue)
		/* store pc, cpsr from previous mode, reserve space for spsr */
		mrs r12, spsr
		sub lr, lr, #4
		subs r10, #1
		bne nested_fiq

		str r12, [sp, #-8]!
		str lr, [sp, #-4]!

		/* store r8-r14 from previous mode */
		sub sp, sp, #(7 * 4)
		stmia sp, {r8-r14}^
		nop

		/* store r0-r7 from previous mode */
		stmfd sp!, {r0-r7}

		/* setup func(data,regs) arguments */
		mov r0, r9
		mov r1, sp
		mov r3, r8

		mov r7, sp

		/* Get sp and lr from non-user modes */
		and r4, r12, #MODE_MASK
		cmp r4, #USR_MODE
		beq fiq_from_usr_mode

		mov r7, sp
		orr r4, r4, #(PSR_I_BIT \| PSR_F_BIT)
		msr cpsr_c, r4
		str sp, [r7, #(4 * 13)]
		str lr, [r7, #(4 * 14)]
		mrs r5, spsr
		str r5, [r7, #(4 * 17)]

		cmp r4, #(SVC_MODE \| PSR_I_BIT \| PSR_F_BIT)
		/* use fiq stack if we reenter this mode */
		subne sp, r7, #(4 * 3)

		fiq_from_usr_mode:
		msr cpsr_c, #(SVC_MODE \| PSR_I_BIT \| PSR_F_BIT)
		mov r2, sp
		sub sp, r7, #12
		stmfd sp!, {r2, ip, lr}
		/* call func(data,regs) */
		blx r3
		ldmfd sp, {r2, ip, lr}
		mov sp, r2

		/* restore/discard saved state */
		cmp r4, #USR_MODE
		beq fiq_from_usr_mode_exit

		msr cpsr_c, r4
		ldr sp, [r7, #(4 * 13)]
		ldr lr, [r7, #(4 * 14)]
		msr spsr_cxsf, r5

		fiq_from_usr_mode_exit:
		msr cpsr_c, #(FIQ_MODE \| PSR_I_BIT \| PSR_F_BIT)

		ldmfd sp!, {r0-r7}
		ldr lr, [sp, #(4 * 7)]
		ldr r12, [sp, #(4 * 8)]
		add sp, sp, #(10 * 4)
		exit_fiq:
		msr spsr_cxsf, r12
		add r10, #1
		cmp r11, #0
		moveqs pc, lr
		bx r11 /* jump to custom fiq return function */

		nested_fiq:
		orr r12, r12, #(PSR_F_BIT)
		b exit_fiq

		fiq_glue_end:

		ENTRY(fiq_glue_setup) /* func, data, sp, smc call number */
		stmfd sp!, {r4}
		mrs r4, cpsr
		msr cpsr_c, #(FIQ_MODE \| PSR_I_BIT \| PSR_F_BIT)
		movs r8, r0
		mov r9, r1
		mov sp, r2
		mov r11, r3
		moveq r10, #0
		movne r10, #1
		msr cpsr_c, r4
		ldmfd sp!, {r4}
		bx lr