summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-05-04Merge "btfm: Program multi channel registers in wcn3990 for Tx/Rx"Linux Build Service Account
2017-05-04Merge "regulator: onsemi-ncp6335d: Add is_enabled API support"Linux Build Service Account
2017-05-04Merge "drm/msm: Fix the SNAPSHOT_HEADER macro"Linux Build Service Account
2017-05-04Merge "fs/mbcache: fix use after free issue in mb_cache_shrink_scan()"Linux Build Service Account
2017-05-04Merge "ARM: dts: msm: Add batt_therm coefficients for QRD SDM660/630"Linux Build Service Account
2017-05-04Merge "qbt1000: Initialize drvdata structure before usage"Linux Build Service Account
2017-05-04Merge "qbt1000: Validate FP app name before qseecom_start_app"Linux Build Service Account
2017-05-04Merge "msm: mdss: Add plane_count range check in mdss WFD"Linux Build Service Account
2017-05-04Merge "msm: mdss: Add plane_count limit check for mdss_rotator buffer"Linux Build Service Account
2017-05-04Merge "ARM: dts: msm: enable SMMU stage1 for 11AD devices on msm8998"Linux Build Service Account
2017-05-04Merge "ASoC: msm: qdsp6v2: Add routing controls for fm over mi2s"Linux Build Service Account
2017-05-04Merge "ASoC: sdm660_cdc: Avoid unclocked register access to digital codec"Linux Build Service Account
2017-05-04Merge "msm: ipa3: configure WLAN resource group on connect"Linux Build Service Account
2017-05-04btfm: Program multi channel registers in wcn3990 for Tx/RxSatish Kodishala
For A2DP/SCO Rx, SCO/FM Tx use cases, we need to program multi channel registers. Without this there would be glitches and random silence during A2DP playback. While at it, add the function name to the debug print macro. CRs-Fixed: 2027268 Change-Id: Ia8e5fde48bb94e97346fe323e92dc32ed60b0e65 Signed-off-by: Satish Kodishala <skodisha@codeaurora.org>
2017-05-04regulator: onsemi-ncp6335d: Add is_enabled API supportKiran Gunda
Without is_enabled function support, regualtor framework treats it as an always on regulator and does not invoke the regulator enable function call. Hence, add support for it. Also, define a parent supply ("vin") for the regulator. This parent can be used to pin-control the regulator. While at it, change the initcall level to subsys_init. so that the driver registers after the parent supply ("vin" - provided by fixed-regualtor). Change-Id: I93e870d2e4b89f7874c3e17be91bc417dadf1777 Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-05-03Merge "drm/msm: Add preemption records to QTI GPU snapshot"Linux Build Service Account
2017-05-03Merge "msm: camera: ispif: extend interface with line width"Linux Build Service Account
2017-05-03Merge "msm: camera: Allow driver file to be opend only once."Linux Build Service Account
2017-05-03Merge "msm: camera2: cpp: Fix out-of-bounds frame or command buffer access"Linux Build Service Account
2017-05-03Merge "iommu/iommu-debug: Add validation support for per-buffer coherent ↵Linux Build Service Account
mappings"
2017-05-03Merge "Revert "smb138x: introduce support for smb1355""Linux Build Service Account
2017-05-03Merge "Revert "smb138x: use chg src bit to disable parallel charger""Linux Build Service Account
2017-05-03Merge "Merge branch 'android-4.4@e4528dd' into branch 'msm-4.4'"Linux Build Service Account
2017-05-03Merge "defconfigs: Sync up defconfigs"Linux Build Service Account
2017-05-03Merge "soc: qcom: minidump: move elf global variables to structure"Linux Build Service Account
2017-05-03Merge "soc: qcom: minidump: update error message log level"Linux Build Service Account
2017-05-03Merge "icnss: Initialize the structure member properly"Linux Build Service Account
2017-05-03Merge "regulator: onsemi-ncp6335d: Fix compilation issues"Linux Build Service Account
2017-05-03Merge "profiler: Reorder the bandwidth counter structure"Linux Build Service Account
2017-05-03qbt1000: Initialize drvdata structure before usageAbir Ghosh
Fix uninitialized local variable error which might have lead to crash. CRs-Fixed: 2030137 Change-Id: I3fd95cb343c3175e4190c8ebfe209399db0602a6 Signed-off-by: Abir Ghosh <abirg@codeaurora.org>
2017-05-03qbt1000: Terminate fingerprint TA name with nullAbir Ghosh
Terminate the string, coming from userspace and containing the name of fingerprint trusted app, with null character, to make sure kernel memory does not leak into logs Change-Id: I1668a64fcb6747ce3ef3b1ee6321fa5fa4a1798a CRs-Fixed: 2029409 Signed-off-by: Abir Ghosh <abirg@codeaurora.org>
2017-05-03qbt1000: Validate FP app name before qseecom_start_appAbir Ghosh
Validate the name of the client app before passing it to qseecom_start_app. CRs-Fixed: 2006695 Change-Id: I9c6b16050d4f6fc94827021c7b0f2ab292452f60 Signed-off-by: Abir Ghosh <abirg@codeaurora.org>
2017-05-04fs/mbcache: fix use after free issue in mb_cache_shrink_scan()Sahitya Tummala
Fix the below potential race between these two contexts - mb_cache_entry_get() and mb_cache_shrink_scan(), which results into use after free issue. task a: mb_cache_shrink_scan() |--if(!list_empty(&mb_cache_lru_list)) |--get the ce entry |--list_del_init(&ce->e_lru_list); |--check ce->e_used, ce->e_queued, ce->e_refcnt and continue -> gets prempted here task b: ext4_xattr_release_block() |--mb_cache_entry_get() |--get ce from hlist_bl_for_each_entry() |--increment ce->e_used and list_del_init(&ce->e_lru_list) |--mb_cache_entry_free() |--hlist_bl_lock(ce->e_block_hash_p); -> results into use after free Also, fix similar potential race between mb_cache_entry_alloc() and mb_cache_entry_get() in case if cache->c_max_entries is reached. Change-Id: I01049bae5d914cfb8494ab299ec2e068745d1110 Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
2017-05-03ARM: dts: msm: Add batt_therm coefficients for QRD SDM660/630Yingwei Zhao
Configure battery thermal coefficients for QRD660/630 to make sure the device could read the correct battery temperatures. CRs-Fixed: 2038922 Change-Id: I21d0eedfec0a0529d8864d11b703659f4ba43b6a Signed-off-by: Yingwei Zhao <cyizhao@codeaurora.org>
2017-05-03Revert "smb138x: introduce support for smb1355"Abhijeet Dharmapurikar
This reverts commit 566b44214cc08786375ac8266ee387e431413078 (smb138x: introduce support for smb1355). This is not required since smb1355 support is moved to its own driver. Change-Id: Ibad8595c09a865e273adb6f30d6a75f931220131 Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-03Revert "smb138x: use chg src bit to disable parallel charger"Abhijeet Dharmapurikar
This reverts commit 0f0e36134d8a1082f099d543a122cd10d777beda ("smb138x: use chg src bit to disable parallel charger) This is not required, since smb1355 support is moved to its own driver. Change-Id: I1bd454030d29195f03be132d167ec8294169b9d5 Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-03qpnp-smb2: Support faking input current limited stateAbhijeet Dharmapurikar
Support faking input current limited state. This is very helpful in testing/debugging the software based vbus changing algorithms. Change-Id: I7cf548c94397ee680c9d65343c49ec7b16873e88 Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-03power: qcom: smb2: Add REAL_TYPE property for usb power_supplyFenglin Wu
Add POWER_SUPPLY_PROP_REAL_TYPE property for usb_psy to present its real charger type. POWER_SUPPLY_PROP_TYPE in usb_psy is always set to POWER_SUPPLY_TYPE_USB_PD for healthd to recognize it as an AC charger. Also add usb_port_psy with POWER_SUPPLY_TYPE_USB type is added for healthd to recognize it as an USB host. Their ONLINE properties will be updated according to the VBUS status, type-c mode and real charger type. With this type being set statically, update the usb phy and pd policy engine code to look at real type. Change-Id: I90aa69325cc82b09dfb513c0eeecbc61e092a57f Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org> Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-03soc: qcom: minidump: move elf global variables to structureLingutla Chandrasekhar
Current driver implementation uses global variables to create minidump elf header. Move all elf global variables into a structure, and also replace 'msm_minidump_enabled' API with 'minidump_enabled' global variable. And also add minidump_table address in elf, which would be useful for parsers to get memory dump table addresses without vmlinux symbols. Change-Id: I8829d88ce234179f429ae9537a3582df794c2cdf Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
2017-05-03soc: qcom: minidump: fix logic checks in elf traversalsLingutla Chandrasekhar
Fix logical checks in minidump elf traversal functions. Change-Id: I649fc9ae66d616982a61f71f66f2abe378212660 Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
2017-05-03soc: qcom: minidump: update error message log levelLingutla Chandrasekhar
Current implementation uses pr_info to print error messages. Update driver prints log level with pr_err instead of pr_info, and also update with proper error number for minidump table update failure return. Change-Id: I27667715c71b361b9ee0f7856c94242d3ca21014 Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
2017-05-03defconfigs: Sync up defconfigsStephen Boyd
We recently renamed CONFIG_UID_CPUTIME, but didn't update all the defconfigs. Change-Id: Ic52f904d6ada3d0e32a8278ec95f7b34b29f96b9 Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2017-05-03ASoC: msm: qdsp6v2: Add routing controls for fm over mi2sLaxminath Kasam
When routing FM over MI2S, add support for required port mixer controls. CRs-Fixed: 2034932 Change-Id: I04e08ae8f876fe08390b3dae96d4522c2546fb32 Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-05-03ASoC: sdm660_cdc: Avoid unclocked register access to digital codecLaxminath Kasam
In particular SSR scenario, digital codec access happens without clock enabled. While SSR down event notification in progress, APR driver blocks request to DSP to enable clock since APR already received down event. regmap access to digital codec register results in AHB timeout error. If DSP clock enable request fails, set the regmap access cache only mode to avoid any register access. CRs-Fixed: 2034468 Change-Id: Id1141339d2673920167ed7ac74b13b6fee05173f Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-05-03Merge "net: wireless: Update regdb for 60G band"Linux Build Service Account
2017-05-03Merge "mmc: core: Use mmc_reset instead of power_restore"Linux Build Service Account
2017-05-03Merge "mmc: core: Do regular power cycle when lacking eMMC HW reset support"Linux Build Service Account
2017-05-03Merge "ASoC: sdm660_cdc: Update volatile register set for cache bypass"Linux Build Service Account
2017-05-03Merge "ASoC: msm: qdspv2: add result check when audio process fail"Linux Build Service Account
2017-05-03Merge "defconfig: msm8998: Enable MHI related drivers"Linux Build Service Account