OSDN Git Service

sagit-ice-cold/kernel_xiaomi_msm8998.git
8 years agonf: xt_qtaguid: fix handling for cases where tunnels are used.
JP Abgrall [Sat, 21 Dec 2013 00:51:11 +0000 (16:51 -0800)]
nf: xt_qtaguid: fix handling for cases where tunnels are used.

* fix skb->dev vs par->in/out
When there is some forwarding going on, it introduces extra state
around devs associated with xt_action_param->in/out and sk_buff->dev.
E.g.
   par->in and par->out are both set, or
   skb->dev and par->out are both set (and different)
This would lead qtaguid to make the wrong assumption about the
direction and update the wrong device stats.
Now we rely more on par->in/out.

* Fix handling when qtaguid is used as "owner"
When qtaguid is used as an owner module, and sk_socket->file is
not there (happens when tunnels are involved), it would
incorrectly do a tag stats update.

* Correct debug messages.

Bug: 11687690
Change-Id: I2b1ff8bd7131969ce9e25f8291d83a6280b3ba7f
CRs-Fixed: 747810
Signed-off-by: JP Abgrall <jpa@google.com>
Git-commit: 2b71479d6f5fe8f33b335f713380f72037244395
Git-repo: https://www.codeaurora.org/cgit/quic/la/kernel/mediatek
[imaund@codeaurora.org: Resolved trivial context conflicts.]
Signed-off-by: Ian Maund <imaund@codeaurora.org>
[bflowers@codeaurora.org: Resolved merge conflicts]
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
8 years agoMerge "scsi: ufs: add 2 lane support"
Linux Build Service Account [Mon, 29 Aug 2016 13:46:44 +0000 (06:46 -0700)]
Merge "scsi: ufs: add 2 lane support"

8 years agoMerge "drivers: mfd: Add 1.6MHz clk support for wcd934x codec"
Linux Build Service Account [Mon, 29 Aug 2016 07:49:29 +0000 (00:49 -0700)]
Merge "drivers: mfd: Add 1.6MHz clk support for wcd934x codec"

8 years agoMerge "defconfig: msm64: msm: Compile vidc driver as LKM"
Linux Build Service Account [Mon, 29 Aug 2016 07:49:28 +0000 (00:49 -0700)]
Merge "defconfig: msm64: msm: Compile vidc driver as LKM"

8 years agoMerge "sound: usb: Add NULL check on return value of iommu_domain_alloc()"
Linux Build Service Account [Mon, 29 Aug 2016 07:49:27 +0000 (00:49 -0700)]
Merge "sound: usb: Add NULL check on return value of iommu_domain_alloc()"

8 years agoMerge "input: synaptics_dsx_2.6: correct sysfs permissions"
Linux Build Service Account [Mon, 29 Aug 2016 07:49:26 +0000 (00:49 -0700)]
Merge "input: synaptics_dsx_2.6: correct sysfs permissions"

8 years agoMerge "Revert "Merge remote-tracking branch 'msm-4.4/tmp-510d0a3f' into msm-4.4""
Linux Build Service Account [Mon, 29 Aug 2016 07:49:26 +0000 (00:49 -0700)]
Merge "Revert "Merge remote-tracking branch 'msm-4.4/tmp-510d0a3f' into msm-4.4""

8 years agoMerge "usb: gadget: f_cdev: Handle notification request properly"
Linux Build Service Account [Mon, 29 Aug 2016 07:49:25 +0000 (00:49 -0700)]
Merge "usb: gadget: f_cdev: Handle notification request properly"

8 years agoMerge "msm_vidc: venc: configure max-B-frames only if B is enabled"
Linux Build Service Account [Mon, 29 Aug 2016 07:49:24 +0000 (00:49 -0700)]
Merge "msm_vidc: venc: configure max-B-frames only if B is enabled"

8 years agoMerge "mm: zbud: fix the locking scenarios with zcache"
Linux Build Service Account [Mon, 29 Aug 2016 07:49:23 +0000 (00:49 -0700)]
Merge "mm: zbud: fix the locking scenarios with zcache"

