Commit graph

588985 commits

Author SHA1 Message Date
Linux Build Service Account
02e860bddb Merge "msm/drm: Move msm_drm_config configuration into the GPUs" 2017-05-02 09:07:17 -07:00
Linux Build Service Account
82fffc58bf Merge "drm/msm: Add PLL_DELTA property to HDMI connector" 2017-05-01 23:57:09 -07:00
Linux Build Service Account
7eacb7e8a2 Merge "ARM: dts: msm: Set 1.848V as the minimum voltage for LDO24 on msm8998" 2017-05-01 23:57:08 -07:00
Linux Build Service Account
91371a5fd8 Merge "power_supply: Add REAL_TYPE power_supply_property" 2017-05-01 23:57:05 -07:00
Linux Build Service Account
edd6b4da0a Merge "qpnp-smb2: make qnovo vote for current and voltage" 2017-05-01 23:57:04 -07:00
Linux Build Service Account
83d523c6dc Merge "qcom: qpnp-smb2: fix cleanup path" 2017-05-01 23:57:03 -07:00
Linux Build Service Account
4082e377a6 Merge "qcom: battery: Fix using stale votable pointers" 2017-05-01 23:57:03 -07:00
Linux Build Service Account
a7e6a8242c Merge "ARM: dts: msm: Add iommu coherent test device for msm8998" 2017-05-01 23:57:02 -07:00
Linux Build Service Account
5c0c850420 Merge "msm: ipa3: fix channel stop retry logic" 2017-05-01 23:57:01 -07:00
Linux Build Service Account
740fee5938 Merge "ARM: boot: Silence 'zimage-dtb is ready' message" 2017-05-01 23:57:00 -07:00
Linux Build Service Account
a2c574ad5b Merge "esoc: mdm-4x: Add support for mdm9x45 and apq8096" 2017-05-01 23:56:58 -07:00
Linux Build Service Account
abb8574839 Merge "defconfig: disable slub debug on sdm660" 2017-05-01 23:56:57 -07:00
Linux Build Service Account
cf05282438 Merge "mmc: cmdq_hci: Avoid releasing clock twice during DCMD error" 2017-05-01 23:56:55 -07:00
Linux Build Service Account
71e7e17ea1 Merge "cfg80211: Add macros to indicate backport support for FILS" 2017-05-01 23:56:53 -07:00
Linux Build Service Account
8d3c81087c Merge "ASoC: msm: q6dspv2: fix APR deregistration logic in ASM during ADSP SSR" 2017-05-01 23:56:51 -07:00
Linux Build Service Account
25790febf2 Merge "defconfig: msm: add dcc config for perf on sdm660" 2017-05-01 23:56:50 -07:00
Linux Build Service Account
e575b75923 Merge "msm: pcie: switch GPIO to sleep state before asserting PERST" 2017-05-01 23:56:48 -07:00
Linux Build Service Account
1886bd0e4b Merge "msm: sde: Avoid use of uninitialized variable" 2017-05-01 23:56:47 -07:00
Fenglin Wu
2fc978c8b7 power_supply: Add REAL_TYPE power_supply_property
Add REAL_TYPE power_supply property to record the real time charger
type.

Change-Id: I5fb2e3e3e782bcac0f8dd6071a830bcf370ebbd4
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
2017-05-01 19:37:08 -07:00
Abhijeet Dharmapurikar
38d7ef50d6 qpnp-smb2: make qnovo vote for current and voltage
Currently the code simply enforces Qnovo's current and voltage bypassing
other voters. This is not desired. Make Qnovo vote via the FCC and FV
votables. The only other vote it should skip is the votes coming from
battery profile.

Change-Id: I5c794ea209a8ea2a61d834e2f619d7ccfd02fed9
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-01 19:37:07 -07:00
Ashay Jaiswal
1317ba7da7 qcom: qpnp-smb2: fix cleanup path
Fix the cleanup path of probe failure to make sure
all the resources get released in proper order.

Change-Id: Ie482c9856569ea708a8fa186049ab778a8e5be12
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-01 19:37:07 -07:00
Harry Yang
3ecadbc42f qcom: battery: Fix using stale votable pointers
The code flow between battery.c and smblib.c could end up with
stale references in smblib. This is when if pl_init fails for
some reason after creating the votables, while smblib obtains
references to them, those references become invalid.

