Commit graph

599721 commits

Author SHA1 Message Date
Linux Build Service Account
51c5c162c1 Merge "ASoC: msm: Add mixer controls for module enabling" 2018-06-05 20:30:51 -07:00
Linux Build Service Account
4926f1bce0 Merge "adv7481: Support 1080p60 in EDID" 2018-06-05 11:30:47 -07:00
Linux Build Service Account
409cda61b1 Merge "ARM: dts: msm: add wifi cnss ramdump support on msm8996 vplatform" 2018-06-05 02:26:46 -07:00
Linux Build Service Account
9e63500269 Merge "usb: core: Resume the devices on pm restore" 2018-06-04 13:49:04 -07:00
Linux Build Service Account
5ae645ca39 Merge "msm: pcie: change PCIe to suspend after suspend_noirq" 2018-06-04 13:49:02 -07:00
Suprith Malligere Shankaregowda
055f69dac6 adv7481: Support 1080p60 in EDID
Add 1080p60 support in EDID.

Change-Id: I03d3dacbf5af9fde519de66f9eb9c1ad24279d1c
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
2018-06-04 07:25:27 -07:00
Linux Build Service Account
7c542d932b Merge "qmp-phy: Power down PHY durng disconnect to avoid leakage" 2018-06-04 04:30:58 -07:00
Linux Build Service Account
68745c46c6 Merge "soc: qcom: boot_marker: add mpm timer interface" 2018-06-04 04:30:57 -07:00
Linux Build Service Account
d56749a4f9 Merge "hbtp_inpu.c: add 800s power down uevent in suspend func" 2018-06-04 04:30:55 -07:00
Linux Build Service Account
c053ae31b8 Merge "soc: qcom: hab: add performance test mechanism for HAB" 2018-06-04 04:30:53 -07:00
Vijayavardhan Vennapusa
492e7daf22 qmp-phy: Power down PHY durng disconnect to avoid leakage
Currently driver is not powering down QMP PHY if target is booted
up without cable connected. Due to this, 0.3mA leakage current is seen
during standby mode if power measured after bootup. Fix this by
putting QMP PHY in power down state during disconnect.

Change-Id: Idbf7e06ca14649797c50853cf3b9ee182f70749e
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2018-06-04 13:17:02 +05:30
Tony Truong
0ea189e015 msm: pcie: change PCIe to suspend after suspend_noirq
Some PCIe clients support suspend_noirq and need the PCIe
link to be up. Change PCIe to have its power down sequence
after clients suspend_noirq.

Change-Id: I32063f6adf795f8a49cd7d9fe340403ffaf6fd94
Signed-off-by: Tony Truong <truong@codeaurora.org>
2018-06-03 21:20:00 -07:00
Linux Build Service Account
3c78eaa812 Merge "soc: msm: add size check to fix out of bounds on ANC" 2018-06-03 19:10:45 -07:00
Linux Build Service Account
fd95dadf54 Merge "Merge android-4.4.133 (3f51ea2) into msm-4.4" 2018-06-02 01:13:34 -07:00
Linux Build Service Account
33b2567cd5 Merge "spi: spi_qsd: add boot marker" 2018-06-01 14:39:22 -07:00
Linux Build Service Account
707b3d9760 Merge "serial: msm_serial_hs: add boot marker" 2018-06-01 14:39:19 -07:00
Timothy Sham
49662914af soc: msm: add size check to fix out of bounds on ANC
Before calling audio ANC ioctl functions, compare the
allocated buffer size to the size of the header and ANC cmd header
to ensure the buffer is big enough.

Change-Id: I8fcd0a830853d802bbb11fc243a4d392fbe384f3
Signed-off-by: Timothy Sham <tsham@codeaurora.org>
2018-06-01 13:35:21 -04:00
Linux Build Service Account
ef6cdc4600 Merge "ARM: dts: msm: remove USB3 device in msm8996-ivi-lv-mt vplatform" 2018-06-01 06:35:14 -07:00
Sriharsha Allenki
6c16439a24 usb: core: Resume the devices on pm restore
On system restoring from hibernation to reset-resume
the connected USB devices, resume the devices
on pm restore irrespective of the skip_resume
flag.