8 years agoMerge "clk: qcom: Add support for clk_set_flags for branch and dummy clock"
Linux Build Service Account [Mon, 29 Aug 2016 07:49:22 +0000 (00:49 -0700)]
Merge "clk: qcom: Add support for clk_set_flags for branch and dummy clock"

8 years agoMerge "radio: iris: uapi header split"
Linux Build Service Account [Mon, 29 Aug 2016 07:49:21 +0000 (00:49 -0700)]
Merge "radio: iris: uapi header split"

8 years agoscsi: ufs: add 2 lane support
Venkat Gopalakrishnan [Thu, 18 Aug 2016 23:58:20 +0000 (16:58 -0700)]
scsi: ufs: add 2 lane support

Qcom ufs controller v3.1.0 supports 2 lanes, add support
to configure 2 lanes during phy initialization.

Change-Id: Ifa2bac71b47ce49a6fb31ebb8dd54b243e1cfae1
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
8 years agophy: qcom-ufs-qmp-v3: add 2 lane phy support
Subhash Jadavani [Mon, 22 Aug 2016 19:52:41 +0000 (12:52 -0700)]
phy: qcom-ufs-qmp-v3: add 2 lane phy support

New version of phy-qcom-ufs-qmp-v3 supports 2 lanes,
this change adds the config table to enable 2 lanes.

Change-Id: Ie916e7090d3660711159b886c27ee3709891ef2b
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
8 years agoMerge "ASoC: wcd934x: Add DSD volume support"
Linux Build Service Account [Sat, 27 Aug 2016 10:35:38 +0000 (03:35 -0700)]
Merge "ASoC: wcd934x: Add DSD volume support"

8 years agoMerge "ARM: dts: msm: Update power attributes for msmcobalt"
Linux Build Service Account [Sat, 27 Aug 2016 10:35:37 +0000 (03:35 -0700)]
Merge "ARM: dts: msm: Update power attributes for msmcobalt"

8 years agoMerge "msm: vidc: Fix multistream issues"
Linux Build Service Account [Sat, 27 Aug 2016 10:35:36 +0000 (03:35 -0700)]
Merge "msm: vidc: Fix multistream issues"

8 years agoMerge "qpnp-fg-gen3: export the battery float voltage"
Linux Build Service Account [Sat, 27 Aug 2016 05:23:00 +0000 (22:23 -0700)]
Merge "qpnp-fg-gen3: export the battery float voltage"

8 years agoMerge "qcom-charger: smb-lib: correct the usb suspend votable name"
Linux Build Service Account [Sat, 27 Aug 2016 05:23:00 +0000 (22:23 -0700)]
Merge "qcom-charger: smb-lib: correct the usb suspend votable name"

8 years agoMerge "qcom-charger: qpnp-fg-gen3: add v2 SRAM register map"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:59 +0000 (22:22 -0700)]
Merge "qcom-charger: qpnp-fg-gen3: add v2 SRAM register map"

8 years agoMerge "ARM: dts: msm: Update GPU SMMU settings for cobalt"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:58 +0000 (22:22 -0700)]
Merge "ARM: dts: msm: Update GPU SMMU settings for cobalt"

8 years agoMerge "host: sdhci: fix current caps when there is no host->vmmc"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:58 +0000 (22:22 -0700)]
Merge "host: sdhci: fix current caps when there is no host->vmmc"

8 years agoMerge "ARM: dts: msmcobalt: add status property for memlat-mon for msmcobalt"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:57 +0000 (22:22 -0700)]
Merge "ARM: dts: msmcobalt: add status property for memlat-mon for msmcobalt"

8 years agoMerge "cnss: Provide API to CLD Driver to control SPDT GPIO"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:54 +0000 (22:22 -0700)]
Merge "cnss: Provide API to CLD Driver to control SPDT GPIO"

8 years agoMerge "input: synaptics_dsx_2.6: fix issues raised by static analyzer"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:51 +0000 (22:22 -0700)]
Merge "input: synaptics_dsx_2.6: fix issues raised by static analyzer"

8 years agoMerge "clk: msm: gcc-cobalt: Remove support for wcss clocks"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:50 +0000 (22:22 -0700)]
Merge "clk: msm: gcc-cobalt: Remove support for wcss clocks"

