Commit graph

589702 commits

Author SHA1 Message Date
Linux Build Service Account
fb8be73fa6 Merge "ARM64: Make KERNEL_TEXT_RDONLY depend on !DEBUG_RODATA" 2017-05-16 06:49:40 -07:00
Linux Build Service Account
ed23e3c43b Merge "scsi: ufs-qcom: remove broken hci version quirk" 2017-05-16 06:49:37 -07:00
Linux Build Service Account
ec43abcb48 Merge "msm: mdss: fix display port crash caused by hpd_irq attention event" 2017-05-16 06:49:35 -07:00
Linux Build Service Account
2fdf1c893d Merge "drm/msm: drop return from gpu->submit()" 2017-05-16 06:49:34 -07:00
Linux Build Service Account
df5db93178 Merge "tracing: do not leak kernel addresses" 2017-05-16 06:49:32 -07:00
Linux Build Service Account
b0104407c2 Merge "Prevent heap overflow in uvc driver" 2017-05-16 06:49:31 -07:00
Linux Build Service Account
f7b2efad8d Merge "msm: kgsl: Offload mementry destroy work to separate thread" 2017-05-16 06:49:29 -07:00
Linux Build Service Account
9ed4022de0 Merge "spcom: avoid user commands via /dev/spcom" 2017-05-16 06:49:29 -07:00
Linux Build Service Account
1924110d21 Merge "timer: Clear deferrable_pending while handling timer softirq" 2017-05-16 06:49:28 -07:00
Linux Build Service Account
647e9bf427 Merge "soc: qcom: rpm_master_stat: Fix buffer overflow" 2017-05-16 06:49:27 -07:00
Linux Build Service Account
40e4c19332 Merge "diag: Add proper synchronization checks to msg mask table" 2017-05-16 06:49:26 -07:00
Linux Build Service Account
3715a9458a Merge "msm: ADSPRPC: verify and initialize some variables" 2017-05-16 06:49:25 -07:00
Linux Build Service Account
560c77a760 Merge "ASoC: wcd: Depend on right config option" 2017-05-16 06:49:24 -07:00
Linux Build Service Account
84b6f80cab Merge "memshare: Update the free memory count after allocation" 2017-05-16 06:49:23 -07:00
Linux Build Service Account
3a168d290b Merge "PM/devfreq: bw_hwmon: add mutex lock in polling interval case" 2017-05-16 06:49:22 -07:00
Linux Build Service Account
4939123c90 Merge "qseecom: add bus scaling support for GP operations" 2017-05-16 06:49:21 -07:00
Linux Build Service Account
f74b3846f3 Merge "ARM: dts: msm: move tdm common prop to parent node" 2017-05-16 06:49:18 -07:00
Linux Build Service Account
c46427b57a Merge "ASoC: msm: qdsp6v2: Add TDM master slave select setting" 2017-05-16 06:49:17 -07:00
Nick Desaulniers
ccc9ce7791 tracing: do not leak kernel addresses
This likely breaks tracing tools like trace-cmd.  It logs in the same
format but now addresses are all 0x0.

Bug: 34277115
Change-Id: Ifb0d4d2a184bf0d95726de05b1acee0287a375d9
Git-repo: https://android.googlesource.com/kernel/msm
Git-commit: 9ad8f2cc1bb73a3e2255dff4ee9c45c909869225
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2017-05-15 10:45:17 -07:00
Robb Glasser
f872fd26e4 Prevent heap overflow in uvc driver
The size of uvc_control_mapping is user controlled leading to a
potential heap overflow in the uvc driver. This adds a check to verify
the user provided size fits within the bounds of the defined buffer
size.

