Merge tag 'LA.UM.8.1.r1-15900-sm8150.0' into neutrino-msm-hotdogb-4.14

"LA.UM.8.1.r1-15900-sm8150.0"

* tag 'LA.UM.8.1.r1-15900-sm8150.0':
  dt-bindings: Add BGR color re-order option for DSI
  drm/msm/dp: avoid sink message processing when hdcp is off
  dt-bindings: Add property to force DSI TX simulate CSI signal
  ARM: dts: msm: fix dither configuration on trinket target
  mhi: core: Use high priority workqueue for all MHI work
  msm: mhi_dev: Wait for host to set BHI_INTVEC value
  msm/sde/rotator: update rotator max clk rate based on target
  ARM: dts: msm: Correct EP PCIE phy sequence
  msm: kgsl: remove redundant check for usermem type
  msm: kgsl: fix accounting of memory mapped to userspace
  ARM64: dts: qcs405: Add SPDIF pinctrl nodes
  UPSTREAM: ath10k: Add support for 64 bit ce descriptor
  UPSTREAM: ath10k: Add SNOC bus type for WCN3990 target
  UPSTREAM: ath10k: Add debug mask for SNOC bus type
  UPSTREAM: ath10k: Add fw feature flag for non-bmi firmware load
  UPSTREAM: ath10k: advertise TDLS wider bandwidth support for 5GHz
  UPSTREAM: ath10k: advertise TDLS wider bandwidth support for 5GHz
  UPSTREAM: ath10k: remove deprecated fw_crash_dump debugfs file
  UPSTREAM: ath10k: refactor firmware crashdump code to coredump.c
  UPSTREAM: ath10k: detach coredump.c from debug.c
  UPSTREAM: ath10k: add coredump_mask module parameter
  UPSTREAM: ath10k: add memory dump support for QCA6174/QCA9377
  UPSTREAM: ath10k: add memory dump support QCA988X
  BACKPORT: UPSTREAM: ath10k: update copyright year
  UPSTREAM: ath10k: build ce layer in ath10k core module
  UPSTREAM: ath10k: platform driver for WCN3990 SNOC WLAN module
  UPSTREAM: ath10k: add resource init and deinit for WCN3990
  drivers: thermal: Re-initialize TSENS controller interrupt configuration
  drivers: thermal: Force notify thermal to re-evaluate TSENS sensors
  msm: kgsl: make stats updation atomic
  msm: ethernet : smmu: enable qcom smmu
  msm: sps: Assign proper BAM destination values
  ARM : dts : support realtek r8125 ethernet driver
  mhi: netdev: free memory allocated in read/write
  mhi: core: Prevent extra votes for multiple timesync requests
  f2fs: remove blk_plugging in block_operations
  block, bfq: fix use-after-free in bfq_idle_slice_timer_body
  ion: Improve ION allocation paths
  msm: npu: Allow user code to query if NPUDSP SID is mapped
  ARM: dts: msm: Add new property npu-dsp-sid-mapped for npu
  msm:npu: prevent fmax_pwrlvl to be used uninitialized
  msm: ipa4: debug patch gsi interrupt issue
  msm: ipa4: capture the unclock gsi IPA register access
  ARM: dts: msm: coalesce UL/DL MSIs for IPA HW channels
  diag: Enable debug logs for pcie operations
  UPSTREAM: ath10k: add hif start/stop methods for wcn3990 snoc layer
  UPSTREAM: ath10k: add HTC services for WCN3990
  UPSTREAM: ath10k: map HTC services to tx/rx pipes for wcn3990
  UPSTREAM: ath10k: add hif power-up/power-down methods
  UPSTREAM: ath10k: add hif tx methods for wcn3990
  UPSTREAM: ath10k: add hif rx methods for wcn3990
  UPSTREAM: ath10k: modify hif tx paddr to dma_addr_t type
  UPSTREAM: ath10k: add support to get target info from hif ops
  UPSTREAM: ath10k: check all CE for data if irq summary is not retained
  UPSTREAM: ath10k: vote for hardware resources for WCN3990
  drm/msm/sde: use atomic counter for pending frame done
  drm/msm/sde: support posted frame trigger for cmd mode
  drm/msm/sde: delay reset frame by a frame for posted trigger
  drm/msm/sde: add connector property for frame trigger mode
  drm/msm/sde: avoid frame done event during autorefresh
  drm/msm/sde: trigger frame done if ctl is idle
  disp: msm: sde: use wr_ptr interrupt instead of ctl_start
  disp: msm: sde: reset ctl during wr_ptr_irq timeout
  disp: msm: sde: fix release fence signaling in error cases
  disp: msm: sde: wait for specific pp_done instead of zero
  disp: msm: sde: fix handling the missing pp-done interrupt cases
  disp: msm: sde: avoid encoder power-collapse with pending frames
  disp: msm: sde: handle another case for lost pp-done interrupt
  disp: msm: sde: signal retire fence in wr_ptr timeout
  disp: msm: sde: avoid multiple frame-done encoder events
  dt-bindings: Add frame threshold property for dsi controller
  ARM: dts: msm: update frame threshold time for atoll
  UPSTREAM: ath10k: correct target assert problem due to CE5 stuck
  UPSTREAM: ath10k: fix fw path name for WCN3990 target
  BACKPORT: UPSTREAM: ath10k: enable hw checksum for wcn3990
  BACKPORT: UPSTREAM: ath10k: add WMI_SERVICE_AVAILABLE_EVENT support
  UPSTREAM: ath10k: support MAC address randomization in scan
  UPSTREAM: ath10k: make some functions static
  UPSTREAM: ath10k: snoc: use module_platform_driver() macro
  UPSTREAM: ath10k: snoc: use correct bus-specific pointer in RX retry
  UPSTREAM: ath10k: snoc: stop including pci.h
  UPSTREAM: ath10k: snoc: drop unused WCN3990_CE_ATTR_FLAGS
  msm: vidc: fix deadlock between queue and flush buffer handling
  mhi: cntrl: qcom: Update the fw image name for new devices
  drm/msm/dsi-staging: update dsi clock calculations
  drm/msm/dsi-staging: update frame transfer time calculations
  disp: msm: dsi: update dsi pclk in panel mode settings
  UPSTREAM: ath10k: snoc: sort include files
  UPSTREAM: ath10k: do not mix spaces and tabs in Kconfig
  UPSTREAM: ath10k: handle resource init failure case
  UPSTREAM: ath10k: add qmi service helpers for wcn3990 qmi client
  UPSTREAM: ath10k: add support to create boardname for non-bmi target
  MDM:IPA3: Fixes issue with RNDIS and ECM suspend path
  msm: ipa3: Enable holb as part of usb suspend
  UPSTREAM: ath10k: allow ATH10K_SNOC with COMPILE_TEST
  UPSTREAM: ath10k: refactoring needed for extended board data download
  UPSTREAM: ath10k: add struct ath10k_bus_params
  UPSTREAM: ath10k: add device type enum to ath10k_bus_params
  UPSTREAM: ath10k: search all IEs for variant before falling back
  UPSTREAM: ath10k: support extended board data download for dual-band QCA9984
  UPSTREAM: ath10k: add debug mask for QMI layer
  UPSTREAM: ath10k: add QMI message handshake for wcn3990 client
  UPSTREAM: PCI: Add Ubiquiti Networks vendor ID
  UPSTREAM: ath10k: add support for Ubiquiti rebranded QCA988X v2
  BACKPORT: UPSTREAM: ath10k: add hw params for shadow register support
  UPSTREAM: ath10k: add support for shadow register for WNC3990
  BACKPORT: UPSTREAM: ath10k: enable SRRI/DRRI support on ddr for WCN3990
  BACKPORT: UPSTREAM: ath10k: skip resetting rx filter for WCN3990
  net: stmmac: Ethtool half duplex not supported
  net: stmmac: Fixed autoneg disable issue
  msm: sps: Correct descriptor fifo address to dump contents
  power: battery: Add support to enable PPS to work in CV mode
  power: smb1398: Update default cp-min-icl to 1A for HVDCP3
  power: smb1398-charger: Update the OVP threshold to 14V
  power: smb1398-charger: disable sync between master and slave
  power: smb5-lib: Report the CURRENT_MAX as 1A in CC-mode
  msm: ipa: eth: Prevent suspend for 2 seconds after device resume
  firmware: scm: Add new SCM call API for switching memory ownership
  ath10k: skip data calibration for non-bmi target
  msm: mhi_dev: Redesign UCI transfer request structure management
  clk: qcom: gdsc-regulator: Add support to skip GDSC disable
  clk: qcom: gdsc-regulator: Update support to skip GDSC disable
  ARM: dts: msm: Add skip-disable-before-sw-enable flag to gx_gdsc
  BACKPORT: UPSTREAM: ath10k: Add WMI diag fw logging support for WCN3990
  msm: mhi_dev: Fix interrupt storm during Enable/disable
  ubifs: Fix deadlock in concurrent bulk-read and writepage
  coresight: tmc-etr: fix etr smmu unmap issue
  mhi: core: Error handling for pending packets in mission_mode
  BACKPORT: UPSTREAM: ath10k: Set DMA address mask to 35 bit for WCN3990
  UPSTREAM: ath10k: update HOST capability qmi message
  ath10k: Don't call SCM interface for statically mapped msa region
  ath10k: Fix compilation error due to downstream QMI implementation
  PCI: Add PCIe quirks for PCIe root port
  drm/msm/sde: initialize sde_encoder_wait_info before usage
  drm/msm/sde: avoid frame_done event trigger for idle scenario
  drm/msm/sde: trigger single frame_done evt for vid encoder
  net: qualcomm: rmnet: validate ipv6 extension header lengths
  ARM: dts: Update AXI bus votes for EMAC in QCS405
  power: smb1398: Do not disable FP_FET during IREV condition
  power: battery: Fix use of uninitialized variable error
  power: smb1398: Update win-uv threshold to 10mV
  arm: dts: msm: Add dt entry to enable geometry mapping in EMAC
  msm: ep_pcie: Prevent apps suspend in active state
  power: smb1390: Fix taper condition for VPH configuration
  ARM: dts: msm: Enable regulator for geni ir
  clk: qcom: npucc: Update NPU Q6 frequency for ATOLL
  media: rc: Enable regulator and rxfifo in suspend
  msm: kgsl: Mark the scratch buffer as privileged
  usb: gadget: Reset string ids upon unbind
  usb: gadget: f_qdss: Allocate one string ID for all instances
  msm: mhi_dev: allocate high priority Workqueue for mhi_sm_wq
  msm: mhi_dev: Fix memory leak
  msm: mhi_dev: Fix memory leak during channel reset/stop
  esoc: Use BOOT mode indicating mdm2ap status high
  esoc: Service errfatal interrupt in BOOT and RUN mode
  BACKPORT: ath10k: enable bus layer suspend/resume for WCN3990
  ath10k: request credit report if flow control enabled on ep
  ath10k: Add support for extended HTT aggr msg support
  ath10k: correct the format of host memory chunks in wmi init command
  ath10k: Fix compilation error in host cap due to downstream QMI
  firmware: qcom: scm: Add WLAN VMID for Qualcomm SCM interface
  ARM: dts: msm8916: Update reserved-memory for wcnss, venus and mba
  ath10k: Enable IOMMU support for WCN3990 target
  uapi: sound: add TTP pass through run mode command
  msm: kgsl: Fix possible use-after-free while adding context to active list
  usb: gadget: Revert increase write buffer size
  spi: spi-geni-qcom: Return error if setup transfer fails
  msm: ipa: Fix deleting the routing entries
  mhi: netdev: Avoid free of netdev client,ipc handles
  power: smb1398-charger: Fix use of uninitialized variable error
  msm: ipa: header file to support wdi 2.4G new pipe
  msm: ipa3: Fix to save the ntn buffers in SMMU disabled case
  mtd: msm_qpic_nand: Skip erased page check upon error
  mtd: msm_qpic_nand: Add support to read one codeword
  mtd: msm_qpic_nand: Use logical unit count in flash density
  msm: ipa3: Define ODL DPL cons for sdx55 CPE config
  msm: adsprpc: Avoid race condition during map find and free
  Revert "coresight: tmc-etr: fix etr smmu unmap issue"
  msm: ipa3: Configure correct aggeragtion byte limit
  msm: ep_pcie: set irq flag to IRQF_EARLY_RESUME for PERST irq
  msm: ADSPRPC: Size check before allocating memory from DMA
  msm: mhi_dev: UCI memory leak fix
  msm: pcie: correct cached PCIe link BW max gen speed
  msm: pcie: validate speed switch request
  msm: mhi_dev: Prevent invalid memory access during channel read