Fix this by calling pl_init early in smb2 driver's probe such that if
it fails smb2 driver exits early.

Also change the name of pl_(de)init() functions to more appropriate
name - qcom_batt_(de)init().

Change-Id: I58f79d26e6cc8524e792a23185ff6fc8cfdffa75
Signed-off-by: Harry Yang <harryy@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-01 19:36:44 -07:00
Sudarshan Rajagopalan
edeb290f5d ARM: dts: msm: Add iommu coherent test device for msm8998
Added a new iommu test device which is dma-coherent. This
test device will be used for validating buffer coherency.

Change-Id: Iea1c57fd2cd5d71de2f26932d21cae8102fb918e
Signed-off-by: Sudarshan Rajagopalan <sudaraja@codeaurora.org>
2017-05-01 17:14:20 -07:00
Tony Truong
4501fe2b46 msm: pcie: switch GPIO to sleep state before asserting PERST
Before asserting PERST, PCIe bus driver should switch GPIO to
sleep state. This will prevent host from missing any events after
the link is off.

Change-Id: Ie57d339da02dde6cbb3c41d2be52ee0602227193
Signed-off-by: Tony Truong <truong@codeaurora.org>
2017-05-01 17:14:09 -07:00
Abhijeet Dharmapurikar
0f0e36134d smb138x: use chg src bit to disable parallel charger
smb1355 doesn't have any facility to suspend input. One has to
disable charging using the chg_en command bit.

So, when parallel charging needs to be disabled, configure
the charger to ignore the chg_en input pin and instead use the
command register. The command register is always programmed to
disable charging.

When parallel charging needs to be enabled, configure it to
follow the chg_en input pin.

This will work for both smb1355 and smb1381 parallel chargers.

Change-Id: I50294f40927641c2e0a7c7e4e7d263592086d3a9
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-01 14:43:19 -07:00
Abhijeet Dharmapurikar
9e2a6b5541 qpnp-smb2: don't stomp over D+/D- during hard reset
Currently when we are in hard reset, the driver requests to remove
the float of D+/D- when VBUS drops and once VBUS is back, it requests
to float D+/D- again. This behaviour ends up stomping over D+/D- lines
leading to noncompliance with PD spec.

Fix it by ensuring we only run the CC2 workaround while VBUS dips
in hard reset.

Change-Id: I2bb9364b890b3a227dd3ea3e0a34a415b600e21a
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-01 14:43:19 -07:00
Abhijeet Dharmapurikar
eae9df7833 qpnp-smb2: report main charger's share in its current_max
Currently main power supply reports the value of the input current limit
set on the usb path. This is incorrect, it should report its own
share. When parallel is disabled, it will end up reporting a value
close to current limit, rounded by 25mA steps.

Note that it should report INT_MAX when there is no limit set on
the ICL - the case for hvdcp chargers.

CRs-Fixed: 2037898
Change-Id: I9859f3d759644a08c6f762e929c471a41b1cdf8f
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-01 14:43:18 -07:00
Skylar Chang
a3488e9398 msm: ipa3: fix channel stop retry logic
Stopping a PROD channel might result in a timeout because the
channel is not empty, or IPA is busy. Whether or not to retry
a stop operation is determined by channel owner.
This change removes the common retry logic of retrying to stop
a PROD channel and adds a retry only for the scenario it is
actually needed.

Change-Id: I7ac1e81f7f99de2b0c3162aa5aaea2102a450838
CRs-Fixed: 2037955
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2017-05-01 12:18:40 -07:00
Vinayak Menon
c00be33263 defconfig: disable slub debug on sdm660
Disable default enablement of slub debug on sdm660
debug defconfig to prevent skb allocation failure
due to increase in order of allocation.

Change-Id: If63822a5abf3b297a34b95e5e5f973556631bd68
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2017-05-01 17:00:43 +05:30
Vinayak Menon
b41072b6f9 defconfig: enable uid stats on sdm660
'commit 6a61b529b4 ("ANDROID: uid_sys_stats: rename
uid_cputime.c to uid_sys_stats.c")' renamed CONFIG_UID_CPUTIME
to CONFIG_UID_SYS_STATS and enabled the new config on relevant
defconfigs except sdm660. Enable it and sync the config to
remove the reference to CONFIG_UID_CPUTIME. Task IO accounting
is enabled as CONFIG_UID_SYS_STATS depends on it.

