Commit graph

587867 commits

Author SHA1 Message Date
Linux Build Service Account
be57574adf Merge "soc: qcom: spcom: validate rx_buf in spcom_rx before usage" 2017-04-18 13:57:01 -07:00
Linux Build Service Account
dcdd543fe1 Merge "wil6210: add option to load FTM FW" 2017-04-18 13:56:59 -07:00
Linux Build Service Account
68cbe2822c Merge "mm: separate out the invocation of lowmemorykiller shrinker" 2017-04-18 13:56:59 -07:00
Linux Build Service Account
2dfa6e303f Merge "wil6210: Improve AP stop handling" 2017-04-18 13:56:57 -07:00
Linux Build Service Account
f574243fae Merge "regulator: qpnp-oledb: Add revid support for OLEDB driver" 2017-04-18 13:56:56 -07:00
Linux Build Service Account
fe484ee85a Merge "power: smb-lib: start CC2 removal WA when VBUS is low" 2017-04-18 13:56:55 -07:00
Linux Build Service Account
a4da2aadd9 Merge "ANDROID: Refactor fs readpage/write tracepoints." 2017-04-18 13:56:54 -07:00
Linux Build Service Account
74cf65d68c Merge "ANDROID: fs: FS tracepoints to track IO." 2017-04-18 13:56:53 -07:00
Linux Build Service Account
e46437e997 Merge "crypto: msm: Fix buffer overflow issue" 2017-04-18 13:56:52 -07:00
Linux Build Service Account
9fbdcef1d5 Merge "qcom: qnovo: allow charger error conditions to disable qnovo" 2017-04-18 13:56:50 -07:00
Linux Build Service Account
50a43711dc Merge "ARM: dts: msm: Add reserved channel for MSM8998/SDM660/SDM630" 2017-04-18 06:29:59 -07:00
Linux Build Service Account
758e42fa64 Merge "ASoC: msm: qdsp6v2: Enable AFE sidetone based on mixer ctl setting" 2017-04-18 06:29:59 -07:00
Linux Build Service Account
90ec95150b Merge "ASoC: msm8998: Add check before dereferencing pointer" 2017-04-18 06:29:44 -07:00
Linux Build Service Account
b0f3600e32 Merge "clk: qcom: Update the hmss_gpll0_clk_src to 300MHz" 2017-04-18 06:29:44 -07:00
Linux Build Service Account
00dfbd4a98 Merge "qcom: smb2: Fix FCC/Float voltage configuration from device tree" 2017-04-18 06:29:43 -07:00
Linux Build Service Account
0fe2dba74c Merge "spmi: pmic-arb: Reserve a channel for debug port" 2017-04-18 06:29:42 -07:00
Linux Build Service Account
3327a91410 Merge "defconfig: msmcortex: Enable 8021Q config for APQ8098" 2017-04-18 06:29:41 -07:00
Linux Build Service Account
706c26b417 Merge "msm: isp: initialize pd stats buffer index" 2017-04-18 06:29:40 -07:00
Linux Build Service Account
c5c36cb00b Merge "msm: mdss: wait for one commit transfer for command mode after resume" 2017-04-18 06:29:39 -07:00
Linux Build Service Account
3c15507fd1 Merge "msm: camera: isp: Detect dual camera out of sync using time" 2017-04-18 06:29:31 -07:00
Ofir Cohen
34b95595b1 soc: qcom: spcom: validate rx_buf in spcom_rx before usage
Checking for rx_buf validity before performing copy operation.

Change-Id: I4651a8cc822fd1537bd92f01bf59ac3b5a500b3a
Signed-off-by: Ofir Cohen <ofirc@codeaurora.org>
2017-04-18 02:24:03 -07:00
Kiran Gunda
4312a0931a regulator: qpnp-oledb: Add revid support for OLEDB driver
Add PMIC revid support to identify the PMIC subtype for OLEDB driver.
This is useful to enable the functionalities/features that are specific to
certain PMICs like PM660A.

Change-Id: I4539955abb29fe37256e21ac507db646953e0abf
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-04-18 14:11:02 +05:30
Kiran Gunda
54b123d8a1 ARM: dts: msm: Add reserved channel for MSM8998/SDM660/SDM630
Channel 511 is used for debug port on MSM8998/SDM660/SDM630
targets. Reserve the same to avoid the access from other
peripherals.

Change-Id: I928916b7d61793a07e9a3b2e1c2127a247c71730
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-04-18 14:06:55 +05:30
Luo Jie
ab0aad15d5 defconfig: msmcortex: Enable 8021Q config for APQ8098
8021Q enables kernel to handle VLAN packets, which is necessary
for the VLAN feature of alx.