Signed-off-by: Adam W. Willis <return.of.octobot@gmail.com>

Conflicts:
       drivers/gpu/drm/msm/dsi-staging/dsi_display.c
       drivers/gpu/drm/msm/dsi-staging/dsi_panel.c
       drivers/gpu/drm/msm/msm_drv.h
       drivers/gpu/drm/msm/sde/sde_connector.c
       drivers/gpu/drm/msm/sde/sde_encoder.c
       drivers/gpu/drm/msm/sde/sde_encoder_phys.h
       drivers/gpu/drm/msm/sde/sde_encoder_phys_cmd.c
       drivers/gpu/msm/kgsl.c
       drivers/gpu/msm/kgsl.h
       drivers/gpu/msm/kgsl_debugfs.c
       drivers/gpu/msm/kgsl_device.h
       drivers/gpu/msm/kgsl_sharedmem.c
       drivers/media/platform/msm/camera/cam_isp/cam_isp_context.c
       drivers/media/platform/msm/camera/cam_req_mgr/cam_req_mgr_core.c
       drivers/media/platform/msm/camera/cam_sensor_module/cam_csiphy/include/cam_csiphy_1_2_2_hwreg.h
       drivers/net/wireless/ath/ath10k/ce.c
       drivers/net/wireless/ath/ath10k/ce.h
       drivers/net/wireless/ath/ath10k/core.c
       drivers/net/wireless/ath/ath10k/core.h
       drivers/net/wireless/ath/ath10k/hif.h
       drivers/net/wireless/ath/ath10k/hw.h
       drivers/net/wireless/ath/ath10k/qmi.c
       drivers/net/wireless/ath/ath10k/qmi.h
       drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c
       drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h
       drivers/net/wireless/ath/ath10k/snoc.c
       drivers/net/wireless/ath/ath10k/snoc.h
       drivers/power/supply/qcom/battery.c
       drivers/staging/android/ion/ion_cma_heap.c

