Signed-off-by: Andrea Bastoni <[email protected]>
---
configs/arm64/qemu-arm64.c | 1 -
configs/arm64/zynqmp-zcu102.c | 1 -
driver/cell.h | 1 -
driver/main.c | 10 ----------
hypervisor/arch/arm64/coloring.c | 3 ---
hypervisor/arch/arm64/include/asm/coloring.h | 6 +-----
include/jailhouse/cell-config.h | 2 --
7 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/configs/arm64/qemu-arm64.c b/configs/arm64/qemu-arm64.c
index ff4bcb25..8e6e46fd 100644
--- a/configs/arm64/qemu-arm64.c
+++ b/configs/arm64/qemu-arm64.c
@@ -46,7 +46,6 @@ struct {
.pci_domain = 1,
.color = {
.way_size = 0x20000,
- .root_map_offset = 0x0C000000000,
},
.arm = {
.gic_version = 3,
diff --git a/configs/arm64/zynqmp-zcu102.c b/configs/arm64/zynqmp-zcu102.c
index 0d721e63..2095762a 100644
--- a/configs/arm64/zynqmp-zcu102.c
+++ b/configs/arm64/zynqmp-zcu102.c
@@ -47,7 +47,6 @@ struct {
.pci_domain = -1,
.color = {
.way_size = 0x10000,
- .root_map_offset = 0x0C000000000,
},
.iommu_units = {
{
diff --git a/driver/cell.h b/driver/cell.h
index 51afe6d8..92afbff8 100644
--- a/driver/cell.h
+++ b/driver/cell.h
@@ -32,7 +32,6 @@ struct cell {
cpumask_t cpus_assigned;
u32 num_memory_regions;
struct jailhouse_memory *memory_regions;
- u64 color_root_map_offset;
#ifdef CONFIG_PCI
u32 num_pci_devices;
struct jailhouse_pci_device *pci_devices;
diff --git a/driver/main.c b/driver/main.c
index 50f7c25c..56955e73 100644
--- a/driver/main.c
+++ b/driver/main.c
@@ -362,16 +362,6 @@ console_free_out:
return ret;
}
-static inline void jailhouse_init_color_params(
- struct jailhouse_system *config,
- struct cell *root)
-{
- /* coloring temporary load-mapping address */
- root->color_root_map_offset =
- config->platform_info.color.root_map_offset;
-}
-
-
/* See Documentation/bootstrap-interface.txt */
static int jailhouse_cmd_enable(struct jailhouse_system __user *arg)
{
diff --git a/hypervisor/arch/arm64/coloring.c b/hypervisor/arch/arm64/coloring.c
index c066ae24..cc259aee 100644
--- a/hypervisor/arch/arm64/coloring.c
+++ b/hypervisor/arch/arm64/coloring.c
@@ -30,9 +30,6 @@
*/
u64 coloring_way_size = 0;
-/** Temporary load-mapping parameter */
-u64 coloring_root_map_offset = 0;
-
static inline int coloring_mem_destroy(struct cell *cell,
struct jailhouse_memory *mr)
{
diff --git a/hypervisor/arch/arm64/include/asm/coloring.h
b/hypervisor/arch/arm64/include/asm/coloring.h
index 9cb50889..7df19acb 100644
--- a/hypervisor/arch/arm64/include/asm/coloring.h
+++ b/hypervisor/arch/arm64/include/asm/coloring.h
@@ -42,9 +42,6 @@
*/
extern u64 coloring_way_size;
-/** Temporary load-mapping parameter */
-extern u64 coloring_root_map_offset;
-
/**
* Colored operations on a cell / memory region.
*
@@ -73,8 +70,7 @@ static inline void arm_color_init(void)
{
coloring_way_size = system_config->platform_info.color.way_size;
- printk("Init Coloring: Way size: 0x%llx, TMP load addr: 0x%llx\n",
- coloring_way_size, coloring_root_map_offset);
+ printk("Init Coloring: Way size: 0x%llx\n", coloring_way_size);
}
/* ------------------------- COLORING API ---------------------------------- */
diff --git a/include/jailhouse/cell-config.h b/include/jailhouse/cell-config.h
index af5b5098..6fe2f016 100644
--- a/include/jailhouse/cell-config.h
+++ b/include/jailhouse/cell-config.h
@@ -135,8 +135,6 @@ struct jailhouse_memory {
struct jailhouse_coloring {
/* Size of a way to use for coloring, preferred to autoconfig */
__u64 way_size;
- /* Temp offset in the root cell to simplify loading of colored cells */
- __u64 root_map_offset;
} __attribute__((packed));
#define JAILHOUSE_SHMEM_NET_REGIONS(start, dev_id) \
--
2.29.2
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/jailhouse-dev/20210125120044.56794-22-andrea.bastoni%40tum.de.
