Commit graph

597100 commits

Author SHA1 Message Date
Al Viro
a88693d006 EXPORT_SYMBOL() for asm
commit 22823ab419d8ed884195cfa75483fd3a99bb1462 upstream.

Add asm-usable variants of EXPORT_SYMBOL/EXPORT_SYMBOL_GPL.  This
commit just adds the default implementation; most of the architectures
can simply add export.h to asm/Kbuild and start using <asm/export.h>
from assembler.  The rest needs to have their <asm/export.h> define
everal macros and then explicitly include <asm-generic/export.h>

One area where the things might diverge from default is the alignment;
normally it's 8 bytes on 64bit targets and 4 on 32bit ones, both for
unsigned long and for struct kernel_symbol.  Unfortunately, amd64 and
m68k are unusual - m68k aligns to 2 bytes (for both) and amd64 aligns
struct kernel_symbol to 16 bytes.  For those we'll need asm/export.h to
override the constants used by generic version - KSYM_ALIGN and KCRC_ALIGN
for kernel_symbol and unsigned long resp.  And no, __alignof__ would not
do the trick - on amd64 __alignof__ of struct kernel_symbol is 8, not 16.

More serious source of unpleasantness is treatment of function
descriptors on architectures that have those.  Things like ppc64,
parisc, ia64, etc.  need more than the address of the first insn to
call an arbitrary function.  As the result, their representation of
pointers to functions is not the typical "address of the entry point" -
it's an address of a small static structure containing all the required
information (including the entry point, of course).  Sadly, the asm-side
conventions differ in what the function name refers to - entry point or
the function descriptor.  On ppc64 we do the latter;
	bar: .quad foo
is what void (*bar)(void) = foo; turns into and the rare places where
we need to explicitly work with the label of entry point are dealt with
as DOTSYM(foo).  For our purposes it's ideal - generic macros are usable.
However, parisc would have foo and P%foo used for label of entry point
and address of the function descriptor and
	bar: .long P%foo
woudl be used instead.	ia64 goes similar to parisc in that respect,
except that there it's @fptr(foo) rather than P%foo.  Such architectures
need to define KSYM_FUNC that would turn a function name into whatever
is needed to refer to function descriptor.

What's more, on such architectures we need to know whether we are exporting
a function or an object - in assembler we have to tell that explicitly, to
decide whether we want EXPORT_SYMBOL(foo) produce e.g.
	__ksymtab_foo: .quad foo
or
	__ksymtab_foo: .quad @fptr(foo)

For that reason we introduce EXPORT_DATA_SYMBOL{,_GPL}(), to be used for
exports of data objects.  On normal architectures it's the same thing
as EXPORT_SYMBOL{,_GPL}(), but on parisc-like ones they differ and the
right one needs to be used.  Most of the exports are functions, so we
keep EXPORT_SYMBOL for those...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Razvan Ghitulete <rga@amazon.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-01-23 19:50:12 +01:00
Andy Lutomirski
b8e7a489b5 x86/asm: Make asm/alternative.h safe from assembly
commit f005f5d860e0231fe212cfda8c1a3148b99609f4 upstream.

asm/alternative.h isn't directly useful from assembly, but it
shouldn't break the build.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/e5b693fcef99fe6e80341c9e97a002fb23871e91.1461698311.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Razvan Ghitulete <rga@amazon.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-01-23 19:50:12 +01:00
Adam Borowski
b76ac90af3 x86/kbuild: enable modversions for symbols exported from asm
commit 334bb773876403eae3457d81be0b8ea70f8e4ccc upstream.

Commit 4efca4ed ("kbuild: modversions for EXPORT_SYMBOL() for asm") adds
modversion support for symbols exported from asm files. Architectures
must include C-style declarations for those symbols in asm/asm-prototypes.h
in order for them to be versioned.

Add these declarations for x86, and an architecture-independent file that
can be used for common symbols.

With f27c2f6 reverting 8ab2ae6 ("default exported asm symbols to zero") we
produce a scary warning on x86, this commit fixes that.

