Skip to contentSkip to conversation

SPARC: added SMC91111 driver in and out macros for LEON processors.

PATCH New Daniel Hellstrom 2 participants 4 messages Mar 31, 2008 Network drivers

lore
Share & tools
lore

Daniel Hellstrom

author
#0 lore raw

PATCH 8/13 SPARC: added SMC91111 driver in and out macros for LEON processors.

Quoted 1 line · Ben Warren

I haven't looked at how all the funky macros in this patch are called, but it's generally considered good form to wrap multi-line macros with do {...} while(0) in order to avoid compiler issues. I'll NAK the patch for now based on this.

The Macros are used to read/write 8-,16-,32-bit words from the I/O bus where the SMC MAC is. LEON2/3 is bigendian, so the macros swaps the read and written data as well. The I/O bus is non-cacheable so no force cache miss is needed here.

I have made the do{}while(0) you asked for and updated patch 8 and my repository:

Signed-off-by Daniel Hellstrom <[email protected]>
---
 drivers/net/smc91111.h |   73 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 71 insertions(+), 2 deletions(-)
drivers/net/smc91111.h +71 -2
index 8dcbb3e..ef325d2 100644
@@ -79,7 +79,7 @@ typedef unsigned long int 		dword;
 #ifdef CONFIG_XSENGINE
 #define	SMC_inl(r) 	(*((volatile dword *)(SMC_BASE_ADDRESS+(r<<1))))
 #define	SMC_inw(r) 	(*((volatile word *)(SMC_BASE_ADDRESS+(r<<1))))
-#define SMC_inb(p)	({ \
+#define SMC_inb(p)  ({ \
 	unsigned int __p = (unsigned int)(SMC_BASE_ADDRESS + (p<<1)); \
 	unsigned int __v = *(volatile unsigned short *)((__p) & ~2); \
 	if (__p & 2) __v >>= 8; \

@@ -176,7 +176,76 @@ typedef unsigned long int 		dword;
 					};  \
 				})
 
