x86 fixes
Linus,
Please pull the latest x86-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
out-of-topic modifications in x86-fixes-for-linus:
--------------------------------------------------include/linux/pci_ids.h # 4c894f4: x86/amd-iommu: Work around S3 BIO
Thanks,
Ingo
------------------>
Joerg Roedel (3):
x86/amd-iommu: Set iommu configuration flags in enable-loop x86/amd-iommu: Work around S3 BIOS bug x86/amd-iommu: Fix rounding-bug in __unmap_single
Yinghai Lu (2):
x86, setup: Fix earlyprintk=serial,ttyS0,115200
x86, setup: Fix earlyprintk=serial,0x3f8,115200arch/x86/boot/early_serial_console.c | 14 ++++++- arch/x86/include/asm/amd_iommu_proto.h | 6 +++ arch/x86/include/asm/amd_iommu_types.h | 12 ++++++ arch/x86/kernel/amd_iommu.c | 4 +- arch/x86/kernel/amd_iommu_init.c | 67 +++++++++++++++++++++---------- include/linux/pci_ids.h | 3 + 6 files changed, 82 insertions(+), 24 deletions(-)
arch/x86/boot/early_serial_console.c +13 -1
@@ -58,7 +58,19 @@ static void parse_earlyprintk(void)if (arg[pos] ==',' ) pos++; -if (!strncmp (arg,"ttyS" ,4 )) { +/* +* make sure we have +* "serial,0x3f8,115200" +* "serial,ttyS0,115200" +* "ttyS0,115200" +*/ +if (pos ==7 && !strncmp (arg + pos,"0x" ,2 )) { + port =simple_strtoull (arg + pos, &e,16 ); +if (port ==0 || arg + pos == e) + port =DEFAULT_SERIAL_PORT ; +else + pos = e - arg; + }else if (!strncmp (arg + pos,"ttyS" ,4 )) {static const int bases[] = {0x3f8 ,0x2f8 };int idx =0 ;
arch/x86/include/asm/amd_iommu_proto.h +6 -0
@@ -38,4 +38,10 @@ static inline void amd_iommu_stats_init(void) { }#endif /* !CONFIG_AMD_IOMMU_STATS */ +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_PROTO_H */
arch/x86/include/asm/amd_iommu_types.h +12 -0
@@ -368,6 +368,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
@@ -411,6 +414,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 ]; };/*
arch/x86/kernel/amd_iommu.c +3 -1
@@ -1953,6 +1953,7 @@ static void __unmap_single(struct dma_ops_domain *dma_dom, size_t size, int dir) { +dma_addr_t flush_addr;dma_addr_t i, start;unsigned int pages;
@@ -1960,6 +1961,7 @@ static void __unmap_single(struct dma_ops_domain *dma_dom, (dma_addr + size > dma_dom->aperture_size)) return; + flush_addr = dma_addr; pages =iommu_num_pages (dma_addr, size,PAGE_SIZE ); dma_addr &=PAGE_MASK ; start = dma_addr;
@@ -1974,7 +1976,7 @@ static void __unmap_single(struct dma_ops_domain *dma_dom,dma_ops_free_addresses (dma_dom, dma_addr, pages);if (amd_iommu_unmap_flush || dma_dom->need_flush) { -iommu_flush_pages (&dma_dom->domain, dma_addr, size); +iommu_flush_pages (&dma_dom->domain, flush_addr, size); dma_dom->need_flush = false; } }
arch/x86/kernel/amd_iommu_init.c +45 -22
92 lines not on this page · raw message
include/linux/pci_ids.h +3 -0
@@ -393,6 +393,9 @@#define PCI_DEVICE_ID_VLSI_82C147 0x0105#define PCI_DEVICE_ID_VLSI_VAS96011 0x0702 +/* AMD RD890 Chipset */ +#define PCI_DEVICE_ID_RD890_IOMMU 0x5a23 +#define PCI_VENDOR_ID_ADL 0x1005#define PCI_DEVICE_ID_ADL_2301 0x2301