Change-Id: Ib7163cf090c4fe86030469a257c49be1f6558984
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2017-05-01 16:59:44 +05:30
Vijay Viswanath
00229f96af mmc: cmdq_hci: Avoid releasing clock twice during DCMD error
When erase DCMD commands fail, a completion notification may get raised
by host controller for the task in addition to error interrupt. This
can result in the done function of mmc request getting called twice
and release the clock twice and mess up the clock request counter. The
done function should be called only once for DCMD commands except flush
commands.

Change-Id: Ie3a96e48ca98872cf686049eb5caa060f143f9cb
Signed-off-by: Vijay Viswanath <vviswana@codeaurora.org>
2017-05-01 02:05:53 -07:00
Vijay Viswanath
d212c508bd mmc: queue: Remove BUG_ON() in cmdq_thread
If any discard requests fails, the mmc driver should not cause kernel
panic. The error handling and informing block layer about error will be
done by completion context.

Change-Id: I0c88ad851ad12c392a557bcb94d3b21dfc62d1f8
Signed-off-by: Vijay Viswanath <vviswana@codeaurora.org>
2017-05-01 02:05:40 -07:00
Vidyullatha Kanchanapally
f179a6cfb7 cfg80211: Add macros to indicate backport support for FILS
This change adds two macros, one to indicate backport support for the
new connect done event which takes connection response parameters as a
structure instead of function arguments and the other macro is to
indicate backport support for FILS shared key authentication offload to
driver.

Change-Id: I6fb562741bb2abacbe1c7c7ffbf4b2afb25e555b
CRs-Fixed: 2028536
Signed-off-by: Vidyullatha Kanchanapally <vidyullatha@codeaurora.org>
2017-05-01 01:58:53 -07:00
Vidyullatha Kanchanapally
6ee553ab2e cfg80211: Add support for FILS shared key authentication offload
Enhance nl80211 and cfg80211 connect request and response APIs to
support FILS shared key authentication offload. The new nl80211
attributes can be used to provide additional information to the driver
to establish a FILS connection. Also enhance the set/del PMKSA to allow
support for adding and deleting PMKSA based on FILS cache identifier.

Add a new feature flag that drivers can use to advertize support for
FILS shared key authentication and association in station mode when
using their own SME.

Change-Id: I75d47301b767e691d6240fd6c20c28b9bfaaa571
Signed-off-by: Vidyullatha Kanchanapally <vkanchan@qti.qualcomm.com>
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-commit: a3caf7440dedd2399f90f27ff11ac390bf03e6c4
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
CRs-Fixed: 2028536
[vidyullatha@codeaurora.org: backport to kernel 4.4 - This commit includes
the changes from following commits in include/uapi/linux/nl80211.h to
compile for msm-4.4 -
4a4b8169501b18c3450ac735a7e277b24886a651 :
cfg80211: Accept multiple RSSI thresholds for CQM]
Signed-off-by: Vidyullatha Kanchanapally <vidyullatha@codeaurora.org>
2017-05-01 01:57:25 -07:00
Johannes Berg
6ea5a099d6 wireless: define cipher/AKM suites using a macro
The spec writes cipher/AKM suites as something like 00-0F-AC:9,
but the part after the colon isn't hex, it's decimal, so that
we've already had a few mistakes (in other code, or unmerged
patches) to e.g. write 0x000FAC10 instead of 0x000FAC0A.

Use a macro to avoid that problem.

Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-commit: 228c8c6b1f4376788e9d5ab00d50b10228eb40d3
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
CRs-Fixed: 2028536
Change-Id: I1507de1ee316182d429186ff33a932675013ba7d
Signed-off-by: Vidyullatha Kanchanapally <vidyullatha@codeaurora.org>
2017-05-01 01:56:46 -07:00
Vidyullatha Kanchanapally
283327c2a6 cfg80211: Use a structure to pass connect response params
Currently the connect event from driver takes all the connection
response parameters as arguments. With support for new features these
response parameters can grow. Use a structure to pass these parameters
rather than passing them as function arguments.

