pvmfw: Use feasible iommus for device assignment test
This CL includes following fixes for preparing iommu validation with
token from hypervisor.
- Provide <android,pvmfw,phy-iommus> for device with iommus.
- Ensure #iommu-cells = <1>
- Ensure that (pvIOMMU, vSID) and (phys IOMMU ID, phys SID) have 1:1
mapping.
- Match number of pvIOMMU/vSID in FDT with VM DTBO's.
This CL doesn't fix <reg> to minimize change.
Bug: 277993056
Test: atest libpvmfw.device_assignment.test, launch protected VM
Change-Id: I3a6f600f0468bc24e818c1772bf8048ee4b41b11
diff --git a/pvmfw/Android.bp b/pvmfw/Android.bp
index c6befb4..42ff982 100644
--- a/pvmfw/Android.bp
+++ b/pvmfw/Android.bp
@@ -81,10 +81,10 @@
":test_pvmfw_devices_vm_dtbo",
":test_pvmfw_devices_vm_dtbo_without_symbols",
":test_pvmfw_devices_with_rng",
- ":test_pvmfw_devices_with_rng_iommu",
":test_pvmfw_devices_with_multiple_devices_iommus",
":test_pvmfw_devices_with_iommu_sharing",
":test_pvmfw_devices_with_iommu_id_conflict",
+ ":test_pvmfw_devices_without_iommus",
],
// To use libpvmfw_fdt_template for testing
enabled: false,
@@ -129,10 +129,10 @@
}
genrule {
- name: "test_pvmfw_devices_with_rng_iommu",
+ name: "test_pvmfw_devices_without_iommus",
defaults: ["dts_to_dtb"],
- srcs: ["testdata/test_pvmfw_devices_with_rng_iommu.dts"],
- out: ["test_pvmfw_devices_with_rng_iommu.dtb"],
+ srcs: ["testdata/test_pvmfw_devices_without_iommus.dts"],
+ out: ["test_pvmfw_devices_without_iommus.dtb"],
}
genrule {