Commit 97fa063a authored May 03, 2018 by Namratha Siddappa

Merge remote-tracking branch 'quic/msm-4.14' into dev/msm-4.14-display



* quic/msm-4.14:
  net: qualcomm: rmnet: check for null ep to avoid null pointer dereference
  msm: adsprpc: duplicate session info for shared context banks
  ARM: dts: msm: add PMS405 peripherals for QCS405
  ARM: dts: msm: add PMS405 peripheral devices
  mhi: core: remove inline declarations from header file
  arm: mm: program ptes for access restriction
  arm: dma-mapping: handle IOVA address zero
  dma-mapping: use iommu_unmap for unmapping address
  arm: dma-mapping: map sg lists into the SMMU as virtually contiguous
  arm: dma: Expand the page protection attributes
  arm: keep address range pmd aligned while remap
  arm: mm: consider only lowmem regions while remap
  arm: mm: fix pte allocation with CONFIG_FORCE_PAGES feature
  arm: Allow remapping lowmem as 4K pages
  msm: kgsl: Abstract out GMU from the GMU core
  msm: pcie: clear Request Exit L1 bit when enabling L1 via debugfs
  mhi: core: start UL channel before DL channel
  proc: Add files for specifying scheduling related per-task attributes
  msm: kgsl: Use del_timer() where appropriate
  ARM: dts: msm: add gpio_key devices for buttons on sm8150-auto ADP STAR
  ARM: dts: msm: add PM855 PMIC devices for sm8150-auto
  ARM: dts: msm: remap PMIC regulators for sm8150-auto
  ARM: dts: msm: Add device tree for sm8150-auto
  cpuidle: Wakeup only cpus for which qos has changed.
  ARM: dts: qcom: add GIC interrupt controller header in qcs405
  power_supply: Add HVDCP_OPTI_ALLOWED property
  power: smb5: fix FLOAT charger ICL handling
  llcc: Update SCT table entries
  defconfig: Enable cellular hints in regulatory cfg80211
  msm: vidc: Add CVP interface api usage
  Linux 4.14.39
  powerpc/eeh: Fix race with driver un/bind
  arm/arm64: KVM: Add PSCI version selection API
  tick/sched: Do not mess with an enqueued hrtimer
  x86/microcode: Do not exit early from __reload_late()
  x86/microcode/intel: Save microcode patch unconditionally
  x86/smpboot: Don't use mwait_play_dead() on AMD systems
  x86/ipc: Fix x32 version of shmid64_ds and msqid64_ds
  tools/lib/subcmd/pager.c: do not alias select() params
  objtool, perf: Fix GCC 8 -Wrestrict error
  drm/i915: Enable display WA#1183 from its correct spot
  drm/amdgpu: set COMPUTE_PGM_RSRC1 for SGPR/VGPR clearing shaders
  rtc: opal: Fix OPAL RTC driver OPAL_BUSY loops
  cpufreq: powernv: Fix hardlockup due to synchronous smp_call in timer interrupt
  earlycon: Use a pointer table to fix __earlycon_table stride
  fpga-manager: altera-ps-spi: preserve nCONFIG state
  libceph: validate con->state at the top of try_write()
  libceph: reschedule a tick in finish_hunting()
  libceph: un-backoff on tick when we have a authenticated session
  ASoC: fsl_esai: Fix divisor calculation failure at lower ratio
  crypto: drbg - set freed buffers to NULL
  powerpc/powernv/npu: Do a PID GPU TLB flush when invalidating a large address range
  powerpc/mm: Flush cache on memory hot(un)plug
  KVM: arm/arm64: Close VMID generation race
  ARM: socfpga_defconfig: Remove QSPI Sector 4K size force
  ARM: amba: Don't read past the end of sysfs "driver_override" buffer
  ARM: amba: Fix race condition with driver_override
  ARM: amba: Make driver_override output consistent with other buses
  PCI: aardvark: Fix PCIe Max Read Request Size setting
  PCI: aardvark: Use ISR1 instead of ISR0 interrupt in legacy irq mode
  PCI: aardvark: Set PIO_ADDR_LS correctly in advk_pcie_rd_conf()
  PCI: aardvark: Fix logic in advk_pcie_{rd,wr}_conf()
  ANDROID: binder: prevent transactions into own process.
  vfio: ccw: process ssch with interrupts disabled
  bfq-iosched: ensure to clear bic/bfqq pointers when preparing request
  scsi: sd: Defer spinning up drive while SANITIZE is in progress
  kobject: don't use WARN for registration failures
  mtd: rawnand: tango: Fix struct clk memory leak
  mtd: cfi: cmdset_0002: Do not allow read/write to suspend erase block.
  mtd: cfi: cmdset_0001: Workaround Micron Erase suspend bug.
  mtd: cfi: cmdset_0001: Do not allow read/write to suspend erase block.
  mtd: spi-nor: cadence-quadspi: Fix page fault kernel panic
  ALSA: hda/realtek - change the location for one of two front mics
  ALSA: hda/realtek - Update ALC255 depop optimize
  ALSA: hda/realtek - Add some fixes for ALC233
  ALSA: hda: Hardening for potential Spectre v1
  ALSA: seq: oss: Hardening for potential Spectre v1
  ALSA: seq: oss: Fix unbalanced use lock for synth MIDI device
  ALSA: core: Report audio_tstamp in snd_pcm_sync_ptr
  ALSA: pcm: Return negative delays from SNDRV_PCM_IOCTL_DELAY.
  ALSA: control: Hardening for potential Spectre v1
  ALSA: rme9652: Hardening for potential Spectre v1
  ALSA: hdspm: Hardening for potential Spectre v1
  ALSA: asihpi: Hardening for potential Spectre v1
  ALSA: opl3: Hardening for potential Spectre v1
  ALSA: hda - Skip jack and others for non-existing PCM streams
  ALSA: dice: fix error path to destroy initialized stream data
  ALSA: dice: fix OUI for TC group
  tty: Use __GFP_NOFAIL for tty_ldisc_get()
  tty: Avoid possible error pointer dereference at tty_ldisc_restore().
  tty: n_gsm: Fix DLCI handling for ADM mode if debug & 2 is not set
  tty: n_gsm: Fix long delays with control frame timeouts in ADM mode
  tty: Don't call panic() at tty_ldisc_init()
  drm/virtio: fix vq wait_event condition
  virtio_console: reset on out of memory
  virtio_console: move removal code
  virtio_console: drop custom control queue cleanup
  virtio_console: free buffers after reset
  virtio_console: don't tie bufs to a vq
  virtio: add ability to iterate over vqs
  ALSA: usb-audio: Skip broken EU on Dell dock USB-audio
  USB: Increment wakeup count on remote wakeup.
  usb: core: Add quirk for HP v222w 16GB Mini
  usb: typec: ucsi: Increase command completion timeout value
  USB: serial: cp210x: add ID for NI USB serial console
  USB: serial: ftdi_sio: use jtag quirk for Arrow USB Blaster
  USB: serial: simple: add libtransistor console
  xhci: Fix USB ports for Dell Inspiron 5775
  Revert "xhci: plat: Register shutdown for xhci_plat"
  usbip: vhci_hcd: check rhport before using in vhci_hub_control()
  usbip: vhci_hcd: Fix usb device and sockfd leaks
  usbip: usbip_host: fix to hold parent lock for device_attach() calls
  usbip: usbip_event: fix to not print kernel pointer address
  random: rate limit unseeded randomness warnings
  random: fix possible sleeping allocation from irq context
  random: set up the NUMA crng instances after the CRNG is fully initialized
  ext4: fix bitmap position validation
  ext4: add validity checks for bitmap block numbers
  ext4: add MODULE_SOFTDEP to ensure crc32c is included in the initramfs
  ext4: set h_journal if there is a failure starting a reserved handle
  ext4: prevent right-shifting extents beyond EXT_MAX_BLOCKS
  cfi: print target address on failure
  soc: qcom: spcom: create control channel
  coresight: tmc: add iommu header file
  qos: Pass the list of cpus with affected qos to notifer
  ARM: dts: msm: Add support for early assert indication
  icnss: Add support for early assert indication
  ARM: dts: msm: Replace devbw freq tables with OPP tables for SM8150
  PM / devfreq: devbw: Switch to OPP APIs
  Linux 4.14.38
  ACPI / video: Only default only_lcd to true on Win8-ready _desktops_
  s390/uprobes: implement arch_uretprobe_is_alive()
  s390/dasd: fix IO error for newly defined devices
  s390/cio: update chpid descriptor after resource accessibility event
  tracing: Fix missing tab for hwlat_detector print format
  block/swim: Fix IO error at end of medium
  block/swim: Fix array bounds check
  block/swim: Select appropriate drive on device open
  block/swim: Rename macros to avoid inconsistent inverted logic
  block/swim: Remove extra put_disk() call from error path
  block/swim: Don't log an error message for an invalid ioctl
  block/swim: Check drive type
  m68k/mac: Don't remap SWIM MMIO region
  fsnotify: Fix fsnotify_mark_connector race
  cdrom: information leak in cdrom_ioctl_media_changed()
  scsi: mptsas: Disable WRITE SAME
  commoncap: Handle memory allocation failure.
  Revert "mm/hmm: fix header file if/else/endif maze"
  arm64: dts: rockchip: remove vdd_log from rk3399-puma
  microblaze: Setup dependencies for ASM optimized lib functions
  s390: correct module section names for expoline code revert
  s390: correct nospec auto detection init order
  s390: add sysfs attributes for spectre
  s390: report spectre mitigation via syslog
  s390: add automatic detection of the spectre defense
  s390: move nobp parameter functions to nospec-branch.c
  s390/entry.S: fix spurious zeroing of r0
  s390: do not bypass BPENTER for interrupt system calls
  s390: Replace IS_ENABLED(EXPOLINE_*) with IS_ENABLED(CONFIG_EXPOLINE_*)
  KVM: s390: force bp isolation for VSIE
  s390: introduce execute-trampolines for branches
  s390: run user space and KVM guests with modified branch prediction
  s390: add options to change branch prediction behaviour for the kernel
  s390/alternative: use a copy of the facility bit mask
  s390: add optimized array_index_mask_nospec
  s390: scrub registers on kernel entry and KVM exit
  KVM: s390: wire up bpb feature
  s390: enable CPU alternatives unconditionally
  s390: introduce CPU alternatives
  virtio_net: fix adding vids on big-endian
  virtio_net: split out ctrl buffer
  net: ethernet: ti: cpsw: fix tx vlan priority mapping
  llc: fix NULL pointer deref for SOCK_ZAPPED
  llc: hold llc_sap before release_sock()
  net: sched: ife: check on metadata length
  net: sched: ife: handle malformed tlv length
  tcp: clear tp->packets_out when purging write queue
  net: sched: ife: signal not finding metaid
  strparser: Fix incorrect strp->need_bytes value.
  amd-xgbe: Only use the SFP supported transceiver signals
  strparser: Do not call mod_delayed_work with a timeout of LONG_MAX
  amd-xgbe: Improve KR auto-negotiation and training
  sctp: do not check port in sctp_inet6_cmp_addr
  amd-xgbe: Add pre/post auto-negotiation phy hooks
  vlan: Fix reading memory beyond skb->tail in skb_vlan_tagged_multi
  pppoe: check sockaddr length in pppoe_connect()
  tipc: add policy for TIPC_NLA_NET_ADDR
  packet: fix bitfield update race
  team: fix netconsole setup over team
  net/smc: fix shutdown in state SMC_LISTEN
  team: avoid adding twice the same option to the event list
  net: fix deadlock while clearing neighbor proxy table
  tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets
  net: af_packet: fix race in PACKET_{R|T}X_RING
  tcp: don't read out-of-bounds opsize
  llc: delete timers synchronously in llc_sk_free()
  net: validate attribute sizes in neigh_dump_table()
  l2tp: check sockaddr length in pppol2tp_connect()
  KEYS: DNS: limit the length of option strings
  ipv6: sr: fix NULL pointer dereference in seg6_do_srh_encap()- v4 pkts
  ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy
  bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave
  Revert "ath10k: send (re)assoc peer command when NSS changed"
  tpm: add retry logic
  tpm: tpm-interface: fix tpm_transmit/_cmd kdoc
  tpm: cmd_ready command can be issued only after granting locality
  i40e: Fix attach VF to VM issue
  drm: bridge: dw-hdmi: Fix overflow workaround for Amlogic Meson GX SoCs
  Revert "pinctrl: intel: Initialize GPIO properly when used through irqchip"
  msm: kgsl: Use the firmware to host error HFI
  ANDROID: staging: lustre: fix filler function type
  ANDROID: fs: gfs2: fix filler function type
  ANDROID: fs: exofs: fix filler function type
  ANDROID: fs: afs: fix filler function type
  ANDROID: fs: nfs: fix filler function type
  ANDROID: fs: fuse: fix filler function type mismatch
  ANDROID: mm: fix filler function type mismatch
  ANDROID: media-device: fix ioctl function types
  ANDROID: v4l2-ioctl: fix function types for IOCTL_INFO_STD
  ANDROID: arch/arm64/crypto: fix CFI in SHA CE
  ANDROID: arm64: kvm: disable CFI
  ANDROID: arm64: mark kpti_install_ng_mappings as __nocfi
  ANDROID: arm64: disable CFI for cpu_replace_ttbr1
  ANDROID: kallsyms: strip the .cfi postfix from symbols with CONFIG_CFI_CLANG
  ANDROID: add support for clang Control Flow Integrity (CFI)
  ANDROID: HACK: init: ensure initcall ordering with LTO
  ANDROID: drivers/misc: disable LTO for lkdtm_rodata.o
  ANDROID: arm64: vdso: disable LTO
  FROMLIST: arm64: select ARCH_SUPPORTS_LTO_CLANG
  FROMLIST: arm64: disable RANDOMIZE_MODULE_REGION_FULL with LTO_CLANG
  ANDROID: arm64: disable ARM64_ERRATUM_843419 for clang LTO
  ANDROID: arm64: pass code model to LLVMgold
  FROMLIST: arm64: make mrs_s and msr_s macros work with LTO
  FROMLIST: efi/libstub: disable LTO
  FROMLIST: scripts/mod: disable LTO for empty.c
  FROMLIST: kbuild: fix dynamic ftrace with clang LTO
  FROMLIST: kbuild: add support for clang LTO
  FROMLIST: arm64: fix -m for GNU gold
  FROMLIST: arm64: add a workaround for GNU gold with ARM64_MODULE_PLTS
  FROMLIST: arm64: explicitly pass --no-fix-cortex-a53-843419 to GNU gold
  FROMLIST: kbuild: add __ld-ifversion and linker-specific macros
  FROMLIST: kbuild: add ld-name macro
  FROMLIST: arm64: keep .altinstructions and .altinstr_replacement
  ANDROID: arm64: fix LD_DEAD_CODE_DATA_ELIMINATION
  FROMLIST: kbuild: fix LD_DEAD_CODE_DATA_ELIMINATION
  FROMLIST: kbuild: add __cc-ifversion and compiler-specific variants
  UPSTREAM: console: Drop added "static" for newport_con
  UPSTREAM: tracing: always define trace_{irq,preempt}_{enable_disable}
  ARM: dts: msm: Change VDD_MMCX's min. voltage to LOW_SVS for SDMSHRIKE
  diag: Add new Diag IDs
  drivers: qcom: lpm-stats: reset CPU stats from that CPU
  msm: kgsl: Remove extra performance vote

