From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754482AbeAMVOP (ORCPT + 1 other); Sat, 13 Jan 2018 16:14:15 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:56505 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754173AbeAMVOO (ORCPT ); Sat, 13 Jan 2018 16:14:14 -0500 From: Arnd Bergmann To: Jassi Brar Cc: Arnd Bergmann , "David S. Miller" , Ard Biesheuvel , Wei Yongjun , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [net-next] net: netsec: use dma_addr_t for storing dma address Date: Sat, 13 Jan 2018 22:13:44 +0100 Message-Id: <20180113211355.638195-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:mnSAr84cdJNhle4ijQ3tnj28P97LQ4RvuI40WIof2UDzopdpYzx lca4mJ3mm4mFT6/pHVoRoSlmB+7btq3RsgN9u5HaogRTSMwPpYE8OYSZskdWu2zViUdjOK/ 4Qxt+oMYk8JoECJGGyuJqL/NVsZ3CWC7m2HEasnRVGEMn36wdTpIc0YAEpmeph3W7YOKChi 66BgXOWaZt8YsHJmmT1uA== X-UI-Out-Filterresults: notjunk:1;V01:K0:jfafAyzV+Is=:y2RyHPSHKa/lewxcA5xGJD Bg+a9l1xNdTOCA9SGitKNzoWhzV6ZQLsUJxlyZSZ2smNU/EJt7vapU3Ahar1uSk3Eq8UTk7Jm 2X7ic7ordCM8WkuFERIQF8JyZcc58SFbFmRV+FusSyGebF//mxpDKWJVvTaHe5yRo3KjZ1Ej8 OcYpsLE/PbJi7CwTN8mPPrRfi5DkNH7bjvl6IQ0hcGGEl1m51MUbUk1fCj7loMVjUTDMRQfS6 pXrQE1aQhOffXqJgoR6WzdQ4Yyp9VdJV7nnETJGry/ThBliCu52E4lVGpeJPK2F7bMqNQI9UT yuHgDqIUKFtlJ4IFcmKZP5Qyt2Uvs1gtSNZQjsLD6PE0PRl0dAiAQ8OFy0aeUn+t0vgEcs4EP VWtcd5wT3121yIruDxAFJevMHOw5PU7djQEJYmmsgjSFAaOkS64N5BaowUhaKYN/VsJ4TxJHj ruXvQEpTru8ZEvTRPIYzaSN25aUv5Ee+1TkhGHY7XEE1JxV4K/QhRHmrSJMSTtobD6jdMgon4 VDe9NOAUZpdFx3eG8RKmhqrZgpwnct8eM7pI85GqunQGQYelCAZD3f1KPpNupjh8Oy/pWm+6F JmoHFkuoT9MiR/UfSJOHKD7kYCMU1WVFPosfpwRSj21u8HsdJ2Mp0P9pdAEgZIzm4R9W+rqqB SmUJpk9XQw+3BrQc2snYSyeLqCO9q1TGrQdeeva48+LhmYaXlUuZEEwL/+cSnlPCNEhMe/dr1 5iMOWmqzBJU35SPaSKaEH4fDOOM2W8EogE6k2A== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On targets that have different sizes for phys_addr_t and dma_addr_t, we get a type mismatch error: drivers/net/ethernet/socionext/netsec.c: In function 'netsec_alloc_dring': drivers/net/ethernet/socionext/netsec.c:970:9: error: passing argument 3 of 'dma_zalloc_coherent' from incompatible pointer type [-Werror=incompatible-pointer-types] The code is otherwise correct, as the address is never actually used as a physical address but only passed into a DMA register. For consistently, I'm changing the variable name as well, to clarify that this is a DMA address. Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/socionext/netsec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c index 6c263af86b8a..f4c0b02ddad8 100644 --- a/drivers/net/ethernet/socionext/netsec.c +++ b/drivers/net/ethernet/socionext/netsec.c @@ -252,7 +252,7 @@ struct netsec_desc { }; struct netsec_desc_ring { - phys_addr_t desc_phys; + dma_addr_t desc_dma; struct netsec_desc *desc; void *vaddr; u16 pkt_cnt; @@ -953,7 +953,7 @@ static void netsec_free_dring(struct netsec_priv *priv, int id) if (dring->vaddr) { dma_free_coherent(priv->dev, DESC_SZ * DESC_NUM, - dring->vaddr, dring->desc_phys); + dring->vaddr, dring->desc_dma); dring->vaddr = NULL; } @@ -967,7 +967,7 @@ static int netsec_alloc_dring(struct netsec_priv *priv, enum ring_id id) int ret = 0; dring->vaddr = dma_zalloc_coherent(priv->dev, DESC_SZ * DESC_NUM, - &dring->desc_phys, GFP_KERNEL); + &dring->desc_dma, GFP_KERNEL); if (!dring->vaddr) { ret = -ENOMEM; goto err; @@ -1087,14 +1087,14 @@ static int netsec_reset_hardware(struct netsec_priv *priv) /* set desc_start addr */ netsec_write(priv, NETSEC_REG_NRM_RX_DESC_START_UP, - upper_32_bits(priv->desc_ring[NETSEC_RING_RX].desc_phys)); + upper_32_bits(priv->desc_ring[NETSEC_RING_RX].desc_dma)); netsec_write(priv, NETSEC_REG_NRM_RX_DESC_START_LW, - lower_32_bits(priv->desc_ring[NETSEC_RING_RX].desc_phys)); + lower_32_bits(priv->desc_ring[NETSEC_RING_RX].desc_dma)); netsec_write(priv, NETSEC_REG_NRM_TX_DESC_START_UP, - upper_32_bits(priv->desc_ring[NETSEC_RING_TX].desc_phys)); + upper_32_bits(priv->desc_ring[NETSEC_RING_TX].desc_dma)); netsec_write(priv, NETSEC_REG_NRM_TX_DESC_START_LW, - lower_32_bits(priv->desc_ring[NETSEC_RING_TX].desc_phys)); + lower_32_bits(priv->desc_ring[NETSEC_RING_TX].desc_dma)); /* set normal tx dring ring config */ netsec_write(priv, NETSEC_REG_NRM_TX_CONFIG, -- 2.9.0