Change-Id: I56e46c579db572e39eabdc6d2be95b00f2c7d9cb
Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-06-01 14:14:17 +05:30
Sriharsha Allenki
dd4a9bfbf0 xhci-plat: Add hibernation support to xhci platform
Add hibernation support to xhci platform by adding
the proper PM ops freeze and restore.
Also set the hibernated argument to xhci_resume which
will trigger the reset-resume of the connected
root-hubs and the devices.

Change-Id: Ib536bb2485928326f34bfc3422b672cc62309efe
Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-06-01 14:14:17 +05:30
Sriharsha Allenki
6a6d52ab38 usb: dwc3: Add support for USB hibernation in host mode
Add support for hibernation of USB in host mode and
cable disconnected mode by adding proper pm operations
freeze and restore.

Change-Id: Ie1761a8afb0bb44a37d6ed4d046e8a09e1f53c5c
Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-06-01 14:14:16 +05:30
Zhiqiang Tu
1bf695251f spi: spi_qsd: add boot marker
Add boot marker for booting KPI measurement

Change-Id: I8ba79f1b0e71e662ad20fcded128d43363e8302f
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-05-31 23:50:03 -07:00
Zhiqiang Tu
e55e517e9a serial: msm_serial_hs: add boot marker
Add boot marker for booting KPI measurement.

Change-Id: Ia54411a901cc09493f2085af42c3a2188438e29d
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-05-31 23:48:48 -07:00
Zhiqiang Tu
7c7109f9b9 soc: qcom: boot_marker: add mpm timer interface
Provide a debugfs interface to get count of mpm timer.

Change-Id: I24e927b6219b8bd4c2f4ddecb8f51518f0db663a
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-06-01 14:34:56 +08:00
Yong Ding
8c4608db93 ARM: dts: msm: remove USB3 device in msm8996-ivi-lv-mt vplatform
In the latest multiple GVMs(Guest Virtual Machines)
environment, USB3 is expected to be used by LA GVM with
the passthrough mode. So it is necessary to remove its
access from LV GVM, or there will be conflict.

Change-Id: I8409a81a636ca38e64b8e00e25170c064549dc61
Signed-off-by: Yong Ding <yongding@codeaurora.org>
2018-05-31 19:18:48 -07:00
Linux Build Service Account
15dfd16651 Merge "defconfig: msm: Enable CONFIG_CGROUP_DEBUG" 2018-05-31 16:44:26 -07:00
Linux Build Service Account
c0a42ee0ed Merge "adv7481: Add support for AVI Infoframe" 2018-05-31 05:11:45 -07:00
Linux Build Service Account
cbeccf228a Merge "soc: qcom: scm_qcpe: Close hab socket on error" 2018-05-31 05:11:44 -07:00
Linux Build Service Account
2272788153 Merge "selinux: KASAN: slab-out-of-bounds in xattr_getsecurity" 2018-05-31 05:11:43 -07:00
Linux Build Service Account
92fbf2a482 Merge "defconfig: msm: Disable config EXT2_FS and EXT3_FS for sdm660" 2018-05-31 05:11:42 -07:00
Linux Build Service Account
dad9612b1f Merge "soc: qcom: boot_stats: Fix compilation issue" 2018-05-31 05:11:41 -07:00
Linux Build Service Account
155d32a6a7 Merge "ARM: dts: msm: Add support for new speed bin for SDM660" 2018-05-31 05:11:40 -07:00
Linux Build Service Account
95be57e783 Merge "clk: qcom: Add support for 585MHz GPU frequency" 2018-05-31 05:11:39 -07:00
Linux Build Service Account
9b371fc84d Merge "audit: Checks valid value of audit_signals and tsk->audit_context" 2018-05-31 05:11:33 -07:00
Linux Build Service Account
e4a7e7dbaa Merge "defconfig: Sync automotive gvm defconfig with metal defconfig" 2018-05-31 05:11:29 -07:00
Linux Build Service Account
1d5d6eea84 Merge "defconfig: reduce HZ value from 250 to 100" 2018-05-31 05:11:20 -07:00
Srinivasarao P
66249baab2 defconfig: msm: Enable CONFIG_CGROUP_DEBUG
Enable CONFIG_CGROUP_DEBUG to address the compatibility issue with
AOSP.

