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

Commit 799d6046 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

[PATCH] powerpc: merge code values for identifying platforms 



This patch merges platform codes.  systemcfg->platform is no longer used,
systemcfg use in general is deprecated as much as possible (and renamed
_systemcfg before it gets completely moved elsewhere in a future patch),
_machine is now used on ppc64 along as ppc32.  Platform codes aren't gone
yet but we are getting a step closer. A bunch of asm code in head[_64].S
is also turned into C code.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 3ddfbcf1

arch/powerpc/kernel/asm-offsets.c

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ int main(void) 
	DEFINE(ICACHEL1LINESIZE, offsetof(struct ppc64_caches, iline_size));

	DEFINE(ICACHEL1LOGLINESIZE, offsetof(struct ppc64_caches, log_iline_size));

	DEFINE(ICACHEL1LINESPERPAGE, offsetof(struct ppc64_caches, ilines_per_page));

	DEFINE(PLATFORM, offsetof(struct systemcfg, platform));

	DEFINE(PLATFORM_LPAR, PLATFORM_LPAR);



	/* paca */

arch/powerpc/kernel/head_64.S

+8 −83
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <asm/reg.h>

#include <asm/page.h>

#include <asm/mmu.h>

#include <asm/systemcfg.h>

#include <asm/ppc_asm.h>

#include <asm/asm-offsets.h>

#include <asm/bug.h>
@@ -1697,25 +1696,14 @@ _GLOBAL(pmac_secondary_start) 
 *   SPRG3 = paca virtual address

 */

_GLOBAL(__secondary_start)

	/* Set thread priority to MEDIUM */

	HMT_MEDIUM



	HMT_MEDIUM			/* Set thread priority to MEDIUM */



	/* Load TOC */

	ld	r2,PACATOC(r13)

	li	r6,0

	stb	r6,PACAPROCENABLED(r13)



#ifndef CONFIG_PPC_ISERIES

	/* Initialize the page table pointer register. */

	LOADADDR(r6,_SDR1)

	ld	r6,0(r6)		/* get the value of _SDR1	 */

	mtspr	SPRN_SDR1,r6			/* set the htab location	 */

#endif

	/* Initialize the first segment table (or SLB) entry		 */

	ld	r3,PACASTABVIRT(r13)	/* get addr of segment table	 */

BEGIN_FTR_SECTION

	bl	.stab_initialize

END_FTR_SECTION_IFCLR(CPU_FTR_SLB)

	bl	.slb_initialize



	/* Do early setup for that CPU (stab, slb, hash table pointer) */

	bl	.early_setup_secondary



	/* Initialize the kernel stack.  Just a repeat for iSeries.	 */

	LOADADDR(r3,current_set)
@@ -1724,37 +1712,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SLB) 
	addi	r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD

	std	r1,PACAKSAVE(r13)



	ld	r3,PACASTABREAL(r13)	/* get raddr of segment table	 */

	ori	r4,r3,1			/* turn on valid bit		 */



#ifdef CONFIG_PPC_ISERIES

	li	r0,-1			/* hypervisor call */

	li	r3,1

	sldi	r3,r3,63		/* 0x8000000000000000 */

	ori	r3,r3,4			/* 0x8000000000000004 */

	sc				/* HvCall_setASR */

#else

	/* set the ASR */

	ld	r3,systemcfg@got(r2)	/* r3 = ptr to systemcfg	 */

	ld	r3,0(r3)

	lwz	r3,PLATFORM(r3)		/* r3 = platform flags		 */

	andi.	r3,r3,PLATFORM_LPAR	/* Test if bit 0 is set (LPAR bit) */

	beq	98f			/* branch if result is 0  */

	mfspr	r3,SPRN_PVR

	srwi	r3,r3,16

	cmpwi	r3,0x37			/* SStar  */

	beq	97f

	cmpwi	r3,0x36			/* IStar  */

	beq	97f

	cmpwi	r3,0x34			/* Pulsar */

	bne	98f

97:	li	r3,H_SET_ASR		/* hcall = H_SET_ASR */

	HVSC				/* Invoking hcall */

	b	99f

98:					/* !(rpa hypervisor) || !(star)  */

	mtasr	r4			/* set the stab location	 */

99:

#endif

	/* Clear backchain so we get nice backtraces */

	li	r7,0

	mtlr	r7
@@ -1777,6 +1735,7 @@ _GLOBAL(start_secondary_prolog) 
	li	r3,0

	std	r3,0(r1)		/* Zero the stack frame pointer	*/

	bl	.start_secondary

	b	.

#endif



/*
@@ -1896,40 +1855,6 @@ _STATIC(start_here_multiplatform) 
	mr	r3,r31

 	bl	.early_setup



	/* set the ASR */

	ld	r3,PACASTABREAL(r13)

	ori	r4,r3,1			/* turn on valid bit		 */

	ld	r3,systemcfg@got(r2)	/* r3 = ptr to systemcfg */

	ld	r3,0(r3)

	lwz	r3,PLATFORM(r3)		/* r3 = platform flags */

	andi.	r3,r3,PLATFORM_LPAR	/* Test if bit 0 is set (LPAR bit) */

	beq	98f			/* branch if result is 0  */

	mfspr	r3,SPRN_PVR

	srwi	r3,r3,16

	cmpwi	r3,0x37			/* SStar */

	beq	97f

	cmpwi	r3,0x36			/* IStar  */

	beq	97f

	cmpwi	r3,0x34			/* Pulsar */

	bne	98f