Documentation/devicetree/bindings/drm/msm/mdss-dsi-panel.txt

@@ -253,6 +253,7 @@ Optional properties:
 - qcom,mdss-dsi-color-order:		Specifies the R, G and B channel ordering.
 					"rgb_swap_rgb" = DSI_RGB_SWAP_RGB (default value)
 					"rgb_swap_rbg" = DSI_RGB_SWAP_RBG
+					"rgb_swap_bgr" = DSI_RGB_SWAP_BGR
 					"rgb_swap_brg" = DSI_RGB_SWAP_BRG
 					"rgb_swap_grb" = DSI_RGB_SWAP_GRB
 					"rgb_swap_gbr" = DSI_RGB_SWAP_GBR
@@ -553,6 +554,7 @@ Optional properties:
 					frequencies in Hz for the given panel.
 - qcom,dsi-dyn-clk-skip-timing-update:	Boolean to specify whether to skip phy timing parameter
 					update during dynamic clock switch.
+- qcom,csi-proxy-enable:		Boolean to config DSI transmission packet DataTypes to simulate the CSI-2 compatible signal
 
 Required properties for sub-nodes:	None
 Optional properties:

Documentation/devicetree/bindings/regulator/gdsc-regulator.txt

@@ -80,6 +80,9 @@ Optional properties:
 			identifier.  If this is specified, then a QMP message
 			should be sent to enable the GDSC instead of setting
 			SW_COLLAPSE=0.
