diff options
| author | Muli Ben-Yehuda <muli@il.ibm.com> | 2007-07-21 17:10:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 18:37:11 -0700 |
| commit | ddbd41b4e76f2b586366df0e85df80729ef90bc5 (patch) | |
| tree | 421203a38a779f55194ff33f5fe045dd9d3701cf /arch/x86_64 | |
| parent | 8cb32dc748571fb474018172e6b59e5a06123192 (diff) | |
| download | op-kernel-dev-ddbd41b4e76f2b586366df0e85df80729ef90bc5.zip op-kernel-dev-ddbd41b4e76f2b586366df0e85df80729ef90bc5.tar.gz | |
x86_64: grab PLSSR too when a DMA error occurs
Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/kernel/pci-calgary.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary.c index f5828db..ed16a10 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) |