8 years agoMerge "defconfig: Enable support for destroying TCP sockets through diag"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:49 +0000 (22:22 -0700)]
Merge "defconfig: Enable support for destroying TCP sockets through diag"

8 years agoMerge "qcom-charger: smb138x: fix buck damage on v1.1 hardware"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:48 +0000 (22:22 -0700)]
Merge "qcom-charger: smb138x: fix buck damage on v1.1 hardware"

8 years agoMerge "msm: vidc: Use internal size for extradata plane"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:47 +0000 (22:22 -0700)]
Merge "msm: vidc: Use internal size for extradata plane"

8 years agoMerge "ARM: dts: msm: Add initial support for msmcobalt QRD SKUK board"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:46 +0000 (22:22 -0700)]
Merge "ARM: dts: msm: Add initial support for msmcobalt QRD SKUK board"

8 years agoMerge "sched: Make use of sysctl_sched_wake_to_idle in select_best_cpu"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:38 +0000 (22:22 -0700)]
Merge "sched: Make use of sysctl_sched_wake_to_idle in select_best_cpu"

8 years agoMerge "sched: handle frequency alert notifications better"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:38 +0000 (22:22 -0700)]
Merge "sched: handle frequency alert notifications better"

8 years agoMerge "regulator: cpr3: fix panic callback failure in interrupt context"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:37 +0000 (22:22 -0700)]
Merge "regulator: cpr3: fix panic callback failure in interrupt context"

8 years agoMerge "misc: qcom: qdsp6v2: initialize wma_config_32"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:36 +0000 (22:22 -0700)]
Merge "misc: qcom: qdsp6v2: initialize wma_config_32"

8 years agoMerge "usb: hcd: Add USB atomic notifier callback for HC died error"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:36 +0000 (22:22 -0700)]
Merge "usb: hcd: Add USB atomic notifier callback for HC died error"

8 years agoMerge "msm: mdss: dsi: fix the check for PLL off when turning off PHY"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:35 +0000 (22:22 -0700)]
Merge "msm: mdss: dsi: fix the check for PLL off when turning off PHY"

8 years agoMerge "ARM: dts: Change minimum voltage for LDO25"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:32 +0000 (22:22 -0700)]
Merge "ARM: dts: Change minimum voltage for LDO25"

8 years agoMerge "ARM: dts: msm: update DSI phy strength settings for msmcobalt"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:31 +0000 (22:22 -0700)]
Merge "ARM: dts: msm: update DSI phy strength settings for msmcobalt"

8 years agoMerge "msm: mdss: dsi: update DSI phy v3 initialization sequence"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:30 +0000 (22:22 -0700)]
Merge "msm: mdss: dsi: update DSI phy v3 initialization sequence"

8 years agoMerge "input: ft5x06_ts: add proximity feature support"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:21 +0000 (22:22 -0700)]
Merge "input: ft5x06_ts: add proximity feature support"

8 years agoMerge "msm: mdss: hide kernel addresses from unprevileged users"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:20 +0000 (22:22 -0700)]
Merge "msm: mdss: hide kernel addresses from unprevileged users"

8 years agoMerge "ARM: dts: msm: configure CX voltage levels from MDSS for msmcobalt"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:19 +0000 (22:22 -0700)]
Merge "ARM: dts: msm: configure CX voltage levels from MDSS for msmcobalt"

8 years agoMerge "msm: ipa3: Adapt version handling to support IPAv3.5/3.5.1"
Linux Build Service Account [Sat, 27 Aug 2016 05:22:17 +0000 (22:22 -0700)]
Merge "msm: ipa3: Adapt version handling to support IPAv3.5/3.5.1"

8 years agousb: gadget: f_cdev: Handle notification request properly
Hemant Kumar [Thu, 25 Aug 2016 22:58:01 +0000 (15:58 -0700)]
usb: gadget: f_cdev: Handle notification request properly

Driver is setting notify request pointer to NULL in order
to prevent re-queueing of notification request until it is
completed. This results into NULL ptr dereference if ioctl
happens before driver unbind tries to free the request buffer.
Fix this issue by introduce a flag q_again to prevent re-queuing
of same request instead of setting notify request pointer to NULL.
Also add NULL check in usb_cser_free_req() and set the request
pointer to NULL after freeing it.

