Commit c1884e1e authored Aug 10, 2023 by Linus Walleij Committed by Guo Ren Aug 10, 2023

csky: Make pfn accessors static inlines



Making virt_to_pfn() a static inline taking a strongly typed
(const void *) makes the contract of a passing a pointer of that
type to the function explicit and exposes any misuse of the
macro virt_to_pfn() acting polymorphic and accepting many types
such as (void *), (unitptr_t) or (unsigned long) as arguments
without warnings.

For symmetry to the same thing with pfn_to_virt().

In order to do this we move the virt_to_phys() and
phys_to_virt() below the definitions of the __pa()
and __va() macros so it compiles. The macro version was also
able to do recursive symbol resolution.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Signed-off-by: Guo Ren <guoren@kernel.org>

parent ee12fe28

arch/csky/include/asm/page.h

+10 −3

Original line number	Diff line number	Diff line
		@@ -34,9 +34,6 @@

		#include <linux/pfn.h>

		#define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT)
		#define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT)

		#define virt_addr_valid(kaddr) ((void )(kaddr) >= (void )PAGE_OFFSET && \
		(void *)(kaddr) < high_memory)

		@@ -80,6 +77,16 @@ extern unsigned long va_pa_offset;

		#define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x), 0))

		static inline unsigned long virt_to_pfn(const void *kaddr)
		{
		return __pa(kaddr) >> PAGE_SHIFT;
		}

		static inline void * pfn_to_virt(unsigned long pfn)
		{
		return (void *)((unsigned long)__va(pfn) << PAGE_SHIFT);
		}

		#define MAP_NR(x) PFN_DOWN((unsigned long)(x) - PAGE_OFFSET - \
		PHYS_OFFSET_OFFSET)
		#define virt_to_page(x) (mem_map + MAP_NR(x))