[Xen-changelog] [xen staging] Merge branch 'arm-next' into staging

[patchbot@xxxxxxx]

commit 65a2c12576a73b67c80a1b4eceff1fa9a4ffa050
Merge: b4ac4bc410222d221dc46a74ac71efaa7b32d57c 
302ba0cee8171ee7c12f100f92e122f269d9f0a7
Author:     Julien Grall <julien.grall@xxxxxxx>
AuthorDate: Wed Jul 4 11:46:11 2018 +0100
Commit:     Julien Grall <julien.grall@xxxxxxx>
CommitDate: Wed Jul 4 11:46:11 2018 +0100

    Merge branch 'arm-next' into staging

 docs/misc/xen-command-line.markdown      |  18 ++
 xen/arch/arm/Kconfig                     |  46 ++---
 xen/arch/arm/alternative.c               |  86 +++++-----
 xen/arch/arm/arm64/asm-offsets.c         |   2 +
 xen/arch/arm/arm64/entry.S               |  48 +++++-
 xen/arch/arm/arm64/smpboot.c             |   2 +-
 xen/arch/arm/arm64/vsysreg.c             |   4 +-
 xen/arch/arm/cpuerrata.c                 | 199 ++++++++++++++++++++++
 xen/arch/arm/cpufeature.c                |  29 ++++
 xen/arch/arm/domain.c                    |   9 +
 xen/arch/arm/gic-vgic.c                  |   2 +-
 xen/arch/arm/gic.c                       |  31 ++++
 xen/arch/arm/irq.c                       |   2 +-
 xen/arch/arm/p2m.c                       |  53 +++++-
 xen/arch/arm/platforms/vexpress.c        |  35 ----
 xen/arch/arm/processor.c                 |   2 +-
 xen/arch/arm/psci.c                      |  13 ++
 xen/arch/arm/setup.c                     |   8 +-
 xen/arch/arm/smpboot.c                   |  42 ++++-
 xen/arch/arm/time.c                      |  45 +++++
 xen/arch/arm/traps.c                     |  58 +++++--
 xen/arch/arm/vgic-v2.c                   |   2 +
 xen/arch/arm/vsmc.c                      |  37 ++++
 xen/common/schedule.c                    |   4 +
 xen/drivers/video/Kconfig                |   3 -
 xen/drivers/video/Makefile               |   1 -
 xen/drivers/video/arm_hdlcd.c            | 281 -------------------------------
 xen/include/asm-arm/alternative.h        |  44 ++++-
 xen/include/asm-arm/arm64/macros.h       |  25 +++
 xen/include/asm-arm/cpuerrata.h          |  42 +++++
 xen/include/asm-arm/cpufeature.h         |   4 +-
 xen/include/asm-arm/current.h            |   6 +-
 xen/include/asm-arm/macros.h             |   2 +-
 xen/include/asm-arm/platforms/vexpress.h |   6 -
 xen/include/asm-arm/procinfo.h           |   4 +-
 xen/include/asm-arm/psci.h               |   1 +
 xen/include/asm-arm/smccc.h              |  13 +-
 xen/include/asm-arm/traps.h              |   4 +
 38 files changed, 785 insertions(+), 428 deletions(-)

diff --cc docs/misc/xen-command-line.markdown
index ff8c7d4c2f,962028b6ed..8a832c0f8b
--- a/docs/misc/xen-command-line.markdown
+++ b/docs/misc/xen-command-line.markdown
@@@ -1758,9 -1756,27 +1758,27 @@@ enforces the maximum theoretically nece
  is being interpreted as a custom timeout in milliseconds. Zero or boolean
  false disable the quirk workaround, which is also the default.
  
+ ### spec-ctrl (Arm)
+ > `= List of [ ssbd=force-disable|runtime|force-enable ]`
+ 
+ Controls for speculative execution sidechannel mitigations.
+ 
+ The option `ssbd=` is used to control the state of Speculative Store
+ Bypass Disable (SSBD) mitigation.
+ 
+ * `ssbd=force-disable` will keep the mitigation permanently off. The guest
+ will not be able to control the state of the mitigation.
+ * `ssbd=runtime` will always turn on the mitigation when running in the
+ hypervisor context. The guest will be to turn on/off the mitigation for
+ itself by using the firmware interface ARCH\_WORKAROUND\_2.
+ * `ssbd=force-enable` will keep the mitigation permanently on. The guest will
+ not be able to control the state of the mitigation.
+ 
+ By default SSBD will be mitigated at runtime (i.e `ssbd=runtime`).
+ 
  ### spec-ctrl (x86)
  > `= List of [ <bool>, xen=<bool>, {pv,hvm,msr-sc,rsb}=<bool>,
 ->              bti-thunk=retpoline|lfence|jmp, {ibrs,ibpb,ssbd}=<bool> ]`
 +>              bti-thunk=retpoline|lfence|jmp, 
{ibrs,ibpb,ssbd,eager-fpu}=<bool> ]`
  
  Controls for speculative execution sidechannel mitigations.  By default, Xen
  will pick the most appropriate mitigations based on compiled in support,
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog