--- arch/x86/include/asm/amd_iommu_types.h

+++ arch/x86/include/asm/amd_iommu_types.h

@@ -305,6 +305,9 @@ struct amd_iommu {

/* capabilities of that IOMMU read from ACPI */

u32 cap;

+ /* flags read from acpi table */

+ u8 acpi_flags;

+

/*

* Capability pointer. There could be more than one IOMMU per PCI

* device function if there are more than one AMD IOMMU capability

@@ -348,6 +351,15 @@ struct amd_iommu {

/* default dma_ops domain for that IOMMU */

struct dma_ops_domain *default_dom;

+

+ /*

+ * This array is required to work around a potential BIOS bug.

+ * The BIOS may miss to restore parts of the PCI configuration

+ * space when the system resumes from S3. The result is that the

+ * IOMMU does not execute commands anymore which leads to system

+ * failure.

+ */

+ u32 cache_cfg[4];

};

/*

@@ -469,4 +481,10 @@ static inline void amd_iommu_stats_init(

/* some function prototypes */

extern void amd_iommu_reset_cmd_buffer(struct amd_iommu *iommu);

+static inline bool is_rd890_iommu(struct pci_dev *pdev)

+{

+ return (pdev->vendor == PCI_VENDOR_ID_ATI) &&

+ (pdev->device == PCI_DEVICE_ID_RD890_IOMMU);

+}

+

#endif /* _ASM_X86_AMD_IOMMU_TYPES_H */