Commit graph

574702 commits

Author SHA1 Message Date
Ghanim Fodi
634732c1bb msm: ipa3: fix GSI ring DMA allocation parameters
DMA coherent allocation was done with inappropriate
flags causing memory allocation to fail occasionally.
Use GFP_KERNEL flag as well as fix up some cleanup
actions.

CRs-Fixed: 1060305
Change-Id: I93c9340439dd65c50764dd078071bf66f65a9464
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
2016-08-30 01:35:19 -07:00
Harry Yang
87ec324a67 qcom-charger: introduce step charging
This algorithm allows for programmable charge current values
based on programmable thresholds on state-of-charge (SoC).

Adjusting battery charge current based on the battery SoC
may lead to extended battery capacity over number of charge
cycles.

Charging profile to be used relies on battery characterization
data from battery cell manufacurers.

CRs-Fixed: 1052854
Change-Id: I8844a3e8428b045514863d72c08f6c6b2b2ac2a4
Signed-off-by: Harry Yang <harryy@codeaurora.org>
2016-08-29 21:48:57 -07:00
Linux Build Service Account
166af733db Merge "scsi: ufs-qcom: skip svs2 configuration for newer controllers" 2016-08-29 19:14:22 -07:00
Linux Build Service Account
78170f03d5 Merge "mfd: qcom-i2c-pmic: prepare for shared interrupt" 2016-08-29 19:14:22 -07:00
Linux Build Service Account
1f2cf9a987 Merge "defconfig: arm64: Add coresight abort support for msmcobalt" 2016-08-29 19:14:21 -07:00
Linux Build Service Account
6f177c586e Merge "ARM: dts: msm: add audio codec as child of MSM External display" 2016-08-29 19:14:20 -07:00
Linux Build Service Account
1c39aaa3b8 Merge "msm: qpnp-haptic: Update function declarations" 2016-08-29 19:14:19 -07:00
David Dai
646894a3b6 ARM: dts: msm: change ebi buswidth for msmhamster
Change the ddr width from 8 to 4 for msmhamster, due to
ddr width being halved in hardware.

Change-Id: I40f5972be54393813ad04b07c032f494888ad5e8
Signed-off-by: David Dai <daidavid1@codeaurora.org>
2016-08-29 18:03:58 -07:00
Mayank Rana
fae741edcc usb: gsi: Queue control notification on gsi_resume
There is delay seen in queueing notification when response is
available after performing function remote wakeup. This change
queues control notification from gsi_resume() for RMNET/MBIM and
ECM case when notify_count is 1 (i.e. remote wakeup is performed
but notify request is not queued.) to make sure that host is
notified before it timeouts for response and starts data transfer.

CRs-Fixed: 1033093
Change-Id: Ic55667df93c8bd51df06b48709bc420c082fbcf5
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
2016-08-29 17:38:42 -07:00
JP Abgrall
97a4ac881a nf: xt_qtaguid: fix handling for cases where tunnels are used.
* fix skb->dev vs par->in/out
When there is some forwarding going on, it introduces extra state
around devs associated with xt_action_param->in/out and sk_buff->dev.
E.g.
   par->in and par->out are both set, or
   skb->dev and par->out are both set (and different)
This would lead qtaguid to make the wrong assumption about the
direction and update the wrong device stats.
Now we rely more on par->in/out.

* Fix handling when qtaguid is used as "owner"
When qtaguid is used as an owner module, and sk_socket->file is
not there (happens when tunnels are involved), it would
incorrectly do a tag stats update.

* Correct debug messages.

