[U-Boot] [PATCH 3/4] net: pcnet: Make 64 bit safe

[Joe Hershberger]

Hi Paul,

On Tue, May 17, 2016 at 5:56 AM, Paul Burton <paul.burton at imgtec.com> wrote:
> Fix the pcnet driver to build safely on 64 bit platforms, in preparation
> for allowing MIPS64 builds for Malta boards.
>
> Signed-off-by: Paul Burton <paul.burton at imgtec.com>
> ---
>
>  drivers/net/pcnet.c | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
> index 16a7512..7dff445 100644
> --- a/drivers/net/pcnet.c
> +++ b/drivers/net/pcnet.c
> @@ -137,7 +137,7 @@ static int pcnet_probe (struct eth_device *dev, bd_t * bis, int dev_num);
>  static inline pci_addr_t pcnet_virt_to_mem(const struct eth_device *dev,
>                                                 void *addr, bool uncached)
>  {
> -       pci_dev_t devbusfn = (pci_dev_t)dev->priv;
> +       pci_dev_t devbusfn = (pci_dev_t)(unsigned long)dev->priv;

I thought this sort of double cast was frowned upon and warns in some
compilers. Is that not an issue here?

>         void *virt_addr = addr;
>
>         if (uncached)
> @@ -179,7 +179,7 @@ int pcnet_initialize(bd_t *bis)
>                         break;
>                 }
>                 memset(dev, 0, sizeof(*dev));
> -               dev->priv = (void *)devbusfn;
> +               dev->priv = (void *)(unsigned long)devbusfn;
>                 sprintf(dev->name, "pcnet#%d", dev_nr);
>
>                 /*
> @@ -190,8 +190,8 @@ int pcnet_initialize(bd_t *bis)
>                 dev->iobase = pci_io_to_phys(devbusfn, dev->iobase);
>                 dev->iobase &= ~0xf;
>
> -               PCNET_DEBUG1("%s: devbusfn=0x%x iobase=0x%x: ",
> -                            dev->name, devbusfn, dev->iobase);
> +               PCNET_DEBUG1("%s: devbusfn=0x%x iobase=0x%lx: ",
> +                            dev->name, devbusfn, (unsigned long)dev->iobase);
>
>                 command = PCI_COMMAND_IO | PCI_COMMAND_MASTER;
>                 pci_write_config_word(devbusfn, PCI_COMMAND, command);
> @@ -298,7 +298,7 @@ static int pcnet_init(struct eth_device *dev, bd_t *bis)
>  {
>         struct pcnet_uncached_priv *uc;
>         int i, val;
> -       u32 addr;
> +       unsigned long addr;
>
>         PCNET_DEBUG1("%s: pcnet_init...\n", dev->name);
>
> @@ -336,16 +336,18 @@ static int pcnet_init(struct eth_device *dev, bd_t *bis)
>          * must be aligned on 16-byte boundaries.
>          */
>         if (lp == NULL) {
> -               addr = (u32)malloc(sizeof(pcnet_priv_t) + 0x10);
> +               addr = (unsigned long)malloc(sizeof(pcnet_priv_t) + 0x10);
>                 addr = (addr + 0xf) & ~0xf;
>                 lp = (pcnet_priv_t *)addr;
>
> -               addr = (u32)memalign(ARCH_DMA_MINALIGN, sizeof(*lp->uc));
> +               addr = (unsigned long)memalign(ARCH_DMA_MINALIGN,
> +                                              sizeof(*lp->uc));
>                 flush_dcache_range(addr, addr + sizeof(*lp->uc));
>                 addr = UNCACHED_SDRAM(addr);
>                 lp->uc = (struct pcnet_uncached_priv *)addr;
>
> -               addr = (u32)memalign(ARCH_DMA_MINALIGN, sizeof(*lp->rx_buf));
> +               addr = (unsigned long)memalign(ARCH_DMA_MINALIGN,
> +                                              sizeof(*lp->rx_buf));
>                 flush_dcache_range(addr, addr + sizeof(*lp->rx_buf));
>                 lp->rx_buf = (void *)addr;
>         }
> --
> 2.8.2
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot