Commit Graph

1058748 Commits

Author SHA1 Message Date
Will Deacon
7aaba75643 Revert "ANDROID: KVM: arm64: relay entropy requests from protected guests directly to secure"
This reverts commit 888643ea37.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Id3a09089934bf4aa1ad283d79cf8710bab9775d5
2022-08-04 13:03:53 +00:00
Will Deacon
a423f8b8b9 Revert "FROMLIST: dt-bindings: reserved-memory: Open Profile for DICE"
This reverts commit e286af3957.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I9b5bedd4d0fd10c30e9158ebcd9dfb5210ec8fd3
2022-08-04 13:03:53 +00:00
Will Deacon
3a47c1e2eb Revert "BACKPORT: FROMLIST: misc: open-dice: Add driver to expose DICE data to userspace"
This reverts commit 3251a051a2.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I3a7d2aecc2dc96b7a48d03d0644b4dec850759c8
2022-08-04 13:03:53 +00:00
Will Deacon
f0bb493a44 Revert "Revert "ANDROID: KVM: arm64: Avoid switching to guest context if guest is already loaded""
This reverts commit 6b08ae02c5.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I550d659aa6cd77c20873b403e7c2bd813502d8b7
2022-08-04 13:03:53 +00:00
Will Deacon
e335a5c33a Revert "ANDROID: KVM: arm64: Support TLB invalidation in guest context"
This reverts commit aebaed988e.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I8732335d95041c194cfdf81ce2c0a1bc6faa8281
2022-08-04 13:03:53 +00:00
Will Deacon
07ee4340b4 Revert "ANDROID: KVM: arm64: Fix vcpu sys_reg accessors when running with VHE"
This reverts commit 93b08c26e7.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I6ad61d8b6c9d6b89d58bc177e758298a01299b8a
2022-08-04 13:03:53 +00:00
Will Deacon
0856645276 Revert "ANDROID: KVM: arm64: pkvm: Force injection of a data abort on NISV MMIO exit"
This reverts commit 4132be368b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ia078dc3315657144a417a97d4d60c3e5fb507271
2022-08-04 13:03:53 +00:00
Will Deacon
a4116dedf3 Revert "Revert "FROMLIST: KVM: arm64: pkvm: Use the mm_ops indirection for cache maintenance""
This reverts commit 9cc414ef88.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I03aba4c1579d8a8190efb7febfb0c9adcd7d2681
2022-08-04 13:03:53 +00:00
Will Deacon
dfdce47932 Revert "FROMGIT: KVM: arm64: pkvm: Use the mm_ops indirection for cache maintenance"
This reverts commit 6cb32aeea6.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I3297de2565bb6f2fa6bf944389c0938cebe5288c
2022-08-04 13:03:53 +00:00
Will Deacon
59717a815b Revert "FROMGIT: KVM: arm64: vgic-v3: Restrict SEIS workaround to known broken systems"
This reverts commit 180087cfb4.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I80e57c5a365bc5aa4eb587257ede31ccfc0050bc
2022-08-04 13:03:53 +00:00
Will Deacon
32a4500ae9 Revert "FROMGIT: KVM: arm64: Use shadow SPSR_EL1 when injecting exceptions on !VHE"
This reverts commit bb60015aac.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ie48017ceed392c53ab6d32f4c7e5763a4aa33b8e
2022-08-04 13:03:53 +00:00
Will Deacon
b16deb89e1 Revert "Revert "FROMLIST: dt-bindings: reserved-memory: Open Profile for DICE""
This reverts commit 13758e91c1.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I0ba0a14613a966ca1a6835db6944149ef92b27e9
2022-08-04 13:03:53 +00:00
Will Deacon
c55ad1ad28 Revert "Revert "BACKPORT: FROMLIST: misc: open-dice: Add driver to expose DICE data to userspace""
This reverts commit 7a02bab109.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Iec2c188b95647908577cab2415c4e87c58651788
2022-08-04 13:03:53 +00:00
Will Deacon
c6a47581dd Revert "FROMLIST: dt-bindings: reserved-memory: Open Profile for DICE"
This reverts commit 684b273516.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I36cb3840e447015f3cc2be309999949634ea91da
2022-08-04 13:03:53 +00:00
Will Deacon
1563deffce Revert "BACKPORT: FROMLIST: misc: open-dice: Add driver to expose DICE data to userspace"
This reverts commit 784db42db8.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Id740b1c0b995fc9c69f57a3017c189ebf1e6c7ca
2022-08-04 13:03:53 +00:00
Will Deacon
e28f00e107 Revert "ANDROID: KVM: arm64: Don't remove shadow table entry twice on teardown"
This reverts commit 9515eed842.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ia2fc456c8a6f43c95daf41a78de7e29321f252dc
2022-08-04 13:03:53 +00:00
Will Deacon
c92fde7c79 Revert "ANDROID: KVM: arm64: pkvm: Prevent the donation of no-map pages"
This reverts commit 2270e9af6b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I2eccd8ae8d15721e75334ead675a8c27235a5865
2022-08-04 13:03:53 +00:00
Will Deacon
1c13daec02 Revert "ANDROID: firmware: arm_ffa: Move constants to header file"
This reverts commit 905f49d35b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I057a34c49e5e3fd1f44f1f770aee848df6a19289
2022-08-04 13:03:53 +00:00
Will Deacon
12749a81ca Revert "ANDROID: firmware: arm_ffa: Move comment before the field it is documenting"
This reverts commit 1c0baeb7f0.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ia33d00daec02d055a281b4f80372dabfe6834f3b
2022-08-04 13:03:53 +00:00
Will Deacon
794e114269 Revert "ANDROID: KVM: arm64: Include asm/kvm_mmu.h in nvhe/mem_protect.h"
This reverts commit 80d49439ea.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Id17526a0ea6ae3438e3da4772b8fd1508f6ca240
2022-08-04 13:03:53 +00:00
Will Deacon
07e24d0bc7 Revert "ANDROID: BACKPORT: KVM: arm64: Block unsafe FF-A calls from the host"
This reverts commit c63757defd.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I6ab696c6ec7f60828061e0bbf2a2466a1b641340
2022-08-04 13:03:53 +00:00
Will Deacon
5b19ef7a56 Revert "ANDROID: KVM: arm64: Probe FF-A version and host/hyp partition ID during init"
This reverts commit 2c234836ad.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I8ef63d69c263d239d2f7a3713658087cb883dbc3
2022-08-04 13:03:53 +00:00
Will Deacon
7d492d973b Revert "ANDROID: KVM: arm64: Handle FFA_FEATURES call from the host"
This reverts commit 1bdc86f0b0.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I76878683c00557b16cdc43b12abffa5a6afb9dcb
2022-08-04 13:03:53 +00:00
Will Deacon
9c27aa05d6 Revert "ANDROID: KVM: arm64: Allocate pages for hypervisor FF-A mailboxes"
This reverts commit 868e8504cc.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I0eddecd8d5bc4d3c30899dd95cfffd3436b17663
2022-08-04 13:03:53 +00:00
Will Deacon
b422db4c25 Revert "ANDROID: KVM: arm64: Handle FFA_RXTX_MAP and FFA_RXTX_UNMAP calls from the host"
This reverts commit 64eaaad40f.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I396947e13f07258c59915e47fb7fee8b619dd9e3
2022-08-04 13:03:53 +00:00
Will Deacon
08829d5415 Revert "ANDROID: BACKPORT: KVM: arm64: Add FF-A helpers to share/unshare memory with secure world"
This reverts commit 1b4277a049.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: If736d67f0ff4d8f9f62af6bd1a2b9e341ee5afcf
2022-08-04 13:03:53 +00:00
Will Deacon
95c89c1594 Revert "ANDROID: KVM: arm64: Handle FFA_MEM_SHARE calls from the host"
This reverts commit ad2b2b869f.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I3b2f7906eeec0405e841cd3736378ac9e5de4df4
2022-08-04 13:03:53 +00:00
Will Deacon
d63be4bfc3 Revert "ANDROID: KVM: arm64: Handle FFA_MEM_RECLAIM calls from the host"
This reverts commit 08be3bcb7e.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Iba02b0f85cc97c32994a5c72345535a9f970f7b6
2022-08-04 13:03:53 +00:00
Will Deacon
40c405c071 Revert "ANDROID: KVM: arm64: Handle FFA_MEM_LEND calls from the host"
This reverts commit 1b0f98a2c2.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I745faba81b1d2108e4b850b8438dce7e0ff132f1
2022-08-04 13:03:53 +00:00
Will Deacon
955aa35d9d Revert "ANDROID: KVM: arm64: pkvm: Add support for fragmented FF-A descriptors"
This reverts commit 81581c794a.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I6188ee42f9324eb41f12be0eae5b83c8ce2e359d
2022-08-04 13:03:53 +00:00
Will Deacon
4cf007bc65 Revert "ANDROID: KVM: arm64: Don't repaint PSCI SYSTEM_RESET to SYSTEM_OFF"
This reverts commit c96767cc24.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I9352e7ad2a8fb088fd63d3243cea24dfcb11ca7a
2022-08-04 13:03:53 +00:00
Will Deacon
96c5df4973 Revert "FROMLIST: KVM: arm64: Bump guest PSCI version to 1.1"
This reverts commit b5c4401843.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ic91d43d8d7fe81554c3a8c7e1b576a4c280ad611
2022-08-04 13:03:53 +00:00
Will Deacon
4c29fddedd Revert "FROMLIST: KVM: arm64: Expose PSCI SYSTEM_RESET2 call to the guest"
This reverts commit 25aa354adb.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I2fe4cc1a129872e0cd5d65ae974a358b23895526
2022-08-04 13:03:53 +00:00
Will Deacon
fb05e4fb48 Revert "FROMLIST: BACKPORT: KVM: arm64: Indicate SYSTEM_RESET2 in kvm_run::system_event flags field"
This reverts commit 1cff9a26fc.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Iebfafe1890f2d3c07218d3345f7d3d65af03b127
2022-08-04 13:03:53 +00:00
Will Deacon
f775f87d16 Revert "ANDROID: KVM: arm64: Forward PSCI SYSTEM_RESET2 calls back to the host"
This reverts commit 5cf72b4387.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ic9ae70a170bf7faa2619a4ac8293f900a5b6912b
2022-08-04 13:03:53 +00:00
Will Deacon
b30213b95f Revert "ANDROID: KVM: arm64: Don't expose TLBI hypercalls after de-privilege"
This reverts commit a4719cfb57.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I01d90d9c9effdec0d5923c87819e3168a4b32175
2022-08-04 13:03:53 +00:00
Will Deacon
375387ce16 Revert "ANDROID: KVM: arm64: Fix host MMIO DABT handler IPA"
This reverts commit 9eab20c98f.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I0e88e392cd364a2a1e8c6d2a3fef20aea135ba3f
2022-08-04 13:03:53 +00:00
Will Deacon
8fd570f1a8 Revert "ANDROID: KVM: arm64: Clear pvmfw pages on clean host shutdown"
This reverts commit e3b73a4b5e.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I406a474c879d2fe44b850fd25262a70a561a5567
2022-08-04 13:03:53 +00:00
Will Deacon
03abbd72a3 Revert "ANDROID: KVM: arm64: Memory donated for shadow state must be aligned"
This reverts commit 50d8a0882d.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I75ca42ba22f416eb17aaf61aa209afaced595f1c
2022-08-04 13:03:53 +00:00
Will Deacon
c93313e2b6 Revert "ANDROID: KVM: arm64: Only call kvm_shadow_destroy() in protected mode"
This reverts commit 0863f25b5d.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I62a13366e694441b688d6555fe8a19cb6552c031
2022-08-04 13:03:53 +00:00
Will Deacon
07dac217ae Revert "ANDROID: KVM: arm64: Do not pass host struct pointers to kvm_arch_vcpu_load()"
This reverts commit ab9f8c8200.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I86c1cceabbc4b73beeac96279056da86d8443a2c
2022-08-04 13:03:53 +00:00
Will Deacon
8e1ed1cf82 Revert "ANDROID: KVM: arm64: move kvm_shadow_destroy to pkvm.c for symmetry with create_el2_shadow"
This reverts commit aaf5614200.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: If565eea895d34a27d2633d707c5faa17d66e6382
2022-08-04 13:03:53 +00:00
Will Deacon
52a268ea87 Revert "ANDROID: KVM: arm64: Do not pass host struct pointers to __pkvm_teardown_shadow()"
This reverts commit 0856ec2e53.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I994e06c090d65f16ca663e517950b681cbcdc7a1
2022-08-04 13:03:53 +00:00
Will Deacon
37fca1139e Revert "ANDROID: KVM: arm64: Do not pass host struct pointers to pkvm_host_donate_guest()"
This reverts commit 579e21a96c.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: If7ccfaea098fa2abcc48b96f392ed24cd7b79f3d
2022-08-04 13:03:53 +00:00
Will Deacon
497c7db99e Revert "ANDROID: KVM: arm64: Refactor __sync_vcpu_state()"
This reverts commit 13a11f2073.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I257360d510bce73651682601c2a0b772d9e61593
2022-08-04 13:03:53 +00:00
Will Deacon
f9125fdfbd Revert "ANDROID: KVM: arm64: Do not pass host struct pointers to pkvm_vcpu_sync_state()"
This reverts commit 6733943e55.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I074a996bc6344119c6edb732ae86d230f4f1ad35
2022-08-04 13:03:53 +00:00
Will Deacon
693838c85e Revert "ANDROID: KVM: arm64: Do not pass host struct pointers to pkvm_vcpu_put()"
This reverts commit 0e6b940fce.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I9224bc31e330d201c5fe13b5bfe92fdcc270fcd9
2022-08-04 13:03:53 +00:00
Will Deacon
3fa7323143 Revert "ANDROID: KVM: arm64: Change variable names to avoid confusing size and count"
This reverts commit 7ab22b914d.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I2fc71418a9145b7a548d15f790509e591b3e5811
2022-08-04 13:03:53 +00:00
Will Deacon
717816658d Revert "ANDROID: KVM: arm64: Do not use kvm.created_vcpus to track the number of pinned vcpus"
This reverts commit 5897711b74.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ide48f5a4ed7f1fca9e82b7fcf88ee4f92e7026ba
2022-08-04 13:03:53 +00:00
Will Deacon
846dfa1ddd Revert "ANDROID: KVM: arm64: get_shadow_vcpu()'s vcpu_idx should be unsigned"
This reverts commit 29e2f13805.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I5f56923c8681390124ecc8e0afd523284da5ba1d
2022-08-04 13:03:53 +00:00