diff options
Diffstat (limited to 'arch/sparc/kernel/psycho_common.c')
-rw-r--r-- | arch/sparc/kernel/psycho_common.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/sparc/kernel/psycho_common.c b/arch/sparc/kernel/psycho_common.c index 790996428c14..40689ae3c9b0 100644 --- a/arch/sparc/kernel/psycho_common.c +++ b/arch/sparc/kernel/psycho_common.c | |||
@@ -94,7 +94,7 @@ static void psycho_check_stc_error(struct pci_pbm_info *pbm) | |||
94 | if (saw_error != 0) { | 94 | if (saw_error != 0) { |
95 | u64 tagval = stc_tag_buf[i]; | 95 | u64 tagval = stc_tag_buf[i]; |
96 | u64 lineval = stc_line_buf[i]; | 96 | u64 lineval = stc_line_buf[i]; |
97 | printk(KERN_ERR "%s: STC_TAG(%d)[PA(%016lx)VA(%08lx)" | 97 | printk(KERN_ERR "%s: STC_TAG(%d)[PA(%016llx)VA(%08llx)" |
98 | "V(%d)W(%d)]\n", | 98 | "V(%d)W(%d)]\n", |
99 | pbm->name, | 99 | pbm->name, |
100 | i, | 100 | i, |
@@ -102,8 +102,8 @@ static void psycho_check_stc_error(struct pci_pbm_info *pbm) | |||
102 | (tagval & PSYCHO_STCTAG_VPN), | 102 | (tagval & PSYCHO_STCTAG_VPN), |
103 | ((tagval & PSYCHO_STCTAG_VALID) ? 1 : 0), | 103 | ((tagval & PSYCHO_STCTAG_VALID) ? 1 : 0), |
104 | ((tagval & PSYCHO_STCTAG_WRITE) ? 1 : 0)); | 104 | ((tagval & PSYCHO_STCTAG_WRITE) ? 1 : 0)); |
105 | printk(KERN_ERR "%s: STC_LINE(%d)[LIDX(%lx)SP(%lx)" | 105 | printk(KERN_ERR "%s: STC_LINE(%d)[LIDX(%llx)SP(%llx)" |
106 | "LADDR(%lx)EP(%lx)V(%d)FOFN(%d)]\n", | 106 | "LADDR(%llx)EP(%llx)V(%d)FOFN(%d)]\n", |
107 | pbm->name, | 107 | pbm->name, |
108 | i, | 108 | i, |
109 | ((lineval & PSYCHO_STCLINE_LINDX) >> 21UL), | 109 | ((lineval & PSYCHO_STCLINE_LINDX) >> 21UL), |
@@ -179,14 +179,14 @@ static void psycho_dump_iommu_tags_and_data(struct pci_pbm_info *pbm, | |||
179 | } | 179 | } |
180 | 180 | ||
181 | printk(KERN_ERR "%s: IOMMU TAG(%d)[error(%s) wr(%d) " | 181 | printk(KERN_ERR "%s: IOMMU TAG(%d)[error(%s) wr(%d) " |
182 | "str(%d) sz(%dK) vpg(%08lx)]\n", | 182 | "str(%d) sz(%dK) vpg(%08llx)]\n", |
183 | pbm->name, i, type_str, | 183 | pbm->name, i, type_str, |
184 | ((tag_val & PSYCHO_IOMMU_TAG_WRITE) ? 1 : 0), | 184 | ((tag_val & PSYCHO_IOMMU_TAG_WRITE) ? 1 : 0), |
185 | ((tag_val & PSYCHO_IOMMU_TAG_STREAM) ? 1 : 0), | 185 | ((tag_val & PSYCHO_IOMMU_TAG_STREAM) ? 1 : 0), |
186 | ((tag_val & PSYCHO_IOMMU_TAG_SIZE) ? 64 : 8), | 186 | ((tag_val & PSYCHO_IOMMU_TAG_SIZE) ? 64 : 8), |
187 | (tag_val & PSYCHO_IOMMU_TAG_VPAGE) << IOMMU_PAGE_SHIFT); | 187 | (tag_val & PSYCHO_IOMMU_TAG_VPAGE) << IOMMU_PAGE_SHIFT); |
188 | printk(KERN_ERR "%s: IOMMU DATA(%d)[valid(%d) cache(%d) " | 188 | printk(KERN_ERR "%s: IOMMU DATA(%d)[valid(%d) cache(%d) " |
189 | "ppg(%016lx)]\n", | 189 | "ppg(%016llx)]\n", |
190 | pbm->name, i, | 190 | pbm->name, i, |
191 | ((data_val & PSYCHO_IOMMU_DATA_VALID) ? 1 : 0), | 191 | ((data_val & PSYCHO_IOMMU_DATA_VALID) ? 1 : 0), |
192 | ((data_val & PSYCHO_IOMMU_DATA_CACHE) ? 1 : 0), | 192 | ((data_val & PSYCHO_IOMMU_DATA_CACHE) ? 1 : 0), |
@@ -326,12 +326,12 @@ irqreturn_t psycho_pcierr_intr(int irq, void *dev_id) | |||
326 | "Excessive Retries" : | 326 | "Excessive Retries" : |
327 | ((error_bits & PSYCHO_PCIAFSR_PPERR) ? | 327 | ((error_bits & PSYCHO_PCIAFSR_PPERR) ? |
328 | "Parity Error" : "???")))))); | 328 | "Parity Error" : "???")))))); |
329 | printk(KERN_ERR "%s: bytemask[%04lx] UPA_MID[%02lx] was_block(%d)\n", | 329 | printk(KERN_ERR "%s: bytemask[%04llx] UPA_MID[%02llx] was_block(%d)\n", |
330 | pbm->name, | 330 | pbm->name, |
331 | (afsr & PSYCHO_PCIAFSR_BMSK) >> 32UL, | 331 | (afsr & PSYCHO_PCIAFSR_BMSK) >> 32UL, |
332 | (afsr & PSYCHO_PCIAFSR_MID) >> 25UL, | 332 | (afsr & PSYCHO_PCIAFSR_MID) >> 25UL, |
333 | (afsr & PSYCHO_PCIAFSR_BLK) ? 1 : 0); | 333 | (afsr & PSYCHO_PCIAFSR_BLK) ? 1 : 0); |
334 | printk(KERN_ERR "%s: PCI AFAR [%016lx]\n", pbm->name, afar); | 334 | printk(KERN_ERR "%s: PCI AFAR [%016llx]\n", pbm->name, afar); |
335 | printk(KERN_ERR "%s: PCI Secondary errors [", pbm->name); | 335 | printk(KERN_ERR "%s: PCI Secondary errors [", pbm->name); |
336 | reported = 0; | 336 | reported = 0; |
337 | if (afsr & PSYCHO_PCIAFSR_SMA) { | 337 | if (afsr & PSYCHO_PCIAFSR_SMA) { |