Change-Id: I30aa2341535bc53982034e7f8ef430137c102177
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-05-31 15:51:23 +05:30
Srinivasarao P
9848856fe1 Merge android-4.4.133 (3f51ea2) into msm-4.4
* refs/heads/tmp-3f51ea2
  Linux 4.4.133
  x86/kexec: Avoid double free_page() upon do_kexec_load() failure
  hfsplus: stop workqueue when fill_super() failed
  cfg80211: limit wiphy names to 128 bytes
  gpio: rcar: Add Runtime PM handling for interrupts
  time: Fix CLOCK_MONOTONIC_RAW sub-nanosecond accounting
  dmaengine: ensure dmaengine helpers check valid callback
  scsi: zfcp: fix infinite iteration on ERP ready list
  scsi: sg: allocate with __GFP_ZERO in sg_build_indirect()
  scsi: libsas: defer ata device eh commands to libata
  s390: use expoline thunks in the BPF JIT
  s390: extend expoline to BC instructions
  s390: move spectre sysfs attribute code
  s390/kernel: use expoline for indirect branches
  s390/lib: use expoline for indirect branches
  s390: move expoline assembler macros to a header
  s390: add assembler macros for CPU alternatives
  ext2: fix a block leak
  tcp: purge write queue in tcp_connect_init()
  sock_diag: fix use-after-free read in __sk_free
  packet: in packet_snd start writing at link layer allocation
  net: test tailroom before appending to linear skb
  btrfs: fix reading stale metadata blocks after degraded raid1 mounts
  btrfs: fix crash when trying to resume balance without the resume flag
  Btrfs: fix xattr loss after power failure
  ARM: 8772/1: kprobes: Prohibit kprobes on get_user functions
  ARM: 8770/1: kprobes: Prohibit probing on optimized_callback
  ARM: 8769/1: kprobes: Fix to use get_kprobe_ctlblk after irq-disabed
  tick/broadcast: Use for_each_cpu() specially on UP kernels
  ARM: 8771/1: kprobes: Prohibit kprobes on do_undefinstr
  efi: Avoid potential crashes, fix the 'struct efi_pci_io_protocol_32' definition for mixed mode
  s390: remove indirect branch from do_softirq_own_stack
  s390/qdio: don't release memory in qdio_setup_irq()
  s390/cpum_sf: ensure sample frequency of perf event attributes is non-zero
  s390/qdio: fix access to uninitialized qdio_q fields
  mm: don't allow deferred pages with NEED_PER_CPU_KM
  powerpc/powernv: Fix NVRAM sleep in invalid context when crashing
  procfs: fix pthread cross-thread naming if !PR_DUMPABLE
  proc read mm's {arg,env}_{start,end} with mmap semaphore taken.
  tracing/x86/xen: Remove zero data size trace events trace_xen_mmu_flush_tlb{_all}
  cpufreq: intel_pstate: Enable HWP by default
  signals: avoid unnecessary taking of sighand->siglock
  mm: filemap: avoid unnecessary calls to lock_page when waiting for IO to complete during a read
  mm: filemap: remove redundant code in do_read_cache_page
  proc: meminfo: estimate available memory more conservatively
  vmscan: do not force-scan file lru if its absolute size is small
  powerpc: Don't preempt_disable() in show_cpuinfo()
  cpuidle: coupled: remove unused define cpuidle_coupled_lock
  powerpc/powernv: remove FW_FEATURE_OPALv3 and just use FW_FEATURE_OPAL
  powerpc/powernv: Remove OPALv2 firmware define and references
  powerpc/powernv: panic() on OPAL < V3
  spi: pxa2xx: Allow 64-bit DMA
  ALSA: control: fix a redundant-copy issue
  ALSA: hda: Add Lenovo C50 All in one to the power_save blacklist
  ALSA: usb: mixer: volume quirk for CM102-A+/102S+
  usbip: usbip_host: fix bad unlock balance during stub_probe()
  usbip: usbip_host: fix NULL-ptr deref and use-after-free errors
  usbip: usbip_host: run rebind from exit when module is removed
  usbip: usbip_host: delete device from busid_table after rebind
  usbip: usbip_host: refine probe and disconnect debug msgs to be useful
  kernel/exit.c: avoid undefined behaviour when calling wait4()
  futex: futex_wake_op, fix sign_extend32 sign bits
  pipe: cap initial pipe capacity according to pipe-max-size limit
  l2tp: revert "l2tp: fix missing print session offset info"
  Revert "ARM: dts: imx6qdl-wandboard: Fix audio channel swap"
  lockd: lost rollback of set_grace_period() in lockd_down_net()
  xfrm: fix xfrm_do_migrate() with AEAD e.g(AES-GCM)
  futex: Remove duplicated code and fix undefined behaviour
  futex: Remove unnecessary warning from get_futex_key
  arm64: Add work around for Arm Cortex-A55 Erratum 1024718
  arm64: introduce mov_q macro to move a constant into a 64-bit register
  audit: move calcs after alloc and check when logging set loginuid
  ALSA: timer: Call notifier in the same spinlock
  sctp: delay the authentication for the duplicated cookie-echo chunk
  sctp: fix the issue that the cookie-ack with auth can't get processed
  tcp: ignore Fast Open on repair mode
  bonding: do not allow rlb updates to invalid mac
  tg3: Fix vunmap() BUG_ON() triggered from tg3_free_consistent().
  sctp: use the old asoc when making the cookie-ack chunk in dupcook_d
  sctp: handle two v4 addrs comparison in sctp_inet6_cmp_addr
  r8169: fix powering up RTL8168h
  qmi_wwan: do not steal interfaces from class drivers
  openvswitch: Don't swap table in nlattr_set() after OVS_ATTR_NESTED is found
  net: support compat 64-bit time in {s,g}etsockopt
  net_sched: fq: take care of throttled flows before reuse
  net/mlx4_en: Verify coalescing parameters are in range
  net: ethernet: sun: niu set correct packet size in skb
  llc: better deal with too small mtu
  ipv4: fix memory leaks in udp_sendmsg, ping_v4_sendmsg
  dccp: fix tasklet usage
  bridge: check iface upper dev when setting master via ioctl
  8139too: Use disable_irq_nosync() in rtl8139_poll_controller()
  BACKPORT, FROMLIST: fscrypt: add Speck128/256 support
  cgroup: Disable IRQs while holding css_set_lock
  Revert "cgroup: Disable IRQs while holding css_set_lock"
  cgroup: Disable IRQs while holding css_set_lock
  ANDROID: proc: fix undefined behavior in proc_uid_base_readdir
  x86: vdso: Fix leaky vdso linker with CC=clang.
  ANDROID: build: cuttlefish: Upgrade clang to newer version.
  ANDROID: build: cuttlefish: Upgrade clang to newer version.
  ANDROID: build: cuttlefish: Fix path to clang.
  UPSTREAM: dm bufio: avoid sleeping while holding the dm_bufio lock
  ANDROID: sdcardfs: Don't d_drop in d_revalidate

