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

Commit 2a46fbd1 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:
  iommu: debug: Fix leaky context banks
  msm: msm_bus: Add mutex lock for floor vote data
  defconfig: msm: disable ARCH_SM8150 in SM6150 defconfig
  ARM: dts: msm: add ion heaps for qcs405
  ARM: dts: msm: Increase Secure Display Heap size for SM8150
  mhi: core: fix incorrect mhi device probe failure
  msm: vidc: Add video decoder batching
  msm: kgsl: Temporarily mask the watchdog upon receiving it
  defconfig: sm8150: Enable vmem layout prints
  arm64: Kconfig: Add Kconfig option for vmem layout
  arm64: Stop printing the virtual memory layout
  mhi: core: add support for bi-direction or directionless channels
  fbdev: core: Initialise structure to prevent kernel information leak
  clk: qcom: debugcc-sm8150: Add measurement support for CPU clocks on SM8150
  devfreq: memlat: Add suspend/resume for mem_latency
  ARM: dts: msm: add memory map for qcs405
  npu: Don't disable post clk if not enabled
  arm: dma-mapping: WARN_ON if iova is not 128M aligned
  arm: provision page alloc debug support
  arm: dma_mapping: Support for DOMAIN_ATTR_S1_BYPASS attribute
  ARM: dts: msm: Add MPROC device nodes for SM6150
  msm: ipa: rmnet: Make code changes with respect to CR#2046006
  drivers: cpuidle: lpm-levels: Remove IPI check on hotplugged cores
  spcom: fix deadlock when add/remove new channel
  ARM: config: Enable MMC related configs for qcs405
  ARM: dts: msm: Enable sdhc1 and sdhc2 for qcs405
  qos: Register irq notify after adding the qos request
  msm: ipa4: add IOCTL for reading vlan mode
  diag: Add new WLAN_RSN event id
  msm: adsprpc: validate VMID before hyp assign
  msm_11ad: Add support for triple MSI
  sched: boost: Add support for nesting and priority
  ARM: dts: msm: remove redundant USB extcon on sm8150

Change-Id: I3ef70a22d95718d588d904d224fde09dc5729def
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents eb25d188 00f0427d

Documentation/devicetree/bindings/bus/mhi.txt

+2 −0
Original line number Diff line number Diff line
@@ -22,8 +22,10 @@ Main node properties: 
	2nd element: Transfer ring length in elements

	3rd element: Event ring associated with this channel

	4th element: Channel direction as defined by enum dma_data_direction

		0 = Bidirectional data transfer

		1 = UL data transfer

		2 = DL data transfer

		3 = No direction, not a regular data transfer channel

	5th element: Channel doorbell mode configuration as defined by

	enum MHI_BRSTMODE

		2 = burst mode disabled

Documentation/devicetree/bindings/clock/qcom,debugcc.txt

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties : 
- qcom,camcc: phandle to the Camera CC device node.

- qcom,dispcc: phandle to the Display CC device node.

- qcom,npucc: phandle to the NPU CC device node.

- qcom,cpucc: phandle to the CPU CC debug device node.

- clock-names: Shall contain "xo_clk_src"

- clocks: phandle + clock reference to the CXO clock.

- #clock-cells : Shall contain 1.
@@ -21,6 +22,7 @@ Example: 
		qcom,camcc = <&clock_camcc>;

		qcom,dispcc = <&clock_dispcc>;

		qcom,npucc = <&clock_npucc>;

		qcom,cpucc = <&cpucc_debug>;

		clock-names = "xo_clk_src";

		clocks = <&clock_rpmh RPMH_CXO_CLK>;

		#clock-cells = <1>;

arch/arm/Kconfig.debug

+4 −0
Original line number Diff line number Diff line
@@ -63,6 +63,10 @@ config DEBUG_USER 
	      8 - SIGSEGV faults

	     16 - SIGBUS faults



config ARCH_SUPPORTS_DEBUG_PAGEALLOC

	def_bool y

	depends on FORCE_PAGES



config FORCE_PAGES

	bool "Force lowmem to be mapped with 4K pages"

        help

arch/arm/configs/qcs405-perf_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -302,11 +302,15 @@ CONFIG_DUAL_ROLE_USB_INTF=y 
CONFIG_USB_GADGET=y

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_MMC=y

CONFIG_MMC_PERF_PROFILING=y

CONFIG_MMC_BLOCK_MINORS=32

CONFIG_MMC_BLOCK_DEFERRED_RESUME=y

CONFIG_MMC_TEST=m

CONFIG_MMC_PARANOID_SD_INIT=y

CONFIG_MMC_CLKGATE=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_RTC_CLASS=y

CONFIG_DMADEVICES=y

CONFIG_UIO=y

arch/arm/configs/qcs405_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -318,11 +318,16 @@ CONFIG_USB_CONFIGFS=y 
CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_DIAG=y

CONFIG_MMC=y

CONFIG_MMC_PERF_PROFILING=y

CONFIG_MMC_BLOCK_MINORS=32

CONFIG_MMC_BLOCK_DEFERRED_RESUME=y

CONFIG_MMC_TEST=m

CONFIG_MMC_RING_BUFFER=y

CONFIG_MMC_PARANOID_SD_INIT=y

CONFIG_MMC_CLKGATE=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_RTC_CLASS=y

CONFIG_DMADEVICES=y

CONFIG_UIO=y