Commit graph

582596 commits

Author SHA1 Message Date
Linux Build Service Account
259275d3a8 Merge "msm: mdss: dp: fix programming of audio ACR control" 2017-02-06 04:23:44 -08:00
Linux Build Service Account
fe1a2cd6f9 Merge "ARM: dts: msm: Change underflow color for truly/sharp wqxga panel" 2017-02-06 04:23:43 -08:00
Linux Build Service Account
9577ce3f81 Merge "msm: mdss: dp: fix hdcp data address" 2017-02-06 04:23:42 -08:00
Linux Build Service Account
d61bb96aff Merge "ARM: dts: msm: update recommended QOS vbif value for sdm660" 2017-02-06 04:23:41 -08:00
Linux Build Service Account
dc18c07931 Merge "msm: mdss: fix mdp vbif writeback qos settings" 2017-02-06 04:23:40 -08:00
Linux Build Service Account
bac30a06da Merge "msm: mdss: Fix 3D Mux when restoring from DSC on/off" 2017-02-06 04:23:39 -08:00
Linux Build Service Account
6dd32f6958 Merge "power: reset: Remove secure boot mode check" 2017-02-06 04:23:38 -08:00
Linux Build Service Account
2aad560e7a Merge " msm: ADSPRPC: Use correct method for static processes" 2017-02-06 04:23:38 -08:00
Linux Build Service Account
50c69dd9ec Merge "usb: dwc3: Add support to LPM L1 remote wakeup for ep0 endpoints" 2017-02-06 04:23:37 -08:00
Rama Krishna Phani A
9a21fb7096 ARM: dts: msm: Update Temperature sensor support for sdm630
Update SW temperature sensor mapping for sdm630 target.

Change-Id: Id1969171dff46b8bf7f78c823ed4d06ccc8369bc
Signed-off-by: Rama Krishna Phani A <rphani@codeaurora.org>
2017-02-06 03:55:12 -08:00
Rama Krishna Phani A
6d4519f691 thermal: tsens: Update sensor id for sdm630
Update sensor id flag for sdm630 such that thermal
client can obtain the HW ID for the available
temperature sensors (TSENS) with sensor ID details.

Change-Id: I70a1c7e4a420dc41591f021da499efe10b7fd6ae
Signed-off-by: Rama Krishna Phani A <rphani@codeaurora.org>
2017-02-06 17:21:53 +05:30
Rajesh Kemisetti
9ea3e6ff51 msm: kgsl: Add NULL check for kgsl_midframe before accessing it
in kgsl_pwrscale_init(), add missing NULL check for kgsl_midframe
to avoid further accessing, in case if memory is not available.

Change-Id: If6a4e59d4675fe67aefc63d7f8251f4d28ddeec5
Signed-off-by: Rajesh Kemisetti <rajeshk@codeaurora.org>
2017-02-06 16:31:19 +05:30
Rajesh Kemisetti
fa48f3ab62 ARM: dts: msm: Enable GPU NAP state on SDM660
Enable NAP state for A512 GPU to save power.

Change-Id: I3c643c90d39ab33c11146b5864b20c14bc9a339a
Signed-off-by: Rajesh Kemisetti <rajeshk@codeaurora.org>
2017-02-06 02:37:21 -08:00
Rajesh Kemisetti
ac6d567b7a msm: kgsl: Do required clock settings for SDM660 GPU
Enable retention of memory and periphery logics for
GPU core clock. If the setting is not done then GPU
might get stale data while switching from NAP to
ACTIVE and which leads to page faults or hangs.

Clock settings need to be handled by client drivers only
and hence do it in KGSL driver.

Change-Id: Iea3fd720e2a0eda9f6ee719177a8898bc2bd75e4
Signed-off-by: Rajesh Kemisetti <rajeshk@codeaurora.org>
2017-02-06 15:25:01 +05:30
Ashish Garg
c3a44d2d67 ARM: dts: msm: correct vote on ldo11 for vddio on sdm660
On sdm660, VDDIO needs 1.8V and LDO11 is voted for 1.88V
which is causing higher power numbers. Update the vote
correctly for LDO11.

