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

Commit cb472ded 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:
  msm: ipa3: remove noncached from IPANAT
  defconfig: enable FastCVP driver for sm8150
  scsi: ufs: Fix UFS's NOC error, command tracing
  power: smb5: Rearrange USB ICL SW configuration
  ARM: dts: msm: Add support for L2 Cache dumping
  ARM: dts: msm: Add support for L1 TLB dumping
  ARM: dts: msm: Remove errirq interrupts
  ARM: dts: msm: Add support for core hang detection
  msm: kgsl: Correct memory type update in IOCTL_KGSL_GPUOBJ_SET_INFO
  msm: kgsl: Correctly limit max number of contexts per process
  msm: kgsl: Keep dispatcher halted during SUSPEND state
  msm: kgsl: Specify context aware target power level for each speed bin
  msm: kgsl: Use only compat VA range for compat tasks
  lpm_levels: Return true for CPU WFI mode allow check
  sched/fair: fix cpu util for waking tasks
  msm: ipa4: Dump IPA registers during panic handling
  ARM: dts: msm: disable L1/L1ss for PCIe on SM8150
  msm: pcie: update PCIe gen3 settings
  ARM: dts: msm: update PCIe gen3x1 and gen3x2 PHY sequence for SM8150
  msm: ipa: disable prefetch for MHI
  power: smb5: Add support to read USBIN_I, USBIN_V, and charger temperature
  sched/core: Disable irq before calling irq_migrate_all_off_this_cpu
  msm: vidc: use declarations from upi header file
  sched/fair: Add bias towards previous CPU for high wakeup rate tasks
  sched: walt: Optimize cycle counter reads
  sched/fair: Consider an idle CPU outside c-state as an active CPU
  defconfig: msm: Enable ADC_TM driver for sm8150
  thermal: adc-tm5: Fix pointer dereference error
  msm: fastcvpd: add fastcvp driver
  net: Add noinline to reduce dev_ethtool stack size
  Linux 4.14.36
  writeback: safer lock nesting
  media: staging: lirc_zilog: incorrect reference counting
  Revert "media: lirc_zilog: driver only sends LIRCCODE"
  iwlwifi: add a bunch of new 9000 PCI IDs
  iwlwifi: add shared clock PHY config flag for some devices
  net: dsa: Discard frames from unused ports
  mm/filemap.c: fix NULL pointer in page_cache_tree_insert()
  autofs: mount point create should honour passed in mode
  Don't leak MNT_INTERNAL away from internal mounts
  rpc_pipefs: fix double-dput()
  orangefs_kill_sb(): deal with allocation failures
  hypfs_kill_super(): deal with failed allocations
  jffs2_kill_sb(): deal with failed allocations
  drm/i915: Correctly handle limited range YCbCr data on VLV/CHV
  mmc: sdhci-pci: Only do AMD tuning for HS200
  fanotify: fix logic of events on child
  udf: Fix leak of UTF-16 surrogates into encoded strings
  powerpc/lib: Fix off-by-one in alternate feature patching
  powerpc/xive: Fix trying to "push" an already active pool VP
  powerpc/eeh: Fix enabling bridge MMIO windows
  MIPS: memset.S: Fix clobber of v1 in last_fixup
  MIPS: memset.S: Fix return of __clear_user from Lpartial_fixup
  MIPS: memset.S: EVA & fault support for small_memset
  MIPS: uaccess: Add micromips clobbers to bzero invocation
  HID: wacom: bluetooth: send exit report for recent Bluetooth devices
  HID: hidraw: Fix crash on HIDIOCGFEATURE with a destroyed device
  HID: input: fix battery level reporting on BT mice
  random: add new ioctl RNDRESEEDCRNG
  random: crng_reseed() should lock the crng instance that it is modifying
  random: use a different mixing algorithm for add_device_randomness()
  random: fix crng_ready() test
  ALSA: hda/realtek - adjust the location of one mic
  ALSA: hda/realtek - set PINCFG_HEADSET_MIC to parse_flags
  ALSA: hda - New VIA controller suppor no-snoop path
  ALSA: rawmidi: Fix missing input substream checks in compat ioctls
  ALSA: line6: Use correct endpoint type for midi output
  drm/radeon: Fix PCIe lane width calculation
  drm/radeon: add PX quirk for Asus K73TK
  drm/rockchip: Clear all interrupts before requesting the IRQ
  drm/amdgpu/si: implement get/set pcie_lanes asic callback
  drm/amdgpu: Fix PCIe lane width calculation
  drm/amdgpu/sdma: fix mask in emit_pipeline_sync
  drm/amdgpu: Fix always_valid bos multiple LRU insertions.
  drm/amdgpu: Add an ATPX quirk for hybrid laptop
  ALSA: pcm: Fix endless loop for XRUN recovery in OSS emulation
  ALSA: pcm: Fix mutex unbalance in OSS emulation ioctls
  ALSA: pcm: Return -EBUSY for OSS ioctls changing busy streams
  ALSA: pcm: Avoid potential races between OSS ioctls and read/write
  ALSA: pcm: Use ERESTARTSYS instead of EINTR in OSS emulation
  vfio/pci: Virtualize Maximum Read Request Size
  watchdog: f71808e_wdt: Fix WD_EN register read
  dt-bindings: clock: mediatek: add binding for fixed-factor clock axisel_d4
  thermal: imx: Fix race condition in imx_thermal_probe()
  pwm: rcar: Fix a condition to prevent mismatch value setting to duty
  clk: bcm2835: De-assert/assert PLL reset signal when appropriate
  clk: mediatek: fix PWM clock source by adding a fixed-factor clock
  clk: fix false-positive Wmaybe-uninitialized warning
  clk: mvebu: armada-38x: add support for missing clocks
  PCI: Mark Broadcom HT1100 and HT2000 Root Port Extended Tags as broken
  mmc: tmio: Fix error handling when issuing CMD23
  mmc: jz4740: Fix race condition in IRQ mask update
  iommu/vt-d: Fix a potential memory leak
  um: Use POSIX ucontext_t instead of struct ucontext
  um: Compile with modern headers
  ring-buffer: Check if memory is available before allocation
  nfit: skip region registration for incomplete control regions
  nfit, address-range-scrub: fix scrub in-progress reporting
  libnvdimm, namespace: use a safe lookup for dimm device name
  libnvdimm, dimm: fix dpa reservation vs uninitialized label area
  tpm: self test failure should not cause suspend to fail
  cxl: Fix possible deadlock when processing page faults from cxllib
  dmaengine: at_xdmac: fix rare residue corruption
  IB/srp: Fix completion vector assignment algorithm
  IB/srp: Fix srp_abort()
  ALSA: pcm: Fix UAF at PCM release via PCM timer access
  RDMA/rxe: Fix an out-of-bounds read
  RDMA/mlx5: Protect from NULL pointer derefence
  RDMA/ucma: Don't allow setting RDMA_OPTION_IB_PATH without an RDMA device
  dm crypt: limit the number of allocated pages
  ext4: add extra checks to ext4_xattr_block_get()
  ext4: add bounds checking to ext4_xattr_find_entry()
  ext4: move call to ext4_error() into ext4_xattr_check_block()
  ext4: don't allow r/w mounts if metadata blocks overlap the superblock
  ext4: always initialize the crc32c checksum driver
  ext4: fail ext4_iget for root directory if unallocated
  ext4: limit xattr size to INT_MAX
  ext4: protect i_disksize update by i_data_sem in direct write path
  ext4: don't update checksum of new initialized bitmaps
  ext4: pass -ESHUTDOWN code to jbd2 layer
  ext4: eliminate sleep from shutdown ioctl
  ext4: shutdown should not prevent get_write_access
  jbd2: if the journal is aborted then don't allow update of the log tail
  block: use 32-bit blk_status_t on Alpha
  extcon: intel-cht-wc: Set direction and drv flags for V5 boost GPIO
  random: use a tighter cap in credit_entropy_bits_safe()
  irqchip/gic: Take lock when updating irq type
  thunderbolt: Prevent crash when ICM firmware is not running
  thunderbolt: Resume control channel after hibernation image is created
  thunderbolt: Serialize PCIe tunnel creation with PCI rescan
  thunderbolt: Wait a bit longer for ICM to authenticate the active NVM
  ASoC: topology: Fix kcontrol name string handling
  ASoC: ssm2602: Replace reg_default_raw with reg_default
  soc: mediatek: fix the mistaken pointer accessed when subdomains are added
  HID: core: Fix size as type u32
  HID: Fix hid_report_len usage
  powerpc/powernv: Fix OPAL NVRAM driver OPAL_BUSY loops
  powerpc/powernv: define a standard delay for OPAL_BUSY type retry loops
  powerpc/kexec_file: Fix error code when trying to load kdump kernel
  powerpc/kprobes: Fix call trace due to incorrect preempt count
  powerpc/64: Fix smp_wmb barrier definition use use lwsync consistently
  powerpc/64: Call H_REGISTER_PROC_TBL when running as a HPT guest on POWER9
  powerpc/64s: Fix dt_cpu_ftrs to have restore_cpu clear unwanted LPCR bits
  powerpc/powernv: Handle unknown OPAL errors in opal_nvram_write()
  CIFS: fix sha512 check in cifs_crypto_secmech_release
  CIFS: add sha512 secmech
  CIFS: refactor crypto shash/sdesc allocation&free
  i2c: i801: Restore configuration at shutdown
  i2c: i801: Save register SMBSLVCMD value only once
  HID: i2c-hid: fix size check and type usage
  smb3: Fix root directory when server returns inode number of zero
  fix smb3-encryption breakage when CONFIG_DEBUG_SG=y
  cifs: fix memory leak in SMB2_open()
  usb: dwc3: gadget: never call ->complete() from ->ep_queue()
  usb: dwc3: pci: Properly cleanup resource
  usb: dwc3: prevent setting PRTCAP to OTG from debugfs
  USB:fix USB3 devices behind USB3 hubs not resuming at hibernate thaw
  USB: gadget: f_midi: fixing a possible double-free in f_midi
  ACPI / hotplug / PCI: Check presence of slot itself in get_slot_status()
  ACPI / video: Add quirk to force acpi-video backlight on Samsung 670Z5E
  regmap: Fix reversed bounds check in regmap_raw_write()
  xen-netfront: Fix hang on device removal
  x86/xen: Delay get_cpu_cap until stack canary is established
  media: vsp1: Fix BRx conditional path in WPF
  media: vivid: check if the cec_adapter is valid
  media: atomisp_fops.c: disable atomisp_compat_ioctl32
  spi: Fix unregistration of controller with fixed SPI bus number
  spi: Fix scatterlist elements size in spi_map_buf
  spi: atmel: init FIFOs before spi enable
  ARM: dts: at91: sama5d4: fix pinctrl compatible string
  ARM: dts: exynos: Fix IOMMU support for GScaler devices on Exynos5250
  ARM: dts: at91: at91sam9g25: fix mux-mask pinctrl property
  arm: dts: mt7623: fix USB initialization fails on bananapi-r2
  ARM: EXYNOS: Fix coupled CPU idle freeze on Exynos4210
  ARM: dts: da850-lego-ev3: Fix battery voltage gpio
  KVM: arm/arm64: vgic-its: Fix potential overrun in vgic_copy_lpi_list
  ARM64: dts: meson: reduce odroid-c2 eMMC maximum rate
  usb: gadget: udc: core: update usb_ep_queue() documentation
  phy: allwinner: sun4i-usb: poll vbus changes on A23/A33 when driving VBUS
  usb: musb: gadget: misplaced out of bounds check
  mm, slab: reschedule cache_reap() on the same CPU
  ipc/shm: fix use-after-free of shm file via remap_file_pages()
  resource: fix integer overflow at reallocation
  fs/reiserfs/journal.c: add missing resierfs_warning() arg
  task_struct: only use anon struct under randstruct plugin
  mm/hmm: hmm_pfns_bad() was accessing wrong struct
  mm/hmm: fix header file if/else/endif maze
  mm/ksm.c: fix inconsistent accounting of zero pages
  ubi: Reject MLC NAND
  ubi: Fix error for write access
  ubi: fastmap: Don't flush fastmap work on detach
  ubifs: Check ubifs_wbuf_sync() return code
  cpufreq: CPPC: Use transition_delay_us depending transition_latency
  tty: make n_tty_read() always abort if hangup is in progress
  leds: qpnp: add driver file for configuring vibrator LDO
  qcom: spmi-wled: Add compatible string for pm640l
  f2fs: check cap_resource only for data blocks
  Revert "f2fs: introduce f2fs_set_page_dirty_nobuffer"
  f2fs: clear PageError on writepage
  drivers: cpuidle: lpm-levels: Update CPU prediction timer
  sched/fair: Only kick nohz balance when runqueue has more than 1 task
  BACKPORT: dm verity: add 'check_at_most_once' option to only validate hashes once
  cpuidle: lpm-levels: Add support to parse LPM parameters
  power: smb5-lib: Disable charging on detecting a debug battery
  rpmh_master_stat: Add support for application processor master stats
  f2fs: call unlock_new_inode() before d_instantiate()
  f2fs: refactor read path to allow multiple postprocessing steps
  fscrypt: allow synchronous bio decryption
  sched: Fix incorrect usage of SCHED_CPUFREQ_INTERCLUSTER_MIG flag
  diag: diagfwd_socket: Fix DEL_CLIENT notification
  FROMLIST: arm64: kvm: use -fno-jump-tables with clang
  diag: Allocate DCI memory using vzalloc instead of kzalloc
  clk: qcom: clk-debug: Add support for enable mask for debug clk
  qseecom: check dmabuf api return value correctly
  ARM: dts: msm: Add GPI DMA device tree nodes for sdm640
  ARM: dts: msm: Add vendor mount node for sdmshrike
  cpufreq: schedutil: Avoid WALT logic when WALT sysctl flag not set