Change-Id: I57c4bf7a40c5ad06b3c7414ae51691f006841ab9
Signed-off-by: Luo Jie <luoj@codeaurora.org>
2017-04-18 00:30:26 -07:00
Kiran Gunda
37e5cdce64 spmi: pmic-arb: Reserve a channel for debug port
Do not keep the channel reserved for debug port in the
ppid to apid mapping table. This is to avoid accessing
that particular channel during the read/write/irq operations.

Change-Id: I8f49d1d87978a5b68ea711d3e30606d72fd09f73
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-04-18 12:20:18 +05:30
Taniya Das
7d46078d8d clk: qcom: Update the hmss_gpll0_clk_src to 300MHz
The GPLL0 source to the CPU subsystem requires 300MHz for OSM to use the
clock source. OSM internally cannot set the RCGR divider, so set the RCG to
300MHz at GCC.

Change-Id: I7a781c69656410eb4ce30126789dbaacf815e8ec
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2017-04-18 11:51:26 +05:30
Srikanth Uyyala
2f4908dc45 msm: isp: initialize pd stats buffer index
intialization of pd_stats buffer index during open node,
and after stats buf_divert.

Change-Id: I499371ddb4eddd74b759720d553164006c223f8a
Signed-off-by: Srikanth Uyyala <suyyala@codeaurora.org>
2017-04-17 22:41:54 -07:00
Vinayak Menon
d8c98bb6ae mm: separate out the invocation of lowmemorykiller shrinker
The commit '6b4f77 (mm: vmscan: invoke slab shrinkers from shrink_zone())'
fixed the invocation of shrinkers but resulted in lowmemorykiller shrinker
being called more. Reduce the number of lowmemorykiller shrinker
invocations by separating out the lowmemorykiller shrinker from
shrink_slab. This will make lowmemorykiller invoked only once for all zones
reclaimed in the direct reclaim path, and once for each zone in the kswap
path. As a consequence the eligible pages passed to shrink_slab_lmk is now
the reclaimable pages of all zones. Reducing the number of lowmemorykiller
invocations reduces the unnecessary time spent in lowmemorykiller and thus
contention or failures on lowmemorykiller's scan_mutex.

Change-Id: Iaabb9e441711f1dc804980b5853b64b3f214698d
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2017-04-18 10:29:44 +05:30
Ashay Jaiswal
e8791c5161 qcom: smb2: Fix FCC/Float voltage configuration from device tree
FCC and Float voltage is configured by battery driver using
power_supply framework (main_psy), re-run FCC/FV election once
main_psy is available to ensure FCC/Float voltage is configured
and reflected on hardware.
While at it, add check for valid "pl_psy" before using it.

CRs-fixed: 2028082
Change-Id: I2f5dc174eacf325ba27186b07c89bb7d438f061b
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2017-04-18 10:22:11 +05:30
Abhijeet Dharmapurikar
95d620e079 power: smb-lib: start CC2 removal WA when VBUS is low
Currently the CC2 removal workaround starts whenever PD issues a hard
reset. When PD issues a hard reset it is not guaranteed that VBUS will
fall since the source may not even be PD capable.

The CC2 removal workaround should only run during the time that VBUS is
low and CC is debounced.

Fix this by scheduling the CC2 removal workaround when VBUS falls and CC
is debounced, and cancel the workaround when either VBUS rises, or the
removal detection is successful.

CRs-Fixed: 2020132
Change-Id: I6475d37911d90805ed8b3bb4b3a26a9f7557ebd6
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-04-17 14:52:46 -07:00
Vikram Panduranga
b80e0c7dcf ASoC: msm: qdsp6v2: Enable AFE sidetone based on mixer ctl setting
AFE sidetone is currently enabled based on a combination
of mixer control setting and default config in ACDB.
This change will limit enablement to mixer control setting alone.

Change-Id: I038d51177adc3e1da45ea7fdf9386362390f181d
Signed-off-by: Vikram Panduranga <vpandura@codeaurora.org>
2017-04-17 14:47:27 -07:00
Linux Build Service Account
7f0d77b390 Merge "leds: qpnp-flash-v2: Change minimum current configuration" 2017-04-17 13:19:30 -07:00
Mohan Srinivasan
4918990f6b ANDROID: Refactor fs readpage/write tracepoints.
Refactor the fs readpage/write tracepoints to move the
inode->path lookup outside the tracepoint code, and pass a pointer
to the path into the tracepoint code instead. This is necessary
because the tracepoint code runs non-preemptible. Thanks to
Trilok Soni for catching this in 4.4.