Bug: 33300353
Change-Id: If29c1b396633b6137966a12e38f6fd1841b045bd
Signed-off-by: Robb Glasser <rglasser@google.com>
Git-repo: https://android.googlesource.com/kernel/msm
Git-commit: 8bc3ec72a02052187397d0de1a7b8bbe7340451c
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2017-05-15 10:44:22 -07:00
Linux Build Service Account
75a9d0fee5 Merge "ARM: dts: msm: Update charging ESR timer value to 96 for PM660 FG" 2017-05-15 03:51:25 -07:00
Linux Build Service Account
e7c8de8d94 Merge "scsi: ufs: Initialize cmd_id and check lrbp->cmd NULL" 2017-05-15 03:51:24 -07:00
Linux Build Service Account
cdcdb7a314 Merge "mmc: mmc: Fix mmc_partial_init for HS400 mode" 2017-05-15 03:51:23 -07:00
Linux Build Service Account
1f7482db72 Merge "defconfig: msm: remove dcc config for perf on sdm660" 2017-05-15 03:51:22 -07:00
Linux Build Service Account
593bc3b721 Merge "sound: usb: Add default branches for BADD 3.0 devices" 2017-05-15 03:51:21 -07:00
Linux Build Service Account
2cc0f28c54 Merge "media: dvb-core: Fix coding errors in broadcast drivers" 2017-05-15 03:51:21 -07:00
Linux Build Service Account
3c50776b05 Merge "defconfig: msmcortex: Cleanup" 2017-05-15 03:51:20 -07:00
Linux Build Service Account
696b2e8fbe Merge "qpnp-smb2: Add software based glitch filter for OTG detection" 2017-05-15 03:51:19 -07:00
Linux Build Service Account
da60dd7190 Merge "dma-mapping: Always remap on dma buffer free" 2017-05-15 03:51:18 -07:00
Linux Build Service Account
c8b9cb715e Merge "ARM: dts: msm: Update the virtual corner for SDM630" 2017-05-15 03:51:17 -07:00
Linux Build Service Account
fee8893548 Merge "clk: Move vdd voting before set rate and parent" 2017-05-15 03:51:16 -07:00
Linux Build Service Account
fc2f0e6d95 Merge "usb: gadget: f_cdev: Increase number of driver instances to 3" 2017-05-15 03:51:15 -07:00
Linux Build Service Account
286d3aa674 Merge "msm: camera: isp: Fix excessive logging in w+t" 2017-05-15 03:51:14 -07:00
Amir Samuelov
646bb3157b spcom: avoid user commands via /dev/spcom
The pseudo-file char-device-nodes /dev/spcom and /dev/sp_ssr are not
associated with a logical channel for data transfer with the Secure
Processor (SP).
Avoid sending user command by file write() over those device nodes.
The command "create channel" should be done over /dev/sp_kernel rather
than over /dev/spcom.
Verify that glink pass valid channel pointer to spcom callbacks.
Use size_t for channel "actual_rx_size" parameter that is provided by
glink to spcom callback.
Remove "fake SSR" command, since real SSR is supported by SP.

Change-Id: Id9113389d94ab4aed01d3ac1e370c4e8f3c8965b
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
2017-05-15 00:55:31 -07:00
Neeraj Upadhyay
1ef28deec0 timer: Clear deferrable_pending while handling timer softirq
Clear deferrable_pending everytime timer softirq is run.
This handles a potential race condition, where one CPU
handles all deferrable timers, before the other CPU gets
a change to run timer softirq. Due to the deferrable_pending
not getting cleared, subsequently, CPUs do not raise
the softirq for handling expired deferrable timers,
in nohz idle enter path.

Change-Id: Ie5fd78f9b27e7553ba43101b86ad939c289827e0
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
2017-05-15 00:06:22 -07:00
Maulik Shah
a9cab2670f soc: qcom: rpm_master_stat: Fix buffer overflow
Buffer overflow can happen when finding next set bit
due to type casting of uint32_t to unsigned long.

Fix this to correctly print number of active cores in
rpm_master_stat.

Change-Id: Ibeacc5ac66535e373965d8f8e4919829367cc257
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
2017-05-15 12:17:27 +05:30
Anirudh Ghayal
01cb0bde1c ARM: dts: msm: Update charging ESR timer value to 96 for PM660 FG
Use the same FG ESR timer value (96) for charging and
discharging. This is to avoid the frequent periodic spur
seen in the RF performance with charger connected.

