Commit graph

600733 commits

Author SHA1 Message Date
Linux Build Service Account
6afb4d46de Merge "dwc3: Check USB LPM status before accessing any register" 2018-07-27 03:36:34 -07:00
Vijayavardhan Vennapusa
16683815e8 USB: pd: Send PS_RDY within tNewSrc after PS_RDY received
USBPD spec mentions max time within which device that transitions
from sink power role to source needs to send PS_RDY message after
PS_RDY received from other device as part of PR_SWAP. Currently
USB PD driver is taking time around 380msec i.e greater than tNewSrc
(275msec) and resulting in USB PD complaince test "2.2.3.1.2
Procedure/Checks for Tester (Source) Originated Swap" failure. Fix it
by waiting only till VBUS voltage reaches VSafe5Vmin.

Change-Id: I3138e6d31ba964507230fe5f914aaaf2e261647d
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2018-07-27 00:12:43 -07:00
Mayank Rana
b36879a9e9 dwc3: Check USB LPM status before accessing any register
USB debugfs entries can be accessed when USB session is not active or
USB is in low power mode. This results into unclocked register access.
Fix this issue by checking USB LPM status.

debugfs_create_regset32() fops related APIs are used to get USB dwc3
register dump. These fops don't have support to query device status
before accessing registers. Hence by default disabling creation of
regdump debugfs entry.

Change-Id: I67b00532eca159e000c848cb056d9759c47aefe9
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
2018-07-26 23:15:26 -07:00
Ajay Agarwal
b77f7d2943 ARM: dts: msm: Disable runtime PM in host mode for automotive
Add "qcom,disable-host-mode-pm" flag to the USB nodes of
automotive targets to disable runtime PM in host mode.

Change-Id: I45949b92e7199b3ee9a95a7e0a3a584f813d0deb
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-07-26 22:52:57 -07:00
Linux Build Service Account
1414afe1cf Merge "msm: sps: Suppress bind/unbind attributes" 2018-07-26 19:19:45 -07:00
Linux Build Service Account
60384a417c Merge "msm: mdss: use uaccess routines to access user space buffers" 2018-07-26 19:19:42 -07:00
Gustavo Solaira
9e9de34171 diag: Read the HSIC data in a work queue
Add a new work queue to process the HSIC diag
data instead of processing it in the interrupt
context.

Change-Id: I8c546cd608c662d1c3133194f70af4953d734b08
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2018-07-26 15:46:16 -07:00
Siva Kumar Akkireddi
058355d2bf msm: sps: Suppress bind/unbind attributes
SPS driver does not support manual bind/unbind operations
through sysfs. Suppress the bind/unbind nodes. Do not free
SPS struct in sps_device_de_init since it is being done in
sps_exit, and also to avoid use-after-free.

Change-Id: If6da6c5fb9d1a44d0420c6151f7f9d0a33cb2d04
Signed-off-by: Siva Kumar Akkireddi <sivaa@codeaurora.org>
2018-07-26 08:43:13 -07:00
Veerabhadrarao Badiganti
08431ef0ac mmc: core: Use mmc_get_cd_gpio to get cd gpio status in resume path
The change a4d7728mmc(core: Update SD card removal logic based on cd-
gpio state), has introduced logic to read the card presence status in
resume path of mmc_pm_notify(), for forcing card detection if card is
removed. But the API being used for getting gpio status invoking sleep
calls from resume context which shouldn't have any sleep calls.

So updated the resume path with different API for getting cd-gpio
state.

This chagne is not needed 4.9 kernel onwards since the there the
sdhci_get_cd() API has different implementation.

Change-Id: I5e7e760c6345a6fcdc873849d11f0bb32af09295
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
2018-07-26 18:22:44 +05:30
Linux Build Service Account
de5fd0b3ce Merge "msm: mdss: Constant fetch across dfps" 2018-07-26 04:06:18 -07:00
Arun Kumar Neelakantam
596aa5c28a net: ipc_router: Initialize the sockaddr in recvmsg() handler
sockaddr structure is filled with required information only which
results in few memory locations of structure with uninitialized data.