Signed-off-by: Adam Borowski <kilobyte@angband.pl>
Tested-by: Kalle Valo <kvalo@codeaurora.org>
Acked-by: Nicholas Piggin <npiggin@gmail.com>
Tested-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Razvan Ghitulete <rga@amazon.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-01-23 19:50:11 +01:00
Andrey Ryabinin
cfc8c1d61e x86/asm: Use register variable to get stack pointer value
commit 196bd485ee4f03ce4c690bfcf38138abfcd0a4bc upstream.

Currently we use current_stack_pointer() function to get the value
of the stack pointer register. Since commit:

  f5caf621ee35 ("x86/asm: Fix inline asm call constraints for Clang")

... we have a stack register variable declared. It can be used instead of
current_stack_pointer() function which allows to optimize away some
excessive "mov %rsp, %<dst>" instructions:

 -mov    %rsp,%rdx
 -sub    %rdx,%rax
 -cmp    $0x3fff,%rax
 -ja     ffffffff810722fd <ist_begin_non_atomic+0x2d>

 +sub    %rsp,%rax
 +cmp    $0x3fff,%rax
 +ja     ffffffff810722fa <ist_begin_non_atomic+0x2a>

Remove current_stack_pointer(), rename __asm_call_sp to current_stack_pointer
and use it instead of the removed function.

Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Reviewed-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20170929141537.29167-1-aryabinin@virtuozzo.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
[dwmw2: We want ASM_CALL_CONSTRAINT for retpoline]
Signed-off-by: David Woodhouse <dwmw@amazon.co.ku>
Signed-off-by: Razvan Ghitulete <rga@amazon.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-01-23 19:50:11 +01:00
Andy Lutomirski
416f66509f x86/mm/32: Move setup_clear_cpu_cap(X86_FEATURE_PCID) earlier
commit b8b7abaed7a49b350f8ba659ddc264b04931d581 upstream.

Otherwise we might have the PCID feature bit set during cpu_init().

This is just for robustness.  I haven't seen any actual bugs here.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bpetkov@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: cba4671af755 ("x86/mm: Disable PCID on 32-bit kernels")
Link: http://lkml.kernel.org/r/b16dae9d6b0db5d9801ddbebbfd83384097c61f3.1505663533.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-01-23 19:50:11 +01:00
Tom Lendacky
642ce1bb5e x86/cpu/AMD: Use LFENCE_RDTSC in preference to MFENCE_RDTSC
commit 9c6a73c75864ad9fa49e5fa6513e4c4071c0e29f upstream.

With LFENCE now a serializing instruction, use LFENCE_RDTSC in preference
to MFENCE_RDTSC.  However, since the kernel could be running under a
hypervisor that does not support writing that MSR, read the MSR back and
verify that the bit has been set successfully.  If the MSR can be read
and the bit is set, then set the LFENCE_RDTSC feature, otherwise set the
MFENCE_RDTSC feature.

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Reviewed-by: Borislav Petkov <bp@suse.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linux-foundation.org>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: Paul Turner <pjt@google.com>
Link: https://lkml.kernel.org/r/20180108220932.12580.52458.stgit@tlendack-t1.amdoffice.net
Signed-off-by: Razvan Ghitulete <rga@amazon.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-01-23 19:50:11 +01:00
Tom Lendacky
20c28c04a6 x86/cpu/AMD: Make LFENCE a serializing instruction
commit e4d0e84e490790798691aaa0f2e598637f1867ec upstream.

To aid in speculation control, make LFENCE a serializing instruction
since it has less overhead than MFENCE.  This is done by setting bit 1
of MSR 0xc0011029 (DE_CFG).  Some families that support LFENCE do not
have this MSR.  For these families, the LFENCE instruction is already
serializing.

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Reviewed-by: Borislav Petkov <bp@suse.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linux-foundation.org>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: Paul Turner <pjt@google.com>
Link: https://lkml.kernel.org/r/20180108220921.12580.71694.stgit@tlendack-t1.amdoffice.net
Signed-off-by: Razvan Ghitulete <rga@amazon.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-01-23 19:50:11 +01:00
Arnd Bergmann
e6c591e7a4 gcov: disable for COMPILE_TEST
commit cc622420798c4bcf093785d872525087a7798db9 upstream.