Change-Id: I7486c5947918d155a30c61d6b9cd5027cf8fbe15
Git-commit: d854b68890
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2017-04-17 10:31:31 -07:00
Mohan Srinivasan
bb4bf9d359 ANDROID: fs: FS tracepoints to track IO.
Adds tracepoints in ext4/f2fs/mpage to track readpages/buffered
write()s. This allows us to track files that are being read/written
to PIDs.

Change-Id: I26bd36f933108927d6903da04d8cb42fd9c3ef3d
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
Git-commit: 32cbbe5953
Git-repo: https://android.googlesource.com/kernel/common/
[runminw@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2017-04-17 10:31:20 -07:00
Linux Build Service Account
d5311c5d43 Merge "ARM: dts: msm: Configure pin state for SMB1381 interrupt" 2017-04-17 06:01:41 -07:00
Linux Build Service Account
df2eb6a8bf Merge "soc:qcom: Synchronize service notifier task's" 2017-04-17 06:01:41 -07:00
Linux Build Service Account
38a8dd1dc3 Merge "core_ctl: Harden the adjustment_possible() check for unisolation" 2017-04-17 06:01:38 -07:00
Linux Build Service Account
8aa78dc580 Merge "usb: gadget: ffs: Fix runtime PM usage count for multiple set_alt" 2017-04-17 06:01:37 -07:00
Linux Build Service Account
0d6721c1e4 Merge "drivers: qcom: ultrasound: check concurrent device open operations" 2017-04-17 06:01:36 -07:00
Linux Build Service Account
fdb1d4a10f Merge "ARM: dts: msm: Enable register read based esd on sdm660 and sdm630" 2017-04-17 06:01:35 -07:00
Linux Build Service Account
e2b0c810d4 Merge "cpu-hotplug: Fix false error message in cpu_up()" 2017-04-17 06:01:34 -07:00
Linux Build Service Account
436a3b821c Merge "defconfig: msm: enable page poisoning by default" 2017-04-17 06:01:32 -07:00
Linux Build Service Account
0ce9249dee Merge "mm: allow page poisoning to be enabled by default." 2017-04-17 06:01:31 -07:00
Avaneesh Kumar Dwivedi
7961850500 soc:qcom: Synchronize service notifier task's
Queue the msg receive task in service notifier queue
so that it does not run concurrently with other notifier task. 
This avoid an issue where adsp ssr is stuck due to deadlock 
between msg receive and service arrive task.

Change-Id: I6ef9b765ae74eeb32021c2848ffc06d70df19c1b
Signed-off-by: Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>
2017-04-16 23:29:28 -07:00
Divya Ojha
c57fa14c6a drivers: qcom: ultrasound: check concurrent device open operations
Make opened device count atomic variable to avoid probable race
condition. Race condition leads to memory leak and list corruption.

Change-Id: I4da98f27d36f616bc8fa7b1a848c20cc7eea04e5
Signed-off-by: Divya Ojha <dojha@codeaurora.org>
2017-04-16 23:12:58 -07:00
Linux Build Service Account
0293b8a7d0 Merge "qcom: smb-lib: rerun APSD on insertion for micro USB mode" 2017-04-16 21:49:18 -07:00
Prashanth Bhatta
a16fc7b970 cnss_prealloc: Remove WARN_ON
WARN_ON is unnecessary if pre-alloc table doesn't have any free
memory. Remove the WARN_ON as error log is enough to find out
missing entry.

Change-Id: I5a46e1f259e88d1a19f05195f5d7bb0745d072c3
CRs-fixed: 2030272
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
2017-04-16 20:09:40 -07:00
Yingwei Zhao
b18d9ef97a ARM: dts: msm: Configure pin state for SMB1381 interrupt
GPIO21 is connected to SMB1381 STAT pin for interrupt detection,
configure it to pull up for sensing SMB1381's interrupt.

CRs-Fixed: 2033882
Change-Id: Ib88aac4acb3b1094adb13839cccf1aa27903b9c7
Signed-off-by: Yingwei Zhao <cyizhao@codeaurora.org>
2017-04-16 19:42:43 -07:00
Ashay Jaiswal
dabce32c24 qcom: smb-lib: rerun APSD on insertion for micro USB mode
In case of very slow insertion of SDP/DCP there is a possibility
that D+/D- makes contact while APSD is in progress. This will
result in an incorrect type detection.
Fix this by doing a APSD rerun after charger-type detection is
complete.

CRs-Fixed: 2032590
Change-Id: I0037b90f29dbe65a2cdb2771d5caceff77862f03
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2017-04-16 21:30:29 +05:30
Linux Build Service Account
9b3e8a81dc Merge "qcom: smb2: ensure QC adapter is at 5V at shutdown" 2017-04-15 23:11:11 -07:00