1 files changed, 1 insertions, 78 deletions
diff --git a/arch/ppc64/kernel/LparData.c b/arch/ppc64/kernel/LparData.c
index 76cfd1449d52..1c11031c838e 100644
--- a/arch/ppc64/kernel/LparData.c
+++ b/arch/ppc64/kernel/LparData.c
@@ -32,32 +32,12 @@
 /* The HvReleaseData is the root of the information shared between 
 * the hypervisor and Linux.  
 */
-/*
- * WARNING - magic here
- *
- * Ok, this is a horrid hack below, but marginally better than the
- * alternatives.  What we really want is just to initialize
- * hvReleaseData in C as in the #if 0 section here.  However, gcc
- * refuses to believe that (u32)&x is a constant expression, so will
- * not allow the xMsNucDataOffset field to be properly initialized.
- * So, we declare hvReleaseData in inline asm instead.  We use inline
- * asm, rather than a .S file, because the assembler won't generate
- * the necessary relocation for the LparMap either, unless that symbol
- * is declared in the same source file.  Finally, we put the asm in a
- * dummy, attribute-used function, instead of at file scope, because
- * file scope asms don't allow contraints.  We want to use the "i"
- * constraints to put sizeof() and offsetof() expressions in there,
- * because including asm/offsets.h in C code then stringifying causes
- * all manner of warnings.
- */
-#if 0
 struct HvReleaseData hvReleaseData = {
        .xDesc = 0xc8a5d9c4,    /* "HvRD" ebcdic */
        .xSize = sizeof(struct HvReleaseData),
        .xVpdAreasPtrOffset = offsetof(struct naca_struct, xItVpdAreas),
        .xSlicNacaAddr = &naca,         /* 64-bit Naca address */
-        .xMsNucDataOffset = (u32)((unsigned long)&xLparMap - KERNELBASE),
+        .xMsNucDataOffset = LPARMAP_PHYS,
        .xFlags = HVREL_TAGSINACTIVE    /* tags inactive       */
                                        /* 64 bit              */
                                        /* shared processors   */
@@ -70,63 +50,6 @@ struct HvReleaseData hvReleaseData = {
                0xa7, 0x40, 0xf2, 0x4b,
                0xf4, 0x4b, 0xf6, 0xf4 },
 };
-#endif
-extern struct HvReleaseData hvReleaseData;
-static void __attribute_used__ hvReleaseData_wrapper(void)
-{
-        /* This doesn't appear to need any alignment (even 4 byte) */
-        asm volatile (
-                "       lparMapPhys = xLparMap - %3\n"
-                "       .data\n"
-                "       .globl  hvReleaseData\n"
-                "hvReleaseData:\n"
-                "       .long   0xc8a5d9c4\n"   /* xDesc */
-                                                /* "HvRD" in ebcdic */
-                "       .short  %0\n"           /* xSize */
-                "       .short  %1\n"           /* xVpdAreasPtrOffset */
-                "       .llong  naca\n"         /* xSlicNacaAddr */
-                "       .long   lparMapPhys\n"  /* xMsNucDataOffset */
-                "       .long   0\n"            /* xRsvd1 */
-                "       .short  %2\n"           /* xFlags */
-                "       .short  4\n"    /* xVrmIndex  - v5r2m0 */
-                "       .short  3\n"    /* xMinSupportedPlicVrmIndex - v5r1m0 */
-                "       .short  3\n"    /* xMinCompatablePlicVrmIndex - v5r1m0 */
-                "       .long   0xd38995a4\n"   /* xVrmName */
-                "       .long   0xa740f24b\n"   /*   "Linux 2.4.64" ebcdic */
-                "       .long   0xf44bf6f4\n"
-                "       . = hvReleaseData + %0\n"
-                "       .previous\n"
-                : : "i"(sizeof(hvReleaseData)),
-                "i"(offsetof(struct naca_struct, xItVpdAreas)),
-                "i"(HVREL_TAGSINACTIVE /* tags inactive, 64 bit, */
-                                       /* shared processors, HMT allowed */
-                    | 6), /* TEMP: This allows non-GA drivers */
-                "i"(KERNELBASE)
-                );
-}
-struct LparMap __attribute__((aligned (16))) xLparMap = {
-        .xNumberEsids = HvEsidsToMap,
-        .xNumberRanges = HvRangesToMap,
-        .xSegmentTableOffs = STAB0_PAGE,
-        .xEsids = {
-                { .xKernelEsid = GET_ESID(KERNELBASE),
-                  .xKernelVsid = KERNEL_VSID(KERNELBASE), },
-                { .xKernelEsid = GET_ESID(VMALLOCBASE),
-                  .xKernelVsid = KERNEL_VSID(VMALLOCBASE), },
-        },
-        .xRanges = {
-                { .xPages = HvPagesToMap,
-                  .xOffset = 0,
-                  .xVPN = KERNEL_VSID(KERNELBASE) << (SID_SHIFT - PAGE_SHIFT),
-                },
-        },
-};
 extern void system_reset_iSeries(void);
 extern void machine_check_iSeries(void);

