Commit 3cbb8d0d authored Nov 01, 2022 by Geert Uytterhoeven Committed by Greg Kroah-Hartman Nov 02, 2022

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>

parent 3b45e2e1

arch/mips/include/asm/octeon/cvmx.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -154,13 +154,13 @@ static inline uint64_t cvmx_build_bits(uint64_t high_bit,

		/**
		* Convert a memory pointer (void*) into a hardware compatible
		* memory address (uint64_t). Octeon hardware widgets don't
		* memory address (phys_addr_t). Octeon hardware widgets don't
		* understand logical addresses.
		*
		* @ptr: C style memory pointer
		* Returns Hardware physical address
		*/
		static inline uint64_t cvmx_ptr_to_phys(void *ptr)
		static inline phys_addr_t cvmx_ptr_to_phys(void *ptr)
		{
		if (sizeof(void *) == 8) {
		/*

drivers/staging/octeon/octeon-stubs.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1212,7 +1212,7 @@ static inline void *cvmx_phys_to_ptr(uint64_t physical_address)
		return (void *)(uintptr_t)(physical_address);
		}

		static inline uint64_t cvmx_ptr_to_phys(void *ptr)
		static inline phys_addr_t cvmx_ptr_to_phys(void *ptr)
		{
		return (unsigned long)ptr;
		}