From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758724AbcHYOsb (ORCPT ); Thu, 25 Aug 2016 10:48:31 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:61184 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758016AbcHYOrv (ORCPT ); Thu, 25 Aug 2016 10:47:51 -0400 From: Arnd Bergmann To: Russell King Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Nicolas Pitre , "David S. Miller" , Yoshinori Sato , Robert Jarzmik , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] smc91x: remove ARM hack for unaligned 16-bit writes Date: Thu, 25 Aug 2016 16:46:21 +0200 Message-Id: <20160825144633.1850889-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160825144633.1850889-1-arnd@arndb.de> References: <20160825144633.1850889-1-arnd@arndb.de> X-Provags-ID: V03:K0:pSakRnSaRm6vbeHi73qPahTVNpDT6NvAs/ONcA4o4FXlJrkI3ex CUL1EFDDK2337PgzrjQwG3nexWI8b1IgIdn2r5rKGYPMKHRuPxjVn6OcUwULhQg5eDZqRir 9Vkip7ehLU6QJIgUKqTEDhJCeVtYAiAHwsmPTm9Bx6HAwYRSvjt/TWRrV9lkbjJoKmmUFkZ vGS5jeYsEos/LDhAZQB6g== X-UI-Out-Filterresults: notjunk:1;V01:K0:iT+rMLQG54E=:7K13SOi8icpjRs9afHgpQS jcP/G54GSoIQ6yQpLfWvxeeQHNSGSM5bDfgWLuHfDir0ZeYDMFQo+QdP7UH7YslWYPndtggla bb7sEuc5k/9zl70hXEy//ar2jWUebhXcmyJ8DX14Nl/3R9QG0oMvH2CZpXp0LGgVijZjhZEjR TtyPKAKuoChb8QHeesaEy+NWNhNXM+meMNMH1iAfWk/WNxwg5MEtyZofA08zYFw63Cb6ovvqr BwUeenC4zB2Appaeboxy0MRknbrzqEAp5ESlxQJIIQjqR5x/XzzwCEkqf3OP/MFP5/vY/GQQY pnmyH1K3v0sCj3RoG2N2P7XYPn9z5G6LAMnoh1jHZfM2iDBXlL8E+wjACb/LuGF4jI2VbzFXG i/pQlEem32RmJ0bkbGiSmvgHXC8/Xfah+7asVGNchDq7hZwT+uwRFxqvn3XmI1UGWMv7GCEIE uZ9VHn/tN5hrGTMSwJCBxoUaO98dW3cDQegx0QohfEypbA76nvAcpYr/lnl/spp2dv7LgylVd zhYf9lGBv/ktY7CaVBJxb8Mhn3pk6MfGxF2tVGlZW6CQVghuJ+B2ooNAU04AJ1Qd11wENojBS tbUel8naMEbMt7yiP3of3sLHsOjmdNepQYEP3M4K/sZcYZHrhWuwy6vhjx3Jxo50ULzasmMQo m7Jcp92GDblTw3Q26t+sCl/YKicbOTcSMT4Te9veabr1VH8WZLCqNbRudXVG19zM5xtU= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The ARM specific I/O operations are almost the same as the generic ones, with the exception of the SMC_outw macro that works around a problem of some platforms that cannot write to 16-bit registers at an address that is not 32-bit aligned. By inspection, I found that this is handled already in the register abstractions for almost all cases, the exceptions being SMC_SET_MAC_ADDR() and SMC_SET_MCAST(). I assume that all platforms that require the hack for the other registers also need it here, so the ones listed explictly here are the only ones that work correctly, while the other ones either don't need the hack at all, or they will set an incorrect MAC address (which can often go unnoticed). This changes the two macros that set the unaligned registers to use 32-bit writes if possible, which should do the right thing in all combinations. The ARM specific SMC_outw gets removed as a consequence. The only difference between the ARM behavior and the default is the selection of the LED settings. The fact that we have different defaults based on the CPU architectures here is a bit suspicious, but probably harmless, and I have no plan of touching that. Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/smsc/smc91x.h | 50 +++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h index 22333477d0b5..908473d9ede0 100644 --- a/drivers/net/ethernet/smsc/smc91x.h +++ b/drivers/net/ethernet/smsc/smc91x.h @@ -58,6 +58,7 @@ #define SMC_inw(a, r) readw((a) + (r)) #define SMC_inl(a, r) readl((a) + (r)) #define SMC_outb(v, a, r) writeb(v, (a) + (r)) +#define SMC_outw(v, a, r) writew(v, (a) + (r)) #define SMC_outl(v, a, r) writel(v, (a) + (r)) #define SMC_insw(a, r, p, l) readsw((a) + (r), p, l) #define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l) @@ -65,19 +66,6 @@ #define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l) #define SMC_IRQ_FLAGS (-1) /* from resource */ -/* We actually can't write halfwords properly if not word aligned */ -static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg) -{ - if ((machine_is_mainstone() || machine_is_stargate2() || - machine_is_pxa_idp()) && reg & 2) { - unsigned int v = val << 16; - v |= readl(ioaddr + (reg & ~2)) & 0xffff; - writel(v, ioaddr + (reg & ~2)); - } else { - writew(val, ioaddr + reg); - } -} - #elif defined(CONFIG_SH_SH4202_MICRODEV) #define SMC_CAN_USE_8BIT 0 @@ -1029,18 +1017,40 @@ static const char * chip_ids[ 16 ] = { #define SMC_SET_MAC_ADDR(lp, addr) \ do { \ - SMC_out16(addr[0]|(addr[1] << 8), ioaddr, ADDR0_REG(lp)); \ - SMC_out16(addr[2]|(addr[3] << 8), ioaddr, ADDR1_REG(lp)); \ - SMC_out16(addr[4]|(addr[5] << 8), ioaddr, ADDR2_REG(lp)); \ + if (SMC_32BIT(lp)) { \ + SMC_outl((addr[0] )|(addr[1] << 8) | \ + (addr[2] << 16)|(addr[3] << 24), \ + ioaddr, ADDR0_REG(lp)); \ + } else { \ + SMC_out16(addr[0]|(addr[1] << 8), ioaddr, \ + ADDR0_REG(lp)); \ + SMC_out16(addr[2]|(addr[3] << 8), ioaddr, \ + ADDR1_REG(lp)); \ + } \ + SMC_out16(addr[4]|(addr[5] << 8), ioaddr, \ + ADDR2_REG(lp)); \ } while (0) #define SMC_SET_MCAST(lp, x) \ do { \ const unsigned char *mt = (x); \ - SMC_out16(mt[0] | (mt[1] << 8), ioaddr, MCAST_REG1(lp)); \ - SMC_out16(mt[2] | (mt[3] << 8), ioaddr, MCAST_REG2(lp)); \ - SMC_out16(mt[4] | (mt[5] << 8), ioaddr, MCAST_REG3(lp)); \ - SMC_out16(mt[6] | (mt[7] << 8), ioaddr, MCAST_REG4(lp)); \ + if (SMC_32BIT(lp)) { \ + SMC_outl((mt[0] ) | (mt[1] << 8) | \ + (mt[2] << 16) | (mt[3] << 24), \ + ioaddr, MCAST_REG1(lp)); \ + SMC_outl((mt[4] ) | (mt[5] << 8) | \ + (mt[6] << 16) | (mt[7] << 24), \ + ioaddr, MCAST_REG3(lp)); \ + } else { \ + SMC_out16(mt[0] | (mt[1] << 8), \ + ioaddr, MCAST_REG1(lp)); \ + SMC_out16(mt[2] | (mt[3] << 8), \ + ioaddr, MCAST_REG2(lp)); \ + SMC_out16(mt[4] | (mt[5] << 8), \ + ioaddr, MCAST_REG3(lp)); \ + SMC_out16(mt[6] | (mt[7] << 8), \ + ioaddr, MCAST_REG4(lp)); \ + } \ } while (0) #define SMC_PUT_PKT_HDR(lp, status, length) \ -- 2.9.0