Memset complete structure before using it to remove uninitialized data.

CRs-Fixed: 2274853
Change-Id: I181710bde100fb1553b925d9fdf227af35ff38b5
Signed-off-by: Arun Kumar Neelakantam <aneela@codeaurora.org>
2018-07-25 22:57:06 -07:00
Linux Build Service Account
b2cbbffddd Merge "msm: mdss: cleanup used pipes during overlay off" 2018-07-25 17:04:09 -07:00
Linux Build Service Account
3fbf4c7216 Merge "drm/sde: report MDP underrun error only if not stabilized" 2018-07-25 17:04:07 -07:00
Linux Build Service Account
4e72dda720 Merge "drm/sde: bridge chip error and smmu fault handling for recovery" 2018-07-25 17:04:06 -07:00
Linux Build Service Account
3cf955eab4 Merge "drm: msm: Hot plug cpu1 once early domain is finished" 2018-07-25 17:04:04 -07:00
Mohammed Javid
23412e401c ARM: dts: msm: Enable Apps shutdown feature in IPA driver for 8996HQX
In order to support GVM restart functionality where apps VM can alone
shutdown, IPA apps driver need to reset IPA HW. So make a change to
enable the DT node to support apps shutdown feature.

Change-Id: I6076d4914a62004b06f5b555e64e22ed49e2551f
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-07-25 19:16:16 +05:30
Linux Build Service Account
640c42099b Merge "ANDROID: Bluetooth: hidp: buffer overflow in hidp_process_report" 2018-07-25 05:33:33 -07:00
Linux Build Service Account
e1ec56a731 Merge "ARM: dts: msm: Add proper irq type in device tree for msm device" 2018-07-25 05:33:23 -07:00
Mark Salyzyn
4d4a179e76 ANDROID: Bluetooth: hidp: buffer overflow in hidp_process_report
The buffer length is unsigned at all layers, but gets cast to int and
checked in hidp_process_report and can lead to a buffer overflow.
Switch len parameter to unsigned int to resolve issue.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Fixes: 678af93e46ac10318b54f2f0c9abbdfe75c4e078 ("HID: Bluetooth: hidp: make sure input buffers are big enough")
Bug: 65853588
Change-Id: I779ce783ae7c3bce8c5a66c0954ef31347e42cfc
Git-repo: https://android.googlesource.com/kernel/msm
Git-commit: 34c56d552bffcaefa84975bea0e55fb4481964fd
Signed-off-by: Srinivasa Rao Kuppala <srkupp@codeaurora.org>
2018-07-25 02:01:34 -07:00
Trishansh Bhardwaj
29d287ad01 msm: camera: Fix out-of-bounds read in string class name.
jpeg driver is calling class_create with stack variable, which
can be overwritten by other stack variables.

Change-Id: I3c22a5b3375b970ff6b1c6de983dd5833f4e11d0
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
Signed-off-by: VijayaKumar T M <vtmuni@codeaurora.org>
2018-07-25 13:18:41 +05:30
Linux Build Service Account
fa59dad6c1 Merge "drm: msm: fix variable initialization" 2018-07-24 13:39:56 -07:00
Linux Build Service Account
a441ab05d2 Merge "Merge android-4.4.141 (b1bad9e) into msm-4.4" 2018-07-24 13:39:53 -07:00
Suprith Malligere Shankaregowda
fb1d9f0acc drm: msm: fix variable initialization
This change initializes variable i and j value to 0 in
dsi_display_prepare() as it was used uninitialized earlier.

Change-Id: I84ed753cfa64a719ec2f1b44a8ef24d5331b0fbc
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
2018-07-24 05:41:45 -07:00
Linux Build Service Account
df9023cd69 Merge "soc: qcom: hab: change the unregistration to be dummy" 2018-07-24 03:32:41 -07:00
Rahul Shahare
b068566550 Revert "mmc: core: Update SD card removal logic based on cd gpio state"
This reverts commit a4d7728953.