Change-Id: Idb7fb154c3dc312045306ac3d23c80da9fa8e1e1
Signed-off-by: Namratha Siddappa <namratha@codeaurora.org>

parents a48ade34 5485c33a

Documentation/admin-guide/kernel-parameters.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -2556,6 +2556,9 @@

		noalign [KNL,ARM]

		noaltinstr [S390] Disables alternative instructions patching
		(CPU alternatives feature).

		noapic [SMP,APIC] Tells the kernel to not make use of any
		IOAPICs that may be present in the system.

Documentation/devicetree/bindings/arm/msm/msm.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -145,3 +145,5 @@ compatible = "qcom,sdm640-qrd"
		compatible = "qcom,qcs405-rumi"
		compatible = "qcom,qcs405-mtp"
		compatible = "qcom,qcs405-cdp"
		compatible = "qcom,sm8150-auto-adp-star"
		compatible = "qcom,auto-adp-star"

Documentation/devicetree/bindings/cnss/icnss.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ Optional properties:
		- qcom,smmu-s1-bypass: Boolean context flag to set SMMU to S1 bypass
		- qcom,wlan-msa-fixed-region: phandle, specifier pairs to children of /reserved-memory
		- qcom,gpio-force-fatal-error: SMP2P bit triggered by WLAN FW to force error fatal.
		- qcom,gpio-early-crash-ind: SMP2P bit triggered by WLAN FW to indicate FW is in assert.

		Example:

		@@ -61,4 +62,5 @@ Example:
		vdd-0.8-cx-mx-supply = <&pm8998_l5>;
		qcom,vdd-0.8-cx-mx-config = <800000 800000 2400 1000>;
		qcom,gpio-forced-fatal-error = <&smp2pgpio_wlan_1_in 0 0>;
		qcom,gpio-early-crash-ind = <&smp2pgpio_wlan_1_in 1 0>;
		};

