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

Commit 394c559c 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:
  wil6210: report amsdu support in BA resp only if it is supported
  defconfig: sm8150: align with android config requirement
  defconfig: Enable page_owner for sm8150 on perf config
  lib: stackdepot: Add support to configure STACK_HASH_SIZE
  msm: kgsl: Fix gmu_dev_ops null pointer deference
  sched: fair: mark parent domain overutilized if !SD_LOAD_BALANCE
  power: smb5: Fix ITERM thresholds configuration
  ARM: dts: msm: Use correct msm-id for SM8150P
  msm: msm_bus: Ignore -EBUSY from disp rsc when sending AMC cmds
  defconfig: Add support for compiling sdxprairie target
  ARM: dts: msm: Add support for UART console on sdxprairie target
  ARM: dts: msm: change clk name for QRNG driver on SM8150
  adsprpc: Disable dynamic loading from HLOS_PHYSPOOL for qcs405
  msm: gsi: Update GSI driver to support 24 event ring channels
  msm: npu: Add loopback test
  ARM: dts: msm: Add rpm-smd irq number for qcs405
  drivers: qcom: rpm-smd: Remove glink and smd based rpm-smd support
  diag: Validate peripheral received from user for switch logging
  Documentation: sound: Add documentation for qcs405 nodes
  ARM: dts: msm: Add wcss tpdm node for sm8150
  scsi: ufs-qcom: Add flag to keep track of PHY's power state
  mhi: core: use kmemdup rather than duplicating it's implementation
  llcc: Update SCT table entries
  msm: kgsl: Add support for A608 GPU
  soc: qcom: qmi: Fix possible use after free
  net: qualcomm: rmnet: Add support for ethtool private stats for port
  net: qualcomm: rmnet: Add support for dowlink marker
  Revert "ARM: dts: Update NPU clocks for sm8150"
  Revert "msm: npu: Enable npu cti/apb/atb clocks"
  msm: adsprpc: use right DMA bit mask for 32 and 64 bit systems
  defconfig: sm8150: Enable USB UAC 2.0 drivers
  USB: f_accessory: Fix NULL pointer dereference in acc_read()
  USB: f_accessory: Fix crash if driver failed to initialize
  usb: gadget: f_accessory: Make RX buffer size aligned to EP's MTU
  USB: f_accessory: Set manufacturer and model string to default value
  mhi: core: use fixed-length string for mhi_device_id
  mhi: core: marked __packed only members that's required
  mhi: core: remove having compile option for CONFIG_OF flag
  sched/sysctl: check for min/max values for sched_{up,down}_migrate knobs
  ARM: dts: msm: Add the parent-supply property to the GPU CX GDSC on SM8150
  leds: qpnp-flash-v2: Fix HW_STROBE configuration
  leds: qpnp-flash-v2: Add support for multi-strobe
  ARM: dts: msm: Disable USB3.0 core for QCS405 on rumi
  wil6210: rate limit wil_rx_refill error
  wil6210: remove unused rx_reorder members
  ARM: dts: msm: Add CommandDB device bindings for sdmmagpie
  wil6210: Initialize reply struct of the WMI commands
  wil6210: move WMI functionality out of wil_cfg80211_mgmt_tx
  ARM: dts: msm: add system PM device binding for sdmmagpie
  wil6210: change reply_size arg to u16 in wmi_call
  wil6210: fix call to wil6210_disconnect during unload
  ARM: dts: msm: Add RSC mailbox controller device nodes for sdmmagpie
  wil6210: align to latest auto generated wmi.h
  ARM: dts: msm: Add PDC interrupt controller for sdmmagpie
  drivers: irqchip: qcom: Add PDC pin data for sdmmagpie
  ARM: dts: msm: Add LPM nodes for sdmmagpie
  ARM: dts: msm: Untrusted pointer dereference
  selinux: Relocate ss_initialized and selinux_enforcing to separate 4k
  drivers: mailbox: rpmh: Enhance debug logs
  defconfig: sm8150: Enable QTI haptics input driver
  Coresight: Modify reset channel for tmc-etf
  ARM: dts: msm: Remove 650MHz GPU clock for QCS405
  msm: vidc: Add support for ar50 bus bw governor
  ARM: dts: msm: Add NPU TPDM node for sm8150
  ARM: dts: msm: Fix incorrect device-tree pickup for SM8150+SDX50
  clk: qcom: Update order of clocks registration
  defconfig: enable HAVE_LOW_MEMORY_KILLER on all s[d]m configs
  ARM: dts: msm: Add CDSP pil node for SM6150
  nl80211: Fix external_auth check for offloaded authentication
  cfg80211: indicate support for external authentication
  nl80211: Allow SAE Authentication for NL80211_CMD_CONNECT
  cfg80211/nl80211: Optional authentication offload to userspace
  Linux 4.14.50
  crypto: omap-sham - fix memleak
  crypto: vmx - Remove overly verbose printk from AES XTS init
  crypto: vmx - Remove overly verbose printk from AES init routines
  crypto: cavium - Limit result reading attempts
  crypto: cavium - Fix fallout from CONFIG_VMAP_STACK
  crypto: caam - fix size of RSA prime factor q
  crypto: caam/qi - fix IV DMA mapping and updating
  crypto: caam - fix IV DMA mapping and updating
  crypto: caam - fix DMA mapping dir for generated IV
  crypto: caam - strip input zeros from RSA input buffer
  Input: elan_i2c - add ELAN0612 (Lenovo v330 14IKB) ACPI ID
  Input: goodix - add new ACPI id for GPD Win 2 touch screen
  kvm: x86: use correct privilege level for sgdt/sidt/fxsave/fxrstor access
  tty: pl011: Avoid spuriously stuck-off interrupts
  vmw_balloon: fixing double free when batching mode is off
  serial: 8250: omap: Fix idling of clocks for unused uarts
  serial: samsung: fix maxburst parameter for DMA transactions
  tty/serial: atmel: use port->name as name in request_irq()
  serial: sh-sci: Stop using printk format %pCr
  usb: gadget: udc: renesas_usb3: disable the controller's irqs for reconnecting
  usb: gadget: function: printer: avoid wrong list handling in printer_write()
  phy: qcom-qusb2: Fix crash if nvmem cell not specified
  Input: xpad - add GPD Win 2 Controller USB IDs
  usb-storage: Add compatibility quirk flags for G-Technologies G-Drive
  usb-storage: Add support for FL_ALWAYS_SYNC flag in the UAS driver
  usbip: vhci_sysfs: fix potential Spectre v1
  NFC: pn533: don't send USB data off of the stack
  staging: android: ion: Switch to pr_warn_once in ion_buffer_destroy
  KVM: x86: pass kvm_vcpu to kvm_read_guest_virt and kvm_write_guest_virt_system
  kvm: nVMX: Enforce cpl=0 for VMX instructions
  KVM: x86: introduce linear_{read,write}_system
  KVM: X86: Fix reserved bits check for MOV to CR3
  gpio: No NULL owner
  af_key: Always verify length of provided sadb_key
  blkdev_report_zones_ioctl(): Use vmalloc() to allocate large buffers
  netfilter: nf_tables: fix NULL pointer dereference on nft_ct_helper_obj_dump()
  defconfig: Change panic timeout for target sm8150
  msm: npu: Return network handle to user instead of id
  msm: kgsl: Fix the DCVS table definition
  msm: kgsl: Clear OOB for CP init if HFI start fails
  ARM: dts: msm: Add cdsp rpmsg entry in sm8150
  mmc: core: Remove obsolete members from mmc_queue
  mmc: core: Update cmdq for making use of per-request data
  ARM: dts: msm: Add cti0 for tmc-etr/etf node for sm8150
  ARM: dts: msm: Include ION DT changes for sdxprairie
  of: make kobject and bin_attribute support configurable
  of: wrap accesses to device_node kobject
  ARM: dts: msm: Include reserved-memory DT changes for sdxprairie
  arm64: ssbd: Add prctl interface for per-thread mitigation
  arm64: ssbd: Introduce thread flag to control userspace mitigation
  arm64: ssbd: Restore mitigation status on CPU resume
  arm64: ssbd: Skip apply_ssbd if not using dynamic mitigation
  arm64: ssbd: Add global mitigation state accessor
  arm64: Add 'ssbd' command-line option
  arm64: Add ARCH_WORKAROUND_2 probing
  arm64: Add per-cpu infrastructure to call ARCH_WORKAROUND_2
  arm64: Call ARCH_WORKAROUND_2 on transitions between EL0 and EL1
  arm/arm64: smccc: Add SMCCC-specific return codes
  msm: fastcvpd: removing spin_lock around hyp_assign
  defconfig: qcs405: enable MDSS PLL driver