CRs-Fixed: 2046553
Change-Id: I9d1ad61f75f553bf527906715699817236f44b01
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-05-15 11:44:55 +05:30
Rob Clark
e2135a7627 drm/msm: drop return from gpu->submit()
At this point, there is nothing left to fail.  And submit already has a
fence assigned and is added to the submit_list.  Any problems from here
on out are asynchronous (ie. hangcheck/recovery).

Change-Id: Ib6b6bf00099137972649c97cc6cd8c4fe25ce7c3
Signed-off-by: Rob Clark <robdclark@gmail.com>
Git-commit: 1193c3bcb581807d58dd7df90528ec744af387a9
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[smasetty@codeaurora.org: fixed merge conflict issues; made corresponding
changes to A5XX submit function.]
Signed-off-by: Sharat Masetty <smasetty@codeaurora.org>
2017-05-15 11:16:11 +05:30
Udaya Bhaskara Reddy Mallavarapu
9603f4f5cd media: dvb-core: Fix coding errors in broadcast drivers
Added Check to verify TSPP channel input source is valid.
Initialize return variables to return correct values in fail conditions.
Move deferencing of input pointer arguments after NULL checking.

CR's-Fixed: 2043689
Change-Id: I7febdb0e0f499846cfcf8836ea35c8547a5074fb
Signed-off-by: Udaya Bhaskara Reddy Mallavarapu <udaym@codeaurora.org>
2017-05-14 21:12:44 +05:30
Linux Build Service Account
c6d1c1699e Merge "drm/msm: make msm_drm.h uapi header safe for C++" 2017-05-13 16:25:54 -07:00
Stephen Boyd
c3ed5ae37c ARM64: Make KERNEL_TEXT_RDONLY depend on !DEBUG_RODATA
KERNEL_TEXT_RDONLY is similar to DEBUG_RODATA, but it relies on
4k pages to be made, whereas DEBUG_RODATA can work with or
without 4k pages. Let's move the depends on statement from
FORCE_PAGES to KERNEL_TEXT_RDONLY to accurately reflect the real
dependency here. This fixes a warning where we have FORCE_PAGES
enabled but DEBUG_RODATA is also enabled at the same time because
the latter is "default y" now and the depends on for FORCE_PAGES
can't be satisfied. In fact, it's OK for FORCE_PAGES to be
enabled at the same time as DEBUG_RODATA, it's really there to
prevent KERNEL_TEXT_RDONLY being enabled at the same time as
DEBUG_RODATA. Move the depends on to make things clearer.

Change-Id: Ie73b768ed4540cdb4d752a9b5f1a049bf644bc7e
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2017-05-12 08:47:47 -07:00
Olav Haugan
092564d2a8 defconfig: msmcortex: Cleanup
Sync defconfig with make menuconfig output.

Change-Id: Ieefef23fe14676007580c524268ef2a228d38059
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2017-05-12 08:44:35 -07:00
Stephen Boyd
0ed5a46cc0 ASoC: wcd: Depend on right config option
Kconfig doesn't have the CONFIG_ part of the option, so don't use
it here. This fixes a kconfig warning about missing a dependency
for "CONFIG_SPI" which doesn't exist because it's supposed to be
"SPI".

Change-Id: Ie449ff250dd87b0a445d34ee079082c6e91f147c
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2017-05-12 08:37:11 -07:00
Ashay Jaiswal
0038058ab4 qpnp-smb2: Add software based glitch filter for OTG detection
When the USB_ID line is pulled low for a very short time there is a
possibility that the SW misses rising edge(removal) event. This may
lead to the state where charger is stuck in the boost-mode forever.

Fix this my adding a SW based glitch logic which checks for the
USB_ID after a SW debounce time and then notifies its presence/removal to
the USB driver.