Documentation/devicetree/bindings/devfreq/devbw.txt

+33 −14

Original line number	Diff line number	Diff line
		@@ -9,11 +9,11 @@ Required properties:
		- compatible: Must be "qcom,devbw"
		- qcom,src-dst-ports: A list of tuples where each tuple consists of a bus
		master port number and a bus slave port number.
		- qcom,bw-tbl: A list of meaningful instantaneous bandwidth values
		(in MB/s) that can be requested from the device
		master port to the slave port. The list of values
		depend on the supported bus/slave frequencies and the
		bus width.
		- operating-points-v2: A phandle to the OPP v2 table that holds meaningful
		instantaneous bandwidth values (in MB/s) that can be
		requested from the device master port to the slave port.
		The list of values depend on the supported bus/slave
		frequencies and the bus width.

		Optional properties:
		- qcom,active-only: Indicates that the bandwidth votes need to be
		@@ -23,17 +23,36 @@ Optional properties:

		Example:

		bw_opp_table: bw-opp-table {
		compatible = "operating-points-v2";
		opp-75 {
		opp-hz = /bits/ 64 < 572 >; /* 75 MHz */
		};
		opp-150 {
		opp-hz = /bits/ 64 < 1144 >; /* 150 MHz */
		};
		opp-200 {
		opp-hz = /bits/ 64 < 1525 >; /* 200 MHz */
		};
		opp-307 {
		opp-hz = /bits/ 64 < 2342 >; /* 307 MHz */
		};
		opp-460 {
		opp-hz = /bits/ 64 < 3509 >; /* 460 MHz */
		};
		opp-614 {
		opp-hz = /bits/ 64 < 4684 >; /* 614 MHz */
		};
		opp-800 {
		opp-hz = /bits/ 64 < 6103 >; /* 800 MHz */
		};
		opp-931 {
		opp-hz = /bits/ 64 < 7102 >; /* 931 MHz */
		};
		};
		qcom,cpubw {
		compatible = "qcom,devbw";
		qcom,src-dst-ports = <1 512>, <2 512>;
		qcom,active-only;
		qcom,bw-tbl =
		< 572 /* 75 MHz */ >,
		< 1144 /* 150 MHz */ >,
		< 1525 /* 200 MHz */ >,
		< 2342 /* 307 MHz */ >,
		< 3509 /* 460 MHz */ >,
		< 4684 /* 614 MHz */ >,
		< 6103 /* 800 MHz */ >,
		< 7102 /* 931 MHz */ >;
		operating-points-v2 = <&bw_opp_table>;
		};