Conflicts:
	arch/arm64/include/asm/cputype.h
	fs/ext4/crypto.c
	fs/ext4/ext4.h
	kernel/cgroup.c
	mm/vmscan.c

Change-Id: Ic10c5722b6439af1cf423fd949c493f786764d7e
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-05-31 12:28:38 +05:30
Sachin Grover
e42662afef selinux: KASAN: slab-out-of-bounds in xattr_getsecurity
Call trace:
 [<ffffff9203a8d7a8>] dump_backtrace+0x0/0x428
 [<ffffff9203a8dbf8>] show_stack+0x28/0x38
 [<ffffff920409bfb8>] dump_stack+0xd4/0x124
 [<ffffff9203d187e8>] print_address_description+0x68/0x258
 [<ffffff9203d18c00>] kasan_report.part.2+0x228/0x2f0
 [<ffffff9203d1927c>] kasan_report+0x5c/0x70
 [<ffffff9203d1776c>] check_memory_region+0x12c/0x1c0
 [<ffffff9203d17cdc>] memcpy+0x34/0x68
 [<ffffff9203d75348>] xattr_getsecurity+0xe0/0x160
 [<ffffff9203d75490>] vfs_getxattr+0xc8/0x120
 [<ffffff9203d75d68>] getxattr+0x100/0x2c8
 [<ffffff9203d76fb4>] SyS_fgetxattr+0x64/0xa0
 [<ffffff9203a83f70>] el0_svc_naked+0x24/0x28

