aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86_64/kernel/pci-calgary.c9
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 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)
900static void calgary_dump_error_regs(struct iommu_table *tbl) 900static void calgary_dump_error_regs(struct iommu_table *tbl)
901{ 901{
902 void __iomem *bbar = tbl->bbar; 902 void __iomem *bbar = tbl->bbar;
903 u32 val32;
904 void __iomem *target; 903 void __iomem *target;
904 u32 csr, plssr;
905 905
906 target = calgary_reg(bbar, phb_offset(tbl->it_busno) | PHB_CSR_OFFSET); 906 target = calgary_reg(bbar, phb_offset(tbl->it_busno) | PHB_CSR_OFFSET);
907 val32 = be32_to_cpu(readl(target)); 907 csr = be32_to_cpu(readl(target));
908
909 target = calgary_reg(bbar, phb_offset(tbl->it_busno) | PHB_PLSSR_OFFSET);
910 plssr = be32_to_cpu(readl(target));
908 911
909 /* If no error, the agent ID in the CSR is not valid */ 912 /* If no error, the agent ID in the CSR is not valid */
910 printk(KERN_EMERG "Calgary: DMA error on Calgary PHB 0x%x, " 913 printk(KERN_EMERG "Calgary: DMA error on Calgary PHB 0x%x, "
911 "CSR = 0x%08x\n", tbl->it_busno, val32); 914 "0x%08x@CSR 0x%08x@PLSSR\n", tbl->it_busno, csr, plssr);
912} 915}
913 916
914static void calioc2_dump_error_regs(struct iommu_table *tbl) 917static void calioc2_dump_error_regs(struct iommu_table *tbl)