OSDN Git Service
Linux Build Service Account [Sat, 26 Nov 2016 22:26:48 +0000 (14:26 -0800)]
Merge "ARM: dts: msm: add support of pm3falcon PMIC for msmfalcon"
Linux Build Service Account [Sat, 26 Nov 2016 22:26:47 +0000 (14:26 -0800)]
Merge "soc: qcom: Turn off MSM_PERFORMANCE_HOTPLUG_ON by default"
Linux Build Service Account [Sat, 26 Nov 2016 22:26:44 +0000 (14:26 -0800)]
Merge "usb: pd: Fix VDM and misc timing issues"
Linux Build Service Account [Sat, 26 Nov 2016 01:47:08 +0000 (17:47 -0800)]
Merge "soc: qcom: msm_bus: Set current index to default value"
Linux Build Service Account [Sat, 26 Nov 2016 01:47:06 +0000 (17:47 -0800)]
Merge "ARM: dts: msm: Add thermal mitigation properties to msmfalcon"
Linux Build Service Account [Sat, 26 Nov 2016 01:47:05 +0000 (17:47 -0800)]
Merge "input: synaptics_dsx: add checks of user input data"
Linux Build Service Account [Sat, 26 Nov 2016 01:47:04 +0000 (17:47 -0800)]
Merge "ASoC: wcd9335: Add dapm ignore suspend for codec dai"
Linux Build Service Account [Sat, 26 Nov 2016 01:47:03 +0000 (17:47 -0800)]
Merge "ASoc: msm: qdsp6v2: Add support for compress capture"
Linux Build Service Account [Sat, 26 Nov 2016 01:47:02 +0000 (17:47 -0800)]
Merge "include: clock: Add audio external clock of_index extries"
Linux Build Service Account [Sat, 26 Nov 2016 01:47:00 +0000 (17:47 -0800)]
Merge "msm: mdss: fix to handle multi-rect configuration in error cases"
Linux Build Service Account [Sat, 26 Nov 2016 01:46:58 +0000 (17:46 -0800)]
Merge "msm: crypto: fix issues on digest buf and copy_from_user in qcedev.c"
Linux Build Service Account [Sat, 26 Nov 2016 01:46:58 +0000 (17:46 -0800)]
Merge "Revert "msm: kgsl: Enable limits management on A540v2""
Linux Build Service Account [Sat, 26 Nov 2016 01:46:56 +0000 (17:46 -0800)]
Merge "smb-lib: fix null ptr access while handling src change interrupt"
Linux Build Service Account [Sat, 26 Nov 2016 01:46:55 +0000 (17:46 -0800)]
Merge "msm: mdss: refine the calculation of tmds clock rate"
Linux Build Service Account [Sat, 26 Nov 2016 01:46:53 +0000 (17:46 -0800)]
Merge "msm: camera: Enable secure camera feature"
Linux Build Service Account [Sat, 26 Nov 2016 01:46:52 +0000 (17:46 -0800)]
Merge "soc: qcom: socinfo: Change offset of image OEM attribute"
Linux Build Service Account [Sat, 26 Nov 2016 01:46:51 +0000 (17:46 -0800)]
Merge "qpnp-smb2: force UFP mode before shutdown"
Linux Build Service Account [Sat, 26 Nov 2016 01:46:50 +0000 (17:46 -0800)]
Merge "qpnp-smb2: add support to configure auto recharge"
Linux Build Service Account [Fri, 25 Nov 2016 16:32:36 +0000 (08:32 -0800)]
Merge "qcom: scm: remove printing input arguments"
Linux Build Service Account [Fri, 25 Nov 2016 16:32:35 +0000 (08:32 -0800)]
Merge "audit: fix a double fetch in audit_log_single_execve_arg()"
Swetha Chikkaboraiah [Wed, 2 Nov 2016 11:19:41 +0000 (16:49 +0530)]
qcom: scm: remove printing input arguments
scm_call2 is printing the input arguments if TZ ret value is < 0
leading to information leak. Remove printing input arguments.
Change-Id: I21dd6d83fa979aed2c79ebb2c9c8de63a247dded
CRs-Fixed:
1076407
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
Signed-off-by: Paresh Purabhiya <ppurab@codeaurora.org>
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
Linux Build Service Account [Fri, 25 Nov 2016 08:10:26 +0000 (00:10 -0800)]
Merge "soc: qcom: fix uninitialized references in gladiator_erp_v2"
Linux Build Service Account [Fri, 25 Nov 2016 08:10:25 +0000 (00:10 -0800)]
Merge "ARM: dts: msm: Add support of IPA for falcon"
Dilip Gudlur [Tue, 22 Nov 2016 18:10:21 +0000 (10:10 -0800)]
soc: qcom: Turn off MSM_PERFORMANCE_HOTPLUG_ON by default
Core-ctl module by default, manages cpus instead of msm_performance
module. Set this config to allow msm_performance manage(hot-plug) cores
in the absence of core-ctl.
Change-Id: I02a1007edfc63ad2c2dd99616cb1a64432b08d13
Signed-off-by: Dilip Gudlur <dgudlur@codeaurora.org>
Linux Build Service Account [Thu, 24 Nov 2016 21:46:43 +0000 (13:46 -0800)]
Merge "clk: qcom: Add snapshot of OSM CPU clock driver"
Linux Build Service Account [Thu, 24 Nov 2016 21:46:39 +0000 (13:46 -0800)]
Merge "ARM: dts: msm: Add RTB support for msmtriton"
Linux Build Service Account [Thu, 24 Nov 2016 21:46:37 +0000 (13:46 -0800)]
Merge "ARM: dts: msm: Add mpm2-sleep-counter device for msmtriton"
Linux Build Service Account [Thu, 24 Nov 2016 21:46:36 +0000 (13:46 -0800)]
Merge "arm: qcom: correct description for MSMTRITON and MSMFALCON"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:39 +0000 (06:13 -0800)]
Merge "msm: vidc: parse 10-bit bus entries for msmfalcon"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:39 +0000 (06:13 -0800)]
Merge "ARM: dts: msm: Add venus device nodes for starlord"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:38 +0000 (06:13 -0800)]
Merge "msm: vidc: Update mbs per second calculation"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:36 +0000 (06:13 -0800)]
Merge "msm: vidc: fix mutex lock issue"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:35 +0000 (06:13 -0800)]
Merge "msm: vidc: fix the interrupt miss issue from video hardware"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:34 +0000 (06:13 -0800)]
Merge "msm: kgsl: Add support for A512 GPU"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:33 +0000 (06:13 -0800)]
Merge "ASoC: msm: Update supported sample rates for USB Backend"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:32 +0000 (06:13 -0800)]
Merge "netfilter: nfnetlink: correctly validate length of batch messages"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:31 +0000 (06:13 -0800)]
Merge "USB: gagget: f_fs: Return error if TX req is queued during device offline"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:29 +0000 (06:13 -0800)]
Merge "clk: qcom: Add support for rf clk1 for msmfalcon"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:28 +0000 (06:13 -0800)]
Merge "ARM: dts: msm: Update clock gfx node for MSMfalcon/Triton"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:26 +0000 (06:13 -0800)]
Merge "clk: qcom: Add support for MMCC clock for MSMFalcon"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:25 +0000 (06:13 -0800)]
Merge "cgroup: prefer %pK to %p"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:24 +0000 (06:13 -0800)]
Merge "HID: core: prevent out-of-bound readings"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:23 +0000 (06:13 -0800)]
Merge "[media] xc2028: avoid use after free"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:22 +0000 (06:13 -0800)]
Merge "tcp: fix use after free in tcp_xmit_retransmit_queue()"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:21 +0000 (06:13 -0800)]
Merge "block: fix use-after-free in sys_ioprio_get()"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:18 +0000 (06:13 -0800)]
Merge "cfg80211: validate beacon int as part of iface combinations"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:18 +0000 (06:13 -0800)]
Merge "cfg80211: fix beacon interval in interface combination iteration"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:17 +0000 (06:13 -0800)]
Merge "cfg80211: identically validate beacon interval for AP/MESH/IBSS"
Linux Build Service Account [Thu, 24 Nov 2016 14:13:16 +0000 (06:13 -0800)]
Merge "msm: sde: Correct max downscale factor for SDE rotator"
Kiran Gunda [Tue, 15 Nov 2016 13:06:34 +0000 (18:36 +0530)]
ARM: dts: msm: add support of pm3falcon PMIC for msmfalcon
PM3FALCON inherits all it's peripheral nodes from PM2FALCON.
Disable WLED which is not supported on pm3falcon.
CRs-Fixed:
1093681
Change-Id: I1eb0583010712286659ec9b726f4ae7a9a2a84e6
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
Jack Pham [Thu, 17 Nov 2016 19:26:55 +0000 (11:26 -0800)]
usb: pd: Fix VDM and misc timing issues
Decrease the wait time from 5ms to 2ms when preparing a VDM
response to ensure that it gets sent out timely within
tSenderResponse (15ms). To avoid possible collision with an
incoming packet, check that there has not been any queued Rx
message just prior to sending a VDM. Also check the result of the
transmit and simply try again later if -EBUSY is returned.
While at it, fix a couple other miscellaneous timing issues.
Setting PD_ACTIVE=1 has considerable delay due to the charger's
voting mechanism, so move setting it to after starting the
SenderResponse timer when sending the Source Capabilities, and
similarly after sending a Request as a sink, in order to make
sure response timing is met. For source hard reset, increase the
tSrcRecover delay slightly from the spec minimum to account for
additional VBUS rise/fall delays before sending PS_RDY. Finally,
add a delay for VCONN_SWAP before sending PS_RDY for similar reason.
Change-Id: I5760fadb66cad6faf02e95a1e1bb975289ef8e9f
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Jack Pham [Wed, 16 Nov 2016 22:28:10 +0000 (14:28 -0800)]
usb: pd: Avoid spurious state machine work on CC change
If an unexpected or delayed Type-C mode change notification
arrives from the charger driver, it could falsely kick the
state machine and could cause it to prematurely hard reset
since it preempted an expected message. This is particularly
true for the PR Swap operation in which the timing of PS_RDY
and resulting power negotiation is disrupted by the CC change
notification which is catching up. The previous way of handling
this by using the pd->in_pr_swap flag to mask the typec_mode
changes is quite fragile due to the uncertainty of when said
flag should be cleared.
Hence, demote the use of the in_pr_swap flag for only ignoring
the expected disconnect the happens in between the role change.
Then, for typec_mode changes, determine if current_pr is changed
or not to decide whether to kick the state machine. Finally,
since disconnect now is signaled by pd->current_pr==PR_NONE,
we'll need to keep track of whether VBUS had been enabled with
a separate flag rather than relying on pd->current_pr==PR_SRC.
Change-Id: I66be40091b75726d25c7be4478f1248a6af9ca3c
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Jack Pham [Sat, 5 Nov 2016 17:55:38 +0000 (10:55 -0700)]
usb: pd: Reset msgid counters properly
Make sure to reset both Tx and Rx msgid counters when the
protocol layer needs to be reset. This occurs after hard/soft
reset as well as when starting up a new sink or source session.
Put this in a common function pd_reset_protocol().
Change-Id: I643a60a28e6498ca16b6f46293b8aa05eff40266
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Jack Pham [Wed, 16 Nov 2016 19:30:30 +0000 (11:30 -0800)]
usb: pd: Fix sink hard reset timing
The current hard reset handling (most recently fixed with
commit
172cec3a2c76 ("usb: pd: Improve sink hard reset handling"))
is based on a maximum timeout for the longest possible (according
to spec) duration that VBUS may turn off and back on again, just
under 2s, before re-starting the sink and waiting for capabilities
again. However, this method is prone to timing errors, particularly
tTypeCSinkWaitCap, which should be based on when VBUS turns on.
Fix this by making use of the VBUS presence notification from the
charger (PROP_PRESENT). Keep track of this in the psy_changed()
callback and use the falling notification to determine when to
transition out of PE_SNK_TRANSITION_TO_DEFAULT into PE_SNK_STARTUP.
Bring back PE_SNK_DISCOVERY which is now used as a waiting state
until the VBUS rising notification comes and transition to
PE_SNK_WAIT_FOR_CAPABILITIES. And move setting of PROP_VOLTAGE_MAX
to PE_SNK_STARTUP after VBUS has turned off to avoid tripping
the charger's overvoltage detection.
Also since aforementioned commit, the CC HW is now able to handle
VBUS going away and not treating it as a false disconnect, so we
can remove the workaround as a disconnect can now be treated as
a disconnect.
Change-Id: I885f3f4c219e102758fd09c8aae9257d093ebb72
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Paul Moore [Tue, 19 Jul 2016 21:42:57 +0000 (17:42 -0400)]
audit: fix a double fetch in audit_log_single_execve_arg()
There is a double fetch problem in audit_log_single_execve_arg()
where we first check the execve(2) argumnets for any "bad" characters
which would require hex encoding and then re-fetch the arguments for
logging in the audit record[1]. Of course this leaves a window of
opportunity for an unsavory application to munge with the data.
This patch reworks things by only fetching the argument data once[2]
into a buffer where it is scanned and logged into the audit
records(s). In addition to fixing the double fetch, this patch
improves on the original code in a few other ways: better handling
of large arguments which require encoding, stricter record length
checking, and some performance improvements (completely unverified,
but we got rid of some strlen() calls, that's got to be a good
thing).
As part of the development of this patch, I've also created a basic
regression test for the audit-testsuite, the test can be tracked on
GitHub at the following link:
* https://github.com/linux-audit/audit-testsuite/issues/25
[1] If you pay careful attention, there is actually a triple fetch
problem due to a strnlen_user() call at the top of the function.
[2] This is a tiny white lie, we do make a call to strnlen_user()
prior to fetching the argument data. I don't like it, but due to the
way the audit record is structured we really have no choice unless we
copy the entire argument at once (which would require a rather
wasteful allocation). The good news is that with this patch the
kernel no longer relies on this strnlen_user() value for anything
beyond recording it in the log, we also update it with a trustworthy
value whenever possible.
Reported-by: Pengfei Wang <wpengfeinudt@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Change-Id: Ie9848961d236739df5014474f2c2a781af9fb811
Git-repo: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Git-commit:
43761473c254b45883a64441dd0bc85a42f3645c
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
Kyle Yan [Wed, 23 Nov 2016 18:54:11 +0000 (10:54 -0800)]
Merge rel/msm-4.4 on remote branch
Change-Id: Id919aee14aa3898b8168015a3ae310437d604812
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
Manaf Meethalavalappu Pallikunhi [Tue, 25 Oct 2016 14:28:16 +0000 (19:58 +0530)]
ARM: dts: msm: Add thermal mitigation properties to msmfalcon
Add thermal properties to enable kernel thermal monitoring and
mitigations like hotplug, thermal reset, vdd restriction, etc.
for msmfalcon. Add mitigation profiles for each physical CPU which
has information like sensor to monitor and various mitigation types
to enable for msmfalcon.
Change-Id: I36ca125143cf9929fb0bd781990bdd8ab1dbeebf
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
Manaf Meethalavalappu Pallikunhi [Tue, 25 Oct 2016 14:16:39 +0000 (19:46 +0530)]
ARM: dts: msm: Add thermal sensor info for msmfalcon
Add thermal sensor related information, which provides information
such as alias, type and scaling factor to Kernel Thermal Monitor(KTM).
The KTM exposes these sensor information via sysfs to thermal-engine.
Change-Id: Ie564c181db61f6229479a49917cdb9e6c1887fc5
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
Min Chong [Fri, 2 Sep 2016 18:36:37 +0000 (11:36 -0700)]
input: synaptics_dsx: add checks of user input data
Add checks of the user input count to avoid possible heap overflow
Signed-off-by: Min Chong <mchong@google.com>
Bug:
30937462
Git-repo: https://android.googlesource.com/kernel/msm.git
Git-commit:
a6accafb252a76256f11c83e28c556c8ca4b8e1f
Change-Id: I6fc8323cbcf395a2c24e49e65cc7012709d031a2
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
Neeraj Upadhyay [Tue, 22 Nov 2016 07:08:27 +0000 (12:38 +0530)]
soc: qcom: fix uninitialized references in gladiator_erp_v2
Fix uninitialized references in gladiator_erp_v2, reported
by static analysis tool. While at it, log all error registers
for Gladiator error.
Change-Id: If2b81e8b8fd446a07bc92ff23f74cdaa9ed11ff5
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Oleg Perelet [Mon, 21 Nov 2016 22:59:37 +0000 (14:59 -0800)]
Revert "msm: kgsl: Enable limits management on A540v2"
This reverts commit
691ddba4ee20 ("msm: kgsl: Enable limits
management on A540v2"). The GPU does not hit the voltage
limits at 670mhz so there isn't any need to enable
limit management.
CRs-Fixed:
1056661
Change-Id: If225dc4ec2c2e3eb8996f49f4fdf6acd31a50680
Signed-off-by: Oleg Perelet <operelet@codeaurora.org>
Runmin Wang [Thu, 6 Oct 2016 01:46:09 +0000 (18:46 -0700)]
msm: 8998: Replace cobalt with 8998
Update the code name from msmcobalt to msm8998. As a result, update
the filename containing "cobalt" and files content containing "cobalt".
CRs-Fixed:
1070840
Change-Id: I2c7b95e3e2a2fec7730724da9eeb86a39a77faf1
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
Signed-off-by: Jeevan Shriram <jshriram@codeaurora.org>
Ingrid Gallardo [Tue, 22 Nov 2016 20:25:33 +0000 (12:25 -0800)]
msm: mdss: fix to handle multi-rect configuration in error cases
In case of an error when configuring a pipe during kickoff,
driver unstages from HW the pipe that had the error, so it
makes sure this dirty pipe is not used by HW.
This is a problem if the pipe is configured in multi-rect
mode and we only fail one of the two multi-rect pipes since
in this case HW is expecting both multi-rect pipes that
represent the two HW rectangles and we are only configuring
one due the error that happened.
Fix this problem by making sure that if the configuration of
one multi-rect fail, we unstage both multi-rect pipes.
Change-Id: I09fbda8eb92c81acf24d0ff07ca9c040141680e1
Signed-off-by: Ingrid Gallardo <ingridg@codeaurora.org>
Utkarsh Saxena [Thu, 25 Aug 2016 06:43:09 +0000 (12:13 +0530)]
ARM: dts: msm: Add support of IPA for falcon
Falcon uses IPA HW to shunt data between
different components like apps, modem and usb.
Add a support to enable IPA node for falcon.
Change-Id: If2b37804d82160d7965ea1d0f6eb69f96b3514f4
Acked-by: Mohammed Javid <mjavid@qti.qualcomm.com>
Signed-off-by: Utkarsh Saxena <usaxena@codeaurora.org>
Rajesh Kemisetti [Thu, 10 Nov 2016 15:41:55 +0000 (21:11 +0530)]
msm: kgsl: Add support for A512 GPU
Add new GPU ID, corresponding VBIF and
initial settings for A512.
Change-Id: Id30415ce0ea73012125ced35771b9aae9f941c22
Signed-off-by: Rajesh Kemisetti <rajeshk@codeaurora.org>
Imran Khan [Sun, 20 Nov 2016 18:25:44 +0000 (23:55 +0530)]
soc: qcom: socinfo: Change offset of image OEM attribute
There is a requirement, for diag command handler, that needs
the separator between image variant and image OEM to be shown
as part of OEM value in sysfs. So change the relevant offset
and size to include this information in image oem sysfs
attribute.
CRs-Fixed:
1086976
Change-Id: Iae12fa648df17dddd48f3a71e94d06c2c3b03277
Signed-off-by: Imran Khan <kimran@codeaurora.org>
Neeraj Upadhyay [Tue, 22 Nov 2016 06:41:28 +0000 (12:11 +0530)]
arm: qcom: correct description for MSMTRITON and MSMFALCON
Correct description for ARCH_MSMFALCON and ARCH_MSMTRITON,
to match the guidelines.
Change-Id: I2e657f3237c7ed38111b7bc6bddbf07ef4420924
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Nicholas Troast [Tue, 22 Nov 2016 00:36:05 +0000 (16:36 -0800)]
qpnp-smb2: force UFP mode before shutdown
If a legacy Type-A to Type-C cable is attached to the phone, but the
Type-A end is left disconnected, then the VBUS capacitor will be charged
when DRP toggles to DFP mode. Since VBUS is charged it will prevent the
device from staying in power off state when shutdown.
Fix this by forcing UFP mode before shutdown so the VBUS capacitor will be
discharged, and therefore it will not trigger PON to restart the device.
Change-Id: I53f89cf6b7c11f32c5e8e5a51a5986fa31424b92
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
Subbaraman Narayanamurthy [Wed, 16 Nov 2016 03:39:08 +0000 (19:39 -0800)]
qpnp-smb2: add support to configure auto recharge
Currently, smb2 charger uses VBT_LT_CHG_RECHARGE_THRESH signal
from FG to enable auto recharge by default. Add support to
configure smb2 charger to use SOC_LT_CHG_RECHARGE_THRESH signal
from FG if needed.
This will enable charging to resume again when battery SOC drops
below the automatic recharge SOC threshold (configured in FG)
while charger is inserted and SOC goes down after the charge
termination had happened.
Change-Id: Ic68cd12cc861d04e107b70e2b96200483f13da26
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Karthikeyan Periasamy [Sat, 19 Nov 2016 01:30:16 +0000 (17:30 -0800)]
msm: vidc: fix the interrupt miss issue from video hardware
enable_irq() called before processing responses in work handler
which would lead to miss interrupt from video hardware sometimes.
An interrupt from video h/w will queue the work to work handler
but if work is already running the new work is not posted.
work handler has two parts, one, read all the messages from video h/w,
two, process the messages. queue work while processing messages
will miss reading the new messages from video h/w because
the queue work (as a result of interrupt from video h/w) will not
actually queue the work as work handler already running. Fix the
issue by enabling irq after processing all the responses to
makesure interrupt coming from video h/w after work handler
completed processing the messages.
CRs-Fixed:
1086284
Change-Id: Id158e5c6d89fc8b761d8cfe92afbf3592877c556
Signed-off-by: Karthikeyan Periasamy <kperiasa@codeaurora.org>
Linux Build Service Account [Mon, 21 Nov 2016 17:18:58 +0000 (09:18 -0800)]
Merge "msm: gsi: fix interrupt processing"
Linux Build Service Account [Mon, 21 Nov 2016 17:18:57 +0000 (09:18 -0800)]
Merge "clk: qcom: Add set_flags ops for the clk_gate2_ops"
Linux Build Service Account [Mon, 21 Nov 2016 17:18:57 +0000 (09:18 -0800)]
Merge "ARM: dts: msm: Add DT for mediabox variant of apqcobalt"
Linux Build Service Account [Mon, 21 Nov 2016 17:18:56 +0000 (09:18 -0800)]
Merge "msm: ipa: add api for getting IPA pdev"
Taniya Das [Mon, 21 Nov 2016 09:25:00 +0000 (14:55 +0530)]
clk: qcom: Add support for rf clk1 for msmfalcon
RF clock 2 is not required on msmfalcon, so remove the clock instance and
add rf clk1 support instead.
Change-Id: I13258295e9ae9c8607586ed5686e97276823d08c
Signed-off-by: Taniya Das <tdas@codeaurora.org>
Taniya Das [Thu, 17 Nov 2016 06:19:24 +0000 (11:49 +0530)]
ARM: dts: msm: Update clock gfx node for MSMfalcon/Triton
Modify the clock_gfx dummy clock to use the real clock controller for all
gpu clock controller clients.
Change-Id: If3c707877f2a0da04065b57a1c2fd44d256a5303
Signed-off-by: Taniya Das <tdas@codeaurora.org>
Taniya Das [Tue, 8 Nov 2016 14:01:35 +0000 (19:31 +0530)]
defconfig: msm: Add support for GPUCC clocks
GPU clock controller is required to be enabled for GPU clocks
supported by GPU clock controller.
Change-Id: Ica381b0b73bd59a10ac8fd876bda5c21678dfddb
Signed-off-by: Taniya Das <tdas@codeaurora.org>
Taniya Das [Sat, 24 Sep 2016 11:02:36 +0000 (16:32 +0530)]
clk: qcom: Add support for MMCC clock for MSMFalcon
Add support for the multimedia clock controller found on MSMFalcon
based devices. This should allow most clocks for multimedia peripherals
which includes display, video, camera etc.
Change-Id: If8aa0b094af5ff82fe66c95e3ef2f13632950d2e
Signed-off-by: Taniya Das <tdas@codeaurora.org>
Skylar Chang [Fri, 18 Nov 2016 18:56:51 +0000 (10:56 -0800)]
msm: gsi: fix interrupt processing
Fix GSI interrupt processing to make sure interrupt are
not missed. In order to achieve that interrupt should first be
cleared before processed.
Change-Id: I42978f2230e95456e4b4e932365e5b2c83445f56
CRs-Fixed:
1090894
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
Neeraj Upadhyay [Wed, 16 Nov 2016 14:09:07 +0000 (19:39 +0530)]
ARM: dts: msm: Add RTB support for msmtriton
Add RTB (Register Trace Buffer) device tree entry for
msmtriton.
Change-Id: I6d55bf454cd629cd4894b60e40e9266d7e8b5bb9
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Neeraj Upadhyay [Wed, 16 Nov 2016 14:07:49 +0000 (19:37 +0530)]
ARM: dts: msm: Add mpm2-sleep-counter device for msmtriton
Add mpm2-sleep-counter device node, which is used by the
boot_stats driver.
Change-Id: I2c8ffe10b650777f6c0b697c33e958300c9dbe66
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Neeraj Upadhyay [Wed, 9 Nov 2016 12:58:07 +0000 (18:28 +0530)]
ARM: dts: msm: Add restart node and imem entries for msmtriton
Add restart node for msmtriton. Additionally, add IMEM
entries for restart-reason, dload_type, and boot_stats.
Change-Id: Ic72005ca76ceea377154e4b11dceccd7c8dc5ab5
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Neeraj Upadhyay [Wed, 16 Nov 2016 13:50:19 +0000 (19:20 +0530)]
ARM: dts: msm: Add RTB support for msmfalcon
Add RTB (Register Trace Buffer) device tree entry for
msmfalcon.
Change-Id: Ifd9f97f8595daac67c733e6120cdb3c89e5a02a4
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Neeraj Upadhyay [Wed, 16 Nov 2016 13:49:19 +0000 (19:19 +0530)]
ARM: dts: msm: Add mpm2-sleep-counter device for msmfalcon
Add mpm2-sleep-counter device node, which is used by the
boot_stats driver.
Change-Id: I32fb4c9a9be83a4448754bffde798432e417b17c
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Neeraj Upadhyay [Wed, 9 Nov 2016 12:39:53 +0000 (18:09 +0530)]
ARM: dts: msm: Add restart node and imem entries for msmfalcon
Add restart node for msmfalcon. Additionally, add IMEM
entries for restart-reason, dload_type, and boot_stats.
Change-Id: I48e84889b0867d98d70056eecae07becebae4c00
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Neeraj Upadhyay [Wed, 9 Nov 2016 12:12:33 +0000 (17:42 +0530)]
ARM: dts: msm: add perf-events support for msmfalcon and msmtriton
Add device tree entry for performance monitor unit (pmu) on msmfalcon
and msmtriton.
Change-Id: I97a28cccc0494ea5ff45ccade9721da0c85edef7
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Amit Nischal [Thu, 17 Nov 2016 09:47:05 +0000 (15:17 +0530)]
clk: qcom: Add set_flags ops for the clk_gate2_ops
Gate clocks would also require to set the flags using
clk_set_flags. Add the clk_ops for the same.
Change-Id: I9d180e4aedb17692eb2e48f98461239d29bbf975
Signed-off-by: Amit Nischal <anischal@codeaurora.org>
Linux Build Service Account [Mon, 21 Nov 2016 01:44:55 +0000 (17:44 -0800)]
Merge "ARM: dts: msm: change UFS/SDHC2 power supply for msmcobalt interposer QRD"
Linux Build Service Account [Sat, 19 Nov 2016 15:36:59 +0000 (07:36 -0800)]
Merge "ARM: dts: msm: add charger/fg device nodes for PMFALCON"
Linux Build Service Account [Sat, 19 Nov 2016 12:39:11 +0000 (05:39 -0700)]
Promotion of kernel.lnx.4.4-161119.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1088658 I2f994ae0250ffc8f740ea633324815ae429c74be msm: ipa3: linearize large skbs
1077102 I09359b528b4742f72a76690930f3d0ed90bb2caa msm: mdss: move warnings and errors out of mdss spinlock
1089895 I84185558fa6e80b13d7d0078bda9d75143680941 tcp: take care of truncations done by sk_filter()
1091511 Ia151b2dd5229f07790ac961af298305b24e098fb msm: wlan: update regulatory database
1081957 I24820bd6254002f8a8db9604d230dcbce59b1beb clk: qcom: Add support to be able to slew PLL
1081738 I10a788726358c56df9bfe11f2332e3823d7cd332 ARM: dts: msm: Enable auto GM for WLED in pmicobalt
1077726 I031ca48f0e0c39f1b2cb51081ecd55b086fb4c9b msm: mdss: fix pp timeout during transition from LP1 to
1074985 Ib2268181a617c23d62b5b6f857be5327113b2a67 soc: qcom: smem: Redesign smem memory architecture
1090708 I9cda84d1c199b72ce8b9e2997601bcc7430ddbf3 ARM: dts: msm: Update the console uart gpios for msmfalc
1080245 I3b4cf83e776750d993d53331142223109bf0862e clk: qcom: Add support for debugfs support
1087110 I3694952289c76394af8d40cd89fd2175f49ac127 msm: mdss: Add systrace for readptr_done
1089865 Ia73ab1ba51df7b501d246bb45141018409496d01 ARM: dts: msm: ensure contiguous MSI for PCIe on msmcoba
941978 Idee8691d769218d7e732c9b7f936a2c40946b239 Revert "scsi: ufs: stub UFS shutdown handler"
1091072 I7e9ada5de1f619c6a34a4b2e1764f5e908564ce5 iio: rradc: Update reading USBIN_V channel
1075082 I971e555ec8d02ccf4382e83132a696b065a8ff12 qseecom: improve error checks in qseecom_probe()
1080245 Ib67b3a3409c9e7d8adb710bb524f54f543abf712 clk: add/modify debugfs support for clocks
941978 Id499abc27303bfed72fab4d61abb872bad7d9043 scsi: ufs: error out all issued requests after shutdown
1083537 I73fc02b812f2e6694e2a6aa8bdad2381a5f19406 ASoC: msm: Fix sound card registration failure
1085331 I92e98ab46107fbcfd843898423b41716a204c2ae ARM: dts: msm: Correct interrupt assignments for msmcoba
1073250 Idc9ca896b3fe6c1c6a72a066a6e453d27a3173e8 Asoc: clean up bootup errors
1091147 I30b8488a1c19815601e6a1c5bcbdeed53715f8fa usb: phy: qusb: Make sure QUSB PHY is into proper state
1086292 I6482dc3d21fdc3e570fd53022e2fb9427668d939 msm: mdss: add null check before dereferencing src_fmt
1086292 I4812330453dedacd16dad1d920a2bacc3f67042b msm: mdss: fix race condition in dsi clk off request
1088709 I21e1c029e6b245cfa26a187b35bb1f6845302484 clk: msm: Add the CLKFLAG_NO_RATE_CACHE flag for MM cloc
1082112 I171c91e700c24ecc213ccda705bbe6188d22a43a scsi: ufs: fix sleep in atomic context
1091354 I9f928f0aad6af346de43965755beb039e422047a Revert "defconfig: msm: avoid compilation of MDSS DP dri
1090727 I78d2c27743d30b90a96e3d8df60859f67db7ddb8 ARM: dts: msm: Add ufs regulators for msmfalcon interpos
1090029 I66f6de42b106fa2027285e7393b6f9fc143d00d8 leds: qpnp-flash: Fix the mask in the flash prepare API
1089181 I4a382915a6c3a6b9d445ec1f5d57fb499a011f1a driver: thermal: msm_thermal: Enable Reliability algorit
1079438 Ib14c5b9121190dded5071ff60ecf0be8e5e5c232 ARM: dts: msm: Add physical dimensions for NT35597 panel
1060212 Iabe79bae5f9471c3c6128ed21efd04de00739daa leds: qpnp-flash-v2: Add support for thermal derate feat
1091127 I7220ad565212c325514301e4c59415b807deb99a ARM: dts: msm: Add gladiator support on msmfalcon and ms
1091440 I0eb8b9a357f172984612175d1b03dd872df91b6f diag: Call diagmem_exit only if the mempool is initializ
1090076 Ia85688854f26fe871d5c1253c2d51d75d84deb8f ARM: dts: msm: Add dummy regulator for LCDB bias
1064071 Ic0dedbad372fd9029b932dd99633a650049751ed msm: kgsl: Fix pagetable member of struct kgsl_memdesc
1083537 I3d2765535793d6ef9153cfcab4b44a9adad67e15 ASoC: msm: Add support for USB/WCN/TDM Audio
1091141 I6ce48512df5973bf8a2a3081a3a6f8759aeb499f ARM: dts: msm: Set USB core clock rate for USB2/USB3 for
1060212 Ie7a94f59e58b8f1b0816afda2496449694629205 leds: qpnp-flash-v2: add support to read pmic revid
1080701 If08ff46e72d537254e90707f28c849a86f262853 ARM: dts: msm: specify I2C configuration for msmfalcon
1079442 I822d6280b301b2db6194c845098c935e612ca61c ASoC: wcd934x: Fix adie loopback through sidetone src pa
1089895 Idc52737bc96097a9220dfe47bb76e94ff1026a05 rose: limit sk_filter trim to payload
1091147 Ibfecfe1846d02b959bd249acac3fe4c57b88aaf0 USB: phy: qusb: Turn on vdd along with 1p8/3p3 LDOs when
1090701 I0e06be169edc2eb1d35ef7fc6c41ff1809aebd03 pinctrl: qcom: msmfalcon: Update gpios as per latest gpi
1086292 I422d53d008223a9b0520f499e629f681bb6afa05 mdss: mdp: avoid panic if recovery handler is uninitiali
1060212 I42503ccd2b2dcc62c5c868132d202b9698c9d216 leds: qpnp-flash-v2: change from dev_*() to pr_*() for l
1090076 Ie828c8568ef09c89cff157d16d3cb322647b6f6e ARM: dts: msm: enable mdss power supplies for falcon tra
1074879 I8d224a70cbef162f27078b62b73acaa22670861d sched/hmp: Enhance co-location and scheduler boost featu
1087471 I15323e3ef91401142d3841db59c18fd8fee753fd sched: Remove thread group iteration from colocation
1085170 Ie23d473302d7fbda9b243a150e5c52d025007e4f usb: pd: Stop processing SVDM if handler found
1091540 I61523188f45daca026b90943c845b43a8327f51e qcom-charger: smb2: Disable try.SINK mode in the probe
1081738 Iee99e9d1b999c84ece075d2f17e9cdf6aef9a2ac leds: qpnp-wled: Add support to configure AUTO_GM settin
1081922 I9aa7a000e75b50c6b26970deaba2131c87087b8c msm: mdss: fix autorefresh disable during handoff
1075694 I9cf2f94892bdeb83fab0068902419b1603520364 msm: kgsl: preserve ISENSE registers across GPU power co
1085321 1085649 I3c9422f3a790c0c1633ab64d4213a088faaeb9e5 diag: Set the diag write buffers to busy state on channe
1090311 I96cdcb9e3642906b4afa08d9bde07e123d9b3977 USB: Allow skipping device resume during system resume
1074879 I470bcd0588e038b4a540d337fe6a412f2fa74920 sched: revise boost logic when boost_type is SCHED_BOOST
1087020 I6f9b7a630158355a7f920dcf9cfffe537b1c6a85 ASoC: msm: q6dspv2: fix potentional information leak
1089062 Icb04f6175b66fa46405e77d10fddf06b0051ee5f phy: qcom-ufs: update ufs phy 1-lane settings
1082590 I4cdcbd31b5fa5ceac0eea7c743ea9286f231b80b scsi: ufs: handle LINERESET during hibern8
1081738 I964b3452d0cdb3618b4ab446655ae75fa3a1049d leds: qpnp-wled: Add support to configure auto PFM for p
1080245 I936496e553bc958c10e743fd8a225ffc7fbc0f79 clk: Add support to allow client to print all enabled cl
1079373 Ifd7b2b88e7ab4c952b743fede6e24795069d653a qcom-charger: WA for legacy bit set on hard reboot
1090518 I7f1c0d9d84607821893a1e5d17934dae5acef5f4 clk: qcom: Add support for RCGs with dynamic and fixed s
1089865 I1e74f1b03c3e15880efdac7ff07aca2f628de99d ARM: dts: msm: enable QGIC MSI for PCIe on msmcobalt
1088059 I66cbe48b7f4910228a6af57610a8427fea7fd1f2 msm: mdss: fix incorrect mutex unlocking during NOTIFY_U
1087418 Ia3fb69dca00654dacd8d1faae34715e40e097480 scsi: ufs: enable auto hibern8 only after device initial
1088216 I326eceeddff8e77d346c3365fa46cd539324451f ARM: dts: msm: Add support for USB device for msmfalcon
1060212 Iafb7915e196a18b5f8076dda8fb06a4bd71a8e6e leds: qpnp-flash-v2: Add support for configuring OTST th
1086372 Ia03380dfa4852c80fedb38f3c79f55d8d1a9a7f6 icnss: Reset mpm_wcssaon_config bits before top level re
1080245 I0a202af6f46c7cf164036d65487db5c40aab4063 clk: Add support for list_rates ops for clocks
1091477 I7435f05f20e12a7704ae5d9597b5cdc9b5a61d00 qcom-charger: Change usb_icl votable for PD vote
1089062 Ief5df61d91fbd765c595533b3380a602a2540e5e scsi: ufs-qcom: update clock scaling sequence
1085217 I62de66e9b0bb1eeeac3c94d1ac1037285811b631 msm: ipa3: header file change for wdi-stats
1080674 I15ef73049cee76c6ea5b3916d9281bbd9fdfc563 ARM: dts: msm: specify UART configuration on msmfalcon.
1090525 I48c50bc320425c0db40cd4865e05c6b7a7fb5da3 msm: sde: remove secure camera ctrl_id definition
1061507 Iad71abbed72aa40b5c839260f5c297a885f7d128 ASoC: wcd-mbhc: correct cross connection check
1085064 Ib53902459646e590df4dc7fcb00f833d5e8f41ed usb: pd: Don't suspend charging unless changing voltages
1064071 Ic0dedbad661143977a226d50263c26b5af579ce3 msm: kgsl: Make sure USE_CPU_MAP + MAP_USER_MEM work tog
1090862 987021 I0d1797a4df9ff67f3b162a1b5d26320ca989f54a msm: mdss: hide additional kernel addresses from unprivi
Change-Id: Ic6272ada932975c2562cb87d4a617520002db3d3
CRs-Fixed:
1082112,
1075694,
1091440,
1085331,
1089062,
1081922,
1089895,
1077726,
1090029,
1061507,
1091354,
1074879, 987021,
1086292,
1085217,
1087020,
1080245,
1088709,
1089181,
1085064,
1087471,
1088059,
1080674,
1090862,
1079442,
1087418,
1090727,
1085649,
1064071,
1081738,
1086372, 941978,
1090518,
1090708,
1077102,
1090076,
1085321,
1091477,
1090701,
1090311,
1091511,
1091141,
1074985,
1079438,
1091147,
1075082,
1091127,
1087110,
1082590,
1081957,
1090525,
1085170,
1088658,
1080701,
1083537,
1091540,
1088216,
1079373,
1060212,
1073250,
1089865,
1091072
Linux Build Service Account [Sat, 19 Nov 2016 04:32:06 +0000 (20:32 -0800)]
Merge "ASoC: msm: q6dspv2: fix potentional information leak"
Linux Build Service Account [Sat, 19 Nov 2016 04:32:05 +0000 (20:32 -0800)]
Merge "ASoC: wcd934x: Fix adie loopback through sidetone src path"
Linux Build Service Account [Sat, 19 Nov 2016 04:32:04 +0000 (20:32 -0800)]
Merge "Asoc: clean up bootup errors"
Linux Build Service Account [Sat, 19 Nov 2016 04:32:03 +0000 (20:32 -0800)]
Merge "Revert "defconfig: msm: avoid compilation of MDSS DP driver for 32-bit msmfalcon""
Linux Build Service Account [Sat, 19 Nov 2016 04:32:03 +0000 (20:32 -0800)]
Merge "ARM: dts: msm: Add support for USB device for msmfalcon and msmtriton"
Linux Build Service Account [Sat, 19 Nov 2016 04:32:02 +0000 (20:32 -0800)]
Merge "ARM: dts: msm: enable mdss power supplies for falcon track3"
Linux Build Service Account [Sat, 19 Nov 2016 04:32:01 +0000 (20:32 -0800)]
Merge "usb: pd: Don't suspend charging unless changing voltages"
Linux Build Service Account [Sat, 19 Nov 2016 04:32:00 +0000 (20:32 -0800)]
Merge "iio: rradc: Update reading USBIN_V channel"
Linux Build Service Account [Sat, 19 Nov 2016 04:31:59 +0000 (20:31 -0800)]
Merge "icnss: Reset mpm_wcssaon_config bits before top level reset"
Linux Build Service Account [Sat, 19 Nov 2016 04:31:58 +0000 (20:31 -0800)]
Merge "qcom-charger: smb2: Disable try.SINK mode in the probe"