Signed-off-by: Vidyullatha Kanchanapally <vkanchan@qti.qualcomm.com>
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
[add to documentation]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-commit: 5349a0f7bfbdd7d81b8418c707dcd1439c714647
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
CRs-Fixed: 2028536
Change-Id: I340a96d052647f79248ef8aa2e0af2b6ba979b2d
Signed-off-by: Vidyullatha Kanchanapally <vidyullatha@codeaurora.org>
2017-05-01 01:53:03 -07:00
Linux Build Service Account
f1a10f1598 Merge "msm: kgsl: Perform cache operation with kernel address" 2017-05-01 00:11:58 -07:00
Linux Build Service Account
6e0bd9c66b Merge "mmc: core: Update the logic of controlling clk scaling through sysfs" 2017-05-01 00:11:58 -07:00
Saranya Chidura
d3f82b4f4c defconfig: msm: add dcc config for perf on sdm660
Add the DCC_CONFIG option in perf defconfig for SDM660
target.

Change-Id: I9f927176bcf4505cecc2c8b23a9a8c9896d45b3a
Signed-off-by: Saranya Chidura <schidura@codeaurora.org>
2017-05-01 11:27:06 +05:30
Arun KS
6a88558416 esoc: mdm-4x: Add support for mdm9x45 and apq8096
Add mdm_ops for mdm9x45 and apq8064.

Change-Id: Iea167175b9bd35a515d15a72897947a889093c03
Signed-off-by: Arun KS <arunks@codeaurora.org>
Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
2017-04-30 19:10:38 +05:30
Arun KS
fe1cc57aaf esoc: Add support for autoboot
Some of the external SoC are flash based and can boot independently.
Extend esoc driver to support such auto boot esocs.

This patch also adds support for primary esoc. Primary esoc are
esoc that control secondary esoc such as modems. Primary esoc have
control over reset/poweroff of secondary esoc. Secondary esoc don't
have control over reset/poweroff of primary esoc. In general modems
are considered as secondary esoc while apps processor is considered
as primary esoc.

Change-Id: Id02417fcd122ac108cf75d3381ee7955f0f8f783
Signed-off-by: Arun KS <arunks@codeaurora.org>
Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
2017-04-30 19:08:54 +05:30
Arun KS
5c846e4f7c esoc: Add err_fatal signal status to clink_ops
Auto_boot esoc devices can boot and crash before
esoc driver comes up. But there is no way for the
user space code to know that it has crashed by looking
at status line alone. Hence, create a new ioctl entry
to export status of err_fatal line to user space.

Change-Id: Ie7d6115c749d4c63f06aefca29ba457d38eccc7f
Signed-off-by: Arun KS <arunks@codeaurora.org>
2017-04-30 11:21:18 +05:30
Arun KS
98bc7be821 esoc: Fix integration with SSR driver
SSR driver expects subsystem descriptor device type to be
struct platform_device, whereas esoc driver is passing a
struct device instead. This results in a NULL pointer crash
during platform_get_irq in subsystem_restart.c. Fix esoc
driver to pass platform_device.

Change-Id: I93d02623cb7ac14ea3171c3792a4c52c73a74dea
Signed-off-by: Arun KS <arunks@codeaurora.org>
Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
2017-04-30 11:04:28 +05:30
Linux Build Service Account
1ccabf65ac Merge "ARM: dts: msm: move panel bindings to different msm8998 platforms" 2017-04-29 07:00:56 -07:00
Linux Build Service Account
586e3cc09b Merge "ARM: dts: msm: Remove I/O coherence for the GPU" 2017-04-29 07:00:55 -07:00
Linux Build Service Account
388991dd69 Merge "ARM: dts: msm: Change panel settings for sdm660 QRD" 2017-04-28 22:10:51 -07:00
Linux Build Service Account
fc78f267c8 Merge "ARM: dts: msm: control VCI register switch for rm67195" 2017-04-28 22:10:49 -07:00
Linux Build Service Account
eebdfc41ec Merge "drm/msm: Add explicit sync operations" 2017-04-28 22:10:48 -07:00
Linux Build Service Account
3e95a21f1f Merge "ASoC: qdsp6v2: Remove Eagle code" 2017-04-28 22:10:47 -07:00
Linux Build Service Account
6c740e8f93 Merge "Merge branch 'android-4.4@b834e92' into branch 'msm-4.4'" 2017-04-28 22:10:46 -07:00