From: Muli Ben-Yehuda Signed-off-by: Muli Ben-Yehuda Cc: Andi Kleen Signed-off-by: Andrew Morton --- arch/x86_64/kernel/pci-calgary.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff -puN arch/x86_64/kernel/pci-calgary.c~x86-64-calgary-grab-plssr-too-when-a-dma-error-occurs arch/x86_64/kernel/pci-calgary.c --- a/arch/x86_64/kernel/pci-calgary.c~x86-64-calgary-grab-plssr-too-when-a-dma-error-occurs +++ a/arch/x86_64/kernel/pci-calgary.c @@ -900,15 +900,18 @@ static void __init calgary_free_bus(stru 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) _