Commit c146f3d1 authored by Christophe Leroy's avatar Christophe Leroy Committed by Jakub Kicinski
Browse files

net: fs_enet: Fix warning due to wrong type 



Building fs_enet on powerpc e500 leads to following warning:

    CC      drivers/net/ethernet/freescale/fs_enet/mac-scc.o
  In file included from ./include/linux/build_bug.h:5,
                   from ./include/linux/container_of.h:5,
                   from ./include/linux/list.h:5,
                   from ./include/linux/module.h:12,
                   from drivers/net/ethernet/freescale/fs_enet/mac-scc.c:15:
  drivers/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd':
  ./include/linux/err.h:28:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
     28 | #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO)
        |                                                 ^
  ./include/linux/compiler.h:77:45: note: in definition of macro 'unlikely'
     77 | # define unlikely(x)    __builtin_expect(!!(x), 0)
        |                                             ^
  drivers/net/ethernet/freescale/fs_enet/mac-scc.c:138:13: note: in expansion of macro 'IS_ERR_VALUE'
    138 |         if (IS_ERR_VALUE(fep->ring_mem_addr))
        |             ^~~~~~~~~~~~

This is due to fep->ring_mem_addr not being a pointer but a DMA
address which is 64 bits on that platform while pointers are
32 bits as this is a 32 bits platform with wider physical bus.

However, using fep->ring_mem_addr is just wrong because
cpm_muram_alloc() returns an offset within the muram and not
a physical address directly. So use fpi->dpram_offset instead.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/ec67ea3a3bef7e58b8dc959f7c17d405af0d27e4.1723101144.git.christophe.leroy@csgroup.eu


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2d5c9dd2

drivers/net/ethernet/freescale/fs_enet/mac-scc.c

+9 −9
Original line number Diff line number Diff line
@@ -131,15 +131,14 @@ static int setup_data(struct net_device *dev) 
static int allocate_bd(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	const struct fs_platform_info *fpi = fep->fpi;

	struct fs_platform_info *fpi = fep->fpi;



	fep->ring_mem_addr = cpm_muram_alloc((fpi->tx_ring + fpi->rx_ring) *

	fpi->dpram_offset = cpm_muram_alloc((fpi->tx_ring + fpi->rx_ring) *

					    sizeof(cbd_t), 8);

	if (IS_ERR_VALUE(fep->ring_mem_addr))

	if (IS_ERR_VALUE(fpi->dpram_offset))

		return -ENOMEM;



	fep->ring_base = (void __iomem __force*)

		cpm_muram_addr(fep->ring_mem_addr);

	fep->ring_base = cpm_muram_addr(fpi->dpram_offset);



	return 0;

}
@@ -147,9 +146,10 @@ static int allocate_bd(struct net_device *dev) 
static void free_bd(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	const struct fs_platform_info *fpi = fep->fpi;



	if (fep->ring_base)

		cpm_muram_free(fep->ring_mem_addr);

		cpm_muram_free(fpi->dpram_offset);

}



static void cleanup_data(struct net_device *dev)
@@ -247,9 +247,9 @@ static void restart(struct net_device *dev) 
		__fs_out8((u8 __iomem *)ep + i, 0);



	/* point to bds */

	W16(ep, sen_genscc.scc_rbase, fep->ring_mem_addr);

	W16(ep, sen_genscc.scc_rbase, fpi->dpram_offset);

	W16(ep, sen_genscc.scc_tbase,

	    fep->ring_mem_addr + sizeof(cbd_t) * fpi->rx_ring);

	    fpi->dpram_offset + sizeof(cbd_t) * fpi->rx_ring);



	/* Initialize function code registers for big-endian.

	 */