OSDN Git Service
Linux Build Service Account [Sun, 19 Nov 2017 15:45:12 +0000 (07:45 -0800)]
Merge "msm: kgsl: Use the bind lock when dumping entries"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:11 +0000 (07:45 -0800)]
Merge "msm: ais: sensor: actuator: avoid accessing out of bound memory"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:10 +0000 (07:45 -0800)]
Merge "drivers: qdsp6v2: Add mutex unlock to properly release lock"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:09 +0000 (07:45 -0800)]
Merge "security: pfe: Return proper error code"
Linux Build Service Account [Sun, 19 Nov 2017 15:45:08 +0000 (07:45 -0800)]
Merge "ARM: dts: msm: Fix tavil codec reset issue on sdm660"
Linux Build Service Account [Sat, 18 Nov 2017 08:35:27 +0000 (00:35 -0800)]
Merge "ath10k: check the pipe credit update enabled flag before set"
Linux Build Service Account [Sat, 18 Nov 2017 08:35:25 +0000 (00:35 -0800)]
Merge "power: qpnp-fg-gen3: update battery profile based on Rconn configuration"
Linux Build Service Account [Sat, 18 Nov 2017 00:00:55 +0000 (16:00 -0800)]
Merge "DRM: SDE: Fix the spelling in DTS parser"
Linux Build Service Account [Sat, 18 Nov 2017 00:00:54 +0000 (16:00 -0800)]
Merge "ARM: dts: msm: Add support for MSM8996 Mizar platform"
Sarada Prasanna Garnayak [Sat, 11 Nov 2017 07:24:50 +0000 (12:54 +0530)]
ath10k: check the pipe credit update enabled flag before set
Check the credit update flag has enabled for the pipe
before setting the flag for credit report update request
on the wcn3990 WLAN module.
CRs-Fixed:
2141924
Change-Id: Ic628fa49934c110b7abccefb45a2a354dc462791
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
Linux Build Service Account [Fri, 17 Nov 2017 03:11:13 +0000 (19:11 -0800)]
Merge "msm: camera: Enable (2+1) lane csiphy combo mode"
Camus Wong [Mon, 13 Nov 2017 21:20:02 +0000 (16:20 -0500)]
DRM: SDE: Fix the spelling in DTS parser
Fix one of the mode properties' spelling error.
Change-Id: I6cb0f31aa62b825773b97099fcac3da8a2b94af6
Signed-off-by: Camus Wong <camusw@codeaurora.org>
Camus Wong [Sat, 11 Nov 2017 05:41:10 +0000 (00:41 -0500)]
SDE: Fix the minimum value in display property
The minium value of u32 is zero instead of -1. -1 will become the
largest value in u32.
Change-Id: I20fcab7d5912d6da7c4afe1ec7a86333767b0bf1
Signed-off-by: Camus Wong <camusw@codeaurora.org>
Bharathraj Nagaraju [Wed, 2 Aug 2017 17:02:01 +0000 (10:02 -0700)]
ARM: dts: msm: Add support for MSM8996 Mizar platform
Add device tree files needed to support MSM8996 based
mizar platform.
Change-Id: Ife6c6659b981b37c6b9d9cbb0a0c106488f1e07f
Signed-off-by: Bharathraj Nagaraju <snbraj@codeaurora.org>
Lynus Vaz [Mon, 30 Oct 2017 12:20:43 +0000 (17:50 +0530)]
msm: kgsl: Use the bind lock when dumping entries
Take the bind lock when we dump information about sparse memory
allocations through the debugfs node.
Change-Id: I955d64d06a259a2bbe4d85a33d68887ee01aad07
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
Subbaraman Narayanamurthy [Fri, 10 Nov 2017 23:37:29 +0000 (15:37 -0800)]
power: qpnp-fg-gen3: update battery profile based on Rconn configuration
Currently, Rconn is configured once in fg_hw_init() if it is not
configured already. However, if the driver loads the profile
later, it will overwrite the Rconn value configured during
fg_hw_init. To fix this problem, configure Rconn after handling
battery profile loading.
Usually the Rconn configuration is setup differently from what
the profile has for it. We check if the profile in SRAM is bit
to bit matching with the profile in device tree. We may come
across a mismatch for Rconn configuration and conclude that the
profile isn't matching. Fix this by initializing the Rconn
configuration in the profile read from device tree to the value
read from SRAM.
CRs-Fixed:
2142441
Change-Id: I2b7ac8cd6efe811527c29bc5cd0fa43b77da7b15
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Linux Build Service Account [Tue, 14 Nov 2017 17:45:25 +0000 (09:45 -0800)]
Merge "soc: qcom: service-locator: Update incorrect usage of qmi_send_req_wait"
Tanya Dixit [Thu, 26 Oct 2017 08:20:42 +0000 (13:50 +0530)]
drivers: qdsp6v2: Add mutex unlock to properly release lock
Add mutex unlock in function audio_effects_shared_ioctl
at appropriate place to prevent use after free.
CRs-Fixed:
2123291
Change-Id: Ie0d321dc8cc20a295d102a44faea7e5710834932
Signed-off-by: Tanya Dixit <tdixit@codeaurora.org>
Kyle Yan [Tue, 7 Nov 2017 23:27:29 +0000 (15:27 -0800)]
soc: qcom: service-locator: Update incorrect usage of qmi_send_req_wait
qmi_send_req_wait expects timeout argument to be passed in ms and not
in jiffies. Update the call in service-locator to pass in the correct
argument.
Change-Id: Ib2f8deedf2fb2a561c30b0c8511bb1edd5a37361
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
Kyle Yan [Wed, 8 Nov 2017 06:14:39 +0000 (22:14 -0800)]
soc: qcom: service-locator: Fix error message prints for receiving messages
ENOMSG is not a real failure return code for qmi_recv_msg. Instead ENOMSG
signifies that we have finished reading the entirety of the message buffer.
Update the error condition to print errors only when any error message
other than ENOMSG is returned.
Change-Id: Id6b42df182cb02f2cbffaae9698363b7dafce4e4
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
Linux Build Service Account [Mon, 13 Nov 2017 15:26:33 +0000 (07:26 -0800)]
Merge "power: qcom: msm-core: Add mutex lock for ioctl"
Linux Build Service Account [Mon, 13 Nov 2017 15:26:32 +0000 (07:26 -0800)]
Merge "ASoC: msm: qdsp6v2: Remove excess logs in compress driver"
Linux Build Service Account [Mon, 13 Nov 2017 15:26:31 +0000 (07:26 -0800)]
Merge "adv7481: Changes to compile ADV7481 as a module"
Linux Build Service Account [Mon, 13 Nov 2017 15:26:30 +0000 (07:26 -0800)]
Merge "usb: gadget: ffs: Defer freeing memory on free_inst if in use"
Linux Build Service Account [Mon, 13 Nov 2017 15:26:29 +0000 (07:26 -0800)]
Merge "ARM: dts: msm: add SLPI fw name property for msm8996"
Rahul Sharma [Sun, 12 Nov 2017 11:40:59 +0000 (17:10 +0530)]
msm: ais: sensor: actuator: avoid accessing out of bound memory
Issue:
When total_steps is updated, after that, copy_from_user
fails with an error, then, i2c_reg_tbl is not allocated.
In this case, when calling msm_actuator_parse_i2c_params,
it lead to out-of-bound memory write.
Fix:
1) Assign total_steps to zero when error from copying.
2) Add NULL pointer check for i2c tbl.
Change-Id: I4df8557719533900a5c571fc00f9844943c8f7b1
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Maulik Shah [Fri, 10 Nov 2017 06:21:01 +0000 (11:51 +0530)]
power: qcom: msm-core: Add mutex lock for ioctl
There can be use after free with multiple ioctl calls.
Add mutex lock when updating userspace power.
Change-Id: Ieae08d05478a462b19cf7f91b64267177eaebe84
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
Rahul Sharma [Mon, 30 Oct 2017 11:01:53 +0000 (16:31 +0530)]
adv7481: Changes to compile ADV7481 as a module
ADV7481 driver is board-specific, and thus should be compiled
as a module. This is part of the kernel modularization requirement.
Change-Id: I38ab9efca34ac9f898c2b76843563d8f74c29320
Suggested-by: Resmi Rajendran <resmir@qti.qualcomm.com>
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Walter Yang [Wed, 25 Oct 2017 06:29:53 +0000 (14:29 +0800)]
ASoC: wcd934x: reset ASRC after playback
Reset ASRC after audio playback is completed to clear
the FIFO and avoid any noise being generated.
CRs-Fixed:
2129994
Change-Id: Ie45796e1bd68d5a8bd790490a65520358f26b811
Signed-off-by: Walter Yang <yandongy@codeaurora.org>
Hareesh Gundu [Wed, 1 Nov 2017 13:17:45 +0000 (18:47 +0530)]
msm: kgsl: Do not expose kernel pointer for global entries
Add kernel pointer restriction while printing the global
page table entries through the debugfs.
Change-Id: Ia2ef4243248ece477e3f679c0027379686670928
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
Linux Build Service Account [Fri, 10 Nov 2017 15:55:28 +0000 (07:55 -0800)]
Merge "drm/msm: add SRM support for HDCP 1.4"
Ananda Kishore [Fri, 10 Nov 2017 09:37:33 +0000 (15:07 +0530)]
ARM: dts: msm: add SLPI fw name property for msm8996
Add SLPI fw name property to support dynamic loading of SLPI
fw images based on the version info.
Change-Id: I31baf971106a7a076cf83bd72c4509d860b3e7cb
Signed-off-by: Ananda Kishore <kananda@codeaurora.org>
Linux Build Service Account [Fri, 10 Nov 2017 06:06:48 +0000 (22:06 -0800)]
Merge "msm: pcie: always recover cfg space during resume"
Abhinav Kumar [Wed, 8 Nov 2017 06:21:22 +0000 (22:21 -0800)]
drm/msm: add SRM support for HDCP 1.4
Add support for clients to notify SRM update
to HDCP 1.x driver.
Integrate the SRM validation check in the HDCP 1.x
authentication flow to check HDCP 1.x receiver/repeater
KSV against the SRM revoked list and fail the authentication
if the sink is found to be present in the list.
Change-Id: I6615122f785bde94cb746ec4df7ab63b9f878528
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
Sujeev Dias [Tue, 10 Oct 2017 17:57:48 +0000 (10:57 -0700)]
msm: pcie: always recover cfg space during resume
During linkdown pci host cannot save the config space
prior to suspending the link. If saved_state is null
recover rc config space using shadow recovery.
CRs-Fixed:
2141146
Change-Id: I6c6e817ae2c32d8040853fe22785040480aa76eb
Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
Linux Build Service Account [Thu, 9 Nov 2017 17:58:57 +0000 (09:58 -0800)]
Merge "msm: vidc: Fix sequence change event properly"
Linux Build Service Account [Thu, 9 Nov 2017 17:58:56 +0000 (09:58 -0800)]
Merge "soc: qcom: msm_bus: Add debug logging for max bandwidth votes"
Linux Build Service Account [Thu, 9 Nov 2017 17:58:55 +0000 (09:58 -0800)]
Merge "msm: mdss: do not do phy reset when HDMI power off"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:54 +0000 (01:36 -0800)]
Merge "usb: gadget: f_qdss: Update usb string table based on channel name"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:53 +0000 (01:36 -0800)]
Merge "msm: sensor: actuator: avoid accessing out of bound memory"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:52 +0000 (01:36 -0800)]
Merge "net: rmnet_data: Support recycling frames to real device"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:51 +0000 (01:36 -0800)]
Merge "ARM: dts: msm: Add support for irs1645 eeprom on msm8998"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:50 +0000 (01:36 -0800)]
Merge "cnss2: Refactor callbacks for SSR framework"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:49 +0000 (01:36 -0800)]
Merge "Merge android-4.4@
ceee5bd (v4.4.95) into msm-4.4"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:48 +0000 (01:36 -0800)]
Merge "sched: restore discarded ifdef CONFIG_SCHED_WALT code"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:46 +0000 (01:36 -0800)]
Merge "wil6210: drop RX probe reponses with low SNR"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:45 +0000 (01:36 -0800)]
Merge "msm: cec: simplify TX message processing"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:44 +0000 (01:36 -0800)]
Merge "cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC)"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:43 +0000 (01:36 -0800)]
Merge "msm: ipa: Fix to use GFP_DMA flag"
Haibin Liu [Tue, 24 Oct 2017 12:32:48 +0000 (20:32 +0800)]
msm: sensor: actuator: avoid accessing out of bound memory
Issue:
When total_steps is updated, after that, copy_from_user
fails with an error, then, i2c_reg_tbl is not allocated.
In this case, when calling msm_actuator_parse_i2c_params,
it lead to out-of-bound memory write.
Fix:
1) Assign total_steps to zero when error from copying.
2) Add NULL pointer check for i2c tbl.
CRs-Fixed:
2111672
Change-Id: Ib9dcb182356e2df8078c131edfd0791fa95a35e0
Signed-off-by: Haibin Liu <haibinl@codeaurora.org>
Linux Build Service Account [Wed, 8 Nov 2017 20:55:16 +0000 (12:55 -0800)]
Merge "NFC: Fix for core init cmd send failure"
Linux Build Service Account [Wed, 8 Nov 2017 20:55:15 +0000 (12:55 -0800)]
Merge "spi: core: Add support for registering SPI slave controllers"
Linux Build Service Account [Wed, 8 Nov 2017 20:55:14 +0000 (12:55 -0800)]
Merge "regulator: qpnp: fix voltage min/max constraints check"
Linux Build Service Account [Wed, 8 Nov 2017 20:55:13 +0000 (12:55 -0800)]
Merge "dwc3: Do not perform core reinitialisation for host only mode"
Vivek Iyer [Mon, 23 Oct 2017 19:38:59 +0000 (12:38 -0700)]
ARM: dts: msm: Add support for irs1645 eeprom on msm8998
Add device tree entry needed to support eeprom on the
irs1645 sensor.
Change-Id: I88ad09c7da813e3b74d465392e8e40839d9c88a9
Signed-off-by: Vivek Iyer <viyer@codeaurora.org>
Dedy Lansky [Wed, 8 Nov 2017 10:43:53 +0000 (12:43 +0200)]
wil6210: drop RX probe reponses with low SNR
FW now reports SNR for RX management frames.
Drop probe responses with SNR lower than the configured threshold.
Change-Id: Ife1863b07aebe5cb6097420290c0c10b590c2da1
Signed-off-by: Dedy Lansky <dlansky@codeaurora.org>
Dedy Lansky [Wed, 8 Nov 2017 12:57:30 +0000 (14:57 +0200)]
wil6210: add sysfs for setting connect SNR threshold
snr_thresh sysfs can be used to set omni and direct SNR threshold for
connection.
Change-Id: I091a6b61a1a4cb98e0e8c0f70b2fff4d22486e61
Signed-off-by: Dedy Lansky <dlansky@codeaurora.org>
Neeraj Soni [Wed, 8 Nov 2017 11:19:51 +0000 (16:49 +0530)]
security: pfe: Return proper error code
ICE clock funciton masks the error code from
scm call. This might introduce unwanted issues
in device. Ensure to return proper error code
to storage frameworks.
Change-Id: Ibd7358c3b19d23d5995cf267f56ef3bacf166569
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
Linux Build Service Account [Wed, 8 Nov 2017 10:31:29 +0000 (02:31 -0800)]
Merge "ARM: dts: msm: enable adv7533 bridge chip power rails on msm8996"
Linux Build Service Account [Wed, 8 Nov 2017 10:31:28 +0000 (02:31 -0800)]
Merge "msm: camera: Check step position table for NULL pointer"
Linux Build Service Account [Wed, 8 Nov 2017 10:31:27 +0000 (02:31 -0800)]
Merge "ARM: dts: msm: Add sdhc_2 on msm8996 virtual platform"
Linux Build Service Account [Wed, 8 Nov 2017 10:31:25 +0000 (02:31 -0800)]
Merge "USB: configfs: Don't send DISCONNECT uevent during unbind"
Linux Build Service Account [Wed, 8 Nov 2017 10:31:24 +0000 (02:31 -0800)]
Merge "defconfig: arm64: msm: Enable MMC on msm8996 virtual plaform"
Linux Build Service Account [Wed, 8 Nov 2017 10:31:23 +0000 (02:31 -0800)]
Merge "soc: qcom: scm: Remap scm busy error codes to -EBUSY"
Yuan Zhao [Wed, 8 Nov 2017 07:51:14 +0000 (15:51 +0800)]
msm: mdss: do not do phy reset when HDMI power off
Do not need to do HDMI PHY reset here, because will do
that when HDMI cable connected again in HDMI mode setting
function.
Change-Id: Ifae7c35f72a9008980c207e0806ab7aaa57dfe07
Signed-off-by: Yuan Zhao <yzhao@codeaurora.org>
Gaurav Singhal [Fri, 13 Oct 2017 11:47:58 +0000 (17:17 +0530)]
NFC: Fix for core init cmd send failure
Due to delay of ~3 sec between core reset response
and core init cmd, i2c send fails as NFC controller
goes to deep sleep state if its idle for ~1sec.
Delay caused due to logs in driver probe sequence.
Delay is added after every gpio state change to
ensure, modified value is taken into consideration
and unnecessary delays are removed.
Change-Id: I4c6e8f867f641d6648139206244d67bb556e0099
Signed-off-by: Gaurav Singhal <gsinghal@codeaurora.org>
Ajay Agarwal [Fri, 28 Jul 2017 05:26:24 +0000 (10:56 +0530)]
dwc3: Do not perform core reinitialisation for host only mode
Cuurently as a part of start host, after the block reset we
are performing core init and gadget restart of the dwc3
controller. This causes crash for host only controller where
ep0 and ep1 have not been initialised but are being
dereferenced. Also, HW reinitialisation is not required for
start or restart host routine.
Change-Id: Ie2b781ecb03a1d0a02c5f4305d518adc18dc6ade
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Geert Uytterhoeven [Mon, 22 May 2017 13:11:41 +0000 (15:11 +0200)]
spi: core: Add support for registering SPI slave controllers
Add support for registering SPI slave controllers using the existing SPI
master framework:
- SPI slave controllers must use spi_alloc_slave() instead of
spi_alloc_master(), and should provide an additional callback
"slave_abort" to abort an ongoing SPI transfer request,
- SPI slave controllers are added to a new "spi_slave" device class,
- SPI slave handlers can be bound to the SPI slave device represented
by an SPI slave controller using a DT child node named "slave",
- Alternatively, (un)binding an SPI slave handler to the SPI slave
device represented by an SPI slave controller can be done by
(un)registering the slave device through a sysfs virtual file named
"slave".
From the point of view of an SPI slave protocol handler, an SPI slave
controller looks almost like an ordinary SPI master controller. The only
exception is that a transfer request will block on the remote SPI
master, and may be cancelled using spi_slave_abort().
Change-Id: I251c5b7247ee7088285e42dd3b3cdce9c56cb9f7
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>
Git-commit:
6c364062bfed3c34490e85bea52ff6e2d4f0f281
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
Odelu Kukatla [Tue, 7 Nov 2017 15:53:02 +0000 (21:23 +0530)]
soc: qcom: msm_bus: Add debug logging for max bandwidth votes
Max bandwidth vote on each bus device is required to be
printed when the device panics, so add a panic notifier
to print the max BW votes on each bus device.
Change-Id: I2256407638fe5085cb4b0f4d5a594dd00f4f3bce
Signed-off-by: Odelu Kukatla <okukatla@codeaurora.org>
Rahul Sharma [Tue, 7 Nov 2017 09:53:07 +0000 (15:23 +0530)]
ARM: dts: msm: enable adv7533 bridge chip power rails on msm8996
msm8996 auto CDP platform missing vddio power supply to power up
adv7533 bridge chip for DSI interfaces, which converts DSI to HDMI
signal. This change adds power rails to adv7533.
Change-Id: Ieaea589803bbac1d42478fff16e8a4a833cf7426
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Linux Build Service Account [Tue, 7 Nov 2017 23:40:02 +0000 (15:40 -0800)]
Merge "mmc: core: Return error if fallback to lower speed mode fails"
Linux Build Service Account [Tue, 7 Nov 2017 23:40:01 +0000 (15:40 -0800)]
Merge "ARM: dts: msm: Change QDSS pipe index to 3 for SDM660"
Yue Ma [Fri, 27 Oct 2017 00:03:02 +0000 (17:03 -0700)]
cnss2: Refactor callbacks for SSR framework
SSR framework is specific for MSM kernels. Refactor the callbacks
for SSR framework so that the same powerup/shutdown APIs can be
also used for non-MSM kernels where SSR framework does not exist.
Change-Id: Ic7bcafadc4f7ad3bd2fab0a4b672b2f5676fe401
Signed-off-by: Yue Ma <yuem@codeaurora.org>
Liangliang Lu [Tue, 7 Nov 2017 10:53:08 +0000 (18:53 +0800)]
usb: gadget: ffs: Defer freeing memory on free_inst if in use
In the case of ffs_free_inst() called, whole ffs_dev structure is
freed. Userspace related API do not check if ffs_dev is freed or
not.
If ffs endpoint is opened by userspace, ffs_free_inst() is executed,
mark inst_exist to false but do not free instance structures until
ffs_data is freed.
Besides, ffs_data is allocated in ffs_fs_mount() while opts->dev
is allocated when ffs instance created. And opts->dev will
be freed when ffs instance freed.
If ffs instance is freed and created once, opts->dev is allocated
to new memory, but since ffs_fs_mount() won't be called in this
case, new opts->dev miss the ffs_data address and
ffs_data->private_data still point to old opts->dev address which
is already freed.
So new allocated opts->dev need to initialize opts->dev->ffs_data,
and ffs_private_data also need to update new allocated opts->dev
address.
Change-Id: Idea56f86c62da700926e8ce3a724d5be6295a4fd
Signed-off-by: Liangliang Lu <luliang@codeaurora.org>
Wanhyeong Ryu [Wed, 1 Nov 2017 07:51:40 +0000 (15:51 +0800)]
mmc: core: Return error if fallback to lower speed mode fails
If there are continuous data-CRC errors in higher speed modes (SDR104
mode), then driver fallbacks to lower speed mode. But if at all it
fails to fallback to lower speed mode, then that error should be
propagated to the caller so that caller will handle it appropriately.
Without this change, sometime while processing card removal event,
driver fails to detect card removal and treats card as present
eventhough its removed.
Change-Id: I89544d41c5b014eb9227ba33ef9ec1917b6793dc
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
Linux Build Service Account [Tue, 7 Nov 2017 09:41:18 +0000 (01:41 -0800)]
Merge "msm: isp: Soft reset ISP before second pass"
Linux Build Service Account [Tue, 7 Nov 2017 09:41:17 +0000 (01:41 -0800)]
Merge "ARM: dts: msm: Remove the virtual plane implementation on msm8996"
Zhiming Weng [Fri, 20 Oct 2017 07:58:25 +0000 (15:58 +0800)]
msm: cec: simplify TX message processing
Simplify the message processing of CEC adapter driver's transmit
function. Don't need to decompose CEC message's header block and
data block 0 before programming to the registers.
Change-Id: Icf2b2f123bda560ef4e3c8c4c6a2eaf828b7ce9a
CRs-Fixed:
2117559
Signed-off-by: Zhiming Weng <czweng@codeaurora.org>
Surajit Podder [Wed, 22 Feb 2017 14:03:05 +0000 (19:33 +0530)]
msm: vidc: Fix sequence change event properly
Ensure that session continue is not sent to firmware
in cases where resources sufficient event is converted
to insufficient.
Change-Id: I3500a63d49dcd799ad76491a207c68bfef854dd3
Signed-off-by: Surajit Podder <spodder@codeaurora.org>
Vivek Veenam [Wed, 9 Mar 2016 05:34:49 +0000 (11:04 +0530)]
msm: camera: Enable (2+1) lane csiphy combo mode
Changes to enable csiphy in combo mode for (2+1) lane
sensors.
CRs-Fixed:
1068576
Change-Id: Iaf03c1a6b13a19e8591ab3dbb462154130b41e5e
Signed-off-by: Vivek Veenam <vveenam@codeaurora.org>
Vijayavardhan Vennapusa [Tue, 7 Nov 2017 05:40:13 +0000 (11:10 +0530)]
ARM: dts: msm: Change QDSS pipe index to 3 for SDM660
Currently same pipe index is used for both QDSS and DPL pipes for SDM660.
This causes QDSS not working in composition 90DB having both QDSS and DPL
interfaces. Hence fix it by changing QDSS pipe index to 3 so that both
QDSS and DPL works fine with 90DB composition on SDM660.
Change-Id: I7c799716cff7321985fcb88a8073737343a932f5
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
Zhiqiang Tu [Fri, 20 Oct 2017 07:44:17 +0000 (15:44 +0800)]
ARM: dts: msm: Add sdhc_2 on msm8996 virtual platform
Add sdhc_2 on msm8996 virtual platform for SDIO WLAN.
Change-Id: Ic021ca67507af88a2c98eac4d5b4c10c3300f1a9
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Vijay kumar Tumati [Tue, 31 Oct 2017 09:44:59 +0000 (15:14 +0530)]
msm: camera: Check step position table for NULL pointer
Before accessing step position table we need to make sure
its valid.
Change-Id: I914a51861e982d556039e5ba8510a67cab69fb82
Signed-off-by: Vijay kumar Tumati <vtumati@codeaurora.org>
Zhiqiang Tu [Fri, 3 Nov 2017 08:57:13 +0000 (16:57 +0800)]
defconfig: arm64: msm: Enable MMC on msm8996 virtual plaform
Enable MMC to support SDIO pass-through on virtual platform.
Change-Id: I808510d6d30ea780f3936c4eba98bb6e3e637050
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Blagovest Kolenichev [Mon, 6 Nov 2017 15:02:23 +0000 (07:02 -0800)]
Merge android-4.4@
ceee5bd (v4.4.95) into msm-4.4
* refs/heads/tmp-
ceee5bd
BACKPORT: arm64: relocatable: suppress R_AARCH64_ABS64 relocations in vmlinux
sched/core: fix have_sched_energy_data build warning
sched/core: Warn if ENERGY_AWARE is enabled but data is missing
sched: walt: Correct WALT window size initialization
FROMLIST: sched/fair: Use wake_q length as a hint for wake_wide
sched: WALT: account cumulative window demand
sched/fair: remove useless variable in find_best_target
sched/tune: access schedtune_initialized under CGROUP_SCHEDTUNE
sched/fair: consider task utilization in group_max_util()
sched/fair: consider task utilization in group_norm_util()
sched/fair: enforce EAS mode
sched/fair: ignore backup CPU when not valid
sched/fair: trace energy_diff for non boosted tasks
UPSTREAM: sched/fair: Sync task util before slow-path wakeup
UPSTREAM: sched/fair: Fix usage of find_idlest_group() when the local group is idlest
UPSTREAM: sched/fair: Fix usage of find_idlest_group() when no groups are allowed
BACKPORT: sched/fair: Fix find_idlest_group when local group is not allowed
UPSTREAM: sched/fair: Remove unnecessary comparison with -1
BACKPORT: sched/fair: Move select_task_rq_fair slow-path into its own function
UPSTREAM: sched/fair: Force balancing on nohz balance if local group has capacity
UPSTREAM: sched/core: Add missing update_rq_clock() call in set_user_nice()
UPSTREAM: sched/core: Add missing update_rq_clock() call for task_hot()
UPSTREAM: sched/core: Add missing update_rq_clock() in detach_task_cfs_rq()
UPSTREAM: sched/core: Add missing update_rq_clock() in post_init_entity_util_avg()
UPSTREAM: sched/core: Fix find_idlest_group() for fork
BACKPORT: sched/fair: Fix PELT integrity for new tasks
BACKPORT: sched/cgroup: Fix cpu_cgroup_fork() handling
UPSTREAM: sched/fair: Fix and optimize the fork() path
BACKPORT: sched/fair: Make it possible to account fair load avg consistently
cpufreq/sched: Consider max cpu capacity when choosing frequencies
Linux 4.4.95
FS-Cache: fix dereference of NULL user_key_payload
fscrypto: require write access to mount to set encryption policy
KEYS: Fix race between updating and finding a negative key
fscrypt: fix dereference of NULL user_key_payload
f2fs crypto: add missing locking for keyring_key access
f2fs crypto: replace some BUG_ON()'s with error checks
sched/autogroup: Fix autogroup_move_group() to never skip sched_move_task()
parisc: Fix double-word compare and exchange in LWS code on 32-bit kernels
parisc: Avoid trashing sr2 and sr3 in LWS code
pkcs7: Prevent NULL pointer dereference, since sinfo is not always set.
KEYS: don't let add_key() update an uninstantiated key
lib/digsig: fix dereference of NULL user_key_payload
KEYS: encrypted: fix dereference of NULL user_key_payload
rtlwifi: rtl8821ae: Fix connection lost problem
clockevents/drivers/cs5535: Improve resilience to spurious interrupts
bus: mbus: fix window size calculation for 4GB windows
brcmsmac: make some local variables 'static const' to reduce stack size
i2c: ismt: Separate I2C block read from SMBus block read
ALSA: hda: Remove superfluous '-' added by printk conversion
ALSA: seq: Enable 'use' locking in all configurations
drm/nouveau/mmu: flush tlbs before deleting page tables
drm/nouveau/bsp/g92: disable by default
can: esd_usb2: Fix can_dlc value for received RTR, frames
usb: musb: Check for host-mode using is_host_active() on reset interrupt
usb: musb: sunxi: Explicitly release USB PHY on exit
can: gs_usb: fix busy loop if no more TX context is available
ALSA: usb-audio: Add native DSD support for Pro-Ject Pre Box S2 Digital
usb: hub: Allow reset retry for USB2 devices on connect bounce
usb: quirks: add quirk for WORLDE MINI MIDI keyboard
usb: cdc_acm: Add quirk for Elatec TWN3
USB: serial: metro-usb: add MS7820 device id
USB: core: fix out-of-bounds access bug in usb_get_bos_descriptor()
USB: devio: Revert "USB: devio: Don't corrupt user memory"
ANDROID: binder: show high watermark of alloc->pages.
ANDROID: binder: Add thread->process_todo flag.
UPSTREAM: arm64: compat: Remove leftover variable declaration
ANDROID: sched/fair: Select correct capacity state for energy_diff
Revert "UPSTREAM: efi/libstub/arm64: Set -fpie when building the EFI stub"
cpufreq: schedutil: clamp util to CPU maximum capacity
FROMLIST: android: binder: Fix null ptr dereference in debug msg
FROMLIST: android: binder: Change binder_shrinker to static
cpufreq/sched: Use cpu max freq rather than policy max
Conflicts:
include/linux/sched.h
kernel/sched/core.c
kernel/sched/fair.c
Change-Id: I2751f851df741f00e797deaf2119872b3dced655
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Blagovest Kolenichev [Mon, 6 Nov 2017 23:07:22 +0000 (15:07 -0800)]
sched: restore discarded ifdef CONFIG_SCHED_WALT code
Code closed in ifdef CONFIG_SCHED_WALT blocks is not used in
msm-4.4 builds, hence in order to be as much as closer to
upstream and subsequently to have less merge conflicts in the
future, let's restore this code.
Restore below CONFIG_SCHED_WALT changes in file [1]:
be832f6 sched: walt: Leverage existing
^^^^^^^ Discarded in
dbad9b8.
efb86bd sched: Introduce Window Assisted Load Tracking (WALT)
^^^^^^^ Restore only the block, which is modified by
be832f6.
Discarded in
efbe378.
dbad9b8 Merge android-4.4@
89074de (v4.4.94) into msm-4.4
efbe378 Merge branch 'v4.4-16.09-android-tmp' into lsk-v4.4-16.09-android
[1] kernel/sched/sched.h
Change-Id: Ifd7e230b3b47dde61abf2472f092ff78d80b7427
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Linux Build Service Account [Mon, 6 Nov 2017 19:49:31 +0000 (11:49 -0800)]
Merge "ARM: dts: msm: Remove GPIO pins that are unused on Mojave"
Linux Build Service Account [Mon, 6 Nov 2017 19:49:30 +0000 (11:49 -0800)]
Merge "soc: qcom: pil: Fix error handling during PIL driver probe"
Linux Build Service Account [Mon, 6 Nov 2017 19:49:29 +0000 (11:49 -0800)]
Merge "net:wireless:cnss2: Fix driver loading failure"
Rahul Sharma [Wed, 18 Oct 2017 10:13:13 +0000 (15:43 +0530)]
ARM: dts: msm: Remove GPIO pins that are unused on Mojave
cam_snapshot and cam_focus GPIO pins are unused on Mojave,
thus remove them from DT. Those pins are used for ADV7481
on Mojave.
Change-Id: I8c0026a215fdc2cf1aa94eb763f82258229435c8
Suggested-by: Resmi Rajendran <resmir@qti.qualcomm.com>
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Camus Wong [Wed, 1 Nov 2017 16:32:04 +0000 (12:32 -0400)]
ARM: dts: msm: Remove the virtual plane implementation on msm8996
Virtual plane limited the usage of plane on assigned display only.
It is against the implementation in strategy manager in SDM, which
assume any plane can be used by any display.
Change-Id: Iddcb94d888dfa1ec7685f2964116b4296a0e9a7f
Signed-off-by: Camus Wong <camusw@codeaurora.org>
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Linux Build Service Account [Mon, 6 Nov 2017 06:33:10 +0000 (22:33 -0800)]
Merge "soc: qcom: Add support for QDSS bridge driver"
Linux Build Service Account [Mon, 6 Nov 2017 06:33:08 +0000 (22:33 -0800)]
Merge "defconfig: sdm660: Enable sdcardfs"
Linux Build Service Account [Mon, 6 Nov 2017 06:33:07 +0000 (22:33 -0800)]
Merge "soc: qcom: glink_smem_native_xport: Add readback to write index"
Linux Build Service Account [Mon, 6 Nov 2017 06:33:06 +0000 (22:33 -0800)]
Merge "msm: kgsl: Add property to determine commands timeout"
Linux Build Service Account [Mon, 6 Nov 2017 06:33:05 +0000 (22:33 -0800)]
Merge "soc: qcom: glink_ssr: Use do_cleanup_data from pkt_priv"
Linux Build Service Account [Mon, 6 Nov 2017 06:33:03 +0000 (22:33 -0800)]
Merge "cnss2: Add device pointer to all external APIs"
Linux Build Service Account [Mon, 6 Nov 2017 06:33:00 +0000 (22:33 -0800)]
Merge "wil6210: missing length check in wil_cfg80211_mgmt_tx"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:59 +0000 (22:32 -0800)]
Merge "ARM: dts: msm: Add GPU maximum frequency 430Mhz support for SDM636"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:58 +0000 (22:32 -0800)]
Merge "defconfig: msmcortex: Enable sdcardfs"