mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/misc/sgi-xp/xp_uv.c
..
..
@@ -3,6 +3,7 @@
3
3
  * License.  See the file "COPYING" in the main directory of this archive
4
4
  * for more details.
5
5
  *
6
+ * (C) Copyright 2020 Hewlett Packard Enterprise Development LP
6
7
  * Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.
7
8
  */
8
9
 
..
..
@@ -17,7 +18,7 @@
17
18
 #include <asm/uv/uv_hub.h>
18
19
 #if defined CONFIG_X86_64
19
20
 #include <asm/uv/bios.h>
20
-#elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV
21
+#elif defined CONFIG_IA64_SGI_UV
21
22
 #include <asm/sn/sn_sal.h>
22
23
 #endif
23
24
 #include "../sgi-gru/grukservices.h"
..
..
@@ -99,7 +100,7 @@
99
100
 		return xpBiosError;
100
101
 	}
101
102
 
102
-#elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV
103
+#elif defined CONFIG_IA64_SGI_UV
103
104
 	u64 nasid_array;
104
105
 
105
106
 	ret = sn_change_memprotect(phys_addr, size, SN_MEMPROT_ACCESS_CLASS_1,
..
..
@@ -129,7 +130,7 @@
129
130
 		return xpBiosError;
130
131
 	}
131
132
 
132
-#elif defined CONFIG_IA64_GENERIC || defined CONFIG_IA64_SGI_UV
133
+#elif defined CONFIG_IA64_SGI_UV
133
134
 	u64 nasid_array;
134
135
 
135
136
 	ret = sn_change_memprotect(phys_addr, size, SN_MEMPROT_ACCESS_CLASS_0,
..
..
@@ -148,12 +149,15 @@
148
149
 enum xp_retval
149
150
 xp_init_uv(void)
150
151
 {
151
-	BUG_ON(!is_uv());
152
+	WARN_ON(!is_uv_system());
153
+	if (!is_uv_system())
154
+		return xpUnsupported;
152
155
 
153
156
 	xp_max_npartitions = XP_MAX_NPARTITIONS_UV;
157
+#ifdef CONFIG_X86
154
158
 	xp_partition_id = sn_partition_id;
155
159
 	xp_region_size = sn_region_size;
156
-
160
+#endif
157
161
 	xp_pa = xp_pa_uv;
158
162
 	xp_socket_pa = xp_socket_pa_uv;
159
163
 	xp_remote_memcpy = xp_remote_memcpy_uv;
..
..
@@ -167,5 +171,5 @@
167
171
 void
168
172
 xp_exit_uv(void)
169
173
 {
170
-	BUG_ON(!is_uv());
174
+	WARN_ON(!is_uv_system());
171
175
 }