AMD IOMMU: Rework of interrupt remapping
PATCH 1/1 AMD IOMMU: Rework of interrupt remapping
Hi,
Attached patch reworks interrupt remapping for following purposes:
1) Parsing IVRS special device entry in order to handle ioapic remapping correctly.
2) Allocating per-device interrupt remapping tables instead of using a global interrupt remapping table.
3) Some system devices like io-apic for north-bridge cannot be discovered during pci device enumeration procedure. To remap interrupt of those devices, device table update is splitted into 2 steps, so that interrupt tables can be bound to device table entry earlier than I/O page tables.
Thanks,
-Wei
Signature · 11 lines
AMD GmbH, Germany Operating System Research Center Legal Information: Advanced Micro Devices GmbH Karl-Hammerschmidt-Str. 34 85609 Dornach b. München Geschäftsführer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis München Registergericht München, HRB Nr. 43632
xen/drivers/passthrough/amd/iommu_acpi.c +92 -63
@@ -28,6 +28,51 @@ extern unsigned short ivrs_bdf_entries;extern unsigned short ivrs_bdf_entries;extern struct ivrs_mappings *ivrs_mappings;extern unsigned short last_bdf; +extern int ioapic_bdf[MAX_IO_APICS ]; + +static void add_ivrs_mapping_entry ( +u16 bdf,u16 alias_id,u8 flags,struct amd_iommu *iommu) +{ +u8 sys_mgt, lint1_pass, lint0_pass, nmi_pass, ext_int_pass, init_pass; +ASSERT ( ivrs_mappings !=NULL ); + +/* setup requestor id */ + ivrs_mappings[bdf].dte_requestor_id = alias_id; + +/* override flags for range of devices */ + sys_mgt =get_field_from_byte (flags, +AMD_IOMMU_ACPI_SYS_MGT_MASK , +AMD_IOMMU_ACPI_SYS_MGT_SHIFT ); + lint1_pass =get_field_from_byte (flags, +AMD_IOMMU_ACPI_LINT1_PASS_MASK , +AMD_IOMMU_ACPI_LINT1_PASS_SHIFT ); + lint0_pass =get_field_from_byte (flags, +AMD_IOMMU_ACPI_LINT0_PASS_MASK , +AMD_IOMMU_ACPI_LINT0_PASS_SHIFT ); + nmi_pass =get_field_from_byte (flags, +AMD_IOMMU_ACPI_NMI_PASS_MASK , +AMD_IOMMU_ACPI_NMI_PASS_SHIFT ); + ext_int_pass =get_field_from_byte (flags, +AMD_IOMMU_ACPI_EINT_PASS_MASK , +AMD_IOMMU_ACPI_EINT_PASS_SHIFT ); + init_pass =get_field_from_byte (flags, +AMD_IOMMU_ACPI_INIT_PASS_MASK , +AMD_IOMMU_ACPI_INIT_PASS_SHIFT ); + + ivrs_mappings[bdf].dte_sys_mgt_enable = sys_mgt; + ivrs_mappings[bdf].dte_lint1_pass = lint1_pass; + ivrs_mappings[bdf].dte_lint0_pass = lint0_pass; + ivrs_mappings[bdf].dte_nmi_pass = nmi_pass; + ivrs_mappings[bdf].dte_ext_int_pass = ext_int_pass; + ivrs_mappings[bdf].dte_init_pass = init_pass; + +/* allocate per-device interrupt remapping table */ +if ( ivrs_mappings[alias_id].intremap_table ==NULL ) + ivrs_mappings[alias_id].intremap_table = +amd_iommu_alloc_intremap_table (); +/* assgin iommu hardware */ + ivrs_mappings[bdf].iommu = iommu; +}static struct amd_iommu *__init find_iommu_from_bdf_cap (u16 bdf,u8 cap_offset)
@@ -131,11 +176,9 @@ static int __init register_exclusion_ran {unsigned long range_top, iommu_top, length;struct amd_iommu *iommu; -u16 bus, devfn, req; - - bus = bdf >>8 ; - devfn = bdf &0xFF ; - iommu =find_iommu_for_device (bus, devfn); +u16 req; + + iommu =find_iommu_for_device (bdf);if ( !iommu ) {amd_iov_error ("IVMD Error: No IOMMU for Dev_Id 0x%x!\n" , bdf);
@@ -176,7 +219,7 @@ static int __init register_exclusion_ran unsigned long base, unsigned long limit, u8 iw, u8 ir) { unsigned long range_top, iommu_top, length; -u16 bus, devfn, bdf, req; +u16 bdf, req;/* is part of exclusion range inside of IOMMU virtual address space? */ /* note: 'limit' parameter is assumed to be page-aligned */
@@ -191,9 +234,7 @@ static int __init register_exclusion_ran/* note: these entries are part of the exclusion range */ for ( bdf =0 ; bdf < ivrs_bdf_entries; bdf++ ) { - bus = bdf >>8 ; - devfn = bdf &0xFF ; -if ( iommu ==find_iommu_for_device (bus, devfn) ) +if ( iommu ==find_iommu_for_device (bdf) ) {reserve_unity_map_for_device (bdf, base, length, iw, ir); req = ivrs_mappings[bdf].dte_requestor_id;
@@ -367,12 +408,7 @@ static u16 __init parse_ivhd_device_selereturn 0 ; } -/* override flags for device */ - ivrs_mappings[bdf].dte_sys_mgt_enable = -get_field_from_byte (ivhd_device->header.flags, -AMD_IOMMU_ACPI_SYS_MGT_MASK , -AMD_IOMMU_ACPI_SYS_MGT_SHIFT ); - ivrs_mappings[bdf].iommu = iommu; +add_ivrs_mapping_entry (bdf, bdf, ivhd_device->header.flags, iommu);return sizeof (struct acpi_ivhd_device_header ); }
@@ -382,7 +418,6 @@ static u16 __init parse_ivhd_device_rang u16 header_length, u16 block_length, struct amd_iommu *iommu) { u16 dev_length, first_bdf, last_bdf, bdf; -u8 sys_mgt; dev_length =sizeof (struct acpi_ivhd_device_range );if ( header_length < (block_length + dev_length) )
@@ -418,15 +453,8 @@ static u16 __init parse_ivhd_device_rangamd_iov_info (" Dev_Id Range: 0x%x -> 0x%x\n" , first_bdf, last_bdf); -/* override flags for range of devices */ - sys_mgt =get_field_from_byte (ivhd_device->header.flags, -AMD_IOMMU_ACPI_SYS_MGT_MASK , -AMD_IOMMU_ACPI_SYS_MGT_SHIFT );for ( bdf = first_bdf; bdf <= last_bdf; bdf++ ) - { - ivrs_mappings[bdf].dte_sys_mgt_enable = sys_mgt; - ivrs_mappings[bdf].iommu = iommu; - } +add_ivrs_mapping_entry (bdf, bdf, ivhd_device->header.flags, iommu);return dev_length; }
@@ -460,17 +488,7 @@ static u16 __init parse_ivhd_device_aliaamd_iov_info (" Dev_Id Alias: 0x%x\n" , alias_id); -/* override requestor_id and flags for device */ - ivrs_mappings[bdf].dte_requestor_id = alias_id; - ivrs_mappings[bdf].dte_sys_mgt_enable = -get_field_from_byte (ivhd_device->header.flags, -AMD_IOMMU_ACPI_SYS_MGT_MASK , -AMD_IOMMU_ACPI_SYS_MGT_SHIFT ); - ivrs_mappings[bdf].iommu = iommu; - - ivrs_mappings[alias_id].dte_sys_mgt_enable = - ivrs_mappings[bdf].dte_sys_mgt_enable; - ivrs_mappings[alias_id].iommu = iommu; +add_ivrs_mapping_entry (bdf, alias_id, ivhd_device->header.flags, iommu);return dev_length; }
@@ -481,7 +499,6 @@ static u16 __init parse_ivhd_device_alia {u16 dev_length, first_bdf, last_bdf, alias_id, bdf; -u8 sys_mgt; dev_length =sizeof (struct acpi_ivhd_device_alias_range );if ( header_length < (block_length + dev_length) )
@@ -525,18 +542,8 @@ static u16 __init parse_ivhd_device_aliaamd_iov_info (" Dev_Id Range: 0x%x -> 0x%x\n" , first_bdf, last_bdf);amd_iov_info (" Dev_Id Alias: 0x%x\n" , alias_id); -/* override requestor_id and flags for range of devices */ - sys_mgt =get_field_from_byte (ivhd_device->header.flags, -AMD_IOMMU_ACPI_SYS_MGT_MASK , -AMD_IOMMU_ACPI_SYS_MGT_SHIFT );for ( bdf = first_bdf; bdf <= last_bdf; bdf++ ) - { - ivrs_mappings[bdf].dte_requestor_id = alias_id; - ivrs_mappings[bdf].dte_sys_mgt_enable = sys_mgt; - ivrs_mappings[bdf].iommu = iommu; - } - ivrs_mappings[alias_id].dte_sys_mgt_enable = sys_mgt; - ivrs_mappings[alias_id].iommu = iommu; +add_ivrs_mapping_entry (bdf, alias_id, ivhd_device->header.flags, iommu);return dev_length; }
@@ -561,12 +568,7 @@ static u16 __init parse_ivhd_device_extereturn 0 ; } -/* override flags for device */ - ivrs_mappings[bdf].dte_sys_mgt_enable = -get_field_from_byte (ivhd_device->header.flags, -AMD_IOMMU_ACPI_SYS_MGT_MASK , -AMD_IOMMU_ACPI_SYS_MGT_SHIFT ); - ivrs_mappings[bdf].iommu = iommu; +add_ivrs_mapping_entry (bdf, bdf, ivhd_device->header.flags, iommu);return dev_length; }
@@ -576,7 +578,6 @@ static u16 __init parse_ivhd_device_exte u16 header_length, u16 block_length, struct amd_iommu *iommu) { u16 dev_length, first_bdf, last_bdf, bdf; -u8 sys_mgt; dev_length =sizeof (struct acpi_ivhd_device_extended_range );if ( header_length < (block_length + dev_length) )
@@ -613,16 +614,35 @@ static u16 __init parse_ivhd_device_exteamd_iov_info (" Dev_Id Range: 0x%x -> 0x%x\n" , first_bdf, last_bdf); -/* override flags for range of devices */ - sys_mgt =get_field_from_byte (ivhd_device->header.flags, -AMD_IOMMU_ACPI_SYS_MGT_MASK , -AMD_IOMMU_ACPI_SYS_MGT_SHIFT );for ( bdf = first_bdf; bdf <= last_bdf; bdf++ ) - { - ivrs_mappings[bdf].dte_sys_mgt_enable = sys_mgt; - ivrs_mappings[bdf].iommu = iommu; - } - +add_ivrs_mapping_entry (bdf, bdf, ivhd_device->header.flags, iommu); + +return dev_length; +} + +static u16 __init parse_ivhd_device_special ( +union acpi_ivhd_device *ivhd_device, +u16 header_length,u16 block_length,struct amd_iommu *iommu) +{ +u16 dev_length, bdf; + + dev_length =sizeof (struct acpi_ivhd_device_special ); +if ( header_length < (block_length + dev_length) ) + { +amd_iov_error ("IVHD Error: Invalid Device_Entry Length!\n" ); +return 0 ; + } + + bdf = ivhd_device->special.dev_id; +if ( bdf >= ivrs_bdf_entries ) + { +amd_iov_error ("IVHD Error: Invalid Device_Entry Dev_Id 0x%x\n" , bdf); +return 0 ; + } + +add_ivrs_mapping_entry (bdf, bdf, ivhd_device->header.flags, iommu); +/* set device id of ioapic */ + ioapic_bdf[ivhd_device->special.handle] = bdf;return dev_length; }
@@ -698,6 +718,11 @@ static int __init parse_ivhd_block(strucbreak ;case AMD_IOMMU_ACPI_IVHD_DEV_EXT_RANGE : dev_length =parse_ivhd_device_extended_range ( + ivhd_device, + ivhd_block->header.length, block_length, iommu); +break ; +case AMD_IOMMU_ACPI_IVHD_DEV_SPECIAL : + dev_length =parse_ivhd_device_special ( ivhd_device, ivhd_block->header.length, block_length, iommu);break ;
@@ -911,6 +936,10 @@ static int __init get_last_bdf_ivhd(void UPDATE_LAST_BDF(ivhd_device->extended_range.trailer.dev_id) dev_length =sizeof (struct acpi_ivhd_device_extended_range );break ; +case AMD_IOMMU_ACPI_IVHD_DEV_SPECIAL : + UPDATE_LAST_BDF(ivhd_device->special.dev_id) + dev_length =sizeof (struct acpi_ivhd_device_special ); +break ;default :amd_iov_error ("IVHD Error: Invalid Device Type!\n" ); dev_length =0 ;
xen/drivers/passthrough/amd/iommu_init.c +66 -11
134 lines not on this page · raw message
xen/drivers/passthrough/amd/iommu_intr.c +141 -69
295 lines not on this page · raw message
xen/drivers/passthrough/amd/iommu_map.c +79 -57
172 lines not on this page · raw message
xen/drivers/passthrough/amd/pci_amd_iommu.c +83 -54
212 lines not on this page · raw message
xen/include/asm-x86/amd-iommu.h +11 -0
@@ -92,5 +92,16 @@ struct ivrs_mappings {unsigned long addr_range_start;unsigned long addr_range_length;struct amd_iommu *iommu; + +/* per device interrupt remapping table */ +void *intremap_table; +spinlock_t intremap_lock; + +/* interrupt remapping settings */ +u8 dte_lint1_pass; +u8 dte_lint0_pass; +u8 dte_nmi_pass; +u8 dte_ext_int_pass; + u8 dte_init_pass; };#endif /* _ASM_X86_64_AMD_IOMMU_H */
xen/include/asm-x86/hvm/svm/amd-iommu-acpi.h +9 -0
@@ -43,6 +43,7 @@#define AMD_IOMMU_ACPI_IVHD_DEV_ALIAS_RANGE 67#define AMD_IOMMU_ACPI_IVHD_DEV_EXT_SELECT 70#define AMD_IOMMU_ACPI_IVHD_DEV_EXT_RANGE 71 +#define AMD_IOMMU_ACPI_IVHD_DEV_SPECIAL 72/* IVHD IOMMU Flags */ #define AMD_IOMMU_ACPI_COHERENT_MASK 0x20
@@ -151,6 +152,13 @@ struct acpi_ivhd_device_extended_range {struct acpi_ivhd_device_trailer trailer; }; +struct acpi_ivhd_device_special { +struct acpi_ivhd_device_header header; +u8 handle; +u16 dev_id; +u8 variety; +}; +union acpi_ivhd_device {struct acpi_ivhd_device_header header;struct acpi_ivhd_device_range range;
@@ -158,6 +166,7 @@ union acpi_ivhd_device {struct acpi_ivhd_device_alias_range alias_range;struct acpi_ivhd_device_extended extended;struct acpi_ivhd_device_extended_range extended_range; +struct acpi_ivhd_device_special special; };struct acpi_ivmd_block_header {
xen/include/asm-x86/hvm/svm/amd-iommu-proto.h +12 -7
@@ -63,10 +63,14 @@ void invalidate_all_iommu_pages(struct dvoid invalidate_all_iommu_pages (struct domain *d);/* device table functions */ -void amd_iommu_set_dev_table_entry (u32 *dte,u64 root_ptr,u64 intremap_ptr, -u16 domain_id,u8 sys_mgt,u8 dev_ex,u8 paging_mode, -u8 valid,u8 int_valid); -int amd_iommu_is_dte_page_translation_valid (u32 *entry); +int get_dma_requestor_id (u16 bdf); +void amd_iommu_add_dev_table_entry ( +u32 *dte,u8 sys_mgt,u8 dev_ex,u8 lint1_pass,u8 lint0_pass, +u8 nmi_pass,u8 ext_int_pass,u8 init_pass); +void amd_iommu_set_intremap_table ( +u32 *dte,u64 intremap_ptr,u8 int_valid); +void amd_iommu_set_root_page_table ( +u32 *dte,u64 root_ptr,u16 domain_id,u8 paging_mode,u8 valid);void invalidate_dev_table_entry (struct amd_iommu *iommu,u16 devic_id);/* send cmd to iommu */
@@ -74,11 +78,12 @@ void flush_command_buffer(struct amd_iomvoid flush_command_buffer (struct amd_iommu *iommu);/* find iommu for bdf */ -struct amd_iommu *find_iommu_for_device (int bus,int devfn); +struct amd_iommu *find_iommu_for_device (int bdf);/*interrupt remapping */ -int __init amd_iommu_setup_intremap_table (void ); -int __init deallocate_intremap_table (void ); +int __init amd_iommu_setup_ioapic_remapping (void ); +void *__init amd_iommu_alloc_intremap_table (void ); +void __init amd_iommu_free_intremap_table (int bdf);void invalidate_interrupt_table (struct amd_iommu *iommu,u16 device_id);void amd_iommu_ioapic_update_ire (unsigned int apic,unsigned int reg,unsigned int value);
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel