Commit graph

590235 commits

Author SHA1 Message Date
Linux Build Service Account
ed23e3c43b Merge "scsi: ufs-qcom: remove broken hci version quirk" 2017-05-16 06:49:37 -07:00
Linux Build Service Account
ec43abcb48 Merge "msm: mdss: fix display port crash caused by hpd_irq attention event" 2017-05-16 06:49:35 -07:00
Linux Build Service Account
2fdf1c893d Merge "drm/msm: drop return from gpu->submit()" 2017-05-16 06:49:34 -07:00
Linux Build Service Account
df5db93178 Merge "tracing: do not leak kernel addresses" 2017-05-16 06:49:32 -07:00
Linux Build Service Account
b0104407c2 Merge "Prevent heap overflow in uvc driver" 2017-05-16 06:49:31 -07:00
Linux Build Service Account
f7b2efad8d Merge "msm: kgsl: Offload mementry destroy work to separate thread" 2017-05-16 06:49:29 -07:00
Linux Build Service Account
9ed4022de0 Merge "spcom: avoid user commands via /dev/spcom" 2017-05-16 06:49:29 -07:00
Linux Build Service Account
1924110d21 Merge "timer: Clear deferrable_pending while handling timer softirq" 2017-05-16 06:49:28 -07:00
Linux Build Service Account
647e9bf427 Merge "soc: qcom: rpm_master_stat: Fix buffer overflow" 2017-05-16 06:49:27 -07:00
Linux Build Service Account
40e4c19332 Merge "diag: Add proper synchronization checks to msg mask table" 2017-05-16 06:49:26 -07:00
Linux Build Service Account
3715a9458a Merge "msm: ADSPRPC: verify and initialize some variables" 2017-05-16 06:49:25 -07:00
Linux Build Service Account
560c77a760 Merge "ASoC: wcd: Depend on right config option" 2017-05-16 06:49:24 -07:00
Linux Build Service Account
84b6f80cab Merge "memshare: Update the free memory count after allocation" 2017-05-16 06:49:23 -07:00
Linux Build Service Account
3a168d290b Merge "PM/devfreq: bw_hwmon: add mutex lock in polling interval case" 2017-05-16 06:49:22 -07:00
Linux Build Service Account
4939123c90 Merge "qseecom: add bus scaling support for GP operations" 2017-05-16 06:49:21 -07:00
Linux Build Service Account
f74b3846f3 Merge "ARM: dts: msm: move tdm common prop to parent node" 2017-05-16 06:49:18 -07:00
Linux Build Service Account
c46427b57a Merge "ASoC: msm: qdsp6v2: Add TDM master slave select setting" 2017-05-16 06:49:17 -07:00
Tharun Kumar Merugu
7fbbf8a306 msm: ADSPRPC: Copy process name buffer to kernel space
Copy user space process name buffer to kernel space using
copy_from_user.

Change-Id: I5272a42651ac50ddeda3f0f7a4cbd32dbaf495ec
Acked-by: Himateja Reddy <hmreddy@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-05-16 06:09:24 -07:00
Narender Ankam
44868b73bd ARM: dts: msm: always enable mdss_mdp node for msm8998 based MOB3 platform
Duplicate probing of mdss_mdp device node is now handled
within SDE driver.

Change-Id: I3e4bb5c73c8d43e6fe07ff791ea3815636e50a55
Signed-off-by: Narender Ankam <nankam@codeaurora.org>
2017-05-16 17:37:13 +05:30
Vijayavardhan Vennapusa
325dc282c7 USB: composite: Advertise USB version as 0x200 if max speed is HS
Currently driver is advertising as USB device as 0x210 even if
maximum speed is limited to high speed mode. This is causing throughput
degradation for RNDIS with host machines that enables USB2 LPM. Hence
disable USB2 LPM for device having maximum speed limited to high speed
mode by advertizing as 0x200.

Change-Id: I9d7d62f35284f11faa7e933e755277d24dce1038
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-05-16 17:01:40 +05:30
David Dai
346c7ec716 msm: msm_bus: Add mutex to protect node_list
Static variable node_list list need to be protected with a mutex
to prevent race conditions and use after free cases.