Change-Id: I5e1892edbdda4c06706a0015ed9bc582ed7290fe
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents 9956996a cd4936b2
Loading
Loading
Loading
Loading
+17 −0
Original line number Diff line number Diff line
@@ -4006,6 +4006,23 @@
			expediting.  Set to zero to disable automatic
			expediting.

	ssbd=		[ARM64,HW]
			Speculative Store Bypass Disable control

			On CPUs that are vulnerable to the Speculative
			Store Bypass vulnerability and offer a
			firmware based mitigation, this parameter
			indicates how the mitigation should be used:

			force-on:  Unconditionally enable mitigation for
				   for both kernel and userspace
			force-off: Unconditionally disable mitigation for
				   for both kernel and userspace
			kernel:    Always enable mitigation in the
				   kernel, and offer a prctl interface
				   to allow userspace to register its
				   interest in being mitigated too.

	stack_guard_gap=	[MM]
			override the default stack gap protection. The value
			is in page units and it defines how many pages prior
+6 −6
Original line number Diff line number Diff line
@@ -10,18 +10,18 @@ the application processor, the modem processor, as well as hardware
accelerators. The RPM driver communicates with the hardware engine using
SMD.

The devicetree representation of the SPM block should be:
The devicetree representation of the RPM block should be:

Required properties