Bug: 11687690
Change-Id: I2b1ff8bd7131969ce9e25f8291d83a6280b3ba7f
CRs-Fixed: 747810
Signed-off-by: JP Abgrall <jpa@google.com>
Git-commit: 2b71479d6f5fe8f33b335f713380f72037244395
Git-repo: https://www.codeaurora.org/cgit/quic/la/kernel/mediatek
[imaund@codeaurora.org: Resolved trivial context conflicts.]
Signed-off-by: Ian Maund <imaund@codeaurora.org>
[bflowers@codeaurora.org: Resolved merge conflicts]
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-08-29 13:59:18 -07:00
Benjamin Chan
aeb8d34871 msm: sde: Fix SMMU fault in SDE rotator for secure playback
When playing secure content, framebuffer is setup as secure in the
rotator. But the sw timestamp is not going through the secure
route, and must clear out the secure setting, otherwise a smmu fault
will be issued. This fix make sure the secure buffer status is
cleared during the sw timestamp submission.

CRs-Fixed: 1059620
Change-Id: Ifb0f9928fa1d948351e6fc1ad925a070a7f50a96
Signed-off-by: Benjamin Chan <bkchan@codeaurora.org>
2016-08-29 13:06:55 -07:00
Ping Li
53bfdf149f msm: mdss: Update MDP memory retention sequence for msmcobalt
msmcobalt requires MDP clks ON when configuring the retention bits of
MDSS_MDP_CBCR and MDSS_MDP_LUT_CBCR registers, so that the retention
signals can be propagated to memories. This change adds the code
to support the new requirement.

Change-Id: I75b83ce99f061104641188c0f0d3d6cd3e0cfb09
Signed-off-by: Ping Li <pingli@codeaurora.org>
2016-08-29 11:38:56 -07:00
Benjamin Chan
3990c6a17a msm: sde: Fix SDE rotator driver error handling
Initialize some local variables before using them and safely return an
error code when encounter error cases in the SDE rotator driver.

CRs-Fixed: 1060558
Change-Id: I25406b13ac2007f1789d8d32e428c39dac4c29cf
Signed-off-by: Benjamin Chan <bkchan@codeaurora.org>
2016-08-29 11:24:53 -04:00
Utkarsh Saxena
c6d6062033 msm: ipa: WDI2.0: hotspot offload using WDI 2.0 interface
Add support to enable WDI 2.0 interface on IPA version 2.6.1
which is used in falcon.

Change-Id: Id6460f21245808b739ad215fe8073ae7cae8422c
Acked-by: Mohammed Javid <mjavid@qti.qualcomm.com>
Signed-off-by: Utkarsh Saxena <usaxena@codeaurora.org>
2016-08-29 07:49:51 -07:00
Linux Build Service Account
aaf356abef Merge "scsi: ufs: add 2 lane support" 2016-08-29 06:46:44 -07:00
Komal Seelam
9bb7d6728f net: cnss: Release QCA chip resources when Wi-Fi is turned off
When WiFi is turned off from userspace, save power by toggling
WLAN_EN gpio and restore power when wifi is loaded again.

CRs-Fixed: 1058794
Change-Id: I0257698d9d168d7c889436a05693061cafe5ea7c
Signed-off-by: Komal Seelam <kseelam@codeaurora.org>
2016-08-29 17:03:49 +05:30
Kanchanapally, Vidyullatha
9f28983d4e cfg80211: Add option to report the bss entry in connect result
Since cfg80211 maintains separate BSS table entries for APs if the same
BSSID, SSID pair is seen on multiple channels, it is possible that it
can map the current_bss to a BSS entry on the wrong channel. This
current_bss will not get flushed unless disconnected and cfg80211
reports a wrong channel as the associated channel.

Fix this by introducing a new cfg80211_connect_bss() function which is
similar to cfg80211_connect_result(), but it includes an additional
parameter: the bss the STA is connected to. This allows drivers to
provide the exact bss entry that matches the BSS to which the connection
was completed.

