add dts config

hc

2023-12-06 08f87f769b595151be1afeff53e144f543faa614

 kernel/arch/x86/xen/xen-head.S
..
..
@@ -22,7 +22,7 @@
22
22
 
23
23
 #ifdef CONFIG_XEN_PV
24
24
 	__INIT
25
-ENTRY(startup_xen)
25
+SYM_CODE_START(startup_xen)
26
26
 	UNWIND_HINT_EMPTY
27
27
 	cld
28
28
 
..
..
@@ -35,33 +35,43 @@
35
35
 	rep __ASM_SIZE(stos)
36
36
 
37
37
 	mov %_ASM_SI, xen_start_info
38
-	mov $init_thread_union+THREAD_SIZE, %_ASM_SP
38
+	mov initial_stack(%rip), %rsp
39
39
 
40
-#ifdef CONFIG_X86_64
41
40
 	/* Set up %gs.
42
41
 	 *
43
-	 * The base of %gs always points to the bottom of the irqstack
44
-	 * union.  If the stack protector canary is enabled, it is
45
-	 * located at %gs:40.  Note that, on SMP, the boot cpu uses
46
-	 * init data section till per cpu areas are set up.
42
+	 * The base of %gs always points to fixed_percpu_data.  If the
43
+	 * stack protector canary is enabled, it is located at %gs:40.
44
+	 * Note that, on SMP, the boot cpu uses init data section until
45
+	 * the per cpu areas are set up.
47
46
 	 */
48
47
 	movl	$MSR_GS_BASE,%ecx
49
-	movq	$INIT_PER_CPU_VAR(irq_stack_union),%rax
48
+	movq	$INIT_PER_CPU_VAR(fixed_percpu_data),%rax
50
49
 	cdq
51
50
 	wrmsr
52
-#endif
53
51
 
54
-	jmp xen_start_kernel
55
-END(startup_xen)
52
+	call xen_start_kernel
53
+SYM_CODE_END(startup_xen)
56
54
 	__FINIT
55
+
56
+#ifdef CONFIG_XEN_PV_SMP
57
+.pushsection .text
58
+SYM_CODE_START(asm_cpu_bringup_and_idle)
59
+	UNWIND_HINT_EMPTY
60
+
61
+	call cpu_bringup_and_idle
62
+SYM_CODE_END(asm_cpu_bringup_and_idle)
63
+.popsection
64
+#endif
57
65
 #endif
58
66
 
59
67
 .pushsection .text
60
68
 	.balign PAGE_SIZE
61
-ENTRY(hypercall_page)
69
+SYM_CODE_START(hypercall_page)
62
70
 	.rept (PAGE_SIZE / 32)
63
-		UNWIND_HINT_EMPTY
64
-		.skip 32
71
+		UNWIND_HINT_FUNC
72
+		ANNOTATE_UNRET_SAFE
73
+		ret
74
+		.skip 31, 0xcc
65
75
 	.endr
66
76
 
67
77
 #define HYPERCALL(n) \
..
..
@@ -69,7 +79,7 @@
69
79
 	.type xen_hypercall_##n, @function; .size xen_hypercall_##n, 32
70
80
 #include <asm/xen-hypercalls.h>
71
81
 #undef HYPERCALL
72
-END(hypercall_page)
82
+SYM_CODE_END(hypercall_page)
73
83
 .popsection
74
84
 
75
85
 	ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS,       .asciz "linux")