[PATCH 3/4] mips: sync asm/addrspace.h with Linux 5.7

[Stefan Roese]

On 12.07.20 01:46, Daniel Schwierzeck wrote:
> Sync asm/addrspace.h with Linux 5.7
> 
> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>

Reviewed-by: Stefan Roese <sr at denx.de>
Tested-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
> 
>   arch/mips/include/asm/addrspace.h | 14 ++------------
>   1 file changed, 2 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/mips/include/asm/addrspace.h b/arch/mips/include/asm/addrspace.h
> index ae6f586f00..8112ab833e 100644
> --- a/arch/mips/include/asm/addrspace.h
> +++ b/arch/mips/include/asm/addrspace.h
> @@ -42,7 +42,7 @@
>   /*
>    * Returns the kernel segment base of a given address
>    */
> -#define KSEGX(a)		((_ACAST32_ (a)) & 0xe0000000)
> +#define KSEGX(a)		((_ACAST32_(a)) & _ACAST32_(0xe0000000))
>   
>   /*
>    * Returns the physical address of a CKSEGx / XKPHYS address
> @@ -123,8 +123,7 @@
>   #define PHYS_TO_XKSEG_UNCACHED(p)	PHYS_TO_XKPHYS(K_CALG_UNCACHED, (p))
>   #define PHYS_TO_XKSEG_CACHED(p)		PHYS_TO_XKPHYS(K_CALG_COH_SHAREABLE, (p))
>   #define XKPHYS_TO_PHYS(p)		((p) & TO_PHYS_MASK)
> -#define PHYS_TO_XKPHYS(cm, a)		(_CONST64_(0x8000000000000000) | \
> -					 (_CONST64_(cm) << 59) | (a))
> +#define PHYS_TO_XKPHYS(cm, a)		(XKPHYS | (_ACAST64_(cm) << 59) | (a))
>   
>   /*
>    * The ultimate limited of the 64-bit MIPS architecture:  2 bits for selecting
> @@ -133,18 +132,9 @@
>    */
>   #define TO_PHYS_MASK	_CONST64_(0x07ffffffffffffff)	/* 2^^59 - 1 */
>   
> -#ifndef CONFIG_CPU_R8000
> -
> -/*
> - * The R8000 doesn't have the 32-bit compat spaces so we don't define them
> - * in order to catch bugs in the source code.
> - */
> -
>   #define COMPAT_K1BASE32		_CONST64_(0xffffffffa0000000)
>   #define PHYS_TO_COMPATK1(x)	((x) | COMPAT_K1BASE32) /* 32-bit compat k1 */
>   
> -#endif
> -
>   #define KDM_TO_PHYS(x)		(_ACAST64_ (x) & TO_PHYS_MASK)
>   #define PHYS_TO_K0(x)		(_ACAST64_ (x) | CAC_BASE)
>   
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de