aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86_64/kernel/pci-calgary.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary.c
index c4692b67878a..b3296cc2f2f2 100644
--- a/arch/x86_64/kernel/pci-calgary.c
+++ b/arch/x86_64/kernel/pci-calgary.c
@@ -715,7 +715,7 @@ static void calgary_watchdog(unsigned long data)
715 715
716 /* If no error, the agent ID in the CSR is not valid */ 716 /* If no error, the agent ID in the CSR is not valid */
717 if (val32 & CSR_AGENT_MASK) { 717 if (val32 & CSR_AGENT_MASK) {
718 printk(KERN_EMERG "calgary_watchdog: DMA error on bus %d, " 718 printk(KERN_EMERG "calgary_watchdog: DMA error on PHB %#x, "
719 "CSR = %#x\n", dev->bus->number, val32); 719 "CSR = %#x\n", dev->bus->number, val32);
720 writel(0, target); 720 writel(0, target);
721 721
@@ -749,7 +749,7 @@ static void __init calgary_enable_translation(struct pci_dev *dev)
749 val32 = be32_to_cpu(readl(target)); 749 val32 = be32_to_cpu(readl(target));
750 val32 |= PHB_TCE_ENABLE | PHB_DAC_DISABLE | PHB_MCSR_ENABLE; 750 val32 |= PHB_TCE_ENABLE | PHB_DAC_DISABLE | PHB_MCSR_ENABLE;
751 751
752 printk(KERN_INFO "Calgary: enabling translation on PHB %d\n", busnum); 752 printk(KERN_INFO "Calgary: enabling translation on PHB %#x\n", busnum);
753 printk(KERN_INFO "Calgary: errant DMAs will now be prevented on this " 753 printk(KERN_INFO "Calgary: errant DMAs will now be prevented on this "
754 "bus.\n"); 754 "bus.\n");
755 755
@@ -779,7 +779,7 @@ static void __init calgary_disable_translation(struct pci_dev *dev)
779 val32 = be32_to_cpu(readl(target)); 779 val32 = be32_to_cpu(readl(target));
780 val32 &= ~(PHB_TCE_ENABLE | PHB_DAC_DISABLE | PHB_MCSR_ENABLE); 780 val32 &= ~(PHB_TCE_ENABLE | PHB_DAC_DISABLE | PHB_MCSR_ENABLE);
781 781
782 printk(KERN_INFO "Calgary: disabling translation on PHB %d!\n", busnum); 782 printk(KERN_INFO "Calgary: disabling translation on PHB %#x!\n", busnum);
783 writel(cpu_to_be32(val32), target); 783 writel(cpu_to_be32(val32), target);
784 readl(target); /* flush */ 784 readl(target); /* flush */
785 785
@@ -1064,7 +1064,7 @@ static int __init calgary_parse_options(char *p)
1064 1064
1065 if (bridge < MAX_PHB_BUS_NUM) { 1065 if (bridge < MAX_PHB_BUS_NUM) {
1066 printk(KERN_INFO "Calgary: disabling " 1066 printk(KERN_INFO "Calgary: disabling "
1067 "translation for PHB 0x%x\n", bridge); 1067 "translation for PHB %#x\n", bridge);
1068 bus_info[bridge].translation_disabled = 1; 1068 bus_info[bridge].translation_disabled = 1;
1069 } 1069 }
1070 } 1070 }