From: Muli Ben-Yehuda Date: Sat, 21 Jul 2007 15:10:57 +0000 (+0200) Subject: x86_64: grab PLSSR too when a DMA error occurs X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ddbd41b4e76f2b586366df0e85df80729ef90bc5;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git x86_64: grab PLSSR too when a DMA error occurs Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds --- diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary.c index f5828db15220..ed16a107d2d4 100644 --- a/arch/x86_64/kernel/pci-calgary.c +++ b/arch/x86_64/kernel/pci-calgary.c @@ -900,15 +900,18 @@ static void __init calgary_free_bus(struct pci_dev *dev) static void calgary_dump_error_regs(struct iommu_table *tbl) { void __iomem *bbar = tbl->bbar; - u32 val32; void __iomem *target; + u32 csr, plssr; target = calgary_reg(bbar, phb_offset(tbl->it_busno) | PHB_CSR_OFFSET); - val32 = be32_to_cpu(readl(target)); + csr = be32_to_cpu(readl(target)); + + target = calgary_reg(bbar, phb_offset(tbl->it_busno) | PHB_PLSSR_OFFSET); + plssr = be32_to_cpu(readl(target)); /* If no error, the agent ID in the CSR is not valid */ printk(KERN_EMERG "Calgary: DMA error on Calgary PHB 0x%x, " - "CSR = 0x%08x\n", tbl->it_busno, val32); + "0x%08x@CSR 0x%08x@PLSSR\n", tbl->it_busno, csr, plssr); } static void calioc2_dump_error_regs(struct iommu_table *tbl)