Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1873e500 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 

Pull ARM64 updates from Catalin Marinas:
 "Main features:
   - KVM and Xen ports to AArch64
   - Hugetlbfs and transparent huge pages support for arm64
   - Applied Micro X-Gene Kconfig entry and dts file
   - Cache flushing improvements

  For arm64 huge pages support, there are x86 changes moving part of
  arch/x86/mm/hugetlbpage.c into mm/hugetlb.c to be re-used by arm64"

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: (66 commits)
  arm64: Add initial DTS for APM X-Gene Storm SOC and APM Mustang board
  arm64: Add defines for APM ARMv8 implementation
  arm64: Enable APM X-Gene SOC family in the defconfig
  arm64: Add Kconfig option for APM X-Gene SOC family
  arm64/Makefile: provide vdso_install target
  ARM64: mm: THP support.
  ARM64: mm: Raise MAX_ORDER for 64KB pages and THP.
  ARM64: mm: HugeTLB support.
  ARM64: mm: Move PTE_PROT_NONE bit.
  ARM64: mm: Make PAGE_NONE pages read only and no-execute.
  ARM64: mm: Restore memblock limit when map_mem finished.
  mm: thp: Correct the HPAGE_PMD_ORDER check.
  x86: mm: Remove general hugetlb code from x86.
  mm: hugetlb: Copy general hugetlb code from x86 to mm.
  x86: mm: Remove x86 version of huge_pmd_share.
  mm: hugetlb: Copy huge_pmd_share from x86 to mm.
  arm64: KVM: document kernel object mappings in HYP
  arm64: KVM: MAINTAINERS update
  arm64: KVM: userspace API documentation
  arm64: KVM: enable initialization of a 32bit vcpu
  ...
parents fb2af002 aa729dcc

Documentation/arm64/memory.txt

+7 −0
Original line number Diff line number Diff line
@@ -73,3 +73,10 @@ Translation table lookup with 64KB pages: 
 |                 |    +--------------------------> [41:29] L2 index (only 38:29 used)

 |                 +-------------------------------> [47:42] L1 index (not used)

 +-------------------------------------------------> [63] TTBR0/1



When using KVM, the hypervisor maps kernel pages in EL2, at a fixed

offset from the kernel VA (top 24bits of the kernel VA set to zero):



Start			End			Size		Use

-----------------------------------------------------------------------

0000004000000000	0000007fffffffff	 256GB		kernel objects mapped in HYP

Documentation/virtual/kvm/api.txt

+39 −19
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ kvm_run' (see below). 
4.11 KVM_GET_REGS



Capability: basic

Architectures: all except ARM

Architectures: all except ARM, arm64

Type: vcpu ioctl

Parameters: struct kvm_regs (out)