CRs-Fixed: 2044958
Change-Id: I31974f7d68b435bbef329278cedbd726ada02e3f
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2017-05-12 16:45:10 +05:30
Saranya Chidura
24bba179ae defconfig: msm: remove dcc config for perf on sdm660
remove the DCC_CONFIG option in perf defconfig for SDM660
target.

Change-Id: Id1b019a5eb1c6a71d4b5e6e854e642411714a900
Signed-off-by: Saranya Chidura <schidura@codeaurora.org>
2017-05-12 15:26:51 +05:30
Ritesh Harjani
45eadbbce3 mmc: mmc: Fix mmc_partial_init for HS400 mode
In case of emmc5.0 cards where HS400 mode and CMD5(awake) partial
init is enabled -> mmc_partial_init is broken and gives below errors.
Fix this by adding calibration logic in case of HS400 mode.

NOTE: In HS400 mode tuning is only performed once during bootup (in
HS200 mode).
Post to that it is always DLL calibration which is performed (in
system/runtime resume).
So even for below issue since timing is already changed using
cached_ios, then do the calibration using ->execute_tuning.

<dmesg errors w/o patch>
root@msm8996:/ # [   76.011036] mmc0: mmc_runtime_suspend:
[   77.315903] mmc0: mmc_runtime_resume:
[   77.367866] mmc0: mmc_partial_init: starting partial init
[   77.376225] mmc0: mmc_test_awake_ext_csd: mmc_get_ext_csd failed
(-110)
[   77.382190] mmc0: mmc_partial_init: done partial init (-110)
[   77.387536] mmc0: _mmc_resume: awake failed (-110), fallback to full
init
[   77.394405] mmc0: mmc_init_card:
[   77.402762] mmc0: mmc_init_card: mmc_send_op_cond() fails -110
[   77.407573] mmc0: MMC card re-init failed rc = -110 (retries = 3)
[   77.507261] mmc0: _mmc_resume: awake failed (-110), fallback to full
init
[   77.513293] mmc0: mmc_init_card:

<dmesg with patch>
[   74.002624] mmc0: mmc_runtime_resume:
[   74.056089] mmc0: mmc_partial_init: starting partial init
[   74.067143] mmc0: mmc_partial_init: done partial init (0)

Change-Id: I0e55efb7863b75bd584843c3fc920c845996eb5c
Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
2017-05-12 02:08:27 -07:00
Ajay Agarwal
2ecf8c9fd2 sound: usb: Add default branches for BADD 3.0 devices
For a BADD 3.0 device, the Data Endpoint wMaxPacketSize
of an Alt Setting must be one of the values mentioned in
the specifications. Similarly, the unit IDs of the source
units of any entity is prescribed by the specs. Add
support for checking the error(default) branches in the
relevant switch cases and accordingly handle them.

Change-Id: Ib88eee21df012089d41c4e78a161ddc6767e1bd4
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2017-05-12 12:33:15 +05:30
Tharun Kumar Merugu
94e69df401 msm: ADSPRPC: verify and initialize some variables
Verify cid variable before accessing it and
initialize invoket variable before bailing out.

Change-Id: Idec133bf8ba1a000b83f92bb567f0b75bbdab340
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-05-11 23:40:29 -07:00
Manoj Prabhu B
b57f957da3 memshare: Update the free memory count after allocation
The patch updates the client's free memory
count variable after the successful allocation.

CRs-Fixed: 2046258
Change-Id: Ibae317596557e23d2b2278daf433bd293a8bd0be
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2017-05-12 10:42:41 +05:30
Santosh Mardi
28aab0311c PM/devfreq: bw_hwmon: add mutex lock in polling interval case
Protect polling interval update event in the governor
with mutex lock.
This will avoid parallel execution of update interval event
on different cores, resulting in memory poison overwritten.

CRs-Fixed: 2035633
Change-Id: Ib919d9774317bc01e3cf581c169c5d18555f484f
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
2017-05-12 10:22:31 +05:30