- compatible: "qcom,rpm-smd" or "qcom,rpm-glink"
- compatible: "qcom,rpm-smd"
- rpm-channel-name: The string corresponding to the channel name of the
			peripheral subsystem. Required for both smd and
			glink transports.
- rpm-channel-type: The interal SMD edge for this subsystem found in
			<soc/qcom/smd.h>
- qcom,glink-edge: Logical name of the remote subsystem. This is a required
			property when rpm-smd driver using glink as trasport.
- interrupts: The IRQ used by remote processor to inform APSS about
				reception of response message packet.

Optional properties
- rpm-standalone: Allow RPM driver to run in standalone mode irrespective of RPM
@@ -32,10 +32,10 @@ Optional properties
Example:

	qcom,rpm-smd@68150 {
		compatible = "qcom,rpm-smd", "qcom,rpm-glink";
		compatible = "qcom,rpm-smd";
		reg = <0x68150 0x3200>;
		interrupts = <GIC_SPI 168 IRQ_TYPE_EDGE_RISING>;
		qcom,rpm-channel-name = "rpm_requests";
		qcom,rpm-channel-type = 15; /* SMD_APPS_RPM */
		qcom,glink-edge = "rpm";
	}
}
+63 −0
Original line number Diff line number Diff line
QTI PDC interrupt controller

PDC is QTI's platform parent interrupt controller that serves as wakeup source.

Newer QTI SOCs are replacing MPM (MSM sleep Power Manager) with PDC (Power
Domain Controller) to manage subsystem wakeups and resources during sleep.
This driver marks the wakeup interrupts in APSS PDC such that it monitors the
interrupts when the system is asleep, wakes up the APSS when one of these
interrupts occur and replays it to the subsystem interrupt controller after it
becomes operational.

Earlier MPM architecture used arch-extension of GIC interrupt
controller to mark enabled wake-up interrupts and monitor these when the
system goes to sleep. Since the arch-extensions are no-longer available
on newer kernel versions, this driver is implemented as hierarchical irq
domain.  GIC is parent interrupt controller at the highest level.
Platform interrupt controller PDC is next in hierarchy, followed by others.
This driver only configures the interrupts, does not handle them.

PDC interrupt configuration involves programming of 2 set of registers:
IRQ_ENABLE_BANK    - Enable the irq
IRQ_i_CFG          - Configure the interrupt i

Properties:

- compatible:
	Usage: required
	Value type: <string>
	Definition: Should contain "qcom,pdc-<target>"

- reg:
	Usage: required
	Value type: <prop-encoded-array>
	Definition: Specifies the base physical address for PDC hardware
			block for DRV2.

- interrupt-cells:
	Usage: required
	Value type: <u32>
	Definition: Specifies the number of cells needed to encode an interrupt source.
			Value must be 3.
			The encoding of these cells are same as described in
			Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt

- interrupt-parent:
	Usage: required
	Value type: <phandle>
	Definition: Specifies the interrupt parent necessary for hierarchical domain to operate.

- interrupt-controller:
	Usage: required
	Value type: <bool>
	Definition: Identifies the node as an interrupt controller.

Example:

pdcgic: interrupt-controller@0xb220000{
	compatible = "qcom,pdc-sdmmagpie";
	reg = <0xb220000 0x30000>;
	#interrupt-cells = <3>;
	interrupt-parent = <&intc>;
	interrupt-controller;
};
+172 −0
Original line number Diff line number Diff line
Qualcomm Technologies, Inc. LPI GPIO controller driver

This DT bindings describes the GPIO controller driver
being added for supporting LPI (Low Power Island) TLMM
from QTI chipsets.

Following properties are for LPI GPIO controller device main node.
- compatible:
	Usage: required
	Value type: <string>
	Definition: must be "qcom,lpi-pinctrl"

