OSDN Git Service
Linux Build Service Account [Wed, 21 Feb 2018 08:41:50 +0000 (00:41 -0800)]
Merge "drm: Add and handle new aspect ratios in DRM layer"
Linux Build Service Account [Wed, 21 Feb 2018 08:41:50 +0000 (00:41 -0800)]
Merge "drm: Add aspect ratio parsing in DRM layer"
smanag [Tue, 14 Nov 2017 09:27:57 +0000 (14:57 +0530)]
drivers: soc: Synchronize apr callback and voice svc release
Issue is seen when apr callback is received while voice_svc_release
is in process of freeing the driver private data.
Avoid invalid access of private data pointer by putting
the callback and release functions in the same locked context.
Change-Id: I93af13cab0a3c7e653a9bc9fa7f4f86bfa0502df
Signed-off-by: smanag <smanag@codeaurora.org>
Shashank Sharma [Mon, 17 Oct 2016 12:04:40 +0000 (17:34 +0530)]
drm: Add and handle new aspect ratios in DRM layer
HDMI 2.0/CEA-861-F introduces two new aspect ratios:
- 64:27
- 256:135
This patch:
- Adds new DRM flags for to represent these new aspect ratios.
- Adds new cases to handle these aspect ratios while converting
from user->kernel mode or vise versa.
V2: Rebase
V3: Align macro for DRM_MODE_PICTURE_ASPECT_256_135 (Jim Bride)
V4: Added r-b from Jose.
Change-Id: Iab14d11e2a69d1ecb016edd2ad6ee8edb228f095
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
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-5-git-send-email-shashank.sharma@intel.com
Git-commit:
a68362fe3e84fcbedd49939aa200519aa5410135
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[nbahrani@codeaurora.org: resolved msm specific merge conflicts]
Signed-off-by: Navid Bahrani <nbahrani@codeaurora.org>
Shashank Sharma [Mon, 17 Oct 2016 12:04:38 +0000 (17:34 +0530)]
drm: Add aspect ratio parsing in DRM layer
Current DRM layer functions don't parse aspect ratio information
while converting a user mode->kernel mode or vice versa. This
causes modeset to pick mode with wrong aspect ratio, eventually
causing failures in HDMI compliance test cases, due to wrong VIC.
This patch adds aspect ratio information in DRM's mode conversion
and mode comparision functions, to make sure kernel picks mode
with right aspect ratio (as per the VIC).
V2: Addressed review comments from Sean:
- Fix spellings/typo
- No need to handle aspect ratio none
- Add a break, for default case too
V3: Rebase
V4: Added r-b from Jose
Change-Id: I05817653b8693c875a989bdd1247e30faf71e657
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Lin, Jia <lin.a.jia@intel.com>
Signed-off-by: Akashdeep Sharma <akashdeep.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-3-git-send-email-shashank.sharma@intel.com
Git-commit:
6dffd431e2296cda08e7e4f0242e02df1d1698cd
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Navid Bahrani <nbahrani@codeaurora.org>
Linux Build Service Account [Tue, 20 Feb 2018 00:07:24 +0000 (16:07 -0800)]
Merge "msm: kgsl: Properly remove ref count on gpuobj_sync failure"
Mohammed Javid [Thu, 18 Jan 2018 21:02:17 +0000 (02:32 +0530)]
msm:ipa: Return mux id only for valid interface
Value of MAX_NUM_OF_MUX_CHANNEL is greater than
number of valid interfaces. So empty interface
is also getting mux id. Return mux id only for valid
interfaces.
Change-Id: I7852df0aa0ccee781c1bf6857a4183b99194f3ee
Acked-by: Pooja Kumari <kumarip@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
Manaf Meethalavalappu Pallikunhi [Thu, 25 Jan 2018 20:04:22 +0000 (01:34 +0530)]
ARM: dts: msm: Disable BCL for all msm8996 auto targets
The auto target doesn't require battery current limit (BCL) solution.
Disable BCL devicetree node for all msm8996 auto targets.
Change-Id: I70f249de2d7d1304287a9f71a7d48f1b90fabee7
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
Manaf Meethalavalappu Pallikunhi [Thu, 25 Jan 2018 19:32:56 +0000 (01:02 +0530)]
defconfig: msm: Enable battery current limit module for msm8996
Enable battery current limit module, which can monitor the
battery current, voltage, and SoC and mitigate the CPU cluster.
Change-Id: I2ba17fe5fe76d42999f71c6197200ac90ff68877
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
Linux Build Service Account [Fri, 16 Feb 2018 22:41:53 +0000 (14:41 -0800)]
Merge "msm: secure_buffer: Add SPSS_SP_SHARED vmid"
Linux Build Service Account [Fri, 16 Feb 2018 22:41:52 +0000 (14:41 -0800)]
Merge "msm: camera: Add RAW12 support for meta data"
Linux Build Service Account [Fri, 16 Feb 2018 22:41:51 +0000 (14:41 -0800)]
Merge "msm: camera: Handle actuator close before power down"
Linux Build Service Account [Fri, 16 Feb 2018 14:14:21 +0000 (06:14 -0800)]
Merge "msm: kgsl: Add a check for valid frequency of RBBM timer clock"
Carter Cooper [Wed, 17 Jan 2018 16:49:00 +0000 (09:49 -0700)]
msm: kgsl: Properly remove ref count on gpuobj_sync failure
The user can pass bad data into kgsl_ioctl_gpuobj_sync(). If
_copy_from_user() fails do to bad data, undo any current
references taken through this ioctl call.
Change-Id: I56195520b9dadba20ee419658fc2cbb282b8449c
Signed-off-by: Carter Cooper <ccooper@codeaurora.org>
Signed-off-by: samit vats <svats@codeaurora.org>
Sudarshan Rajagopalan [Thu, 29 Jun 2017 00:45:57 +0000 (17:45 -0700)]
msm: secure_buffer: Add SPSS_SP_SHARED vmid
Add support for SPSS_SP_SHARED vmid. This vmid is equivalent
to TZ VM, which can be used for sharing memory with TZ with
the assign call.
Change-Id: I10b98820796e8bab7b8275f5ddf44e8814dc0fb0
Signed-off-by: Sudarshan Rajagopalan <sudaraja@codeaurora.org>
Linux Build Service Account [Thu, 15 Feb 2018 20:21:05 +0000 (12:21 -0800)]
Merge "icnss: Remove vote for hardware resources when FW is not down"
Archana Obannagari [Thu, 8 Feb 2018 11:12:24 +0000 (16:42 +0530)]
msm: kgsl: Add a check for valid frequency of RBBM timer clock
rbbmtimer_clk hardwired fixed XO frequency 19.2Mhz. clock_round_rate()
for RBBM timer clock fails with -EPERM as it is fixed. So added a
check to make sure that rbbmtimer_clk clk_set_rate() has valid
frequency. This avoids warning message in the driver log.
Change-Id: I8f8bcec88e6a39e1550bb67590e6b66dba8e7a27
Signed-off-by: Archana Obannagari <aobann@codeaurora.org>
Manoj Prabhu B [Fri, 2 Feb 2018 11:24:53 +0000 (16:54 +0530)]
diag: Prevent unnecessary data ready counter update
The patch fixes unnecessary data ready counter update by
adding proper checks.
CRs-Fixed:
2180045
Change-Id: Iff34a9c6203324cd07964d69a1f525325b3a011b
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
Sreelakshmi Gownipalli [Wed, 22 Nov 2017 20:25:39 +0000 (12:25 -0800)]
diag: Increment data ready only if it is first update
Increment data ready only if it is not incremented earlier.
Change-Id: Ia61e638bcf18e17dfe4bef15fc8ed4168b4c1891
Signed-off-by: Sreelakshmi Gownipalli <sgownipa@codeaurora.org>
Linux Build Service Account [Wed, 14 Feb 2018 21:20:11 +0000 (13:20 -0800)]
Merge "ath10k: Set fw feature flag for no 4addr hdr padding"
Linux Build Service Account [Wed, 14 Feb 2018 13:30:59 +0000 (05:30 -0800)]
Merge "msm: ais: isp: Handling buffer use after getting it freed"
Linux Build Service Account [Wed, 14 Feb 2018 13:30:58 +0000 (05:30 -0800)]
Merge "ASoC: msm: qdsp6v2: Fix memory allocation issue in afe_sidetone"
Linux Build Service Account [Wed, 14 Feb 2018 13:30:57 +0000 (05:30 -0800)]
Merge "ASoC: msm: Upgrade Machine Driver to Support 32 Channels"
Linux Build Service Account [Wed, 14 Feb 2018 13:30:56 +0000 (05:30 -0800)]
Merge "ARM: dts: msm: Disable SPI CAN controller on msm8996 CV2X boards"
Linux Build Service Account [Wed, 14 Feb 2018 13:30:55 +0000 (05:30 -0800)]
Merge "leds: qpnp-flash-v2: Fix the macro calculations"
Linux Build Service Account [Wed, 14 Feb 2018 02:52:11 +0000 (18:52 -0800)]
Merge "defconfig: msm: Enable PCAN-USB for msm8996"
Linux Build Service Account [Wed, 14 Feb 2018 02:52:10 +0000 (18:52 -0800)]
Merge "ARM: dts: msm: Remove rh850 device node from mizar"
Linux Build Service Account [Tue, 13 Feb 2018 20:17:09 +0000 (12:17 -0800)]
Merge "eventpoll.h: fix epoll event masks"
Linux Build Service Account [Tue, 13 Feb 2018 20:17:08 +0000 (12:17 -0800)]
Merge "USB: gadget: Replace %pM with %pm"
Linux Build Service Account [Tue, 13 Feb 2018 20:17:06 +0000 (12:17 -0800)]
Merge "SDE: HDMI: Disable HPD if non-pluggable flag is set"
Linux Build Service Account [Tue, 13 Feb 2018 20:17:05 +0000 (12:17 -0800)]
Merge "DRM: DBA: Adding hardware power sequence to DBA power off code"
Linux Build Service Account [Tue, 13 Feb 2018 20:17:04 +0000 (12:17 -0800)]
Merge "DRM: SDE: Avoid vblank request to the same state"
Aditya Bavanari [Tue, 13 Feb 2018 13:54:40 +0000 (19:24 +0530)]
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>
Ajay Agarwal [Wed, 25 Oct 2017 09:46:11 +0000 (15:16 +0530)]
USB: gadget: Replace %pM with %pm
commit
c173d5504d08ca0 ("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>
Rakesh Pillai [Tue, 13 Feb 2018 06:38:34 +0000 (12:08 +0530)]
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>
Camus Wong [Mon, 5 Feb 2018 22:14:44 +0000 (17:14 -0500)]
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>
Camus Wong [Fri, 29 Dec 2017 16:50:13 +0000 (11:50 -0500)]
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>
Linux Build Service Account [Mon, 12 Feb 2018 13:01:45 +0000 (05:01 -0800)]
Merge "ARM: dts: msm: disable wdog wakeup on msm8996 vplatform"
Linux Build Service Account [Mon, 12 Feb 2018 13:01:44 +0000 (05:01 -0800)]
Merge "ASoC: msm: qdsp6v2: Add support to query AVCS version info"
Linux Build Service Account [Mon, 12 Feb 2018 13:01:42 +0000 (05:01 -0800)]
Merge "ASoC: msm: Update Audio Header File for 32 Channels Support"
Rahul Sharma [Mon, 12 Feb 2018 05:55:36 +0000 (11:25 +0530)]
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>
Linux Build Service Account [Mon, 12 Feb 2018 05:34:57 +0000 (21:34 -0800)]
Merge "ARM: dts: msm: refine device tree hierarchy for msm8996 vplatform"
Yimin Peng [Mon, 12 Feb 2018 03:24:52 +0000 (11:24 +0800)]
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>
Greg KH [Wed, 8 Mar 2017 18:03:03 +0000 (19:03 +0100)]
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>
Ghanim Fodi [Wed, 31 Jan 2018 12:49:37 +0000 (14:49 +0200)]
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>
Zhiqiang Tu [Tue, 6 Feb 2018 07:08:56 +0000 (15:08 +0800)]
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>
Linux Build Service Account [Sat, 10 Feb 2018 01:07:17 +0000 (17:07 -0800)]
Merge "msm: ais: Synchronize v4l2 subscribe and unsubscribe event"
Linux Build Service Account [Sat, 10 Feb 2018 01:07:15 +0000 (17:07 -0800)]
Merge "ARM: dts: qcom: add wdog to the baseline msm8996 vplatform"
Linux Build Service Account [Sat, 10 Feb 2018 01:07:14 +0000 (17:07 -0800)]
Merge "msm: thermal: Add support to monitor only one tsens for VDD restriction"
Linux Build Service Account [Fri, 9 Feb 2018 16:25:36 +0000 (08:25 -0800)]
Merge "msm: ais: sensor: Fix out of bound read for region params"
Linux Build Service Account [Fri, 9 Feb 2018 10:11:52 +0000 (02:11 -0800)]
Merge "soc: qcom: hab: fix the panic in shmem device shutdown"
Vijay kumar Tumati [Thu, 8 Feb 2018 09:38:11 +0000 (15:08 +0530)]
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>
Yong Ding [Wed, 7 Feb 2018 07:52:31 +0000 (15:52 +0800)]
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>
Linux Build Service Account [Fri, 9 Feb 2018 03:03:43 +0000 (19:03 -0800)]
Merge "arm64: Move BP hardening to check_and_switch_context"
Linux Build Service Account [Fri, 9 Feb 2018 03:03:42 +0000 (19:03 -0800)]
Merge "arm64: Add BTAC/LinkStack sanitizations for Kryo cores"
Linux Build Service Account [Fri, 9 Feb 2018 03:03:42 +0000 (19:03 -0800)]
Merge "arm64: Implement branch predictor hardening for Falkor"
Linux Build Service Account [Fri, 9 Feb 2018 03:03:41 +0000 (19:03 -0800)]
Merge "arch: arm64: Add midr values for kryo2xx big cores"
Linux Build Service Account [Fri, 9 Feb 2018 03:03:40 +0000 (19:03 -0800)]
Merge "arm64: Implement branch predictor hardening for affected Cortex-A CPUs"
Linux Build Service Account [Fri, 9 Feb 2018 03:03:39 +0000 (19:03 -0800)]
Merge "arm64: Define Cortex-A73 MIDR"
Linux Build Service Account [Fri, 9 Feb 2018 03:03:38 +0000 (19:03 -0800)]
Merge "arm64: cputype: Add missing MIDR values for Cortex-A72 and Cortex-A75"
Linux Build Service Account [Fri, 9 Feb 2018 03:03:38 +0000 (19:03 -0800)]
Merge "arm64: cpu_errata: Allow an erratum to be match for all revisions of a core"
Linux Build Service Account [Fri, 9 Feb 2018 03:03:37 +0000 (19:03 -0800)]
Merge "arm64: Add skeleton to harden the branch predictor against aliasing attacks"
Linux Build Service Account [Fri, 9 Feb 2018 03:03:36 +0000 (19:03 -0800)]
Merge "drivers/firmware: Expose psci_get_version through psci_ops structure"
Linux Build Service Account [Fri, 9 Feb 2018 03:03:35 +0000 (19:03 -0800)]
Merge "arm64: cpufeature: Pass capability structure to ->enable callback"
Linux Build Service Account [Fri, 9 Feb 2018 03:03:34 +0000 (19:03 -0800)]
Merge "arm64: errata: Calling enable functions for CPU errata too"
Linux Build Service Account [Fri, 9 Feb 2018 03:03:33 +0000 (19:03 -0800)]
Merge "Merge android-4.4.115 (
aa856bd) into msm-4.4"
Linux Build Service Account [Fri, 9 Feb 2018 03:03:31 +0000 (19:03 -0800)]
Merge "cnss: Add support to program MAC address thru debugfs"
Linux Build Service Account [Fri, 9 Feb 2018 03:03:30 +0000 (19:03 -0800)]
Merge "msm: ADSPRPC: Use ID in response to get context pointer"
Linux Build Service Account [Fri, 9 Feb 2018 03:03:28 +0000 (19:03 -0800)]
Merge "msm: camera: change csiphy CDR regulator voltage on sdm660"
Yimin Peng [Tue, 30 Jan 2018 06:39:18 +0000 (14:39 +0800)]
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>
Alex Yakavenka [Thu, 8 Feb 2018 22:11:28 +0000 (14:11 -0800)]
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>
Camus Wong [Thu, 8 Feb 2018 19:03:37 +0000 (14:03 -0500)]
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>
Linux Build Service Account [Thu, 8 Feb 2018 16:43:55 +0000 (08:43 -0800)]
Merge "mm-camera2:isp2: Handle use after free buffer"
Tharun Kumar Merugu [Thu, 8 Feb 2018 10:00:54 +0000 (15:30 +0530)]
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>
Marc Zyngier [Fri, 19 Jan 2018 15:42:09 +0000 (15:42 +0000)]
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>
Srinivas Ramana [Tue, 6 Feb 2018 15:40:15 +0000 (21:10 +0530)]
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>
Shanker Donthineni [Fri, 5 Jan 2018 20:28:59 +0000 (14:28 -0600)]
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>
Mohammed Javid [Fri, 19 Jan 2018 13:26:51 +0000 (18:56 +0530)]
msm: ipa: Fix to add string NULL terminator
Missing null terminator to userspcae provided
string leads to strlen buffer overflow in strlcpy function.
Added code changes to fix string NULL terminator issue.
Change-Id: I3f9d5f22fbb26f68de12370bc5e07a4e6bc2ced9
Acked-by: Ashok Vuyyuru <avuyyuru@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
Vijay kumar Tumati [Tue, 6 Feb 2018 04:06:14 +0000 (09:36 +0530)]
msm: camera: change csiphy CDR regulator voltage on sdm660
Set the appropriate regulator voltage to run csiphy in
cphy mode.
Change-Id: I1d6d65115e294dbf72560c8066b45bed0b03b92a
Signed-off-by: Vijay kumar Tumati <vtumati@codeaurora.org>
Sameer Thalappil [Fri, 1 Dec 2017 01:31:16 +0000 (17:31 -0800)]
cnss: Add support to program MAC address thru debugfs
MAC addresses provisioning thru CNSS is usually done by OEM drivers.
Debugfs interfaces can be used for internal testing.
Change-Id: I1a2693835ac09619baf03ee7d2e1b69dbe48559f
Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>
Linux Build Service Account [Thu, 8 Feb 2018 01:11:16 +0000 (17:11 -0800)]
Merge "i2c-msm-v2: Use "subsys" instead of "arch" initcall"
Linux Build Service Account [Thu, 8 Feb 2018 01:11:14 +0000 (17:11 -0800)]
Merge "ath10k: Enable wlan firmware based on the driver mode"
Linux Build Service Account [Wed, 7 Feb 2018 16:41:44 +0000 (08:41 -0800)]
Merge "power: smb1351-charger: Fix check in shutdown path for parallel disable"
Linux Build Service Account [Wed, 7 Feb 2018 16:41:43 +0000 (08:41 -0800)]
Merge "cnss_utils: Add support for derived MAC address"
Linux Build Service Account [Wed, 7 Feb 2018 16:41:41 +0000 (08:41 -0800)]
Merge "drm/msm: Corrected CCU load bit configuration"
Srinivas Ramana [Tue, 16 Jan 2018 09:09:49 +0000 (14:39 +0530)]
arch: arm64: Add midr values for kryo2xx big cores
Add midr value for kryo2xx big cores to apply errata workarounds for
branch prediction hardening.
Change-Id: I7ca9cfa3e6b48d5af78a5297cb76ebe6f52e519e
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
Will Deacon [Wed, 3 Jan 2018 12:46:21 +0000 (12:46 +0000)]
arm64: Implement branch predictor hardening for affected Cortex-A CPUs
Cortex-A57, A72, A73 and A75 are susceptible to branch predictor aliasing
and can theoretically be attacked by malicious code.
This patch implements a PSCI-based mitigation for these CPUs when available.
The call into firmware will invalidate the branch predictor state, preventing
any malicious entries from affecting other victim contexts.
Change-Id: I554536e8e5cb3839e102299da8f5b944415b1880
Co-developed-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Git-commit:
aa6acde65e03186b5add8151e1ffe36c3c62639b
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
Marc Zyngier [Mon, 30 Jan 2017 14:18:49 +0000 (14:18 +0000)]
arm64: Define Cortex-A73 MIDR
As we're about to introduce a new workaround that is specific to
Cortex-A73, let's define the coresponding MIDR.
Change-Id: Iabb0e83a0eadddbde458fdafd1224e442b6f3e63
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Git-commit:
199fd2bff4040985fbd7853cc39b7245fcf54bb9
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[sramana@codeaurora.org: Resolve trivial merge conflicts]
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
Will Deacon [Wed, 3 Jan 2018 11:19:34 +0000 (11:19 +0000)]
arm64: cputype: Add missing MIDR values for Cortex-A72 and Cortex-A75
Hook up MIDR values for the Cortex-A72 and Cortex-A75 CPUs, since they
will soon need MIDR matches for hardening the branch predictor.
Change-Id: I59af5ea4af17198aa70d2ba4b25f729a562727ee
Signed-off-by: Will Deacon <will.deacon@arm.com>
Git-commit:
a65d219fe5dc7887fd5ca04c2ac3e9a34feb8dfc
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[sramana@codeaurora.org: Resolve trivial merge conflicts]
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
Marc Zyngier [Wed, 1 Feb 2017 14:38:46 +0000 (14:38 +0000)]
arm64: cpu_errata: Allow an erratum to be match for all revisions of a core
Some minor erratum may not be fixed in further revisions of a core,
leading to a situation where the workaround needs to be updated each
time an updated core is released.
Introduce a MIDR_ALL_VERSIONS match helper that will work for all
versions of that MIDR, once and for all.
Change-Id: Icbb685f79205ba45f9c990d83cf961616b0d96b7
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Git-commit:
06f1494f837da8997d670a1ba87add7963b08922
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[sramana@codeaurora.org: Fix merge conflicts]
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
Will Deacon [Wed, 3 Jan 2018 11:17:58 +0000 (11:17 +0000)]
arm64: Add skeleton to harden the branch predictor against aliasing attacks
Aliasing attacks against CPU branch predictors can allow the attacks to
redirect speculative control flow on some CPUs and potentially divulge
information from one context to another.
This patch adds initial skeleton code behind a new Kconfig option to
enable implementation-specific mitigations against these attacks for
CPUs that are affected.
Change-Id: I07fba1943dd63df8951bf68fac947666100e5559
Co-developed-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Git-commit:
0f15adbb2861ce6f75ccfc5a92b19eae0ef327d0
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[sramana@codeaurora.org: Fix merge conflicts and make it
compilable on msm-4.4]
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
Vijay kumar Tumati [Wed, 7 Feb 2018 09:35:55 +0000 (15:05 +0530)]
msm: camera: Add RAW12 support for meta data
Adding support to decode 12 bit raw metadata
at CSID.
Change-Id: I89bb9f69f3f004df29b1498761e9a54fb88cdef0
Signed-off-by: Vijay kumar Tumati <vtumati@codeaurora.org>
Atanas Filipov [Tue, 27 Sep 2016 11:37:57 +0000 (14:37 +0300)]
i2c-msm-v2: Use "subsys" instead of "arch" initcall
The i2c-msm-v2 driver trying to get the clocks too early, but
the clock framework is not initialized yet. The change of the
initcall type reducing deferred calls and improving boot time.
Info:
[0.212999] i2c-msm-v2
78b6000.i2c: probing driver i2c-msm-v2
[0.213172] i2c-msm-v2
78b6000.i2c: error on clk_get(core_clk):-517
-- snipped --
[0.275922] i2c-msm-v2
78b6000.i2c: probing driver i2c-msm-v2
[0.276086] i2c-msm-v2
78b6000.i2c: error on clk_get(core_clk):-517
-- snipped --
[0.302980] msm_mpm_dev_probe(): Cannot get clk resource for XO: -517
[0.303394] i2c-msm-v2
78b6000.i2c: probing driver i2c-msm-v2
-- snipped --
Change-Id: Ia8c110b5f67eeec07586adb30ec3a7aff7ce265a
Signed-off-by: Atanas Filipov <afilipov@codeaurora.org>
Cong Tang [Fri, 2 Feb 2018 03:09:41 +0000 (11:09 +0800)]
ASoC: msm: Upgrade Machine Driver to Support 32 Channels
Upgrade machine driver to support 32 channels include expose mixer
controls for TERT/QUAT slot_number and slot_width and also slot
mapping configuration.
Change-Id: Ie0a73cf45a6daf3d4aced02cd99aa0ec09cb7c48
Signed-off-by: Cong Tang <congt@codeaurora.org>
Linux Build Service Account [Wed, 7 Feb 2018 07:46:59 +0000 (23:46 -0800)]
Merge "reg: qcom: call reg notifier during wiphy registration"
Linux Build Service Account [Wed, 7 Feb 2018 07:46:58 +0000 (23:46 -0800)]
Merge "drm/msm: restore perfcounter after turning on GPMU"
Linux Build Service Account [Wed, 7 Feb 2018 07:46:56 +0000 (23:46 -0800)]
Merge "ath10k: Handle mgmt tx completion event"
Sameer Thalappil [Thu, 9 Nov 2017 01:08:48 +0000 (17:08 -0800)]
cnss_utils: Add support for derived MAC address
MAC address programmed thru CNSS could be provisioned or
derived MAC address. So add support for programming the derived
MAC address.
Change-Id: I2fae232e32a8600949c286346acd05afefd94ef8
Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>
Cong Tang [Mon, 5 Feb 2018 09:20:53 +0000 (17:20 +0800)]
ASoC: msm: Update Audio Header File for 32 Channels Support
Update audio header files include new macro and structure definitions
for 32 channels support.
Change-Id: Idf5e92f7fda4b820b1a7f01001a683772281d8ba
Signed-off-by: Cong Tang <congt@codeaurora.org>
Linux Build Service Account [Tue, 6 Feb 2018 23:07:48 +0000 (15:07 -0800)]
Merge "lpm-stats: cleanup lpm stats processing sanity wrapping"