diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2024-07-18 14:32:46 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2024-07-18 14:32:46 +1000 |
| commit | 9ff0251b2eb54d17fbe4f6aff50f6edfd837adb6 (patch) | |
| tree | 76fa15127c725cb4a2edb626a3843a3787ec5a3d /Documentation | |
| parent | 90e812ac40c4b813fdbafab22f426fe4cdf840a8 (diff) | |
| parent | ca8dad0415162efea3597abe06b2025f34213eb5 (diff) | |
Merge branch 'topic/ppc-kvm' into next
Merge the powerpc KVM topic branch.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/arch/powerpc/kvm-nested.rst | 4 | ||||
| -rw-r--r-- | Documentation/virt/kvm/api.rst | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/arch/powerpc/kvm-nested.rst b/Documentation/arch/powerpc/kvm-nested.rst index 630602a8aa00..5defd13cc6c1 100644 --- a/Documentation/arch/powerpc/kvm-nested.rst +++ b/Documentation/arch/powerpc/kvm-nested.rst @@ -546,7 +546,9 @@ table information. +--------+-------+----+--------+----------------------------------+ | 0x1052 | 0x08 | RW | T | CTRL | +--------+-------+----+--------+----------------------------------+ -| 0x1053-| | | | Reserved | +| 0x1053 | 0x08 | RW | T | DPDES | ++--------+-------+----+--------+----------------------------------+ +| 0x1054-| | | | Reserved | | 0x1FFF | | | | | +--------+-------+----+--------+----------------------------------+ | 0x2000 | 0x04 | RW | T | CR | diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst index a71d91978d9e..899480d4acaf 100644 --- a/Documentation/virt/kvm/api.rst +++ b/Documentation/virt/kvm/api.rst @@ -2439,8 +2439,11 @@ registers, find a list below: PPC KVM_REG_PPC_PSSCR 64 PPC KVM_REG_PPC_DEC_EXPIRY 64 PPC KVM_REG_PPC_PTCR 64 + PPC KVM_REG_PPC_HASHKEYR 64 + PPC KVM_REG_PPC_HASHPKEYR 64 PPC KVM_REG_PPC_DAWR1 64 PPC KVM_REG_PPC_DAWRX1 64 + PPC KVM_REG_PPC_DEXCR 64 PPC KVM_REG_PPC_TM_GPR0 64 ... PPC KVM_REG_PPC_TM_GPR31 64 |