Change-Id: Id6178d312394a4c4bebb77659f6eb7e21574137b
Signed-off-by: Ashish Garg <ashigarg@codeaurora.org>
2017-02-06 14:52:21 +05:30
Laxminath Kasam
b603bf6436 ASoC: msm: remove duplicate mixer control
WSA speaker controls fail to register due to
duplicate mix control. Remove duplicate control.

Change-Id: I276456493271c9425d1bbde57d381f899c1ee7ab
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-02-06 13:50:41 +05:30
Maulik Shah
9b1fcbc10e ARM: dts: msm: Add msm-core device for sdm630
Add msm-core device to run power and temperature
calculation on the cores.

Change-Id: I35045e2dd96d9bf498cf8889eadf0959b345884a
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
2017-02-06 12:01:53 +05:30
Linux Build Service Account
dd09cbba26 Merge "jbd2: Fix use after free in kjournald2()" 2017-02-05 20:53:36 -08:00
Linux Build Service Account
8233655f50 Merge "ARM: dts: msm: correct mdp settings of dma pipes for msm8998" 2017-02-05 20:53:35 -08:00
Linux Build Service Account
b5a8dd5d88 Merge "msm: mdss: add support to set the parent of DP pixel clock RCG" 2017-02-05 20:53:34 -08:00
Linux Build Service Account
11f41002e3 Merge "msm: mdss: dp: add support for DP PHY register offset property" 2017-02-05 20:53:33 -08:00
Linux Build Service Account
3e6913ada9 Merge "msm: mdss: Fix possible integer overflow" 2017-02-05 20:53:32 -08:00
Linux Build Service Account
cae1e1f5d1 Merge "msm: mdss: Enable dest_scaler support in mdp for sdm660" 2017-02-05 20:53:32 -08:00
Linux Build Service Account
bfa5884216 Merge "msm: sde: Avoid VBIF programming when SDE rotator is still busy" 2017-02-05 20:53:31 -08:00
Michal Kazior
4faa13b2ad cfg80211: export interface stopping function
This exports a new cfg80211_stop_iface() function.

This is intended for driver internal interface
combination management and channel switching.

Due to locking issues (it re-enters driver) the
call is asynchronous and uses cfg80211 event
list/worker.

CRs-Fixed: 1114710
Change-Id: I2784dc34b6a20fbe8697473e37cacf8edd35deca
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
Git-commit: f04c22033c
[rsirasan@codeaurora.org: Resolved merge conflicts]
Signed-off-by: Rajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>
2017-02-05 20:38:22 -08:00
Rajeev Kumar Sirasanagandla
e96faeafdc cfg80211: Do not disconnect on suspend
Qualcomm Technologies Inc vendor specific wlan driver (qcacld-3.0)
internally supports wow mode and is enabled by default.

Currently, cfg80211 subsystem and wpa_supplicant is not aware of
qcacld-3.0 internal support for wowlan, due to which wpa_supplicant
is issuing disconnect on suspend, resulting in wowlan failure.

To fix this, avoid disconnect on suspend.

CRs-Fixed: 2001614
Change-Id: I8e369fe61fd2715d2de9dcfb637ebb53f044b501
Signed-off-by: Rajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>
2017-02-06 10:00:20 +05:30
Sahitya Tummala
cd89945594 jbd2: Fix use after free in kjournald2()
Below is the synchronization issue between unmount and kjournald2
contexts, which results into use after free issue in kjournald2().
Fix this issue by using journal->j_state_lock to synchronize the
wait_event() done in journal_kill_thread() and the wake_up() done
in kjournald2().

TASK 1:
umount cmd:
   |--jbd2_journal_destroy() {
       |--journal_kill_thread() {
            write_lock(&journal->j_state_lock);
	    journal->j_flags |= JBD2_UNMOUNT;
	    ...
	    write_unlock(&journal->j_state_lock);
	    wake_up(&journal->j_wait_commit);	   TASK 2 wakes up here:
	    					   kjournald2() {
						     ...
						     checks JBD2_UNMOUNT flag and calls goto end-loop;
						     ...
						     end_loop:
						       write_unlock(&journal->j_state_lock);
						       journal->j_task = NULL; --> If this thread gets
						       pre-empted here, then TASK 1 wait_event will
						       exit even before this thread is completely
						       done.
	    wait_event(journal->j_wait_done_commit, journal->j_task == NULL);
	    ...
	    write_lock(&journal->j_state_lock);
	    write_unlock(&journal->j_state_lock);
	  }
       |--kfree(journal);
     }
}
						       wake_up(&journal->j_wait_done_commit); --> this step
						       now results into use after free issue.
						   }