Change-Id: Id431f911d3bdebfeedd0a5c1e36218ce7467ba67
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
8 years agoMerge "phy: qcom-ufs: update ufs phy settings"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:54 +0000 (14:48 -0700)]
Merge "phy: qcom-ufs: update ufs phy settings"

8 years agoMerge "soc: qcom: rpm-smd: Account for NOACK messages with system sleep"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:53 +0000 (14:48 -0700)]
Merge "soc: qcom: rpm-smd: Account for NOACK messages with system sleep"

8 years agoMerge "soc: qcom: glink: Best Fit approach to find intent"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:52 +0000 (14:48 -0700)]
Merge "soc: qcom: glink: Best Fit approach to find intent"

8 years agoMerge "qcom_charger: smb-lib: support faking battery capacity"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:52 +0000 (14:48 -0700)]
Merge "qcom_charger: smb-lib: support faking battery capacity"

8 years agoMerge "msm: ipa: WA to get PA of sgt_tbl from wlan"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:51 +0000 (14:48 -0700)]
Merge "msm: ipa: WA to get PA of sgt_tbl from wlan"

8 years agoMerge "msm: ipa3: remove wrong smmu clk vote"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:50 +0000 (14:48 -0700)]
Merge "msm: ipa3: remove wrong smmu clk vote"

8 years agoMerge "ARM: dts: msm: update VDD_GFX CPR target quotients for msmcobalt v2"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:49 +0000 (14:48 -0700)]
Merge "ARM: dts: msm: update VDD_GFX CPR target quotients for msmcobalt v2"

8 years agoMerge "msm: ipa3: add ipa-uc ram mapping to wlan-cb"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:49 +0000 (14:48 -0700)]
Merge "msm: ipa3: add ipa-uc ram mapping to wlan-cb"

8 years agoMerge "msm: ipa: header change for SMMU wlan VA mapping"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:48 +0000 (14:48 -0700)]
Merge "msm: ipa: header change for SMMU wlan VA mapping"

8 years agoMerge "ARM: dts: msm: Add bus bandwidth entry for IPA"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:47 +0000 (14:48 -0700)]
Merge "ARM: dts: msm: Add bus bandwidth entry for IPA"

8 years agoMerge "usb: gadget: f_gsi: Fix alternate index returned by gsi_get_alt"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:46 +0000 (14:48 -0700)]
Merge "usb: gadget: f_gsi: Fix alternate index returned by gsi_get_alt"

8 years agoMerge "cpuset: Make cpusets restore on hotplug"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:45 +0000 (14:48 -0700)]
Merge "cpuset: Make cpusets restore on hotplug"

8 years agoMerge " msm: ADSPRPC: Update channel state during subsystem restart"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:45 +0000 (14:48 -0700)]
Merge " msm: ADSPRPC: Update channel state during subsystem restart"

8 years agoMerge "msm: mdss: add additional LM checks for dest scalar validation"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:44 +0000 (14:48 -0700)]
Merge "msm: mdss: add additional LM checks for dest scalar validation"

8 years agoMerge "msm: mdss: update lineptr instantly in cmd mode panels w/autorefresh"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:43 +0000 (14:48 -0700)]
Merge "msm: mdss: update lineptr instantly in cmd mode panels w/autorefresh"

8 years agoMerge "msm: kgsl: Change sequencing for GPU hardware clock gating"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:42 +0000 (14:48 -0700)]
Merge "msm: kgsl: Change sequencing for GPU hardware clock gating"

8 years agoMerge "msm: ipa3: add gateway info on wan_msg"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:42 +0000 (14:48 -0700)]
Merge "msm: ipa3: add gateway info on wan_msg"

8 years agoMerge "msm: misc: hdcp: add support for multi-part hdcp2p2 messages"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:41 +0000 (14:48 -0700)]
Merge "msm: misc: hdcp: add support for multi-part hdcp2p2 messages"

8 years agoMerge "msm: ipa: handle information leak on ADD_FLT_RULE_INDEX ioctl"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:40 +0000 (14:48 -0700)]
Merge "msm: ipa: handle information leak on ADD_FLT_RULE_INDEX ioctl"

