OSDN Git Service
Hardik Arya [Mon, 9 Apr 2018 09:19:40 +0000 (14:49 +0530)]
diag: Add missing protection while accessing session's info
Currently, mutex protection is missing while accessing md session's
info via macro. The patch adds proper protection before accessing
the same.
Change-Id: I17b18183407279447229783fd0165337bd173423
Signed-off-by: Hardik Arya <harya@codeaurora.org>
Linux Build Service Account [Fri, 3 Aug 2018 11:05:50 +0000 (04:05 -0700)]
Merge "soc: qcom: hab: fix some NULL pointer dereference issues"
Linux Build Service Account [Fri, 3 Aug 2018 11:05:48 +0000 (04:05 -0700)]
Merge "usb: dwc3-msm: Queue resume_work unconditionally on pm_resume"
Linux Build Service Account [Fri, 3 Aug 2018 11:05:44 +0000 (04:05 -0700)]
Merge "msm: vidc: Increase minimum input buffer count for HEVC decode"
Linux Build Service Account [Fri, 3 Aug 2018 11:05:38 +0000 (04:05 -0700)]
Merge "soc: qcom: hab: add hab statistics support"
Linux Build Service Account [Fri, 3 Aug 2018 11:05:29 +0000 (04:05 -0700)]
Merge "diag: Read the HSIC data in a work queue"
Yong Ding [Tue, 17 Jul 2018 08:36:43 +0000 (16:36 +0800)]
soc: qcom: hab: fix some NULL pointer dereference issues
With this patch, some potential NULL pointer dereference
issues are resolved. For example, if an invalid MMID
(MultiMedia ID defined by HAB driver) is gotten but we
fail to directly return with an error, the vchan variable
as NULL pointer will be dereferenced.
Change-Id: I92f9c5d08f99ef9db3e6a8b2ecdc0f074c8e8bff
Signed-off-by: Yong Ding <yongding@codeaurora.org>
Paras Nagda [Tue, 29 May 2018 12:20:35 +0000 (17:50 +0530)]
msm: vidc: Increase minimum input buffer count for HEVC decode
Increase minimum input buffer count for HEVC decode to 5 to
avoid hang when the DPB is not full and FW keeps
waiting for FTB although sufficient ETB are being queued.
CRs-Fixed:
2252419
Change-Id: Id344cd896aeac46765e250e715d14a6c835b4221
Signed-off-by: Paras Nagda <pnagda@codeaurora.org>
Gerrit - the friendly Code Review server [Fri, 3 Aug 2018 03:10:21 +0000 (20:10 -0700)]
Merge changes into msm-4.4
Linux Build Service Account [Thu, 2 Aug 2018 14:10:44 +0000 (07:10 -0700)]
Merge "msm: ipa: support ipacm cleanup"
Linux Build Service Account [Thu, 2 Aug 2018 14:10:43 +0000 (07:10 -0700)]
Merge "cnss2: Add support for PCIe WLAN IPA uc SMMU feature"
Linux Build Service Account [Thu, 2 Aug 2018 14:10:41 +0000 (07:10 -0700)]
Merge "diag: Modify md_info and diag client map synchronization"
Linux Build Service Account [Thu, 2 Aug 2018 14:10:39 +0000 (07:10 -0700)]
Merge "msm: camera: Fix out-of-bounds read in string class name."
Linux Build Service Account [Thu, 2 Aug 2018 14:10:35 +0000 (07:10 -0700)]
Merge "msm: camera: sensor: Add support for front aux sensor"
Skylar Chang [Sat, 7 Apr 2018 23:42:36 +0000 (16:42 -0700)]
msm: ipa: support ipacm cleanup
Support header/filter, routing rules
cleanup when user-space module
crashed like ipacm and also cached
the wlan client connect messages
for ipacm to query.
Change-Id: Ib09cbe0e9114aa5a5673898ff796de7e7944af35
Acked-by: Pooja Kumari <kumarip@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
Manoj Prabhu B [Wed, 25 Jul 2018 09:36:11 +0000 (15:06 +0530)]
diag: Modify md_info and diag client map synchronization
Extend the scope of protection to md_info till queueing
the write to sdcard. Patch adds protection to diag client map
synchronizing access by various clients.
CRs-Fixed:
2282558
Change-Id: If076af2d09180a282a9077b4ebcda0184e9f67b5
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
Linux Build Service Account [Thu, 2 Aug 2018 03:19:45 +0000 (20:19 -0700)]
Merge "power: wakeup_reason: send uevent to user space"
Linux Build Service Account [Wed, 1 Aug 2018 11:54:15 +0000 (04:54 -0700)]
Merge "net: ipc_router: Initialize the sockaddr in recvmsg() handler"
Frank Liu [Fri, 27 Jul 2018 06:32:53 +0000 (14:32 +0800)]
cnss2: Add support for PCIe WLAN IPA uc SMMU feature
To add support for PCIe WLAN IPA uc SMMU feature, prvoide related
platform api for wlan driver to get the smmu map handle and do the
mapping.
Change-Id: I672b1a48879ada65b3ddb3f16c4bd787dc1b70a6
Signed-off-by: Frank Liu <qiliu@codeaurora.org>
Linux Build Service Account [Tue, 31 Jul 2018 16:34:30 +0000 (09:34 -0700)]
Merge "msm: kgsl: Fix the missing IBs from the snapshot"
Linux Build Service Account [Tue, 31 Jul 2018 16:34:28 +0000 (09:34 -0700)]
Merge "usb: phy-msm-ssusb-qmp: Make vls_clamp_reg as optional"
Linux Build Service Account [Tue, 31 Jul 2018 16:34:27 +0000 (09:34 -0700)]
Merge "icnss: Remove sending uevent after FW ready"
Sunil Khatri [Mon, 30 Jul 2018 09:48:17 +0000 (15:18 +0530)]
msm: kgsl: Fix the missing IBs from the snapshot
We missed updating index for internal IBs like setstate
or power-on fixup.
The index value was never updated after that, so all the
IBs after that index were never parsed, and are missing
from the snapshot.
Change-Id: I61db75f33630db322fe5ee1adce9f120987d32ee
Signed-off-by: Sunil Khatri <sunilkh@codeaurora.org>
Ajay Agarwal [Wed, 25 Jul 2018 06:55:16 +0000 (12:25 +0530)]
usb: phy-msm-ssusb-qmp: Make vls_clamp_reg as optional
Currently the SSUSB QMP PHY driver mandates that vls_clamp_reg be
passed from the DTSI. But this register cannot be accessed on a
platform on which Linux is a guest OS. This can lead to errors
when trying to enable autonomous mode. Work around this situation
by making the vls_clamp_reg property as optional.
Change-Id: Idb103d9b7bda717a5f12689951a7452c46aa76dd
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Ajay Agarwal [Tue, 31 Jul 2018 07:10:10 +0000 (12:40 +0530)]
usb: dwc3-msm: Queue resume_work unconditionally on pm_resume
Currently on pm_resume, the driver queues resume_work only if
vbus_active is true or id_state is false. So when the system is
suspended with host mode cable connected and the cable is
disconnected, the port still remains in host mode. Fix this by
unconditionally queueing resume_work from pm_resume and adding
required pm_relax in B_IDLE branch of sm_work.
Also create a freezable workqueue for sm_work so that the work
items do not race with pm_resume of child devices.
Change-Id: I9b79ddcc44c87111fc85086038361d9140be2af5
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Linux Build Service Account [Tue, 31 Jul 2018 06:59:59 +0000 (23:59 -0700)]
Merge "msm: ipa: Add support to IPA platform shutdown cleanup"
Linux Build Service Account [Tue, 31 Jul 2018 06:59:57 +0000 (23:59 -0700)]
Merge "arch: arm64: Reenable HW breakpoint"
Yong Ding [Tue, 31 Jul 2018 06:16:16 +0000 (14:16 +0800)]
soc: qcom: hab: add hab statistics support
This allows user to read back hab runtime information.
Change-Id: Id266dd17b9c9d38f0e93aa600510ae1c6b12cca5
Signed-off-by: Yong Ding <yongding@codeaurora.org>
Neeraj Upadhyay [Mon, 16 Apr 2018 09:32:03 +0000 (15:02 +0530)]
arch: arm64: Reenable HW breakpoint
HW breakpoint was disabled in
'commit
f2a3f3ef8e73 ("arch: arm64: disable HW breakpoint")'.
However, it is required for setting breakpoints using ptrace
syscall, which is required for certain userspace applications
to work. So, reenable it.
Change-Id: Ib2a49488b92b0f77d13871d151778b3f0feab273
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Mohammed Javid [Mon, 2 Jul 2018 07:17:41 +0000 (12:47 +0530)]
msm: ipa: Add support to IPA platform shutdown cleanup
Add support for platform reboot from IPA APPS
driver perspective.
Change-Id: Id65336da06a59a28944bfd51d9482d3d82a9cc3e
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
Linux Build Service Account [Mon, 30 Jul 2018 20:37:32 +0000 (13:37 -0700)]
Merge "msm: ipa3: Update holb config on USB DPL ep"
Linux Build Service Account [Mon, 30 Jul 2018 20:37:27 +0000 (13:37 -0700)]
Merge "defconfig: msm: Enable QUOTA encryption support"
Linux Build Service Account [Mon, 30 Jul 2018 20:37:22 +0000 (13:37 -0700)]
Merge "mm-camera2:isp2: Add NULL check for stream_info pointer"
Mohammed Javid [Fri, 13 Jul 2018 10:17:51 +0000 (15:47 +0530)]
msm: ipa3: Update holb config on USB DPL ep
Once USB DPL consumer ep is configured,
there is a chance of IPA hardware getting stalled,
if DPL client is not pulling the data over other end.
so, set holb discard over USB DPL cons ep
to avoid this stall.
Change-Id: I520b8c1ec84e03b783677c43670cbb9f904a4b4f
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
Linux Build Service Account [Mon, 30 Jul 2018 12:12:59 +0000 (05:12 -0700)]
Merge "mmc: core: Use mmc_get_cd_gpio to get cd gpio status in resume path"
Venkata Rao Kakani [Thu, 19 Jul 2018 09:34:57 +0000 (15:04 +0530)]
defconfig: msm: Enable QUOTA encryption support
Add sdcardfs support and QUOTA encryption support for
CTS issue fixes.
Change-Id: Ie7120b21bf5b6b00432cc79302a3cf740a2cc710
Signed-off-by: Venkata Rao Kakani <vkakani@codeaurora.org>
Srikanth Uyyala [Tue, 24 Jul 2018 08:57:38 +0000 (14:27 +0530)]
mm-camera2:isp2: Add NULL check for stream_info pointer
The function msm_isp_get_stream_common_data could return a NULL,
add check to avoid NULL pointer dereference.
Change-Id: I157a74189b581d8ba90ef31f71c3be9b8369a764
Signed-off-by: Srikanth Uyyala <suyyala@codeaurora.org>
Linux Build Service Account [Mon, 30 Jul 2018 03:42:17 +0000 (20:42 -0700)]
Merge "ARM: dts: msm: Enable Apps shutdown feature in IPA driver for 8996HQX"
Linux Build Service Account [Sat, 28 Jul 2018 11:00:26 +0000 (04:00 -0700)]
Merge "defconfig: msm: Define common hypervisor flag"
Linux Build Service Account [Sat, 28 Jul 2018 11:00:25 +0000 (04:00 -0700)]
Merge "defconfig: msm8998: Enable VTI config for v4 and v6"
Linux Build Service Account [Sat, 28 Jul 2018 11:00:24 +0000 (04:00 -0700)]
Merge "defconfig: sdm660: Enable VTI config for v4 and v6"
Devi Sandeep Endluri V V [Wed, 25 Jul 2018 20:59:54 +0000 (02:29 +0530)]
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>
Devi Sandeep Endluri V V [Wed, 25 Jul 2018 21:13:38 +0000 (02:43 +0530)]
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>
Camus Wong [Fri, 16 Mar 2018 21:02:55 +0000 (17:02 -0400)]
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>
Linux Build Service Account [Fri, 27 Jul 2018 10:36:37 +0000 (03:36 -0700)]
Merge "USB: pd: Send PS_RDY within tNewSrc after PS_RDY received"
Linux Build Service Account [Fri, 27 Jul 2018 10:36:35 +0000 (03:36 -0700)]
Merge "dwc3: Check USB LPM status before accessing any register"
Vijayavardhan Vennapusa [Tue, 3 Jul 2018 10:17:18 +0000 (15:47 +0530)]
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>
Mayank Rana [Mon, 25 Sep 2017 23:48:39 +0000 (16:48 -0700)]
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>
Ajay Agarwal [Wed, 25 Jul 2018 07:30:15 +0000 (13:00 +0530)]
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>
Linux Build Service Account [Fri, 27 Jul 2018 02:19:45 +0000 (19:19 -0700)]
Merge "msm: sps: Suppress bind/unbind attributes"
Linux Build Service Account [Fri, 27 Jul 2018 02:19:43 +0000 (19:19 -0700)]
Merge "msm: mdss: use uaccess routines to access user space buffers"
Gustavo Solaira [Thu, 26 Jul 2018 02:14:10 +0000 (19:14 -0700)]
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>
Siva Kumar Akkireddi [Thu, 5 Jul 2018 05:25:32 +0000 (10:55 +0530)]
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>
Veerabhadrarao Badiganti [Thu, 26 Jul 2018 12:35:31 +0000 (18:05 +0530)]
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>
Linux Build Service Account [Thu, 26 Jul 2018 11:06:19 +0000 (04:06 -0700)]
Merge "msm: mdss: Constant fetch across dfps"
Arun Kumar Neelakantam [Thu, 19 Jul 2018 08:55:22 +0000 (14:25 +0530)]
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>
Linux Build Service Account [Thu, 26 Jul 2018 00:04:09 +0000 (17:04 -0700)]
Merge "msm: mdss: cleanup used pipes during overlay off"
Linux Build Service Account [Thu, 26 Jul 2018 00:04:08 +0000 (17:04 -0700)]
Merge "drm/sde: report MDP underrun error only if not stabilized"
Linux Build Service Account [Thu, 26 Jul 2018 00:04:07 +0000 (17:04 -0700)]
Merge "drm/sde: bridge chip error and smmu fault handling for recovery"
Linux Build Service Account [Thu, 26 Jul 2018 00:04:05 +0000 (17:04 -0700)]
Merge "drm: msm: Hot plug cpu1 once early domain is finished"
Mohammed Javid [Wed, 25 Jul 2018 13:46:16 +0000 (19:16 +0530)]
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>
Linux Build Service Account [Wed, 25 Jul 2018 12:33:33 +0000 (05:33 -0700)]
Merge "ANDROID: Bluetooth: hidp: buffer overflow in hidp_process_report"
Linux Build Service Account [Wed, 25 Jul 2018 12:33:24 +0000 (05:33 -0700)]
Merge "ARM: dts: msm: Add proper irq type in device tree for msm device"
Mark Salyzyn [Tue, 16 Jan 2018 21:42:30 +0000 (13:42 -0800)]
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>
Trishansh Bhardwaj [Fri, 6 Jul 2018 10:38:12 +0000 (16:08 +0530)]
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>
Linux Build Service Account [Tue, 24 Jul 2018 20:39:56 +0000 (13:39 -0700)]
Merge "drm: msm: fix variable initialization"
Linux Build Service Account [Tue, 24 Jul 2018 20:39:55 +0000 (13:39 -0700)]
Merge "Merge android-4.4.141 (
b1bad9e) into msm-4.4"
Suprith Malligere Shankaregowda [Wed, 27 Jun 2018 06:10:22 +0000 (11:40 +0530)]
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>
Linux Build Service Account [Tue, 24 Jul 2018 10:32:42 +0000 (03:32 -0700)]
Merge "soc: qcom: hab: change the unregistration to be dummy"
Srinivasarao P [Tue, 24 Jul 2018 06:39:54 +0000 (12:09 +0530)]
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>
Animesh Kishore [Tue, 24 Jul 2018 06:29:14 +0000 (11:59 +0530)]
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>
Nirmal Abraham [Mon, 23 Jul 2018 11:41:05 +0000 (17:11 +0530)]
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>
Linux Build Service Account [Mon, 23 Jul 2018 10:03:49 +0000 (03:03 -0700)]
Merge "msm: camera: isp : Fix race condition in close sequence"
Srikanth Uyyala [Tue, 17 Apr 2018 07:42:52 +0000 (13:12 +0530)]
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>
Gerrit - the friendly Code Review server [Sat, 21 Jul 2018 04:57:10 +0000 (21:57 -0700)]
Merge changes into msm-4.4
Linux Build Service Account [Fri, 20 Jul 2018 19:17:58 +0000 (12:17 -0700)]
Merge "msm: camera: skip recovery during stream off in dual vfe"
Rahul Sharma [Thu, 19 Jul 2018 09:45:55 +0000 (15:15 +0530)]
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>
Linux Build Service Account [Fri, 20 Jul 2018 09:38:09 +0000 (02:38 -0700)]
Merge "defconfig: sdm660: align with android config requirement"
Linux Build Service Account [Fri, 20 Jul 2018 09:38:07 +0000 (02:38 -0700)]
Merge "msm: vidc: Addition of enums for HLG and HDR10"
Linux Build Service Account [Fri, 20 Jul 2018 09:38:05 +0000 (02:38 -0700)]
Merge "Merge android-4.4.140 (
789274d) into msm-4.4"
Linux Build Service Account [Fri, 20 Jul 2018 09:38:03 +0000 (02:38 -0700)]
Merge "diag: Featurize IPC logging"
Yong Ding [Fri, 20 Jul 2018 07:23:43 +0000 (15:23 +0800)]
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>
Srikanth Uyyala [Fri, 4 May 2018 09:00:53 +0000 (14:30 +0530)]
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>
xianzhu [Tue, 10 Jul 2018 08:03:58 +0000 (16:03 +0800)]
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>
Srikanth Uyyala [Fri, 4 May 2018 08:53:10 +0000 (14:23 +0530)]
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>
Rahul Shahare [Thu, 19 Jul 2018 12:09:32 +0000 (17:39 +0530)]
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>
Paras Nagda [Thu, 19 Jul 2018 13:21:14 +0000 (18:51 +0530)]
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>
Balachandra C S [Fri, 13 Jul 2018 11:02:28 +0000 (16:32 +0530)]
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>
Balachandra C S [Mon, 9 Jul 2018 11:54:41 +0000 (17:24 +0530)]
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>
Balachandra C S [Thu, 24 May 2018 14:16:25 +0000 (19:46 +0530)]
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>
Nirmal Abraham [Tue, 17 Jul 2018 10:19:19 +0000 (15:49 +0530)]
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>
Mohit Aggarwal [Mon, 9 Jul 2018 10:33:37 +0000 (16:03 +0530)]
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>
Rahul Sharma [Mon, 9 Jul 2018 18:18:12 +0000 (23:48 +0530)]
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>
Linux Build Service Account [Thu, 19 Jul 2018 03:29:04 +0000 (20:29 -0700)]
Merge "usb: dwc3-msm: Add boot marker"
Blagovest Kolenichev [Wed, 11 Jul 2018 15:31:19 +0000 (08:31 -0700)]
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>
Linux Build Service Account [Wed, 18 Jul 2018 08:05:43 +0000 (01:05 -0700)]
Merge "USB: core: harden cdc_parse_cdc_header"
Linux Build Service Account [Wed, 18 Jul 2018 08:05:42 +0000 (01:05 -0700)]
Merge "ARM: dts: msm: Change thermal configuration settings for msm8996."
Linux Build Service Account [Wed, 18 Jul 2018 08:05:41 +0000 (01:05 -0700)]
Merge "firmware_class: make firmware caching configurable"
Linux Build Service Account [Wed, 18 Jul 2018 08:05:40 +0000 (01:05 -0700)]
Merge "drm: msm: add skip_ddc support for hdmi display"
Linux Build Service Account [Wed, 18 Jul 2018 08:05:37 +0000 (01:05 -0700)]
Merge "ARM: dts: msm: add ddc_skip on auto 8996 boards"