Change-Id: I879cdc0a0211349218e0dbe4839ac6648cb3bce2
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents df165e3d 78e2a700

Documentation/device-mapper/verity.txt

+11 −0
Original line number Diff line number Diff line
@@ -109,6 +109,17 @@ fec_start <offset> 
    This is the offset, in <data_block_size> blocks, from the start of the

    FEC device to the beginning of the encoding data.



check_at_most_once

    Verify data blocks only the first time they are read from the data device,

    rather than every time.  This reduces the overhead of dm-verity so that it

    can be used on systems that are memory and/or CPU constrained.  However, it

    provides a reduced level of security because only offline tampering of the

    data device's content will be detected, not online tampering.



    Hash blocks are still verified each time they are read from the hash device,

    since verification of hash blocks is less performance critical than data

    blocks, and a hash block will not be verified any more after all the data

    blocks it covers have been verified anyway.



Theory of operation

===================

Documentation/devicetree/bindings/arm/msm/lpm-levels.txt

+24 −2
Original line number Diff line number Diff line
@@ -28,6 +28,14 @@ Required properties: 
	mask of the cluster mode in the composite state ID used to define

	cluster low power modes in PSCI.



Optional properties:

	- qcom,disable-prediction: This property is used to indicate the LPM

	governor will not use LPM prediction for this cluster.

	- qcom,clstr-tmr-add: This property is used as correction timer for

	wrong prediction by lpm prediction algorithm for cluster predictions.

	This value should be between 100 to 1500. Higher values would mean

	longer time staying in shallower state before waking up to select a

	deeper state in case of wrong prediction.

	qcom,pm-cluster contains qcom,pm-cluster-level nodes which identify

	the various low power modes that the cluster can enter. The

	qcom,pm-cluster node should also include another cluster node or a cpu
