forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/arch/x86/boot/boot.h
....@@ -1,11 +1,9 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
12 /* -*- linux-c -*- ------------------------------------------------------- *
23 *
34 * Copyright (C) 1991, 1992 Linus Torvalds
45 * Copyright 2007 rPath, Inc. - All Rights Reserved
56 * Copyright 2009 Intel Corporation; author H. Peter Anvin
6
- *
7
- * This file is part of the Linux kernel, and is made available under
8
- * the terms of the GNU General Public License version 2.
97 *
108 * ----------------------------------------------------------------------- */
119
....@@ -30,8 +28,6 @@
3028 #include "cpuflags.h"
3129
3230 /* Useful macros */
33
-#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
34
-
3531 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
3632
3733 extern struct setup_header hdr;
....@@ -114,66 +110,78 @@
114110
115111 static inline u8 rdfs8(addr_t addr)
116112 {
113
+ u8 *ptr = (u8 *)absolute_pointer(addr);
117114 u8 v;
118
- asm volatile("movb %%fs:%1,%0" : "=q" (v) : "m" (*(u8 *)addr));
115
+ asm volatile("movb %%fs:%1,%0" : "=q" (v) : "m" (*ptr));
119116 return v;
120117 }
121118 static inline u16 rdfs16(addr_t addr)
122119 {
120
+ u16 *ptr = (u16 *)absolute_pointer(addr);
123121 u16 v;
124
- asm volatile("movw %%fs:%1,%0" : "=r" (v) : "m" (*(u16 *)addr));
122
+ asm volatile("movw %%fs:%1,%0" : "=r" (v) : "m" (*ptr));
125123 return v;
126124 }
127125 static inline u32 rdfs32(addr_t addr)
128126 {
127
+ u32 *ptr = (u32 *)absolute_pointer(addr);
129128 u32 v;
130
- asm volatile("movl %%fs:%1,%0" : "=r" (v) : "m" (*(u32 *)addr));
129
+ asm volatile("movl %%fs:%1,%0" : "=r" (v) : "m" (*ptr));
131130 return v;
132131 }
133132
134133 static inline void wrfs8(u8 v, addr_t addr)
135134 {
136
- asm volatile("movb %1,%%fs:%0" : "+m" (*(u8 *)addr) : "qi" (v));
135
+ u8 *ptr = (u8 *)absolute_pointer(addr);
136
+ asm volatile("movb %1,%%fs:%0" : "+m" (*ptr) : "qi" (v));
137137 }
138138 static inline void wrfs16(u16 v, addr_t addr)
139139 {
140
- asm volatile("movw %1,%%fs:%0" : "+m" (*(u16 *)addr) : "ri" (v));
140
+ u16 *ptr = (u16 *)absolute_pointer(addr);
141
+ asm volatile("movw %1,%%fs:%0" : "+m" (*ptr) : "ri" (v));
141142 }
142143 static inline void wrfs32(u32 v, addr_t addr)
143144 {
144
- asm volatile("movl %1,%%fs:%0" : "+m" (*(u32 *)addr) : "ri" (v));
145
+ u32 *ptr = (u32 *)absolute_pointer(addr);
146
+ asm volatile("movl %1,%%fs:%0" : "+m" (*ptr) : "ri" (v));
145147 }
146148
147149 static inline u8 rdgs8(addr_t addr)
148150 {
151
+ u8 *ptr = (u8 *)absolute_pointer(addr);
149152 u8 v;
150
- asm volatile("movb %%gs:%1,%0" : "=q" (v) : "m" (*(u8 *)addr));
153
+ asm volatile("movb %%gs:%1,%0" : "=q" (v) : "m" (*ptr));
151154 return v;
152155 }
153156 static inline u16 rdgs16(addr_t addr)
154157 {
158
+ u16 *ptr = (u16 *)absolute_pointer(addr);
155159 u16 v;
156
- asm volatile("movw %%gs:%1,%0" : "=r" (v) : "m" (*(u16 *)addr));
160
+ asm volatile("movw %%gs:%1,%0" : "=r" (v) : "m" (*ptr));
157161 return v;
158162 }
159163 static inline u32 rdgs32(addr_t addr)
160164 {
165
+ u32 *ptr = (u32 *)absolute_pointer(addr);
161166 u32 v;
162
- asm volatile("movl %%gs:%1,%0" : "=r" (v) : "m" (*(u32 *)addr));
167
+ asm volatile("movl %%gs:%1,%0" : "=r" (v) : "m" (*ptr));
163168 return v;
164169 }
165170
166171 static inline void wrgs8(u8 v, addr_t addr)
167172 {
168
- asm volatile("movb %1,%%gs:%0" : "+m" (*(u8 *)addr) : "qi" (v));
173
+ u8 *ptr = (u8 *)absolute_pointer(addr);
174
+ asm volatile("movb %1,%%gs:%0" : "+m" (*ptr) : "qi" (v));
169175 }
170176 static inline void wrgs16(u16 v, addr_t addr)
171177 {
172
- asm volatile("movw %1,%%gs:%0" : "+m" (*(u16 *)addr) : "ri" (v));
178
+ u16 *ptr = (u16 *)absolute_pointer(addr);
179
+ asm volatile("movw %1,%%gs:%0" : "+m" (*ptr) : "ri" (v));
173180 }
174181 static inline void wrgs32(u32 v, addr_t addr)
175182 {
176
- asm volatile("movl %1,%%gs:%0" : "+m" (*(u32 *)addr) : "ri" (v));
183
+ u32 *ptr = (u32 *)absolute_pointer(addr);
184
+ asm volatile("movl %1,%%gs:%0" : "+m" (*ptr) : "ri" (v));
177185 }
178186
179187 /* Note: these only return true/false, not a signed return value! */
....@@ -309,7 +317,7 @@
309317 void __attribute__((noreturn)) die(void);
310318
311319 /* memory.c */
312
-int detect_memory(void);
320
+void detect_memory(void);
313321
314322 /* pm.c */
315323 void __attribute__((noreturn)) go_to_protected_mode(void);