github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-10 21:29:20 +00:00
Code Issues Projects Releases Wiki Activity

dm: Use new MMIO device passthrough management ioctls

Browse Source 
IC_ASSIGN_MMIODEV	->	ACRN_IOCTL_ASSIGN_MMIODEV
IC_DEASSIGN_MMIODEV	->	ACRN_IOCTL_DEASSIGN_MMIODEV

struct acrn_mmiodev has slight change. Move struct acrn_mmiodev into
acrn_common.h because it is used by both DM and HV.

Tracked-On: #6282
Signed-off-by: Shuo A Liu <shuo.a.liu@intel.com>
This commit is contained in:
Shuo A Liu
2021-07-07 16:54:26 +08:00
committed by wenlingz
parent 3625eb7a99
commit 9e7abbb38c
13 changed files with 61 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
misc/config_tools/data/generic_board/generic_code/hybrid/vm_configurations.c
View File

@@ -56,8 +56,8 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
.pt_tpm2 = true,
.mmiodevs[0] =
{
.base_gpa = VM0_TPM_BUFFER_BASE_ADDR_GPA,
.base_hpa = VM0_TPM_BUFFER_BASE_ADDR,
.user_vm_pa = VM0_TPM_BUFFER_BASE_ADDR_GPA,
.service_vm_pa = VM0_TPM_BUFFER_BASE_ADDR,
.size = VM0_TPM_BUFFER_SIZE,
},
#endif
@@ -65,8 +65,8 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
.pt_p2sb_bar = true,
.mmiodevs[0] =
{
.base_gpa = P2SB_BAR_ADDR_GPA,
.base_hpa = P2SB_BAR_ADDR,
.user_vm_pa = P2SB_BAR_ADDR_GPA,
.service_vm_pa = P2SB_BAR_ADDR,
.size = P2SB_BAR_SIZE,
},
#endif

8
misc/config_tools/data/generic_board/generic_code/hybrid_rt/vm_configurations.c
View File

@@ -59,8 +59,8 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
.pt_tpm2 = true,
.mmiodevs[0] =
{
.base_gpa = VM0_TPM_BUFFER_BASE_ADDR_GPA,
.base_hpa = VM0_TPM_BUFFER_BASE_ADDR,
.user_vm_pa = VM0_TPM_BUFFER_BASE_ADDR_GPA,
.service_vm_pa = VM0_TPM_BUFFER_BASE_ADDR,
.size = VM0_TPM_BUFFER_SIZE,
},
#endif
@@ -68,8 +68,8 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
.pt_p2sb_bar = true,
.mmiodevs[0] =
{
.base_gpa = P2SB_BAR_ADDR_GPA,
.base_hpa = P2SB_BAR_ADDR,
.user_vm_pa = P2SB_BAR_ADDR_GPA,
.service_vm_pa = P2SB_BAR_ADDR,
.size = P2SB_BAR_SIZE,
},
#endif

8
misc/config_tools/data/generic_board/generic_code/logical_partition/vm_configurations.c
View File

@@ -54,8 +54,8 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
.pt_tpm2 = true,
.mmiodevs[0] =
{
.base_gpa = VM0_TPM_BUFFER_BASE_ADDR_GPA,
.base_hpa = VM0_TPM_BUFFER_BASE_ADDR,
.user_vm_pa = VM0_TPM_BUFFER_BASE_ADDR_GPA,
.service_vm_pa = VM0_TPM_BUFFER_BASE_ADDR,
.size = VM0_TPM_BUFFER_SIZE,
},
#endif
@@ -63,8 +63,8 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
.pt_p2sb_bar = true,
.mmiodevs[0] =
{
.base_gpa = P2SB_BAR_ADDR_GPA,
.base_hpa = P2SB_BAR_ADDR,
.user_vm_pa = P2SB_BAR_ADDR_GPA,
.service_vm_pa = P2SB_BAR_ADDR,
.size = P2SB_BAR_SIZE,
},
#endif

