From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751341AbbJGG7J (ORCPT ); Wed, 7 Oct 2015 02:59:09 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:52544 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750952AbbJGG7H (ORCPT ); Wed, 7 Oct 2015 02:59:07 -0400 From: Arnd Bergmann To: Joe Perches Cc: netdev@vger.kernel.org, davem@davemloft.net, Jiri Pirko , Ido Schimmel , linux-kernel@vger.kernel.org, Elad Raz , Scott Feldman , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] mlxsw: fix warnings for big-endian 32-bit dma_addr_t Date: Wed, 07 Oct 2015 08:58:34 +0200 Message-ID: <9933338.DDyBa8BQum@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1444200782.26237.8.camel@perches.com> References: <30258520.VaA2vDyUiY@wuerfel> <1444200782.26237.8.camel@perches.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:y+2byBNI0oReikkvxtbqwqHsvM93PXRVhPb4uvjI6tv4Esc6OMo hAsbb91o+WDH72v8pc42z38f4meUGbNFsBvRPZw7tzpxJkIAAmYAfMwldtNvJyxnB2wEpXH ZxIpIJZiN9+q1aMO4ipJWwwjNQdNzfz29GLHPC3EvgtVb9mvv4X8+V2elYp2p0Tt85W/GF7 W0v1cFqfxdSxiOSOCKX+A== X-UI-Out-Filterresults: notjunk:1;V01:K0:wxoHX87kY2M=:SgAp715PaQP5oCxWvReDS1 LwK397dZ/UU8+DsPgfx2jTSZrFzafB0rQd8vcPIQrGzC6/1XCM29KCAzJg9occzollD+ESzc9 n+lHiO0eRUNiGvzkYwDoAadN6Te+M4z8li1kCb/Cn+TDiTY3qtQ1pp8EjBEBZWYBTLc3/ia+8 HAzXEGbwB21Pv8hyRavUwSVpkHmG4yZUTcDPKTuQe+hWO32rYgYAsvZ1Jx4D3+NcwLbPPj8bx zFLfGYork2hPMAY8O3Z4vAlPVjGUUgcnGwbBlvEfC7wJ/hxGI07G2D/8zCr06hMcMpF5b/XM4 ORdlcL11ia3a/uJXcI9fWP5ML0Kw4Dy+Q8JlcRHdy2kARFrlqljVNuXSNWVkI1TuaTuq6mkST Vf8+6wo6YDlfioA307pAeqAebz8Am4EyMopFqry0BgFeu3pZrwFQmH0vmLa/VFlxLlYUV4G1j 3Bk/qjBAnVvb1Qh2mBlcTk/ZklzgFFmcw+/VEdMSGWJ8FOgrNxc5qog/EhW/7OSQAjouvZzWT P+Jc+9yH/lUIu4qPhEfRRLuw+LNyGteAYb+XkKbWbY6nUXRO1WxL2BL2/hd2cyf9X2Mx2c4wL Rqu4E6je4KS6meA+Zg8THHliik8NffOpw8Ff0O6erxUJleZ0XTPM6iJkHpBv4/5zrx/WYZgle p84niah/GSPhJCsg0Y2uB69p3slQdpIRE138UN8zRWiqK8oLElGeL93jotU7v6A6J93qq1tlg HrrQqrGKtzZbfBNv Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The recently added mlxsw driver produces warnings in ARM allmodconfig: drivers/net/ethernet/mellanox/mlxsw/pci.c: In function 'mlxsw_pci_cmd_exec': drivers/net/ethernet/mellanox/mlxsw/pci.c:1585:59: warning: right shift count >= width of type [-Wshift-count-overflow] linux/byteorder/big_endian.h:38:51: note: in definition of macro '__cpu_to_be32' drivers/net/ethernet/mellanox/mlxsw/pci.c:76:2: note: in expansion of macro 'iowrite32be' This uses upper_32_bits() to extract the bits while avoiding that warning. Signed-off-by: Arnd Bergmann Acked-by: Jiri Pirko Fixes: eda6500a987a "mlxsw: Add PCI bus implementation" --- I've kept Jiri's Ack despite having in effect a completely different patch here, as the effect and the changelog is the same for practical purposes. Hope that's ok. diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c index 462cea31ecbb..cef866c37648 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/pci.c +++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c @@ -1582,11 +1582,11 @@ static int mlxsw_pci_cmd_exec(void *bus_priv, u16 opcode, u8 opcode_mod, if (in_mbox) memcpy(mlxsw_pci->cmd.in_mbox.buf, in_mbox, in_mbox_size); - mlxsw_pci_write32(mlxsw_pci, CIR_IN_PARAM_HI, in_mapaddr >> 32); - mlxsw_pci_write32(mlxsw_pci, CIR_IN_PARAM_LO, in_mapaddr); + mlxsw_pci_write32(mlxsw_pci, CIR_IN_PARAM_HI, upper_32_bits(in_mapaddr)); + mlxsw_pci_write32(mlxsw_pci, CIR_IN_PARAM_LO, lower_32_bits(in_mapaddr)); - mlxsw_pci_write32(mlxsw_pci, CIR_OUT_PARAM_HI, out_mapaddr >> 32); - mlxsw_pci_write32(mlxsw_pci, CIR_OUT_PARAM_LO, out_mapaddr); + mlxsw_pci_write32(mlxsw_pci, CIR_OUT_PARAM_HI, upper_32_bits(out_mapaddr)); + mlxsw_pci_write32(mlxsw_pci, CIR_OUT_PARAM_LO, lower_32_bits(out_mapaddr)); mlxsw_pci_write32(mlxsw_pci, CIR_IN_MODIFIER, in_mod); mlxsw_pci_write32(mlxsw_pci, CIR_TOKEN, 0);