+ - qcom,skip-disable-before-sw-enable: Presence denotes a hardware requirement
+					to leave the GDSC on that has been
+					enabled by an entity external to HLOS.
 
 [1]: Documentation/devicetree/bindings/arm/msm/msm_bus.txt
 

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

@@ -1417,6 +1417,8 @@ Optional properties:
 - qcom,afe-rxtx-lb: AFE RX to TX loopback.
 - qcom,ext-mclk-gpio: pinctrl referring to external mclk
 - qcom,ext-mclk-src: Device tree node referring to external mclk clock
+- qcom,pri-spdiftx-gpios: Pinctrl referring to primary spdif output gpios
+- qcom,sec-spdiftx-gpios: Pinctrl referring to secondary spdif output gpios
 - #ext-mclk-1-cfg-cells: Number of cells in ext-mclk-1-cfg-* nodes. Must be 6.
 - ext-mclk-1 cfg-11p2896: Frequnency table for 11.2896MHz mclk frequnecy.
 			  Fields are clock rate, div2x, m, n, d and clock root.

arch/arm64/boot/dts/qcom/atoll-gdsc.dtsi

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -134,6 +134,7 @@
 		qcom,poll-cfg-gdscr;
 		domain-addr = <&gpu_gx_domain_addr>;
 		sw-reset = <&gpu_gx_sw_reset>;
