Commit graph

582433 commits

Author SHA1 Message Date
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
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
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
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
Prasad Sodagudi
e709bdfc40 power: reset: Remove secure boot mode check
Debug policy of secure devices take care of nullifying
the ram dumps in secure boot mode. So no need to check
about secure boot mode in reboot driver to enable
download feature.

Change-Id: Idb5c93aca630f0093fccc2997bf50e7958dfbf54
Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
2017-02-03 08:45:09 -08:00
Rajeev Kumar Sirasanagandla
aa0bbc8456 ath10k: Populate HW params, WMI and HTT versions for WCN3990
firmware-5.bin file for WCN3990 contains just WMI and HTT versions and
firmware is loaded by PIL.

This change, populate the hw params for WCN3990 and parse
firmware-5.bin file for WMI and HTT versions.

CRs-Fixed: 2002151
Change-Id: Ic65d3696e9546fd428e608f4738e9fe53d61338f
Signed-off-by: Rajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>
2017-02-03 22:08:15 +05:30
Linux Build Service Account
147b2394be Merge "ARM: dts: msm: Add sdhc ice device node for sdm660" 2017-02-03 06:27:02 -08:00
Linux Build Service Account
7888c1e5c1 Merge "ARM: dts: msm: Add ufs ice device node for sdm660" 2017-02-03 06:27:01 -08:00
Linux Build Service Account
ac4d5daf02 Merge "ASoc: wcd-mbhc: correct handling of electrical interrupts" 2017-02-03 06:27:00 -08:00
Linux Build Service Account
4db174025d Merge "msm: qdsp6v2: set device channels on vocproc" 2017-02-03 06:26:59 -08:00
Linux Build Service Account
33d4486260 Merge "ASoC: msm: qdsp6v2: completely deallocate on cal block creation failure" 2017-02-03 06:26:58 -08:00
Linux Build Service Account
9ffdcf0122 Merge "drivers: soc: apr: create glink buffers dynamically" 2017-02-03 06:26:57 -08:00
Linux Build Service Account
7e9b695f04 Merge "ASoC: msm8998: enable ignore suspend flag for ANC" 2017-02-03 06:26:56 -08:00
Linux Build Service Account
376ee68bbf Merge "ALSA: pcm: fix blocking while loop in snd_pcm_update_hw_ptr0()" 2017-02-03 06:26:55 -08:00
Linux Build Service Account
49c12b3001 Merge "ARM: dts: msm: Add ufs support for SDM630" 2017-02-03 06:26:51 -08:00
Linux Build Service Account
359111c6f3 Merge "ARM: dts: msm: Add WCN3990 WLAN module device node for APQ8998" 2017-02-03 06:26:50 -08:00
Linux Build Service Account
4cdd068494 Merge "soc: qcom: glink_ssr: Set NULL after free" 2017-02-03 06:26:49 -08:00
Linux Build Service Account
ac0ef02816 Merge "iio: rradc: Update charger die temperature coefficients" 2017-02-03 06:26:48 -08:00
Linux Build Service Account
294fecd4b8 Merge "msm: ADSPRPC: Use domain information to open channels" 2017-02-03 06:26:47 -08:00
Linux Build Service Account
e8cc3a4e40 Merge "qcom: battery: reorganize creation of votables in SMB library" 2017-02-03 06:26:45 -08:00