Commit graph

596001 commits

Author SHA1 Message Date
Linux Build Service Account
2f26ea48fb Merge "arm64: issue isb when trapping CNTVCT_EL0 access" 2018-01-12 15:34:03 -08:00
Linux Build Service Account
5d574072e3 Merge "BACKPORT: arm64: Add CNTFRQ_EL0 trap handler" 2018-01-12 15:34:02 -08:00
Linux Build Service Account
d81280ed87 Merge "BACKPORT: arm64: Add CNTVCT_EL0 trap handler" 2018-01-12 15:34:01 -08:00
Linux Build Service Account
ca9e78d525 Merge "ASoC: msm: add kcontrol for sec tdm slot config" 2018-01-12 15:34:00 -08:00
Linux Build Service Account
8867eef777 Merge "netfilter: nf_defrag_ipv4: Add sysctl to disable per interface" 2018-01-12 15:33:58 -08:00
Linux Build Service Account
39b7c5b66a Merge "ARM: dts: msm: smmu and modem switch to virtual clock on msm8996 vplatform" 2018-01-12 15:33:57 -08:00
Linux Build Service Account
04b6b652ac Merge "leds: qpnp-wled: add stepper algorithm using brightness map" 2018-01-11 04:15:02 -08:00
Linux Build Service Account
d11384c032 Merge "leds: qpnp-wled: add support for brightness mapping" 2018-01-11 04:15:01 -08:00
Linux Build Service Account
223521eafb Merge "ARM: dts: msm: Add missing entries for XO on msm8996 agave" 2018-01-11 04:15:00 -08:00
Linux Build Service Account
4e432f6b70 Merge "mmc: host: Add device_prepare pm for mmc_host" 2018-01-11 04:14:59 -08:00
Linux Build Service Account
4233164b94 Merge "drivers: cpuidle: lpm-levels: Fix untrusted pointer dereference." 2018-01-11 04:14:57 -08:00
Linux Build Service Account
424c9af495 Merge "soc: msm: qdsp6v2: fix compile warning in ion vm driver" 2018-01-11 04:14:56 -08:00
Linux Build Service Account
e64256fca0 Merge "ASoC: msm: qdsp6v2: add spin lock to protect ac" 2018-01-11 04:14:55 -08:00
Linux Build Service Account
eb26d9d0c0 Merge "icnss: Add size check before assigning msa permission" 2018-01-11 04:14:54 -08:00
Linux Build Service Account
a26abcc37e Merge "drm/msm: Fix prototypes of the stub functions" 2018-01-11 04:14:53 -08:00
Linux Build Service Account
3ff2845f4e Merge "oc: qcom: rpm-smd-debug: Fix potential memory leaks" 2018-01-11 04:14:51 -08:00
Linux Build Service Account
75c61941bc Merge "Merge android-4.4.105 (8a53962) into msm-4.4" 2018-01-11 04:14:46 -08:00
Linux Build Service Account
e525ef12a4 Merge "Merge android-4.4.104 (8bc4213) into msm-4.4" 2018-01-11 04:14:45 -08:00
Subash Abhinov Kasiviswanathan
3ee7c157f7 netfilter: nf_defrag_ipv4: Add sysctl to disable per interface
Add a sysctl nf_ipv4_defrag_skip to skip defragmentation per
interface. This is set 0 to preserve existing behavior (always
defrag per interface).

This is useful for pure ipv4 forwarding scenarios (without NAT)
in conjunction with xfrm. It appears that network stack defrags
the packets and then forwards them to xfrm which then encrypts
and then later fragments them on a different boundary compared
to the source.

CRs-Fixed: 2140310
Change-Id: I11956284a9692579274e8626f61cc6432232254c
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2018-01-10 13:57:22 -07:00
Derek Chen
fa7c29365d ASoC: msm: add kcontrol for sec tdm slot config
Add kcontrol support for TDM slot width and
slot number configuration for secondary TDM
interface.

CRs-fixed: 2170145
Signed-off-by: Derek Chen <chenche@codeaurora.org>
Change-Id: I573421d005618c07c5735196490385d67f36f89a
2018-01-10 08:51:24 -08:00
Rahul Sharma
932d6cbc80 ARM: dts: msm: Add missing entries for XO on msm8996 agave
Some camera entries are missing in camera dtsi files which are
causing failure on LA XO shutdown. Added all missing automotive
camera entries to dtsi files which are used by camera driver
during LA XO shutdown.