Reviewed-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Vidyullatha Kanchanapally <vkanchan@qti.qualcomm.com>
Signed-off-by: Sunil Dutt <usdutt@qti.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-commit: 81948527fce52c73c9a0742b8ec8d26b97f6c3c0
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
Change-Id: I5dc58b360b2bbce53493466a0bcd5363276c302a
CRs-fixed: 1008791
Signed-off-by: Vidyullatha Kanchanapally <vidyullatha@codeaurora.org>
2016-08-29 01:45:00 -07:00
Vidyullatha Kanchanapally
bc2630b4c9 cfg80211: Define macro to indicate support for new cfg80211 connect api
Define macro to indicate backport support for the new
cfg80211 connect api.

Change-Id: If77035ca928bf5bc5a27230d9b3f6d56ea6c8b99
CRs-Fixed: 1008791
Signed-off-by: Vidyullatha Kanchanapally <vidyullatha@codeaurora.org>
2016-08-29 01:44:45 -07:00
Jouni Malinen
5a9bcc929f cfg80211: Add option to specify previous BSSID for Connect command
This extends NL80211_CMD_CONNECT to allow the NL80211_ATTR_PREV_BSSID
attribute to be used similarly to way this was already allowed with
NL80211_CMD_ASSOCIATE. This allows user space to request reassociation
(instead of association) when already connected to an AP. This provides
an option to reassociate within an ESS without having to disconnect and
associate with the AP.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-commit: ba6fbacf9c073effaedf0c52fe7e52e2baf67725
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
Change-Id: Idfd211db838cdde40ecc02a1803eac5c1ebfbc77
CRs-fixed: 1004073
Signed-off-by: Vidyullatha Kanchanapally <vidyullatha@codeaurora.org>
2016-08-29 01:44:30 -07:00
Vidyullatha Kanchanapally
1b4ea77769 cfg80211: Define macro to indicate prev_bssid connect support
Define macro to indicate backport support for prev_bssid
parameter in connect request. This parameter allows the
driver to decide whether to do a new association or a
re-association on a cfg80211 connect request.

Change-Id: I760e2999ec56c9aa0c44ac7b062ee1755192299f
CRs-Fixed: 1004073
Signed-off-by: Vidyullatha Kanchanapally <vidyullatha@codeaurora.org>
2016-08-29 01:43:43 -07:00
Vidyullatha Kanchanapally
6038e87f08 cfg80211: Define macro to indicate bssid based scan support
Define macro to indicate backport support for bssid parameter
in scan request.

Change-Id: I542b0de66948610135cf69a3d24c1561017fe7a8
CRs-Fixed: 996660
Signed-off-by: Vidyullatha Kanchanapally <vidyullatha@codeaurora.org>
2016-08-29 01:43:21 -07:00
Praveen Chavan
34e86b910f msm: vidc: Compare ion_handles rather than fds
fd(s) cannot uniquely identify buffers queued by cross-process
clients. Use ion handles to compare and match already-mapped-
buffers irrespective of data or extradata planes.

CRs-Fixed: 1060416
Change-Id: I591f18aa225cc6690bf423f2ae5bc7dafd4dad78
Signed-off-by: Praveen Chavan <pchavan@codeaurora.org>
2016-08-29 01:28:06 -07:00
Linux Build Service Account
436eeda4f1 Merge "drivers: mfd: Add 1.6MHz clk support for wcd934x codec" 2016-08-29 00:49:28 -07:00
Linux Build Service Account
37d7004cec Merge "defconfig: msm64: msm: Compile vidc driver as LKM" 2016-08-29 00:49:28 -07:00
Linux Build Service Account
1de43aecd2 Merge "sound: usb: Add NULL check on return value of iommu_domain_alloc()" 2016-08-29 00:49:27 -07:00
Linux Build Service Account
627ff531cb Merge "input: synaptics_dsx_2.6: correct sysfs permissions" 2016-08-29 00:49:26 -07:00
Linux Build Service Account
2b4e8cbd34 Merge "Revert "Merge remote-tracking branch 'msm-4.4/tmp-510d0a3f' into msm-4.4"" 2016-08-29 00:49:25 -07:00
Linux Build Service Account
50618ab44f Merge "usb: gadget: f_cdev: Handle notification request properly" 2016-08-29 00:49:25 -07:00
Linux Build Service Account
7121dd22c2 Merge "msm_vidc: venc: configure max-B-frames only if B is enabled" 2016-08-29 00:49:23 -07:00
Linux Build Service Account
105d1fddef Merge "mm: zbud: fix the locking scenarios with zcache" 2016-08-29 00:49:23 -07:00
Linux Build Service Account
cbbeefbea9 Merge "clk: qcom: Add support for clk_set_flags for branch and dummy clock" 2016-08-29 00:49:21 -07:00
Linux Build Service Account
5eaa42dc62 Merge "radio: iris: uapi header split" 2016-08-29 00:49:21 -07:00
Maya Erez
9bc4dc29a0 scsi: ufs: Initiate crypto before SCSI for UFS fast boot
UFS driver integrates a new functionality to support inline
crypto engine, which was added to the crypto component.
In case ICE driver is initialized after UFS driver, we experience
long boot time as a result of probe defer handling.
Changing the modules order in the makefile will reduce the
probability for probe defer cases and will allow maintaining
shorter boot time.

