Commit graph

587889 commits

Author SHA1 Message Date
Linux Build Service Account
1342831f8a Merge "qcom: smblib: report discharging in case of input OV" 2017-04-18 22:19:28 -07:00
Linux Build Service Account
518e9d19b5 Merge "msm: ipa3: allocate memory for DMA task on init" 2017-04-18 22:19:27 -07:00
Linux Build Service Account
849232eb3e Merge "msm: pcie: support QGIC MSI with SMMU fastmap enabled" 2017-04-18 22:19:26 -07:00
Linux Build Service Account
984ec0d1e7 Merge "msm: mdss: Wait for VSYNC after continuous splash handoff" 2017-04-18 22:19:24 -07:00
Linux Build Service Account
e34cc21861 Merge "usb: phy: qmp: Remove extra debug log" 2017-04-18 22:19:24 -07:00
Linux Build Service Account
aadfc6d284 Merge "power: smb-lib: WA to fix legacy cable detection" 2017-04-18 22:19:21 -07:00
Linux Build Service Account
64cf255adf Merge "soc: qcom: qpnp-haptic: Optimize updating RATE_CFG registers" 2017-04-18 22:19:19 -07:00
Linux Build Service Account
c5371f74c8 Merge "msm: mdss: reset cdm block after used" 2017-04-18 22:19:18 -07:00
Linux Build Service Account
ce87c90172 Merge "lowmemorykiller: fix scan_mutex contention" 2017-04-18 13:57:02 -07:00
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
Skylar Chang
e01629963c msm: ipa3: allocate memory for DMA task on init
On some conditions, such as reboot, the allocation context
for DMA task might be a user space processes with SIGKILL.
Pre allocate this buffer to avoid DMA allocation failure.

Change-Id: Ie0c5ecbb7aebbf03c42c2f8976aad40e9987fd4a
CRs-Fixed: 2032907
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2017-04-18 11:34:11 -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
Liangliang Lu
0e7130d545 usb: phy: qmp: Remove extra debug log
Remove extra debug log to keep code clean.

Change-Id: I70907bb5530574386c60d14be24e13ee7ac7015f
Signed-off-by: Liangliang Lu <luliang@codeaurora.org>
2017-04-18 18:48:59 +08: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
Prakash Gupta
1b8bb0da0b lowmemorykiller: fix scan_mutex contention
A livelock can be created in the system by lowmemorykiller trying to kill
the same task again and again.  Below is the livelock condition.

P0 -> binder_main_lock(W)
P1 -> binder_main_lock(T)-> mmap_sem(W)
P2 -> mmap_sem(T) -> lowmem_scan::scan_mutex(W)
P3 -> lowmem_scan::scan_mutex(T) -> send SIGKILL P0

Here multiple tasks are contending on scan_mutex, and binder_main_lock.
Change lowmem_scan mutex_lock with mutex_trylock, so in case of lowmem_scan
lock contention, task will be allowed to reclaim from other shrinkers. This
will also maintain the serialization of lowmemorykiller trigger.

If a task is pending MEMDIE'ing, remove sleep before falling back on other
shrinkers.

If the task selected to be killed is MEMDIE'ing and in un-interruptible
sleep state, do not repeat kill but fallback on other shrinkers without any
delay.

Change-Id: I12131622f7fa7b422c6d5d09f782af848300e412
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
2017-04-18 07:32:31 +05:30
Harry Yang
d8c64ab421 qcom: smblib: report discharging in case of input OV
The register BATTERY_CHARGER_STATUS continues to show charging state
(like FULLON or TAPER mode) in cases where charging was paused due
to input OV. Look at BATTERY_CHARGER_STATUS_7_REG to determine if
charging was paused.

This fix modifies previous similar change for JEITA hard condition but
continue to cover the case.

Change-Id: Ibc5f4f5e85651708b656f06814008b0c319db02d
Signed-off-by: Harry Yang <harryy@codeaurora.org>
2017-04-17 18:19:59 -07:00
Abhijeet Dharmapurikar
5446858d07 power: smb-lib: WA to fix legacy cable detection
Currently a legacy cable is always assumed which causes decreased
performance from non-legacy HVDCP adapters with 10k ohm Rp.

Fix this by disabling and re-enabling Type-C to rerun the legacy cable
detection.

Moreover, the legacy cable IRQs are not used and cause unnecessary
type-c-change IRQs to fire. Disable them.

CRs-Fixed: 2020132
Change-Id: I57fc3762251ead028298f01b06d66f52fd119c6b
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-04-17 18:19:45 -07:00
Abhijeet Dharmapurikar
fcc7e888ff power: smb-lib: cache USB Type-C status
Currently the USB Type-C status is retrieved from the hardware in real
time. The Type-C change IRQ should trigger on every change of the Type-C
status, therefore it is not necessary to read the status registers
multiple times if a Type-C change IRQ has not triggered. Furthermore,
workarounds which force UFP/DFP mode, or disable Type-C altogether could
mislead the software into thinking a removal has happened.

Cache all of the USB Type-C status registers upon receiving a USB Type-C
change IRQ, and use the cached status where appropriate.

CRs-Fixed: 2020132
Change-Id: I99f2ff29633207898ae803672162db0c3cec80dc
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-04-17 17:35:46 -07:00
Abhijeet Dharmapurikar
fd0747e34a power: qcom: lock USB removal
During USB removal a lot of cleanup happens; votables are reset, flags
are cleared, etc. After the cleanup is finished there is a chance that
USB power supply consumers may set properties before getting the USB
removal notification. This can lead to many problems where ICL limits
are set based on the previous insertion, or APSD is disabled due to a
late setting of PD_ACTIVE.

Introduce a lock which prevents USB power supply consumers from setting
properties when USB has been removed. This lock will ensure that the
next insertion starts with a clean slate.

CRs-Fixed: 2020132
Change-Id: I05a4145289b6097e41afc30aa09782722fa03fb6
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-04-17 17:35:46 -07:00
Nicholas Troast
9b1513098b power: smb-lib: cleanup everything upon USB removal
Currently it is expected upon USB removal that consumers will receive a
notification that USB has been removed and will cleanup after
themselves. Unfortunately this makes it very difficult to keep track of
all of the necessary cleanup steps upon removal.

Also, in preparation of not allowing consumers to set properties after a
USB removal has happened it is now the responsibility of the charger
driver to cleanup on their behalf.

Moreover, since we don't have a separate removal/insertion interrupt,
the removal/insertion code may run even if the typeC cable is not
physically inserted/removed. Fix it by tracking a typec_present flag.

CRs-Fixed: 2020132
Change-Id: Ia514abaa4e12f72daec17fd1e95f3c51cc38a15f
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-04-17 17:35:41 -07:00
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