Commit graph

597205 commits

Author SHA1 Message Date
Linux Build Service Account
9591e476bb Merge "USB: gadget: Replace %pM with %pm" 2018-02-13 12:17:08 -08:00
Linux Build Service Account
0100d380ab Merge "SDE: HDMI: Disable HPD if non-pluggable flag is set" 2018-02-13 12:17:06 -08:00
Linux Build Service Account
76ee1b8d18 Merge "DRM: DBA: Adding hardware power sequence to DBA power off code" 2018-02-13 12:17:05 -08:00
Linux Build Service Account
3b67a3866b Merge "DRM: SDE: Avoid vblank request to the same state" 2018-02-13 12:17:04 -08:00
Aditya Bavanari
7e2b30f53a ASoC: msm: qdsp6v2: Fix memory allocation issue in afe_sidetone
When afe sidetone params are set, memory allocation is not
done before packing the param data. Allocate memory before
packing the param data to fix this.

CRs-Fixed: 2189218
Change-Id: I38cc5a1a948228235e178f46bfce99fa8dec3bd8
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2018-02-13 23:14:05 +05:30
Ajay Agarwal
20fca09e45 USB: gadget: Replace %pM with %pm
commit c173d5504d ("USB: gadget: Replace %pK with
%pM") modified the MAC address format specifier to %pM.
So when the host PC asks for the MAC address, the
device sends the address with colons present. Linux
Host machines cannot handle this and ECM function fails
to bind. Fix this by changing the format specifier to
%pm which removes the colons and sends the MAC address.

Change-Id: Id3eebfa371bd2cf976ee0f44e8a7b54690f43e77
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-02-13 15:32:14 +05:30
Rakesh Pillai
88b589eaa3 ath10k: Set fw feature flag for no 4addr hdr padding
WCN3990 gives no padding for llc header in the rx pkts.
The rounding off of hdrlen causes extra bits from LLC header
being stripped off and hence the pkt is misinterpreted and
subsequently discarded.

Set the fw flag to skip the hdrlen rounding off for wcn3990.

CRs-Fixed: 2189079
Change-Id: I038791707977f0d4ee81986e6c76d86606a69d9c
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
2018-02-13 15:32:02 +05:30
Yimin Peng
ba15fa752d spmi: msm: Add virtual SPMI PMIC front end driver
Add basic infrastructure for SPMI front end driver. Frontend driver
communicates with backend to service SPMI request from clients.

Change-Id: Icff567a2f224fb49f370bf760287d9d3615a3325
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
2018-02-13 10:23:45 +08:00
Camus Wong
def1bee62a DRM: DBA: Adding hardware power sequence to DBA power off code
Adding power off register sequence to reduce power in power off.
Adding switch GPIO sequence in power on/off call.

Change-Id: Ifbe57852a43e1b1d0f05594a84a10540cfeb6be7
Signed-off-by: Camus Wong <camusw@codeaurora.org>
2018-02-12 19:36:58 -05:00
Camus Wong
1921a9ede6 SDE: HDMI: Disable HPD if non-pluggable flag is set
For non-pluggable display, HPD hardware should be disabled.
HPD related clocks should also shutdown during suspend.

Change-Id: I59475b07b44c2a7f1784d160263a6bca7701a702
Signed-off-by: Camus Wong <camusw@codeaurora.org>
2018-02-12 06:50:15 -08:00
Linux Build Service Account
9d5748ab14 Merge "ARM: dts: msm: disable wdog wakeup on msm8996 vplatform" 2018-02-12 05:01:44 -08:00
Linux Build Service Account
2c24f5e2c0 Merge "ASoC: msm: qdsp6v2: Add support to query AVCS version info" 2018-02-12 05:01:43 -08:00
Linux Build Service Account
01829b3780 Merge "ASoC: msm: Update Audio Header File for 32 Channels Support" 2018-02-12 05:01:42 -08:00
Rahul Sharma
08c8d3a714 msm: ais: isp: Handling buffer use after getting it freed
In the code, start_fetch can try to access the
buffer pointer variable after free, as the
same pointer can be freed at RELEASE_BUF call too
at the same time. Hence fixing this race condition.

Change-Id: Ifb643bace27064e1324d714aebed706b48e44b65
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2018-02-11 22:25:30 -08:00
Linux Build Service Account
631acc8fdd Merge "ARM: dts: msm: refine device tree hierarchy for msm8996 vplatform" 2018-02-11 21:34:56 -08:00
Yimin Peng
1d6d0c7817 ARM: dts: msm: disable wdog wakeup on msm8996 vplatform
The wdog always bites with the flag when guest virtual machine enters
into suspend.

Change-Id: Ie239dcb8a48cdaffcddf923a3114210ec5947ff9
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
2018-02-12 11:33:07 +08:00
Greg KH
8de43829d7 eventpoll.h: fix epoll event masks
[resend due to me forgetting to cc: linux-api the first time around I
posted these back on Feb 23]

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

When userspace tries to use these defines, it complains that it needs to
be an unsigned 1 that is shifted, so libc implementations have to create
their own version.  Fix this by defining it properly so that libcs can
just use the kernel uapi header.

Change-Id: Iac4e9f2a30ef3ea444c984c9eb8d6c5edc1f8264
Reported-by: Elliott Hughes <enh@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: 6f051e4a685b768f3704c7c069aa1edee3010622
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
[schikk@codeaurora.org: resolved merge conflicts]
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
2018-02-11 19:31:13 -08:00
Ghanim Fodi
b57f252a8b msm: ipa: Prevent deletion of the default route rule
The first APPS default routing table rule is installed
at the IPA driver initialization. To prevent routing
exception, this rule cannot be deleted by user application.
This change prevents deleting this rule.

Change-Id: Ia27434fd24a15fea5956018a1271b11bbe227df7
CRs-fixed: 2165859
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
2018-02-11 01:04:16 -08:00
Zhiqiang Tu
989e608baa ARM: dts: msm: refine device tree hierarchy for msm8996 vplatform
Move the basic part and audio common part to separated device tree
include files for msm8996 virtual platform.

Change-Id: Id1847f6bbf083fb82230f6eb67d32fea401baa5d
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-02-11 15:07:44 +08:00
Linux Build Service Account
f2604c4f48 Merge "msm: ais: Synchronize v4l2 subscribe and unsubscribe event" 2018-02-09 17:07:17 -08:00
Linux Build Service Account
5ea3f07aec Merge "ARM: dts: qcom: add wdog to the baseline msm8996 vplatform" 2018-02-09 17:07:15 -08:00
Linux Build Service Account
d0c522b2ff Merge "msm: thermal: Add support to monitor only one tsens for VDD restriction" 2018-02-09 17:07:14 -08:00
Linux Build Service Account
5e5f1941b4 Merge "msm: ais: sensor: Fix out of bound read for region params" 2018-02-09 08:25:36 -08:00
Linux Build Service Account
5072ad3bd5 Merge "soc: qcom: hab: fix the panic in shmem device shutdown" 2018-02-09 02:11:52 -08:00
Vijay kumar Tumati
2fe9f37f2e msm: camera: Handle actuator close before power down
In case when userspace process is killed, actuator
subdev is first closed and then power down is called.
In this sequence, we need to handle actuator states
properly to shutdown all the regulators during close.

Change-Id: I843b463a1b576971e16d1554ded20984dd0ec436
Signed-off-by: Vijay kumar Tumati <vtumati@codeaurora.org>
2018-02-09 12:30:59 +05:30
Yong Ding
435b592e06 soc: qcom: hab: fix the panic in shmem device shutdown
The global struct list_head pchannels should be directly
used as the list head for pchan list traversal. Previously,
a local struct list_head instance was wrongly created and
used for such traversal. It caused kernel panic in system
shutdown.

Change-Id: Ifb82b55d5a0237fd12f8f53db095fccbcef96fb8
Signed-off-by: Yong Ding <yongding@codeaurora.org>
2018-02-08 19:18:47 -08:00
Linux Build Service Account
a6c36341e5 Merge "arm64: Move BP hardening to check_and_switch_context" 2018-02-08 19:03:43 -08:00
Linux Build Service Account
fe3ef6b4ac Merge "arm64: Add BTAC/LinkStack sanitizations for Kryo cores" 2018-02-08 19:03:42 -08:00
Linux Build Service Account
741767ad2c Merge "arm64: Implement branch predictor hardening for Falkor" 2018-02-08 19:03:41 -08:00
Linux Build Service Account
e89a71fb8b Merge "arch: arm64: Add midr values for kryo2xx big cores" 2018-02-08 19:03:41 -08:00
Linux Build Service Account
049d9307d2 Merge "arm64: Implement branch predictor hardening for affected Cortex-A CPUs" 2018-02-08 19:03:40 -08:00
Linux Build Service Account
e887df737e Merge "arm64: Define Cortex-A73 MIDR" 2018-02-08 19:03:39 -08:00
Linux Build Service Account
731d1e7b7f Merge "arm64: cputype: Add missing MIDR values for Cortex-A72 and Cortex-A75" 2018-02-08 19:03:38 -08:00
Linux Build Service Account
bb4e15efef Merge "arm64: cpu_errata: Allow an erratum to be match for all revisions of a core" 2018-02-08 19:03:37 -08:00
Linux Build Service Account
6564e041a6 Merge "arm64: Add skeleton to harden the branch predictor against aliasing attacks" 2018-02-08 19:03:37 -08:00
Linux Build Service Account
5d7bc6e4bb Merge "drivers/firmware: Expose psci_get_version through psci_ops structure" 2018-02-08 19:03:36 -08:00
Linux Build Service Account
18f6c1a5fb Merge "arm64: cpufeature: Pass capability structure to ->enable callback" 2018-02-08 19:03:35 -08:00
Linux Build Service Account
8543ad0652 Merge "arm64: errata: Calling enable functions for CPU errata too" 2018-02-08 19:03:34 -08:00
Linux Build Service Account
cf1de4e04b Merge "Merge android-4.4.115 (aa856bd) into msm-4.4" 2018-02-08 19:03:33 -08:00
Linux Build Service Account
71de2d96a7 Merge "cnss: Add support to program MAC address thru debugfs" 2018-02-08 19:03:31 -08:00
Linux Build Service Account
978d3b08ae Merge "msm: ADSPRPC: Use ID in response to get context pointer" 2018-02-08 19:03:29 -08:00
Linux Build Service Account
2503a1d5d8 Merge "msm: camera: change csiphy CDR regulator voltage on sdm660" 2018-02-08 19:03:28 -08:00
Yimin Peng
8755da552b ARM: dts: qcom: add wdog to the baseline msm8996 vplatform
The ramdump function needs watchdog device support.

Change-Id: I04e7e5773096c91fdc592aedf5d295256bd6ca08
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
2018-02-09 10:53:47 +08:00
Alex Yakavenka
baf99c4702 ARM: dts: msm: Remove rh850 device node from mizar
Mizar board doesn't have rh850 can controller

Change-Id: Ie3eb224fc4dfa71da7d290bfaf47ae4b9fcaceb4
Signed-off-by: Alex Yakavenka <ayakav@codeaurora.org>
2018-02-08 14:13:13 -08:00
Camus Wong
fe9857b511 DRM: SDE: Avoid vblank request to the same state
This change add check to existing vblank request state.  It will avoid
enable vblank multiple times.  It will also avoid disable vblank
multiple times.

Change-Id: I10781c33e51b1032b72fcbc1a01a7d01be8be510
Signed-off-by: Camus Wong <camusw@codeaurora.org>
2018-02-08 15:25:39 -05:00
Linux Build Service Account
6ca24c92b8 Merge "mm-camera2:isp2: Handle use after free buffer" 2018-02-08 08:43:54 -08:00
Tharun Kumar Merugu
e569b915a2 msm: ADSPRPC: Use ID in response to get context pointer
Send context ID in rpc header instead of context pointer.
Validate context ID received in response and get context pointer.

Change-Id: I9cfd10d0c1b25c3085b8e15c7ca1c8ff214bf10d
Acked-by: Viswanatham Paduchuri <vpaduchu@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2018-02-08 15:30:54 +05:30
Marc Zyngier
03ac41373f arm64: Move BP hardening to check_and_switch_context
We call arm64_apply_bp_hardening() from post_ttbr_update_workaround,
which has the unexpected consequence of being triggered on every
exception return to userspace when ARM64_SW_TTBR0_PAN is selected,
even if no context switch actually occured.

This is a bit suboptimal, and it would be more logical to only
invalidate the branch predictor when we actually switch to
a different mm.

In order to solve this, move the call to arm64_apply_bp_hardening()
into check_and_switch_context(), where we're guaranteed to pick
a different mm context.

Change-Id: I28f2fb09b77544e5ead095e9dad1ad64b2b3ae36
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Git-commit: a8e4c0a919ae310944ed2c9ace11cf3ccd8a609b
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2018-02-08 01:50:38 -08:00
Srinivas Ramana
21393ff3ea arm64: Add BTAC/LinkStack sanitizations for Kryo cores
Kryo cores are exposed to two vulnerabilities due to subroutine return
(called LINK-STACK) and branch target predictors.
These two issues can be mitigated through software workarounds.

Kernel:
 - Apply LINK-STACK mitigation which is to issue 16 nested BL instructions
   on process context switch 'cpu_do_switch_mm()' where ASID changes.
 - Apply psci based branch predictor invalidation.

use the kryo core detection routine (based on MIDR) from the
commit bb48711800e6d ("arm64: cpu_errata: Add Kryo to Falkor 1003 errata")
by Stephen Boyd <sboyd@codeaurora.org>.

Change-Id: I81e8e72e7fa219f12dfe8ec39836eb8eb3c4c7b0
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2018-02-08 01:50:16 -08:00
Shanker Donthineni
f62d97e9b4 arm64: Implement branch predictor hardening for Falkor
Falkor is susceptible to branch predictor aliasing and can
theoretically be attacked by malicious code. This patch
implements a mitigation for these attacks, preventing any
malicious entries from affecting other victim contexts.

Change-Id: I535d423c2cefaf93627267b867bf0846e502d4c1
Signed-off-by: Shanker Donthineni <shankerd@codeaurora.org>
[will: fix label name when !CONFIG_KVM and remove references to MIDR_FALKOR]
Signed-off-by: Will Deacon <will.deacon@arm.com>
Git-commit: ec82b567a74fbdffdf418d4bb381d55f6a9096af
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[sramana@codeaurora.org: Use only the link stack sanitization routines,
and leave Falkor related BP hardening code]
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2018-02-08 15:13:20 +05:30