+		qcom,skip-disable-before-sw-enable;
 		status = "disabled";
 	};
 

arch/arm64/boot/dts/qcom/msm8916.dtsi

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2015, 2020 The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and

arch/arm64/boot/dts/qcom/qcs405-csra8-audio-overlay.dtsi

@@ -76,6 +76,22 @@
 		pinctrl-0 = <&ext_mclk_1_sck_active>;
 		pinctrl-1 = <&ext_mclk_1_sck_sleep>;
 	};
+
+	pri_spdiftx_gpios: pri_spdiftx_pinctrl {
+		compatible = "qcom,msm-cdc-pinctrl";
+		pinctrl-names = "aud_active", "aud_sleep";
+		pinctrl-0 = <&pri_spdiftx_active>;
+		pinctrl-1 = <&pri_spdiftx_sleep>;
+		qcom,lpi-gpios;
+	};
+
+	sec_spdiftx_gpios: sec_spdiftx_pinctrl {
+		compatible = "qcom,msm-cdc-pinctrl";
+		pinctrl-names = "aud_active", "aud_sleep";
+		pinctrl-0 = <&sec_spdiftx_active>;
+		pinctrl-1 = <&sec_spdiftx_sleep>;
+		qcom,lpi-gpios;
+	};
 };
 
 &q6core {
@@ -109,6 +125,8 @@
 	qcom,cdc-dmic67-gpios = <&cdc_dmic67_gpios>;
 	qcom,pri-mi2s-gpios = <&pri_mi2s_gpios>;
 	qcom,sec-mi2s-gpios = <&sec_mi2s_gpios>;
+	qcom,pri-spdiftx-gpios = <&pri_spdiftx_gpios>;
+	qcom,sec-spdiftx-gpios = <&sec_spdiftx_gpios>;
 	qcom,audio-routing =
 		"RX_BIAS", "MCLK",
 		"lineout booster", "LINEOUT1",

arch/arm64/boot/dts/qcom/qcs405-csra8plus2-audio-overlay.dtsi

@@ -97,6 +97,22 @@
 		pinctrl-0 = <&ext_mclk_1_sck_active>;
 		pinctrl-1 = <&ext_mclk_1_sck_sleep>;
 	};