Change-Id: I0d0d9514c4080ab60071398e7f4f603a5e31bb85
Signed-off-by: Rahul Shahare <rshaha@codeaurora.org>
2018-07-24 13:21:47 +05:30
Srinivasarao P
f77d7178aa Merge android-4.4.141 (b1bad9e) into msm-4.4
* refs/heads/tmp-b1bad9e
  Linux 4.4.141
  loop: remember whether sysfs_create_group() was done
  RDMA/ucm: Mark UCM interface as BROKEN
  PM / hibernate: Fix oops at snapshot_write()
  loop: add recursion validation to LOOP_CHANGE_FD
  netfilter: x_tables: initialise match/target check parameter struct
  netfilter: nf_queue: augment nfqa_cfg_policy
  uprobes/x86: Remove incorrect WARN_ON() in uprobe_init_insn()
  x86/cpufeature: Add helper macro for mask check macros
  x86/cpufeature: Make sure DISABLED/REQUIRED macros are updated
  x86/cpufeature: Update cpufeaure macros
  x86/cpufeature, x86/mm/pkeys: Fix broken compile-time disabling of pkeys
  x86/cpu: Add detection of AMD RAS Capabilities
  x86/mm/pkeys: Fix mismerge of protection keys CPUID bits
  x86/cpufeature, x86/mm/pkeys: Add protection keys related CPUID definitions
  x86/cpufeature: Speed up cpu_feature_enabled()
  x86/boot: Simplify kernel load address alignment check
  x86/vdso: Use static_cpu_has()
  x86/alternatives: Discard dynamic check after init
  x86/alternatives: Add an auxilary section
  x86/cpufeature: Get rid of the non-asm goto variant
  x86/cpufeature: Replace the old static_cpu_has() with safe variant
  x86/cpufeature: Carve out X86_FEATURE_*
  x86/headers: Don't include asm/processor.h in asm/atomic.h
  x86/fpu: Get rid of xstate_fault()
  x86/fpu: Add an XSTATE_OP() macro
  x86/cpu: Provide a config option to disable static_cpu_has
  x86/cpufeature: Cleanup get_cpu_cap()
  x86/cpufeature: Move some of the scattered feature bits to x86_capability
  iw_cxgb4: correctly enforce the max reg_mr depth
  tools build: fix # escaping in .cmd files for future Make
  Fix up non-directory creation in SGID directories
  HID: usbhid: add quirk for innomedia INNEX GENESIS/ATARI adapter
  xhci: xhci-mem: off by one in xhci_stream_id_to_ring()
  usb: quirks: add delay quirks for Corsair Strafe
  USB: serial: mos7840: fix status-register error handling
  USB: yurex: fix out-of-bounds uaccess in read handler
  USB: serial: keyspan_pda: fix modem-status error handling
  USB: serial: cp210x: add another USB ID for Qivicon ZigBee stick
  USB: serial: ch341: fix type promotion bug in ch341_control_in()
  ahci: Disable LPM on Lenovo 50 series laptops with a too old BIOS
  vmw_balloon: fix inflation with batching
  ibmasm: don't write out of bounds in read handler
  MIPS: Fix ioremap() RAM check
  cpufreq: Kconfig: Remove CPU_FREQ_DEFAULT_GOV_SCHED

Change-Id: I0909a2917621f2384cdfe27078577cc2c06b9612
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-07-24 12:10:47 +05:30
Animesh Kishore
43af76ad09 msm: mdss: Constant fetch across dfps
Timing engine HW restricts changing programmable fetch
start when off. Program constant fetch start in SW drivers.
Fix fetch start is calculated based on panel DT timings.

Change-Id: I2124c92b2f83d9c963e05c14421f61a08878d63b
Signed-off-by: Animesh Kishore <animeshk@codeaurora.org>
2018-07-24 11:59:14 +05:30
Nirmal Abraham
a1655ade5d msm: mdss: use uaccess routines to access user space buffers
Use routines defined in uaccess.h (like put_user, get_user)
while accessing user space buffers. Otherwise this leads to
userspace access violation when PAN is enabled.

