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

Commit 77e06261 authored by Namratha Siddappa's avatar Namratha Siddappa
Browse files

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



* quic/msm-4.14:
  ARM: dts: msm: add headset mic for SM8150 QRD device
  ARM: dts: msm: add SPMI PMIC arbiter device for sdm640
  drivers: cpuidle: lpm-levels: Fix untrusted pointer dereference.
  rpmsg: glink: Use strlcpy
  msm: vidc: Fix CDSP interface queue release issue
  net: qualcomm: rmnet: Add support for UL aggregation
  msm: kgsl: Enable CPU vote for GPU bus DCVS
  input: touchscreen: Disable fts_fw_update_auto
  trace/sched: use proper specifier to avoid compilation errors
  drivers: soc: qcom: Add support to display RPMH master stats
  rtc-pm8xxx: Fix issue in RTC write path
  msm: vidc: Debug message format to improve readability
  ARM: dts: msm: Add ADC_TM nodes for PM855, PM855B and PM855l
  thermal: adc-tm: Add ADC_TM driver
  iommu: msm: Fix __msm_dma_map_sg sg_tmp sanity check
  iommu: arm-smmu: Initialize value of phys
  drm/dsi-staging: do not update the stored values in parser
  [media] v4l: Add TME color format
  msm: vidc: Enable 4K@120fps Video Playback
  msm: vidc: Adding debugfs support to vote video core clocks
  ARM: dts: msm: Add support for cdsp PIL for sdmshrike
  qcom: minidump: don't register idle task's stack in minidump
  soc: qcom: update ss structure for alignment support minidump
  ARM: dts: msm: Set maximum speed as super speed plus on SM8150
  ARM: config: Enable different CONFIG_MMC flags for sdm640
  ARM: dts: msm: Add sdhc1 and sdhc2 for sdm640-rumi
  ARM: dts: msm: Add support for I2C, SPI, UART and Slimbus on QCS405
  msm: kgsl: Keep the IRQ pending count accurate
  seemp: port instrumentation and logging service
  ARM: dts: msm: Add thermal zone configuration for QCS405
  ARM: dts: msm: Add mlp466076 3250mAh battery profile to SM8150 QRD
  ARM: dts: msm: Update SID entries for iommu test devices for sm8150
  defconfig: sm8150: enable proxy consumer driver for regulators
  ARM: dts: msm: reserve memory for continuous splash for sm8150
  ARM: dts: msm: add proxy vote for DSI supplies for sm8150
  ARM: dts: msm: Add audio device tree properties on sdmshrike
  msm: ipa3: Add QMI server exit handling
  qrtr: Reset address of to sockaddr for local enqueue
  cpuidle: lpm-levels: Add premature count to module parameter
  cpuidle: lpm-levels: Remove sched_set_cpu_cstate calls
  usb: configfs: Set USB gadget speed as super speed plus
  ARM: dts: msm: Update USB QMP DP PHY initialization sequence on SM8150
  dwc3-msm: Return zero if max speed requested is already active
  policy_engine: Clear ss_lane_svid in reset_vdm_state()
  clk: qcom: gcc-sm8150: update usb mock utmi supported frequencies
  power: qpnp-fg-gen4: add support for capacity learning and cycle counter
  platform: msm: Export register_codec ops API for audio
  net: qualcomm: rmnet: Fix warning seen with fill_info
  defconfig: sm8150: Enable EXT4 encryption
  drm/msm/sde: make sure all locks are acquired during lastclose
  staging: android: ion: Track total memory allocations per heap
  ARM: dts: msm: Remove GMU OPP table for SM8150
  dwc3-msm: Add check before calling stop host in restart callback
  cpuidle: lpm-levels: Correctly init 32bit ops for SMP systems
  cpuidle: lpm-levels: Add system_pm ops for system level LPMs
  drivers: cpuidle: lpm-levels: Do not set affinity level for 0 mode id
  Linux 4.14.35
  nfsd: fix incorrect umasks
  hugetlbfs: fix bug in pgoff overflow checking
  xen: xenbus_dev_frontend: Fix XS_TRANSACTION_END handling
  ovl: fix lookup with middle layer opaque dir and absolute path redirects
  blk-mq: don't keep offline CPUs mapped to hctx 0
  lib: fix stall in __bitmap_parselist()
  f2fs: fix heap mode to reset it back
  sunrpc: remove incorrect HMAC request initialization
  ath9k: Protect queue draining by rcu_read_lock()
  hwmon: (ina2xx) Fix access to uninitialized mutex
  x86/mce/AMD: Get address from already initialized block
  x86/mce/AMD, EDAC/mce_amd: Enumerate Reserved SMCA bank type
  x86/mce/AMD: Pass the bank number to smca_get_bank_type()
  x86/MCE: Report only DRAM ECC as memory errors on AMD systems
  rtl8187: Fix NULL pointer dereference in priv->conf_mutex
  Bluetooth: hci_bcm: Treat Interrupt ACPI resources as always being active-low
  Bluetooth: Fix connection if directed advertising and privacy is used
  getname_kernel() needs to make sure that ->name != ->iname in long case
  get_user_pages_fast(): return -EFAULT on access_ok failure
  s390/ipl: ensure loadparm valid flag is set
  s390/qdio: don't merge ERROR output buffers
  s390/qdio: don't retry EQBS after CCQ 96
  nfit: fix region registration vs block-data-window ranges
  block/loop: fix deadlock after loop_set_status
  apparmor: fix resource audit messages when auditing peer
  apparmor: fix display of .ns_name for containers
  apparmor: fix logging of the existence test for signals
  scsi: qla2xxx: Fix small memory leak in qla2x00_probe_one on probe failure
  x86/MCE/AMD: Define a function to get SMCA bank type
  radeon: hide pointless #warning when compile testing
  perf/core: Fix use-after-free in uprobe_perf_close()
  perf intel-pt: Fix timestamp following overflow
  perf intel-pt: Fix error recovery from missing TIP packet
  perf intel-pt: Fix sync_switch
  perf intel-pt: Fix overlap detection to identify consecutive buffers correctly
  KVM: PPC: Book3S HV: trace_tlbie must not be called in realmode
  PCI: hv: Serialize the present and eject work items
  Drivers: hv: vmbus: do not mark HV_PCIE as perf_device
  parisc: Fix HPMC handler by increasing size to multiple of 16 bytes
  parisc: Fix out of array access in match_pci_device()
  media: v4l: vsp1: Fix header display list status check in continuous mode
  media: v4l2-compat-ioctl32: don't oops on overlay
  lan78xx: Correctly indicate invalid OTP
  vhost: Fix vhost_copy_to_user()
  vhost: fix vhost_vq_access_ok() log check
  slip: Check if rstate is initialized before uncompressing
  rds: MP-RDS may use an invalid c_path
  cdc_ether: flag the Cinterion AHS8 modem by gemalto as WWAN
  netfilter: ipset: Missing nfnl_lock()/nfnl_unlock() is added to ip_set_net_exit()
  ARM: dts: msm: Update glink nodes for sm8150
  soc: qcom: glink_probe: Add SSR support for GLINK
  rpmsg: glink: spss: Add pipe reset handlers
  rpmsg: glink: Add pipe reset functionality
  rpmsg: glink: spss: Unmap mailbox descriptors correctly
  rpmsg: Guard against null endpoint ops in destroy
  iommu: arm-smmu: Disable io-coherency in bypass mode
  iommu: arm-smmu: Fix QSMMUV500 system cache quirk
  drm/msm/sde: restrict directly accessing data in user pointers
  sched/fair: use tunable value for capacity margin checks
  sched/walt: Fix SCHED_CPUFREQ_CONTINUE for hotplug cases
  defconfig: sm8150: Enable MHI transport for qrtr
  qrtr: Introduce MHI transport for qrtr
  drm/msm/dp: configure AUX switch on connect/disconnect
  drivers: soc: qcom: terminate SBU lines when unused
  drm/msm/dp: add orientation support for simulation mode
  drm/msm/dsi-staging: add parser sub-module
  ARM: dts: msm: Add smmu device for sdm640
  diag: Add protection while accessing usb_info's buffer table
  diag: Clearing the mask before switching logging mode
  diag: Add missing protection while accessing session's info
  drm/msm/sde: set correct timeline at fence create
  AndroidKernel: Update the LLVM path
  defconfig: sm8150: Enable the ARM DSU PMU
  drm/msm/sde: fix kickoff ref count for single phys encoder usecase
  usb: gadget: Update functions for SSP descriptors
  drivers: edac: Allow IRQ line to be shared
  defconfig: msm: enable PREEMPTIRQ_EVENTS for SM8150
  trace/irq: Add trace point to track IRQs disable callers
  sched: Add trace point to track preemption disable callers
  arch: arm64: defconfig: Enable QTAGUID for SM8150
  ARM: dts: msm: increase adsp heap size for sm8150
  msm: kgsl: Separate out A6xx GMU specific code
  misc: qpnp: add snapshot of qpnp-misc documentation
  defconfig: sdmshrike: enable CONFIG_QCOM_SECURE_BUFFER
  drivers: cpuidle: lpm-levels: plug in cpu bias
  ANDROID: Add build server config for cuttlefish.
  ANDROID: Add defconfig for cuttlefish.
  FROMLIST: staging: Android: Add 'vsoc' driver for cuttlefish.
  msm: kgsl: Enable GPU slumber
  defconfig: Enable service locator and QMI for sdmshrike
  ANDROID: cpufreq: Add time_in_state to /proc/uid directories
  ANDROID: proc: Add /proc/uid directory
  ANDROID: cpufreq: times: track per-uid time in state
  ANDROID: cpufreq: track per-task time in state
  f2fs/fscrypt: updates to v4.17-rc1
  cnss: Add support to program MAC address thru debugfs
  drm/msm/sde: update rgba4444 and rgba5551 color component order