8 years agoMerge "diag: Add diag over glink support"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:39 +0000 (14:48 -0700)]
Merge "diag: Add diag over glink support"

8 years agoMerge "qseecom: support whitelist memory for qseecom_send_modfd_cmd"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:39 +0000 (14:48 -0700)]
Merge "qseecom: support whitelist memory for qseecom_send_modfd_cmd"

8 years agoMerge "msm: mdss: Correct command mode MISR CRC reg offset and blockid"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:38 +0000 (14:48 -0700)]
Merge "msm: mdss: Correct command mode MISR CRC reg offset and blockid"

8 years agoMerge "usb: gadget: gsi: Handle EVT_HOST_READY event in STATE_INITIALIZED state"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:37 +0000 (14:48 -0700)]
Merge "usb: gadget: gsi: Handle EVT_HOST_READY event in STATE_INITIALIZED state"

8 years agoMerge "clk: msm: mdss: update Dp PLL/Phy configuration"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:35 +0000 (14:48 -0700)]
Merge "clk: msm: mdss: update Dp PLL/Phy configuration"

8 years agoMerge "mdss: display-port: add support for audio programming"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:35 +0000 (14:48 -0700)]
Merge "mdss: display-port: add support for audio programming"

8 years agoMerge "msm: ipa3: fix the dma_map_single issue"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:34 +0000 (14:48 -0700)]
Merge "msm: ipa3: fix the dma_map_single issue"

8 years agoMerge "regulator: cpr3-mmss-regulator: update ref voltages for msmcobalt v2"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:33 +0000 (14:48 -0700)]
Merge "regulator: cpr3-mmss-regulator: update ref voltages for msmcobalt v2"

8 years agoMerge "ARM: dts: msm: add hdcp support on msmcobalt v1"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:32 +0000 (14:48 -0700)]
Merge "ARM: dts: msm: add hdcp support on msmcobalt v1"

8 years agoMerge "msm: kgsl: remove un-used GPU power states"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:31 +0000 (14:48 -0700)]
Merge "msm: kgsl: remove un-used GPU power states"

8 years agoMerge "ARM: dts: msm: Add GPU DCVS plan for msmcobalt V2"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:30 +0000 (14:48 -0700)]
Merge "ARM: dts: msm: Add GPU DCVS plan for msmcobalt V2"

8 years agoMerge "clk: msm: clock: Add voter clocks for mmss_camss_jpeg0_clk"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:29 +0000 (14:48 -0700)]
Merge "clk: msm: clock: Add voter clocks for mmss_camss_jpeg0_clk"

8 years agoMerge "msm: ipa3: Update registers configurations for IPAv3.5/3.5.1"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:29 +0000 (14:48 -0700)]
Merge "msm: ipa3: Update registers configurations for IPAv3.5/3.5.1"

8 years agoMerge "scsi: ufs: fix race between hibern8 failure recovery and error handler"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:28 +0000 (14:48 -0700)]
Merge "scsi: ufs: fix race between hibern8 failure recovery and error handler"

8 years agoMerge "msm: ipa: fix a static analysis issue at IPA unit-tests"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:27 +0000 (14:48 -0700)]
Merge "msm: ipa: fix a static analysis issue at IPA unit-tests"

8 years agoMerge "ASoC: msm: Add support for playback over slimbus2 rx port"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:24 +0000 (14:48 -0700)]
Merge "ASoC: msm: Add support for playback over slimbus2 rx port"

8 years agoMerge "msm: ipa3: Fix unclocked access to IPA SMEM register"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:23 +0000 (14:48 -0700)]
Merge "msm: ipa3: Fix unclocked access to IPA SMEM register"

8 years agoMerge "defconfig: msm: enable SMCInvoke feature"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:22 +0000 (14:48 -0700)]
Merge "defconfig: msm: enable SMCInvoke feature"

8 years agoMerge "msm: mink: Adding SMCInvoke Driver"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:22 +0000 (14:48 -0700)]
Merge "msm: mink: Adding SMCInvoke Driver"

8 years agoMerge "coresight: abort coresight tracing on kernel crash"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:21 +0000 (14:48 -0700)]
Merge "coresight: abort coresight tracing on kernel crash"

