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

Commit 59c7a18e 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:
  diag: Protect the decrement of number of diag clients
  edac: Check part number before parsing L1/L2 error
  ARM: dts: msm: Update MHI configuration for sm8150
  msm: kgsl: Log external and transaction stalled iommu faults
  mm: compaction: fix the page state calculation in too_many_isolated
  mm: vmstat: add pageoutclean
  ARM: dts: msm: Fix interrupts definition in SMB1390 device
  scsi: ufs: add UFS fault injection to hibernate enter and exit
  perf: Fix idle notifier setup in arm64 PMU driver
  ARM: dts: msm: Update analog voltage for eeprom on sm8150 QRD platform
  ARM: dts: msm: Add thermal mitigation config for NPU in SM8150
  usb: dwc3: gadget: remove unbalanced pm_runtime_put()
  defconfig: Enable CONFIG_NETFILTER_XT_MATCH_BPF
  msm: gsi: add support for prefetch escape buffer only
  qbt1000: Remove redundant check on qseecom buffer size
  ARM: dts: msm: Remove USB speed limitation on QRD8150
  ARM: dts: msm: Update the RPM clock node for QCS405
  defconfig: Enable RPM clock driver for QCS405
  defconfig: Enable full reference count validation
  lib: refcount: Cause kernel panic on refcount error detection
  extcon: usb-gpio: Add support for optional VBUS output enable GPIO
  qrtr: mhi: Configure IPC mhi channel to autostart
  ARM: dts: msm: realign PCIe1 SIDs to base SID for SM8150
  npu: Save and restore BWMON registers
  ARM: dts: msm: disable wil6210 for sm8150-sdx50m
  ARM: dts: msm: Fix wdsp glink node for sm8150
  phy: qcom-ufs: Update UFS's PHY Calibration Sequence
  ARM: dts: msm: add AHB bus configurations for SM8150 multimedia GDSCs
  clk: qcom: gdsc-regulator: add support to manage bus bandwidth requests
  ARM: dts: msm: Add proxy init client for MM config slaves for sm8150
  msm: vidc: Add support for Adaptive B
  sched/fair: always use task_fits_max check
  ARM: dts: msm: Update the vdd-cx handle name for QCS405
  ion: ion_system_heap: update supported page-orders for ion pool
  mm: vmscan: do not pass reclaimed slab to vmpressure
  mm: memory: reduce fault_around_bytes
  mm: ratelimit swap write errors
  sched/walt: improve the scheduler
  mm: allow page poisoning to be enabled by default.
  mm: vmscan: fix the page state calculation in too_many_isolated
  usb: pd: fix off-by-one in rdo_h_show
  usb: pd: notify charger if source is PPS capable
  power_supply: Add enums for POWER_SUPPLY_PROP_PD_ACTIVE

Change-Id: I8af8542417a5e93baa72f5788effac127bce67dc
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents c05f2053 3afeb98f

Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ Either one of id-gpio or vbus-gpio must be present. Both can be present as well. 
- id-gpio: gpio for USB ID pin. See gpio binding.

- vbus-gpio: gpio for USB VBUS pin.



Optional properties:

- vbus-out-gpio: gpio for enabling VBUS output (e.g. when entering host mode)



Example: Examples of extcon-usb-gpio node in dra7-evm.dts as listed below:

	extcon_usb1 {

		compatible = "linux,extcon-usb-gpio";

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

+11 −0
Original line number Diff line number Diff line
@@ -61,6 +61,17 @@ Optional properties: 
 - reset-names: reset signal name strings sorted in the same order as the resets

			property. These can be supplied only if we support

			qcom,skip-logic-collapse.

 - qcom,msm-bus,name:	Name to use for the bus client.  See [1] for details.

 - qcom,msm-bus,num-cases: Must be 2 if qcom,msm-bus,name is specified.  The

			first case corresponds to no bus request and the second

			case corresponds to a minimum bus request.  See [1] for

			details.

 - qcom,msm-bus,num-paths: Should be 1 if qcom,msm-bus,name is specified.  See

			[1] for details.

 - qcom,msm-bus,vectors-KBps: Required if qcom,msm-bus,name is specified.  See

			[1] for an explanation of the data format.



[1]: Documentation/devicetree/bindings/arm/msm/msm_bus.txt



Example:

	gdsc_oxili_gx: qcom,gdsc@fd8c4024 {

arch/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -1027,4 +1027,13 @@ config REFCOUNT_FULL 
	  against various use-after-free conditions that can be used in

	  security flaw exploits.



config PANIC_ON_REFCOUNT_ERROR

	bool "Kernel panic on refcount error detection"

	depends on REFCOUNT_FULL

	help

	  If enabled, the kernel will panic when the refcount library

	  has detected any type of error (e.g. potential use-after-free

	  or potential memory-leaks) with an object associated with that

	  reference counter.



source "kernel/gcov/Kconfig"

arch/arm/configs/qcs405-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -318,6 +318,7 @@ CONFIG_STAGING=y 
CONFIG_ASHMEM=y

CONFIG_ION=y

CONFIG_COMMON_CLK_QCOM=y

CONFIG_QCOM_CLK_SMD_RPM=y

CONFIG_MDM_GCC_QCS405=y

CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y
@@ -326,8 +327,10 @@ CONFIG_QCOM_APCS_IPC=y 
CONFIG_RPMSG_CHAR=y

CONFIG_RPMSG_QCOM_GLINK_RPM=y

CONFIG_RPMSG_QCOM_GLINK_SMEM=y

CONFIG_RPMSG_QCOM_SMD=y

CONFIG_QCOM_QMI_HELPERS=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SMD_RPM=y

CONFIG_QCOM_SCM=y

CONFIG_QCOM_SMP2P=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

arch/arm/configs/qcs405_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ CONFIG_STAGING=y 
CONFIG_ASHMEM=y

CONFIG_ION=y

CONFIG_COMMON_CLK_QCOM=y

CONFIG_QCOM_CLK_SMD_RPM=y

CONFIG_MDM_GCC_QCS405=y

CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y
@@ -346,8 +347,10 @@ CONFIG_QCOM_IOMMU=y 
CONFIG_RPMSG_CHAR=y

CONFIG_RPMSG_QCOM_GLINK_RPM=y

CONFIG_RPMSG_QCOM_GLINK_SMEM=y

CONFIG_RPMSG_QCOM_SMD=y

CONFIG_QCOM_QMI_HELPERS=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SMD_RPM=y

CONFIG_QCOM_SCM=y

CONFIG_QCOM_SMP2P=y

CONFIG_MSM_SUBSYSTEM_RESTART=y