Change-Id: Iea16e347ee71f0845711a21b6b9b01e16a6ab619
Signed-off-by: Nirmal Abraham <nabrah@codeaurora.org>
2018-07-23 17:54:22 +05:30
Linux Build Service Account
a71e8433d7 Merge "msm: camera: isp : Fix race condition in close sequence" 2018-07-23 03:03:48 -07:00
Srikanth Uyyala
c9eb396da5 msm: camera: isp : Fix race condition in close sequence
Serializing reset_hw and reset_irq, to avoid race condition

Change-Id: I8f21cb816748129bde7f0f1455b203b42603d244
Signed-off-by: Srikanth Uyyala <suyyala@codeaurora.org>
2018-07-23 10:44:50 +05:30
Soumya Managoli
fc7ad45736 ARM: dts: msm: Add support for audio over USBC for MSM8998
Enable config for analog audio over USBC support
on MSM8998 with wcd934x codec.

Change-Id: I874fddc564ca350177b239d58594edeb1fa169d0
Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
2018-07-21 03:17:12 -07:00
Gerrit - the friendly Code Review server
595eeed398 Merge changes into msm-4.4 2018-07-20 21:57:10 -07:00
Linux Build Service Account
05faf99fea Merge "msm: camera: skip recovery during stream off in dual vfe" 2018-07-20 12:17:58 -07:00
Rahul Sharma
bf9dde89b8 drm/sde: report MDP underrun error only if not stabilized
MDP underrun error is being reported to recovery manager as and when they
are detected by the interrupt handler. Since most of the times errors are
recovered successfully and stabilizes and hence we do not need to report in
those scenarios.

This implementation uses a delayed work to figure out if the error is
stabilized. In case if error is still persists then it would be reported
to the recovery manager.

Change-Id: I3509484867d86dc946dd4be856d85de444c0aa60
Signed-off-by: Rahul Sharma <rahsha@codeaurora.org>
2018-07-20 16:53:04 +05:30
Linux Build Service Account
4b519e0d9f Merge "defconfig: sdm660: align with android config requirement" 2018-07-20 02:38:08 -07:00
Linux Build Service Account
c48c535a72 Merge "msm: vidc: Addition of enums for HLG and HDR10" 2018-07-20 02:38:07 -07:00
Linux Build Service Account
1f9a2cdec9 Merge "Merge android-4.4.140 (789274d) into msm-4.4" 2018-07-20 02:38:05 -07:00
Linux Build Service Account
074aef20c5 Merge "diag: Featurize IPC logging" 2018-07-20 02:38:03 -07:00
Yong Ding
769a58cd28 soc: qcom: hab: change the unregistration to be dummy
HAB service should be kept available as long as possible
since it is very fundamental. It can possibly be used in
the GVM(Guest Virtual Machine) shutdown procedure to
talk with the hypervisor. And the unregistration function
will only be left to give a log message.

Change-Id: I0cbc153a68a0fb496d14fc49db6cfee211a01722
Signed-off-by: Yong Ding <yongding@codeaurora.org>
2018-07-20 17:00:29 +08:00
Srikanth Uyyala
d0097debb3 msm: camera: skip recovery during stream off in dual vfe
in dual vfe usecase, skip pingpong mismatch recovery
if one of the vfe's active stream count is zero.

Change-Id: I1b4dce66ad6665e41c4185d3ac510204d40131da
Signed-off-by: Srikanth Uyyala <suyyala@codeaurora.org>
2018-07-20 12:14:47 +05:30
Linux Build Service Account
b52c8265db Merge 385635a167 on remote branch
Change-Id: I50b796e1c1f3c6a19b8d44675c32b3efc58ffde1
2018-07-19 23:33:10 -07:00
xianzhu
ba2d60830c power: wakeup_reason: send uevent to user space
Sends uevent to user space when enter or out of suspend,
the modules of user space can use it to do some necessary
operation. For example, in order to reduce power consumption,
we can use this mechanism to send instructions which can
reduce unnecessary wake-up sources of modem to modem driver.
Any module except modem can also monitor this event for power
consumption purpose.