@@ -77,8 +85,22 @@ that share the parameters.It contains the following properties. 
	- qcom,pm-cpu-levels: The different low power modes that a CPU could

	enter. The following section explains the required properties of this

	node.

	-qcom,use-prediction: This optional property is used to indicate the

	the LPM governor is to apply sleep prediction to this cluster.



Optional properties:

	- qcom,disable-prediction: This property is used to indicate the

	LPM governor is to disable sleep prediction to this cpu.

	- qcom,ref-stddev: This property is used as reference standard deviation

	in lpm prediction algorithm. This value should be between 100 to 1000.

	Higher value would result in more predictions and thereby resulting in

	shallower low power modes.

	- qcom,tmr-add: This property is used as correction timer for wrong

	prediction by lpm prediction algorithm. This value should be between

	100 to 1500. Higher values would mean longer time staying in shallower

	state before waking up to select a deeper state in case of wrong prediction.

	- qcom,ref-premature-cnt: This property is used as reference premature

	count to predict next sleep state by the prediction algorithm. This value

	should be between 1 to 5. Higher value for this parameter would result in

	less predictions to disallow deeper low power modes.



[Node bindings for qcom,pm-cpu-levels]

 Required properties:

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

+15 −2
Original line number Diff line number Diff line
@@ -4,15 +4,28 @@ 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.