8 years agoMerge "soc: qcom: Clear PBL interrupt in case of error"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:20 +0000 (14:48 -0700)]
Merge "soc: qcom: Clear PBL interrupt in case of error"

8 years agoMerge "qcom-charger: expand data structure smb_chg_param"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:20 +0000 (14:48 -0700)]
Merge "qcom-charger: expand data structure smb_chg_param"

8 years agoMerge "msm: mdss: fix pipe priority validation"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:19 +0000 (14:48 -0700)]
Merge "msm: mdss: fix pipe priority validation"

8 years agoMerge "msm: mdss: Fix potential NULL pointer dereferences"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:18 +0000 (14:48 -0700)]
Merge "msm: mdss: Fix potential NULL pointer dereferences"

8 years agoMerge "ARM: dts: msm: Update SS phy initialization sequence for msmcobalt"
Linux Build Service Account [Fri, 26 Aug 2016 21:48:17 +0000 (14:48 -0700)]
Merge "ARM: dts: msm: Update SS phy initialization sequence for msmcobalt"

8 years agoRevert "Merge remote-tracking branch 'msm-4.4/tmp-510d0a3f' into msm-4.4"
Trilok Soni [Fri, 26 Aug 2016 02:05:37 +0000 (19:05 -0700)]
Revert "Merge remote-tracking branch 'msm-4.4/tmp-510d0a3f' into msm-4.4"

