Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16a15a30 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] iSeries: Clean up lparmap mess 



We need to have xLparMap in head_64.S so that it is at a fixed address
(because the linker will not resolve (address & 0xffffffff) for us).
But the assembler miscalculates the KERNEL_VSID() expressions.  So put
the confusing expressions into asm-offsets.c.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 556ecf9b

arch/powerpc/kernel/Makefile

+0 −7
Original line number Diff line number Diff line
@@ -80,13 +80,6 @@ ifneq ($(CONFIG_PPC_INDIRECT_IO),y) 
obj-y				+= iomap.o

endif



ifeq ($(CONFIG_PPC_ISERIES),y)

CFLAGS_lparmap.s		+= -g0

extra-y += lparmap.s

$(obj)/head_64.o:	$(obj)/lparmap.s

AFLAGS_head_64.o += -I$(obj)

endif



else

# stuff used from here for ARCH=ppc

smpobj-$(CONFIG_SMP)		+= smp.o

arch/powerpc/kernel/asm-offsets.c

+8 −0
Original line number Diff line number Diff line
@@ -312,5 +312,13 @@ int main(void) 
#ifdef CONFIG_BUG

	DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));

#endif



#ifdef CONFIG_PPC_ISERIES

	/* the assembler miscalculates the VSID values */

	DEFINE(PAGE_OFFSET_ESID, GET_ESID(PAGE_OFFSET));

	DEFINE(PAGE_OFFSET_VSID, KERNEL_VSID(PAGE_OFFSET));

	DEFINE(VMALLOC_START_ESID, GET_ESID(VMALLOC_START));

	DEFINE(VMALLOC_START_VSID, KERNEL_VSID(VMALLOC_START));

#endif

	return 0;

}

arch/powerpc/kernel/head_64.S

+19 −8
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <asm/iseries/lpar_map.h>

#include <asm/thread_info.h>

#include <asm/firmware.h>

#include <asm/page_64.h>



#define DO_SOFT_DISABLE
@@ -1519,8 +1520,8 @@ _GLOBAL(do_stab_bolted) 
 * Space for CPU0's segment table.

 *

 * On iSeries, the hypervisor must fill in at least one entry before

 * we get control (with relocate on).  The address is give to the hv

 * as a page number (see xLparMap in lpardata.c), so this must be at a

 * we get control (with relocate on).  The address is given to the hv

 * as a page number (see xLparMap below), so this must be at a

 * fixed address (the linker can't compute (u64)&initial_stab >>

 * PAGE_SHIFT).

 */
@@ -1542,12 +1543,22 @@ fwnmi_data_area: 
	 * both pSeries and iSeries */

#ifdef CONFIG_PPC_ISERIES

        . = LPARMAP_PHYS

#include "lparmap.s"

/*

 * This ".text" is here for old compilers that generate a trailing

 * .note section when compiling .c files to .s

 */

	.text

	.globl xLparMap

xLparMap:

	.quad	HvEsidsToMap		/* xNumberEsids */

	.quad	HvRangesToMap		/* xNumberRanges */

	.quad	STAB0_PAGE		/* xSegmentTableOffs */

	.zero	40			/* xRsvd */

	/* xEsids (HvEsidsToMap entries of 2 quads) */

	.quad	PAGE_OFFSET_ESID	/* xKernelEsid */

	.quad	PAGE_OFFSET_VSID	/* xKernelVsid */

	.quad	VMALLOC_START_ESID	/* xKernelEsid */

	.quad	VMALLOC_START_VSID	/* xKernelVsid */

	/* xRanges (HvRangesToMap entries of 3 quads) */

	.quad	HvPagesToMap		/* xPages */

	.quad	0			/* xOffset */

	.quad	PAGE_OFFSET_VSID << (SID_SHIFT - HW_PAGE_SHIFT)	/* xVPN */



#endif /* CONFIG_PPC_ISERIES */



        . = 0x8000

arch/powerpc/kernel/lparmap.c

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2005  Stephen Rothwell  IBM Corp.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */

#include <asm/mmu.h>

#include <asm/pgtable.h>

#include <asm/iseries/lpar_map.h>



/* The # is to stop gcc trying to make .text nonexecutable */

const struct LparMap __attribute__((__section__(".text #"))) xLparMap = {

	.xNumberEsids = HvEsidsToMap,

	.xNumberRanges = HvRangesToMap,

	.xSegmentTableOffs = STAB0_PAGE,



	.xEsids = {

		{ .xKernelEsid = GET_ESID(PAGE_OFFSET),

		  .xKernelVsid = KERNEL_VSID(PAGE_OFFSET), },

		{ .xKernelEsid = GET_ESID(VMALLOC_START),

		  .xKernelVsid = KERNEL_VSID(VMALLOC_START), },

	},



	.xRanges = {

		{ .xPages = HvPagesToMap,

		  .xOffset = 0,

		  .xVPN = KERNEL_VSID(PAGE_OFFSET) << (SID_SHIFT - HW_PAGE_SHIFT),

		},

	},

};

include/asm-powerpc/iseries/lpar_map.h

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 


#include <asm/types.h>



#endif



/*

 * The iSeries hypervisor will set up mapping for one or more

 * ESID/VSID pairs (in SLB/segment registers) and will set up
@@ -56,6 +58,7 @@ 
/* Hypervisor initially maps 32MB of the load area */

#define HvPagesToMap	8192



#ifndef __ASSEMBLY__

struct LparMap {

	u64	xNumberEsids;	// Number of ESID/VSID pairs

	u64	xNumberRanges;	// Number of VA ranges to map