| 
									
										
										
										
											2008-09-10 03:07:03 -07:00
										 |  |  | /* psycho_common.c: Code common to PSYCHO and derivative PCI controllers.
 | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * Copyright (C) 2008 David S. Miller <davem@davemloft.net> | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | #include <linux/kernel.h>
 | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | #include <linux/interrupt.h>
 | 
					
						
							| 
									
										
										
										
											2008-09-10 03:07:03 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | #include <asm/upa.h>
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #include "pci_impl.h"
 | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | #include "iommu_common.h"
 | 
					
						
							| 
									
										
										
										
											2008-09-10 03:07:03 -07:00
										 |  |  | #include "psycho_common.h"
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												sparc64: fix warnings in psycho_common after ull conversion
After conversion to use unsigned long long for u64
I saw following warnings:
  CC      arch/sparc/kernel/psycho_common.o
arch/sparc/kernel/psycho_common.c: In function `psycho_check_stc_error':
arch/sparc/kernel/psycho_common.c:104: warning: long long unsigned int format, long unsigned int arg (arg 4)
arch/sparc/kernel/psycho_common.c:104: warning: long long unsigned int format, long unsigned int arg (arg 5)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 4)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 5)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 6)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 7)
arch/sparc/kernel/psycho_common.c: In function `psycho_dump_iommu_tags_and_data':
arch/sparc/kernel/psycho_common.c:187: warning: long long unsigned int format, long unsigned int arg (arg 8)
arch/sparc/kernel/psycho_common.c:193: warning: long long unsigned int format, long unsigned int arg (arg 6)
arch/sparc/kernel/psycho_common.c: In function `psycho_pcierr_intr':
arch/sparc/kernel/psycho_common.c:333: warning: long long unsigned int format, long unsigned int arg (arg 3)
arch/sparc/kernel/psycho_common.c:333: warning: long long unsigned int format, long unsigned int arg (arg 4)
This is due to different integer promotion in my 32 bit hosted gcc.
The fix is to force a few constants to ULL.
The following stands out from the rest:
+#define  PSYCHO_IOMMU_TAG_VPAGE         0x7ffffULL
+#define  PSYCHO_IOMMU_DATA_PPAGE 0xfffffffULL
They were needed otherwise the expression:
    (data_val & PSYCHO_IOMMU_DATA_PPAGE) << IOMMU_PAGE_SHIFT)
were promoted to a unsigned long and not a unsigned long long as expected.
I tried the alternative solution and made IOMMU_PAGE_SHIFT an ULL but that did not help.
The only way gcc would make this expression an unsigned long long was to
define PSYCHO_IOMMU_DATA_PPAGE as ULL. The alternative to add a cast was
not considered a valid solution.
We had this issue in two places and this were the only places the above
two constants are used.
A small coding style diff sneaked in too. 
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
											
										 
											2009-01-08 11:37:19 -08:00
										 |  |  | #define  PSYCHO_STRBUF_CTRL_DENAB	0x0000000000000002ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_STCERR_WRITE		0x0000000000000002ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_STCERR_READ		0x0000000000000001ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_STCTAG_PPN		0x0fffffff00000000ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_STCTAG_VPN		0x00000000ffffe000ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_STCTAG_VALID		0x0000000000000002ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_STCTAG_WRITE		0x0000000000000001ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_STCLINE_LINDX		0x0000000001e00000ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_STCLINE_SPTR		0x00000000001f8000ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_STCLINE_LADDR		0x0000000000007f00ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_STCLINE_EPTR		0x00000000000000fcULL
 | 
					
						
							|  |  |  | #define  PSYCHO_STCLINE_VALID		0x0000000000000002ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_STCLINE_FOFN		0x0000000000000001ULL
 | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | static DEFINE_SPINLOCK(stc_buf_lock); | 
					
						
							|  |  |  | static unsigned long stc_error_buf[128]; | 
					
						
							|  |  |  | static unsigned long stc_tag_buf[16]; | 
					
						
							|  |  |  | static unsigned long stc_line_buf[16]; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void psycho_check_stc_error(struct pci_pbm_info *pbm) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	unsigned long err_base, tag_base, line_base; | 
					
						
							|  |  |  | 	struct strbuf *strbuf = &pbm->stc; | 
					
						
							|  |  |  | 	u64 control; | 
					
						
							|  |  |  | 	int i; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (!strbuf->strbuf_control) | 
					
						
							|  |  |  | 		return; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	err_base = strbuf->strbuf_err_stat; | 
					
						
							|  |  |  | 	tag_base = strbuf->strbuf_tag_diag; | 
					
						
							|  |  |  | 	line_base = strbuf->strbuf_line_diag; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	spin_lock(&stc_buf_lock); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	/* This is __REALLY__ dangerous.  When we put the streaming
 | 
					
						
							|  |  |  | 	 * buffer into diagnostic mode to probe it's tags and error | 
					
						
							|  |  |  | 	 * status, we _must_ clear all of the line tag valid bits | 
					
						
							|  |  |  | 	 * before re-enabling the streaming buffer.  If any dirty data | 
					
						
							|  |  |  | 	 * lives in the STC when we do this, we will end up | 
					
						
							|  |  |  | 	 * invalidating it before it has a chance to reach main | 
					
						
							|  |  |  | 	 * memory. | 
					
						
							|  |  |  | 	 */ | 
					
						
							|  |  |  | 	control = upa_readq(strbuf->strbuf_control); | 
					
						
							|  |  |  | 	upa_writeq(control | PSYCHO_STRBUF_CTRL_DENAB, strbuf->strbuf_control); | 
					
						
							|  |  |  | 	for (i = 0; i < 128; i++) { | 
					
						
							|  |  |  | 		u64 val; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		val = upa_readq(err_base + (i * 8UL)); | 
					
						
							|  |  |  | 		upa_writeq(0UL, err_base + (i * 8UL)); | 
					
						
							|  |  |  | 		stc_error_buf[i] = val; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	for (i = 0; i < 16; i++) { | 
					
						
							|  |  |  | 		stc_tag_buf[i] = upa_readq(tag_base + (i * 8UL)); | 
					
						
							|  |  |  | 		stc_line_buf[i] = upa_readq(line_base + (i * 8UL)); | 
					
						
							|  |  |  | 		upa_writeq(0UL, tag_base + (i * 8UL)); | 
					
						
							|  |  |  | 		upa_writeq(0UL, line_base + (i * 8UL)); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	/* OK, state is logged, exit diagnostic mode. */ | 
					
						
							|  |  |  | 	upa_writeq(control, strbuf->strbuf_control); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	for (i = 0; i < 16; i++) { | 
					
						
							|  |  |  | 		int j, saw_error, first, last; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		saw_error = 0; | 
					
						
							|  |  |  | 		first = i * 8; | 
					
						
							|  |  |  | 		last = first + 8; | 
					
						
							|  |  |  | 		for (j = first; j < last; j++) { | 
					
						
							|  |  |  | 			u64 errval = stc_error_buf[j]; | 
					
						
							|  |  |  | 			if (errval != 0) { | 
					
						
							|  |  |  | 				saw_error++; | 
					
						
							|  |  |  | 				printk(KERN_ERR "%s: STC_ERR(%d)[wr(%d)" | 
					
						
							|  |  |  | 				       "rd(%d)]\n", | 
					
						
							|  |  |  | 				       pbm->name, | 
					
						
							|  |  |  | 				       j, | 
					
						
							|  |  |  | 				       (errval & PSYCHO_STCERR_WRITE) ? 1 : 0, | 
					
						
							|  |  |  | 				       (errval & PSYCHO_STCERR_READ) ? 1 : 0); | 
					
						
							|  |  |  | 			} | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		if (saw_error != 0) { | 
					
						
							|  |  |  | 			u64 tagval = stc_tag_buf[i]; | 
					
						
							|  |  |  | 			u64 lineval = stc_line_buf[i]; | 
					
						
							| 
									
										
										
										
											2009-01-06 13:19:28 -08:00
										 |  |  | 			printk(KERN_ERR "%s: STC_TAG(%d)[PA(%016llx)VA(%08llx)" | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | 			       "V(%d)W(%d)]\n", | 
					
						
							|  |  |  | 			       pbm->name, | 
					
						
							|  |  |  | 			       i, | 
					
						
							|  |  |  | 			       ((tagval & PSYCHO_STCTAG_PPN) >> 19UL), | 
					
						
							|  |  |  | 			       (tagval & PSYCHO_STCTAG_VPN), | 
					
						
							|  |  |  | 			       ((tagval & PSYCHO_STCTAG_VALID) ? 1 : 0), | 
					
						
							|  |  |  | 			       ((tagval & PSYCHO_STCTAG_WRITE) ? 1 : 0)); | 
					
						
							| 
									
										
										
										
											2009-01-06 13:19:28 -08:00
										 |  |  | 			printk(KERN_ERR "%s: STC_LINE(%d)[LIDX(%llx)SP(%llx)" | 
					
						
							|  |  |  | 			       "LADDR(%llx)EP(%llx)V(%d)FOFN(%d)]\n", | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | 			       pbm->name, | 
					
						
							|  |  |  | 			       i, | 
					
						
							|  |  |  | 			       ((lineval & PSYCHO_STCLINE_LINDX) >> 21UL), | 
					
						
							|  |  |  | 			       ((lineval & PSYCHO_STCLINE_SPTR) >> 15UL), | 
					
						
							|  |  |  | 			       ((lineval & PSYCHO_STCLINE_LADDR) >> 8UL), | 
					
						
							|  |  |  | 			       ((lineval & PSYCHO_STCLINE_EPTR) >> 2UL), | 
					
						
							|  |  |  | 			       ((lineval & PSYCHO_STCLINE_VALID) ? 1 : 0), | 
					
						
							|  |  |  | 			       ((lineval & PSYCHO_STCLINE_FOFN) ? 1 : 0)); | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	spin_unlock(&stc_buf_lock); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-09-10 03:07:03 -07:00
										 |  |  | #define PSYCHO_IOMMU_TAG		0xa580UL
 | 
					
						
							|  |  |  | #define PSYCHO_IOMMU_DATA		0xa600UL
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | static void psycho_record_iommu_tags_and_data(struct pci_pbm_info *pbm, | 
					
						
							|  |  |  | 					      u64 *tag, u64 *data) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	int i; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	for (i = 0; i < 16; i++) { | 
					
						
							|  |  |  | 		unsigned long base = pbm->controller_regs; | 
					
						
							|  |  |  | 		unsigned long off = i * 8UL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		tag[i] = upa_readq(base + PSYCHO_IOMMU_TAG+off); | 
					
						
							|  |  |  | 		data[i] = upa_readq(base + PSYCHO_IOMMU_DATA+off); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		/* Now clear out the entry. */ | 
					
						
							|  |  |  | 		upa_writeq(0, base + PSYCHO_IOMMU_TAG + off); | 
					
						
							|  |  |  | 		upa_writeq(0, base + PSYCHO_IOMMU_DATA + off); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_TAG_ERRSTS (0x3UL << 23UL)
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_TAG_ERR	 (0x1UL << 22UL)
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_TAG_WRITE	 (0x1UL << 21UL)
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_TAG_STREAM (0x1UL << 20UL)
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_TAG_SIZE	 (0x1UL << 19UL)
 | 
					
						
							| 
									
										
											  
											
												sparc64: fix warnings in psycho_common after ull conversion
After conversion to use unsigned long long for u64
I saw following warnings:
  CC      arch/sparc/kernel/psycho_common.o
arch/sparc/kernel/psycho_common.c: In function `psycho_check_stc_error':
arch/sparc/kernel/psycho_common.c:104: warning: long long unsigned int format, long unsigned int arg (arg 4)
arch/sparc/kernel/psycho_common.c:104: warning: long long unsigned int format, long unsigned int arg (arg 5)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 4)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 5)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 6)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 7)
arch/sparc/kernel/psycho_common.c: In function `psycho_dump_iommu_tags_and_data':
arch/sparc/kernel/psycho_common.c:187: warning: long long unsigned int format, long unsigned int arg (arg 8)
arch/sparc/kernel/psycho_common.c:193: warning: long long unsigned int format, long unsigned int arg (arg 6)
arch/sparc/kernel/psycho_common.c: In function `psycho_pcierr_intr':
arch/sparc/kernel/psycho_common.c:333: warning: long long unsigned int format, long unsigned int arg (arg 3)
arch/sparc/kernel/psycho_common.c:333: warning: long long unsigned int format, long unsigned int arg (arg 4)
This is due to different integer promotion in my 32 bit hosted gcc.
The fix is to force a few constants to ULL.
The following stands out from the rest:
+#define  PSYCHO_IOMMU_TAG_VPAGE         0x7ffffULL
+#define  PSYCHO_IOMMU_DATA_PPAGE 0xfffffffULL
They were needed otherwise the expression:
    (data_val & PSYCHO_IOMMU_DATA_PPAGE) << IOMMU_PAGE_SHIFT)
were promoted to a unsigned long and not a unsigned long long as expected.
I tried the alternative solution and made IOMMU_PAGE_SHIFT an ULL but that did not help.
The only way gcc would make this expression an unsigned long long was to
define PSYCHO_IOMMU_DATA_PPAGE as ULL. The alternative to add a cast was
not considered a valid solution.
We had this issue in two places and this were the only places the above
two constants are used.
A small coding style diff sneaked in too. 
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
											
										 
											2009-01-08 11:37:19 -08:00
										 |  |  | #define  PSYCHO_IOMMU_TAG_VPAGE	 0x7ffffULL
 | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | #define  PSYCHO_IOMMU_DATA_VALID (1UL << 30UL)
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_DATA_CACHE (1UL << 28UL)
 | 
					
						
							| 
									
										
											  
											
												sparc64: fix warnings in psycho_common after ull conversion
After conversion to use unsigned long long for u64
I saw following warnings:
  CC      arch/sparc/kernel/psycho_common.o
arch/sparc/kernel/psycho_common.c: In function `psycho_check_stc_error':
arch/sparc/kernel/psycho_common.c:104: warning: long long unsigned int format, long unsigned int arg (arg 4)
arch/sparc/kernel/psycho_common.c:104: warning: long long unsigned int format, long unsigned int arg (arg 5)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 4)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 5)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 6)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 7)
arch/sparc/kernel/psycho_common.c: In function `psycho_dump_iommu_tags_and_data':
arch/sparc/kernel/psycho_common.c:187: warning: long long unsigned int format, long unsigned int arg (arg 8)
arch/sparc/kernel/psycho_common.c:193: warning: long long unsigned int format, long unsigned int arg (arg 6)
arch/sparc/kernel/psycho_common.c: In function `psycho_pcierr_intr':
arch/sparc/kernel/psycho_common.c:333: warning: long long unsigned int format, long unsigned int arg (arg 3)
arch/sparc/kernel/psycho_common.c:333: warning: long long unsigned int format, long unsigned int arg (arg 4)
This is due to different integer promotion in my 32 bit hosted gcc.
The fix is to force a few constants to ULL.
The following stands out from the rest:
+#define  PSYCHO_IOMMU_TAG_VPAGE         0x7ffffULL
+#define  PSYCHO_IOMMU_DATA_PPAGE 0xfffffffULL
They were needed otherwise the expression:
    (data_val & PSYCHO_IOMMU_DATA_PPAGE) << IOMMU_PAGE_SHIFT)
were promoted to a unsigned long and not a unsigned long long as expected.
I tried the alternative solution and made IOMMU_PAGE_SHIFT an ULL but that did not help.
The only way gcc would make this expression an unsigned long long was to
define PSYCHO_IOMMU_DATA_PPAGE as ULL. The alternative to add a cast was
not considered a valid solution.
We had this issue in two places and this were the only places the above
two constants are used.
A small coding style diff sneaked in too. 
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
											
										 
											2009-01-08 11:37:19 -08:00
										 |  |  | #define  PSYCHO_IOMMU_DATA_PPAGE 0xfffffffULL
 | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | static void psycho_dump_iommu_tags_and_data(struct pci_pbm_info *pbm, | 
					
						
							|  |  |  | 					    u64 *tag, u64 *data) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	int i; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	for (i = 0; i < 16; i++) { | 
					
						
							|  |  |  | 		u64 tag_val, data_val; | 
					
						
							|  |  |  | 		const char *type_str; | 
					
						
							|  |  |  | 		tag_val = tag[i]; | 
					
						
							|  |  |  | 		if (!(tag_val & PSYCHO_IOMMU_TAG_ERR)) | 
					
						
							|  |  |  | 			continue; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		data_val = data[i]; | 
					
						
							|  |  |  | 		switch((tag_val & PSYCHO_IOMMU_TAG_ERRSTS) >> 23UL) { | 
					
						
							|  |  |  | 		case 0: | 
					
						
							|  |  |  | 			type_str = "Protection Error"; | 
					
						
							|  |  |  | 			break; | 
					
						
							|  |  |  | 		case 1: | 
					
						
							|  |  |  | 			type_str = "Invalid Error"; | 
					
						
							|  |  |  | 			break; | 
					
						
							|  |  |  | 		case 2: | 
					
						
							|  |  |  | 			type_str = "TimeOut Error"; | 
					
						
							|  |  |  | 			break; | 
					
						
							|  |  |  | 		case 3: | 
					
						
							|  |  |  | 		default: | 
					
						
							|  |  |  | 			type_str = "ECC Error"; | 
					
						
							|  |  |  | 			break; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		printk(KERN_ERR "%s: IOMMU TAG(%d)[error(%s) wr(%d) " | 
					
						
							| 
									
										
										
										
											2009-01-06 13:19:28 -08:00
										 |  |  | 		       "str(%d) sz(%dK) vpg(%08llx)]\n", | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | 		       pbm->name, i, type_str, | 
					
						
							|  |  |  | 		       ((tag_val & PSYCHO_IOMMU_TAG_WRITE) ? 1 : 0), | 
					
						
							|  |  |  | 		       ((tag_val & PSYCHO_IOMMU_TAG_STREAM) ? 1 : 0), | 
					
						
							|  |  |  | 		       ((tag_val & PSYCHO_IOMMU_TAG_SIZE) ? 64 : 8), | 
					
						
							|  |  |  | 		       (tag_val & PSYCHO_IOMMU_TAG_VPAGE) << IOMMU_PAGE_SHIFT); | 
					
						
							|  |  |  | 		printk(KERN_ERR "%s: IOMMU DATA(%d)[valid(%d) cache(%d) " | 
					
						
							| 
									
										
										
										
											2009-01-06 13:19:28 -08:00
										 |  |  | 		       "ppg(%016llx)]\n", | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | 		       pbm->name, i, | 
					
						
							|  |  |  | 		       ((data_val & PSYCHO_IOMMU_DATA_VALID) ? 1 : 0), | 
					
						
							|  |  |  | 		       ((data_val & PSYCHO_IOMMU_DATA_CACHE) ? 1 : 0), | 
					
						
							| 
									
										
											  
											
												sparc64: fix warnings in psycho_common after ull conversion
After conversion to use unsigned long long for u64
I saw following warnings:
  CC      arch/sparc/kernel/psycho_common.o
arch/sparc/kernel/psycho_common.c: In function `psycho_check_stc_error':
arch/sparc/kernel/psycho_common.c:104: warning: long long unsigned int format, long unsigned int arg (arg 4)
arch/sparc/kernel/psycho_common.c:104: warning: long long unsigned int format, long unsigned int arg (arg 5)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 4)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 5)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 6)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 7)
arch/sparc/kernel/psycho_common.c: In function `psycho_dump_iommu_tags_and_data':
arch/sparc/kernel/psycho_common.c:187: warning: long long unsigned int format, long unsigned int arg (arg 8)
arch/sparc/kernel/psycho_common.c:193: warning: long long unsigned int format, long unsigned int arg (arg 6)
arch/sparc/kernel/psycho_common.c: In function `psycho_pcierr_intr':
arch/sparc/kernel/psycho_common.c:333: warning: long long unsigned int format, long unsigned int arg (arg 3)
arch/sparc/kernel/psycho_common.c:333: warning: long long unsigned int format, long unsigned int arg (arg 4)
This is due to different integer promotion in my 32 bit hosted gcc.
The fix is to force a few constants to ULL.
The following stands out from the rest:
+#define  PSYCHO_IOMMU_TAG_VPAGE         0x7ffffULL
+#define  PSYCHO_IOMMU_DATA_PPAGE 0xfffffffULL
They were needed otherwise the expression:
    (data_val & PSYCHO_IOMMU_DATA_PPAGE) << IOMMU_PAGE_SHIFT)
were promoted to a unsigned long and not a unsigned long long as expected.
I tried the alternative solution and made IOMMU_PAGE_SHIFT an ULL but that did not help.
The only way gcc would make this expression an unsigned long long was to
define PSYCHO_IOMMU_DATA_PPAGE as ULL. The alternative to add a cast was
not considered a valid solution.
We had this issue in two places and this were the only places the above
two constants are used.
A small coding style diff sneaked in too. 
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
											
										 
											2009-01-08 11:37:19 -08:00
										 |  |  | 		       (data_val & PSYCHO_IOMMU_DATA_PPAGE) << IOMMU_PAGE_SHIFT); | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | 	} | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_CTRL_XLTESTAT	0x0000000006000000UL
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_CTRL_XLTEERR	0x0000000001000000UL
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | void psycho_check_iommu_error(struct pci_pbm_info *pbm, | 
					
						
							|  |  |  | 			      unsigned long afsr, | 
					
						
							|  |  |  | 			      unsigned long afar, | 
					
						
							|  |  |  | 			      enum psycho_error_type type) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	u64 control, iommu_tag[16], iommu_data[16]; | 
					
						
							|  |  |  | 	struct iommu *iommu = pbm->iommu; | 
					
						
							|  |  |  | 	unsigned long flags; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	spin_lock_irqsave(&iommu->lock, flags); | 
					
						
							|  |  |  | 	control = upa_readq(iommu->iommu_control); | 
					
						
							|  |  |  | 	if (control & PSYCHO_IOMMU_CTRL_XLTEERR) { | 
					
						
							|  |  |  | 		const char *type_str; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		control &= ~PSYCHO_IOMMU_CTRL_XLTEERR; | 
					
						
							|  |  |  | 		upa_writeq(control, iommu->iommu_control); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		switch ((control & PSYCHO_IOMMU_CTRL_XLTESTAT) >> 25UL) { | 
					
						
							|  |  |  | 		case 0: | 
					
						
							|  |  |  | 			type_str = "Protection Error"; | 
					
						
							|  |  |  | 			break; | 
					
						
							|  |  |  | 		case 1: | 
					
						
							|  |  |  | 			type_str = "Invalid Error"; | 
					
						
							|  |  |  | 			break; | 
					
						
							|  |  |  | 		case 2: | 
					
						
							|  |  |  | 			type_str = "TimeOut Error"; | 
					
						
							|  |  |  | 			break; | 
					
						
							|  |  |  | 		case 3: | 
					
						
							|  |  |  | 		default: | 
					
						
							|  |  |  | 			type_str = "ECC Error"; | 
					
						
							|  |  |  | 			break; | 
					
						
							| 
									
										
										
										
											2011-06-03 14:45:23 +00:00
										 |  |  | 		} | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | 		printk(KERN_ERR "%s: IOMMU Error, type[%s]\n", | 
					
						
							|  |  |  | 		       pbm->name, type_str); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		/* It is very possible for another DVMA to occur while
 | 
					
						
							|  |  |  | 		 * we do this probe, and corrupt the system further. | 
					
						
							|  |  |  | 		 * But we are so screwed at this point that we are | 
					
						
							|  |  |  | 		 * likely to crash hard anyways, so get as much | 
					
						
							|  |  |  | 		 * diagnostic information to the console as we can. | 
					
						
							|  |  |  | 		 */ | 
					
						
							|  |  |  | 		psycho_record_iommu_tags_and_data(pbm, iommu_tag, iommu_data); | 
					
						
							|  |  |  | 		psycho_dump_iommu_tags_and_data(pbm, iommu_tag, iommu_data); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	psycho_check_stc_error(pbm); | 
					
						
							|  |  |  | 	spin_unlock_irqrestore(&iommu->lock, flags); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define  PSYCHO_PCICTRL_SBH_ERR	 0x0000000800000000UL
 | 
					
						
							|  |  |  | #define  PSYCHO_PCICTRL_SERR	 0x0000000400000000UL
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static irqreturn_t psycho_pcierr_intr_other(struct pci_pbm_info *pbm) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	irqreturn_t ret = IRQ_NONE; | 
					
						
							|  |  |  | 	u64 csr, csr_error_bits; | 
					
						
							| 
									
										
										
										
											2008-09-16 14:11:43 -07:00
										 |  |  | 	u16 stat, *addr; | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	csr = upa_readq(pbm->pci_csr); | 
					
						
							|  |  |  | 	csr_error_bits = csr & (PSYCHO_PCICTRL_SBH_ERR | PSYCHO_PCICTRL_SERR); | 
					
						
							|  |  |  | 	if (csr_error_bits) { | 
					
						
							|  |  |  | 		/* Clear the errors.  */ | 
					
						
							|  |  |  | 		upa_writeq(csr, pbm->pci_csr); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		/* Log 'em.  */ | 
					
						
							|  |  |  | 		if (csr_error_bits & PSYCHO_PCICTRL_SBH_ERR) | 
					
						
							|  |  |  | 			printk(KERN_ERR "%s: PCI streaming byte hole " | 
					
						
							|  |  |  | 			       "error asserted.\n", pbm->name); | 
					
						
							|  |  |  | 		if (csr_error_bits & PSYCHO_PCICTRL_SERR) | 
					
						
							|  |  |  | 			printk(KERN_ERR "%s: PCI SERR signal asserted.\n", | 
					
						
							|  |  |  | 			       pbm->name); | 
					
						
							|  |  |  | 		ret = IRQ_HANDLED; | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2008-09-16 14:11:43 -07:00
										 |  |  | 	addr = psycho_pci_config_mkaddr(pbm, pbm->pci_first_busno, | 
					
						
							|  |  |  | 					0, PCI_STATUS); | 
					
						
							|  |  |  | 	pci_config_read16(addr, &stat); | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | 	if (stat & (PCI_STATUS_PARITY | | 
					
						
							|  |  |  | 		    PCI_STATUS_SIG_TARGET_ABORT | | 
					
						
							|  |  |  | 		    PCI_STATUS_REC_TARGET_ABORT | | 
					
						
							|  |  |  | 		    PCI_STATUS_REC_MASTER_ABORT | | 
					
						
							|  |  |  | 		    PCI_STATUS_SIG_SYSTEM_ERROR)) { | 
					
						
							|  |  |  | 		printk(KERN_ERR "%s: PCI bus error, PCI_STATUS[%04x]\n", | 
					
						
							|  |  |  | 		       pbm->name, stat); | 
					
						
							| 
									
										
										
										
											2008-09-16 14:11:43 -07:00
										 |  |  | 		pci_config_write16(addr, 0xffff); | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | 		ret = IRQ_HANDLED; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	return ret; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												sparc64: fix warnings in psycho_common after ull conversion
After conversion to use unsigned long long for u64
I saw following warnings:
  CC      arch/sparc/kernel/psycho_common.o
arch/sparc/kernel/psycho_common.c: In function `psycho_check_stc_error':
arch/sparc/kernel/psycho_common.c:104: warning: long long unsigned int format, long unsigned int arg (arg 4)
arch/sparc/kernel/psycho_common.c:104: warning: long long unsigned int format, long unsigned int arg (arg 5)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 4)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 5)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 6)
arch/sparc/kernel/psycho_common.c:114: warning: long long unsigned int format, long unsigned int arg (arg 7)
arch/sparc/kernel/psycho_common.c: In function `psycho_dump_iommu_tags_and_data':
arch/sparc/kernel/psycho_common.c:187: warning: long long unsigned int format, long unsigned int arg (arg 8)
arch/sparc/kernel/psycho_common.c:193: warning: long long unsigned int format, long unsigned int arg (arg 6)
arch/sparc/kernel/psycho_common.c: In function `psycho_pcierr_intr':
arch/sparc/kernel/psycho_common.c:333: warning: long long unsigned int format, long unsigned int arg (arg 3)
arch/sparc/kernel/psycho_common.c:333: warning: long long unsigned int format, long unsigned int arg (arg 4)
This is due to different integer promotion in my 32 bit hosted gcc.
The fix is to force a few constants to ULL.
The following stands out from the rest:
+#define  PSYCHO_IOMMU_TAG_VPAGE         0x7ffffULL
+#define  PSYCHO_IOMMU_DATA_PPAGE 0xfffffffULL
They were needed otherwise the expression:
    (data_val & PSYCHO_IOMMU_DATA_PPAGE) << IOMMU_PAGE_SHIFT)
