OSDN Git Service
Linux Build Service Account [Tue, 19 Dec 2017 21:24:09 +0000 (13:24 -0800)]
Merge "power: qpnp-fg-gen3: Update ESR filter coefficients for low temperature"
Shihuan Liu [Fri, 4 Aug 2017 18:00:00 +0000 (11:00 -0700)]
msm: ipa: add new IP filtering bitmaps
Add new IP filtering bitmaps to match TCP SYN packets.
Change-Id: I73ab2944c3d351fdb57f147d3efedd1b5829835e
Acked-by: Pooja Kumari <kumarip@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
Acked-by: Shihuan Liu <shihuanl@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
Mohammed Javid [Thu, 14 Dec 2017 07:19:05 +0000 (12:49 +0530)]
msm: ipa: Change error value for set quota
Currently IPA send common error -EFAULT to user space
in case of IOCTL fails. Change error value for set quota
based on error received from modem.
Change-Id: Ib6ba487a186245ddf752cd08de12293af1ea1bb9
Acked-by: Pooja Kumari <kumarip@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
Linux Build Service Account [Tue, 19 Dec 2017 10:33:31 +0000 (02:33 -0800)]
Merge "ARM: dts: msm: add vwatchdog and memdump for gvm on msm8996"
Linux Build Service Account [Tue, 19 Dec 2017 10:33:30 +0000 (02:33 -0800)]
Merge "qseecom: resend continue blocked listener request"
Zhiqiang Tu [Tue, 19 Dec 2017 06:27:02 +0000 (14:27 +0800)]
ARM: dts: msm: Remove spi_9 and i2c_8 in msm8996 ivi vplatform
Remove spi_9 and i2c_8 since they are not needed.
Change-Id: I1fe4d722e79ebdc5e779f974ca51cc8a8424d564
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Zhiqiang Tu [Tue, 19 Dec 2017 06:17:32 +0000 (14:17 +0800)]
ARM: dts: msm: Remove blsp1_uart2 on msm8996 telematics vplatform
Remove blsp1_uart2 since it is not needed.
Change-Id: If412f12cb1fd455cc7d4e7698d0c202ad80f35ae
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Linux Build Service Account [Mon, 18 Dec 2017 23:25:05 +0000 (15:25 -0800)]
Merge "ARM: dts: msm: Add new device properties for msm8996 agave"
Linux Build Service Account [Mon, 18 Dec 2017 23:25:04 +0000 (15:25 -0800)]
Merge "defconfig: msm: add vwatchdog and memdump for gvm"
Linux Build Service Account [Mon, 18 Dec 2017 23:25:02 +0000 (15:25 -0800)]
Merge "drm/mm: Fix NULL pointer dereference in allocator"
Linux Build Service Account [Mon, 18 Dec 2017 23:25:02 +0000 (15:25 -0800)]
Merge "drm/msm: Set proper GEM address space range for drm mm allocator"
Zhen Kong [Sat, 2 Dec 2017 02:26:25 +0000 (18:26 -0800)]
qseecom: resend continue blocked listener request
When new cmd with session_id is not supported by TZ, resend
continue blocked listener request with legacy cmd using app_id.
Also set dummy app_id in qseecom_process_listener_from_smcinvoke
to support legacy cmd.
Change-Id: Icafc77cece23daff0f2ceb89c10e82a822eb582a
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
Yong Ding [Fri, 24 Nov 2017 10:12:21 +0000 (18:12 +0800)]
soc: qcom: hab: add some code clean up
Add some code clean up for hab driver, including removing
implicit type conversion, and etc.
Change-Id: Ic2910f48063e22d1708972c1e0a5d23cbf179874
Signed-off-by: Yong Ding <yongding@codeaurora.org>
Yong Ding [Wed, 29 Nov 2017 05:55:51 +0000 (13:55 +0800)]
soc: qcom: hab: fix issues in multi-threads cases
In multi-threads stress tests, some synchronization issues
were found. Here are the fixes for them.
Change-Id: I43a1fef5771af08f3fe7c0be486cc2d36667e773
Signed-off-by: Yong Ding <yongding@codeaurora.org>
Yong Ding [Thu, 23 Nov 2017 09:42:15 +0000 (17:42 +0800)]
soc: qcom: hab: use separated irq for each pchan
Before this change, all physical channels share only one single irq
issued by only one single virtual shmem device from hypervisor.
To achieve better performance, each physical channel will be built
on top of one virtual shmem device with its own irq.
Change-Id: I5bf42896883865908c80df75f848174f4acf3717
Signed-off-by: Yong Ding <yongding@codeaurora.org>
Yong Ding [Mon, 27 Nov 2017 09:26:03 +0000 (17:26 +0800)]
soc: qcom: hab: add multi-GVMs support
This is the new feature to support multiple Guest Virtual
Machiness communications.
In the past, HAB driver supported the communication between
only one single GVM and the host machine. With this new
feature, more than one GVMs can communicate with the host
machine over HAB driver.
Change-Id: I22eb17b7cf367e25e2d829d9dbd2d3a3463be1e8
Signed-off-by: Yong Ding <yongding@codeaurora.org>
Linux Build Service Account [Mon, 18 Dec 2017 09:19:12 +0000 (01:19 -0800)]
Merge "ARM: dts: msm: memory rework for gvm on msm8996"
Srinivasarao P [Mon, 18 Dec 2017 08:44:52 +0000 (14:14 +0530)]
Merge android-4.4.97 (
46d256d) into msm-4.4
* refs/heads/tmp-
46d256d
Linux 4.4.97
staging: r8712u: Fix Sparse warning in rtl871x_xmit.c
xen: don't print error message in case of missing Xenstore entry
bt8xx: fix memory leak
s390/dasd: check for device error pointer within state change interrupts
mei: return error on notification request to a disconnected client
exynos4-is: fimc-is: Unmap region obtained by of_iomap()
staging: lustre: ptlrpc: skip lock if export failed
staging: lustre: hsm: stack overrun in hai_dump_data_field
staging: lustre: llite: don't invoke direct_IO for the EOF case
platform/x86: intel_mid_thermal: Fix module autoload
scsi: aacraid: Process Error for response I/O
xen/manage: correct return value check on xenbus_scanf()
cx231xx: Fix I2C on Internal Master 3 Bus
perf tools: Only increase index if perf_evsel__new_idx() succeeds
drm/amdgpu: when dpm disabled, also need to stop/start vce.
i2c: riic: correctly finish transfers
ext4: do not use stripe_width if it is not set
ext4: fix stripe-unaligned allocations
staging: rtl8712u: Fix endian settings for structs describing network packets
mfd: axp20x: Fix axp288 PEK_DBR and PEK_DBF irqs being swapped
mfd: ab8500-sysctrl: Handle probe deferral
ARM: pxa: Don't rely on public mmc header to include leds.h
mmc: s3cmci: include linux/interrupt.h for tasklet_struct
PM / wakeirq: report a wakeup_event on dedicated wekup irq
Fix tracing sample code warning.
tracing/samples: Fix creation and deletion of simple_thread_fn creation
drm/msm: fix an integer overflow test
drm/msm: Fix potential buffer overflow issue
perf tools: Fix build failure on perl script context
ocfs2: fstrim: Fix start offset of first cluster group during fstrim
ARM: 8715/1: add a private asm/unaligned.h
ARM: dts: mvebu: pl310-cache disable double-linefill
arm64: ensure __dump_instr() checks addr_limit
ASoC: adau17x1: Workaround for noise bug in ADC
KEYS: fix out-of-bounds read during ASN.1 parsing
KEYS: return full count in keyring_read() if buffer is too small
cifs: check MaxPathNameComponentLength != 0 before using it
ALSA: seq: Fix nested rwsem annotation for lockdep splat
ALSA: timer: Add missing mutex lock for compat ioctls
BACKPORT: xfrm: Clear sk_dst_cache when applying per-socket policy.
Revert "ANDROID: sched/rt: schedtune: Add boost retention to RT"
cpufreq: Drop schedfreq governor
ANDROID: sched/rt: schedtune: Add boost retention to RT
ANDROID: sched/rt: add schedtune accounting
ANDROID: Revert "arm64: move ELF_ET_DYN_BASE to 4GB / 4MB"
ANDROID: Revert "arm: move ELF_ET_DYN_BASE to 4MB"
sched: EAS: Fix the calculation of group util in group_idle_state()
sched: EAS: update trg_cpu to backup_cpu if no energy saving for target_cpu
sched: EAS: Fix the condition to distinguish energy before/after
Conflicts:
drivers/cpufreq/Kconfig
drivers/gpu/drm/msm/msm_gem_submit.c
kernel/sched/core.c
kernel/sched/fair.c
kernel/sched/rt.c
kernel/sched/sched.h
Change-Id: I0d8c5287cb67fd47c8944a002c0ca71adcdef537
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Aditya Bavanari [Wed, 22 Nov 2017 07:21:05 +0000 (12:51 +0530)]
ASoC: apr: Add validity check to APR port
Add boundary checks for APR port received from ADSP.
CRs-Fixed:
2143207
Change-Id: I9a7fa39ee223e1859323caa6eb74c1c8a26a041d
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
Rahul Sharma [Tue, 14 Nov 2017 10:50:13 +0000 (16:20 +0530)]
ARM: dts: msm: Add new device properties for msm8996 agave
Add lane_count, settle_count and resolution array
device properties to adv7481 device on msm8996 agave.
Change-Id: I512d3f7339905cb67613ca706c978f23dde599ae
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Yimin Peng [Thu, 30 Nov 2017 11:58:13 +0000 (19:58 +0800)]
ARM: dts: msm: add vwatchdog and memdump for gvm on msm8996
Add devices for virtual watchdong and memory dump function.
Change-Id: Ic3d26e8438cd2fcd4fcf0a6091ecd40ffa956c22
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
Yimin Peng [Thu, 30 Nov 2017 11:51:10 +0000 (19:51 +0800)]
defconfig: msm: add vwatchdog and memdump for gvm
add support to virtual watchdog and memory dump function.
Change-Id: If585e8e900487818d12cce9592c357f9a5ccfe7e
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
Linux Build Service Account [Sun, 17 Dec 2017 16:28:55 +0000 (08:28 -0800)]
Merge "serial: msm_serial_hs: Allow system suspend when no client is active"
Linux Build Service Account [Sat, 16 Dec 2017 08:56:46 +0000 (00:56 -0800)]
Merge "qseecom: support listener request from smcinvoke without reentrancy"
Linux Build Service Account [Sat, 16 Dec 2017 08:56:45 +0000 (00:56 -0800)]
Merge "qseecom: fix an issue when requested listener svc id does not exist"
Gustavo Solaira [Sat, 16 Dec 2017 03:06:41 +0000 (19:06 -0800)]
ARM: dts: msm: Add option to ethernet node on msm8996 CV2X
The ethernet chip has the PERST connected to its reset pin
on msm8996 CV2X boards so it has to be fully reset after
system resume, add this flag so the driver can perform the
correct operation.
Change-Id: I97ecddb4fd7830081c5af7dc9578466e995bb9dd
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
Zhen Kong [Thu, 19 Oct 2017 19:32:07 +0000 (12:32 -0700)]
qseecom: support listener request from smcinvoke without reentrancy
Add support to process listener request from smcinvoke when
reentrancy is disabled.
Change-Id: I2ce030cf6d5104ca2dec1402634a05d425e6d474
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
Linux Build Service Account [Fri, 15 Dec 2017 22:14:38 +0000 (14:14 -0800)]
Merge "adv7481: Remove conditional compilation for PM functions"
Linux Build Service Account [Fri, 15 Dec 2017 22:14:37 +0000 (14:14 -0800)]
Merge "drm/msm: Correctly retrieve gpu's active power level"
Linux Build Service Account [Fri, 15 Dec 2017 22:14:36 +0000 (14:14 -0800)]
Merge "ARM: dts: msm: blsp and sdhci switch to virtual clock on msm8996 vplatform"
Linux Build Service Account [Fri, 15 Dec 2017 22:14:35 +0000 (14:14 -0800)]
Merge "clk: msm: virtual clock adds support for usb, lpass and modem"
Linux Build Service Account [Fri, 15 Dec 2017 22:14:34 +0000 (14:14 -0800)]
Merge "msm: ipa: Fix to validate routing table index for filter exception"
Linux Build Service Account [Fri, 15 Dec 2017 22:14:33 +0000 (14:14 -0800)]
Merge "msm: mdss: Trigger idle fallback when no update due to touch"
Linux Build Service Account [Fri, 15 Dec 2017 22:14:32 +0000 (14:14 -0800)]
Merge "drivers: net: can: Add suspend/resume routine for CAN driver"
Linux Build Service Account [Fri, 15 Dec 2017 22:14:31 +0000 (14:14 -0800)]
Merge "spi: spi_qsd: Poll for valid state after software Reset"
Zhen Kong [Sat, 9 Dec 2017 20:51:36 +0000 (12:51 -0800)]
qseecom: fix an issue when requested listener svc id does not exist
When listener svc id does not exist, the listener svc entry pointer
is actualy invalid, and should be set to NULL to avoid invalid pointer
deference on cache operation when sending listener resp to TZ.
Change-Id: I6af0c7405c9dc5dfe481396979023968a8324dd0
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
Rahul Sharma [Wed, 6 Dec 2017 19:37:10 +0000 (01:07 +0530)]
adv7481: Remove conditional compilation for PM functions
Remove conditional compilation for power management functions,
so that suspend and resume are called always.
Change-Id: I6309df0d12db16c90a10127293bb2715cde15a29
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Mohammed Javid [Thu, 5 Oct 2017 18:09:39 +0000 (23:39 +0530)]
msm: ipa: Fix to validate routing table index for filter exception
Fix to validate routing table index for filter action
IPA_PASS_TO_EXCEPTION case to avoid ipa assert
during commit filter rule.
Change-Id: I957f7ffc415ea1a042f6b3a948e94410d41b2262
Acked-by: Ashok Vuyyuru <avuyyuru@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
Krishna Manikandan [Fri, 15 Dec 2017 09:02:07 +0000 (14:32 +0530)]
msm: mdss: Trigger idle fallback when no update due to touch
Trigger an idle fallback with a reasonable timeout value when
there is no update despite of a touch event and idle_time is 0.
This will reset the refresh rate to minimum fps.
CRs-Fixed:
2003247
Change-Id: I4a2964038f23984bf1ea39c63bf679d80ad12cba
Signed-off-by: Krishna Manikandan <mkrishn@codeaurora.org>
Mukesh Kumar Savaliya [Sat, 2 Dec 2017 10:52:27 +0000 (16:22 +0530)]
serial: msm_serial_hs: Allow system suspend when no client is active
In some cases, attempt to system resume imbalances the PM usage_count
which completely disables runtime PM callbacks of the device and suspend
doesn't happen.
Allow device to enter suspend through system PM when such condition met
and in addition do not suspend manually if runtime PM is disabled, let
auto suspend takes care of it.
Change-Id: I73df5804d47f551bfee97f43dbe772ee3774b399
Signed-off-by: Mukesh Kumar Savaliya <msavaliy@codeaurora.org>
Linux Build Service Account [Fri, 15 Dec 2017 07:58:54 +0000 (23:58 -0800)]
Merge "Merge android-4.4.96 (
aed4c54) into msm-4.4"
Yimin Peng [Tue, 21 Nov 2017 08:27:28 +0000 (16:27 +0800)]
ARM: dts: msm: memory rework for gvm on msm8996
Split memory configuration for different projects.
Change-Id: I2928adb05dfe174a2d8413172ed10f4240f3f42d
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
Linux Build Service Account [Thu, 14 Dec 2017 21:44:24 +0000 (13:44 -0800)]
Merge "ARM: dts: msm: Override vendor node entires in fstab for MSM8996ProAU"
Abinaya P [Tue, 7 Nov 2017 11:09:22 +0000 (16:39 +0530)]
drivers: net: can: Add suspend/resume routine for CAN driver
Make the CAN interrupt as a wakeup capable interrupt and also add
suspend/resume routine to handle the suspend/resume states of
the device
Change-Id: I0e972f3c4b005b52fb8d2e03f83995ecd3c47538
Signed-off-by: Abinaya P <abinayap@codeaurora.org>
Dhoat Harpal [Thu, 14 Dec 2017 11:54:17 +0000 (17:24 +0530)]
soc: qcom: glink_smem_native_xport: Send blocked signal command
Glink smem xprt driver is not sending blocked signal command to
remote side, when fifo gets full during tx_data. This results in
Glink tx_thread taking longer time in sending data to remote side.
Glink smem xprt driver sends blocked signal command.
CRs-Fixed:
2154819
Change-Id: I105fce28449db2dd0931292cd6850d2409ae683d
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
Dilip Kota [Mon, 4 Dec 2017 07:20:45 +0000 (12:50 +0530)]
spi: spi_qsd: Poll for valid state after software Reset
For SPI slave, software reset performs long pulse
reset. Software should wait for QUP to be in valid
state before doing operations on QUP.
Change-Id: Ifbed295df87a6c5c383cedb431b368b3dffca676
Signed-off-by: Dilip Kota <dkota@codeaurora.org>
Linux Build Service Account [Thu, 14 Dec 2017 08:14:44 +0000 (00:14 -0800)]
Merge "drivers: power: reset: Do cold reset when doing oem reboot"
Linux Build Service Account [Thu, 14 Dec 2017 08:14:42 +0000 (00:14 -0800)]
Merge "ARM: dts: msm: enable drm msm-hyp driver for msm8996"
Linux Build Service Account [Thu, 14 Dec 2017 08:14:41 +0000 (00:14 -0800)]
Merge "scsi: ufs: Trigger runtime-idle in a separate work"
Linux Build Service Account [Thu, 14 Dec 2017 08:14:40 +0000 (00:14 -0800)]
Merge "dwc3-msm: Notify proper current values in case of floating charger"
Linux Build Service Account [Thu, 14 Dec 2017 08:14:39 +0000 (00:14 -0800)]
Merge "net: cnss2: restore pci config space before enable device"
Linux Build Service Account [Thu, 14 Dec 2017 08:14:37 +0000 (00:14 -0800)]
Merge "power: smb-lib: fix OTG enable error handling"
Linux Build Service Account [Thu, 14 Dec 2017 08:14:36 +0000 (00:14 -0800)]
Merge "ion: ensure CMO target is valid"
Venkateswara Rao Tadikonda [Tue, 12 Dec 2017 14:07:27 +0000 (19:37 +0530)]
drm/mm: Fix NULL pointer dereference in allocator
While searching for first hole (get_first_hole) and next free hole
(get_next_hole) from rbtree, rb_first() and rb_next() functions may
return NULL pointer. A NULL pointer check can avoid the NULL pointer
dereference.
Change-Id: I21c918fff3ae995a9d8b2201030401d80ed1fd9e
Signed-off-by: Venkateswara Rao Tadikonda <vtadik@codeaurora.org>
Satya Krishna Pindiproli [Mon, 11 Dec 2017 11:28:53 +0000 (16:58 +0530)]
ARM: dts: msm: add support for TDM interfaces on msm8996 MTP
Add TDM interface DAIs and corresponding GPIO changes
to support TDM on msm8996 MTP.
Change-Id: Ifcf6995c61a0a74ffa205d64d2d797255c978c41
Signed-off-by: Satya Krishna Pindiproli <satyak@codeaurora.org>
Satya Krishna Pindiproli [Wed, 6 Dec 2017 10:14:53 +0000 (15:44 +0530)]
ASoC: msm: add TDM interface changes for 8996
Add documentation and TDM interface changes in msm8996
machine driver to support TDM on msm8996 MTP.
Change-Id: I5ae3c491a57c400deb6a2574ef0e1be90f7f0000
Signed-off-by: Satya Krishna Pindiproli <satyak@codeaurora.org>
Camus Wong [Sat, 9 Dec 2017 19:28:54 +0000 (14:28 -0500)]
ARM: dts: msm: enable drm msm-hyp driver for msm8996
Enable virtual kernel drm driver for hypervisor environment for msm8996.
Change-Id: I6305e088e4b844d3f7dfe1620bd6d68cdaf6432f
Signed-off-by: Camus Wong <camusw@codeaurora.org>
Camus Wong [Mon, 14 Aug 2017 20:51:07 +0000 (16:51 -0400)]
drm/msm-hyp: new virtual msm driver
This driver is enabled on hypervisor builds for the purpose of
creating a DRM device that DRM Master can open and listen on for
VBlank and Page Flip events.
Change-Id: Ib9b2df5ae0e2c33145663b3f515595e8f433a850
Signed-off-by: Camus Wong <camusw@codeaurora.org>
Asutosh Das [Tue, 14 Nov 2017 11:31:40 +0000 (17:01 +0530)]
scsi: ufs: Trigger runtime-idle in a separate work
In case of an exception, there could be a deadlock:
-000|__switch_to()
-001|context_switch(inline)
-001|__schedule()
-002|schedule()
-003|schedule_timeout()
-004|do_wait_for_common(inline)
-004|__wait_for_common(inline)
-004|wait_for_common()
-005|wait_for_completion()
-006|destroy_work_on_stack(inline)
-006|flush_work()
-007|ufshcd_suspend()
-008|ufshcd_runtime_suspend()
-009|ufshcd_pltfrm_runtime_suspend()
-010|pm_generic_runtime_suspend()
-011|__rpm_callback(inline)
-011|rpm_callback()
-012|rpm_suspend()
-013|rpm_idle()
-014|__pm_runtime_idle()
-015|ufshcd_exception_event_handler()
-016|__read_once_size(inline)
-016|static_key_count(inline)
-016|static_key_false(inline)
-016|trace_workqueue_execute_end(inline)
-016|process_one_work()
-017|__read_once_size(inline)
-017|list_empty(inline)
-017|worker_thread()
-018|kthread()
-019|ret_from_fork(asm)
This is caused because in exception handler
pm_runtime_put_sync is invoked which calls ufshcd_suspend.
And ufshcd_suspend flushes the exception handler work
& deadlocks.
Hence, schedule the suspend work in a different context.
Change-Id: I02524cee5ab2b64e0ad5de873d5318aef7b6ac95
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
Binoy Jayan [Thu, 9 Nov 2017 10:16:26 +0000 (15:46 +0530)]
ARM: dts: msm: Override vendor node entires in fstab for MSM8996ProAU
Override the property fsmgr_flags by adding the options verify and
slotselect for the vendor node in the fstab so that A/B is enabled and the
partition is verified by the device mapper target dm-verity. Also delete
the system node from the fstab as it is already mounted by the kernel.
Change-Id: Ib65f1d261c95b995f3999ba24517a69488346ca9
Signed-off-by: Binoy Jayan <bjayan@codeaurora.org>
Venkateswara Rao Tadikonda [Tue, 12 Dec 2017 13:30:53 +0000 (19:00 +0530)]
drm/msm: Set proper GEM address space range for drm mm allocator
GEM address space range provided to drm mm allocator is not correct.
Start address and size of the address space should be passed to drm mm
initializer. Instead of size, end address of address space range is
passed to drm mm initializer.
msm_gem_get_iova() returns 0, even if memory mapping to virtual
address space is failed. Return proper error value to user space
driver incase of error.
Change-Id: I356a63b873094cb465909437dcdab9513e27b7ff
Signed-off-by: Venkateswara Rao Tadikonda <vtadik@codeaurora.org>
Zhiqiang Tu [Mon, 11 Dec 2017 08:54:05 +0000 (16:54 +0800)]
clk: msm: virtual clock adds support for usb, lpass and modem
Support usb, lpass and modem clocks in msm8996 virtual clock
frontend driver.
Change-Id: I5ee4f2d951f133a8403442707e633563efdc5c65
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Zhiqiang Tu [Wed, 13 Dec 2017 09:08:26 +0000 (17:08 +0800)]
ARM: dts: msm: blsp and sdhci switch to virtual clock on msm8996 vplatform
Enable virtual clock for uart, spi, i2c and sdhci.
Change-Id: Id0dd32c520eeb956390fb1e0e1a4f762c6ae47f9
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Sai Krishna Juturi [Fri, 8 Dec 2017 09:30:43 +0000 (15:00 +0530)]
dwc3-msm: Notify proper current values in case of floating charger
Currently our driver is notifying ETIMEDOUT to PMIC
incase of floating charger. Consider if we are inserting
an SDP charger slowly that time also we will detect
it as floating charger then also we are notifying
ETIMEDOUT irrespective of current that is notified from
gadget driver. Hence notify charging current properly
if enumeration happens even in case of
floating charger so that PMIC can update real charger
type to SDP
Signed-off-by: Sai Krishna Juturi <jsaikrishna@codeaurora.org>
Change-Id: Ibeeeafac0834c9df7099a3f0bad274ddb393de47
Linux Build Service Account [Wed, 13 Dec 2017 03:00:52 +0000 (19:00 -0800)]
Merge "smb1351: add MODEL_NAME property in parallel power_supply"
Linux Build Service Account [Wed, 13 Dec 2017 03:00:51 +0000 (19:00 -0800)]
Merge "ARM: dts: msm: Change rh850 interrupt to gpio_122 on auto cdp boards"
Linux Build Service Account [Wed, 13 Dec 2017 03:00:50 +0000 (19:00 -0800)]
Merge "soc: qcom: pil: NULL check before pil_memset_io"
Linux Build Service Account [Wed, 13 Dec 2017 03:00:48 +0000 (19:00 -0800)]
Merge "drivers: lmh_dcvsh: Defer cluster cooling register until core comes online"
Linux Build Service Account [Wed, 13 Dec 2017 03:00:46 +0000 (19:00 -0800)]
Merge "usb: pd: qpnp-pdphy: move RX handling to hard IRQ"
Linux Build Service Account [Wed, 13 Dec 2017 03:00:45 +0000 (19:00 -0800)]
Merge "usb: pd: qpnp-pdphy: Remove rx_busy flag"
Linux Build Service Account [Wed, 13 Dec 2017 03:00:44 +0000 (19:00 -0800)]
Merge "defconfig: msm: Enable CONFIG_INET_LRO"
Blagovest Kolenichev [Tue, 12 Dec 2017 11:32:55 +0000 (03:32 -0800)]
Merge android-4.4.96 (
aed4c54) into msm-4.4
* refs/heads/tmp-
aed4c54
Linux 4.4.96
Revert "drm: bridge: add DT bindings for TI ths8135"
ecryptfs: fix dereference of NULL user_key_payload
x86/microcode/intel: Disable late loading on model 79
regulator: fan53555: fix I2C device ids
can: kvaser_usb: Ignore CMD_FLUSH_QUEUE_REPLY messages
can: kvaser_usb: Correct return value in printout
can: sun4i: fix loopback mode
scsi: sg: Re-fix off by one in sg_fill_request_table()
scsi: zfcp: fix erp_action use-before-initialize in REC action trace
assoc_array: Fix a buggy node-splitting case
Input: gtco - fix potential out-of-bound access
Input: elan_i2c - add ELAN0611 to the ACPI table
xen/gntdev: avoid out of bounds access in case of partial gntdev_mmap()
fuse: fix READDIRPLUS skipping an entry
spi: uapi: spidev: add missing ioctl header
usb: xhci: Handle error condition in xhci_stop_device()
ceph: unlock dangling spinlock in try_flush_caps()
ALSA: hda - fix headset mic problem for Dell machines with alc236
ALSA: hda/realtek - Add support for ALC236/ALC3204
workqueue: replace pool->manager_arb mutex with a flag
sched: EAS: upmigrate misfit current task
sched: avoid pushing tasks to an offline CPU
sched: Extend active balance to accept 'push_task' argument
Revert "sched/core: Warn if ENERGY_AWARE is enabled but data is missing"
Revert "sched/core: fix have_sched_energy_data build warning"
FROMLIST: kbuild: clang: fix build failures with sparse check
Revert "Revert "UPSTREAM: efi/libstub/arm64: Set -fpie when building the EFI stub""
BACKPORT: efi/libstub: Unify command line param parsing
Conflicts:
drivers/usb/host/xhci-hub.c
kernel/sched/core.c
kernel/sched/fair.c
Change-Id: Ie36ce5de516f02b2d553043009d9afee64e7ff24
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Linux Build Service Account [Tue, 12 Dec 2017 06:33:57 +0000 (22:33 -0800)]
Merge "ARM: dts: msm: Set values for MDM shutdown and reset on msm8996 CV2X"
Linux Build Service Account [Tue, 12 Dec 2017 06:33:56 +0000 (22:33 -0800)]
Merge "defconfig: arm64: fsm: Modify configs for FSM"
Linux Build Service Account [Tue, 12 Dec 2017 06:33:55 +0000 (22:33 -0800)]
Merge "pwm: pwm-qpnp: Enable glitch removal after PWM enabled"
Linux Build Service Account [Tue, 12 Dec 2017 06:33:54 +0000 (22:33 -0800)]
Merge "clk: msm: Add virtual clock frontend driver"
Linux Build Service Account [Tue, 12 Dec 2017 06:33:52 +0000 (22:33 -0800)]
Merge "usb: pd: Send pending VDM message upon entering SNK/SRC_Ready"
Vignesh Kulothungan [Tue, 28 Nov 2017 19:01:11 +0000 (11:01 -0800)]
msm: Array bounds check for buffer index
Check the ASM buffer index boundary before using it
to access the buffer to avoid out of array bounds error.
CRs-Fixed:
2145996
Change-Id: I97ad482dec0803debd01f19a9aeb531090fc1644
Signed-off-by: vigneshk <vigneshk@codeaurora.org>
Lijuan Gao [Wed, 6 Dec 2017 08:20:35 +0000 (16:20 +0800)]
drivers: power: reset: Do cold reset when doing oem reboot
As the IMEM approach to store reset reason is deprecated, so use
the spare register in PMIC power-on peripheral to store the oem
restart reason.
Bit-2 to bit-7 of SOFT_RB_SPARE for hard reset reason, so divide
existing range into regions, value 0 to 31 for common defined features
and 32 to 63 values are for OEMs/ODMs specific features.
Change-Id: Ib8e64d6dd5a335325d0469280e41e9d10ec9b893
Signed-off-by: Lijuan Gao <lijuang@codeaurora.org>
Ashay Jaiswal [Wed, 15 Nov 2017 12:39:19 +0000 (18:09 +0530)]
power: smb-lib: fix OTG enable error handling
Fix OTG enable error path and drop stale votes
on USB_ICL votable.
Change-Id: Ia0fce0ef75bb83ece72cc6a5a8f294b2500a0166
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Swetha Chikkaboraiah [Wed, 20 Sep 2017 07:12:45 +0000 (12:42 +0530)]
soc: qcom: pil: NULL check before pil_memset_io
In existing implementation if vmap fails device panics for
NULL pointer access while doing pil_memset_io.
Instead check for the NULL pointer.
Change-Id: I1b9fd084a8c168b70f6e01134e4122445e4873b4
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
Subbaraman Narayanamurthy [Wed, 29 Nov 2017 03:54:09 +0000 (19:54 -0800)]
leds: qpnp-flash-v2: Return error code separately during current prediction
Currently when the maximum available current per flash switch is
calculated, it is returned along with the error code. This will
be confusing when a real error occurs. Fix this by returning
error code separately and obtain the current by passing it by
reference.
Change-Id: I9e2a3436e19cc37319316603e6dfa45241df8a49
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Yasir Malik [Fri, 8 Dec 2017 20:41:25 +0000 (15:41 -0500)]
defconfig: arm64: fsm: Modify configs for FSM
* Enable POSIX message queues
* Disable ANDROID_PARANOID_NETWORK
* Disable IPC_ROUTER_SECURITY
* Disable unnecessary drivers:
- Graphics
- Sound
- Bluetooth
- Wireless LAN
- Most input devices
Change-Id: I134e94ad21ed2d9c8f247b5c1523510cdd9ecb0a
CRs-Fixed:
2130054
Acked-by: Jennifer L. Zenner <jzenner@qti.qualcomm.com>
Signed-off-by: Yasir Malik <ymalik@codeaurora.org>
Jack Pham [Thu, 2 Nov 2017 17:51:48 +0000 (10:51 -0700)]
usb: pd: qpnp-pdphy: move RX handling to hard IRQ
For improved performance, move RX handling from a thread to
a hard IRQ handler. This helps to decrease the chance of missing
incoming back-to-back messages (e.g. Accept -> PS_Ready following
a successful power request) due to the pending RX token in case
the IRQ thread is delayed due to high system load. policy_engine
needs to perform the buffer allocation with the GFP_ATOMIC flag.
Change-Id: Iacb2623280f1ac4de9f483a8abbf5dc055041be7
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Linux Build Service Account [Fri, 8 Dec 2017 10:17:03 +0000 (02:17 -0800)]
Merge "defconfig: Add android-verity support for system"
Linux Build Service Account [Fri, 8 Dec 2017 10:17:02 +0000 (02:17 -0800)]
Merge "ARM: dts: msm: Add NTN_CLK_SYNC pin for msm8996 agave and auto cdp board"
Linux Build Service Account [Fri, 8 Dec 2017 10:17:00 +0000 (02:17 -0800)]
Merge "ARM: dts: msm: Disable PCIe L1 and L1ss for msm8996 CV2X"
Linux Build Service Account [Fri, 8 Dec 2017 10:16:59 +0000 (02:16 -0800)]
Merge "diag: Free the memory in diagfwd_peripheral_exit()"
Zhiqiang Tu [Tue, 7 Nov 2017 02:23:37 +0000 (10:23 +0800)]
clk: msm: Add virtual clock frontend driver
It is virtual clock frontend driver which communicates
with host backend clock service/driver over HABMM. It
only supports msm8996 virtual platform currently.
Change-Id: Icfee28c301fa4a583b45e5d364432535643eb9b7
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Jack Pham [Thu, 12 Oct 2017 16:41:51 +0000 (09:41 -0700)]
usb: pd: qpnp-pdphy: Remove rx_busy flag
Having this flag was causing PD TX messages to incorrectly
get blocked in the case where the policy engine state machine
worker got scheduled to run in the RX IRQ, but before the
handler exits and clears the flag. This caused false errors
that an RX message is pending. Remove usage of this flag as
it was doing more harm than good.
Change-Id: Iffccfc9ffafac6017192d86d8d97d5534890c7b5
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Jack Pham [Tue, 10 Oct 2017 23:59:32 +0000 (16:59 -0700)]
usb: pd: Avoid blocking wait in SRC_TRANSITION_TO_DEFAULT
When sending/receiving a hard reset in source mode, the
PE_SRC_TRANSITION_TO_DEFAULT state turns off VBUS/VCONN and
sleeps for 750ms. During this fairly long period any Type-C
event such as cable disconnect or reconnect won't get
processed as the workqueue is blocked by this wait condition.
This can lead to incorrect state handling, for example when
a sink is removed and a source is attached; the state machine
will think a sink is still attached. Fix this by removing
the msleep() and set a timer to restart the state machine
to PE_UNKNOWN which will turn VBUS/VCONN back on and start
again in PE_SRC_STARTUP. This frees up the workqueue to
process any potential incoming events in the meantime.
Change-Id: I282551a58252a672f319d1559eac9f4ad4c3ca8a
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Jack Pham [Thu, 5 Oct 2017 19:51:26 +0000 (12:51 -0700)]
usb: pd: Send pending VDM message upon entering SNK/SRC_Ready
Entering SNK_Ready or SRC_Ready state from usbpd_set_state()
is somewhat terminal as it is the end state of a contract
negotiation. If there was a previous pending VDM message
waiting to be sent, for example the start of a Discovery which
was queued prior to a PR Swap, it would not get sent. Check for
this and enqueue usbpd_sm once again so that it could be sent
out. Otherwise, start the Discovery process in case we are
in DFP mode, and do that for SNK_Ready as well.
Change-Id: I4516ccb0deec8cdabdb62d539d7d2b66dc23f1ee
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Binoy Jayan [Thu, 9 Nov 2017 10:20:17 +0000 (15:50 +0530)]
defconfig: Add android-verity support for system
Add android-verity support so that the system image is verified by
the kernel during the boot time. Also set the x509 key file to be
used for verification.
Change-Id: I17ffc2944ef9af556d9fdc05d62734de384dc27c
Signed-off-by: Binoy Jayan <bjayan@codeaurora.org>
Subbaraman Narayanamurthy [Fri, 8 Dec 2017 03:12:27 +0000 (19:12 -0800)]
power: qpnp-fg-gen3: Update ESR filter coefficients for low temperature
As per the hardware recommendation, update ESR tight and broad
filter coefficients for low temperature (< 10 C) to 3 %.
CRs-Fixed:
2155610
Change-Id: I7e5a77bcd14ad64459f6bd13f0be0551dcbefdba
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Manaf Meethalavalappu Pallikunhi [Tue, 5 Dec 2017 01:53:04 +0000 (07:23 +0530)]
drivers: lmh_dcvsh: Defer cluster cooling register until core comes online
If all cores for a cluster are offline or not brought up during
lmh dcvsh probe, it fails to register cooling device and it leads
to probe failure. If later these cores come online, lmh dcvsh doesn't
re-probe it and eventually that cluster lmh dcvsh is broken.
Register for cpu online notification and register cpu cooling device
in cpu online notification callback context. It makes sure that
both lmh dcvsh probing and cooling device register are proper.
Change-Id: Id5345a578aab920d12bd9d9e2ccf1d5059582de9
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
Alex Yakavenka [Mon, 4 Dec 2017 23:43:49 +0000 (15:43 -0800)]
ARM: dts: msm: Change rh850 interrupt to gpio_122 on auto cdp boards
rh850_2_apq interrupt is connected to gpio_122 on auto cdp boards
CRs-Fixed:
2009305
Change-Id: Id60ec07a7bc4757050ad2a1c39123ec561581082
Signed-off-by: Alex Yakavenka <ayakav@codeaurora.org>
Poddar, Siddarth [Thu, 7 Dec 2017 06:04:21 +0000 (11:34 +0530)]
defconfig: msm: Enable CONFIG_INET_LRO
WLAN module supports LRO, so enable CONFIG_INET_LRO for SDM660.
Remove it from defconfig to enable as Kconfig has default set to enable.
Change-Id: I5681c47caa18931ab1a3ea2b09c3a1f9abc38777
CRs-Fixed:
2144533
Signed-off-by: Poddar Siddarth <siddpodd@codeaurora.org>
Zou Shunxiang [Tue, 5 Dec 2017 01:39:29 +0000 (09:39 +0800)]
ARM: dts: msm: Add NTN_CLK_SYNC pin for msm8996 agave and auto cdp board
NTN_CLK_SYNC line should be set low before bringing Neutrino out
of reset for msm8996 agave board and auto CDP board.
Change-Id: I7b213a7dad2dbdedd3fe42a88972dc36cbf2e5b5
Signed-off-by: Zou Shunxiang <shunxian@codeaurora.org>
Linux Build Service Account [Wed, 6 Dec 2017 15:00:32 +0000 (07:00 -0800)]
Merge "wcnss: fix the potential buffer overflow in wlan ctrl data process"
Linux Build Service Account [Wed, 6 Dec 2017 15:00:31 +0000 (07:00 -0800)]
Merge "icnss: Reject driver reinit request when FW is down"