This reverts commit 9d6fd2c3e9fcfb ("Merge remote-tracking branch
'msm-4.4/tmp-510d0a3f' into msm-4.4"), because it breaks the
dump parsing tools due to kernel can be loaded anywhere in the memory
now and not fixed at linear mapping.

Change-Id: Id416f0a249d803442847d09ac47781147b0d0ee6
Signed-off-by: Trilok Soni <tsoni@codeaurora.org>
8 years agoASoC: wcd934x: Add DSD volume support
Phani Kumar Uppalapati [Fri, 19 Aug 2016 07:13:15 +0000 (00:13 -0700)]
ASoC: wcd934x: Add DSD volume support

Add support for adjusting volume when DSD (Direct Stream
Digital) audio playback is in progress.

Change-Id: Ica51d40911d16059e8af21c60794b35c68bb695d
Signed-off-by: Phani Kumar Uppalapati <phaniu@codeaurora.org>
8 years agoASoC: wcd934x: Add support for DSD audio playback
Phani Kumar Uppalapati [Wed, 20 Jul 2016 23:43:15 +0000 (16:43 -0700)]
ASoC: wcd934x: Add support for DSD audio playback

Add DAPM (Dynamic Audio Power Management) widgets and
routing to enable support for DSD (Direct Stream Digital)
audio playback on wcd934x codec.

Change-Id: I06e1b0134cea58adedbd9113a51529b2b73da835
Signed-off-by: Phani Kumar Uppalapati <phaniu@codeaurora.org>
8 years agoASoC: wcd934x: add ASRC mixing support
Vidyakumar Athota [Wed, 27 Jul 2016 23:12:16 +0000 (16:12 -0700)]
ASoC: wcd934x: add ASRC mixing support

WCD934X supports mixing of integer sample rate clips with
fractional sample rate clips using ASRC(asynchronous sample
rate converter) block. Add support to use ASRC block in codec.

CRs-Fixed: 1054643
Change-Id: I3a04cc902c74b49e1d40c5a52acbf1f7c907c34e
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
8 years agoASoC: wcd934x: Add support for codec MCLK2 enablement
Phani Kumar Uppalapati [Thu, 11 Aug 2016 06:59:41 +0000 (23:59 -0700)]
ASoC: wcd934x: Add support for codec MCLK2 enablement

Add support to enable codec MCLK2 which is used for
44.1KHz and its multiples sample rate audio playback.

CRs-Fixed: 1054643
Change-Id: Id157439b2a46ac4fa54b4a768f9555cf390399b5
Signed-off-by: Phani Kumar Uppalapati <phaniu@codeaurora.org>
8 years agoASoC: wcd934x: Add support for voltage scaling
Bhalchandra Gajare [Wed, 17 Aug 2016 20:35:34 +0000 (13:35 -0700)]
ASoC: wcd934x: Add support for voltage scaling

WCD934X audio codec supports static voltage scaling (SVS) mode, which
puts the codec into lowest power state. The codec has different power
states (SVS2, SVS and Nominal). Add support in codec driver to vote
for SVS when audio usecases are enabled and remove vote for SVS when
audio usecases are disabled. The codec driver only votes for SVS or
no SVS and the hardware internally manages to go into Nominal mode.

CRs-Fixed: 1049012
Change-Id: I6f66d3136e3c49da54f5919184bc113267105463
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
8 years agoASoC: wcd934x: add MAD support for wcd934x codec
Meng Wang [Wed, 20 Jul 2016 08:34:52 +0000 (16:34 +0800)]
ASoC: wcd934x: add MAD support for wcd934x codec

MAD (Microphone Activity Detection) hardware block in wcd934x audio
codec samples the microphone at configured intervals to sense
presence of valid audio signal. This is used for voice activation
use cases. Change adds widgets and routes to enable the MAD block.

CRs-Fixed: 1049012
Change-Id: I1ce4f3f215850fada6c25192a4351f3a9c76a370
Signed-off-by: Meng Wang <mwang@codeaurora.org>
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
8 years agosoc: qcom: rpm-smd: Account for NOACK messages with system sleep
Mahesh Sivasubramanian [Mon, 7 Dec 2015 18:19:22 +0000 (11:19 -0700)]
soc: qcom: rpm-smd: Account for NOACK messages with system sleep

When a system is entering RPM assisted sleep, the NOACK messages are
not accounted in preventing such sleep modes as no driver is waiting
on it. In such scenarios, some active messages could still be in the
Apps RX buffer which reduces the number of outstanding sleep messages.

Fix by accounting for NOACK messages while flushing sleep set requests
and ensuring that they are read before sending any sleep set requests.

The original changes were reverted to address issues with SMD transport.
This change includes fixes from earlier squashed into a single commit.

Change-Id: I5570d7694424d0a602c446c0af098a64ffa681e4
Signed-off-by: Mahesh Sivasubramanian <msivasub@codeaurora.org>
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
8 years agoqcom_charger: smb-lib: support faking battery capacity
Abhijeet Dharmapurikar [Tue, 23 Aug 2016 19:55:49 +0000 (12:55 -0700)]
qcom_charger: smb-lib: support faking battery capacity

On debug setups where the battery is not present, we need a way
to fake battery capacity instead of reporting some incorrect
/non-existent value. Provide means for the userspace to setup
a fake battery capacity.

Change-Id: Iff3ee1009d9c3215433cc267f016ef9cf2a9bff2
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
8 years agoqpnp-fg-gen3: export the battery float voltage
Abhijeet Dharmapurikar [Thu, 25 Aug 2016 20:50:42 +0000 (13:50 -0700)]
qpnp-fg-gen3: export the battery float voltage

Implement VOLTAGE_MAX_DESIGN to expose the battery float voltage. This
property will reflect the values read from battery profile and will
will be used for setting the max voltage on charging chips.

Change-Id: I4b9028f8930ac2f3de6c043fa145494f37322160
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
8 years agoqcom-charger: smb-lib: correct the usb suspend votable name
Abhijeet Dharmapurikar [Wed, 24 Aug 2016 19:29:50 +0000 (12:29 -0700)]
qcom-charger: smb-lib: correct the usb suspend votable name

Currently the name of the votable that suspends usb is INPUT_SUSPEND.
However, the PMI has two inputs - USB and DC. The dc suspending votable
is correctly named DC_SUSPEND. So rename the INPUT_SUSPEND to an
appropriate name - USB_SUSPEND.

Change-Id: Ia5ea1b139f5e9d560dc6492aa9fc13ffeeda83ca
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
8 years agomsm: ipa: WA to get PA of sgt_tbl from wlan
Skylar Chang [Thu, 25 Aug 2016 20:39:28 +0000 (13:39 -0700)]
msm: ipa: WA to get PA of sgt_tbl from wlan

with SMMU enable, the API page_to_phys() is
failed to get PA of the sg_page tbl. The WA
is to have wlan-driver directly send the PA
to ipa-driver.

Change-Id: I7750102222d519969da0d597a6591aa728abb27a
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>