Change-Id: I62ca3ed02ea78e06735355a2c8b6d515e36dc7e6
Signed-off-by: xianzhu <xianzhu@codeaurora.org>
2018-07-20 14:30:17 +08:00
Srikanth Uyyala
3a3c7c7bb1 msm: camera: Dont call recovery for inactive streams
During Stream-off is in progress and all active
streams are zero and that instant if we cause
pingpong mismatch, recovery is not expected.

Change-Id: Ibdaeb4308f33772fcd330712b0a866aedb7a9486
Signed-off-by: Srikanth Uyyala <suyyala@codeaurora.org>
2018-07-20 11:58:56 +05:30
Rahul Shahare
98732ea029 defconfig: sdm660: align with android config requirement
Align with android-base.cfg which is android kernel config
requirement for sdm660_defconfig.

Change-Id: I41566f96efe441f06986a1b4bfc6d034b2255062
Signed-off-by: Rahul Shahare <rshaha@codeaurora.org>
2018-07-19 23:19:27 -07:00
Paras Nagda
98f28d031d msm: vidc: Addition of enums for HLG and HDR10
Add HLG and ST2084 Transfer characteristics enum values as
specified in the latest HEVC spec.

Change-Id: Iff19ff5c13c4861f4d97ab0433214fe95fa84459
Signed-off-by: Paras Nagda <pnagda@codeaurora.org>
2018-07-20 10:12:07 +05:30
Balachandra C S
967528c6c6 ARM: dts: msm: Add proper irq type in device tree for msm device
Use proper irq type for gpio interrupt in qti-can controller. This
interrupt type may vary among different targets.

Change-Id: I32679cbdc29dbda49769dcb455589da64527f3cc
Signed-off-by: Balachandra C S <balacs@codeaurora.org>
2018-07-19 06:37:03 -07:00
Balachandra C S
fc93ec766e drivers: net: can: Inform power states to CAN controller
CAN controller needs to be aware of host power state to decide
if a timestamp message can be sent to host or not.

Change-Id: I89a570a2fb38336c38d0105bbb3df8b89d7e3035
Signed-off-by: Balachandra C S <balacs@codeaurora.org>
2018-07-19 06:36:40 -07:00
Balachandra C S
eb119bcb2a drivers: net: can: Add timestamp adjustment for frames in qti-can
Correct the frame timestamp based on the controller and host
time difference.

Change-Id: I6c60b943d18779a9bd9f221a2344dcea90b9fb5a
Signed-off-by: Balachandra C S <balacs@codeaurora.org>
2018-07-19 19:02:29 +05:30
Nirmal Abraham
5dda52d4de msm: mdss: cleanup used pipes during overlay off
During overlay off, cleanup pipes which are currently active
in used pipes list. This is to avoid to a race condition
wherein the pipe params gets changed in prepare cycle,
but the commit cylce has not executed to queue the buffers
associated with the pipe and the same pipe which has old
buffer(stale content) gets used from overlay_off flow.

Change-Id: I117e6ee9854ff287f7bb1055ca745760db980bed
Signed-off-by: Nirmal Abraham <nabrah@codeaurora.org>
2018-07-19 18:19:32 +05:30
Mohit Aggarwal
4b97647dc2 diag: Featurize IPC logging
Currently, in case IPC logging related config
is disabled then there are some unwanted error
logs in kernel logs. Featurize IPC logging to
get rid of error logs.

Change-Id: I8455f5e3a13cf58b4d65d1e1a5c4f1ec0adedabf
Signed-off-by: Mohit Aggarwal <maggarwa@codeaurora.org>
2018-07-19 13:38:15 +05:30