97:	li	r3,H_SET_ASR		/* hcall = H_SET_ASR */

	HVSC				/* Invoking hcall */

	b	99f

98:					/* !(rpa hypervisor) || !(star) */

	mtasr	r4			/* set the stab location	*/

99:

	/* Set SDR1 (hash table pointer) */

	ld	r3,systemcfg@got(r2)	/* r3 = ptr to systemcfg */

	ld	r3,0(r3)

	lwz	r3,PLATFORM(r3)		/* r3 = platform flags */

	/* Test if bit 0 is set (LPAR bit) */

	andi.	r3,r3,PLATFORM_LPAR

	bne	98f			/* branch if result is !0  */

	LOADADDR(r6,_SDR1)		/* Only if NOT LPAR */

	add	r6,r6,r26

	ld	r6,0(r6)		/* get the value of _SDR1 */

	mtspr	SPRN_SDR1,r6			/* set the htab location  */

98: 

	LOADADDR(r3,.start_here_common)

	SET_REG_TO_CONST(r4, MSR_KERNEL)

	mtspr	SPRN_SRR0,r3

arch/powerpc/kernel/paca.c

+2 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <asm/processor.h>

#include <asm/ptrace.h>

#include <asm/page.h>



#include <asm/systemcfg.h>

#include <asm/lppaca.h>

#include <asm/iseries/it_lp_queue.h>

#include <asm/paca.h>
@@ -24,8 +24,7 @@ static union { 
	struct systemcfg	data;

	u8			page[PAGE_SIZE];

} systemcfg_store __attribute__((__section__(".data.page.aligned")));

struct systemcfg *systemcfg = &systemcfg_store.data;

EXPORT_SYMBOL(systemcfg);

struct systemcfg *_systemcfg = &systemcfg_store.data;





/* This symbol is provided by the linker - let it fill in the paca

arch/powerpc/kernel/ppc_ksyms.c

+0 −3
Original line number Diff line number Diff line
@@ -188,9 +188,6 @@ EXPORT_SYMBOL(adb_try_handler_change); 
EXPORT_SYMBOL(cuda_request);

EXPORT_SYMBOL(cuda_poll);

#endif /* CONFIG_ADB_CUDA */

#if defined(CONFIG_PPC_MULTIPLATFORM) && defined(CONFIG_PPC32)

EXPORT_SYMBOL(_machine);

#endif

#ifdef CONFIG_PPC_PMAC

EXPORT_SYMBOL(sys_ctrler);

#endif

arch/powerpc/kernel/prom.c

+4 −12
Original line number Diff line number Diff line
@@ -48,9 +48,6 @@ 
#include <asm/machdep.h>

#include <asm/pSeries_reconfig.h>

#include <asm/pci-bridge.h>

#ifdef CONFIG_PPC64

#include <asm/systemcfg.h>

#endif



#ifdef DEBUG

#define DBG(fmt...) printk(KERN_ERR fmt)
@@ -391,7 +388,7 @@ static int __devinit finish_node_interrupts(struct device_node *np, 


#ifdef CONFIG_PPC64

		/* We offset irq numbers for the u3 MPIC by 128 in PowerMac */

		if (systemcfg->platform == PLATFORM_POWERMAC && ic && ic->parent) {

		if (_machine == PLATFORM_POWERMAC && ic && ic->parent) {

			char *name = get_property(ic->parent, "name", NULL);

			if (name && !strcmp(name, "u3"))

				np->intrs[intrcount].line += 128;
@@ -1161,13 +1158,9 @@ static int __init early_init_dt_scan_chosen(unsigned long node, 
	prop = (u32 *)of_get_flat_dt_prop(node, "linux,platform", NULL);

	if (prop == NULL)

		return 0;

#ifdef CONFIG_PPC64

	systemcfg->platform = *prop;

#else

#ifdef CONFIG_PPC_MULTIPLATFORM

	_machine = *prop;

#endif

#endif



#ifdef CONFIG_PPC64

	/* check if iommu is forced on or off */
@@ -1346,9 +1339,6 @@ void __init early_init_devtree(void *params) 
	of_scan_flat_dt(early_init_dt_scan_memory, NULL);

	lmb_enforce_memory_limit(memory_limit);

	lmb_analyze();

#ifdef CONFIG_PPC64

	systemcfg->physicalMemorySize = lmb_phys_mem_size();

#endif

	lmb_reserve(0, __pa(klimit));



	DBG("Phys. mem: %lx\n", lmb_phys_mem_size());
@@ -1915,7 +1905,7 @@ static int of_finish_dynamic_node(struct device_node *node, 
	/* We don't support that function on PowerMac, at least

	 * not yet

	 */

	if (systemcfg->platform == PLATFORM_POWERMAC)

	if (_machine == PLATFORM_POWERMAC)

		return -ENODEV;



	/* fix up new node's linux_phandle field */
@@ -1999,9 +1989,11 @@ int prom_add_property(struct device_node* np, struct property* prop) 
	*next = prop;

	write_unlock(&devtree_lock);



#ifdef CONFIG_PROC_DEVICETREE

	/* try to add to proc as well if it was initialized */

	if (np->pde)

		proc_device_tree_add_prop(np->pde, prop);

#endif /* CONFIG_PROC_DEVICETREE */



	return 0;

}