Documentation/devicetree/bindings/qdsp/msm-fastrpc.txt

+11 −6

Original line number	Diff line number	Diff line
		@@ -25,6 +25,9 @@ Subnode Required properties:
		- label : Label describing the channel this context bank belongs to
		- iommus : A list of phandle and IOMMU specifier pairs that describe the
		IOMMU master interfaces of the device
		- dma-coherent : A flag marking a context bank as I/O coherent
		- shared-cb : A value indicating how many fastrpc sessions can share a
		context bank

		Example:
		qcom,msm_fastrpc {
		@@ -42,12 +45,14 @@ Example:
		qcom,msm_fastrpc_compute_cb_1 {
		compatible = "qcom,msm-fastrpc-compute-cb";
		label = "adsprpc-smd";
		iommus = <&apps_smmu 0x1401 0x0>,
		iommus = <&apps_smmu 0x1401 0x0>;
		dma-coherent;
		};
		qcom,msm_fastrpc_compute_cb_2 {
		compatible = "qcom,msm-fastrpc-compute-cb";
		label = "adsprpc-smd";
		iommus = <&apps_smmu 0x1402 0x0>,
		label = "sdsprpc-smd";
		iommus = <&apps_smmu 0x1402 0x0>;
		shared-cb = <5>;
		};
		};