Change-Id: I633ed0788bb1dd6c512c6d6349c3750c19bcdd26
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2018-01-10 07:40:50 -08:00
Zhiqiang Tu
ade10b604f ARM: dts: msm: smmu and modem switch to virtual clock on msm8996 vplatform
Enable virtual clock for smmu and modem.

Change-Id: I0a399eb3535ea919ed2919a041ff467572c40e8b
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-01-09 23:45:26 -08:00
Mahesh Sivasubramanian
5f3b521525 drivers: cpuidle: lpm-levels: Fix untrusted pointer dereference.
The list_for_each macro was not used correctly, where the intermediate
variable would be LIST_POISON, resulting in a untrusted pointer
dereference. Switch to using list_for_each_entry_safe to for safe
removal of a list entry.

Change-Id: I0e0fd5dd9f251b5093d6e9d6335387512ec59249
Signed-off-by: Mahesh Sivasubramanian <msivasub@codeaurora.org>
2018-01-10 12:31:28 +05:30
Vijay Viswanath
a4d62a190d mmc: host: Add device_prepare pm for mmc_host
mmc_host is a virtual device and it doesn't have any pm ops and so during
pm registration of device, no_pm_callback gets set as true. The
mmc_host device is not runtime enabled as it is a virtual device and
mmc_host is the parent device of mmc_card. As the mmc_host is runtime
disabled, mmc_card can runtime suspend/resume without depending on
state of mmc_host during normal operations. During system suspend, the
direct_complete flag of mmc_host device gets set as it has no pm_ops.
When mmc_card successfully suspends, it clears the direct_complete flag
of its parent (mmc_host).

But in certain cases during dpm_suspend, an async error can occur after
suspend work for mmc_card is scheduled and before it gets executed. In
that case, mmc_card suspend work will not clear the direct_complete flag
of mmc_host. When mmc_host suspend comes after that of mmc_card,
it too will skip all actions.

But by this time, the mmc_host device has been added to device_suspended
list. So during resume, mmc_host resume will do dpm resume of mmc_host.
In dpm_resume, all devices which has direct_complete flag set will be
runtime_enabled. This is because, in dpm_suspend, any device with
direct_complete flag will be runtime_disabled. Thus, mmc_host which has
direct_complete flag set, will get runtime enabled during dpm_resume.
This is a problem in pm framework with direct_complete flag
(runtime enabling a device in resume when it was not runtime disabled
in suspend path).

Now that mmc_host device is runtime enabled, to runtime resume the
mmc_card, the pm framework will try to runtime resume the mmc_host
device as well and will fail. This prevents mmc_card from runtime
resuming after a runtime_suspend.

Fix this by adding a dummy suspend_prepare() fn for mmc_host. This
prevents the direct_complete flag of mmc_host device from getting set.

Change-Id: Ib739399027958d17e418e0240684b0b517a02941
Signed-off-by: Vijay Viswanath <vviswana@codeaurora.org>
2018-01-10 12:27:13 +05:30
Yuanyuan Liu
d49bcf2440 icnss: Add size check before assigning msa permission
While assigning msa permission, number of memory region is passed
as an argument within platform private data. This number could
exceed the range of memory region buffer that preallocated. Hence
add size check before accessing region buffer.