Change-Id: I941a577a427ad45e7519408425e00541e825efc6
Signed-off-by: Maya Erez <merez@codeaurora.org>
2016-08-29 00:30:38 -07:00
Jouni Malinen
5766333698 cfg80211: Allow a scan request for a specific BSSID
This allows scans for a specific BSSID to be optimized by the user space
application by requesting the driver to set the Probe Request frame
BSSID field (Address 3) to the specified BSSID instead of the wildcard
BSSID. This prevents other APs from replying which reduces airtime need
and latency in getting the response from the target AP through.

This is an optimization and as such, it is acceptable for some of the
drivers not to support the mechanism. If not supported, the wildcard
BSSID will be used and more responses may be received.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-commit: 0889675a9503f48d1ad01b4eaa202f89469b2b62
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Change-Id: I20cf654661c11880055d022e0c9ec77beab659e8
CRs-fixed: 996660
Signed-off-by: Vidyullatha Kanchanapally <vidyullatha@codeaurora.org>
2016-08-29 00:21:40 -07:00
Venkat Gopalakrishnan
54b8bf43e4 ARM: dts: msm: add 2 lane support for msmcobalt ufs phy
Qcom ufs controller v3.1.0 supports 2 lanes. Add necessary
clocks and lane config properties to support that.

Change-Id: I97b11dc21882f08327d7d056ce1bf1c34b3c3946
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
2016-08-29 00:21:19 -07:00
Subhash Jadavani
a58cf90d63 scsi: ufs-qcom: skip svs2 configuration for newer controllers
Newer QCOM UFS host controller doesn't need to execute
the special LPM mode configuration when switching to SVS2
mode. This change looks at the host controller version
to bypass this special configuration for newer controller
version.

Change-Id: Ib84663955c0c0db6124819c4c4749e5c347a3495
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
2016-08-29 00:16:43 -07:00
Venkat Gopalakrishnan
b938e3480e scsi: ufs: add 2 lane support
Qcom ufs controller v3.1.0 supports 2 lanes, add support
to configure 2 lanes during phy initialization.

Change-Id: Ifa2bac71b47ce49a6fb31ebb8dd54b243e1cfae1
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
2016-08-29 00:16:13 -07:00
Subhash Jadavani
19bec73759 phy: qcom-ufs-qmp-v3: add 2 lane phy support
New version of phy-qcom-ufs-qmp-v3 supports 2 lanes,
this change adds the config table to enable 2 lanes.

Change-Id: Ie916e7090d3660711159b886c27ee3709891ef2b
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
2016-08-29 00:15:41 -07:00
Xiaojun Sang
c9b0b7c45d ASoC: sound: soc: fix incorrect max value
1. Max value stands for number of levels in SX control. The value
was adjusted inappropriately, which causes inconsistency between
max and min value.

