staging: octeon: cvmx_ptr_to_phys() should return physaddr_t
authorGeert Uytterhoeven <geert@linux-m68k.org>
Tue, 1 Nov 2022 08:01:11 +0000 (09:01 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 Nov 2022 07:21:49 +0000 (08:21 +0100)
commit3cbb8d0d6d42958c146624a102d1a0e59a820b65
treec937fa118126b1e0b7c8552e353b47a8fc5dbe0f
parent3b45e2e139c1e71b17a97ae887ba1caadd8e8ad2
staging: octeon: cvmx_ptr_to_phys() should return physaddr_t

On 32-bit without physical address extensions (e.g. sh-allmodconfig):

    drivers/staging/octeon/ethernet-mem.c: In function ‘cvm_oct_free_hw_memory’:
    ./arch/sh/include/asm/io.h:239:32: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
      239 | #define phys_to_virt(address) ((void *)(address))
  |                                ^
    drivers/staging/octeon/ethernet-mem.c:123:18: note: in expansion of macro ‘phys_to_virt’
      123 |    fpa = (char *)phys_to_virt(cvmx_ptr_to_phys(fpa));
  |                  ^~~~~~~~~~~~

Fix this by making cvmx_ptr_to_phys() return physaddr_t instead of
uint64_t.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20221101080111.750748-1-geert@linux-m68k.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/mips/include/asm/octeon/cvmx.h
drivers/staging/octeon/octeon-stubs.h