+
+	pri_spdiftx_gpios: pri_spdiftx_pinctrl {
+		compatible = "qcom,msm-cdc-pinctrl";
+		pinctrl-names = "aud_active", "aud_sleep";
+		pinctrl-0 = <&pri_spdiftx_active>;
+		pinctrl-1 = <&pri_spdiftx_sleep>;
+		qcom,lpi-gpios;
+	};
+
+	sec_spdiftx_gpios: sec_spdiftx_pinctrl {
+		compatible = "qcom,msm-cdc-pinctrl";
+		pinctrl-names = "aud_active", "aud_sleep";
+		pinctrl-0 = <&sec_spdiftx_active>;
+		pinctrl-1 = <&sec_spdiftx_sleep>;
+		qcom,lpi-gpios;
+	};
 };
 
 &q6core {
@@ -136,6 +152,8 @@
 	qcom,pri-mi2s-gpios = <&pri_mi2s_gpios>;
 	qcom,sec-mi2s-gpios = <&sec_mi2s_gpios>;
 	qcom,quat-mi2s-gpios = <&quat_mi2s_gpios>;
+	qcom,pri-spdiftx-gpios = <&pri_spdiftx_gpios>;
+	qcom,sec-spdiftx-gpios = <&sec_spdiftx_gpios>;
 	qcom,msm-mi2s-master = <1>, <0>, <1>, <0>, <1>, <1>;
 	qcom,audio-routing =
 		"RX_BIAS", "MCLK",

arch/arm64/boot/dts/qcom/qcs405-geni-ir-overlay.dtsi

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -26,6 +26,7 @@
 			<&clock_gcc GCC_GENI_IR_S_CLK>;
 		clock-names = "iface_clk", "serial_clk";
 
+		vdda33-supply = <&pms405_l12>;
 		qcom,geni-ir-wakeup-gpio = <&tlmm 77 IRQ_TYPE_LEVEL_HIGH>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&ir_in_default>;

arch/arm64/boot/dts/qcom/qcs405-lpi.dtsi

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -453,6 +453,65 @@
 			};
 		};
 