Change-Id: I7487aff6f946544cfcfc38a9f28769be762e3969
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
2017-02-05 19:13:43 -08:00
Stanislaw Gruszka
0cf830b706 cfg80211/mac80211: disconnect on suspend
If possible that after suspend, cfg80211 will receive request to
disconnect what require action on interface that was removed during
suspend.

Problem can manifest itself by various warnings similar to below one:

WARNING: at net/mac80211/driver-ops.h:12 ieee80211_bss_info_change_notify+0x2f9/0x300 [mac80211]()
wlan0:  Failed check-sdata-in-driver check, flags: 0x4
Call Trace:
 [<c043e0b3>] warn_slowpath_fmt+0x33/0x40
 [<f83707c9>] ieee80211_bss_info_change_notify+0x2f9/0x300 [mac80211]
 [<f83a660a>] ieee80211_recalc_ps_vif+0x2a/0x30 [mac80211]
 [<f83a6706>] ieee80211_set_disassoc+0xf6/0x500 [mac80211]
 [<f83a9441>] ieee80211_mgd_deauth+0x1f1/0x280 [mac80211]
 [<f8381b36>] ieee80211_deauth+0x16/0x20 [mac80211]
 [<f8261e70>] cfg80211_mlme_down+0x70/0xc0 [cfg80211]
 [<f8264de1>] __cfg80211_disconnect+0x1b1/0x1d0 [cfg80211]

To fix the problem disconnect from any associated network before
suspend. User space is responsible to establish connection again
after resume. This basically need to be done by user space anyway,
because associated stations can go away during suspend (for example
NetworkManager disconnects on suspend and connect on resume by default).

Patch also handle situation when driver refuse to suspend with wowlan
configured and try to suspend again without it.

CRs-Fixed: 1114636
Change-Id: I6f2265a65dd47e3b127ba6236e4c9cf7ba77fc09
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
Git-commit: 8125696991
[rsirasan@codeaurora.org: Resolved merge conflicts]
Signed-off-by: Rajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>
2017-02-05 11:26:29 -08:00
Amir Samuelov
edd2fc9348 spcom: print error message on lock ion failure
Locking ION buffer should not fail, print error message if it happens.

Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
Change-Id: Ic67f69daa646712dd814f29d5aa0fc68386177e1
2017-02-05 04:11:51 -08:00
Padmanabhan Komanduru
76ec1e194d ARM: dts: msm: update the DT properties for display port on SDM660
Add the DT entries for clocks, PD PHY handle, logical to physical
lane map settings, DP PLL entries, Pinctrl settings and DP PHY AUX
settings for display port interface on SDM660.

Change-Id: I6fdf430cfe1664a74e4f8b452ac62cb0ce2075f4
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
Signed-off-by: Vishnuvardhan Prodduturi <vproddut@codeaurora.org>
2017-02-05 11:25:56 +05:30
Linux Build Service Account
2e47ba9a64 Merge "ARM: dts: msm: add Silver cluster MEM-ACC thresholds for msm8998v2" 2017-02-04 20:21:42 -08:00
Linux Build Service Account
0c43003cae Merge "soc: qcom: glink_smem_native_xprt: Add print for GFP_ATOMIC alloc fail" 2017-02-04 20:21:41 -08:00
Liam Mark
84386b6597 net: support __alloc_skb to always use GFP_DMA
This makes it possible to ensure that any clients which use
__alloc_skb always allocate memory from the DMA zone.