Change-Id: I4790b06712b8a8b401f43418cfcc53b415fb0019
Signed-off-by: David Dai <daidavid1@codeaurora.org>
Signed-off-by: Odelu Kukatla <okukatla@codeaurora.org>
2017-05-16 15:49:10 +05:30
Rajkumar Subbiah
ef8e3cd458 msm: mdss: Fix potential dereferencing of null pointer
During atomic commit on a writeback panel, there is a possibility
of deferencing a NULL pointer if the configuration changes before
the commit. This change adds a NULL pointer check to avoid it.

Change-Id: I56d0efad40992b6f87c81e5eab93cf0f24f6f524
Signed-off-by: Rajkumar Subbiah <rsubbia@codeaurora.org>
2017-05-16 03:11:13 -07:00
Jin Li
54133d0b7d drm/msm: wait fence complete before flip
In async commit case, driver needs to always wait for input fence
before triggering the complete_commit path. Otherwise, there could
be tearing since GPU hasn't finished the composition rendering.

Change-Id: I73a54f5811fdcf8639618ce3cacf4cbaa00b406c
Signed-off-by: Felix Xiong <xayang@codeaurora.org>
Signed-off-by: Jin Li <jinl@codeaurora.org>
Signed-off-by: Yunyun Cao <yunyunc@codeaurora.org>
2017-05-16 18:09:03 +08:00
Brahmaji K
df7052e30b qcdev: Check the digest length during the SHA operations
Check the digest length to avoid buffer overflow while
doing the SHA operations.

Change-Id: I4d3fb20723f59e905a672edaf84ee5d0865905b1
Signed-off-by: Brahmaji K <bkomma@codeaurora.org>
2017-05-16 03:02:33 -07:00
Pratham Pratap
1509025cbf USB: f_qc_rndis: Prevent use-after-free for _rndis_qc
Assume that there are two threads, thread1 is setting
value of _rndis_qc variable in rndis_qc_bind_config_vendor
function. Thread2 jumps in and get the value of _rndis_qc
in rndis_qc_open_dev function before it is freed in
rndis_qc_bind_config_vendor function, since rndis_ipa_init
or usb_add_function failed. Use-after-free will happen as
Thread2 is referencing freed objects. To prevent this
spinlock is used where ever it is needed to protect
_rndis_qc variable.

Change-Id: I4da50c125e401e90abec3dc6b4e2c4a504a63ba0
Signed-off-by: Pratham Pratap <prathampratap@codeaurora.org>
2017-05-16 01:59:48 -07:00
Vijay kumar Tumati
933316ef88 ARM: dts: msm: Add flash handle to camera1 device on SDM660
Add flash handle to camera1 device in SDM660 sensor
MTP/CDP/QRD platforms to support flash on auxiliary camera.

In dual camera usecase, even the auxiliary sensor uses
flash. So the flash handle should be added to this camera
node as well.

Change-Id: Id7b40e5e86e67aa1e5df95d2094641a50f81286e
Signed-off-by: Vijay kumar Tumati <vtumati@codeaurora.org>
2017-05-16 01:40:01 -07:00
Maria Yu
f4106f4657 soc: qcom: msm_bus: add rt mutex lock for cllist data
Cldata needed to be protected by lock since crash
happened when synchronous update and free.

CRs-Fixed: 2034222
Change-Id: Ied86461b784d69d9758dc3fc793a8a0de86e7f9c
Signed-off-by: Maria Yu <aiquny@codeaurora.org>
2017-05-16 16:16:12 +08:00
Ziqi Chen
5187aa6bfc ARM: dts: msm: Update high-speed PHY parameters for QRD SDM660
QRD SDM660 failed on high-speed eye diagram test. Updated
these parameters based on tuning result to pass compliance test.

Change-Id: Ice00698872be4c39c2184dbd5bc2d99af7641b02
Signed-off-by: Ziqi Chen <ziqic@codeaurora.org>
2017-05-15 23:55:29 -07:00
Ziqi Chen
73c0dce1f5 ARM: dts: msm: Update high-speed PHY parameters for QRD SDM630
QRD SDM630 failed on high-speed eye diagram test. Update these
parameters based on tuning result to pass compliance test.