Enabling gcov is counterproductive to compile testing: it significantly
increases the kernel image size, compile time, and it produces lots
of false positive "may be used uninitialized" warnings as the result
of missed optimizations.

This is in line with how UBSAN_SANITIZE_ALL and PROFILE_ALL_BRANCHES
work, both of which have similar problems.

With an ARM allmodconfig kernel, I see the build time drop from
283 minutes CPU time to 225 minutes, and the vmlinux size drops
from 43MB to 26MB.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-01-23 19:50:10 +01:00
Deepak Kumar
959a0fa9ae msm: kgsl: Move global memory region to 0x100000000
On a 64bit kernel, a 32bit user application is not
restricted to 3GB limit of virtual memory. It is
allowed to access complete 4GB range.

Move global memory region to 0x100000000 outside of
32bit range on 64bit kernel to increase the virtual
memory range for a 32bit application running on a
64bit kernel. This will also move secure memory
region to 0xF0000000.

Change-Id: I017ac0c052b4d9466f9f1a66af4a83f0636450cb
Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
2018-01-23 20:49:13 +05:30
Zhiqiang Tu
663eb5feb7 ARM: dts: msm: Switch to virtual clock and reset for usb2 on vplatform
Switch to virtual clock and reset to support role switch and power
management.

Change-Id: Ie7c65d8fe1226765d99afc63eda5e1c86400a919
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-01-23 17:56:31 +08:00
Meera Gande
d5c49b6b51 mm-camera2:isp2: Handle use after free buffer
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
at the same time.

Change-Id: Ic83f22336504cf67afe12131f791eee25477f011
Signed-off-by: Meera Gande <mgande@codeaurora.org>
2018-01-23 12:23:48 +05:30
Wei Wang
4e4b700a62 ipv6: release rt6->rt6i_idev properly during ifdown
When a dst is created by addrconf_dst_alloc() for a host route or an
anycast route, dst->dev points to loopback dev while rt6->rt6i_idev
points to a real device.
When the real device goes down, the current cleanup code only checks for
dst->dev and assumes rt6->rt6i_idev->dev is the same. This causes the
refcount leak on the real device in the above situation.
This patch makes sure to always release the refcount taken on
rt6->rt6i_idev during dst_dev_put().