Change-Id: I3c4c55820ef888ad351f4cd031bf17f77984c285
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents d57a1dd3 c9e61f28

AndroidKernel.mk

+3 −3
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ endif 


ifeq ($(KERNEL_LLVM_SUPPORT), true)

  ifeq ($(KERNEL_SD_LLVM_SUPPORT), true)  #Using sd-llvm compiler

    ifeq ($(shell echo $(SDCLANG_PATH_2) | head -c 1),/)

       KERNEL_LLVM_BIN := $(SDCLANG_PATH_2)/clang

    ifeq ($(shell echo $(SDCLANG_PATH) | head -c 1),/)

       KERNEL_LLVM_BIN := $(SDCLANG_PATH)/clang

    else

       KERNEL_LLVM_BIN := $(ANDROID_BUILD_TOP)/$(SDCLANG_PATH_2)/clang

       KERNEL_LLVM_BIN := $(ANDROID_BUILD_TOP)/$(SDCLANG_PATH)/clang

    endif

    $(warning "Using sdllvm" $(KERNEL_LLVM_BIN))

  else

Documentation/ABI/testing/sysfs-fs-f2fs

+11 −0
Original line number Diff line number Diff line
@@ -192,3 +192,14 @@ Date: November 2017 
Contact:	"Sheng Yong" <shengyong1@huawei.com>