2. Code assumes negative value of mc->min. Positive mc->min leads
to incorrect number of levels. The fix covers the risk.

CRs-Fixed: 1053735
Change-Id: I71bd8f11ff9faff9252129d84c1a80845fc2fe2a
Signed-off-by: Xiaojun Sang <xsang@codeaurora.org>
2016-08-29 15:06:10 +08:00
Kumar, Anand
0e0c3c54aa cnss: Use Different Dump Names for QCA PCIe and SDIO targets
On Dual-WiFi platforms, SDIO and PCIe dumps are overwritten by
the crashscope, as they use the same dump name.
Use different dump names to distinguish the dump between SDIO and PCIe.

CRs-Fixed: 1037346
Change-Id: I59c0ee5d3c5f206ae09d6b813f1e5c1ce1434cc1
Signed-off-by: Anand Kumar <anandkumar@codeaurora.org>
2016-08-29 11:19:29 +05:30
Theodore Ts'o
fd0655a7f0 ext4 crypto: simplify interfaces to directory entry insert functions
A number of functions include ext4_add_dx_entry, make_indexed_dir,
etc. are being passed a dentry even though the only thing they use is
the containing parent.  We can shrink the code size slightly by maing
this replacement.  This will also be useful in cases where we don't
have a dentry as the argument to the directory entry insert functions.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: "Theodore Ts'o" <tytso@google.com>
Git-commit: e3b970d19418e2cfeeaca323ae620cc2dab22086
Git-repo: https://android.googlesource.com/kernel/msm/
Change-Id: I565f822a8fc795740155154a7f003340b26ee128
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
2016-08-28 09:39:30 -07:00
Prashanth Bhatta
7d45313e05 icnss: Handle wait being interrupted
When event needs to be processed synchronously, event posting
thread waits for the completion. After completion, result from
the event work is retrieved and event buffer would be freed. But
if waiting thread gets interrupted then wait_for_completion API
returns failure and it also frees the buffer posted for
processing. Event work queue may accesses the freed buffer and
crash the system.
Fix the issue by properly synchronizing event buffer free between
caller and event work by checking for return value of
wait_for_completion.

CRs-fixed: 1057180
Change-Id: Ic3968fd4c0232da6bc9a97d94376f540f62bd2e6
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
2016-08-27 12:09:16 -07:00
Satyajit Desai
2681a68d37 defconfig: arm64: Add coresight abort support for msmcobalt
Enable CoreSight abort for msmcobalt. CoreSight driver will
dump any trace present in the current sink in case we hit a
kernel panic, user fault or an undefined instruction.

Change-Id: Iff2fdfb547617425182429d95fb1d3b9a2e4321f
Signed-off-by: Satyajit Desai <sadesai@codeaurora.org>
2016-08-27 11:27:42 -07:00
Linux Build Service Account
e8a0e0808d Merge "ASoC: wcd934x: Add DSD volume support" 2016-08-27 03:35:38 -07:00
Linux Build Service Account
9a3bdf21ff Merge "ARM: dts: msm: Update power attributes for msmcobalt" 2016-08-27 03:35:37 -07:00
Linux Build Service Account
1adaeeae92 Merge "msm: vidc: Fix multistream issues" 2016-08-27 03:35:36 -07:00
Linux Build Service Account
78cf186b80 Merge "qpnp-fg-gen3: export the battery float voltage" 2016-08-26 22:23:00 -07:00
Linux Build Service Account
97cb0bb99f Merge "qcom-charger: smb-lib: correct the usb suspend votable name" 2016-08-26 22:23:00 -07:00
Linux Build Service Account
8dff1db3bc Merge "qcom-charger: qpnp-fg-gen3: add v2 SRAM register map" 2016-08-26 22:22:59 -07:00
Linux Build Service Account
2507985cbc Merge "ARM: dts: msm: Update GPU SMMU settings for cobalt" 2016-08-26 22:22:58 -07:00