Change-Id: I45f4efc7edaa636c861458dab74b1956767d2019
CRs-Fixed: 2101134
Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
2018-01-09 17:04:11 -08:00
Linux Build Service Account
1707cb3ff1 Merge "msm: camera: Prevent buffer overread in write_logsync." 2018-01-09 15:40:52 -08:00
Linux Build Service Account
413d1c29b6 Merge "drm: add picture aspect ratio flags" 2018-01-09 15:40:42 -08:00
Linux Build Service Account
814ce2f505 Merge "ARM: dts: msm: Add support for FHD+ Video Mode Panel on SDM660" 2018-01-09 15:40:41 -08:00
Linux Build Service Account
fcf826264c Merge "sched: Restore previous implementation of check_for_migration()" 2018-01-09 15:40:39 -08:00
Linux Build Service Account
20ab01289c Merge "sched: core: Exclude isolated cpus in sched_getaffinity cpumask" 2018-01-09 15:40:38 -08:00
Linux Build Service Account
335cf65347 Merge "sched: Update tracepoint to include task info" 2018-01-09 15:40:35 -08:00
Linux Build Service Account
05389087c3 Merge "ARM: dts: msm: Add cnss sdio dsrc on msm8996 vplatform" 2018-01-09 15:40:34 -08:00
Linux Build Service Account
d093470650 Merge "defconfig: msm: enable tv tuner driver for MSM8996" 2018-01-09 15:40:32 -08:00
Linux Build Service Account
3808c1b2e9 Merge "ath10k: Define wlan hardware param for pdev suspend option" 2018-01-09 15:40:30 -08:00
Linux Build Service Account
b04efc88ff Merge "UPSTREAM: ALSA: timer: Call notifier in the same spinlock" 2018-01-09 15:40:29 -08:00
Linux Build Service Account
8be6297f82 Merge "sched: Fix spinlock recursion in sched_exit()" 2018-01-09 15:40:27 -08:00
Linux Build Service Account
30bcab60e7 Merge "drm/msm/sde: clear blend stages of all mixers" 2018-01-09 15:40:26 -08:00
Linux Build Service Account
9c7f12cde2 Merge "soc: qcom: glink: Modify glink logging in tx_common" 2018-01-09 15:40:25 -08:00
Linux Build Service Account
57f58180d9 Merge "soc: qcom: glink_pkt: Exit if device handle is NULL" 2018-01-09 15:40:23 -08:00
Linux Build Service Account
bdc7048a1b Merge "usb: gadget: Update default class subclass and protocol for rndis" 2018-01-09 15:40:22 -08:00
Linux Build Service Account
6464572edc Merge "ASoC: msm: qdsp6v2: Update audio effects driver to support Instance ID" 2018-01-09 15:40:14 -08:00
Linux Build Service Account
d59545e5cb Merge "cnss2: Make WLAN host driver unregister work uninterruptible" 2018-01-09 15:40:12 -08:00
Linux Build Service Account
14aa89ff45 Merge "cnss2: Ignore recovery if driver state is not proper" 2018-01-09 15:40:11 -08:00
Linux Build Service Account
fa18c55b4d Merge "soc: qcom: hab: add some more logs" 2018-01-09 15:40:00 -08:00
Trishansh Bhardwaj
1240d01e09 msm: camera: Prevent buffer overread in write_logsync.
If userspace issues write with string of length 21 or more then
there is a chance that kernel will overread lbuf array.
This change makes sure that lbuf is NULL terminated.

Change-Id: I9ad6d5a607b2ff1f293512be9746ee554b076b10
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2018-01-09 01:04:35 -08:00
Camus Wong
afdb01d0f0 drm/msm: Fix prototypes of the stub functions
Fix prototypes of the stub version of these functions
when QCOM_BUS_SCALING is not enabled
 sde_power_data_bus_parse
 sde_power_data_bus_unregister

Change-Id: I049e9da3e32902e23fcd1faca1693f18686914a5
Signed-off-by: Camus Wong <camusw@codeaurora.org>
2018-01-08 16:42:25 -05:00
Shashank Sharma
dfd7f4cba2 drm: add picture aspect ratio flags
This patch adds drm flag bits for aspect ratio information

Currently drm flag bits don't have field for mode's picture
aspect ratio. This field will help the driver to pick mode with
right aspect ratio, and help in setting right VIC field in avi
infoframes.

V2: Addressed review comments from Sean
- Changed PAR-> PIC_AR
V3: Rebase
V3: Added r-b by Jose

Change-Id: I40cd7fc8393166b710a5f1faaea6e7dac59af65b
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Jim Bride <jim.bride@linux.intel.com>
Reviewed-by: Jose Abreu <Jose.Abreu@synopsys.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1476705880-15600-2-git-send-email-shashank.sharma@intel.com
Git-commit: 876f43c073d79ad3f14a4cebd1aea1f39fc4daf5
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[nbahrani@codeaurora.org: resolve merge conflicts by changing
 the mask bits to 27:24 instead of 22:19]
Signed-off-by: Navid Bahrani <nbahrani@codeaurora.org>
2018-01-08 11:40:09 -08:00
Raghavendra Kakarla
9c1ab77010 oc: qcom: rpm-smd-debug: Fix potential memory leaks
Fix memory leak due to rpm request not freed during error conditions.