Description:

		 Controls readahead inode block in readdir.



What:		/sys/fs/f2fs/<disk>/extension_list

Date:		Feburary 2018

Contact:	"Chao Yu" <yuchao0@huawei.com>

Description:

		 Used to control configure extension list:

		 - Query: cat /sys/fs/f2fs/<disk>/extension_list

		 - Add: echo '[h/c]extension' > /sys/fs/f2fs/<disk>/extension_list

		 - Del: echo '[h/c]!extension' > /sys/fs/f2fs/<disk>/extension_list

		 - [h] means add/del hot file extension

		 - [c] means add/del cold file extension

Documentation/devicetree/bindings/arm/msm/rpmh-master-stat.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
* RPMH Master Stats



Differet Subsystems maintains master data in SMEM.

It tells about the individual masters information at any given

time like "system sleep counts", "system sleep last entered at"

and "system sleep accumulated duration" etc. These stats can be

show to the user using the debugfs interface of the kernel.

To achieve this, device tree node has been added.



The required properties for rpmh-master-stats are:



- compatible: "qcom,rpmh-master-stats".



Example:



qcom,rpmh-master-stats {

	compatible = "qcom,rpmh-master-stats";

};

Documentation/devicetree/bindings/misc/qpnp-misc.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
QPNP-MISC