diff --git a/arch/ppc64/kernel/LparData.c b/arch/ppc64/kernel/LparData.c index 76cfd1449d52..1c11031c838e 100644 --- a/arch/ppc64/kernel/LparData.c +++ b/arch/ppc64/kernel/LparData.c
@@ -32,32 +32,12 @@
32	/* The HvReleaseData is the root of the information shared between	32	/* The HvReleaseData is the root of the information shared between
33	* the hypervisor and Linux.	33	* the hypervisor and Linux.
34	*/	34	*/
35
36	/*
37	* WARNING - magic here
38	*
39	* Ok, this is a horrid hack below, but marginally better than the
40	* alternatives. What we really want is just to initialize
41	* hvReleaseData in C as in the #if 0 section here. However, gcc
42	* refuses to believe that (u32)&x is a constant expression, so will
43	* not allow the xMsNucDataOffset field to be properly initialized.
44	* So, we declare hvReleaseData in inline asm instead. We use inline
45	* asm, rather than a .S file, because the assembler won't generate
46	* the necessary relocation for the LparMap either, unless that symbol
47	* is declared in the same source file. Finally, we put the asm in a
48	* dummy, attribute-used function, instead of at file scope, because
49	* file scope asms don't allow contraints. We want to use the "i"
50	* constraints to put sizeof() and offsetof() expressions in there,
51	* because including asm/offsets.h in C code then stringifying causes
52	* all manner of warnings.
53	*/
54	#if 0
55	struct HvReleaseData hvReleaseData = {	35	struct HvReleaseData hvReleaseData = {
56	.xDesc = 0xc8a5d9c4, /* "HvRD" ebcdic */	36	.xDesc = 0xc8a5d9c4, /* "HvRD" ebcdic */
57	.xSize = sizeof(struct HvReleaseData),	37	.xSize = sizeof(struct HvReleaseData),
58	.xVpdAreasPtrOffset = offsetof(struct naca_struct, xItVpdAreas),	38	.xVpdAreasPtrOffset = offsetof(struct naca_struct, xItVpdAreas),
59	.xSlicNacaAddr = &naca, /* 64-bit Naca address */	39	.xSlicNacaAddr = &naca, /* 64-bit Naca address */
60	.xMsNucDataOffset = (u32)((unsigned long)&xLparMap - KERNELBASE),	40	.xMsNucDataOffset = LPARMAP_PHYS,
61	.xFlags = HVREL_TAGSINACTIVE /* tags inactive */	41	.xFlags = HVREL_TAGSINACTIVE /* tags inactive */
62	/* 64 bit */	42	/* 64 bit */
63	/* shared processors */	43	/* shared processors */
@@ -70,63 +50,6 @@ struct HvReleaseData hvReleaseData = {
70	0xa7, 0x40, 0xf2, 0x4b,	50	0xa7, 0x40, 0xf2, 0x4b,
71	0xf4, 0x4b, 0xf6, 0xf4 },	51	0xf4, 0x4b, 0xf6, 0xf4 },
72	};	52	};
73	#endif
74
75
76	extern struct HvReleaseData hvReleaseData;
77
78	static void __attribute_used__ hvReleaseData_wrapper(void)
79	{
80	/* This doesn't appear to need any alignment (even 4 byte) */
81	asm volatile (
82	" lparMapPhys = xLparMap - %3\n"
83	" .data\n"
84	" .globl hvReleaseData\n"
85	"hvReleaseData:\n"
86	" .long 0xc8a5d9c4\n" /* xDesc */
87	/* "HvRD" in ebcdic */
88	" .short %0\n" /* xSize */
89	" .short %1\n" /* xVpdAreasPtrOffset */
90	" .llong naca\n" /* xSlicNacaAddr */
91	" .long lparMapPhys\n" /* xMsNucDataOffset */
92	" .long 0\n" /* xRsvd1 */
93	" .short %2\n" /* xFlags */
94	" .short 4\n" /* xVrmIndex - v5r2m0 */
95	" .short 3\n" /* xMinSupportedPlicVrmIndex - v5r1m0 */
96	" .short 3\n" /* xMinCompatablePlicVrmIndex - v5r1m0 */
97	" .long 0xd38995a4\n" /* xVrmName */
98	" .long 0xa740f24b\n" /* "Linux 2.4.64" ebcdic */
99	" .long 0xf44bf6f4\n"
100	" . = hvReleaseData + %0\n"
101	" .previous\n"
102	: : "i"(sizeof(hvReleaseData)),
103	"i"(offsetof(struct naca_struct, xItVpdAreas)),
104	"i"(HVREL_TAGSINACTIVE /* tags inactive, 64 bit, */
105	/* shared processors, HMT allowed */
106	\| 6), /* TEMP: This allows non-GA drivers */
107	"i"(KERNELBASE)
108	);
109	}
110
111	struct LparMap __attribute__((aligned (16))) xLparMap = {
112	.xNumberEsids = HvEsidsToMap,
113	.xNumberRanges = HvRangesToMap,
114	.xSegmentTableOffs = STAB0_PAGE,
115
116	.xEsids = {
117	{ .xKernelEsid = GET_ESID(KERNELBASE),
118	.xKernelVsid = KERNEL_VSID(KERNELBASE), },
119	{ .xKernelEsid = GET_ESID(VMALLOCBASE),
120	.xKernelVsid = KERNEL_VSID(VMALLOCBASE), },
121	},
122
123	.xRanges = {
124	{ .xPages = HvPagesToMap,
125	.xOffset = 0,
126	.xVPN = KERNEL_VSID(KERNELBASE) << (SID_SHIFT - PAGE_SHIFT),
127	},
128	},
129	};
130		53
131	extern void system_reset_iSeries(void);	54	extern void system_reset_iSeries(void);
132	extern void machine_check_iSeries(void);	55	extern void machine_check_iSeries(void);