From patchwork Fri Oct 30 15:00:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 538367 X-Patchwork-Delegate: joe.hershberger@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 976F5140D95 for ; Sat, 31 Oct 2015 02:00:22 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr_eu.20150623.gappssmtp.com header.i=@monstr_eu.20150623.gappssmtp.com header.b=2PzfktEm; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7A3C5A74CD; Fri, 30 Oct 2015 16:00:20 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Xa834Bvv69NI; Fri, 30 Oct 2015 16:00:20 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B247CA74AF; Fri, 30 Oct 2015 16:00:19 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 64591A74AF for ; Fri, 30 Oct 2015 16:00:16 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Mg-kWOX7nJUE for ; Fri, 30 Oct 2015 16:00:16 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by theia.denx.de (Postfix) with ESMTPS id 18CCCA74AA for ; Fri, 30 Oct 2015 16:00:12 +0100 (CET) Received: by wmff134 with SMTP id f134so13982292wmf.0 for ; Fri, 30 Oct 2015 08:00:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr_eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id; bh=fvQw/n2R/umRhwrpRznUOywDyi+2ekkPOJOBGHd/0y4=; b=2PzfktEmtKK2XUvRCO/azYouabX3XtTt74alJBKUl5yxUqB/3XGoJ0xkx8Wgoopb39 IhTgluMmk59M9gC8LTACUS7XJs6hueIhWuqTdYDq1o5iFxVu7qKrDnNwDhZV2hSlWO0+ q6/uyxmK2zjh0WPqEDLmhVMk7+mrnPIuHmxQQfnLfq51RmzUU+NdzkqxttPhA+nqV/Ff tIZ4xuIdNb8XVMfnzLRiNABrKk9/nNnHE2YoJ0G8UEwIbgu19RSnv9/rsh98CfZZKPz0 /uHone8UI/dzPLc1oQ5JgesBYArqLLk6ezSIZ7nTW8O2YlgHG/7kF8Wg0LlnOhLwQDvg lv3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=fvQw/n2R/umRhwrpRznUOywDyi+2ekkPOJOBGHd/0y4=; b=EhMJFgQ8hlMnyX2nvcjSKTQFz+aNkyJwxdMTPHTloZAOcdVH5BP9EHpUS9mOSdlHZb Q8zHtnZECim9MK2ZH0CAJqX5/75/iBS7rrWU2PXprGUp+1Avssu0oEAiSC2aGo3eB1me GEqlbK1HQTuoyjtXrYvUij43AhgNCM2uYKtES1oKRq/ZjCHqrLxoJc2n5FLYnsMdL6/P ADZ1X/qMzgXEYe23+LHg8RzvLzuSK8xEWshJjooGqV1EwiYHpe47IJdLecdGMkR6+7ov 52qBqnKFg3z1lHilprUN105uLbHaO9QXIW0U1ewkF0hpSXFSb+wrCGaliWLhSvp7cj0s dSEA== X-Gm-Message-State: ALoCoQm5t8jiZd2NfAxSYh22AW9edglR6NpH6QFzQtCldLIf1JF6pbfu16uuQso2knGcqUoFk76N X-Received: by 10.28.18.21 with SMTP id 21mr4181733wms.34.1446217212315; Fri, 30 Oct 2015 08:00:12 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id v9sm7416644wjv.45.2015.10.30.08.00.11 (version=TLS1_1 cipher=AES128-SHA bits=128/128); Fri, 30 Oct 2015 08:00:11 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de Date: Fri, 30 Oct 2015 16:00:10 +0100 Message-Id: <4e22ec14e6bb8ff66e577e7c74893db48f3c5c81.1446217207.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.5.0 Cc: Tom Rini , Joe Hershberger Subject: [U-Boot] [PATCH] net: gem: Build warning fixes for 64-bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Cast pointers to unsigned long instead of a sized 32-bit type to avoid pointer to integer cast size mismatch warnings. Signed-off-by: Michal Simek Acked-by: Joe Hershberger --- drivers/net/zynq_gem.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 045954a7b059..ee2c6b1f4579 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -347,13 +347,13 @@ static int zynq_gem_init(struct eth_device *dev, bd_t * bis) for (i = 0; i < RX_BUF; i++) { priv->rx_bd[i].status = 0xF0000000; priv->rx_bd[i].addr = - ((u32)(priv->rxbuffers) + + ((unsigned long)(priv->rxbuffers) + (i * PKTSIZE_ALIGN)); } /* WRAP bit to last BD */ priv->rx_bd[--i].addr |= ZYNQ_GEM_RXBUF_WRAP_MASK; /* Write RxBDs to IP */ - writel((u32)priv->rx_bd, ®s->rxqbase); + writel((unsigned long)priv->rx_bd, ®s->rxqbase); /* Setup for DMA Configuration register */ writel(ZYNQ_GEM_DMACR_INIT, ®s->dmacr); @@ -378,8 +378,8 @@ static int zynq_gem_init(struct eth_device *dev, bd_t * bis) flush_dcache_range((ulong)&dummy_rx_bd, (ulong)&dummy_rx_bd + sizeof(dummy_rx_bd)); - writel((u32)dummy_tx_bd, ®s->transmit_q1_ptr); - writel((u32)dummy_rx_bd, ®s->receive_q1_ptr); + writel((unsigned long)dummy_tx_bd, ®s->transmit_q1_ptr); + writel((unsigned long)dummy_rx_bd, ®s->receive_q1_ptr); priv->init++; } @@ -458,7 +458,7 @@ static inline int wait_for_bit(const char *func, u32 *reg, const u32 mask, static int zynq_gem_send(struct eth_device *dev, void *ptr, int len) { - u32 addr, size; + unsigned long addr, size; struct zynq_gem_priv *priv = dev->priv; struct zynq_gem_regs *regs = (struct zynq_gem_regs *)dev->iobase; struct emac_bd *current_bd = &priv->tx_bd[1]; @@ -466,7 +466,7 @@ static int zynq_gem_send(struct eth_device *dev, void *ptr, int len) /* Setup Tx BD */ memset(priv->tx_bd, 0, sizeof(struct emac_bd)); - priv->tx_bd->addr = (u32)ptr; + priv->tx_bd->addr = (unsigned long)ptr; priv->tx_bd->status = (len & ZYNQ_GEM_TXBUF_FRMLEN_MASK) | ZYNQ_GEM_TXBUF_LAST_MASK; /* Dummy descriptor to mark it as the last in descriptor chain */ @@ -476,14 +476,14 @@ static int zynq_gem_send(struct eth_device *dev, void *ptr, int len) ZYNQ_GEM_TXBUF_USED_MASK; /* setup BD */ - writel((u32)priv->tx_bd, ®s->txqbase); + writel((unsigned long)priv->tx_bd, ®s->txqbase); - addr = (u32) ptr; + addr = (unsigned long)ptr; addr &= ~(ARCH_DMA_MINALIGN - 1); size = roundup(len, ARCH_DMA_MINALIGN); flush_dcache_range(addr, addr + size); - addr = (u32)priv->rxbuffers; + addr = (unsigned long)priv->rxbuffers; addr &= ~(ARCH_DMA_MINALIGN - 1); size = roundup((RX_BUF * PKTSIZE_ALIGN), ARCH_DMA_MINALIGN); flush_dcache_range(addr, addr + size); @@ -519,7 +519,7 @@ static int zynq_gem_recv(struct eth_device *dev) frame_len = current_bd->status & ZYNQ_GEM_RXBUF_LEN_MASK; if (frame_len) { - u32 addr = current_bd->addr & ZYNQ_GEM_RXBUF_ADD_MASK; + unsigned long addr = current_bd->addr & ZYNQ_GEM_RXBUF_ADD_MASK; addr &= ~(ARCH_DMA_MINALIGN - 1); net_process_received_packet((u8 *)addr, frame_len); @@ -601,7 +601,8 @@ int zynq_gem_initialize(bd_t *bis, phys_addr_t base_addr, /* Initialize the bd spaces for tx and rx bd's */ priv->tx_bd = (struct emac_bd *)bd_space; - priv->rx_bd = (struct emac_bd *)((u32)bd_space + BD_SEPRN_SPACE); + priv->rx_bd = (struct emac_bd *)((unsigned long)bd_space + + BD_SEPRN_SPACE); priv->phyaddr = phy_addr; priv->emio = emio;