QPNP-MISC provides a way to read the PMIC part number and revision.



Required properties:

- compatible : should be "qcom,qpnp-misc"

- reg : offset and length of the PMIC peripheral register map.



Optional properties:

- qcom,pwm-sel:			Select PWM source. Possible values:

				0: LOW

				1: PWM1_in

				2: PWM2_in

				3: PWM1_in & PWM2_in

- qcom,enable-gp-driver:	Enable the GP driver. Should only be specified

				if a non-zero PWM source is specified under

				"qcom,pwm-sel" property.



Example:

	qcom,misc@900 {

		compatible = "qcom,qpnp-misc";

		reg = <0x900 0x100>;

		qcom,pwm-sel = <2>;

		qcom,enable-gp-driver;

	};

Documentation/devicetree/bindings/power/supply/qcom/qpnp-fg-gen4.txt

+49 −0
Original line number Diff line number Diff line
@@ -158,6 +158,55 @@ First Level Node - FG Gen4 device 
		    loaded earlier by bootloader doesn't match with the profile

		    available in the device tree.



- qcom,cl-start-capacity

	Usage:      optional

	Value type: <u32>

	Definition: Battery SOC threshold to start the capacity learning.

		    If this is not specified, then the default value used

		    will be 15. Unit is in percentage.



- qcom,cl-min-temp

	Usage:      optional

	Value type: <u32>

	Definition: Lower limit of battery temperature to start the capacity

		    learning. If this is not specified, then the default value

		    used will be 150 (15 C). Unit is in decidegC.



- qcom,cl-max-temp

	Usage:      optional

	Value type: <u32>

	Definition: Upper limit of battery temperature to start the capacity

		    learning. If this is not specified, then the default value

		    used will be 500 (50 C). Unit is in decidegC.



- qcom,cl-max-increment

	Usage:      optional

	Value type: <u32>

	Definition: Maximum capacity increment allowed per capacity learning

		    cycle. If this is not specified, then the default value

		    used will be 5 (0.5%). Unit is in decipercentage.



- qcom,cl-max-decrement

	Usage:      optional

	Value type: <u32>

	Definition: Maximum capacity decrement allowed per capacity learning

		    cycle. If this is not specified, then the default value

		    used will be 100 (10%). Unit is in decipercentage.



- qcom,cl-min-limit

	Usage:      optional

	Value type: <u32>

	Definition: Minimum limit that the capacity cannot go below in a

		    capacity learning cycle. If this is not specified, then

		    the default value is 0. Unit is in decipercentage.



- qcom,cl-max-limit

	Usage:      optional

	Value type: <u32>

	Definition: Maximum limit that the capacity cannot go above in a

		    capacity learning cycle. If this is not specified, then

		    the default value is 0. Unit is in decipercentage.



- qcom,hold-soc-while-full

	Usage:      optional

	Value type: <empty>