Commit graph

600588 commits

Author SHA1 Message Date
Guchun Chen
53ccf7e9c4 drm: msm: update dsi state context when splash is on
DSI phy state's update should be called by one unique
API, to ensure no operation is missed. Otherwise, the
incomplete operation will bring DSI regulator off error
and trigger device watchdog reset.

CRs-Fixed: 2282416
Change-Id: If8d08f224f713547a4df607f817e21c49bbc4ed6
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2018-07-25 11:20:54 +08:00
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
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
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
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
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
Linux Build Service Account
2124c4de44 Merge "USB: core: harden cdc_parse_cdc_header" 2018-07-18 01:05:43 -07:00
Linux Build Service Account
5b0186d001 Merge "ARM: dts: msm: Change thermal configuration settings for msm8996." 2018-07-18 01:05:42 -07:00
Linux Build Service Account
e222538907 Merge "firmware_class: make firmware caching configurable" 2018-07-18 01:05:41 -07:00
Linux Build Service Account
a731719d4e Merge "drm: msm: add skip_ddc support for hdmi display" 2018-07-18 01:05:39 -07:00
Linux Build Service Account
eaa068f805 Merge "ARM: dts: msm: add ddc_skip on auto 8996 boards" 2018-07-18 01:05:37 -07:00
Linux Build Service Account
edbebfaaf2 Merge "drm/msm: Fix the format prints in display driver" 2018-07-17 15:06:26 -07:00
Linux Build Service Account
80db82bdaf Merge "msm: ipa: Error prints are misleading fix it" 2018-07-17 15:06:09 -07:00
Atul Raut
72c7b7b08e ARM: dts: msm: Change thermal configuration settings for msm8996.
msm-core(EA in kernel part) is enabled for thermal monitoring feature.
It sets cpu tsens threshold independent of thermal SW but not really
using any thermal info in driver. So redundant threshold get sets which
causes wakable irq to fire in hibernation restore phase.
That abort's system wide suspend transition which eventually fail to
restore hibernation image.

To fix, set thermal configuration to new threshold.

Change-Id: I38cad5217c1196d3a804fa78570984e60427a94e
Signed-off-by: Atul Raut <araut@codeaurora.org>
2018-07-17 10:43:45 -07:00
Tim Murray
8be65bee66 firmware_class: make firmware caching configurable
Because firmware caching generates uevent messages that are sent over a
netlink socket, it can prevent suspend on many platforms. It's also not
always useful, so make it a configurable option.

bug 32180327

Change-Id: I1250512b27edb56caa78d536e5ccf1fb669476ad
Signed-off-by: Tim Murray <timmurray@google.com>
Git-repo: https://source.codeaurora.org/quic/la/kernel/msm-4.4
Git-commit: e3198d51be98ec5606e2a2c5112a8a974d354fbc
Signed-off-by: Chintan Pandya <cpandya@codeaurora.org>
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-07-17 03:21:57 -07:00
Linux Build Service Account
cca3c14ebe Merge "ARM: dts: msm: Enable diagfwd-usb for MSM8996 CV2X boards" 2018-07-16 21:54:13 -07:00
Linux Build Service Account
5468d13d1d Merge "diag: Enable diagfwd via USB even when MHI is available" 2018-07-16 21:54:10 -07:00
Linux Build Service Account
582f5092f3 Merge "soc: qcom: hab: check the buffer's pointer before exporting it" 2018-07-16 21:54:09 -07:00
Linux Build Service Account
385635a167 Merge "mmc: core: Update SD card removal logic based on cd gpio state" 2018-07-16 11:36:25 -07:00
Gustavo Solaira
dc59c27d8b ARM: dts: msm: Enable diagfwd-usb for MSM8996 CV2X boards
Enable the diagfwd-usb platform driver for MSM8996
CV2X boards. This is used to forward diag data from MDM
via USB.

Change-Id: I816e82c25ca623c47c541e4e790e22b90c55da41
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2018-07-16 11:18:19 -07:00
Gustavo Solaira
146820788a diag: Enable diagfwd via USB even when MHI is available
Some devices need diag via USB even when MHI is used
for rmnet and qmi tethering. This is because of lack
of support for diagfwd for mhi_dev in Linux.

Change-Id: Ie0ec19ee109d49aa409d1df3ad5ca24b75de7102
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2018-07-16 11:18:18 -07:00
Gustavo Solaira
2bd6702877 usb: misc: diag_ipc_bridge: Add support for 901D PID
Add support for creation of diag traffic channel in case
the connected device has 0x05C6 VID and 0x901D PID.
   0x901D : DIAG + ADB

Change-Id: I6df0aca714f10ea7d854f621e19da1388a7e7d5c
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2018-07-16 11:18:17 -07:00
Ajay Agarwal
d6edcd0faf defconfig: msm-auto: Enable diag_ipc_bridge driver for msm8996
Enable DIAG and IPC bridge driver on msm8996 auto to support
interfacing with DIAG and QMI interfaces.

