From 473c5b84783ee2af98f3d7cfdd06c652a255e493 Mon Sep 17 00:00:00 2001 From: Muli Ben-Yehuda Date: Sat, 21 Jul 2007 17:10:57 +0200 Subject: [PATCH] --- yaml --- r: 62411 b: refs/heads/master c: ddbd41b4e76f2b586366df0e85df80729ef90bc5 h: refs/heads/master i: 62409: fd3e38e1f56670fb3a916f2e105bae82ae30c7b1 62407: b762a73c8112e3ae8661e631bad4aeb515678cb8 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/pci-calgary.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 797cc060eb47..4c691200a2cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8cb32dc748571fb474018172e6b59e5a06123192 +refs/heads/master: ddbd41b4e76f2b586366df0e85df80729ef90bc5 diff --git a/trunk/arch/x86_64/kernel/pci-calgary.c b/trunk/arch/x86_64/kernel/pci-calgary.c index f5828db15220..ed16a107d2d4 100644 --- a/trunk/arch/x86_64/kernel/pci-calgary.c +++ b/trunk/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)