If user get root access and calls security.selinux setxattr() with an
embedded NUL on a file and then if some process performs a getxattr()
on that file with a length greater than the actual length of the string,
it would result in a panic.

To fix this, add the actual length of the string to the security context
instead of the length passed by the userspace process.

Change-Id: Ie0b8bfc7c96bc12282b955fb3adf41b3c2d011cd
Signed-off-by: Sachin Grover <sgrover@codeaurora.org>
2018-05-30 21:25:04 -07:00
Suprith Malligere Shankaregowda
1fb990c0b3 adv7481: Add support for AVI Infoframe
AVI Infoframe provides the aspect ratio and video
identification code information. Add support to read
this from ADV7481 registers and to return it to user space
through an ioctl call.

Change-Id: Ia64fbc736b548633b34a9bd96f7a78700afb3db5
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
2018-05-30 21:21:40 -07:00
Linux Build Service Account
07c1b26257 Merge "mmc: card: Update multi_cmd_ioctl path to support cmdq" 2018-05-30 21:10:30 -07:00
Linux Build Service Account
7f1e39e00b Merge "drm: sde: Check commit's validity when starting splash handoff" 2018-05-30 10:21:00 -07:00
Amit Blay
9d0080999d soc: qcom: scm_qcpe: Close hab socket on error
Close the open hab socket after receiving an error status from
the hab.

Change-Id: Ia56c7ce49d0e61661c9f133d35540e48f3707e01
Signed-off-by: Amit Blay <ablay@codeaurora.org>
2018-05-30 18:08:45 +03:00
Taniya Das
129e694595 ARM: dts: msm: Add support for new speed bin for SDM660
New cpu speed bin of 4 is added to support 1.9/1.8GHz.

Change-Id: Ic0dffc7c46e82748bf9f40de7f478ec073142dd1
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2018-05-30 15:03:27 +05:30
Taniya Das
22f07893c9 clk: qcom: Add support for 585MHz GPU frequency
On SDM660 there is a new frequency requirement of 585MHz, so add support
for the same.

Change-Id: I9b55b18d6befdc8f5a7d9dac6bcb832eda338497
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2018-05-30 15:03:18 +05:30
Zhiqiang Tu
e54fbdbc40 soc: qcom: boot_stats: Fix compilation issue
Fix the multiple definition issue of msm_timer_get_sclk_ticks
when CONFIG_MSM_BOOT_STATS is disabled.

Change-Id: Id2c263c48cec038be4354894fa57b203a5f764c6
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-05-30 16:51:56 +08:00
Chetan C R
ad60f0e735 audit: Checks valid value of audit_signals and tsk->audit_context
There can be a case when current task's audit context
may be NULL or even if it is not NULL, it can have
invalid non-zero value of dummy variable and also
we should audit the signal only if we have non-zero
value of audit_signals.

Issue has been seen during power on/off tests. So
better to add explicit check on these variables.

Change-Id: I2f3e17d933fca8e3b8f4013f44f942f11c68f440
Signed-off-by: Chetan C R <cravin@codeaurora.org>
2018-05-29 21:58:34 -07:00
Lei wang
beafa8ecff defconfig: Sync automotive gvm defconfig with metal defconfig
Sync automotive gvm defconfig with metal, cleanup some unused config

Change-Id: Ic0f6f5e1d274692886da237f52c13b587e43a779
Signed-off-by: Lei wang <leiwan@codeaurora.org>
2018-05-29 19:28:32 -07:00
Linux Build Service Account
fc98b97cd8 Merge "msm: kgsl: Don't dump GPMU registers on non GPMU devices" 2018-05-29 13:57:06 -07:00
Linux Build Service Account
addd4dab16 Merge "ASoC: msm: add boot marker for mi2s and auto sound card" 2018-05-29 05:07:37 -07:00