Commit graph

600320 commits

Author SHA1 Message Date
Geert Uytterhoeven
dae7ffc78e USB: serial: cp210x: use tcflag_t to fix incompatible pointer type
commit 009615ab7fd4e43b82a38e4e6adc5e23c1ee567f upstream.

On sparc32, tcflag_t is unsigned long, unlike all other architectures:

    drivers/usb/serial/cp210x.c: In function 'cp210x_get_termios':
    drivers/usb/serial/cp210x.c:717:3: warning: passing argument 2 of 'cp210x_get_termios_port' from incompatible pointer type
       cp210x_get_termios_port(tty->driver_data,
       ^
    drivers/usb/serial/cp210x.c:35:13: note: expected 'unsigned int *' but argument is of type 'tcflag_t *'
     static void cp210x_get_termios_port(struct usb_serial_port *port,
		 ^

Consistently use tcflag_t to fix this.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-06-06 16:46:20 +02:00
Michael Neuling
783771fdbf powerpc/64s: Clear PCR on boot
commit faf37c44a105f3608115785f17cbbf3500f8bc71 upstream.

Clear the PCR (Processor Compatibility Register) on boot to ensure we
are not running in a compatibility mode.

We've seen this cause problems when a crash (and kdump) occurs while
running compat mode guests. The kdump kernel then runs with the PCR
set and causes problems. The symptom in the kdump kernel (also seen in
petitboot after fast-reboot) is early userspace programs taking
sigills on newer instructions (seen in libc).

Signed-off-by: Michael Neuling <mikey@neuling.org>
Cc: stable@vger.kernel.org
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-06-06 16:46:20 +02:00
Will Deacon
55a0e02e85 arm64: lse: Add early clobbers to some input/output asm operands
commit 32c3fa7cdf0c4a3eb8405fc3e13398de019e828b upstream.

For LSE atomics that read and write a register operand, we need to
ensure that these operands are annotated as "early clobber" if the
register is written before all of the input operands have been consumed.
Failure to do so can result in the compiler allocating the same register
to both operands, leading to splats such as:

 Unable to handle kernel paging request at virtual address 11111122222221
 [...]
 x1 : 1111111122222222 x0 : 1111111122222221
 Process swapper/0 (pid: 1, stack limit = 0x000000008209f908)
 Call trace:
  test_atomic64+0x1360/0x155c

where x0 has been allocated as both the value to be stored and also the
atomic_t pointer.

This patch adds the missing clobbers.

Cc: <stable@vger.kernel.org>
Cc: Dave Martin <dave.martin@arm.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Reported-by: Mark Salter <msalter@redhat.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-06-06 16:46:20 +02:00
Linux Build Service Account
2ebea3c619 Merge "ARM: dts: msm: Add WLAN SSR support on msm8996 vplatform" 2018-06-06 06:27:44 -07:00
Linux Build Service Account
4398e17bbf Merge "mmc: sdhci-msm: Add boot marker" 2018-06-06 06:27:38 -07:00
Yong Ding
7cecb53b50 soc: qcom: scm_qcpe: use uninterruptible habmm_socket_recv()
This is necessary to support scm call in system shutdown
procedure. With interruptible habmm_socket_recv(), it will
return immediately without blocking until the response
arrives.

Change-Id: Ia7ef95e4c6878a149ec373c8d2b5ae19a36f4125
Signed-off-by: Yong Ding <yongding@codeaurora.org>
2018-06-06 03:38:46 -07:00
Guchun Chen
2ced56323b drm: msm: sde: update display status after handoff is done
Each displays's splash status should be set to false after
splash handoff is done, this will avoid potential display risk
when display output is configured again.

CRs-Fixed: 2251770
Change-Id: I62733cb1bcd52e584766349465047e466f211f82
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2018-06-06 14:10:49 +08:00
Ferry Zhou
3c06973a97 ARM: dts: msm: Add WLAN SSR support on msm8996 vplatform
Add WLAN SSR support on msm8996 vplatform for Android GVM based
on the subsystem notification virtualization.

Change-Id: I5008b09053fff5866ab26c9558cf2fccafabd670
Signed-off-by: Ferry Zhou <tianguiz@codeaurora.org>
2018-06-06 14:08:51 +08:00
Linux Build Service Account
51c5c162c1 Merge "ASoC: msm: Add mixer controls for module enabling" 2018-06-05 20:30:51 -07:00
Jaegeuk Kim
98b6097d0f FROMLIST: f2fs: run fstrim asynchronously if runtime discard is on
Cherry-picked from:
        origin/upstream-f2fs-stable-linux-4.4.y

We don't need to wait for whole bunch of discard candidates in fstrim, since
runtime discard will issue them in idle time.

Change-Id: I32602711842d603cca030765eab49b337789e8ad
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2018-06-05 14:00:40 -07:00
Linux Build Service Account
4926f1bce0 Merge "adv7481: Support 1080p60 in EDID" 2018-06-05 11:30:47 -07:00
Roman Kiryanov
7e3a6fc483 goldfish: pipe: ANDROID: address must be written as __pa(x), not x
The previous change missed the __pa transformation applied to the address before passing it further. The value also has to be written from the high part first.

Bug: 72717639
Change-Id: Id0756ca733f26ced1d74179764116db05ec47bea
Signed-off-by: Roman Kiryanov <rkir@google.com>
2018-06-05 09:42:36 -07:00
Linux Build Service Account
409cda61b1 Merge "ARM: dts: msm: add wifi cnss ramdump support on msm8996 vplatform" 2018-06-05 02:26:46 -07:00
Dilip Gudlur
37ccad7c20 msm: ais: translate wall clock time to userspace
Translate wall clock time in camera kernel buffers
to camera userspace application.

Change-Id: I5ad66766e9557dfe7897940b66decf7cc699787f
Signed-off-by: Dilip Gudlur <dgudlur@codeaurora.org>
2018-06-04 23:03:55 -07:00
vkakani
528c99691b ARM: SMMU: clear page table ops of attached device
incase of error during dynamic attach,
added smmu attach device cleanup along with
free page table ops

Change-Id: Id8984d05002700014307a905fc7166702fa64a7d
Signed-off-by: vkakani <vkakani@codeaurora.org>
2018-06-04 21:43:50 -07:00
Roman Kiryanov
6cdd987da8 goldfish: pipe: ANDROID: add missing check for memory allocated
Bug: 72717639
Change-Id: I9bc8db41f2269c38a259d842ea52bdc0037f3bae
Signed-off-by: Roman Kiryanov <rkir@google.com>
2018-06-04 18:30:10 -07:00
Roman Kiryanov
33467f9a09 goldfish: pipe: ANDROID: remove redundant blank lines
Bug: 72717639
Change-Id: I951c34c7247c764ccd40a3e62680909b76403c4c
Signed-off-by: Roman Kiryanov <rkir@google.com>
2018-06-04 18:30:10 -07:00
Roman Kiryanov
f13f3745ee Update arch/x86/configs/x86_64_ranchu_defconfig
Bug: 72717639
Change-Id: Ia7519bd03fefa2a3d7c91e3a2537599bfd6be70d
Signed-off-by: Roman Kiryanov <rkir@google.com>
2018-06-04 18:29:48 -07:00
Linux Build Service Account
9e63500269 Merge "usb: core: Resume the devices on pm restore" 2018-06-04 13:49:04 -07:00
Linux Build Service Account
5ae645ca39 Merge "msm: pcie: change PCIe to suspend after suspend_noirq" 2018-06-04 13:49:02 -07:00
Suprith Malligere Shankaregowda
055f69dac6 adv7481: Support 1080p60 in EDID
Add 1080p60 support in EDID.

Change-Id: I03d3dacbf5af9fde519de66f9eb9c1ad24279d1c
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
2018-06-04 07:25:27 -07:00
Linux Build Service Account
7c542d932b Merge "qmp-phy: Power down PHY durng disconnect to avoid leakage" 2018-06-04 04:30:58 -07:00
Linux Build Service Account
68745c46c6 Merge "soc: qcom: boot_marker: add mpm timer interface" 2018-06-04 04:30:57 -07:00
Linux Build Service Account
d56749a4f9 Merge "hbtp_inpu.c: add 800s power down uevent in suspend func" 2018-06-04 04:30:55 -07:00
Linux Build Service Account
c053ae31b8 Merge "soc: qcom: hab: add performance test mechanism for HAB" 2018-06-04 04:30:53 -07:00
Vijayavardhan Vennapusa
492e7daf22 qmp-phy: Power down PHY durng disconnect to avoid leakage
Currently driver is not powering down QMP PHY if target is booted
up without cable connected. Due to this, 0.3mA leakage current is seen
during standby mode if power measured after bootup. Fix this by
putting QMP PHY in power down state during disconnect.

Change-Id: Idbf7e06ca14649797c50853cf3b9ee182f70749e
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2018-06-04 13:17:02 +05:30
Han Lu
53c8faf4dc q6asm: retry asm open in case of session id conflict
The ADSP asm session ids are managed by the kernel driver. It's all right
for native use cases. But for virtualization use cases, there's no way to
synchronize the session ids' status among virtual machines.  Playing back
in one virtual machine is probably failed, because the session id may had
been occupied by a use case in another virtual machine.

The patch allowed audio playback stream to try all available session ids
in case of session id conflict error, to support concurrent playback from
multiple virtual machines.

Change-Id: If98d05898cec3f05d80c750ec8a014add3b1f34c
Signed-off-by: Han Lu <hanlu@codeaurora.org>
2018-06-04 00:32:36 -07:00
Tony Truong
0ea189e015 msm: pcie: change PCIe to suspend after suspend_noirq
Some PCIe clients support suspend_noirq and need the PCIe
link to be up. Change PCIe to have its power down sequence
after clients suspend_noirq.

Change-Id: I32063f6adf795f8a49cd7d9fe340403ffaf6fd94
Signed-off-by: Tony Truong <truong@codeaurora.org>
2018-06-03 21:20:00 -07:00
Linux Build Service Account
3c78eaa812 Merge "soc: msm: add size check to fix out of bounds on ANC" 2018-06-03 19:10:45 -07:00
Linux Build Service Account
fd95dadf54 Merge "Merge android-4.4.133 (3f51ea2) into msm-4.4" 2018-06-02 01:13:34 -07:00
Linux Build Service Account
33b2567cd5 Merge "spi: spi_qsd: add boot marker" 2018-06-01 14:39:22 -07:00
Linux Build Service Account
707b3d9760 Merge "serial: msm_serial_hs: add boot marker" 2018-06-01 14:39:19 -07:00
Timothy Sham
49662914af soc: msm: add size check to fix out of bounds on ANC
Before calling audio ANC ioctl functions, compare the
allocated buffer size to the size of the header and ANC cmd header
to ensure the buffer is big enough.

Change-Id: I8fcd0a830853d802bbb11fc243a4d392fbe384f3
Signed-off-by: Timothy Sham <tsham@codeaurora.org>
2018-06-01 13:35:21 -04:00
Linux Build Service Account
ef6cdc4600 Merge "ARM: dts: msm: remove USB3 device in msm8996-ivi-lv-mt vplatform" 2018-06-01 06:35:14 -07:00
Sriharsha Allenki
6c16439a24 usb: core: Resume the devices on pm restore
On system restoring from hibernation to reset-resume
the connected USB devices, resume the devices
on pm restore irrespective of the skip_resume
flag.

Change-Id: I56e46c579db572e39eabdc6d2be95b00f2c7d9cb
Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-06-01 14:14:17 +05:30
Sriharsha Allenki
dd4a9bfbf0 xhci-plat: Add hibernation support to xhci platform
Add hibernation support to xhci platform by adding
the proper PM ops freeze and restore.
Also set the hibernated argument to xhci_resume which
will trigger the reset-resume of the connected
root-hubs and the devices.

Change-Id: Ib536bb2485928326f34bfc3422b672cc62309efe
Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-06-01 14:14:17 +05:30
Sriharsha Allenki
6a6d52ab38 usb: dwc3: Add support for USB hibernation in host mode
Add support for hibernation of USB in host mode and
cable disconnected mode by adding proper pm operations
freeze and restore.

Change-Id: Ie1761a8afb0bb44a37d6ed4d046e8a09e1f53c5c
Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-06-01 14:14:16 +05:30
Zhiqiang Tu
1bf695251f spi: spi_qsd: add boot marker
Add boot marker for booting KPI measurement

Change-Id: I8ba79f1b0e71e662ad20fcded128d43363e8302f
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-05-31 23:50:03 -07:00
Zhiqiang Tu
e55e517e9a serial: msm_serial_hs: add boot marker
Add boot marker for booting KPI measurement.

Change-Id: Ia54411a901cc09493f2085af42c3a2188438e29d
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-05-31 23:48:48 -07:00
Zhiqiang Tu
7c7109f9b9 soc: qcom: boot_marker: add mpm timer interface
Provide a debugfs interface to get count of mpm timer.

Change-Id: I24e927b6219b8bd4c2f4ddecb8f51518f0db663a
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-06-01 14:34:56 +08:00
Yong Ding
8c4608db93 ARM: dts: msm: remove USB3 device in msm8996-ivi-lv-mt vplatform
In the latest multiple GVMs(Guest Virtual Machines)
environment, USB3 is expected to be used by LA GVM with
the passthrough mode. So it is necessary to remove its
access from LV GVM, or there will be conflict.

Change-Id: I8409a81a636ca38e64b8e00e25170c064549dc61
Signed-off-by: Yong Ding <yongding@codeaurora.org>
2018-05-31 19:18:48 -07:00
Linux Build Service Account
15dfd16651 Merge "defconfig: msm: Enable CONFIG_CGROUP_DEBUG" 2018-05-31 16:44:26 -07:00
Alistair Strachan
e75204cc0a ANDROID: x86_64_cuttlefish_defconfig: Enable F2FS
Bug: 80475502
Change-Id: I061467404f1d4b828ac1b7423db375a35934ce28
Signed-off-by: Alistair Strachan <astrachan@google.com>
2018-05-31 15:56:04 -07:00
Alistair Strachan
cb8f554266 ANDROID: Update x86_64_cuttlefish_defconfig
Merge with the configs from kernel/configs.git added recently.

This should fix ipsec VPN functionality.

Bug: 80540078
Change-Id: I9cc99f5e34d2809670fe2fc0df121610657f6769
Signed-off-by: Alistair Strachan <astrachan@google.com>
2018-05-31 13:57:27 -07:00
Linux Build Service Account
c0a42ee0ed Merge "adv7481: Add support for AVI Infoframe" 2018-05-31 05:11:45 -07:00
Linux Build Service Account
cbeccf228a Merge "soc: qcom: scm_qcpe: Close hab socket on error" 2018-05-31 05:11:44 -07:00
Linux Build Service Account
2272788153 Merge "selinux: KASAN: slab-out-of-bounds in xattr_getsecurity" 2018-05-31 05:11:43 -07:00
Linux Build Service Account
92fbf2a482 Merge "defconfig: msm: Disable config EXT2_FS and EXT3_FS for sdm660" 2018-05-31 05:11:42 -07:00
Linux Build Service Account
dad9612b1f Merge "soc: qcom: boot_stats: Fix compilation issue" 2018-05-31 05:11:41 -07:00
Linux Build Service Account
155d32a6a7 Merge "ARM: dts: msm: Add support for new speed bin for SDM660" 2018-05-31 05:11:40 -07:00