Change-Id: Id3d07aebb85432298179c6846986540e2f8b13a9
Fixes: 587fea741134 ("ipv6: mark DST_NOGC and remove the operation of
dst_free()")
Reported-by: John Stultz <john.stultz@linaro.org>
Tested-by: John Stultz <john.stultz@linaro.org>
Tested-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Wei Wang <weiwan@google.com>
Signed-off-by: Martin KaFai Lau <kafai@fb.com>
Acked-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Git-commit: e5645f51ba99738b0e5d708edf9c6454f33b9310
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Tejaswi Tanikella <tejaswit@codeaurora.org>
2018-01-22 22:13:55 -08:00
Linux Build Service Account
f56ee1db81 Merge "drm/edid: CEA mode 64 1080p100 vsync pulse width incorrect" 2018-01-22 22:12:34 -08:00
Linux Build Service Account
1e6d2618a7 Merge "drm/edid: complete CEA modedb(VIC 1-107)" 2018-01-22 22:12:33 -08:00
Linux Build Service Account
add2282e7d Merge "clocksource: arch_timer: Disable user access to the physical counter" 2018-01-22 22:12:32 -08:00
Linux Build Service Account
60ab2b9541 Merge "msm: vidc: set multistream mode for worst case scratch buffer requirement" 2018-01-22 22:12:31 -08:00
Linux Build Service Account
63f67fc2d5 Merge "dwc3: debugfs: Add check for length before copy data from userspace" 2018-01-22 22:12:30 -08:00
Meng Wang
3979085e74 ASoC: msm: qdsp6v2: correct return value check
When the return value of adm_populate_channel_weight is 0, it should
keep running, not return error.

Change-Id: I447b81d6edfc89db6cb3742c1719e745c6071c12
Signed-off-by: Meng Wang <mwang@codeaurora.org>
2018-01-22 21:05:00 -08:00
Shihuan Liu
05ec87e351 msm: ipa: add new IPA filtering bitmap
Add new IPA filtering bitmap to match inner IP type
and inner IPv4 address in L2TP use case.

Change-Id: I30afbfba6fb0150ab90826eb2543540699ab895b
Acked-by: Shihuan Liu <shihuanl@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2018-01-22 10:28:50 -08:00
Umang Agrawal
4443d763c3 power: smb1351-charger: Fix check in shutdown path for parallel disable
Change in parameter checked while disabling parallel charger in the
shutdown path as the charger present flag is not updated in parallel
charger mode.

CRs-Fixed: 2172956
Change-Id: I79ff909abae5dcc2692c69a81ea70ee56ca34522
Signed-off-by: Umang Agrawal <uagrawal@codeaurora.org>
2018-01-22 18:21:28 +05:30
Andy Sun
ea9d0315e3 ais: support field info report to user space
1. send real SOF event to user space per SOF irq;
   original SOF event per:
     CAMIF port: epoch irq
     RDI port: reg_update irq
2. provide interface for user space to query field type;
3. provide frame id from stream_info not src_info for user;

Change-Id: Ied446b81a84d95c7273d1aa3918a474ac739971f
Signed-off-by: Andy Sun <bins@codeaurora.org>
2018-01-22 16:03:01 +08:00
Will Huang
81d7e2934d net: cnss2: Enable CONFIG_CNSS_UTILS for msm8996AU
Enable CONFIG_CNSS_UTILS in order to support WLAN LTE coex and other
CNSS UTILS functions.

Change-Id: I1f496ca3b32bf9f7e87b8eb03b4f0aec413be336
CRs-Fixed: 2172124
Signed-off-by: Will Huang <wilhuang@codeaurora.org>
2018-01-22 15:18:40 +08:00
Zhiqiang Tu
45b84a4fb5 clk: msm: Add usb2s support for msm8996 virtual clock
Add the usb2s relevant clocks in msm8996 virtual clock driver.

Change-Id: Id72e1a69f39ee2dd0c871828e9faed8dbedefd5b
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-01-21 22:48:08 -08:00
Yimin Peng
1cce581249 ARM: dts: msm: add usb2s and usb3 devices on msm8996 vplatform
Add usb passthrough devices for msm8996 vplatform.

Change-Id: I7a49470ed722a2028c73e99554e3d4fe98b0f38d
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
2018-01-22 13:56:58 +08:00
Chao Bi
a90314995d ARM: dts: msm: Add msm android vm device node on msm8996 vplatform
This patch is to add a new device tree file specific for ivi-android gvm.

Change-Id: I558c300a6698f818a3621d287fb8dd398c4d0e83
Signed-off-by: Chao Bi <chaobi@codeaurora.org>
2018-01-22 10:01:05 +08:00
Skylar Chang
ad5f103c51 msm: ipa: return the wifi stats when reset is set
After Andorid-O, every time after framework queries
the WIFI-stats, it will reset the stats because
framework would like to know only the difference of
data usage, not accumulated stats.

Change-Id: I66bbf779f872c54311dcc8e3ba635949126e94ac
Acked-by: Pooja Kumari <kumarip@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2018-01-21 01:04:28 -08:00
Linux Build Service Account
a5cabe9334 Merge "msm: ipa: Return error -ENODEV for set data quota failure" 2018-01-20 06:06:04 -08:00
Mohammed Javid
8a0980acf1 msm: ipa: Return error -ENODEV for set data quota failure
If set data quota fails due to invalid interface
name, return -ENODEV error.

Change-Id: I45f4082cb8026d3757bd4df237e34df14750ea29
Acked-by: Pooja Kumari <kumarip@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-01-19 23:39:56 -08:00
Linux Build Service Account
be48c04efd Merge "power: qpnp-fg-gen3: add support for configuring cutoff current" 2018-01-19 20:10:35 -08:00
Linux Build Service Account
5cbcd25aea Merge "leds: qpnp-flash-v2: Update IRES for active LEDs" 2018-01-19 20:10:34 -08:00
Daniel Rosenberg
3fc4284df7 ANDROID: sdcardfs: Move default_normal to superblock
Moving default_normal from mount info to superblock info
as it doesn't need to change between mount points.

Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 72158116
Change-Id: I16c6a0577c601b4f7566269f7e189fcf697afd4e
2018-01-19 23:07:11 +00:00
Hyojun Kim
d96d95dd1d blkdev: Refactoring block io latency histogram codes
The current io_latency_state structure includes entries for read
and write requests. There are special types of write commands
such as sync and discard (trim) commands, and the current
implementation is not general enough if we want to separate
latency histogram for such special commands.

This change makes io_latency_state structure request-type neutral.
It also changes to print the latency average.

Signed-off-by: Hyojun Kim <hyojun@google.com>
2018-01-19 19:08:57 +00:00
Linux Build Service Account
a407c5262d Merge "soc: qcom: hab: add compat_ioctl support" 2018-01-19 09:30:33 -08:00
Linux Build Service Account
d23b921b46 Merge "soc: qcom: hab: add dts parsing into hab driver" 2018-01-19 09:30:32 -08:00
Linux Build Service Account
54b0b96ecd Merge "Merge android-4.4.110 (5cc8c2e) into msm-4.4" 2018-01-19 09:30:27 -08:00
Linux Build Service Account
188c08e1bf Merge "power: smb1351-charger: Disable parallel charging in shutdown path" 2018-01-19 09:30:26 -08:00
Vaishnavi Kommaraju
8e4d5486e3 ASoc: wcd_cpe_core: Add mutex lock for CPE session
Add mutex lock to ensure atomic access to core handle
in CPE alloc and dealloc sessions.

CRs-Fixed: 2169403
Change-Id: I7e046f349cc56ee06706cf15651dac3fdfe9d9a6
Signed-off-by: Vaishnavi Kommaraju <vkommara@codeaurora.org>
2018-01-19 20:30:26 +05:30
Guchun Chen
16ac82899e ARM: dts: msm: remove no-map for lk_pool on msm8996 auto boards
no-map is set for carve out memory, which means it will never be
brought back to system. While in kernel, such memory should be recycled
if no one uses it.

CRs-Fixed: 2168593
Change-Id: I06471db012927e82faee12149d14c79d7097cc1c
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2018-01-19 15:20:59 +08:00
Subbaraman Narayanamurthy
2e21ea63b3 leds: qpnp-flash-v2: Update IRES for active LEDs
Currently, whenever the switch LED device is triggered, IRES is
updated based on the LEDs belonging to that switch LED device.
However, this can overwrite IRES configuration if flash and torch
LED devices have different IRES since they share the same id.

Fix this by checking the active LED status which will be updated
based on the brightness level set so that IRES will be updated
for the correct LED (flash/torch) device.

CRs-Fixed: 2173127
Change-Id: Ic3b5db2f56758ccd68fd80139aeb22f31723130e
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2018-01-18 18:34:02 -08:00
Catalin Marinas
52c02cf1b2 FROMLIST: arm64: kpti: Fix the interaction between ASID switching and software PAN
With ARM64_SW_TTBR0_PAN enabled, the exception entry code checks the
active ASID to decide whether user access was enabled (non-zero ASID)
when the exception was taken. On return from exception, if user access
was previously disabled, it re-instates TTBR0_EL1 from the per-thread
saved value (updated in switch_mm() or efi_set_pgd()).

Commit 7655abb95386 ("arm64: mm: Move ASID from TTBR0 to TTBR1") makes a
TTBR0_EL1 + ASID switching non-atomic. Subsequently, commit 27a921e75711
("arm64: mm: Fix and re-enable ARM64_SW_TTBR0_PAN") changes the
__uaccess_ttbr0_disable() function and asm macro to first write the
reserved TTBR0_EL1 followed by the ASID=0 update in TTBR1_EL1. If an
exception occurs between these two, the exception return code will
re-instate a valid TTBR0_EL1. Similar scenario can happen in
cpu_switch_mm() between setting the reserved TTBR0_EL1 and the ASID
update in cpu_do_switch_mm().

This patch reverts the entry.S check for ASID == 0 to TTBR0_EL1 and
disables the interrupts around the TTBR0_EL1 and ASID switching code in
__uaccess_ttbr0_disable(). It also ensures that, when returning from the
EFI runtime services, efi_set_pgd() doesn't leave a non-zero ASID in
TTBR1_EL1 by using uaccess_ttbr0_{enable,disable}.

The accesses to current_thread_info()->ttbr0 are updated to use
READ_ONCE/WRITE_ONCE.

As a safety measure, __uaccess_ttbr0_enable() always masks out any
existing non-zero ASID TTBR1_EL1 before writing in the new ASID.

Fixes: 27a921e75711 ("arm64: mm: Fix and re-enable ARM64_SW_TTBR0_PAN")
Acked-by: Will Deacon <will.deacon@arm.com>
Reported-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: James Morse <james.morse@arm.com>
Tested-by: James Morse <james.morse@arm.com>
Co-developed-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git
 commit 6b88a32c7af68895134872cdec3b6bfdb532d94e)