Returns: 0 on success, -1 on error
@@ -301,7 +301,7 @@ struct kvm_regs { 
4.12 KVM_SET_REGS



Capability: basic

Architectures: all except ARM

Architectures: all except ARM, arm64

Type: vcpu ioctl

Parameters: struct kvm_regs (in)

Returns: 0 on success, -1 on error
@@ -587,7 +587,7 @@ struct kvm_fpu { 
4.24 KVM_CREATE_IRQCHIP



Capability: KVM_CAP_IRQCHIP

Architectures: x86, ia64, ARM

Architectures: x86, ia64, ARM, arm64

Type: vm ioctl

Parameters: none

Returns: 0 on success, -1 on error
@@ -595,14 +595,14 @@ Returns: 0 on success, -1 on error 
Creates an interrupt controller model in the kernel.  On x86, creates a virtual

ioapic, a virtual PIC (two PICs, nested), and sets up future vcpus to have a

local APIC.  IRQ routing for GSIs 0-15 is set to both PIC and IOAPIC; GSI 16-23

only go to the IOAPIC.  On ia64, a IOSAPIC is created. On ARM, a GIC is

only go to the IOAPIC.  On ia64, a IOSAPIC is created. On ARM/arm64, a GIC is

created.





4.25 KVM_IRQ_LINE



Capability: KVM_CAP_IRQCHIP

Architectures: x86, ia64, arm

Architectures: x86, ia64, arm, arm64

Type: vm ioctl

Parameters: struct kvm_irq_level

Returns: 0 on success, -1 on error
@@ -612,9 +612,10 @@ On some architectures it is required that an interrupt controller model has 
been previously created with KVM_CREATE_IRQCHIP.  Note that edge-triggered

interrupts require the level to be set to 1 and then back to 0.



ARM can signal an interrupt either at the CPU level, or at the in-kernel irqchip

(GIC), and for in-kernel irqchip can tell the GIC to use PPIs designated for

specific cpus.  The irq field is interpreted like this:

ARM/arm64 can signal an interrupt either at the CPU level, or at the

in-kernel irqchip (GIC), and for in-kernel irqchip can tell the GIC to

use PPIs designated for specific cpus.  The irq field is interpreted

like this:



  bits:  | 31 ... 24 | 23  ... 16 | 15    ...    0 |

  field: | irq_type  | vcpu_index |     irq_id     |
@@ -1831,6 +1832,22 @@ ARM 32-bit VFP control registers have the following id bit patterns: 
ARM 64-bit FP registers have the following id bit patterns:

  0x4030 0000 0012 0 <regno:12>





arm64 registers are mapped using the lower 32 bits. The upper 16 of

that is the register group type, or coprocessor number:



arm64 core/FP-SIMD registers have the following id bit patterns. Note

that the size of the access is variable, as the kvm_regs structure

contains elements ranging from 32 to 128 bits. The index is a 32bit

value in the kvm_regs structure seen as a 32bit array.

  0x60x0 0000 0010 <index into the kvm_regs struct:16>



arm64 CCSIDR registers are demultiplexed by CSSELR value:

  0x6020 0000 0011 00 <csselr:8>



arm64 system registers have the following id bit patterns:

  0x6030 0000 0013 <op0:2> <op1:3> <crn:4> <crm:4> <op2:3>



4.69 KVM_GET_ONE_REG



Capability: KVM_CAP_ONE_REG
@@ -2264,7 +2281,7 @@ current state. "addr" is ignored. 
4.77 KVM_ARM_VCPU_INIT



Capability: basic

Architectures: arm

Architectures: arm, arm64

Type: vcpu ioctl

Parameters: struct struct kvm_vcpu_init (in)

Returns: 0 on success; -1 on error
@@ -2283,12 +2300,14 @@ should be created before this ioctl is invoked. 
Possible features:

	- KVM_ARM_VCPU_POWER_OFF: Starts the CPU in a power-off state.

	  Depends on KVM_CAP_ARM_PSCI.

	- KVM_ARM_VCPU_EL1_32BIT: Starts the CPU in a 32bit mode.

	  Depends on KVM_CAP_ARM_EL1_32BIT (arm64 only).





4.78 KVM_GET_REG_LIST



Capability: basic

Architectures: arm

Architectures: arm, arm64

Type: vcpu ioctl

Parameters: struct kvm_reg_list (in/out)

Returns: 0 on success; -1 on error
@@ -2308,7 +2327,7 @@ KVM_GET_ONE_REG/KVM_SET_ONE_REG calls. 
4.80 KVM_ARM_SET_DEVICE_ADDR



Capability: KVM_CAP_ARM_SET_DEVICE_ADDR

Architectures: arm

Architectures: arm, arm64

Type: vm ioctl

Parameters: struct kvm_arm_device_address (in)

Returns: 0 on success, -1 on error
@@ -2329,18 +2348,19 @@ can access emulated or directly exposed devices, which the host kernel needs 
to know about. The id field is an architecture specific identifier for a

specific device.



ARM divides the id field into two parts, a device id and an address type id

specific to the individual device.

ARM/arm64 divides the id field into two parts, a device id and an

address type id specific to the individual device.



  bits:  | 63        ...       32 | 31    ...    16 | 15    ...    0 |

  field: |        0x00000000      |     device id   |  addr type id  |



ARM currently only require this when using the in-kernel GIC support for the

hardware VGIC features, using KVM_ARM_DEVICE_VGIC_V2 as the device id.  When

setting the base address for the guest's mapping of the VGIC virtual CPU

and distributor interface, the ioctl must be called after calling

KVM_CREATE_IRQCHIP, but before calling KVM_RUN on any of the VCPUs.  Calling

this ioctl twice for any of the base addresses will return -EEXIST.

ARM/arm64 currently only require this when using the in-kernel GIC

support for the hardware VGIC features, using KVM_ARM_DEVICE_VGIC_V2

as the device id.  When setting the base address for the guest's

mapping of the VGIC virtual CPU and distributor interface, the ioctl

must be called after calling KVM_CREATE_IRQCHIP, but before calling

KVM_RUN on any of the VCPUs.  Calling this ioctl twice for any of the

base addresses will return -EEXIST.



4.82 KVM_PPC_RTAS_DEFINE_TOKEN

MAINTAINERS

+16 −0
Original line number Diff line number Diff line
@@ -4739,6 +4739,15 @@ F: arch/arm/include/uapi/asm/kvm* 
F:	arch/arm/include/asm/kvm*

F:	arch/arm/kvm/



KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)

M:	Marc Zyngier <marc.zyngier@arm.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	kvmarm@lists.cs.columbia.edu

S:	Maintained

F:	arch/arm64/include/uapi/asm/kvm*

F:	arch/arm64/include/asm/kvm*

F:	arch/arm64/kvm/



KEXEC

M:	Eric Biederman <ebiederm@xmission.com>

W:	http://kernel.org/pub/linux/utils/kernel/kexec/
@@ -9135,6 +9144,13 @@ S: Supported 
F:	arch/arm/xen/

F:	arch/arm/include/asm/xen/



XEN HYPERVISOR ARM64

M:	Stefano Stabellini <stefano.stabellini@eu.citrix.com>

L:	xen-devel@lists.xensource.com (moderated for non-subscribers)

S:	Supported

F:	arch/arm64/xen/

F:	arch/arm64/include/asm/xen/



XEN NETWORK BACKEND DRIVER

M:	Ian Campbell <ian.campbell@citrix.com>

L:	xen-devel@lists.xensource.com (moderated for non-subscribers)

arch/arm/include/asm/xen/page.h

+1 −2
Original line number Diff line number Diff line 
#ifndef _ASM_ARM_XEN_PAGE_H

#define _ASM_ARM_XEN_PAGE_H



#include <asm/mach/map.h>

#include <asm/page.h>

#include <asm/pgtable.h>
@@ -88,6 +87,6 @@ static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn) 
	return __set_phys_to_machine(pfn, mfn);

}



#define xen_remap(cookie, size) __arm_ioremap((cookie), (size), MT_MEMORY);

#define xen_remap(cookie, size) ioremap_cached((cookie), (size));



#endif /* _ASM_ARM_XEN_PAGE_H */

arch/arm/kvm/arch_timer.c

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ static struct notifier_block kvm_timer_cpu_nb = { 


static const struct of_device_id arch_timer_of_match[] = {

	{ .compatible	= "arm,armv7-timer",	},

	{ .compatible	= "arm,armv8-timer",	},

	{},

};