Change-Id: I34bb4d7808448ba687bdd9495e1573cb9eac6098
Signed-off-by: Ziqi Chen <ziqic@codeaurora.org>
2017-05-15 23:47:04 -07:00
Sarada Prasanna Garnayak
fa85584489 ath10k: Define structure for copy engine interrupt map for SNOC
The WLAN driver request and free the copy engine interrupt
according to the WLAN host target communication and protocol
in different WLAN context and subsystem state. The ath10k snoc
free/request all copy engine interrupt line during wlan subsystem
recovery due to firmware crash or hardware interface down etc.

To avoid the kernel warning and fault due to redundant copy engine
interrupt request/free in different wlan state. Define structure
for copy engine to maintain the stat of copy engine interrupt list
request/free.

Change-Id: I5cf3de4feecfb3a93a930c4939dc0a80bfc14e55
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
2017-05-15 23:43:45 -07:00
Xiaojun Sang
f485150d69 ASoC: msm: remove unused msm-compr-q6-v2
msm-compr-q6-v2.c and msm-compr-q6-v2.h are no longer used.

CRs-Fixed: 2022953
Change-Id: I856d90a212a3e123a2c8b80092aff003f7c608c7
Signed-off-by: Xiaojun Sang <xsang@codeaurora.org>
2017-05-15 19:23:40 -07:00
Can Guo
ea86ca8e20 defconfig: arm64: Enable UFSHCD_CMD_LOGGING flag
Enabling SCSI_UFSHCD_CMD_LOGGING flag in defconfig
file. With this feature eanbled, ufs commands send
through ufshcd shall be logged.

Change-Id: Ibc4d1f39221fbcdc926e030d1df08a9fea31d24c
Signed-off-by: Can Guo <cang@codeaurora.org>
2017-05-15 18:04:21 -07:00
Puja Gupta
91747af561 soc: qcom: Fix checks for QMI response values
The return values from QMI could be compared directly and was
incorrectly interpreted in service locator and notifier.

Also initialize structure in service locator so as to not have garbage
values in them.

Change-Id: I7f8f27857706e9508b64289d9263c79494c17a8d
Signed-off-by: Puja Gupta <pujag@codeaurora.org>
2017-05-15 13:26:51 -07:00
Ben Romberger
9b556eaa0e ASoC: msm: qdsp6v2: Add 144k sample rate to compress driver
Add support for 144k sample rate in the compress driver.
144k is supported for TrueHD pass-through.

Change-Id: I2a0e772e658e64f43ed1864814f91e7a36f67af6
Signed-off-by: Ben Romberger <bromberg@codeaurora.org>
2017-05-15 13:01:47 -07:00
Hemant Kumar
adce509c28 usb: gadget: f_cdev: Fix NULL pointer dereference in cser_free_inst
If f_cdev_alloc() fails it frees the port context and set_inst_name()
call back returns with error. As a result free_func_inst() call back
is called which is dereferencing port context from f_cdev_opts context
which results into NULL ptr dereference. Fix the issue by adding NULL
check for port context pointer in f_cdev_opts context.

Change-Id: I69828761be0a9f7df714eec34894c13f762dcc43
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2017-05-15 12:24:00 -07:00
Animesh Kishore
97b31746b3 ARM: dts: msm: Enable dynamic fps for msm8998
Enabling dynamic fps for nt35597 wqxga panel on msm8998.
The feature helps to reduce fps when static screen
leading to power saving.

Change-Id: Icc040d3d764b70cdf9e9ba2523acd04c9a8691c6
Signed-off-by: Animesh Kishore <animeshk@codeaurora.org>
2017-05-15 11:15:37 -07:00
Nick Desaulniers
ccc9ce7791 tracing: do not leak kernel addresses
This likely breaks tracing tools like trace-cmd.  It logs in the same
format but now addresses are all 0x0.

