Commit Graph

1058885 Commits

Author SHA1 Message Date
Will Deacon
bea4eea60a Revert "FROMGIT: KVM: arm64: Expose unshare hypercall to the host"
This reverts commit b45ecf7774.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I88682e661a42d8aabc0f5f46461b750e9206c6ea
2022-08-04 13:03:53 +00:00
Will Deacon
15cf0f0006 Revert "FROMGIT: KVM: arm64: pkvm: Unshare guest structs during teardown"
This reverts commit 12f8b6f54b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ie814f165936e4f01ab817a552f0f123275851bde
2022-08-04 13:03:53 +00:00
Will Deacon
70d632ccf1 Revert "FROMGIT: KVM: arm64: Drop unused workaround_flags vcpu field"
This reverts commit 79e8cbf51a.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I99bd979377c80340224a318874fff35c033bc417
2022-08-04 13:03:53 +00:00
Will Deacon
3fba2cc0c0 Revert "FROMGIT: KVM: arm64: vgic-v3: Fix vcpu index comparison"
This reverts commit d11273c6b3.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ibfdd432ac711a871576c40d25cce9af7a1233bac
2022-08-04 13:03:53 +00:00
Will Deacon
056550b1ed Revert "FROMGIT: KVM: arm64: vgic: Demote userspace-triggered console prints to kvm_debug()"
This reverts commit 60bd62a27a.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I18d82a911f6ab65b806eeb9894e72ba302ec779a
2022-08-04 13:03:53 +00:00
Will Deacon
1dc91f04a4 Revert "FROMGIT: KVM: arm64: Rework kvm_pgtable initialisation"
This reverts commit fc13bc019f.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ic4d8020f3f310623b55adc3dde3d4bcff237300a
2022-08-04 13:03:53 +00:00
Will Deacon
a361e63c61 Revert "FROMGIT: KVM: arm64: Fix comment typo in kvm_vcpu_finalize_sve()"
This reverts commit 90ee768cbc.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I00a761d776e554b5fa1c651a72e89062b8f13b98
2022-08-04 13:03:53 +00:00
Will Deacon
a7ff4a258c Revert "FROMGIT: KVM: arm64: vgic: Replace kernel.h with the necessary inclusions"
This reverts commit de680fdc4b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I9bb0ad2b102a3415d5a3e57bb3c07ca5b45985f7
2022-08-04 13:03:53 +00:00
Will Deacon
dca54686eb Revert "ANDROID: KVM: arm64: Introduce IOMMU driver infrastructure"
This reverts commit 5158bd95fe.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I409940ea93cec0c92368f1f0d8041361190c20e7
2022-08-04 13:03:53 +00:00
Will Deacon
6791d1a2c8 Revert "ANDROID: KVM: arm64: Add 'host_smc_handler' to kvm_iommu_ops"
This reverts commit ba27273db7.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Icbfae975bb34e96a9eaf4d0f8e5bbbad56237081
2022-08-04 13:03:53 +00:00
Will Deacon
35da9fb07b Revert "ANDROID: KVM: arm64: Add 'host_stage2_set_owner' to kvm_iommu_ops"
This reverts commit f51f6b5d26.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I985a3f0c01a5c05472b7381441c9144a78b0e3a8
2022-08-04 13:03:53 +00:00
Will Deacon
2c2b64e5b3 Revert "ANDROID: KVM: arm64: Add 'host_mmio_dabt_handler' to kvm_iommu_ops"
This reverts commit 565267794a.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I5b1129b0a71416675a15008157e7a7a98a343517
2022-08-04 13:03:53 +00:00
Will Deacon
09d1f2e4ff Revert "ANDROID: KVM: arm64: Add 'host_stage2_adjust_mmio_range' to kvm_iommu_ops"
This reverts commit 57454d3763.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I03d1c3da627c27e11606511bd95cba62ce95d588
2022-08-04 13:03:53 +00:00
Will Deacon
4ac24d87e9 Revert "ANDROID: dt-bindings: iommu: Add Google S2MPU"
This reverts commit f43970daf2.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I432c4a7edd850442c0e609e07320c164b03f4f42
2022-08-04 13:03:53 +00:00
Will Deacon
7101fee045 Revert "ANDROID: KVM: arm64: Create empty S2MPU driver"
This reverts commit d907ef4ba5.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ia5ff3af0762f01243ab6b39317d993c24933d6b8
2022-08-04 13:03:53 +00:00
Will Deacon
5f11cfb675 Revert "ANDROID: KVM: arm64: Parse S2MPU MMIO region"
This reverts commit 8827315de0.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I452bb1c9c729685355d34e074baf8b899fa774a8
2022-08-04 13:03:53 +00:00
Will Deacon
7f57318294 Revert "ANDROID: KVM: arm64: Read and check S2MPU_VERSION"
This reverts commit e850485374.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ib3390281dd569c34b92781eb8c5e261cd5a056f5
2022-08-04 13:03:53 +00:00
Will Deacon
27da5c847c Revert "ANDROID: KVM: arm64: Allocate context IDs for valid VIDs"
This reverts commit a74e3b10a1.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I7f74295b1353c6e10f4d61ce98e57b8d9d09a024
2022-08-04 13:03:53 +00:00
Will Deacon
f194ade76f Revert "ANDROID: KVM: arm64: Implement IRQ handler for S2MPU faults"
This reverts commit 4a75e1b060.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Iec816336b559f906ddd4e8477c6b81926d066f45
2022-08-04 13:03:53 +00:00
Will Deacon
6290d3f2d5 Revert "ANDROID: KVM: arm64: Copy S2MPU configuration to hyp"
This reverts commit 0ed6ef5469.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ie26957d74f1505cd2b28da4bae1b2673135a30f8
2022-08-04 13:03:53 +00:00
Will Deacon
20ea84d60f Revert "ANDROID: KVM: arm64: Enable S2MPUs in __pkvm_init_stage2_iommu"
This reverts commit f6b90bb6f5.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I70db912d943e890a3c6eb4bf072845d6778d8c45
2022-08-04 13:03:53 +00:00
Will Deacon
eefeeb6a68 Revert "ANDROID: KVM: arm64: Reprogram S2MPUs in 'host_smc_handler'"
This reverts commit 6a2df20712.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I4c033beff6273ee11e6a21d6e0d740218704c74f
2022-08-04 13:03:53 +00:00
Will Deacon
b44b7997ed Revert "ANDROID: KVM: arm64: Set up S2MPU Memory Protection Table"
This reverts commit 4bd76c88c5.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ic9b4b3997a66915da5299401c889ed668d3de2df
2022-08-04 13:03:53 +00:00
Will Deacon
7321f03379 Revert "ANDROID: KVM: arm64: Modify S2MPU MPT in 'host_stage2_set_owner'"
This reverts commit ce1b8ebce8.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I64e7e57f746da5f8b01d02f715efe37d6acc5a06
2022-08-04 13:03:53 +00:00
Will Deacon
8110d32251 Revert "ANDROID: KVM: arm64: Add S2MPU kselftest"
This reverts commit fa6ad0bcb8.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ia8c34ff1045944465fda40a62b68c366b393142e
2022-08-04 13:03:53 +00:00
Will Deacon
d192e9dd59 Revert "ANDROID: KVM: arm64: Unmap S2MPU MMIO regions in MPT"
This reverts commit b03ce007f9.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I890260dd0da31b642b0dc6bd0aa47b02e3eb2b43
2022-08-04 13:03:53 +00:00
Will Deacon
4544cc012a Revert "ANDROID: KVM: arm64: Implement MMIO handler in S2MPU driver"
This reverts commit 81e70911d6.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I3958d6ffebfff32038d3ce3af6c792220698f13f
2022-08-04 13:03:53 +00:00
Will Deacon
3d9e00e539 Revert "ANDROID: KVM: arm64: Unmap S2MPU MMIO registers from host stage-2"
This reverts commit 0fedf3dfd3.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I9ad97a3390a9af8b86f42f04965a08ac1232d592
2022-08-04 13:03:53 +00:00
Will Deacon
9b3628fd98 Revert "ANDROID: Enable KVM_S2MPU in gki_defconfig"
This reverts commit 2023f01461.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I3ddcbca7b4d1bd9bed4e9f92c7de6dde0903f82e
2022-08-04 13:03:53 +00:00
Will Deacon
b27f5f4394 Revert "ANDROID: KVM: arm64: Mark select_iommu_ops static"
This reverts commit 8d929114a7.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I2a4a2ff21296d2f2c274b2d392a26fd649b97e22
2022-08-04 13:03:53 +00:00
Will Deacon
8d1be014db Revert "ANDROID: KVM: arm64: Initialize pkvm_pgtable.mm_ops earlier"
This reverts commit e3bc721865.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I0f24937e19518bab92d7c649c6f87ec18eec2549
2022-08-04 13:03:53 +00:00
Will Deacon
31094eab00 Revert "Revert "ANDROID: KVM: arm64: Unmap S2MPU MMIO regions in MPT""
This reverts commit d52e3e4473.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I465cb99696ef1aba22a8cb575736b81773e47831
2022-08-04 13:03:53 +00:00
Will Deacon
5436ba5277 Revert "ANDROID: KVM: arm64: Remove kernel-doc in S2MPU driver"
This reverts commit f5a3444bf3.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I713a3f4e954e0a6730b169fd075914d64471cad1
2022-08-04 13:03:53 +00:00
Will Deacon
571f6ea647 Revert "ANDROID: KVM: arm64: Wait on S2MPU.STATUS after invalidation"
This reverts commit 89dc7c6b94.

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

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ifa6c14dffe0d3574772d26775ac7c964cbeeea55
2022-08-04 13:03:53 +00:00
Will Deacon
5bfe2b9511 Revert "ANDROID: KVM: arm64: Implement do_donate() helper for donating memory"
This reverts commit 7479c4b499.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I53d2151082d761c0102d2c29246436c53de88e0b
2022-08-04 13:03:53 +00:00
Will Deacon
79e165b8cc Revert "ANDROID: KVM: arm64: Implement hyp -> host memory donation"
This reverts commit 17086543c9.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ib5e25f606e69411178c933972266f278dbbef369
2022-08-04 13:03:53 +00:00
Will Deacon
326fb8d362 Revert "ANDROID: KVM: arm64: Add __pkvm_host_donate_hyp()"
This reverts commit 2c2efee64d.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Id6750257c04b3f63cfcb7ecd046b374ab29bac82
2022-08-04 13:03:53 +00:00
Will Deacon
607636d2eb Revert "ANDROID: KVM: arm64: Add __pkvm_hyp_donate_host()"
This reverts commit 394b00e804.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I2431d37b0e202fd38c5f7ffb84995d7aa6fccb9b
2022-08-04 13:03:53 +00:00
Will Deacon
168c93f276 Revert "ANDROID: KVM: arm64: Move hyp refcount manipulation helpers"
This reverts commit 91adb28087.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I2cc1c6377ad059f2e90916da20573cbc41cd19d2
2022-08-04 13:03:53 +00:00
Will Deacon
8b29f4a626 Revert "ANDROID: KVM: arm64: Back hyp_vmemmap for all of memory"
This reverts commit b047bd2325.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: If3f226371bae6419cbff922b13090061f5767d65
2022-08-04 13:03:53 +00:00
Will Deacon
8f3105d135 Revert "ANDROID: KVM: arm64: Add helpers to pin memory shared with hyp"
This reverts commit 8499e08c40.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I28d5e9344ffbb2f27fd1ef432dca29933bbd193b
2022-08-04 13:03:53 +00:00
Will Deacon
9bf320d18f Revert "ANDROID: KVM: arm64: Split up nvhe/fixed_config.h"
This reverts commit ba3a8a156d.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I257b4ce70d06b94e7c502d14f78774d0b2c6bf1f
2022-08-04 13:03:53 +00:00
Will Deacon
e77ce0a14d Revert "ANDROID: KVM: arm64: Trap debug break and watch from guest"
This reverts commit 9b08f9cf8e.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I12b04cb929fc891e8c6f06a86f1fe3d9e1f5db10
2022-08-04 13:03:53 +00:00
Will Deacon
d9cd49c2e1 Revert "ANDROID: KVM: arm64: FAR_EL2 mask as a define"
This reverts commit b72132ff31.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I4632fbed70e1cc4fa4c7009e2da93cdd8a7408d1
2022-08-04 13:03:53 +00:00
Will Deacon
7d1015fa9d Revert "ANDROID: KVM: arm64: Add hyp_spinlock_t static initializer"
This reverts commit b7ceb8bab7.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Id40d2098b3d9cfbe85bb83549e36dd2a1bdda503
2022-08-04 13:03:53 +00:00
Will Deacon
8e35b1cebb Revert "ANDROID: KVM: arm64: Fix initializing traps for protected VMs"
This reverts commit 03233fe45b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ieada5ccc1e2badebce286cc815de8380e5602849
2022-08-04 13:03:53 +00:00
Will Deacon
26c300dbe6 Revert "ANDROID: KVM: arm64: Move pstate reset values to kvm_arm.h"
This reverts commit 1d49d311c2.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ia6b0472de8de3d32487cec031c11411fe5822dd1
2022-08-04 13:03:53 +00:00
Will Deacon
7de2e597af Revert "ANDROID: KVM: arm64: Refactor reset_mpidr to extract its computation"
This reverts commit 6d967c004b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I5baf33fe3365651483a4f7172af170b0505bbbb2
2022-08-04 13:03:53 +00:00
Will Deacon
53bb9be307 Revert "ANDROID: KVM: arm64: Reset sysregs for protected VMs"
This reverts commit 9293478f7f.

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