Skip to contentSkip to conversation

net/tulip: don't warn about unknown ARM architecture

PATCH Applied Arnd Bergmann 3 participants 3 messages Jan 30, 2015 – Feb 3, 2015

Subsystems (3)
Networking Network drivers Tulip network drivers
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 net/tulip: don't warn about unknown ARM architecture

ARM has 32-byte cache lines, which according to the comment in the init registers function seems to work best with the default value of 0x4800 that is also used on sparc and parisc.

This adds ARM to the same list, to use that default but no longer warn about it.

Signed-off-by Arnd Bergmann <[email protected]>
drivers/net/ethernet/dec/tulip/winbond-840.c +1 -1
index 6aa887e0e1cb..9beb3d34d4ba 100644
@@ -904,7 +904,7 @@ static void init_registers(struct net_device *dev)
 	}
 #elif defined(__powerpc__) || defined(__i386__) || defined(__alpha__) || defined(__ia64__) || defined(__x86_64__)
 	i |= 0xE000;
-#elif defined(CONFIG_SPARC) || defined (CONFIG_PARISC)
+#elif defined(CONFIG_SPARC) || defined (CONFIG_PARISC) || defined(CONFIG_ARM)
 	i |= 0x4800;
 #else
 #warning Processor architecture undefined
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Arnd Bergmann

ARM has 32-byte cache lines, which according to the comment in the init registers function seems to work best with the default value of 0x4800 that is also used on sparc and parisc.

This adds ARM to the same list, to use that default but no longer warn about it.

Signed-off-by Arnd Bergmann <[email protected]>
Acked-by Grant Grundler <[email protected]>

thanks!
grant

Quoted 14 lines
drivers/net/ethernet/dec/tulip/winbond-840.c +1 -1
index 6aa887e0e1cb..9beb3d34d4ba 100644
@@ -904,7 +904,7 @@ static void init_registers(struct net_device *dev)
        }
 #elif defined(__powerpc__) || defined(__i386__) || defined(__alpha__) || defined(__ia64__) || defined(__x86_64__)
        i |= 0xE000;
-#elif defined(CONFIG_SPARC) || defined (CONFIG_PARISC)
+#elif defined(CONFIG_SPARC) || defined (CONFIG_PARISC) || defined(CONFIG_ARM)
        i |= 0x4800;
 #else
 #warning Processor architecture undefined
maintainer Applied
#2 lore raw
In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>
Date: Fri, 30 Jan 2015 22:58:19 +0100

Quoted 8 lines

ARM has 32-byte cache lines, which according to the comment in the init registers function seems to work best with the default value of 0x4800 that is also used on sparc and parisc.

This adds ARM to the same list, to use that default but no longer warn about it.

Signed-off-by Arnd Bergmann <[email protected]>

Applied, thanks a lot.