+		pri_spdiftx_pin {
+			pri_spdiftx_sleep: pri_spdiftx_sleep {
+				mux {
+					pins = "gpio6";
+					function = "func1";
+				};
+
+				config {
+					pins = "gpio6";
+					drive-strength = <2>;
+					bias-pull-down;
+					output-low;
+				};
+			};
+
+			pri_spdiftx_active: pri_spdiftx_active {
+				mux {
+					pins = "gpio6";
+					function = "func1";
+				};
+
+				config {
+					pins = "gpio6";
+					drive-strength = <8>;
+					bias-pull-down;
+					output-low;
+				};
+			};
+		};
+
+		sec_spdiftx_pin {
+			sec_spdiftx_sleep: sec_spdiftx_sleep {
+				mux {
+					pins = "gpio7";
+					function = "func1";
+				};
+
+				config {
+					pins = "gpio7";
+					drive-strenght = <2>;
+					bias-bus-hold;
+					output-high;
+				};
+			};
+
+			sec_spdiftx_active: sec_spdiftx_active {
+				mux {
+					pins = "gpio7";
+					function = "func1";
+				};
+
+				config {
+					pins = "gpio7";
+					drive-strength = <8>;
+					output-low;
+				};
+			};
+		};
+
 		wsa_swr_data_pin {
 			wsa_swr_data_sleep: wsa_swr_data_sleep {
 				mux {

arch/arm64/boot/dts/qcom/qcs405.dtsi

@@ -1571,9 +1571,9 @@
 		qcom,msm-bus,num-paths = <2>;
 		qcom,msm-bus,vectors-KBps =
 			<98 512 0 0>, <1 781 0 0>,  /* No vote */
-			<98 512 1250 0>, <1 781 0 40000>,  /* 10Mbps vote */
-			<98 512 12500 0>, <1 781 0 40000>,  /* 100Mbps vote */
-			<98 512 125000 0>, <1 781 0 40000>; /* 1000Mbps vote */
+			<98 512 2500 0>, <1 781 0 40000>,  /* 10Mbps vote */
+			<98 512 25000 0>, <1 781 0 40000>,  /* 100Mbps vote */
+			<98 512 250000 0>, <1 781 0 40000>; /* 1000Mbps vote */
 		qcom,bus-vector-names = "0", "10", "100", "1000";
 		clocks = <&clock_gcc GCC_ETH_AXI_CLK>,
 				<&clock_gcc GCC_ETH_PTP_CLK>,

arch/arm64/boot/dts/qcom/sdxprairie.dtsi

@@ -1519,6 +1519,7 @@
 			compatible = "qcom,emac-smmu-embedded";
 			iommus = <&apps_smmu 0x1c0 0xf>;
 			qcom,iova-mapping = <0x80000000 0x40000000>;
+			qcom,smmu-geometry;
 		};
 	};
 

arch/arm64/boot/dts/qcom/sm8150-marmot.dtsi

@@ -172,7 +172,7 @@
 		mhi_event@7 {
 			mhi,num-elements = <2048>;
 			mhi,intmod = <5>;
-			mhi,msi = <6>;
+			mhi,msi = <5>;
 			mhi,chan = <101>;
 			mhi,priority = <1>;
 			mhi,brstmode = <3>;
@@ -183,7 +183,7 @@
 		mhi_event@8 {
 			mhi,num-elements = <0>;
 			mhi,intmod = <0>;
-			mhi,msi = <7>;
+			mhi,msi = <6>;
 			mhi,chan = <102>;
 			mhi,priority = <1>;
 			mhi,brstmode = <3>;
@@ -195,7 +195,7 @@
 		mhi_event@9 {
 			mhi,num-elements = <1024>;
 			mhi,intmod = <5>;
-			mhi,msi = <8>;
+			mhi,msi = <7>;
 			mhi,chan = <103>;
 			mhi,priority = <1>;
 			mhi,brstmode = <2>;
@@ -205,7 +205,7 @@
 		mhi_event@10 {
 			mhi,num-elements = <0>;
 			mhi,intmod = <0>;
-			mhi,msi = <9>;
+			mhi,msi = <8>;
 			mhi,chan = <105>;
 			mhi,priority = <1>;
 			mhi,brstmode = <3>;
@@ -217,7 +217,7 @@
 		mhi_event@11 {
 			mhi,num-elements = <0>;
 			mhi,intmod = <0>;
-			mhi,msi = <10>;
+			mhi,msi = <9>;
 			mhi,chan = <106>;
 			mhi,priority = <1>;
 			mhi,brstmode = <3>;
@@ -229,7 +229,7 @@
 		mhi_event@12 {
 			mhi,num-elements = <0>;
 			mhi,intmod = <0>;
-			mhi,msi = <11>;
+			mhi,msi = <10>;
 			mhi,chan = <107>;
 			mhi,priority = <1>;
 			mhi,brstmode = <3>;
@@ -241,7 +241,7 @@
 		mhi_event@13 {
 			mhi,num-elements = <0>;
 			mhi,intmod = <0>;
-			mhi,msi = <12>;
+			mhi,msi = <11>;
 			mhi,chan = <108>;
 			mhi,priority = <1>;
 			mhi,brstmode = <3>;
@@ -253,7 +253,7 @@
 		mhi_event@14 {
 			mhi,num-elements = <1024>;
 			mhi,intmod = <1>;
-			mhi,msi = <13>;
+			mhi,msi = <12>;
 			mhi,chan = <109>;
 			mhi,priority = <0>;
 			mhi,brstmode = <2>;
@@ -263,7 +263,7 @@
 		mhi_event@15 {
 			mhi,num-elements = <1024>;
 			mhi,intmod = <0>;
-			mhi,msi = <14>;
+			mhi,msi = <13>;
 			mhi,chan = <110>;
 			mhi,priority = <0>;
 			mhi,brstmode = <2>;

arch/arm64/boot/dts/qcom/trinket-sde.dtsi

@@ -1,4 +1,4 @@
-/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -99,7 +99,7 @@
 		qcom,sde-cdm-off = <0x7a200>;
 		qcom,sde-cdm-size = <0x224>;
 
-		qcom,sde-dither-off = <0x30e0 0x30e0 0x30e0 0x30e0>;
+		qcom,sde-dither-off = <0x30e0 0x30e0>;
 		qcom,sde-dither-version = <0x00010000>;
 		qcom,sde-dither-size = <0x20>;
 

drivers/bus/mhi/controllers/mhi_qcom.c

@@ -33,7 +33,7 @@ struct firmware_info {
 };
 
 static const struct firmware_info firmware_table[] = {
-	{.dev_id = 0x308, .fw_image = "sdx65m/sbl1.mbn",
+	{.dev_id = 0x308, .fw_image = "sdx65m/xbl.elf",
 	 .edl_image = "sdx65m/edl.mbn"},
 	{.dev_id = 0x307, .fw_image = "sdx60m/sbl1.mbn",
 	 .edl_image = "sdx60m/edl.mbn"},

drivers/bus/mhi/core/mhi_main.c

@@ -1889,7 +1889,8 @@ int mhi_prepare_channel(struct mhi_controller *mhi_cntrl,
 	return 0;
 
 error_dec_pendpkt:
-	atomic_dec(&mhi_cntrl->pending_pkts);
+	if (in_mission_mode)
+		atomic_dec(&mhi_cntrl->pending_pkts);
 error_pm_state:
 	if (!mhi_chan->offload_ch)
 		mhi_deinit_chan_ctxt(mhi_cntrl, mhi_chan);

drivers/char/adsprpc.c

@@ -656,12 +656,20 @@ static int fastrpc_mmap_find(struct fastrpc_file *fl, int fd,
 static int dma_alloc_memory(dma_addr_t *region_phys, void **vaddr, size_t size,
 					unsigned long dma_attr)
 {
+	int err = 0;
 	struct fastrpc_apps *me = &gfa;
 
 	if (me->dev == NULL) {
 		pr_err("device adsprpc-mem is not initialized\n");
 		return -ENODEV;
 	}
+	VERIFY(err, size > 0 && size < MAX_SIZE_LIMIT);
+	if (err) {
+		err = -EFAULT;
+		pr_err("adsprpc: %s: invalid allocation size 0x%zx\n",
+			__func__, size);
+		return err;
+	}
 	*vaddr = dma_alloc_attrs(me->dev, size, region_phys,
 					GFP_KERNEL, dma_attr);
 	if (IS_ERR_OR_NULL(*vaddr)) {
@@ -733,9 +741,11 @@ static void fastrpc_mmap_free(struct fastrpc_mmap *map, uint32_t flags)
 	}
 	if (map->flags == ADSP_MMAP_HEAP_ADDR ||
 				map->flags == ADSP_MMAP_REMOTE_HEAP_ADDR) {
+		spin_lock(&me->hlock);
 		map->refs--;
 		if (!map->refs)
 			hlist_del_init(&map->hn);
+		spin_unlock(&me->hlock);
 		if (map->refs > 0)
 			return;
 	} else {