Add a generic layer on top of intel and amd iommu code
PATCH 3/4 Add a generic layer on top of intel and amd iommu code
Signed-off-by Wei Wang <[email protected]>
Signature · 12 lines
AMD Saxony, Dresden, Germany Operating System Research Center Legal Information: AMD Saxony Limited Liability Company & Co. KG Sitz (Geschäftsanschrift): Wilschdorfer Landstr. 101, 01109 Dresden, Deutschland Registergericht Dresden: HRA 4896 vertretungsberechtigter Komplementär: AMD Saxony LLC (Sitz Wilmington, Delaware, USA) Geschäftsführer der AMD Saxony LLC: Dr. Hans-R. Deppe, Thomas McCoy
xen/arch/x86/hvm/svm/amd_iommu/amd-iommu-detect.c +2 -0
@@ -89,12 +89,14 @@ int __init get_iommu_capabilities(u8 busu32 cap_header, cap_range;u64 mmio_bar; +#if HACK_BIOS_SETTINGS /* remove it when BIOS available */ write_pci_config (bus, dev, func, cap_ptr +PCI_CAP_MMIO_BAR_HIGH_OFFSET ,0x00000000 );write_pci_config (bus, dev, func, cap_ptr +PCI_CAP_MMIO_BAR_LOW_OFFSET ,0x40000001 );/* remove it when BIOS available */ +#endif mmio_bar = (u64 )read_pci_config (bus, dev, func, cap_ptr +PCI_CAP_MMIO_BAR_HIGH_OFFSET ) <<32 ;
xen/arch/x86/hvm/svm/amd_iommu/amd-iommu-map.c +30 -2
@@ -113,7 +113,7 @@ static void invalidate_iommu_page(structsend_iommu_command (iommu, cmd); } -static void flush_command_buffer (struct amd_iommu *iommu) +void flush_command_buffer (struct amd_iommu *iommu) {u32 cmd[4 ], status;int loop_count, comp_wait;
@@ -278,7 +278,7 @@ void amd_iommu_set_dev_table_entry(u32 * dte[0 ] = entry; } -static void *amd_iommu_get_vptr_from_page_table_entry (u32 *entry) +void *amd_iommu_get_vptr_from_page_table_entry (u32 *entry) {u64 addr_lo, addr_hi, ptr;
@@ -299,6 +299,34 @@ static int amd_iommu_is_pte_present(u32return (get_field_from_reg_u32 (entry[0 ],IOMMU_PDE_PRESENT_MASK ,IOMMU_PDE_PRESENT_SHIFT )); +} + +void invalidate_dev_table_entry (struct amd_iommu *iommu, +u16 device_id) +{ +u32 cmd[4 ], entry; + + cmd[3 ] = cmd[2 ] =0 ; +set_field_in_reg_u32 (device_id,0 , +IOMMU_INV_DEVTAB_ENTRY_DEVICE_ID_MASK , +IOMMU_INV_DEVTAB_ENTRY_DEVICE_ID_SHIFT , &entry); + cmd[0 ] = entry; + +set_field_in_reg_u32 (IOMMU_CMD_INVALIDATE_DEVTAB_ENTRY ,0 , +IOMMU_CMD_OPCODE_MASK ,IOMMU_CMD_OPCODE_SHIFT , &entry); + cmd[1 ] = entry; + +send_iommu_command (iommu, cmd); +} + +int amd_iommu_is_dte_page_translation_valid (u32 *entry) +{ +return (get_field_from_reg_u32 (entry[0 ], +IOMMU_DEV_TABLE_VALID_MASK , +IOMMU_DEV_TABLE_VALID_SHIFT ) && +get_field_from_reg_u32 (entry[0 ], +IOMMU_DEV_TABLE_TRANSLATION_VALID_MASK , +IOMMU_DEV_TABLE_TRANSLATION_VALID_SHIFT )); } static void *get_pte_from_page_tables(void *table, int level,
xen/arch/x86/hvm/svm/amd_iommu/pci-amd-iommu.c +192 -20
252 lines not on this page · raw message
xen/arch/x86/hvm/svm/intr.c +41 -0
53 lines not on this page · raw message
xen/include/asm-x86/hvm/svm/amd-iommu-defs.h +5 -0
@@ -262,6 +262,10 @@#define IOMMU_INV_IOMMU_PAGES_ADDR_LOW_SHIFT 12#define IOMMU_INV_IOMMU_PAGES_ADDR_HIGH_MASK 0xFFFFFFFF#define IOMMU_INV_IOMMU_PAGES_ADDR_HIGH_SHIFT 0 + +/* INVALIDATE_DEVTAB_ENTRY command */ +#define IOMMU_INV_DEVTAB_ENTRY_DEVICE_ID_MASK 0x0000FFFF +#define IOMMU_INV_DEVTAB_ENTRY_DEVICE_ID_SHIFT 0/* Event Log */ #define IOMMU_EVENT_LOG_BASE_LOW_OFFSET 0x10
@@ -415,5 +419,6 @@#define IOMMU_PAGE_TABLE_LEVEL_4 4#define IOMMU_IO_WRITE_ENABLED 1#define IOMMU_IO_READ_ENABLED 1 +#define HACK_BIOS_SETTINGS 0#endif /* _ASM_X86_64_AMD_IOMMU_DEFS_H */
xen/include/asm-x86/hvm/svm/amd-iommu-proto.h +9 -0
@@ -27,6 +27,10 @@list_for_each_entry (amd_iommu, \ &amd_iommu_head, list) +#define for_each_pdev (domain, pdev) \ + list_for_each_entry(pdev, \ + &(domain->arch.hvm_domain.hvm_iommu.pdev_list), list) +#define DMA_32BIT_MASK 0x00000000ffffffffULL#define PAGE_ALIGN (addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)#define PAGE_SHIFT_4K (12)
@@ -52,13 +56,18 @@ int amd_iommu_map_page(struct domain *d,int amd_iommu_map_page (struct domain *d,unsigned long gfn,unsigned long mfn);int amd_iommu_unmap_page (struct domain *d,unsigned long gfn); +void *amd_iommu_get_vptr_from_page_table_entry (u32 *entry);/* device table functions */ void amd_iommu_set_dev_table_entry (u32 *dte,u64 root_ptr,u16 domain_id,u8 paging_mode); +int amd_iommu_is_dte_page_translation_valid (u32 *entry); +void invalidate_dev_table_entry (struct amd_iommu *iommu, +u16 devic_id);/* send cmd to iommu */ int send_iommu_command (struct amd_iommu *iommu,u32 cmd[]); +void flush_command_buffer (struct amd_iommu *iommu);/* iommu domain funtions */ int amd_iommu_domain_init (struct domain *domain);
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel