OSDN Git Service
Derek Chen [Mon, 17 Apr 2017 20:35:03 +0000 (16:35 -0400)]
ARM: dts: msm: move tdm common prop to parent node
Move tdm common properties from child node to parent
for msm8996 automotive adp/cdp/dragonboard platforms.
CRs-fixed:
2034655
Change-Id: I861f221d0cdd47d9748b0ab6f9dee986a9776e87
Signed-off-by: Derek Chen <chenche@codeaurora.org>
Karthikeyan Mani [Mon, 27 Feb 2017 22:24:20 +0000 (14:24 -0800)]
ASoC: msm: qdsp6v2: Add TDM master slave select setting
Add TDM clock id setting in TDM parent node to
select between IBIT and EBIT for TDM operation.
Move dtsi entries from child to parent that are
common to the group.
CRs-fixed:
1116515
Change-Id: I663eb926818c2aae1eaea8c78bdc0a973ecd0ae3
Signed-off-by: Karthikeyan Mani <kmani@codeaurora.org>
Linux Build Service Account [Thu, 4 May 2017 06:32:11 +0000 (23:32 -0700)]
Merge "drm/msm: Add preemption records to QTI GPU snapshot"
Linux Build Service Account [Thu, 4 May 2017 06:32:10 +0000 (23:32 -0700)]
Merge "msm: camera: ispif: extend interface with line width"
Linux Build Service Account [Thu, 4 May 2017 06:32:09 +0000 (23:32 -0700)]
Merge "msm: camera: Allow driver file to be opend only once."
Linux Build Service Account [Thu, 4 May 2017 06:32:07 +0000 (23:32 -0700)]
Merge "msm: camera2: cpp: Fix out-of-bounds frame or command buffer access"
Linux Build Service Account [Thu, 4 May 2017 06:32:06 +0000 (23:32 -0700)]
Merge "iommu/iommu-debug: Add validation support for per-buffer coherent mappings"
Linux Build Service Account [Thu, 4 May 2017 06:31:51 +0000 (23:31 -0700)]
Merge "Revert "smb138x: introduce support for smb1355""
Linux Build Service Account [Thu, 4 May 2017 06:31:50 +0000 (23:31 -0700)]
Merge "Revert "smb138x: use chg src bit to disable parallel charger""
Linux Build Service Account [Thu, 4 May 2017 06:31:49 +0000 (23:31 -0700)]
Merge "Merge branch 'android-4.4@
e4528dd' into branch 'msm-4.4'"
Linux Build Service Account [Thu, 4 May 2017 06:31:47 +0000 (23:31 -0700)]
Merge "defconfigs: Sync up defconfigs"
Linux Build Service Account [Thu, 4 May 2017 06:31:45 +0000 (23:31 -0700)]
Merge "soc: qcom: minidump: move elf global variables to structure"
Linux Build Service Account [Thu, 4 May 2017 06:31:44 +0000 (23:31 -0700)]
Merge "soc: qcom: minidump: update error message log level"
Linux Build Service Account [Thu, 4 May 2017 06:31:13 +0000 (23:31 -0700)]
Merge "icnss: Initialize the structure member properly"
Linux Build Service Account [Thu, 4 May 2017 06:31:08 +0000 (23:31 -0700)]
Merge "regulator: onsemi-ncp6335d: Fix compilation issues"
Linux Build Service Account [Thu, 4 May 2017 06:31:07 +0000 (23:31 -0700)]
Merge "profiler: Reorder the bandwidth counter structure"
Abhijeet Dharmapurikar [Wed, 3 May 2017 01:05:48 +0000 (18:05 -0700)]
Revert "smb138x: introduce support for smb1355"
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>
Abhijeet Dharmapurikar [Wed, 3 May 2017 01:04:54 +0000 (18:04 -0700)]
Revert "smb138x: use chg src bit to disable parallel charger"
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>
Abhijeet Dharmapurikar [Tue, 2 May 2017 03:00:25 +0000 (20:00 -0700)]
qpnp-smb2: Support faking input current limited state
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>
Fenglin Wu [Tue, 25 Apr 2017 13:45:08 +0000 (21:45 +0800)]
power: qcom: smb2: Add REAL_TYPE property for usb power_supply
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>
Lingutla Chandrasekhar [Tue, 25 Apr 2017 15:36:56 +0000 (21:06 +0530)]
soc: qcom: minidump: move elf global variables to structure
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>
Lingutla Chandrasekhar [Wed, 3 May 2017 09:22:45 +0000 (14:52 +0530)]
soc: qcom: minidump: fix logic checks in elf traversals
Fix logical checks in minidump elf traversal functions.
Change-Id: I649fc9ae66d616982a61f71f66f2abe378212660
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
Lingutla Chandrasekhar [Tue, 25 Apr 2017 15:12:10 +0000 (20:42 +0530)]
soc: qcom: minidump: update error message log level
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>
Stephen Boyd [Fri, 28 Apr 2017 19:09:45 +0000 (12:09 -0700)]
defconfigs: Sync up defconfigs
We recently renamed CONFIG_UID_CPUTIME, but didn't update all the
defconfigs.
Change-Id: Ic52f904d6ada3d0e32a8278ec95f7b34b29f96b9
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Linux Build Service Account [Wed, 3 May 2017 10:42:43 +0000 (03:42 -0700)]
Merge "net: wireless: Update regdb for 60G band"
Linux Build Service Account [Wed, 3 May 2017 10:42:41 +0000 (03:42 -0700)]
Merge "mmc: core: Use mmc_reset instead of power_restore"
Linux Build Service Account [Wed, 3 May 2017 10:42:41 +0000 (03:42 -0700)]
Merge "mmc: core: Do regular power cycle when lacking eMMC HW reset support"
Linux Build Service Account [Wed, 3 May 2017 10:42:40 +0000 (03:42 -0700)]
Merge "ASoC: sdm660_cdc: Update volatile register set for cache bypass"
Linux Build Service Account [Wed, 3 May 2017 10:42:39 +0000 (03:42 -0700)]
Merge "ASoC: msm: qdspv2: add result check when audio process fail"
Linux Build Service Account [Wed, 3 May 2017 10:42:38 +0000 (03:42 -0700)]
Merge "defconfig: msm8998: Enable MHI related drivers"
Linux Build Service Account [Wed, 3 May 2017 10:42:37 +0000 (03:42 -0700)]
Merge "tty: serial: msm: Move request_irq to the end of startup"
Kiran Gunda [Wed, 3 May 2017 06:05:28 +0000 (11:35 +0530)]
regulator: onsemi-ncp6335d: Fix compilation issues
Fix the compilation issue seen due to the regulator framework
changes from 3.10 to 4.4 kernel. Also remove the redundant error
messages during the memory allocation failures.
Change-Id: I4887c2d3acaff562fb41e6c2eaeb2c1ef2c1bde5
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
Lingutla Chandrasekhar [Mon, 1 May 2017 08:40:21 +0000 (14:10 +0530)]
defconfig: msm: perf: disable cache dumps support
During Mini dump collection, cache dump needs extra memory
and time hence disable it in perf builds.
Change-Id: I68aae6edf676c27b8443fdcc88ece05fa3a26748
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
Hardik Kantilal Patel [Wed, 3 May 2017 08:31:16 +0000 (14:01 +0530)]
icnss: Initialize the structure member properly
After cold boot calibration WLAN FW send pin connect result to
platform driver through qmi indication message. To avoid uninitialized
access of pin connect result structure member initialize it properly.
CRs-Fixed:
2042000
Change-Id: I5654583e890f9ee67ddcc632aecd9ecb8a160062
Signed-off-by: Hardik Kantilal Patel <hkpatel@codeaurora.org>
Sharat Masetty [Mon, 1 May 2017 06:45:22 +0000 (12:15 +0530)]
drm/msm: Add preemption records to QTI GPU snapshot
This patch helps dump the full 64k per ring preemption
record to GPU snapshot which is collected during GPU
recovery step. We use the general object snapshot section
type to store these records and we only collect the preemption
records if preemption was going to kick in, which is when
the number of rings is greater than one.
Change-Id: I1872bc14c6b39c8c4963ce9c98e96b03cbfec907
Signed-off-by: Sharat Masetty <smasetty@codeaurora.org>
Sayali Lokhande [Mon, 24 Apr 2017 08:10:50 +0000 (13:40 +0530)]
mmc: core: Use mmc_reset instead of power_restore
On 4.4 kernel, 'commit
364549ddc29d ("mmc: core: Remove
redundant ->power_restore() callback for MMC")' removed
power_restore callback for MMC since mmc_reset is
implemented. Hence use reset instead of power_restore in
mmc_cmdq_hw_reset. Also modify the caller function mmc_cmdq_hw_reset
to properly use the mmc_reset.
Change-Id: Ia06d579401b6a083b164dff7a253d1eb3caef1a3
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
Signed-off-by: Vijay Viswanath <vviswana@codeaurora.org>
Gwendal Grignou [Fri, 1 Apr 2016 23:04:22 +0000 (16:04 -0700)]
mmc: core: Do regular power cycle when lacking eMMC HW reset support
The eMMC HW reset may be implemented either via the host ops ->hw_reset()
callback or through DT and the eMMC pwrseq. Additionally some eMMC cards
don't support HW reset.
To allow a reset to be done for the different combinations of mmc hosts
and eMMC/MMC cards, let's implement a fallback via trying a regular power
cycle. This improves the mmc block layer retry mechanism of failing I/O
requests.
Change-Id: I5cafd54327cde22ea9599543382f1b294272a42c
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
[Ulf: Rewrote changelog]
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Git-commit:
4e6c71788d6bb0e5438fc9211fa6e52dcca01474
Git-repo: git://git.linaro.org/people/ulf.hansson/mmc.git
[vviswana@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Vijay Viswanath <vviswana@codeaurora.org>
Anirudh Ghayal [Tue, 2 May 2017 10:45:27 +0000 (16:15 +0530)]
drivers: regulator: Add snapshot of OnSemi NCP6335D regulator
This is snapshot of the OnSemi NCP6335D driver as of msm-3.10
'commit
156ba1726643 ("regulator: onsemi-ncp6335d: Add i2c retry logic")'.
Change-Id: I4cf0acd272fcf498462d4397385cd62f144eadf8
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
Linux Build Service Account [Wed, 3 May 2017 02:30:29 +0000 (19:30 -0700)]
Merge "tty: serial: msm: fix potential race b/w startup and irq handling"
Linux Build Service Account [Wed, 3 May 2017 02:30:28 +0000 (19:30 -0700)]
Merge "msm: ipa3: fix a race condition on clock vote from suspend"
Linux Build Service Account [Wed, 3 May 2017 02:30:27 +0000 (19:30 -0700)]
Merge "fs: ecryptfs: Cache to be cleared after file write"
Linux Build Service Account [Wed, 3 May 2017 02:30:26 +0000 (19:30 -0700)]
Merge "msm: ipa: Add mutext protection when updating notify req cache"
Linux Build Service Account [Wed, 3 May 2017 02:30:19 +0000 (19:30 -0700)]
Merge "msm: camera: Fix NULL pointer dereference in msm_vb2.c."
Sujeev Dias [Tue, 2 May 2017 23:12:20 +0000 (16:12 -0700)]
defconfig: msm8998: Enable MHI related drivers
MHI host and related drivers provide communication between
host and external modem. Enable it.
CRs-Fixed:
2041725
Change-Id: I1fbdfa7f17d158c1b6a33eb14497add495454bd1
Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
Sudarshan Rajagopalan [Wed, 5 Apr 2017 02:10:06 +0000 (19:10 -0700)]
iommu/iommu-debug: Add validation support for per-buffer coherent mappings
Added new debugfs files/nodes to perform basic validation of the
per-buffer IO coherent dma-mapping that was recently implemented.
Also, added a node to print out the PTE for a given IOVA.
Nodes added:
dma_attach
dma_map
dma_unmap
dma_atos
virt_addr
pte
Change-Id: I041ab5f4e37e50dd3f58e2def3fdd3125a60629c
Signed-off-by: Sudarshan Rajagopalan <sudaraja@codeaurora.org>
Linux Build Service Account [Tue, 2 May 2017 16:07:43 +0000 (09:07 -0700)]
Merge "ASoC: msm: qdsp6v2: Clear pass-through mode on routing close"
Linux Build Service Account [Tue, 2 May 2017 16:07:42 +0000 (09:07 -0700)]
Merge "ASoC: msm-lsm-client: use kzalloc instead of kmalloc"
Linux Build Service Account [Tue, 2 May 2017 16:07:41 +0000 (09:07 -0700)]
Merge "icnss: remove pre-alloc memory leak check in platform driver"
Linux Build Service Account [Tue, 2 May 2017 16:07:40 +0000 (09:07 -0700)]
Merge "Merge remote-tracking branch 'remotes/quic/dev/msm-4.4-8996au' into msm-4.4"
Linux Build Service Account [Tue, 2 May 2017 16:07:38 +0000 (09:07 -0700)]
Merge "input: synaptics: fix for buggy code poined by SIL tool"
Linux Build Service Account [Tue, 2 May 2017 16:07:37 +0000 (09:07 -0700)]
Merge "usb: gadget: MIDI: Add support for SuperSpeed enumeration"
Linux Build Service Account [Tue, 2 May 2017 16:07:36 +0000 (09:07 -0700)]
Merge "diag: Open glink channels in workqueue context"
Linux Build Service Account [Tue, 2 May 2017 16:07:35 +0000 (09:07 -0700)]
Merge "clk: Add support to dump state of all clocks into ftrace"
Linux Build Service Account [Tue, 2 May 2017 16:07:35 +0000 (09:07 -0700)]
Merge "SDM660: ADSPRPC: Align the size of IOVA to 128MB"
Linux Build Service Account [Tue, 2 May 2017 16:07:32 +0000 (09:07 -0700)]
Merge "esoc: mdm-4x: Separate out callback function for 9x45"
Linux Build Service Account [Tue, 2 May 2017 16:07:32 +0000 (09:07 -0700)]
Merge "ARM: dts: msm: Add support mdm9x45 external modem"
Linux Build Service Account [Tue, 2 May 2017 16:07:31 +0000 (09:07 -0700)]
Merge "esoc: Add provision to handle shutdown request in userspace"
Linux Build Service Account [Tue, 2 May 2017 16:07:30 +0000 (09:07 -0700)]
Merge "soc: qcom: ssr: Add option to relax on ssr failures"
Linux Build Service Account [Tue, 2 May 2017 16:07:18 +0000 (09:07 -0700)]
Merge "msm/drm: Move msm_drm_config configuration into the GPUs"
Blagovest Kolenichev [Tue, 2 May 2017 13:15:44 +0000 (06:15 -0700)]
Merge branch 'android-4.4@
e4528dd' into branch 'msm-4.4'
* refs/heads/tmp-
e4528dd:
Linux 4.4.65
perf/core: Fix concurrent sys_perf_event_open() vs. 'move_group' race
ping: implement proper locking
staging/android/ion : fix a race condition in the ion driver
vfio/pci: Fix integer overflows, bitmask check
tipc: check minimum bearer MTU
netfilter: nfnetlink: correctly validate length of batch messages
xc2028: avoid use after free
mnt: Add a per mount namespace limit on the number of mounts
tipc: fix socket timer deadlock
tipc: fix random link resets while adding a second bearer
gfs2: avoid uninitialized variable warning
hostap: avoid uninitialized variable use in hfa384x_get_rid
tty: nozomi: avoid a harmless gcc warning
tipc: correct error in node fsm
tipc: re-enable compensation for socket receive buffer double counting
tipc: make dist queue pernet
tipc: make sure IPv6 header fits in skb headroom
ANDROID: uid_sys_stats: fix access of task_uid(task)
BACKPORT: f2fs: sanity check log_blocks_per_seg
Linux 4.4.64
tipc: fix crash during node removal
block: fix del_gendisk() vs blkdev_ioctl crash
x86, pmem: fix broken __copy_user_nocache cache-bypass assumptions
hv: don't reset hv_context.tsc_page on crash
Drivers: hv: balloon: account for gaps in hot add regions
Drivers: hv: balloon: keep track of where ha_region starts
Tools: hv: kvp: ensure kvp device fd is closed on exec
kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd
x86/mce/AMD: Give a name to MCA bank 3 when accessed with legacy MSRs
powerpc/kprobe: Fix oops when kprobed on 'stdu' instruction
ubi/upd: Always flush after prepared for an update
mac80211: reject ToDS broadcast data frames
mmc: sdhci-esdhc-imx: increase the pad I/O drive strength for DDR50 card
ACPI / power: Avoid maybe-uninitialized warning
Input: elantech - add Fujitsu Lifebook E547 to force crc_enabled
VSOCK: Detach QP check should filter out non matching QPs.
Drivers: hv: vmbus: Reduce the delay between retries in vmbus_post_msg()
Drivers: hv: get rid of timeout in vmbus_open()
Drivers: hv: don't leak memory in vmbus_establish_gpadl()
s390/mm: fix CMMA vs KSM vs others
CIFS: remove bad_network_name flag
cifs: Do not send echoes before Negotiate is complete
ring-buffer: Have ring_buffer_iter_empty() return true when empty
tracing: Allocate the snapshot buffer before enabling probe
KEYS: fix keyctl_set_reqkey_keyring() to not leak thread keyrings
KEYS: Change the name of the dead type to ".dead" to prevent user access
KEYS: Disallow keyrings beginning with '.' to be joined as session keyrings
ANDROID: sdcardfs: Call lower fs's revalidate
ANDROID: sdcardfs: Avoid setting GIDs outside of valid ranges
ANDROID: sdcardfs: Copy meta-data from lower inode
Revert "Revert "Android: sdcardfs: Don't do d_add for lower fs""
ANDROID: sdcardfs: Use filesystem specific hash
ANDROID: AVB error handler to invalidate vbmeta partition.
ANDROID: Update init/do_mounts_dm.c to the latest ChromiumOS version.
Revert "[RFC]cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions"
Conflicts:
drivers/md/Makefile
Change-Id: I8f5ed53cb8b6cc66914f10c6ac820003b87b8759
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Neeraj Upadhyay [Wed, 26 Apr 2017 05:07:15 +0000 (10:37 +0530)]
tty: serial: msm: fix potential race b/w startup and irq handling
There is a potential race for tx/rx dma requests between
msm_startup() and irq handling, for cases where dmas are not
available. This results in irq path trying to do dma mapping,
resulting in data abort. For example, consider below scenario
where rx handler reads the intermediate value of dma->chan,
set in msm_request_rx_dma(), and tries to do dma mapping,
which results in data abort.
uart_port_startup()
msm_startup()
request_irq()
...
msm_request_rx_dma()
...
dma->chan = dma_request_slave_channel_reason(dev, "rx");
<UART RX IRQ>
msm_uart_irq()
msm_handle_rx_dm()
msm_start_rx_dma()
dma->desc = dma_map_single()
<data abort>
Change-Id: Icf5d48f2718c3c6a855ffd3d10988a93f8281d78
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Neeraj Soni [Tue, 2 May 2017 10:02:48 +0000 (15:32 +0530)]
fs: ecryptfs: Cache to be cleared after file write
This ensures that caches are maintained and no stale
data is present.
Change-Id: Ie8e92197a5a4179d422a523d3d6dad48bdf0b5d2
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
Andrew Chant [Fri, 31 Mar 2017 10:03:48 +0000 (15:33 +0530)]
input: synaptics: fix for buggy code poined by SIL tool
Place file offset validity checks under mutex for
synaptics_dsx_rmi_dev.c touch driver.
Git-repo: https://android.googlesource.com/kernel/msm
Git-commit:
e1fb1600fc222337989e3084d68df929882deae5
Change-Id: I2c32babbccb483547204cb2843973abf97e988a5
Signed-off-by: Andrew Chant <achant@google.com>
[srkupp@codeaurora.org: This change is a fix for buggy
code pointed by sil after merging the above commit.}
Signed-off-by: Srinivasa Rao Kuppala <srkupp@codeaurora.org>
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
Linux Build Service Account [Tue, 2 May 2017 06:57:09 +0000 (23:57 -0700)]
Merge "drm/msm: Add PLL_DELTA property to HDMI connector"
Linux Build Service Account [Tue, 2 May 2017 06:57:08 +0000 (23:57 -0700)]
Merge "ARM: dts: msm: Set 1.848V as the minimum voltage for LDO24 on msm8998"
Linux Build Service Account [Tue, 2 May 2017 06:57:05 +0000 (23:57 -0700)]
Merge "power_supply: Add REAL_TYPE power_supply_property"
Linux Build Service Account [Tue, 2 May 2017 06:57:04 +0000 (23:57 -0700)]
Merge "qpnp-smb2: make qnovo vote for current and voltage"
Linux Build Service Account [Tue, 2 May 2017 06:57:04 +0000 (23:57 -0700)]
Merge "qcom: qpnp-smb2: fix cleanup path"
Linux Build Service Account [Tue, 2 May 2017 06:57:03 +0000 (23:57 -0700)]
Merge "qcom: battery: Fix using stale votable pointers"
Linux Build Service Account [Tue, 2 May 2017 06:57:02 +0000 (23:57 -0700)]
Merge "ARM: dts: msm: Add iommu coherent test device for msm8998"
Linux Build Service Account [Tue, 2 May 2017 06:57:02 +0000 (23:57 -0700)]
Merge "msm: ipa3: fix channel stop retry logic"
Linux Build Service Account [Tue, 2 May 2017 06:57:01 +0000 (23:57 -0700)]
Merge "ARM: boot: Silence 'zimage-dtb is ready' message"
Linux Build Service Account [Tue, 2 May 2017 06:56:58 +0000 (23:56 -0700)]
Merge "esoc: mdm-4x: Add support for mdm9x45 and apq8096"
Linux Build Service Account [Tue, 2 May 2017 06:56:57 +0000 (23:56 -0700)]
Merge "defconfig: disable slub debug on sdm660"
Linux Build Service Account [Tue, 2 May 2017 06:56:56 +0000 (23:56 -0700)]
Merge "mmc: cmdq_hci: Avoid releasing clock twice during DCMD error"
Linux Build Service Account [Tue, 2 May 2017 06:56:54 +0000 (23:56 -0700)]
Merge "cfg80211: Add macros to indicate backport support for FILS"
Linux Build Service Account [Tue, 2 May 2017 06:56:52 +0000 (23:56 -0700)]
Merge "ASoC: msm: q6dspv2: fix APR deregistration logic in ASM during ADSP SSR"
Linux Build Service Account [Tue, 2 May 2017 06:56:51 +0000 (23:56 -0700)]
Merge "defconfig: msm: add dcc config for perf on sdm660"
Linux Build Service Account [Tue, 2 May 2017 06:56:49 +0000 (23:56 -0700)]
Merge "msm: pcie: switch GPIO to sleep state before asserting PERST"
Linux Build Service Account [Tue, 2 May 2017 06:56:48 +0000 (23:56 -0700)]
Merge "msm: sde: Avoid use of uninitialized variable"
Ajay Agarwal [Wed, 26 Apr 2017 05:24:12 +0000 (10:54 +0530)]
usb: gadget: MIDI: Add support for SuperSpeed enumeration
Currently MIDI function supports only upto HighSpeed
enumeration. Add descriptors for SuperSpeed mode
and bind them to enable SuperSpeed enumeration of
USB MIDI function.
Change-Id: I0451dabf91e88503ab588dadbfbe6a2b76e2351b
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Tharun Kumar Merugu [Thu, 27 Apr 2017 12:13:27 +0000 (17:43 +0530)]
SDM660: ADSPRPC: Align the size of IOVA to 128MB
Align the size of the IOVA that is being passed
in the arm_iommu_create_mapping() to 128MB.
Change-Id: Ia554c2157d6c46b2f3848f993a7e61ff7f029547
Acked-by: Chenna Kesava Raju <chennak@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
Hardik Kantilal Patel [Thu, 27 Apr 2017 06:25:45 +0000 (11:55 +0530)]
icnss: remove pre-alloc memory leak check in platform driver
The WLAN host driver is allocating the memory from pre-alloc pool
during insmod/wlan start up before WLAN driver register and
release the pre-alloc memory after driver unregister/remove.
The Pre-alloc memory leak check and reset in Icnss platform driver
on probe failure and after remove will leads to invalid memory
leak stat and dangling pointer for wlan host driver allocated memory
from the pre-alloc memory pool.
To fix the above issue remove the pre-allaoc memory leak
check and pre-alloc memory pool reset from the icnss platform
driver and export symbol for the pre-alloc memory leak check
and pre-alloc memory pool reset.
CRs-Fixed:
2039483
Change-Id: Id9f01c9d2b5184fbb58935eaf11fd21b50b47908
Signed-off-by: Hardik Kantilal Patel <hkpatel@codeaurora.org>
Arun KS [Thu, 20 Apr 2017 13:11:33 +0000 (18:41 +0530)]
esoc: mdm-4x: Separate out callback function for 9x45
Reset and power off timing is different. Hence need a
separate callback function.
Change-Id: I9714a4449b1fbeab84017da4be17f5ca2cb6cab6
Signed-off-by: Arun KS <arunks@codeaurora.org>
Arun KS [Fri, 24 Mar 2017 06:18:36 +0000 (11:48 +0530)]
ARM: dts: msm: Add support mdm9x45 external modem
This change defines upto 3 instances of external mdm9x45 modems in
device-tree which would need to be controlled by esoc (external esoc)
driver. The device-tree nodes allows the configuration of the external
modems (like the GPIO pins used to communicate status of modem) to be
specified.
Change-Id: I7e609f7549a02cd3322db76b00dc30137ed68953
Signed-off-by: Arun KS <arunks@codeaurora.org>
Arun KS [Thu, 2 Mar 2017 12:42:54 +0000 (18:12 +0530)]
esoc: Add provision to handle shutdown request in userspace
In certain scenarios, modem shutdown requests are handled in
userspace. Enhance request engine of esoc driver to send
shutdown requests to userspace.
Also, during a shutdown, avoid setting status to 0, if line is
not a power source. There can be multiple mdms monitoring status
line. This can otherwise be misinterpreted as an unexpected reset
by other mdms.
Change-Id: I9c20a86e76f892cc61dbfb814202b26e5cce3e96
Signed-off-by: Arun KS <arunks@codeaurora.org>
Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
Arun KS [Mon, 6 Mar 2017 07:55:56 +0000 (13:25 +0530)]
esoc: Update SSR driver with crash status
During an unexpected reset or error fatal, update the
crash status to SSR. This is important for the drivers
listening at SSR related kernel notifier calls, where
crash status is also passed as a data payload.
Change-Id: Ide0634d0139a84b5988fa87e709877f3028029ef
Signed-off-by: Arun KS <arunks@codeaurora.org>
Arun KS [Mon, 6 Mar 2017 07:51:45 +0000 (13:21 +0530)]
soc: qcom: ssr: Add option to relax on ssr failures
SSR failures are considered fatal and results in system panic.
In certain scenarios system can continue to work even with a
failed subsystem.
Add an option in subsystem descriptor to relax on ssr failures.
Change-Id: I86dcaa615d6443937077880d9a91070d9c22ea1f
Signed-off-by: Arun KS <arunks@codeaurora.org>
[satyap@codeaurora.org: trivial merge conflict resolution]
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
Amit Nischal [Mon, 6 Mar 2017 11:10:58 +0000 (16:40 +0530)]
clk: Add support to dump state of all clocks into ftrace
Add clk_state event to record the state of all the clocks
into ftrace. The clock event could be triggered by using
the "trace_clocks" debugfs entry and it would dump the
current state of all clocks in ftrace logs.
Change-Id: I28b6574fe1d96472833a93e7b251dbba6c6eae49
Signed-off-by: Amit Nischal <anischal@codeaurora.org>
Fenglin Wu [Tue, 25 Apr 2017 12:51:06 +0000 (20:51 +0800)]
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>
Abhijeet Dharmapurikar [Fri, 28 Apr 2017 02:20:31 +0000 (19:20 -0700)]
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>
Ashay Jaiswal [Thu, 27 Apr 2017 11:46:26 +0000 (17:16 +0530)]
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>
Harry Yang [Thu, 6 Apr 2017 07:02:30 +0000 (00:02 -0700)]
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>
Zhiqiang Tu [Thu, 27 Apr 2017 02:51:03 +0000 (10:51 +0800)]
Merge remote-tracking branch 'remotes/quic/dev/msm-4.4-8996au' into msm-4.4
Conflicts:
arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
drivers/gpu/drm/msm/Makefile
Change-Id: Ief80c28ff1422fd71a0c3d2041531e2ab078ee7a
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Sudarshan Rajagopalan [Thu, 27 Apr 2017 20:38:21 +0000 (13:38 -0700)]
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>
Tony Truong [Sat, 29 Apr 2017 01:17:04 +0000 (18:17 -0700)]
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>
Abhijeet Dharmapurikar [Tue, 25 Apr 2017 01:33:55 +0000 (18:33 -0700)]
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>
Abhijeet Dharmapurikar [Mon, 24 Apr 2017 21:06:54 +0000 (14:06 -0700)]
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>
Abhijeet Dharmapurikar [Mon, 24 Apr 2017 20:33:07 +0000 (13:33 -0700)]
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>
Skylar Chang [Mon, 24 Apr 2017 17:05:05 +0000 (10:05 -0700)]
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>