Bug: 34277115
Change-Id: Ifb0d4d2a184bf0d95726de05b1acee0287a375d9
Git-repo: https://android.googlesource.com/kernel/msm
Git-commit: 9ad8f2cc1bb73a3e2255dff4ee9c45c909869225
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2017-05-15 10:45:17 -07:00
Robb Glasser
f872fd26e4 Prevent heap overflow in uvc driver
The size of uvc_control_mapping is user controlled leading to a
potential heap overflow in the uvc driver. This adds a check to verify
the user provided size fits within the bounds of the defined buffer
size.

Bug: 33300353
Change-Id: If29c1b396633b6137966a12e38f6fd1841b045bd
Signed-off-by: Robb Glasser <rglasser@google.com>
Git-repo: https://android.googlesource.com/kernel/msm
Git-commit: 8bc3ec72a02052187397d0de1a7b8bbe7340451c
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2017-05-15 10:44:22 -07:00
Maya Erez
9b372ef962 msm_11ad: add support to PCIe D3hot in system suspend
Transition to D3 hot in system suspend allows the wil6210
device to preserve the active connections in system suspend.

Change-Id: I4c24551f91ee7e59d4bfee02b0911c31ae0a05b1
Signed-off-by: Maya Erez <merez@codeaurora.org>
2017-05-15 16:57:58 +03:00
Maya Erez
36fc0ea2ed wil6210: add support for PCIe D3hot in system suspend
In order to preserve the connection in suspend/resume flow,
wil6210 host allows going to PCIe D3hot state in suspend,
instead of performing a full wil6210 device reset. This
requires the platform ability to initiate wakeup in case of
RX data. To check that, a new platform API is added.
In addition, add cfg80211 suspend/resume callbacks
implementation.

Change-Id: I3846eaaa8d6e9ecbe5adbb0c04c7574865d5af5e
Signed-off-by: Maya Erez <merez@codeaurora.org>
2017-05-15 16:57:46 +03:00
Kyle Yan
373b13c83b Merge remote-tracking branch 'origin/tmp-285c137' into msm-4.4
* origin/tmp-285c137:
  Linux 4.4.68
  block: get rid of blk_integrity_revalidate()
  drm/ttm: fix use-after-free races in vm fault handling
  f2fs: sanity check segment count
  bnxt_en: allocate enough space for ->ntp_fltr_bmap
  ipv6: reorder ip6_route_dev_notifier after ipv6_dev_notf
  ipv6: initialize route null entry in addrconf_init()
  rtnetlink: NUL-terminate IFLA_PHYS_PORT_NAME string
  ipv4, ipv6: ensure raw socket message is big enough to hold an IP header
  tcp: do not inherit fastopen_req from parent
  tcp: fix wraparound issue in tcp_lp
  bpf, arm64: fix jit branch offset related to ldimm64
  tcp: do not underestimate skb->truesize in tcp_trim_head()
  ALSA: hda - Fix deadlock of controller device lock at unbinding
  staging: emxx_udc: remove incorrect __init annotations
  staging: wlan-ng: add missing byte order conversion
  brcmfmac: Make skb header writable before use
  brcmfmac: Ensure pointer correctly set if skb data location changes
  MIPS: R2-on-R6 MULTU/MADDU/MSUBU emulation bugfix
  scsi: mac_scsi: Fix MAC_SCSI=m option when SCSI=m
  serial: 8250_omap: Fix probe and remove for PM runtime
  phy: qcom-usb-hs: Add depends on EXTCON
  USB: serial: io_edgeport: fix descriptor error handling
  USB: serial: mct_u232: fix modem-status error handling
  USB: serial: quatech2: fix control-message error handling
  USB: serial: ftdi_sio: fix latency-timer error handling
  USB: serial: ark3116: fix open error handling
  USB: serial: ti_usb_3410_5052: fix control-message error handling
  USB: serial: io_edgeport: fix epic-descriptor handling
  USB: serial: ssu100: fix control-message error handling
  USB: serial: digi_acceleport: fix incomplete rx sanity check
  USB: serial: keyspan_pda: fix receive sanity checks
  usb: chipidea: Handle extcon events properly
  usb: chipidea: Only read/write OTGSC from one place
  usb: host: ohci-exynos: Decrese node refcount on exynos_ehci_get_phy() error paths
  usb: host: ehci-exynos: Decrese node refcount on exynos_ehci_get_phy() error paths
  KVM: nVMX: do not leak PML full vmexit to L1
  KVM: nVMX: initialize PML fields in vmcs02
  Revert "KVM: nested VMX: disable perf cpuid reporting"
  x86/platform/intel-mid: Correct MSI IRQ line for watchdog device
  kprobes/x86: Fix kernel panic when certain exception-handling addresses are probed
  clk: Make x86/ conditional on CONFIG_COMMON_CLK
  x86/pci-calgary: Fix iommu_free() comparison of unsigned expression >= 0
  x86/ioapic: Restore IO-APIC irq_chip retrigger callback
  mwifiex: Avoid skipping WEP key deletion for AP
  mwifiex: remove redundant dma padding in AMSDU
  mwifiex: debugfs: Fix (sometimes) off-by-1 SSID print
  ARM: OMAP5 / DRA7: Fix HYP mode boot for thumb2 build
  leds: ktd2692: avoid harmless maybe-uninitialized warning
  power: supply: bq24190_charger: Handle fault before status on interrupt
  power: supply: bq24190_charger: Don't read fault register outside irq_handle_thread()
  power: supply: bq24190_charger: Call power_supply_changed() for relevant component
  power: supply: bq24190_charger: Install irq_handler_thread() at end of probe()
  power: supply: bq24190_charger: Call set_mode_host() on pm_resume()
  power: supply: bq24190_charger: Fix irq trigger to IRQF_TRIGGER_FALLING
  powerpc/powernv: Fix opal_exit tracepoint opcode
  cpupower: Fix turbo frequency reporting for pre-Sandy Bridge cores
  ARM: 8452/3: PJ4: make coprocessor access sequences buildable in Thumb2 mode
  9p: fix a potential acl leak
  ANDROID: android-base.cfg: remove spurious CONFIG_MODULES line
  ANDROID: memory_state_time: fix undefined behavior with missing DT properties
  ANDROID: rfkill: fix unused function warning
  ANDROID: make PF_KEY SHA256 use RFC-compliant truncation.
  ANDROID: sdcardfs: fix sdcardfs_destroy_inode for the inode RCU approach
  ANDROID: android-base.cfg: remove NETFILTER_XT_MATCH_QUOTA2_LOG
  ANDROID: sdcardfs: Don't iput if we didn't igrab
  ANDROID: Add untag hacks to inet_release function