-#else /* if not CONFIG_PXA250 */
+#elif defined(CONFIG_LEON)	/* if not CONFIG_PXA250 */
+
+#define SMC_LEON_SWAP16(_x_) ({ word _x = (_x_); ((_x << 8) | (_x >> 8)); })
+
+#define SMC_LEON_SWAP32(_x_)			\
+    ({ dword _x = (_x_);			\
+       ((_x << 24) |				\
+       ((0x0000FF00UL & _x) <<  8) |		\
+       ((0x00FF0000UL & _x) >>  8) |		\
+       (_x  >> 24)); })
+			 
+#define	SMC_inl(r) 	(SMC_LEON_SWAP32((*(volatile dword *)(SMC_BASE_ADDRESS+((r)<<0)))))
+#define	SMC_inl_nosw(r) 	((*(volatile dword *)(SMC_BASE_ADDRESS+((r)<<0))))
+#define	SMC_inw(r) 	(SMC_LEON_SWAP16((*(volatile word *)(SMC_BASE_ADDRESS+((r)<<0)))))
+#define	SMC_inw_nosw(r) 	((*(volatile word *)(SMC_BASE_ADDRESS+((r)<<0))))
+#define SMC_inb(p)	({ \
+	word ___v = SMC_inw((p) & ~1); \
+	if ((p) & 1) ___v >>= 8; \
+	else ___v &= 0xff; \
+	___v; })
+
+#define	SMC_outl(d,r)	(*(volatile dword *)(SMC_BASE_ADDRESS+((r)<<0))=SMC_LEON_SWAP32(d))
+#define	SMC_outl_nosw(d,r)	(*(volatile dword *)(SMC_BASE_ADDRESS+((r)<<0))=(d))
+#define	SMC_outw(d,r)	(*(volatile word *)(SMC_BASE_ADDRESS+((r)<<0))=SMC_LEON_SWAP16(d))
+#define	SMC_outw_nosw(d,r)	(*(volatile word *)(SMC_BASE_ADDRESS+((r)<<0))=(d))
+#define	SMC_outb(d,r)	do{	word __d = (byte)(d);  \
+				word __w = SMC_inw((r)&~1);  \
+				__w &= ((r)&1) ? 0x00FF : 0xFF00;  \
+				__w |= ((r)&1) ? __d<<8 : __d;  \
+				SMC_outw(__w,(r)&~1);  \
+			}while(0)
+#define SMC_outsl(r,b,l)	do{	int __i; \
+					dword *__b2; \
+					__b2 = (dword *) b; \
+					for (__i = 0; __i < l; __i++) { \
+					    SMC_outl_nosw( *(__b2 + __i), r); \
+					} \
+				}while(0)
+#define SMC_outsw(r,b,l)	do{	int __i; \
+					word *__b2; \
+					__b2 = (word *) b; \
+					for (__i = 0; __i < l; __i++) { \
+					    SMC_outw_nosw( *(__b2 + __i), r); \
+					} \
+				}while(0)
+#define SMC_insl(r,b,l) 	do{	int __i ;  \
+					dword *__b2;  \
+			    		__b2 = (dword *) b;  \
+			    		for (__i = 0; __i < l; __i++) {  \
+					  *(__b2 + __i) = SMC_inl_nosw(r);  \
+					};  \
+				}while(0)
+
+#define SMC_insw(r,b,l) 	do{	int __i ;  \
+					word *__b2;  \
+			    		__b2 = (word *) b;  \
+			    		for (__i = 0; __i < l; __i++) {  \
+					  *(__b2 + __i) = SMC_inw_nosw(r);  \
+					};  \
+				}while(0)
+
+#define SMC_insb(r,b,l) 	do{	int __i ;  \
+					byte *__b2;  \
+			    		__b2 = (byte *) b;  \
+			    		for (__i = 0; __i < l; __i++) {  \
+					  *(__b2 + __i) = SMC_inb(r);  \
+					};  \
+				}while(0)
+
+#else				/* if not CONFIG_PXA250 and not CONFIG_LEON */
 
 #ifndef CONFIG_SMC_USE_IOFUNCS /* these macros don't work on some boards */
 /*
Signature · 1 line
1.5.4
#1 lore raw

PATCH 8/13 SPARC: added SMC91111 driver in and out macros for LEON processors.

Quoted 13 lines · Daniel Hellstrom
Quoted 2 lines · Ben Warren

I haven't looked at how all the funky macros in this patch are called, but it's generally considered good form to wrap multi-line macros with do {...} while(0) in order to avoid compiler issues. I'll NAK the patch for now based on this.

The Macros are used to read/write 8-,16-,32-bit words from the I/O bus where the SMC MAC is. LEON2/3 is bigendian, so the macros swaps the read and written data as well. The I/O bus is non-cacheable so no force cache miss is needed here.

I have made the do{}while(0) you asked for and updated patch 8 and my repository:

Per the e-mail by A. Rubini, I guess this isn't necessary. Sorry for causing extra work for you. I'll pull this into the net tree today.

regards,
Ben

author
#2 lore raw

PATCH 8/13 SPARC: added SMC91111 driver in and out macros for LEON processors.

Quoted 23 lines · Ben Warren
Quoted 10 lines · Daniel Hellstrom
Quoted 5 lines · Ben Warren

I haven't looked at how all the funky macros in this patch are called, but it's generally considered good form to wrap multi-line macros with do {...} while(0) in order to avoid compiler issues. I'll NAK the patch for now based on this.

Quoted 10 lines

The Macros are used to read/write 8-,16-,32-bit words from the I/O bus where the SMC MAC is. LEON2/3 is bigendian, so the macros swaps the read and written data as well. The I/O bus is non-cacheable so no force cache miss is needed here.

I have made the do{}while(0) you asked for and updated patch 8 and my repository:

Quoted 5 lines

Per the e-mail by A. Rubini, I guess this isn't necessary. Sorry for causing extra work for you. I'll pull this into the net tree today.

regards,
Ben

I agree with you both. However, some of the macros should not be "expression statements" as they return nothing this is also indicated by the inline function declared in drivers/net/smc91111.c:
static inline word SMC_inw(dword offset);
static inline void SMC_outw(word value, dword offset);
static inline byte SMC_inb(dword offset);
static inline void SMC_outb(byte value, dword offset);
static inline void SMC_insw(dword offset, volatile uchar* buf, dword len); static inline void SMC_outsw(dword offset, uchar* buf, dword len);

I my last patch I let the only the "true" "expressions statements" have the gcc slang Alessandro speak of.

I would prefer the last patch I sent, currently in the repository.

Best Regards,
Daniel Hellstrom

#3 lore raw

PATCH 8/13 SPARC: added SMC91111 driver in and out macros for LEON processors.

Quoted 42 lines · Daniel Hellstrom
Quoted 23 lines · Ben Warren
Quoted 10 lines · Daniel Hellstrom
Quoted 5 lines · Ben Warren

I haven't looked at how all the funky macros in this patch are called, but it's generally considered good form to wrap multi-line macros with do {...} while(0) in order to avoid compiler issues. I'll NAK the patch for now based on this.

Quoted 10 lines

The Macros are used to read/write 8-,16-,32-bit words from the I/O bus where the SMC MAC is. LEON2/3 is bigendian, so the macros swaps the read and written data as well. The I/O bus is non-cacheable so no force cache miss is needed here.

I have made the do{}while(0) you asked for and updated patch 8 and my repository:

Quoted 5 lines

Per the e-mail by A. Rubini, I guess this isn't necessary. Sorry for causing extra work for you. I'll pull this into the net tree today.

regards,
Ben

I agree with you both. However, some of the macros should not be "expression statements" as they return nothing this is also indicated by the inline function declared in drivers/net/smc91111.c:
static inline word SMC_inw(dword offset);
static inline void SMC_outw(word value, dword offset); static inline byte SMC_inb(dword offset);
static inline void SMC_outb(byte value, dword offset); static inline void SMC_insw(dword offset, volatile uchar* buf, dword len);
static inline void SMC_outsw(dword offset, uchar* buf, dword len);

Quoted 5 lines

I my last patch I let the only the "true" "expressions statements" have the gcc slang Alessandro speak of.

I would prefer the last patch I sent, currently in the repository.

Very good. Thanks for being so thorough! Much more interesting than quibbling about whitespace...

regards,
Ben