displayed using the sysfs interface.

To achieve this, device tree node has been added.



Additionally, RPMH master stats also maintains application processor's

master stats. It uses profiling units to calculate power down and power

up stats.



The required properties for rpmh-master-stats are:



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

- compatible:

	Usage: required

	Value type: <string>

	Definition: Should be "qcom,rpmh-master-stats-v1".



- reg:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: Specifies physical address of start of profiling unit.



Example:



qcom,rpmh-master-stats {

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

	reg = <0xb221200 0x60>;

};

Documentation/devicetree/bindings/gpu/adreno-pwrlevels.txt

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ Properties: 


- qcom,gpu-pwrlevel:		A single powerlevel



- qcom,ca-target-pwrlevel:

				This value indicates which qcom,gpu-pwrlevel

				to jump on in case of context aware power level

				jump.

Properties:

- reg:				Index of the powerlevel (0 = highest perf)

- qcom,gpu-freq			GPU frequency for the powerlevel (in Hz)

Documentation/devicetree/bindings/gpu/adreno.txt

+19 −0
Original line number Diff line number Diff line
@@ -167,6 +167,15 @@ Optional Properties: 
				Specify the size of snapshot in bytes. This will override

				snapshot size defined in the driver code.



- qcom,enable-ca-jump:

                                Boolean. Enables use of context aware DCVS

- qcom,ca-busy-penalty:

                                This property represents the time in microseconds required to

                                initiate context aware power level jump.

- qcom,ca-target-pwrlevel:

                                This value indicates which qcom,gpu-pwrlevel to jump on in case

                                of context aware power level jump.



- qcom,gpu-qdss-stm:

				<baseAddr size>

				baseAddr - base address of the gpu channels in the qdss stm memory region
@@ -323,6 +332,15 @@ Example of A330 GPU in MSM8916: 
		coresight-child-list = <&funnel_in0>;

		coresight-child-ports = <5>;



		/* Enable context aware freq. scaling */

		qcom,enable-ca-jump;



		/* Context aware jump busy penalty in us */

		qcom,ca-busy-penalty = <12000>;



		/* Context aware jump target power level */

		qcom,ca-target-pwrlevel = <1>;



		qcom,soc-hw-revisions {

			#address-cells = <1>;

			#size-cells = <0>;
@@ -389,6 +407,7 @@ Example of A330 GPU in MSM8916: 
				#size-cells = <0>;



				qcom,speed-bin = <0>;

				qcom,ca-target-pwrlevel = <1>;



				qcom,gpu-pwrlevel@0 {

					reg = <0>;