OSDN Git Service
Linux Build Service Account [Tue, 21 Feb 2017 13:33:35 +0000 (05:33 -0800)]
Merge "ARM: dts: msm: Update icnss device node for sdm630"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:34 +0000 (05:33 -0800)]
Merge "clk: qcom: Remove few multimedia clocks for sdm630"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:33 +0000 (05:33 -0800)]
Merge "msm: kgsl: Log mmap_base value on _get_svm_area failure"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:32 +0000 (05:33 -0800)]
Merge "soc: qcom: rpm_rail_stats: Add support for lpcx and lpmx rail stats"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:31 +0000 (05:33 -0800)]
Merge "ARM: dts: msm: Enable OSM CPU clocks for SDM630"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:31 +0000 (05:33 -0800)]
Merge "ARM: dts: msm: Enable home key for qrd sdm630"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:30 +0000 (05:33 -0800)]
Merge "ARM: dts: msm: disable dynamic fps for nt35597 truly panel on sdm660"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:29 +0000 (05:33 -0800)]
Merge "ARM: dts: msm: update correct read OT settings for mdss"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:28 +0000 (05:33 -0800)]
Merge "smb138x-charger: use SW based comparison for connector health"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:28 +0000 (05:33 -0800)]
Merge "ARM: dts: msm: add connector temp iio channel for SMB138X"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:27 +0000 (05:33 -0800)]
Merge "mm: vmscan: do not pass reclaimed slab to vmpressure"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:26 +0000 (05:33 -0800)]
Merge "mm: vmpressure: fix sending wrong events on underflow"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:25 +0000 (05:33 -0800)]
Merge "USB: qusb: Add support to change TUNEX registers dynamically"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:24 +0000 (05:33 -0800)]
Merge "phy: qcom-ufs: parse ref-clk details prior to resource request"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:23 +0000 (05:33 -0800)]
Merge "ARM: dts: msm: update enable signal polarity of SMB1351 for SDM660"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:23 +0000 (05:33 -0800)]
Merge "msm: ipa: changes to suspend/disable for WDI 2"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:19 +0000 (05:33 -0800)]
Merge "net: validate the range we feed to iov_iter_init() in sys_sendto/sys_recvfrom"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:18 +0000 (05:33 -0800)]
Merge "usb: pd: Skip decreasing current when requesting the same PPS"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:17 +0000 (05:33 -0800)]
Merge "ARM: dts: msm: Update Temperature sensor support for sdm660"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:17 +0000 (05:33 -0800)]
Merge "USB: gadget: Replace %pK with %p"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:16 +0000 (05:33 -0800)]
Merge "msm: kgsl: Fix false timeout gpu faults"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:15 +0000 (05:33 -0800)]
Merge "input: touchscreen: remove msg21xx mstar touch driver"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:14 +0000 (05:33 -0800)]
Merge "mmc: core: Fix deadlock in suspend & rescan path"
Linux Build Service Account [Tue, 21 Feb 2017 13:33:14 +0000 (05:33 -0800)]
Merge "mmc: sdhci-msm: Dont wait infinitely for pwr_irq interrupt"
Linux Build Service Account [Tue, 21 Feb 2017 03:44:30 +0000 (19:44 -0800)]
Merge "ARM: dts: msm: Enable APC0/1 CPR closed-loop operation for sdm660"
Linux Build Service Account [Tue, 21 Feb 2017 03:44:28 +0000 (19:44 -0800)]
Merge "drm/msm: gpu: Return error on hw_init failure"
Linux Build Service Account [Tue, 21 Feb 2017 03:44:28 +0000 (19:44 -0800)]
Merge "drm/msm: Detach the MMU during msm_gpu_cleanup()"
Linux Build Service Account [Tue, 21 Feb 2017 03:44:27 +0000 (19:44 -0800)]
Merge "msm: mdss: fix secure session power vote"
Linux Build Service Account [Tue, 21 Feb 2017 03:44:26 +0000 (19:44 -0800)]
Merge "clk: qcom: Add support to list registers for slew PLL"
Linux Build Service Account [Tue, 21 Feb 2017 03:44:25 +0000 (19:44 -0800)]
Merge "certs: dm-verity: add keyring certification for verity"
Linux Build Service Account [Mon, 20 Feb 2017 18:08:28 +0000 (10:08 -0800)]
Merge "ppp: defer netns reference release for ppp channel"
Linux Build Service Account [Mon, 20 Feb 2017 18:08:26 +0000 (10:08 -0800)]
Merge "power: qcom-charger: delay ICL change reporting to parallel psy"
Linux Build Service Account [Mon, 20 Feb 2017 18:08:25 +0000 (10:08 -0800)]
Merge "ARM: dts: msm: Enable camera for sdm630"
Linux Build Service Account [Mon, 20 Feb 2017 18:08:25 +0000 (10:08 -0800)]
Merge "ARM: dts: msm: Add max secure video sessions for sdm660"
Linux Build Service Account [Mon, 20 Feb 2017 18:08:24 +0000 (10:08 -0800)]
Merge "ARM: dts: msm: add support for NO jacktype for SDM630"
Vijayavardhan Vennapusa [Thu, 16 Feb 2017 10:55:35 +0000 (16:25 +0530)]
USB: qusb: Add support to change TUNEX registers dynamically
Add required support to change QUSB2PHY_PORT_TUNE1/2/3/4/5 registers
dynamically for testing USB electrical complaince.
Change-Id: Id84d460c8f8dc8cdedabe3887859d6b90acf7c3f
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
Sarada Prasanna Garnayak [Wed, 15 Feb 2017 11:31:08 +0000 (17:01 +0530)]
ARM: dts: msm: Update icnss device node for sdm630
Add SMMU sid, memory base address and enable icnss
device node status for the icnss platform driver probe.
CRs-Fixed:
2008779
Change-Id: I05e48c8c450c03b119fc71c395e6456c88060c42
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
Odelu Kukatla [Thu, 16 Feb 2017 10:14:19 +0000 (15:44 +0530)]
clk: qcom: Remove few multimedia clocks for sdm630
Some of the multimedia subsystem clocks are not present in sdm630,
so remove them from registering with clock framework.
Change-Id: I073dc25fa0a0665a5b9b10c4ea977767a1e286d1
Signed-off-by: Odelu Kukatla <okukatla@codeaurora.org>
Maulik Shah [Mon, 20 Feb 2017 06:24:13 +0000 (11:54 +0530)]
soc: qcom: rpm_rail_stats: Add support for lpcx and lpmx rail stats
RPM has added support for lpcx and lpmx rails stats. Increase rail
buffer length to print stats for these rails.
Change-Id: I565786d847e09f325ae43e9465d744b111e7fa2c
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
cyizhao [Mon, 13 Feb 2017 11:35:32 +0000 (19:35 +0800)]
ARM: dts: msm: Enable home key for qrd sdm630
PM660 GPIO11 is used for home key on QRD sdm630 device.
Configure it to input/pull-up mode and add it to gpio-keys
device for key detection.
CRs-Fixed:
2008859
Change-Id: I3f673d925b2186069ac55ab7c9bf72fd241242c8
Signed-off-by: Yingwei Zhao <cyizhao@codeaurora.org>
Vinayak Menon [Sun, 19 Feb 2017 09:00:31 +0000 (20:00 +1100)]
mm: vmscan: do not pass reclaimed slab to vmpressure
During global reclaim, the nr_reclaimed passed to vmpressure includes the
pages reclaimed from slab. But the corresponding scanned slab pages is
not passed. There is an impact to the vmpressure values because of this.
While moving from kernel version 3.18 to 4.4, a difference is seen in the
vmpressure values for the same workload resulting in a different behaviour
of the vmpressure consumer. One such case is of a vmpressure based
lowmemorykiller. It is observed that the vmpressure events are received
late and less in number resulting in tasks not being killed at the right
time. The following numbers show the impact on reclaim activity due to
the change in behaviour of lowmemorykiller on a 4GB device. The test
launches a number of apps in sequence and repeats it multiple times.
v4.4 v3.18
pgpgin
163016456 145617236
pgpgout
4366220 4188004
workingset_refault
29857868 26781854
workingset_activate
6293946 5634625
pswpin
1327601 1133912
pswpout
3593842 3229602
pgalloc_dma
99520618 94402970
pgalloc_normal
104046854 98124798
pgfree
203772640 192600737
pgmajfault
2126962 1851836
pgsteal_kswapd_dma
19732899 18039462
pgsteal_kswapd_normal
19945336 17977706
pgsteal_direct_dma 206757 131376
pgsteal_direct_normal 236783 138247
pageoutrun 116622 108370
allocstall 7220 4684
compact_stall 931 856
This is a regression introduced by commit
6b4f7799c6a5 ("mm: vmscan:
invoke slab shrinkers from shrink_zone()").
So do not consider reclaimed slab pages for vmpressure calculation. The
reclaimed pages from slab can be excluded because the freeing of a page by
slab shrinking depends on each slab's object population, making the cost
model (i.e. scan:free) different from that of LRU. Also, not every
shrinker accounts the pages it reclaims. But ideally the pages reclaimed
from slab should be passed to vmpressure, otherwise higher vmpressure
levels can be triggered even when there is a reclaim progress. But
accounting only the reclaimed slab pages without the scanned, and adding
something which does not fit into the cost model just adds noise to the
vmpressure values.
Fixes:
6b4f7799c6a5 ("mm: vmscan: invoke slab shrinkers from shrink_zone()")
Link: http://lkml.kernel.org/r/1486641577-11685-2-git-send-email-vinmenon@codeaurora.org
Acked-by: Minchan Kim <minchan@kernel.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Anton Vorontsov <anton.vorontsov@linaro.org>
Cc: Shiraz Hashim <shashim@codeaurora.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Git-commit:
97a9668a428e9651a4aa3ff5d4e7e60024be2d87
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
Change-Id: If46b1cee6fd9723bebd87d76e0bb8451de05a9c1
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
Vinayak Menon [Sun, 19 Feb 2017 09:00:30 +0000 (20:00 +1100)]
mm: vmpressure: fix sending wrong events on underflow
At the end of a window period, if the reclaimed pages is greater than
scanned, an unsigned underflow can result in a huge pressure value and
thus a critical event. Reclaimed pages is found to go higher than scanned
because of the addition of reclaimed slab pages to reclaimed in
shrink_node without a corresponding increment to scanned pages. Minchan
Kim mentioned that this can also happen in the case of a THP page where
the scanned is 1 and reclaimed could be 512.
Link: http://lkml.kernel.org/r/1486641577-11685-1-git-send-email-vinmenon@codeaurora.org
Acked-by: Minchan Kim <minchan@kernel.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Rik van Riel <riel@redhat.com>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Anton Vorontsov <anton.vorontsov@linaro.org>
Cc: Shiraz Hashim <shashim@codeaurora.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Change-Id: Ic1221fa129c9b3512127537d62df7bd4a7606d24
Git-commit:
746d8d8f3ebb49a62ffcffb4b1f41cc27d020a2e
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
Utkarsh Saxena [Wed, 8 Feb 2017 15:43:24 +0000 (21:13 +0530)]
msm: ipa: changes to suspend/disable for WDI 2
Adapt to latest changes to IPA micro-controller(IPA uC).
For pipe SUSPEND, IPA uC will fail in case
the pipe is not empty.
IPA driver needs to insure pipe is empty
and then issue a SUSPEND command.
For pipe DISABLE, pipe is already empty on SUSPEND,
IPA driver does not need to do ensure anything before
issuing a DISABLE command.
Change-Id: Ic0e65b671fc29583203986defada31e92065adfd
Acked-by: Mohammed Javid <mjavid@qti.qualcomm.com>
Signed-off-by: Utkarsh Saxena <usaxena@codeaurora.org>
Hareesh Gundu [Wed, 15 Feb 2017 10:32:06 +0000 (16:02 +0530)]
msm: kgsl: Log mmap_base value on _get_svm_area failure
_get_svm_area can fail to find available address range
from mmap_base which was adjusted by random factor.
By logging mmap_base value will help to identify
any issue with the VA randomization.
Change-Id: Ibdc3fac975adde02c30aa253b53d6533ee558161
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
Ashay Jaiswal [Mon, 20 Feb 2017 03:27:51 +0000 (08:57 +0530)]
ARM: dts: msm: update enable signal polarity of SMB1351 for SDM660
Update enable signal polarity of SMB1351 as active high to make
sure STAT pin of main charger controls SMB1351.
Change-Id: I7c3fa06d59667639899ad795537ed49cb1f59e2d
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
WANG Cong [Wed, 6 Jul 2016 05:12:36 +0000 (22:12 -0700)]
ppp: defer netns reference release for ppp channel
Matt reported that we have a NULL pointer dereference
in ppp_pernet() from ppp_connect_channel(),
i.e. pch->chan_net is NULL.
This is due to that a parallel ppp_unregister_channel()
could happen while we are in ppp_connect_channel(), during
which pch->chan_net set to NULL. Since we need a reference
to net per channel, it makes sense to sync the refcnt
with the life time of the channel, therefore we should
release this reference when we destroy it.
Fixes:
1f461dcdd296 ("ppp: take reference on channels netns")
Reported-by: Matt Bennett <Matt.Bennett@alliedtelesis.co.nz>
Cc: Paul Mackerras <paulus@samba.org>
Cc: linux-ppp@vger.kernel.org
Cc: Guillaume Nault <g.nault@alphalink.fr>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Reviewed-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Git-repo:https://source.codeaurora.org/quic/la/kernel/msm-4.4
Git-commit:
205e1e255c479f3fd77446415706463b282f94e4
Change-Id: Ic7ce3be365ebdc1505ed8ce68df981c855638a3c
Signed-off-by: Srinivasa Rao Kuppala <srkupp@codeaurora.org>
Jordan Crouse [Mon, 13 Feb 2017 17:14:12 +0000 (10:14 -0700)]
drm/msm: gpu: Return error on hw_init failure
When the GPU hardware init function fails (like say, ME_INIT timed
out) return error instead of blindly continuing on. This gives us
a small chance of saving the system before it goes boom.
Change-Id: Ic0dedbad142efbc9bd93e8531b40c391ec15f557
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Jordan Crouse [Mon, 13 Feb 2017 17:14:12 +0000 (10:14 -0700)]
drm/msm: Detach the MMU during msm_gpu_cleanup()
Make sure to detach the MMU device before destroying the address
space.
Change-Id: Ic0dedbadff27fed017840a61ec5e0d55ce0c71e6
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Jordan Crouse [Mon, 13 Feb 2017 17:14:11 +0000 (10:14 -0700)]
drm/msm: Support different SMMU backends for address spaces
SDE and the GPU have different requirements for the SMMU backends - the
SDE generates its own iova addresses and needs special support for DMA
buffers and the GPU does its own IOMMU operations. Add a shim layer to
aspace to break out the address generation and call the appropriate
SMMU functions. There is probably consolidation that can be done, but for
now this is the best way to deal with the two use cases.
Change-Id: Ic0dedbadc6dc03504ef7dffded18ba09fb3ef291
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Rob Clark [Mon, 13 Feb 2017 17:14:11 +0000 (10:14 -0700)]
drm/msm: support multiple address spaces
We can have various combinations of 64b and 32b address space, ie. 64b
CPU but 32b display and gpu, or 64b CPU and GPU but 32b display. So
best to decouple the device iova's from mmap offset.
Change-Id: Ic0dedbad2b36b535df3e8fb2ddddc20add592cea
Signed-off-by: Rob Clark <robdclark@gmail.com>
Git-commit:
22877bcbdacd50d076f9b2f829e6a3753aa9821f
Git-repo: https://github.com/freedreno/kernel-msm.git
[jcrouse@codeaurora.org: Fix merge conflicts, remove mdp5 due to large
infrastructure changes, compile fixes]
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Linux Build Service Account [Sun, 19 Feb 2017 17:46:36 +0000 (09:46 -0800)]
Merge "msm: ipa: Do not assert if IPA FW loading fails"
Linux Build Service Account [Sun, 19 Feb 2017 17:46:35 +0000 (09:46 -0800)]
Merge "ath10k: Add support for shadow register for WNC3990"
Ghanim Fodi [Sun, 12 Feb 2017 13:25:53 +0000 (15:25 +0200)]
msm: ipa: Do not assert if IPA FW loading fails
Currently, IPA driver asserts if IPA FW loading
fails. Some environments do not have IPA FW
integrated and we should not crash at these cases.
CRs-fixed:
2005599
Change-Id: I78b9f2cadb8c35ab455f4514c7efc9cee4cf4542
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
Linux Build Service Account [Sun, 19 Feb 2017 09:04:40 +0000 (01:04 -0800)]
Merge "power: qcom-charger: fix minor bugs in parallel path"
Linux Build Service Account [Sun, 19 Feb 2017 09:04:39 +0000 (01:04 -0800)]
Merge "power: qcom-charger: add a workaround flag for QC AUTH interrupt"
Linux Build Service Account [Sun, 19 Feb 2017 09:04:39 +0000 (01:04 -0800)]
Merge "ARM: dts: msm: fix the compatible string used for GFX LDO CPR for sdm630"
Linux Build Service Account [Sun, 19 Feb 2017 09:04:38 +0000 (01:04 -0800)]
Merge "ARM: dts: msm: increase the system pm levels in sdm660"
Linux Build Service Account [Sun, 19 Feb 2017 09:04:37 +0000 (01:04 -0800)]
Merge "ARM: dts: msm: Enable wil6210 device for 8998 qrd-vr"
Linux Build Service Account [Sun, 19 Feb 2017 09:04:37 +0000 (01:04 -0800)]
Merge "ARM: dts: msm: Correct the number of bus frequency levels for SDM630"
Linux Build Service Account [Sun, 19 Feb 2017 09:04:36 +0000 (01:04 -0800)]
Merge "defconfig: msm: Enable BALANCE_ANON_FILE_RECLAIM for sdm660"
Linux Build Service Account [Sun, 19 Feb 2017 00:15:19 +0000 (16:15 -0800)]
Merge "ARM: dts: msm: Fix DCVS load for SDM660"
Linux Build Service Account [Sun, 19 Feb 2017 00:15:14 +0000 (16:15 -0800)]
Merge "drm/msm: add put_iova() helper"
Linux Build Service Account [Sun, 19 Feb 2017 00:15:13 +0000 (16:15 -0800)]
Merge "drm/msm: set dma_mask properly"
Linux Build Service Account [Sun, 19 Feb 2017 00:15:10 +0000 (16:15 -0800)]
Merge "wil6210: convert symbolic permissions to octal permissions"
Linux Build Service Account [Sun, 19 Feb 2017 00:15:10 +0000 (16:15 -0800)]
Merge "wil6210: option to override A-BFT length in start AP/PCP"
Linux Build Service Account [Sun, 19 Feb 2017 00:15:09 +0000 (16:15 -0800)]
Merge "wil6210: report association ID (AID) per station in debugfs"
Linux Build Service Account [Sun, 19 Feb 2017 00:15:08 +0000 (16:15 -0800)]
Merge "wil6210: remove __func__ from debug printouts"
Vishnuvardhan Prodduturi [Fri, 17 Feb 2017 13:37:00 +0000 (19:07 +0530)]
ARM: dts: msm: disable dynamic fps for nt35597 truly panel on sdm660
Disable dynamic fps for nt35597 truly dual dsi panel to avoid
split screen artifacts.
Change-Id: I47fc1045152fcc30bacc258d7c6943dec6047e3a
Signed-off-by: Vishnuvardhan Prodduturi <vproddut@codeaurora.org>
Linux Build Service Account [Sat, 18 Feb 2017 14:38:28 +0000 (06:38 -0800)]
Merge "ARM: dts: msm: Update cpufreq table for sdm630"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:27 +0000 (06:38 -0800)]
Merge "ARM: dts: msm: add ESD and ULPS support for SDM660 panels"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:27 +0000 (06:38 -0800)]
Merge "msm: mdss: Rate limit hist bin error logs"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:26 +0000 (06:38 -0800)]
Merge "msm: mdss: Use DMA pipe in pan display path for SDM 3.x.x"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:25 +0000 (06:38 -0800)]
Merge "msm: sde: Fix SW timestamp initialization when missing power event"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:24 +0000 (06:38 -0800)]
Merge "msm: mdss: fix autorefresh during kickoff"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:23 +0000 (06:38 -0800)]
Merge "msm: mdss: correct bpp for TP10 in bandwidth calculations"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:22 +0000 (06:38 -0800)]
Merge "usb: gsi: Capture USB GSI endpoint operations"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:22 +0000 (06:38 -0800)]
Merge "scsi: ufs: full reinit upon resume if link was off"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:21 +0000 (06:38 -0800)]
Merge "regulator: cpr4-mmss-ldo: Correct the GFX LDO CPR sensor count for sdm630"
Tirupathi Reddy [Sat, 18 Feb 2017 09:49:20 +0000 (15:19 +0530)]
ARM: dts: msm: Update cpufreq table for sdm630
Update cpufreq table for sdm630 as per new cpu clock plan.
CRs-Fixed:
2008773
Change-Id: Ibaa5d3c2d1dbafd14b5e9bee382cd3980f89aa51
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
Neeraj Upadhyay [Sat, 18 Feb 2017 08:06:55 +0000 (13:36 +0530)]
ARM: dts: msm: add support for NO jacktype for SDM630
Add device tree files for headset jacktype NO, for CDP
and RCM platforms of SDM630.
Change-Id: I297e6467ed47c51950ae527077c3d20cf738e0b6
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Raviteja Tamatam [Sat, 18 Feb 2017 05:31:34 +0000 (11:01 +0530)]
ARM: dts: msm: update correct read OT settings for mdss
Fix default read vbif OT settings for mdss driver
in sdm630 and sdm660.
Change-Id: I9efbda397ffbf3552a165887d43e25a0426fd5b5
Signed-off-by: Raviteja Tamatam <travitej@codeaurora.org>
Ashay Jaiswal [Sat, 18 Feb 2017 04:41:34 +0000 (10:11 +0530)]
power: qcom-charger: delay ICL change reporting to parallel psy
ICL change interrupt triggers whenever there is change in the
input ICL, in case of AICL restart(done as part of S/W base
pulsing) AICL starts from 500mA and ICL change gets triggered
for every 25mA ICL as part of AICL ramping.
ICL change handler generates a power_supply event on parallel
psys and thus causing parallel framework to re-split ICL for
every 25mA. Fix this by delaying power_supply event until AICL
settles.
Change-Id: I9270a99f536db4534e46764b2e053ff93b38cb54
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Ashay Jaiswal [Sat, 18 Feb 2017 04:29:23 +0000 (09:59 +0530)]
power: qcom-charger: Add support for software INOV
Hardware autonomous INOV does adapter's output voltage
manipulation only based on the input limited state of main
charger. This works well with MID-MID parallel configuration
but with USBIN-USBIN parallel configuration parallel charger's
input limited state also plays role for INOV manipulations.
Thus disable hardware based autonomous INOV and add support
for software based INOV for USBIN-USBIN configuration.
Note that if authentication is disabled, the hw assumes QC3.0 and
if the autonomous bit is enabled, it issues increment/decrement pulses.
This happens even when QC3.0 has not been actually authenticated.
Change-Id: I397acb558c9ba3b6fc7d7b974d64459f278697fd
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Ashay Jaiswal [Fri, 17 Feb 2017 10:30:05 +0000 (16:00 +0530)]
power: qcom-charger: add support for internal and external rsense
USBIN-USBIN parallel configuration can have either an internal current
sensing via main charger's BATFET or an external current sense resistor.
The FCC split between main and parallel charger differs based on current
sensing mode, add support to differentiate internal/external sensing and
the FCC split is done as follows:
- Internal Sensing: Main charger configure to full FCC
Parallel charger configured to 50% FCC.
- External sensing: Main charger configure to 50% FCC
Parallel charger configured to 50% FCC.
Change-Id: Ia0c6234ce6f62af460edd3c4f56e34810899b3e3
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Ashay Jaiswal [Thu, 16 Feb 2017 11:14:08 +0000 (16:44 +0530)]
power: qcom-charger: fix minor bugs in parallel path
"icl_reduction_ua" is not updated to new slave ICL value after
ICL split, update the variable.
Change-Id: I944fddfda1aa2c359785d1a3155ac22ebe91fa65
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Ashay Jaiswal [Thu, 16 Feb 2017 08:44:58 +0000 (14:14 +0530)]
power: qcom-charger: add a workaround flag for QC AUTH interrupt
In PM660 "QC authentication done" IRQ is a pulse and thus it
does not require workaround to disable this IRQ after authentication
completes. Add a workaround flag to enable this only for PMI8998.
Change-Id: I766219df38fc4954f5208d6db323b680e8e5fafd
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Mayank Rana [Thu, 8 Dec 2016 23:39:19 +0000 (15:39 -0800)]
usb: gsi: Capture USB GSI endpoint operations
In some cases it has been observed that after sending STARTXFER
command with USB GSI IN endpoint, USB controller is accessing zero
address resulting into bus error. This change captures USB GSI
operation sequence in debug buffer which may help to understand
race condition in terms of USB gadget events and USB GSI endpoint
operations.
Change-Id: Ia46877bb92ea0cc1d5f3712e5c70bb44232d5cfe
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
Nicholas Troast [Wed, 15 Feb 2017 00:11:56 +0000 (16:11 -0800)]
smb138x-charger: use SW based comparison for connector health
The hardware based threshold comparison requires thermal regulation to
be active. This is a problem for layouts which connect USBIN rather than
MID to the SMB138X since the thermal regulation will throttle the ICL in
the USBIN case.
Read the connector temperature ADC and compare against the thresholds
in software instead of enabling thermal regulation.
Change-Id: I9ecda675947fc6c82a8c8b67d0c9d930365ad02e
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
Al Viro [Fri, 20 Mar 2015 17:41:43 +0000 (17:41 +0000)]
net: validate the range we feed to iov_iter_init() in sys_sendto/sys_recvfrom
Change-Id: I4bbd1bd2b661bc21aa0fdcc436b09b3bd23803be
Cc: stable@vger.kernel.org # v3.19
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Git-commit:
4de930efc23b92ddf88ce91c405ee645fe6e27ea
Git-repo: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Signed-off-by: Ravi Kumar Siddojigari <rsiddoji@codeaurora.org>
[dcagle: Resolve trivial merge conflicts]
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
Linux Build Service Account [Fri, 17 Feb 2017 15:33:08 +0000 (07:33 -0800)]
Merge "ARM: dts: msm: move ref-clk from phy to ufs node in sdm660"
Linux Build Service Account [Fri, 17 Feb 2017 15:33:07 +0000 (07:33 -0800)]
Merge "ARM: dts: msm: Add qcom,gpu-limit property for sdm660"
Linux Build Service Account [Fri, 17 Feb 2017 15:33:06 +0000 (07:33 -0800)]
Merge "mm:camera: Do not detach isp node during smmu detach."
Linux Build Service Account [Fri, 17 Feb 2017 15:33:05 +0000 (07:33 -0800)]
Merge "msm: cpp: Call iommu detach in the error scenarios for secure case"
Linux Build Service Account [Fri, 17 Feb 2017 15:33:04 +0000 (07:33 -0800)]
Merge "block: protect iterate_bdevs() against concurrent close"
Linux Build Service Account [Fri, 17 Feb 2017 15:33:04 +0000 (07:33 -0800)]
Merge "drm/msm/sde:: fix optional property parsing for qseed and csc properties"
Linux Build Service Account [Fri, 17 Feb 2017 15:33:03 +0000 (07:33 -0800)]
Merge "tracing: Modify saved_tgids size for change in saved_cmdline_size"
Linux Build Service Account [Fri, 17 Feb 2017 15:33:02 +0000 (07:33 -0800)]
Merge "soc: qcom: ramdump: Remove page alignment during ramdump collection"
Linux Build Service Account [Fri, 17 Feb 2017 15:33:01 +0000 (07:33 -0800)]
Merge "ARM: dts: msm: update correct default OT settings for mdss"
Linux Build Service Account [Fri, 17 Feb 2017 15:33:01 +0000 (07:33 -0800)]
Merge "ARM: dts: msm: Add pmic bring up changes for SDM630 QRD"
Linux Build Service Account [Fri, 17 Feb 2017 15:32:59 +0000 (07:32 -0800)]
Merge "soc: qcom: pil: Allow the MBA memory to be dynamic or a carveout"