Change-Id: I3b399b8da113e38a050b0b3e81eeaec549253bb9
Signed-off-by: Liam Mark <lmark@codeaurora.org>
2017-02-04 01:10:40 -08:00
Linux Build Service Account
d1542a7257 Merge "clk: msm: clock-osm: support MEM-ACC threshold voltage for Silver cluster" 2017-02-03 22:59:40 -08:00
Linux Build Service Account
c1ff98eb33 Merge "diag: Do not close MHI channels when usb is disconnected" 2017-02-03 22:59:40 -08:00
Linux Build Service Account
b1615eab2b Merge "qcrypto: protect potential integer overflow." 2017-02-03 22:59:39 -08:00
Linux Build Service Account
6f9b57201a Merge "qpnp-fg-gen3: Linearize SOC during discharging in SOC masking algorithm" 2017-02-03 22:59:36 -08:00
Linux Build Service Account
cbfe05e69f Merge "qpnp-fg-gen3: Adjust recharge voltage to help SOC masking" 2017-02-03 22:59:35 -08:00
Sathish Ambley
63f127db63 msm: ADSPRPC: Use correct method for static processes
Use correct method to connect to static processes as the existing
method was used for dynamic process creation.

Change-Id: Id7f631560edd9b8e4e970baecdda50f7804991bd
Acked-by: Ashwini Patil <aapatil@qti.qualcomm.com>
Signed-off-by: Sathish Ambley <sathishambley@codeaurora.org>
2017-02-03 21:16:24 -08:00
Linux Build Service Account
b1c46e3dc3 Merge "msm: ipa3: Validate IPA and GSI firmwares before loading" 2017-02-03 14:56:17 -08:00
Linux Build Service Account
655b6272e6 Merge "soc: qcom: pil: Fix error case scenario in subsystem ramdump" 2017-02-03 14:56:16 -08:00
Linux Build Service Account
51e5b8276d Merge "ARM: dts: msm: add etm save restore nodes for sdm630" 2017-02-03 14:56:15 -08:00
Linux Build Service Account
b8845d4039 Merge "ARM: dts: msm: Enable UART for sdm630" 2017-02-03 14:56:14 -08:00
Linux Build Service Account
a080820a1b Merge "ARM: dts: msm: Add revid phandle to read FAB ID for PM660" 2017-02-03 14:56:13 -08:00
Linux Build Service Account
1b987b844b Merge "ARM: dts: msm: modify dcc ram size for sdm660" 2017-02-03 14:56:12 -08:00
Linux Build Service Account
318086fc43 Merge "ath10k: Populate HW params, WMI and HTT versions for WCN3990" 2017-02-03 14:56:12 -08:00
Sreelakshmi Gownipalli
837039b26f diag: Do not close MHI channels when usb is disconnected
Do not close MHI channels when usb is disconnected and a process
is running in memory device mode.

Change-Id: I043fc25542e432a9fa294d4f433945718b2e5878
Signed-off-by: Sreelakshmi Gownipalli <sgownipa@codeaurora.org>
2017-02-03 14:43:16 -08:00
David Collins
ce39257f1e regulator: qpnp-oledb-regulator: correct various coding style issues
Correct warnings flagged by checkpatch.  In particular, modify
the following:

 - Change variables of type 'unsigned' to 'unsigned int'.

 - Update the REGULATOR_QPNP_OLEDB Kconfig option.

Change-Id: I75f4a5868f98f7090baa0dc77da8923c1d789d3a
Signed-off-by: David Collins <collinsd@codeaurora.org>
2017-02-03 12:19:18 -08:00
David Collins
62869dea24 regulator: qpnp-lcdb-regulator: correct various coding style issues
Correct warnings flagged by checkpatch.  In particular, modify
the following:

 - Change variables of type 'unsigned' to 'unsigned int'.

 - Update the REGULATOR_QPNP_LCDB Kconfig option.

Change-Id: I9b9324f205481dd91f0db39f2c4ac309105cb556
Signed-off-by: David Collins <collinsd@codeaurora.org>
2017-02-03 12:19:17 -08:00
David Collins
decdf60c66 regulator: qpnp-labibb-regulator: correct various coding style issues
Correct warnings flagged by checkpatch.  In particular, modify
the following:

 - Add 'const' to the type of a struct of_device_id variable.

 - Remove unnecessary out-of-memory error messages.

 - Change variables of type 'unsigned' to 'unsigned int'.

 - Use variable name in sizeof() for devm_kzalloc() call.

 - Update the REGULATOR_QPNP_LABIBB Kconfig option.

Change-Id: Id98fed6b3c460d6f4282eab88cebdc8b2bd9bf2e
Signed-off-by: David Collins <collinsd@codeaurora.org>
2017-02-03 12:19:16 -08:00