From patchwork Thu Sep 27 19:48:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Fischer X-Patchwork-Id: 975873 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42LlkC0QBsz9s3x for ; Fri, 28 Sep 2018 05:49:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727567AbeI1CIx (ORCPT ); Thu, 27 Sep 2018 22:08:53 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:33776 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727358AbeI1CIw (ORCPT ); Thu, 27 Sep 2018 22:08:52 -0400 Received: by mail-pg1-f195.google.com with SMTP id y18-v6so2721088pge.0 for ; Thu, 27 Sep 2018 12:48:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WgkLxetghD43EB2J79DDlFtMR0Nk9CEW/84WajNEtF0=; b=C2Nr2tOxqF296fyN/5GBEvpbiAzLpGFpiCRBovrr4nSYavrU06sE/HUrYX7YgQfgoF nm3e97CFQb4R35xKR0YDZSXacks6OFNgnKzmMkYFpj38garzBfLrANXrzlAn580bS744 /8oeL/66t5ThhB1df6v2b9EiIcmjcGcGQj249KX6mZ8wP6M1NF2CbA3X3cg4zqF0QBVt 2o89gdRRKpcvr51lKyDs52L7+100rKGy8dqRAzS8owgtsiZNHhslWu9s7F/GvP6HOc8d WRQCcgbIusW9C8AuKV9b/+R2Ukd4rGVa6Bq7sn6k+j8E9VFNgJIMtu441unjnbao86ts rowA== X-Gm-Message-State: ABuFfohsk+EmkUWxs1SLb9mYE5tJZE8wkCadf35hBuSjemEMXplr6Q1F 4tds8HdeFz84HdTtjJ/BLRiNzQ== X-Google-Smtp-Source: ACcGV62zRVQctwEpZWwUwvYlsA3Kg9WfQDmkKydHtHv/q7J8mTNRHEDn8Va4R52iDFu524HhYEATpA== X-Received: by 2002:a62:23cd:: with SMTP id q74-v6mr13065696pfj.151.1538077738485; Thu, 27 Sep 2018 12:48:58 -0700 (PDT) Received: from localhost ([207.114.172.147]) by smtp.gmail.com with ESMTPSA id g66-v6sm4256628pfk.39.2018.09.27.12.48.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Sep 2018 12:48:57 -0700 (PDT) From: Moritz Fischer To: linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org, keescook@chromium.org, davem@davemloft.net, moritz.fischer@ettus.com, f.fainelli@gmail.com, alex.williams@ni.com, Moritz Fischer , Arnd Bergmann Subject: [PATCH net-next] net: nixge: Address compiler warnings when building for i386 Date: Thu, 27 Sep 2018 12:48:51 -0700 Message-Id: <20180927194851.3042-1-mdf@kernel.org> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Address compiler warning reported by kbuild autobuilders when building for i386 as a result of dma_addr_t size on different architectures. warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] Fixes: 7e8d5755be0e ("net: nixge: Add support for 64-bit platforms") Signed-off-by: Moritz Fischer Cc: Arnd Bergmann --- drivers/net/ethernet/ni/nixge.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c index 74cf52e3fb09..0611f2335b4a 100644 --- a/drivers/net/ethernet/ni/nixge.c +++ b/drivers/net/ethernet/ni/nixge.c @@ -127,8 +127,8 @@ struct nixge_hw_dma_bd { #ifdef CONFIG_PHYS_ADDR_T_64BIT #define nixge_hw_dma_bd_set_addr(bd, field, addr) \ do { \ - (bd)->field##_lo = lower_32_bits(((u64)addr)); \ - (bd)->field##_hi = upper_32_bits(((u64)addr)); \ + (bd)->field##_lo = lower_32_bits((addr)); \ + (bd)->field##_hi = upper_32_bits((addr)); \ } while (0) #else #define nixge_hw_dma_bd_set_addr(bd, field, addr) \ @@ -251,7 +251,7 @@ static void nixge_hw_dma_bd_release(struct net_device *ndev) NIXGE_MAX_JUMBO_FRAME_SIZE, DMA_FROM_DEVICE); - skb = (struct sk_buff *) + skb = (struct sk_buff *)(uintptr_t) nixge_hw_dma_bd_get_addr(&priv->rx_bd_v[i], sw_id_offset); dev_kfree_skb(skb); @@ -323,7 +323,7 @@ static int nixge_hw_dma_bd_init(struct net_device *ndev) if (!skb) goto out; - nixge_hw_dma_bd_set_offset(&priv->rx_bd_v[i], skb); + nixge_hw_dma_bd_set_offset(&priv->rx_bd_v[i], (uintptr_t)skb); phys = dma_map_single(ndev->dev.parent, skb->data, NIXGE_MAX_JUMBO_FRAME_SIZE, DMA_FROM_DEVICE); @@ -601,8 +601,8 @@ static int nixge_recv(struct net_device *ndev, int budget) tail_p = priv->rx_bd_p + sizeof(*priv->rx_bd_v) * priv->rx_bd_ci; - skb = (struct sk_buff *)nixge_hw_dma_bd_get_addr(cur_p, - sw_id_offset); + skb = (struct sk_buff *)(uintptr_t) + nixge_hw_dma_bd_get_addr(cur_p, sw_id_offset); length = cur_p->status & XAXIDMA_BD_STS_ACTUAL_LEN_MASK; if (length > NIXGE_MAX_JUMBO_FRAME_SIZE) @@ -643,7 +643,7 @@ static int nixge_recv(struct net_device *ndev, int budget) nixge_hw_dma_bd_set_phys(cur_p, cur_phys); cur_p->cntrl = NIXGE_MAX_JUMBO_FRAME_SIZE; cur_p->status = 0; - nixge_hw_dma_bd_set_offset(cur_p, new_skb); + nixge_hw_dma_bd_set_offset(cur_p, (uintptr_t)new_skb); ++priv->rx_bd_ci; priv->rx_bd_ci %= RX_BD_NUM;