Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ddbd41b4e76f2b586366df0e85df80729ef90bc5
Commit:     ddbd41b4e76f2b586366df0e85df80729ef90bc5
Parent:     8cb32dc748571fb474018172e6b59e5a06123192
Author:     Muli Ben-Yehuda <[EMAIL PROTECTED]>
AuthorDate: Sat Jul 21 17:10:57 2007 +0200
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sat Jul 21 18:37:11 2007 -0700

    x86_64: grab PLSSR too when a DMA error occurs
    
    Signed-off-by: Muli Ben-Yehuda <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 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);
+              "[EMAIL PROTECTED] [EMAIL PROTECTED]", tbl->it_busno, csr, 
plssr);
 }
 
 static void calioc2_dump_error_regs(struct iommu_table *tbl)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to