Commit graph

600673 commits

Author SHA1 Message Date
Linux Build Service Account
7adc4e13a4 Merge "defconfig: msm: Define common hypervisor flag" 2018-07-28 04:00:25 -07:00
Linux Build Service Account
2eb95c6cb2 Merge "defconfig: msm8998: Enable VTI config for v4 and v6" 2018-07-28 04:00:24 -07:00
Linux Build Service Account
f8a156dfae Merge "defconfig: sdm660: Enable VTI config for v4 and v6" 2018-07-28 04:00:23 -07:00
Devi Sandeep Endluri V V
48771935e6 defconfig: msm8998: Enable VTI config for v4 and v6
Enable VTI to give userspace (netd) the ability to create and
update virtual interfaces.

CRs-Fixed: 2214527
Change-Id: I5076d59230538c0b88fbd8d3c9188141a600526b
Signed-off-by: Devi Sandeep Endluri V V <dendluri@codeaurora.org>
2018-07-27 10:10:34 -07:00
Devi Sandeep Endluri V V
34096f2db5 defconfig: sdm660: Enable VTI config for v4 and v6
Enable VTI to give userspace (netd) the ability to create and
update virtual interfaces.

Change-Id: Ia32c78a8675757f4b600c6e4211f42afdb8249d4
CRs-Fixed: 2214527
Signed-off-by: Devi Sandeep Endluri V V <dendluri@codeaurora.org>
2018-07-27 10:09:44 -07:00
Camus Wong
6a36454b0a defconfig: msm: Define common hypervisor flag
Define common flag for hypervisor platforms and make use of it to:
1. Enable drm/msm-hyp
2. Disable drm/msm

Change-Id: I6eb6a7cd2a1128ed8d2bf6efd96c4829556eb876
Signed-off-by: Camus Wong <camusw@codeaurora.org>
2018-07-27 10:31:56 -04:00
Linux Build Service Account
e9d5b645ee Merge "USB: pd: Send PS_RDY within tNewSrc after PS_RDY received" 2018-07-27 03:36:36 -07:00
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
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
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
Linux Build Service Account
de5fd0b3ce Merge "msm: mdss: Constant fetch across dfps" 2018-07-26 04:06:18 -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
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
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
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
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
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
Rahul Sharma
faa4206fb7 drm/sde: bridge chip error and smmu fault handling for recovery
This implementation adds the following support:

1. handle bridge chip error reported by driver to DBA. error reported
   to DBA will be send to recovery manager to recover the faulty
   bridge chip by performing a power cycle.

2. smmu fault error notification.

3. detection on errors in bridge chip driver.

Change-Id: I86cc491e3cd25fdcf9b998a0d687baba0a06d836
Signed-off-by: Rahul Sharma <rahsha@codeaurora.org>
2018-07-19 10:08:28 +05:30
Linux Build Service Account
8acbfc522f Merge "usb: dwc3-msm: Add boot marker" 2018-07-18 20:29:02 -07:00
Blagovest Kolenichev
df1c139ee7 Merge android-4.4.140 (789274d) into msm-4.4
* refs/heads/tmp-789274d
  Linux 4.4.140
  staging: comedi: quatech_daqp_cs: fix no-op loop daqp_ao_insn_write()
  netfilter: nf_log: don't hold nf_log_mutex during user access
  mtd: cfi_cmdset_0002: Change erase functions to check chip good only
  mtd: cfi_cmdset_0002: Change erase functions to retry for error
  mtd: cfi_cmdset_0002: Change definition naming to retry write operation
  dm bufio: don't take the lock in dm_bufio_shrink_count
  mtd: rawnand: mxc: set spare area size register explicitly
  dm bufio: drop the lock when doing GFP_NOIO allocation
  dm bufio: avoid sleeping while holding the dm_bufio lock
  mm, page_alloc: do not break __GFP_THISNODE by zonelist reset
  media: cx25840: Use subdev host data for PLL override
  x86/mce: Fix incorrect "Machine check from unknown source" message
  x86/mce: Detect local MCEs properly
  HID: debug: check length before copy_to_user()
  HID: hiddev: fix potential Spectre v1
  HID: i2c-hid: Fix "incomplete report" noise
  ext4: check superblock mapped prior to committing
  ext4: add more mount time checks of the superblock
  ext4: add more inode number paranoia checks
  ext4: clear i_data in ext4_inode_info when removing inline data
  ext4: include the illegal physical block in the bad map ext4_error msg
  ext4: verify the depth of extent tree in ext4_find_extent()
  ext4: only look at the bg_flags field if it is valid
  ext4: always check block group bounds in ext4_init_block_bitmap()
  ext4: make sure bitmaps and the inode table don't overlap with bg descriptors
  jbd2: don't mark block as modified if the handle is out of credits
  cifs: Fix infinite loop when using hard mount option
  drbd: fix access after free
  s390: Correct register corruption in critical section cleanup
  scsi: sg: mitigate read/write abuse
  tracing: Fix missing return symbol in function_graph output
  mm: hugetlb: yield when prepping struct pages
  ubi: fastmap: Correctly handle interrupted erasures in EBA
  ARM: dts: imx6q: Use correct SDMA script for SPI5 core
  netfilter: nf_tables: use WARN_ON_ONCE instead of BUG_ON in nft_do_chain()
  nvme-pci: initialize queue memory before interrupts
  kprobes/x86: Do not modify singlestep buffer while resuming
  ipv4: Fix error return value in fib_convert_metrics()
  i2c: rcar: fix resume by always initializing registers before transfer
  ath10k: fix rfc1042 header retrieval in QCA4019 with eth decap mode
  x86/boot: Fix early command-line parsing when matching at end
  n_tty: Access echo_* variables carefully.
  staging: android: ion: Return an ERR_PTR in ion_map_kernel
  n_tty: Fix stall at n_tty_receive_char_special().
  USB: serial: cp210x: add Silicon Labs IDs for Windows Update
  USB: serial: cp210x: add CESINEL device ids
  usb: cdc_acm: Add quirk for Uniden UBC125 scanner

Change-Id: I01c4fc4b6354c28a7d8ff391ff515096ed4d3da4
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-07-18 15:09:28 +05:30