Change-Id: I440a58bf452e76c8886f7bcd8f89b24698a301e9
Signed-off-by: Raghavendra Kakarla <rkakarla@codeaurora.org>
2018-01-08 01:44:51 -08:00
Rashi Bindra
d6718c4e1b ARM: dts: msm: Add support for FHD+ Video Mode Panel on SDM660
Add changes to add panel init sequence, on/off commands and other
panel properties for FHD+ Video Mode Panel.

Change-Id: Iedabdec64ea6d5882a4078c0e5d831d0547314c3
Signed-off-by: Rashi Bindra <rbindra@codeaurora.org>
Signed-off-by: Vishnuvardhan Prodduturi <vproddut@codeaurora.org>
2018-01-08 13:11:15 +05:30
Srinivasarao P
33260fbfb3 Merge android-4.4.105 (8a53962) into msm-4.4
* refs/heads/tmp-8a53962
  Linux 4.4.105
  xen-netfront: avoid crashing on resume after a failure in talk_to_netback()
  usb: host: fix incorrect updating of offset
  USB: usbfs: Filter flags passed in from user space
  USB: devio: Prevent integer overflow in proc_do_submiturb()
  USB: Increase usbfs transfer limit
  USB: core: Add type-specific length check of BOS descriptors
  usb: ch9: Add size macro for SSP dev cap descriptor
  usb: Add USB 3.1 Precision time measurement capability descriptor support
  usb: xhci: fix panic in xhci_free_virt_devices_depth_first
  usb: hub: Cycle HUB power when initialization fails
  Revert "ocfs2: should wait dio before inode lock in ocfs2_setattr()"
  net: fec: fix multicast filtering hardware setup
  xen-netfront: Improve error handling during initialization
  mm: avoid returning VM_FAULT_RETRY from ->page_mkwrite handlers
  tcp: correct memory barrier usage in tcp_check_space()
  dmaengine: pl330: fix double lock
  tipc: fix cleanup at module unload
  net: sctp: fix array overrun read on sctp_timer_tbl
  drm/exynos/decon5433: set STANDALONE_UPDATE_F on output enablement
  NFSv4: Fix client recovery when server reboots multiple times
  KVM: arm/arm64: Fix occasional warning from the timer work function
  nfs: Don't take a reference on fl->fl_file for LOCK operation
  ravb: Remove Rx overflow log messages
  net/appletalk: Fix kernel memory disclosure
  vti6: fix device register to report IFLA_INFO_KIND
  ARM: OMAP1: DMA: Correct the number of logical channels
  net: systemport: Pad packet before inserting TSB
  net: systemport: Utilize skb_put_padto()
  kprobes/x86: Disable preemption in ftrace-based jprobes
  perf test attr: Fix ignored test case result
  sysrq : fix Show Regs call trace on ARM
  EDAC, sb_edac: Fix missing break in switch
  x86/entry: Use SYSCALL_DEFINE() macros for sys_modify_ldt()
  serial: 8250: Preserve DLD[7:4] for PORT_XR17V35X
  usb: phy: tahvo: fix error handling in tahvo_usb_probe()
  spi: sh-msiof: Fix DMA transfer size check
  serial: 8250_fintek: Fix rs485 disablement on invalid ioctl()
  selftests/x86/ldt_get: Add a few additional tests for limits
  s390/pci: do not require AIS facility
  ima: fix hash algorithm initialization
  USB: serial: option: add Quectel BG96 id
  s390/runtime instrumentation: simplify task exit handling
  serial: 8250_pci: Add Amazon PCI serial device ID
  usb: quirks: Add no-lpm quirk for KY-688 USB 3.1 Type-C Hub
  uas: Always apply US_FL_NO_ATA_1X quirk to Seagate devices
  bcache: recover data from backing when data is clean
  bcache: only permit to recovery read error when cache device is clean
  ANDROID: initramfs: call free_initrd() when skipping init

Conflicts:
	drivers/usb/core/config.c
	include/linux/usb.h
	include/uapi/linux/usb/ch9.h

Change-Id: Ibada5100be12f3a1389461f7738ee2ecb0d427af
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-01-08 10:02:41 +05:30