patch-2.1.110 linux/include/asm-alpha/mcpcia.h

• Lines: 140
• Date: Sun Jul 19 20:44:41 1998
• Orig file: v2.1.109/linux/include/asm-alpha/mcpcia.h
• Orig date: Tue Jun 9 11:57:31 1998

diff -u --recursive --new-file v2.1.109/linux/include/asm-alpha/mcpcia.h linux/include/asm-alpha/mcpcia.h
@@ -167,6 +167,8 @@
 #define MCPCIA_DENSE(h)		(IDENT_ADDR + 0xf900000000UL + HOSE(h))
 #define MCPCIA_IACK_SC(h)	(IDENT_ADDR + 0xf9f0003f00UL + HOSE(h))
 
+#define DENSE_MEM(addr)		MCPCIA_DENSE(((unsigned long)(addr) >> 32) & 3)
+
 #define HAE_ADDRESS		MCPCIA_HAE_MEM(0)
 
 #ifdef __KERNEL__
@@ -197,6 +199,7 @@
  */
 
 #define vuip	volatile unsigned int *
+#define vulp	volatile unsigned long *
 
 #ifdef DISABLE_BWIO_ENABLED
 
@@ -375,7 +378,7 @@
 	__asm__ __volatile__ (
 		 "ldbu %0,%1"
 		 : "=r" (result)
-		 : "m"  (*(unsigned char *)(addr+MCPCIA_BW_MEM)));
+		 : "m"  (*(volatile unsigned char *)(addr+MCPCIA_BW_MEM)));
 
 	return result;
 }
@@ -387,21 +390,19 @@
 	__asm__ __volatile__ (
 		 "ldwu %0,%1"
 		 : "=r" (result)
-		 : "m"  (*(unsigned short *)(addr+MCPCIA_BW_MEM)));
+		 : "m"  (*(volatile unsigned short *)(addr+MCPCIA_BW_MEM)));
 
 	return result;
 }
 
 extern inline unsigned long __readl(unsigned long addr)
 {
-	register unsigned long result;
-
-	__asm__ __volatile__ (
-		 "ldl %0,%1"
-		 : "=r" (result)
-		 : "m"  (*(unsigned int *)(addr+MCPCIA_BW_MEM)));
+	return *(vuip)(addr + MCPCIA_BW_MEM);
+}
 
-	return result;
+extern inline unsigned long __readq(unsigned long addr)
+{
+	return *(vulp)(addr + MCPCIA_BW_MEM);
 }
 
 extern inline void __writeb(unsigned char b, unsigned long addr)
@@ -409,7 +410,8 @@
 	__asm__ __volatile__ (
 		 "stb %1,%0\n\t"
 		 "mb"
-		 : : "m" (*(unsigned char *)(addr+MCPCIA_BW_MEM)), "r" (b));
+		 : "m" (*(volatile unsigned char *)(addr+MCPCIA_BW_MEM))
+		 : "r" (b));
 }
 
 extern inline void __writew(unsigned short b, unsigned long addr)
@@ -417,15 +419,20 @@
 	__asm__ __volatile__ (
 		 "stw %1,%0\n\t"
 		 "mb"
-		 : : "m" (*(unsigned short *)(addr+MCPCIA_BW_MEM)), "r" (b));
+		 : "m" (*(volatile unsigned short *)(addr+MCPCIA_BW_MEM))
+		 : "r" (b));
 }
 
 extern inline void __writel(unsigned int b, unsigned long addr)
 {
-	__asm__ __volatile__ (
-		 "stl %1,%0\n\t"
-		 "mb"
-		 : : "m" (*(unsigned int *)(addr+MCPCIA_BW_MEM)), "r" (b));
+	*(vuip)(addr+MCPCIA_BW_MEM) = b;
+	mb();
+}
+
+extern inline void __writeq(unsigned long b, unsigned long addr)
+{
+	*(vulp)(addr+MCPCIA_BW_MEM) = b;
+	mb();
 }
 
 #define readb(addr) __readb((addr))
@@ -620,6 +627,13 @@
 	return *(vuip) (addr + MCPCIA_DENSE(hose));
 }
 
+extern inline unsigned long __readq(unsigned long in_addr)
+{
+	unsigned long addr = in_addr & 0xffffffffUL;
+	unsigned long hose = (in_addr >> 32) & 3;
+	return *(vulp) (addr + MCPCIA_DENSE(hose));
+}
+
 extern inline void __writel(unsigned int b, unsigned long in_addr)
 {
 	unsigned long addr = in_addr & 0xffffffffUL;
@@ -627,12 +641,22 @@
 	*(vuip) (addr + MCPCIA_DENSE(hose)) = b;
 }
 
+extern inline void __writeq(unsigned long b, unsigned long in_addr)
+{
+	unsigned long addr = in_addr & 0xffffffffUL;
+	unsigned long hose = (in_addr >> 32) & 3;
+	*(vulp) (addr + MCPCIA_DENSE(hose)) = b;
+}
+
 #endif /* BWIO_ENABLED */
 
 #define readl(a)	__readl((unsigned long)(a))
+#define readq(a)	__readq((unsigned long)(a))
 #define writel(v,a)	__writel((v),(unsigned long)(a))
+#define writeq(v,a)	__writeq((v),(unsigned long)(a))
 
 #undef vuip
+#undef vulp
 
 struct linux_hose_info {
         struct pci_bus                  pci_bus;
@@ -646,10 +670,8 @@
 	unsigned int                    pci_hose_index;
 };
 
-extern unsigned long mcpcia_init (unsigned long mem_start,
-				 unsigned long mem_end);
-extern unsigned long mcpcia_fixup (unsigned long mem_start,
-				 unsigned long mem_end);
+extern unsigned long mcpcia_init (unsigned long, unsigned long);
+extern void mcpcia_fixup (void);
 
 #endif /* __KERNEL__ */