diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-09-27 11:03:33 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-09-27 11:03:33 +0200 |
| commit | e77d99d4a4ec761ad061f1ec890c71040a92efe3 (patch) | |
| tree | aea6fe2ee5bb6e699045a3629b48208f3e2a26b6 /Documentation | |
| parent | bb0ca6acd466af55c95b7ce508f29e23a24cabd9 (diff) | |
| parent | 0496daa5cf99741ce8db82686b4c7446a37feabb (diff) | |
| download | linux-stable-e77d99d4a4ec761ad061f1ec890c71040a92efe3.tar.gz linux-stable-e77d99d4a4ec761ad061f1ec890c71040a92efe3.tar.bz2 linux-stable-e77d99d4a4ec761ad061f1ec890c71040a92efe3.zip | |
Merge tag 'kvm-arm-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-next
Changes for KVM for arm/arm64 for 3.18
This includes a bunch of changes:
- Support read-only memory slots on arm/arm64
- Various changes to fix Sparse warnings
- Correctly detect write vs. read Stage-2 faults
- Various VGIC cleanups and fixes
- Dynamic VGIC data strcuture sizing
- Fix SGI set_clear_pend offset bug
- Fix VTTBR_BADDR Mask
- Correctly report the FSC on Stage-2 faults
Conflicts:
virt/kvm/eventfd.c
[duplicate, different patch where the kvm-arm version broke x86.
The kvm tree instead has the right one]
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/virtual/kvm/devices/arm-vgic.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/virtual/kvm/devices/arm-vgic.txt b/Documentation/virtual/kvm/devices/arm-vgic.txt index 7f4e91b1316b..df8b0c7540b6 100644 --- a/Documentation/virtual/kvm/devices/arm-vgic.txt +++ b/Documentation/virtual/kvm/devices/arm-vgic.txt @@ -71,3 +71,13 @@ Groups: Errors: -ENODEV: Getting or setting this register is not yet supported -EBUSY: One or more VCPUs are running + + KVM_DEV_ARM_VGIC_GRP_NR_IRQS + Attributes: + A value describing the number of interrupts (SGI, PPI and SPI) for + this GIC instance, ranging from 64 to 1024, in increments of 32. + + Errors: + -EINVAL: Value set is out of the expected range + -EBUSY: Value has already be set, or GIC has already been initialized + with default values. |