forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390 
 kernel/arch/s390/include/asm/setup.h
....@@ -6,37 +6,41 @@
66 #ifndef _ASM_S390_SETUP_H
77 #define _ASM_S390_SETUP_H
88 
9
-#include <linux/const.h>
9
+#include <linux/bits.h>
1010 #include <uapi/asm/setup.h>
11
+#include <linux/build_bug.h>
1112 
1213 #define EP_OFFSET		0x10008
1314 #define EP_STRING		"S390EP"
1415 #define PARMAREA		0x10400
15
-#define PARMAREA_END		0x11000
16
+#define EARLY_SCCB_OFFSET	0x11000
17
+#define HEAD_END		0x12000
18
+
19
+#define EARLY_SCCB_SIZE		PAGE_SIZE
1620 
1721 /*
1822  * Machine features detected in early.c
1923  */
2024 
21
-#define MACHINE_FLAG_VM		_BITUL(0)
22
-#define MACHINE_FLAG_KVM	_BITUL(1)
23
-#define MACHINE_FLAG_LPAR	_BITUL(2)
24
-#define MACHINE_FLAG_DIAG9C	_BITUL(3)
25
-#define MACHINE_FLAG_ESOP	_BITUL(4)
26
-#define MACHINE_FLAG_IDTE	_BITUL(5)
27
-#define MACHINE_FLAG_DIAG44	_BITUL(6)
28
-#define MACHINE_FLAG_EDAT1	_BITUL(7)
29
-#define MACHINE_FLAG_EDAT2	_BITUL(8)
30
-#define MACHINE_FLAG_TOPOLOGY	_BITUL(10)
31
-#define MACHINE_FLAG_TE		_BITUL(11)
32
-#define MACHINE_FLAG_TLB_LC	_BITUL(12)
33
-#define MACHINE_FLAG_VX		_BITUL(13)
34
-#define MACHINE_FLAG_TLB_GUEST	_BITUL(14)
35
-#define MACHINE_FLAG_NX		_BITUL(15)
36
-#define MACHINE_FLAG_GS		_BITUL(16)
37
-#define MACHINE_FLAG_SCC	_BITUL(17)
25
+#define MACHINE_FLAG_VM		BIT(0)
26
+#define MACHINE_FLAG_KVM	BIT(1)
27
+#define MACHINE_FLAG_LPAR	BIT(2)
28
+#define MACHINE_FLAG_DIAG9C	BIT(3)
29
+#define MACHINE_FLAG_ESOP	BIT(4)
30
+#define MACHINE_FLAG_IDTE	BIT(5)
31
+#define MACHINE_FLAG_EDAT1	BIT(7)
32
+#define MACHINE_FLAG_EDAT2	BIT(8)
33
+#define MACHINE_FLAG_TOPOLOGY	BIT(10)
34
+#define MACHINE_FLAG_TE		BIT(11)
35
+#define MACHINE_FLAG_TLB_LC	BIT(12)
36
+#define MACHINE_FLAG_VX		BIT(13)
37
+#define MACHINE_FLAG_TLB_GUEST	BIT(14)
38
+#define MACHINE_FLAG_NX		BIT(15)
39
+#define MACHINE_FLAG_GS		BIT(16)
40
+#define MACHINE_FLAG_SCC	BIT(17)
41
+#define MACHINE_FLAG_PCI_MIO	BIT(18)
3842 
39
-#define LPP_MAGIC		_BITUL(31)
43
+#define LPP_MAGIC		BIT(31)
4044 #define LPP_PID_MASK		_AC(0xffffffff, UL)
4145 
4246 /* Offsets to entry points in kernel/head.S  */
....@@ -51,6 +55,7 @@
5155 #define INITRD_SIZE_OFFSET	0x10410
5256 #define OLDMEM_BASE_OFFSET	0x10418
5357 #define OLDMEM_SIZE_OFFSET	0x10420
58
+#define KERNEL_VERSION_OFFSET	0x10428
5459 #define COMMAND_LINE_OFFSET	0x10480
5560 
5661 #ifndef __ASSEMBLY__
....@@ -65,11 +70,32 @@
6570 #define OLDMEM_SIZE	(*(unsigned long *)  (OLDMEM_SIZE_OFFSET))
6671 #define COMMAND_LINE	((char *)	     (COMMAND_LINE_OFFSET))
6772 
73
+struct parmarea {
74
+	unsigned long ipl_device;			/* 0x10400 */
75
+	unsigned long initrd_start;			/* 0x10408 */
76
+	unsigned long initrd_size;			/* 0x10410 */
77
+	unsigned long oldmem_base;			/* 0x10418 */
78
+	unsigned long oldmem_size;			/* 0x10420 */
79
+	unsigned long kernel_version;			/* 0x10428 */
80
+	char pad1[0x10480 - 0x10430];			/* 0x10430 - 0x10480 */
81
+	char command_line[ARCH_COMMAND_LINE_SIZE];	/* 0x10480 */
82
+};
83
+
84
+extern unsigned int zlib_dfltcc_support;
85
+#define ZLIB_DFLTCC_DISABLED		0
86
+#define ZLIB_DFLTCC_FULL		1
87
+#define ZLIB_DFLTCC_DEFLATE_ONLY	2
88
+#define ZLIB_DFLTCC_INFLATE_ONLY	3
89
+#define ZLIB_DFLTCC_FULL_DEBUG		4
90
+
91
+extern int noexec_disabled;
6892 extern int memory_end_set;
6993 extern unsigned long memory_end;
94
+extern unsigned long vmalloc_size;
7095 extern unsigned long max_physmem_end;
7196 
72
-extern void detect_memory_memblock(void);
97
+/* The Write Back bit position in the physaddr is given by the SLPC PCI */
98
+extern unsigned long mio_wb_bit_mask;
7399 
74100 #define MACHINE_IS_VM		(S390_lowcore.machine_flags & MACHINE_FLAG_VM)
75101 #define MACHINE_IS_KVM		(S390_lowcore.machine_flags & MACHINE_FLAG_KVM)
....@@ -78,7 +104,6 @@
78104 #define MACHINE_HAS_DIAG9C	(S390_lowcore.machine_flags & MACHINE_FLAG_DIAG9C)
79105 #define MACHINE_HAS_ESOP	(S390_lowcore.machine_flags & MACHINE_FLAG_ESOP)
80106 #define MACHINE_HAS_IDTE	(S390_lowcore.machine_flags & MACHINE_FLAG_IDTE)
81
-#define MACHINE_HAS_DIAG44	(S390_lowcore.machine_flags & MACHINE_FLAG_DIAG44)
82107 #define MACHINE_HAS_EDAT1	(S390_lowcore.machine_flags & MACHINE_FLAG_EDAT1)
83108 #define MACHINE_HAS_EDAT2	(S390_lowcore.machine_flags & MACHINE_FLAG_EDAT2)
84109 #define MACHINE_HAS_TOPOLOGY	(S390_lowcore.machine_flags & MACHINE_FLAG_TOPOLOGY)
....@@ -89,6 +114,7 @@
89114 #define MACHINE_HAS_NX		(S390_lowcore.machine_flags & MACHINE_FLAG_NX)
90115 #define MACHINE_HAS_GS		(S390_lowcore.machine_flags & MACHINE_FLAG_GS)
91116 #define MACHINE_HAS_SCC		(S390_lowcore.machine_flags & MACHINE_FLAG_SCC)
117
+#define MACHINE_HAS_PCI_MIO	(S390_lowcore.machine_flags & MACHINE_FLAG_PCI_MIO)
92118 
93119 /*
94120  * Console mode. Override with conmode=
....@@ -96,9 +122,6 @@
96122 extern unsigned int console_mode;
97123 extern unsigned int console_devno;
98124 extern unsigned int console_irq;
99
-
100
-extern char vmhalt_cmd[];
101
-extern char vmpoff_cmd[];
102125 
103126 #define CONSOLE_IS_UNDEFINED	(console_mode == 0)
104127 #define CONSOLE_IS_SCLP		(console_mode == 1)
....@@ -135,6 +158,18 @@
135158 extern void (*_machine_halt)(void);
136159 extern void (*_machine_power_off)(void);
137160 
161
+extern unsigned long __kaslr_offset;
162
+static inline unsigned long kaslr_offset(void)
163
+{
164
+	return __kaslr_offset;
165
+}
166
+
167
+static inline u32 gen_lpswe(unsigned long addr)
168
+{
169
+	BUILD_BUG_ON(addr > 0xfff);
170
+	return 0xb2b20000 | addr;
171
+}
172
+
138173 #else /* __ASSEMBLY__ */
139174 
140175 #define IPL_DEVICE	(IPL_DEVICE_OFFSET)