8
misc/config_tools/scenario_config/vm_configurations_c.py
View File

@@ -340,8 +340,8 @@ def gen_pre_launch_vm(vm_type, vm_i, scenario_items, config):
print("#ifdef VM0_PASSTHROUGH_TPM", file=config)
print("\t\t.pt_tpm2 = true,", file=config)
print("\t\t.mmiodevs[0] = {", file=config)
print("\t\t\t.base_gpa = VM0_TPM_BUFFER_BASE_ADDR_GPA,", file=config)
print("\t\t\t.base_hpa = VM0_TPM_BUFFER_BASE_ADDR,", file=config)
print("\t\t\t.user_vm_pa = VM0_TPM_BUFFER_BASE_ADDR_GPA,", file=config)
print("\t\t\t.service_vm_pa = VM0_TPM_BUFFER_BASE_ADDR,", file=config)
print("\t\t\t.size = VM0_TPM_BUFFER_SIZE,", file=config)
print("\t\t},", file=config)
print("#endif", file=config)
@@ -350,8 +350,8 @@ def gen_pre_launch_vm(vm_type, vm_i, scenario_items, config):
print("#ifdef P2SB_BAR_ADDR", file=config)
print("\t\t.pt_p2sb_bar = true,", file=config)
print("\t\t.mmiodevs[0] = {", file=config)
print("\t\t\t.base_gpa = P2SB_BAR_ADDR_GPA,", file=config)
print("\t\t\t.base_hpa = P2SB_BAR_ADDR,", file=config)
print("\t\t\t.user_vm_pa = P2SB_BAR_ADDR_GPA,", file=config)
print("\t\t\t.service_vm_pa = P2SB_BAR_ADDR,", file=config)
print("\t\t\t.size = P2SB_BAR_SIZE,", file=config)
print("\t\t},", file=config)
print("#endif", file=config)

8
misc/config_tools/xforms/vm_configurations.c.xsl
View File

@@ -238,8 +238,8 @@
<xsl:value-of select="acrn:ifdef('VM0_PASSTHROUGH_TPM')" />
<xsl:value-of select="acrn:initializer('pt_tpm2', 'true')" />
<xsl:value-of select="acrn:initializer('mmiodevs[0]', '{', true())" />
<xsl:value-of select="acrn:initializer('base_gpa', 'VM0_TPM_BUFFER_BASE_ADDR_GPA')" />
<xsl:value-of select="acrn:initializer('base_hpa', 'VM0_TPM_BUFFER_BASE_ADDR')" />
<xsl:value-of select="acrn:initializer('user_vm_pa', 'VM0_TPM_BUFFER_BASE_ADDR_GPA')" />
<xsl:value-of select="acrn:initializer('service_vm_pa', 'VM0_TPM_BUFFER_BASE_ADDR')" />
<xsl:value-of select="acrn:initializer('size', 'VM0_TPM_BUFFER_SIZE')" />
<xsl:text>},</xsl:text>
<xsl:value-of select="$newline" />
@@ -247,8 +247,8 @@
<xsl:value-of select="acrn:ifdef('P2SB_BAR_ADDR')" />
<xsl:value-of select="acrn:initializer('pt_p2sb_bar', 'true')" />
<xsl:value-of select="acrn:initializer('mmiodevs[0]', '{', true())" />
<xsl:value-of select="acrn:initializer('base_gpa', 'P2SB_BAR_ADDR_GPA')" />
<xsl:value-of select="acrn:initializer('base_hpa', 'P2SB_BAR_ADDR')" />
<xsl:value-of select="acrn:initializer('user_vm_pa', 'P2SB_BAR_ADDR_GPA')" />
<xsl:value-of select="acrn:initializer('service_vm_pa', 'P2SB_BAR_ADDR')" />
<xsl:value-of select="acrn:initializer('size', 'P2SB_BAR_SIZE')" />
<xsl:text>},</xsl:text>
<xsl:value-of select="$newline" />