- reg:
	Usage: required
	Value type: <prop-encoded-array>
	Definition: Register base of the GPIO controller and length.

- qcom,num-gpios:
	Usage: required
	Value type: <u32>
	Definition: Number of GPIOs supported by the controller.

- qcom,lpi-offset-tbl
	Usage: required
	Value type: <u32-array>
	Definition: Offset table of GPIOs supported by the controller.

- gpio-controller:
	Usage: required
	Value type: <none>
	Definition: Used to mark the device node as a GPIO controller.

- #gpio-cells:
	Usage: required
	Value type: <u32>
	Definition: Must be 2;
		    The first cell will be used to define gpio number and the
		    second denotes the flags for this gpio.

Please refer to ../gpio/gpio.txt for general description of GPIO bindings.

Please refer to pinctrl-bindings.txt in this directory for details of the
common pinctrl bindings used by client devices, including the meaning of the
phrase "pin configuration node".

The pin configuration nodes act as a container for an arbitrary number of
subnodes. Each of these subnodes represents some desired configuration for a
pin or a list of pins. This configuration can include the
mux function to select on those pin(s), and various pin configuration
parameters, as listed below.

SUBNODES:

The name of each subnode is not important; all subnodes should be enumerated
and processed purely based on their content.

Each subnode only affects those parameters that are explicitly listed. In
other words, a subnode that lists a mux function but no pin configuration
parameters implies no information about any pin configuration parameters.
Similarly, a pin subnode that describes a pullup parameter implies no
information about e.g. the mux function.

The following generic properties as defined in pinctrl-bindings.txt are valid
to specify in a pin configuration subnode:

- pins:
	Usage: required
	Value type: <string-array>
	Definition: List of gpio pins affected by the properties specified in
		    this subnode.  Valid pins are: gpio0-gpio31 for LPI.

- function:
	Usage: required
	Value type: <string>
	Definition: Specify the alternative function to be configured for the
		    specified pins. Valid values are:
			"gpio",
			"func1",
			"func2",
			"func3",
			"func4",
			"func5"

- bias-disable:
	Usage: optional
	Value type: <none>
	Definition: The specified pins should be configured as no pull.

- bias-pull-down:
	Usage: optional
	Value type: <none>
	Definition: The specified pins should be configured as pull down.

- bias-bus-hold:
	Usage: optional
	Value type: <none>
	Definition: The specified pins should be configured as bus-keeper mode.

- bias-pull-up:
	Usage: optional
	Value type: <empty>
	Definition: The specified pins should be configured as pull up.

- input-enable:
	Usage: optional
	Value type: <none>
	Definition: The specified pins are put in input mode.

- output-high:
	Usage: optional
	Value type: <none>
	Definition: The specified pins are configured in output mode, driven
		    high.

- output-low:
	Usage: optional
	Value type: <none>
	Definition: The specified pins are configured in output mode, driven
		    low.

- qcom,drive-strength:
	Usage: optional
	Value type: <u32>
	Definition: Selects the drive strength for the specified pins.

Example:

	lpi_tlmm: lpi_pinctrl@152c000 {
		compatible = "qcom,lpi-pinctrl";
		qcom,num-gpios = <32>;
		reg = <0x152c000 0>;
		gpio-controller;
		#gpio-cells = <2>;
		qcom,lpi-offset-tbl = <0x00000010>, <0x00000020>,
				<0x00000030>, <0x00000040>,
				<0x00000050>, <0x00000060>,
				<0x00000070>, <0x00000080>,
				<0x00000090>, <0x00000100>,
				<0x00000110>, <0x00000120>,
				<0x00000130>, <0x00000140>,
				<0x00000150>, <0x00000160>,
				<0x00000170>, <0x00000180>,
				<0x00000190>, <0x00000200>,
				<0x00000210>;


		hph_comp_active: hph_comp_active {
			mux {
				pins = "gpio22";
				function = "func1";
			};

			config {
				pins = "gpio22";
				output-high;
				qcom,drive-strength = <8>;
			};
		};

		hph_comp_sleep: hph_comp_sleep {
			mux {
				pins = "gpio22";
				function = "func1";
			};

			config {
				pins = "gpio22";
				qcom,drive-strength = <2>;
			};
		};
	};
+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ Optional properties:
- qcom,rpc-latency-us:	FastRPC QoS latency vote
- qcom,adsp-remoteheap-vmid:  FastRPC remote heap VMID list
- qcom,secure-context-bank		:	Bool indicating secure FastRPC context bank.
- qcom,fastrpc-legacy-remote-heap	:	Bool indicating hypervisor is not supported.

Optional subnodes:
- qcom,msm_fastrpc_compute_cb :	Child nodes representing the compute context
Loading