Commit graph

582456 commits

Author SHA1 Message Date
Liam Mark
45cb559804 arm: dma-mapping: map_page map to nearest page
Since the page offset can be greater than the size of a page fix
arm_coherent_iommu_map_page so that it maps to nearest page
boundary.

This both prevents unnecessarily mapping memory we don’t need to
map and fixes a bug where the unmap wasn’t unmapping this extra
memory.

Change-Id: Iaa69aff7505ee75d1f2e69bb0cda814bc6211bd3
Signed-off-by: Liam Mark <lmark@codeaurora.org>
2017-02-06 14:03:48 -08:00
Linux Build Service Account
20e1ed9259 Merge "ASoC: sdm660-cdc: Add 4-mic DMIC support" 2017-02-06 04:23:53 -08:00
Linux Build Service Account
39dc977caf Merge "ASoC: msm: qdsp6v2: Add mixer controls for PRI/SEC TDM" 2017-02-06 04:23:52 -08:00
Linux Build Service Account
5f0c116c60 Merge "ARM: dts: msm: Add video support for SDM630" 2017-02-06 04:23:51 -08:00
Linux Build Service Account
979e8f753c Merge "ARM: dts: msm: Update venus clock cycles for SDM660" 2017-02-06 04:23:50 -08:00
Linux Build Service Account
c892e8fa89 Merge "cfg80211: export interface stopping function" 2017-02-06 04:23:48 -08:00
Linux Build Service Account
2511ad49fa Merge "spcom: print error message on lock ion failure" 2017-02-06 04:23:48 -08:00
Linux Build Service Account
58666f9527 Merge "defconfig: remove the cti config for perf of sdm660" 2017-02-06 04:23:47 -08:00
Linux Build Service Account
854146dae5 Merge "ARM: dts: msm: enable correct power sequence of smmu and mdss GDSCs" 2017-02-06 04:23:46 -08:00
Linux Build Service Account
46c51a37b4 Merge "msm: mdss: Do not apply bl scale if current back light is zero" 2017-02-06 04:23:45 -08:00
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
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
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
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
Laxminath Kasam
0328d8d137 ASoC: sdm660-cdc: Add 4-mic DMIC support
Add route map and mix controls to support 4 digital mics
in SDM660 internal codec.

Change-Id: Ida16a910961d01a57d7d03dd64b61ecd36bad37d
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-02-04 01:38:57 +05:30
Puja Gupta
c50f341bf3 soc: qcom: pil: Fix error case scenario in subsystem ramdump
During ramdump collection we assign memory to HLOS from subsystem for
non-secure pil. Whether ramdump collection is successful or not, we
should assign memory back to subsystem. This is to avoid access
violations in powerup path which happens after ramdump.

CRs-Fixed: 2002073
Change-Id: I7f1d42aebb44464fe077ca544ce91c2d7a8eefbb
Signed-off-by: Puja Gupta <pujag@codeaurora.org>
2017-02-03 10:57:38 -08:00
Chris Lew
fd7ce450ad soc: qcom: glink_smem_native_xprt: Add print for GFP_ATOMIC alloc fail
Add error message for GFP_ATOMIC allocation failure. Keep current
design to drop packet if allocation fails. This print will help debug
issues where a system critical client fails because of a dropped GLINK
packet.

CRs-Fixed: 1112151
Change-Id: I6a69cbf1f88295009284d726a06fa5affd4cc591
Signed-off-by: Chris Lew <clew@codeaurora.org>
2017-02-03 10:51:54 -08:00