Change-Id: I6d750f8bb186774ff9630beeb0ed8e680af26231
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
2017-05-15 05:09:49 -07:00
Ramesh V
cc12a0966b msm: camera: isp : Fix race condition in close sequence
Serializing reset_hw and reset_irq, to avoid race condition.

Change-Id: I0fd4fc8cfcdef9fe0e0679c3cee44b2dddc7b506
Signed-off-by: Ramesh V <ramev@codeaurora.org>
2017-05-15 17:00:16 +05:30
Linux Build Service Account
75a9d0fee5 Merge "ARM: dts: msm: Update charging ESR timer value to 96 for PM660 FG" 2017-05-15 03:51:25 -07:00
Linux Build Service Account
e7c8de8d94 Merge "scsi: ufs: Initialize cmd_id and check lrbp->cmd NULL" 2017-05-15 03:51:24 -07:00
Linux Build Service Account
cdcdb7a314 Merge "mmc: mmc: Fix mmc_partial_init for HS400 mode" 2017-05-15 03:51:23 -07:00
Linux Build Service Account
1f7482db72 Merge "defconfig: msm: remove dcc config for perf on sdm660" 2017-05-15 03:51:22 -07:00
Linux Build Service Account
593bc3b721 Merge "sound: usb: Add default branches for BADD 3.0 devices" 2017-05-15 03:51:21 -07:00
Linux Build Service Account
2cc0f28c54 Merge "media: dvb-core: Fix coding errors in broadcast drivers" 2017-05-15 03:51:21 -07:00
Linux Build Service Account
3c50776b05 Merge "defconfig: msmcortex: Cleanup" 2017-05-15 03:51:20 -07:00
Linux Build Service Account
696b2e8fbe Merge "qpnp-smb2: Add software based glitch filter for OTG detection" 2017-05-15 03:51:19 -07:00