Change-Id: Icd6f58f0b12fcfdeaf08dceb36a929f585ac1479
[ghackmann@google.com:
 - adjust context
 - apply asm-uaccess.h changes to uaccess.h
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2018-01-18 18:19:10 +00:00
Marc Zyngier
da94c13a99 FROMLIST: arm64: Move post_ttbr_update_workaround to C code
We will soon need to invoke a CPU-specific function pointer after changing
page tables, so move post_ttbr_update_workaround out into C code to make
this possible.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
(cherry picked from git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git
 commit 400a169447ad2268b023637a118fba27246bcc19)

Change-Id: I4e6edb3dcb6aabe9c17e4698619a093e76495b36
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2018-01-18 18:19:02 +00:00
Will Deacon
c30184d9b6 FROMLIST: arm64: mm: Rename post_ttbr0_update_workaround
The post_ttbr0_update_workaround hook applies to any change to TTBRx_EL1.
Since we're using TTBR1 for the ASID, rename the hook to make it clearer
as to what it's doing.

Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Laura Abbott <labbott@redhat.com>
Tested-by: Shanker Donthineni <shankerd@codeaurora.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
(cherry picked from git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git
 commit 158d495899ce55db453f682a8ac8390d5a426578)

Change-Id: Iaf152ca1bd0a20bd15a77afac4ad4e9ea8ada08f
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2018-01-18 18:18:51 +00:00
Linux Build Service Account
6b202df713 Merge "mmc: sdhci: Remove some redundant stack information" 2018-01-18 09:36:24 -08:00
Linux Build Service Account
f5e3d60a29 Merge "dwc3-msm: Introduce sysfs param to indicate usb compliance mode" 2018-01-18 09:36:23 -08:00
Linux Build Service Account
ba930bb521 Merge "defconfig: msm: sdm660: disable memory cgroups" 2018-01-18 09:36:22 -08:00
Linux Build Service Account
f3dcbfee1c Merge "usb: pd: avoid out-of-bounds access when reading PDOs" 2018-01-18 09:36:20 -08:00
Linux Build Service Account
10d5a831db Merge "usb: pd: ensure source hard reset is handled timely" 2018-01-18 09:36:19 -08:00
Linux Build Service Account
13c7e628e7 Merge "msm: ipa: Fix to unsigned integer underflow" 2018-01-18 09:36:17 -08:00
Yong Ding
bc474ffea6 soc: qcom: hab: add compat_ioctl support
This is used to allow 32-bit userland programs to make ioctl
calls on 64-bit kernel.

Change-Id: Ie5066a3445c79859fc0b509159b34ff08d36358a
Signed-off-by: Yong Ding <yongding@codeaurora.org>
2018-01-18 01:30:45 -08:00
Yong Ding
d062c8ead0 soc: qcom: hab: add dts parsing into hab driver
HAB driver can parse its relevant entries from device
tree, and get necessary info, like its local vmid,
physical channel groups, and etc.

Change-Id: Iab0501a442bd3c89dd4b348570108dbe5ab0adca
Signed-off-by: Yong Ding <yongding@codeaurora.org>
2018-01-18 17:16:04 +08:00