Merge remote-tracking branch 'kiszka/master'

[jailhouse.git] / hypervisor / arch / x86 / include / asm / cell.h

diff --git a/hypervisor/arch/x86/include/asm/cell.h b/hypervisor/arch/x86/include/asm/cell.h
index 1671ef7607deb2216d9c9d606e9597b076c00cab..2223532a39c93f13cd7f771e646ea3da276b742e 100644 (file)
--- a/hypervisor/arch/x86/include/asm/cell.h
+++ b/hypervisor/arch/x86/include/asm/cell.h
@@ -18,13 +18,14 @@
 #include <jailhouse/paging.h>
 
 #include <jailhouse/cell-config.h>
-#include <jailhouse/hypercall.h>
 
-struct pci_device;
+struct cell_ioapic;
+
+/** x86-specific cell states. */
+struct arch_cell {
+       /** Buffer for the EPT/NPT root-level page table. */
+       u8 __attribute__((aligned(PAGE_SIZE))) root_table_page[PAGE_SIZE];
 
-/** Cell-related states. */
-/* TODO: factor out arch-independent bits, define struct arch_cell */
-struct cell {
        union {
                struct {
                        /** PIO access bitmap. */
@@ -32,6 +33,12 @@ struct cell {
                        /** Paging structures used for cell CPUs. */
                        struct paging_structures ept_structs;
                } vmx; /**< Intel VMX-specific fields. */
+               struct {
+                       /** I/O Permissions Map. */
+                       u8 *iopm;
+                       /** Paging structures used for cell CPUs and IOMMU. */
+                       struct paging_structures npt_iommu_structs;
+               } svm; /**< AMD SVM-specific fields. */
        };
 
        union {
@@ -44,50 +51,18 @@ struct cell {
                } vtd; /**< Intel VT-d specific fields. */
        };
 
-       /** ID of the cell. */
-       unsigned int id;
-       /** Number of pages used for storing cell-specific states and
-        * configuration data. */
-       unsigned int data_pages;
-       /** Pointer to static cell description. */
-       struct jailhouse_cell_desc *config;
-
-       /** Pointer to cell's CPU set. */
-       struct cpu_set *cpu_set;
-       /** Stores the cell's CPU set if small enough. */
-       struct cpu_set small_cpu_set;
-
-       /** True while the cell can be loaded by the root cell. */
-       bool loadable;
-
-       /** Pointer to next cell in the system. */
-       struct cell *next;
-
-       /** List of PCI devices assigned to this cell. */
-       struct pci_device *pci_devices;
-       /** List of PCI devices assigned to this cell that support MSI-X. */
-       struct pci_device *msix_device_list;
        /** Shadow value of PCI config space address port register. */
        u32 pci_addr_port_val;
 
-       /** Shadow value of IOAPIC index register. */
-       u32 ioapic_index_reg_val;
-       /** IOAPIC ID as used for interrupt remapping. */
-       u16 ioapic_id;
-       /** IOMMU unit responsible for the IOAPIC. */
-       u8 ioapic_iommu;
-       /** Bitmap of IOAPIC pins assigned to this cell. */
-       u64 ioapic_pin_bitmap;
+       /** List of IOAPICs assigned to this cell. */
+       struct cell_ioapic *ioapics;
+       /** Number of assigned IOAPICs. */
+       unsigned int num_ioapics;
 
-       union {
-               /** Communication region. */
-               struct jailhouse_comm_region comm_region;
-               /** Padding to full page size. */
-               u8 padding[PAGE_SIZE];
-       } __attribute__((aligned(PAGE_SIZE))) comm_page;
-       /**< Page containing the communication region (shared with cell). */
+       /** Class Of Service for cache allocation (Intel only). */
+       u32 cos;
+       /** Allocated L3 cache region (Intel only). */
+       u64 cat_mask;
 };
 
-extern struct cell root_cell;
-
 #endif /* !_JAILHOUSE_ASM_CELL_H */