were promoted to a unsigned long and not a unsigned long long as expected.
I tried the alternative solution and made IOMMU_PAGE_SHIFT an ULL but that did not help.
The only way gcc would make this expression an unsigned long long was to
define PSYCHO_IOMMU_DATA_PPAGE as ULL. The alternative to add a cast was
not considered a valid solution.
We had this issue in two places and this were the only places the above
two constants are used.
A small coding style diff sneaked in too. 
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
											
										 
											2009-01-08 11:37:19 -08:00
										 |  |  | #define  PSYCHO_PCIAFSR_PMA	0x8000000000000000ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_PCIAFSR_PTA	0x4000000000000000ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_PCIAFSR_PRTRY	0x2000000000000000ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_PCIAFSR_PPERR	0x1000000000000000ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_PCIAFSR_SMA	0x0800000000000000ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_PCIAFSR_STA	0x0400000000000000ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_PCIAFSR_SRTRY	0x0200000000000000ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_PCIAFSR_SPERR	0x0100000000000000ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_PCIAFSR_RESV1	0x00ff000000000000ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_PCIAFSR_BMSK	0x0000ffff00000000ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_PCIAFSR_BLK	0x0000000080000000ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_PCIAFSR_RESV2	0x0000000040000000ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_PCIAFSR_MID	0x000000003e000000ULL
 | 
					
						
							|  |  |  | #define  PSYCHO_PCIAFSR_RESV3	0x0000000001ffffffULL
 | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | irqreturn_t psycho_pcierr_intr(int irq, void *dev_id) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	struct pci_pbm_info *pbm = dev_id; | 
					
						
							|  |  |  | 	u64 afsr, afar, error_bits; | 
					
						
							|  |  |  | 	int reported; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	afsr = upa_readq(pbm->pci_afsr); | 
					
						
							|  |  |  | 	afar = upa_readq(pbm->pci_afar); | 
					
						
							|  |  |  | 	error_bits = afsr & | 
					
						
							|  |  |  | 		(PSYCHO_PCIAFSR_PMA | PSYCHO_PCIAFSR_PTA | | 
					
						
							|  |  |  | 		 PSYCHO_PCIAFSR_PRTRY | PSYCHO_PCIAFSR_PPERR | | 
					
						
							|  |  |  | 		 PSYCHO_PCIAFSR_SMA | PSYCHO_PCIAFSR_STA | | 
					
						
							|  |  |  | 		 PSYCHO_PCIAFSR_SRTRY | PSYCHO_PCIAFSR_SPERR); | 
					
						
							|  |  |  | 	if (!error_bits) | 
					
						
							|  |  |  | 		return psycho_pcierr_intr_other(pbm); | 
					
						
							|  |  |  | 	upa_writeq(error_bits, pbm->pci_afsr); | 
					
						
							|  |  |  | 	printk(KERN_ERR "%s: PCI Error, primary error type[%s]\n", | 
					
						
							|  |  |  | 	       pbm->name, | 
					
						
							|  |  |  | 	       (((error_bits & PSYCHO_PCIAFSR_PMA) ? | 
					
						
							|  |  |  | 		 "Master Abort" : | 
					
						
							|  |  |  | 		 ((error_bits & PSYCHO_PCIAFSR_PTA) ? | 
					
						
							|  |  |  | 		  "Target Abort" : | 
					
						
							|  |  |  | 		  ((error_bits & PSYCHO_PCIAFSR_PRTRY) ? | 
					
						
							|  |  |  | 		   "Excessive Retries" : | 
					
						
							|  |  |  | 		   ((error_bits & PSYCHO_PCIAFSR_PPERR) ? | 
					
						
							|  |  |  | 		    "Parity Error" : "???")))))); | 
					
						
							| 
									
										
										
										
											2009-01-06 13:19:28 -08:00
										 |  |  | 	printk(KERN_ERR "%s: bytemask[%04llx] UPA_MID[%02llx] was_block(%d)\n", | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | 	       pbm->name, | 
					
						
							|  |  |  | 	       (afsr & PSYCHO_PCIAFSR_BMSK) >> 32UL, | 
					
						
							|  |  |  | 	       (afsr & PSYCHO_PCIAFSR_MID) >> 25UL, | 
					
						
							|  |  |  | 	       (afsr & PSYCHO_PCIAFSR_BLK) ? 1 : 0); | 
					
						
							| 
									
										
										
										
											2009-01-06 13:19:28 -08:00
										 |  |  | 	printk(KERN_ERR "%s: PCI AFAR [%016llx]\n", pbm->name, afar); | 
					
						
							| 
									
										
										
										
											2008-09-10 03:52:51 -07:00
										 |  |  | 	printk(KERN_ERR "%s: PCI Secondary errors [", pbm->name); | 
					
						
							|  |  |  | 	reported = 0; | 
					
						
							|  |  |  | 	if (afsr & PSYCHO_PCIAFSR_SMA) { | 
					
						
							|  |  |  | 		reported++; | 
					
						
							|  |  |  | 		printk("(Master Abort)"); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	if (afsr & PSYCHO_PCIAFSR_STA) { | 
					
						
							|  |  |  | 		reported++; | 
					
						
							|  |  |  | 		printk("(Target Abort)"); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	if (afsr & PSYCHO_PCIAFSR_SRTRY) { | 
					
						
							|  |  |  | 		reported++; | 
					
						
							|  |  |  | 		printk("(Excessive Retries)"); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	if (afsr & PSYCHO_PCIAFSR_SPERR) { | 
					
						
							|  |  |  | 		reported++; | 
					
						
							|  |  |  | 		printk("(Parity Error)"); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	if (!reported) | 
					
						
							|  |  |  | 		printk("(none)"); | 
					
						
							|  |  |  | 	printk("]\n"); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (error_bits & (PSYCHO_PCIAFSR_PTA | PSYCHO_PCIAFSR_STA)) { | 
					
						
							|  |  |  | 		psycho_check_iommu_error(pbm, afsr, afar, PCI_ERR); | 
					
						
							|  |  |  | 		pci_scan_for_target_abort(pbm, pbm->pci_bus); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	if (error_bits & (PSYCHO_PCIAFSR_PMA | PSYCHO_PCIAFSR_SMA)) | 
					
						
							|  |  |  | 		pci_scan_for_master_abort(pbm, pbm->pci_bus); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (error_bits & (PSYCHO_PCIAFSR_PPERR | PSYCHO_PCIAFSR_SPERR)) | 
					
						
							|  |  |  | 		pci_scan_for_parity_error(pbm, pbm->pci_bus); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	return IRQ_HANDLED; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-09-10 03:07:03 -07:00
										 |  |  | static void psycho_iommu_flush(struct pci_pbm_info *pbm) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	int i; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	for (i = 0; i < 16; i++) { | 
					
						
							|  |  |  | 		unsigned long off = i * 8; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		upa_writeq(0, pbm->controller_regs + PSYCHO_IOMMU_TAG + off); | 
					
						
							|  |  |  | 		upa_writeq(0, pbm->controller_regs + PSYCHO_IOMMU_DATA + off); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define PSYCHO_IOMMU_CONTROL		0x0200UL
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_CTRL_TSBSZ	0x0000000000070000UL
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_TSBSZ_1K      	0x0000000000000000UL
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_TSBSZ_2K      	0x0000000000010000UL
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_TSBSZ_4K      	0x0000000000020000UL
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_TSBSZ_8K      	0x0000000000030000UL
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_TSBSZ_16K     	0x0000000000040000UL
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_TSBSZ_32K     	0x0000000000050000UL
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_TSBSZ_64K     	0x0000000000060000UL
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_TSBSZ_128K    	0x0000000000070000UL
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_CTRL_TBWSZ    	0x0000000000000004UL
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_CTRL_DENAB    	0x0000000000000002UL
 | 
					
						
							|  |  |  | #define  PSYCHO_IOMMU_CTRL_ENAB     	0x0000000000000001UL
 | 
					
						
							|  |  |  | #define PSYCHO_IOMMU_FLUSH		0x0210UL
 | 
					
						
							|  |  |  | #define PSYCHO_IOMMU_TSBBASE		0x0208UL
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | int psycho_iommu_init(struct pci_pbm_info *pbm, int tsbsize, | 
					
						
							|  |  |  | 		      u32 dvma_offset, u32 dma_mask, | 
					
						
							|  |  |  | 		      unsigned long write_complete_offset) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	struct iommu *iommu = pbm->iommu; | 
					
						
							|  |  |  | 	u64 control; | 
					
						
							|  |  |  | 	int err; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	iommu->iommu_control  = pbm->controller_regs + PSYCHO_IOMMU_CONTROL; | 
					
						
							|  |  |  | 	iommu->iommu_tsbbase  = pbm->controller_regs + PSYCHO_IOMMU_TSBBASE; | 
					
						
							|  |  |  | 	iommu->iommu_flush    = pbm->controller_regs + PSYCHO_IOMMU_FLUSH; | 
					
						
							|  |  |  | 	iommu->iommu_tags     = pbm->controller_regs + PSYCHO_IOMMU_TAG; | 
					
						
							|  |  |  | 	iommu->write_complete_reg = (pbm->controller_regs + | 
					
						
							|  |  |  | 				     write_complete_offset); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	iommu->iommu_ctxflush = 0; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	control = upa_readq(iommu->iommu_control); | 
					
						
							|  |  |  | 	control |= PSYCHO_IOMMU_CTRL_DENAB; | 
					
						
							|  |  |  | 	upa_writeq(control, iommu->iommu_control); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	psycho_iommu_flush(pbm); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	/* Leave diag mode enabled for full-flushing done in pci_iommu.c */ | 
					
						
							|  |  |  | 	err = iommu_table_init(iommu, tsbsize * 1024 * 8, | 
					
						
							|  |  |  | 			       dvma_offset, dma_mask, pbm->numa_node); | 
					
						
							|  |  |  | 	if (err) | 
					
						
							|  |  |  | 		return err; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	upa_writeq(__pa(iommu->page_table), iommu->iommu_tsbbase); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	control = upa_readq(iommu->iommu_control); | 
					
						
							|  |  |  | 	control &= ~(PSYCHO_IOMMU_CTRL_TSBSZ | PSYCHO_IOMMU_CTRL_TBWSZ); | 
					
						
							|  |  |  | 	control |= PSYCHO_IOMMU_CTRL_ENAB; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	switch (tsbsize) { | 
					
						
							|  |  |  | 	case 64: | 
					
						
							|  |  |  | 		control |= PSYCHO_IOMMU_TSBSZ_64K; | 
					
						
							|  |  |  | 		break; | 
					
						
							|  |  |  | 	case 128: | 
					
						
							|  |  |  | 		control |= PSYCHO_IOMMU_TSBSZ_128K; | 
					
						
							|  |  |  | 		break; | 
					
						
							|  |  |  | 	default: | 
					
						
							|  |  |  | 		return -EINVAL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	upa_writeq(control, iommu->iommu_control); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	return 0; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							| 
									
										
										
										
											2008-09-10 03:15:56 -07:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-07-22 16:04:30 -06:00
										 |  |  | void psycho_pbm_init_common(struct pci_pbm_info *pbm, struct platform_device *op, | 
					
						
							| 
									
										
										
										
											2008-09-10 03:15:56 -07:00
										 |  |  | 			    const char *chip_name, int chip_type) | 
					
						
							|  |  |  | { | 
					
						
							| 
									
										
										
										
											2010-04-13 16:12:29 -07:00
										 |  |  | 	struct device_node *dp = op->dev.of_node; | 
					
						
							| 
									
										
										
										
											2008-09-10 03:15:56 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	pbm->name = dp->full_name; | 
					
						
							|  |  |  | 	pbm->numa_node = -1; | 
					
						
							|  |  |  | 	pbm->chip_type = chip_type; | 
					
						
							|  |  |  | 	pbm->chip_version = of_getintprop_default(dp, "version#", 0); | 
					
						
							|  |  |  | 	pbm->chip_revision = of_getintprop_default(dp, "module-revision#", 0); | 
					
						
							|  |  |  | 	pbm->op = op; | 
					
						
							|  |  |  | 	pbm->pci_ops = &sun4u_pci_ops; | 
					
						
							|  |  |  | 	pbm->config_space_reg_bits = 8; | 
					
						
							|  |  |  | 	pbm->index = pci_num_pbms++; | 
					
						
							|  |  |  | 	pci_get_pbm_props(pbm); | 
					
						
							|  |  |  | 	pci_determine_mem_io_space(pbm); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	printk(KERN_INFO "%s: %s PCI Bus Module ver[%x:%x]\n", | 
					
						
							|  |  |  | 	       pbm->name, chip_name, | 
					
						
							|  |  |  | 	       pbm->chip_version, pbm->chip_revision); | 
					
						
							|  |  |  | } |