Change-Id: I8b32bdfc6aa29c090b21512e202c2822b9752a48
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-07-16 11:18:16 -07:00
Gustavo Solaira
70a7fe177d diag: Disable the code for diag_smux
Disable the diag_smux code to fix the build with
diagfwd USB enabled since the dependencies for
diag_smux are not available it is deprecated in
this kernel version.

Change-Id: I6a8bc3a34f67ed5b1ca175cad0b3067e2c2df199
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2018-07-16 11:16:57 -07:00
Mohammed Javid
bbff7311e9 msm: ipa: Error prints are misleading fix it
IPC logging is for debugging purpose and
it may disabled in kernel anytime.
From IPA driver printing the error log on IPC
create context is misleading.
Instead of error, make it as debug.

Change-Id: Icee2b1ad9fcef446f79dfc71f554a24a90ea3d2d
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-07-16 15:12:25 +05:30
Linux Build Service Account
5e972f6b60 Merge "soc: qcom: hab: resolve NULL pointer dereference issues" 2018-07-16 01:31:34 -07:00
Linux Build Service Account
438ba82af9 Merge "defconfig: gvm: enable msm hardware random generator" 2018-07-16 01:31:32 -07:00
Linux Build Service Account
dbd927c73d Merge "ssusb: vplatform: enable otg passthrough in la-gvm" 2018-07-16 01:31:32 -07:00
Linux Build Service Account
016e86bc53 Merge "iommu/debug: Add mutex to make attach/detach thread safe" 2018-07-16 01:31:30 -07:00
Suprith Malligere Shankaregowda
6df01b6179 ARM: dts: msm: add ddc_skip on auto 8996 boards
This change is done to disable the hdmi scrambler related display
kernel error messages in the boot logs.

Change-Id: I7f9284c3d64e291ef9c6442e7e89f6551cbce8d6
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
2018-07-15 22:11:23 -07:00
Suprith Malligere Shankaregowda
225c6e1fee drm: msm: add skip_ddc support for hdmi display
HDMI display on auto boards has disabled pluggable function
and hardcoded 1080p mode for output. So ddc related function
should also be skipped. Otherwise, some error messages are
printed when accessing ddc.

Change-Id: I42694b0586dd870e7881b422cd3d6ee960276b17
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2018-07-15 22:11:04 -07:00
Linux Build Service Account
ff5fac3d56 Merge "ARM: dts: msm: Add clock skew values for msm8996 CV2X boards" 2018-07-15 13:23:49 -07:00
Linux Build Service Account
65a0403464 Merge "Documentation: devicetree: net: Add clock skew parameters for neutrino" 2018-07-14 00:36:46 -07:00
Linux Build Service Account
741e5a2f47 Merge "cnss2: Refactor PCIe bus related code" 2018-07-14 00:36:44 -07:00
Lakshmi Narayana Kalavala
cb60bccda1 drm/msm: Fix the format prints in display driver
Fix the %p format prints with %pK.

Change-Id: I1743bacb76c1db4bfa304146f7d391751b35273c
Signed-off-by: Lakshmi Narayana Kalavala <lkalaval@codeaurora.org>
Signed-off-by: Navid Bahrani <nbahrani@codeaurora.org>
2018-07-13 16:42:59 -07:00
Aditya Mathur
18f31ec736 ARM: dts: msm: Add clock skew values for msm8996 CV2X boards
Add phy clock skew values for the neutrino driver
on msm8996 CV2X boards.

Change-Id: Ic06b054dd6d5e4267fdec64d7d73786b54466444
Signed-off-by: Aditya Mathur <aditmath@codeaurora.org>
2018-07-13 15:37:57 -07:00
Aditya Mathur
63226fea94 Documentation: devicetree: net: Add clock skew parameters for neutrino
Add documentation for new PHY clock skew parameters
in the neutrino driver.

Change-Id: Ibefa49ef0f91e42e3bb6d050eeac4a4adfc67ee1
Signed-off-by: Aditya Mathur <aditmath@codeaurora.org>
2018-07-13 14:46:27 -07:00
Linux Build Service Account
125e556ec0 Merge "drm: msm: error notification and handling" 2018-07-13 14:31:15 -07:00
VENKATA RAO KAKANI
ba826181ed iommu/debug: Add mutex to make attach/detach thread safe
This mutex lock will help to synchronise the usage of iommu domain
structure which is getting used by multiple threads to perform
iommu attach and iommu detach in case of any error.

Without this change we are seeing page poisoning - write after free
when running stress tests using iommu-debug test cases.

Change-Id: I388a90084ab8cc7e7097bac9a41ed5fed6dad312
Acked-by: Ankur Saxena <c_ankusa@qti.qualcomm.com>
Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Signed-off-by: VENKATA RAO KAKANI <vkakani@codeaurora.org>
2018-07-13 04:56:53 -07:00
Linux Build Service Account
1814c3e255 Merge "adv7481: Fix AVI infoframe read" 2018-07-13 03:01:24 -07:00