提交 3cbb8d0d 编写于 作者: G Geert Uytterhoeven 提交者: Greg Kroah-Hartman

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: NGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20221101080111.750748-1-geert@linux-m68k.orgSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 3b45e2e1
...@@ -154,13 +154,13 @@ static inline uint64_t cvmx_build_bits(uint64_t high_bit, ...@@ -154,13 +154,13 @@ static inline uint64_t cvmx_build_bits(uint64_t high_bit,
/** /**
* Convert a memory pointer (void*) into a hardware compatible * 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. * understand logical addresses.
* *
* @ptr: C style memory pointer * @ptr: C style memory pointer
* Returns Hardware physical address * 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) { if (sizeof(void *) == 8) {
/* /*
......
...@@ -1212,7 +1212,7 @@ static inline void *cvmx_phys_to_ptr(uint64_t physical_address) ...@@ -1212,7 +1212,7 @@ static inline void *cvmx_phys_to_ptr(uint64_t physical_address)
return (void *)(uintptr_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; return (unsigned long)ptr;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册