add ax88772_rst

hc

2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29

 kernel/arch/xtensa/include/asm/vectors.h
..
..
@@ -18,61 +18,29 @@
18
18
 #ifndef _XTENSA_VECTORS_H
19
19
 #define _XTENSA_VECTORS_H
20
20
 
21
-#include <variant/core.h>
21
+#include <asm/core.h>
22
22
 #include <asm/kmem_layout.h>
23
23
 
24
-#if XCHAL_HAVE_PTP_MMU
25
-#define XCHAL_KIO_CACHED_VADDR		0xe0000000
26
-#define XCHAL_KIO_BYPASS_VADDR		0xf0000000
27
-#define XCHAL_KIO_DEFAULT_PADDR		0xf0000000
24
+#if defined(CONFIG_MMU) && XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY
25
+#ifdef CONFIG_KERNEL_VIRTUAL_ADDRESS
26
+#define KERNELOFFSET			CONFIG_KERNEL_VIRTUAL_ADDRESS
28
27
 #else
29
-#define XCHAL_KIO_BYPASS_VADDR		XCHAL_KIO_PADDR
30
-#define XCHAL_KIO_DEFAULT_PADDR		0x90000000
31
-#endif
32
-#define XCHAL_KIO_SIZE			0x10000000
33
-
34
-#if (!XCHAL_HAVE_PTP_MMU || XCHAL_HAVE_SPANNING_WAY) && defined(CONFIG_USE_OF)
35
-#define XCHAL_KIO_PADDR			xtensa_get_kio_paddr()
36
-#ifndef __ASSEMBLY__
37
-extern unsigned long xtensa_kio_paddr;
38
-
39
-static inline unsigned long xtensa_get_kio_paddr(void)
40
-{
41
-	return xtensa_kio_paddr;
42
-}
43
-#endif
44
-#else
45
-#define XCHAL_KIO_PADDR			XCHAL_KIO_DEFAULT_PADDR
46
-#endif
47
-
48
-#if defined(CONFIG_MMU)
49
-
50
-#if XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY
51
-/* Image Virtual Start Address */
52
-#define KERNELOFFSET			(XCHAL_KSEG_CACHED_VADDR + \
53
-					 CONFIG_KERNEL_LOAD_ADDRESS - \
28
+#define KERNELOFFSET			(CONFIG_KERNEL_LOAD_ADDRESS + \
29
+					 XCHAL_KSEG_CACHED_VADDR - \
54
30
 					 XCHAL_KSEG_PADDR)
31
+#endif
55
32
 #else
56
33
 #define KERNELOFFSET			CONFIG_KERNEL_LOAD_ADDRESS
57
34
 #endif
58
-
59
-#else /* !defined(CONFIG_MMU) */
60
-  /* MMU Not being used - Virtual == Physical */
61
-
62
-/* Location of the start of the kernel text, _start */
63
-#define KERNELOFFSET			CONFIG_KERNEL_LOAD_ADDRESS
64
-
65
-
66
-#endif /* CONFIG_MMU */
67
35
 
68
36
 #define RESET_VECTOR1_VADDR		(XCHAL_RESET_VECTOR1_VADDR)
69
-#ifdef CONFIG_VECTORS_OFFSET
70
-#define VECBASE_VADDR			(KERNELOFFSET - CONFIG_VECTORS_OFFSET)
37
+#ifdef CONFIG_VECTORS_ADDR
38
+#define VECBASE_VADDR			(CONFIG_VECTORS_ADDR)
71
39
 #else
72
40
 #define VECBASE_VADDR			_vecbase
73
41
 #endif
74
42
 
75
-#if defined(XCHAL_HAVE_VECBASE) && XCHAL_HAVE_VECBASE
43
+#if XCHAL_HAVE_VECBASE
76
44
 
77
45
 #define VECTOR_VADDR(offset)		(VECBASE_VADDR + offset)
78
46