powerpc/86xx: clean up smp init code
Removed the need for asm/mpc86xx.h as it was only used in mpc86xx_smp.c and just moved the defines it cared about into there. Also fixed up the ioremap to only map the one 4k page we need access to and to iounmap when we are done. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
ca851c783c
commit
1e76dff22c
|
@ -1,33 +0,0 @@
|
|||
/*
|
||||
* MPC86xx definitions
|
||||
*
|
||||
* Author: Jeff Brown
|
||||
*
|
||||
* Copyright 2004 Freescale Semiconductor, Inc
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#ifndef __ASM_POWERPC_MPC86xx_H__
|
||||
#define __ASM_POWERPC_MPC86xx_H__
|
||||
|
||||
#include <asm/mmu.h>
|
||||
|
||||
#ifdef CONFIG_PPC_86xx
|
||||
|
||||
#define CPU0_BOOT_RELEASE 0x01000000
|
||||
#define CPU1_BOOT_RELEASE 0x02000000
|
||||
#define CPU_ALL_RELEASED (CPU0_BOOT_RELEASE | CPU1_BOOT_RELEASE)
|
||||
#define MCM_PORT_CONFIG_OFFSET 0x1010
|
||||
|
||||
/* Offset from CCSRBAR */
|
||||
#define MPC86xx_MCM_OFFSET (0x00000)
|
||||
#define MPC86xx_MCM_SIZE (0x02000)
|
||||
|
||||
#endif /* CONFIG_PPC_86xx */
|
||||
#endif /* __ASM_POWERPC_MPC86xx_H__ */
|
||||
#endif /* __KERNEL__ */
|
|
@ -28,7 +28,6 @@
|
|||
#include <asm/time.h>
|
||||
#include <asm/machdep.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include <asm/mpc86xx.h>
|
||||
#include <asm/prom.h>
|
||||
#include <mm/mmu_decl.h>
|
||||
#include <asm/udbg.h>
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
#include <asm/time.h>
|
||||
#include <asm/machdep.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include <asm/mpc86xx.h>
|
||||
#include <asm/prom.h>
|
||||
#include <mm/mmu_decl.h>
|
||||
#include <asm/udbg.h>
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
#include <asm/time.h>
|
||||
#include <asm/machdep.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include <asm/mpc86xx.h>
|
||||
#include <asm/prom.h>
|
||||
#include <mm/mmu_decl.h>
|
||||
#include <asm/udbg.h>
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
#include <asm/time.h>
|
||||
#include <asm/machdep.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include <asm/mpc86xx.h>
|
||||
#include <asm/prom.h>
|
||||
#include <mm/mmu_decl.h>
|
||||
#include <asm/udbg.h>
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
#include <asm/time.h>
|
||||
#include <asm/machdep.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include <asm/mpc86xx.h>
|
||||
#include <asm/prom.h>
|
||||
#include <mm/mmu_decl.h>
|
||||
#include <asm/udbg.h>
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
#include <asm/pgtable.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include <asm/mpic.h>
|
||||
#include <asm/mpc86xx.h>
|
||||
#include <asm/cacheflush.h>
|
||||
|
||||
#include <sysdev/fsl_soc.h>
|
||||
|
@ -30,6 +29,11 @@
|
|||
extern void __secondary_start_mpc86xx(void);
|
||||
extern unsigned long __secondary_hold_acknowledge;
|
||||
|
||||
#define MCM_PORT_CONFIG_OFFSET 0x10
|
||||
|
||||
/* Offset from CCSRBAR */
|
||||
#define MPC86xx_MCM_OFFSET (0x1000)
|
||||
#define MPC86xx_MCM_SIZE (0x1000)
|
||||
|
||||
static void __init
|
||||
smp_86xx_release_core(int nr)
|
||||
|
@ -48,6 +52,8 @@ smp_86xx_release_core(int nr)
|
|||
pcr = in_be32(mcm_vaddr + (MCM_PORT_CONFIG_OFFSET >> 2));
|
||||
pcr |= 1 << (nr + 24);
|
||||
out_be32(mcm_vaddr + (MCM_PORT_CONFIG_OFFSET >> 2), pcr);
|
||||
|
||||
iounmap(mcm_vaddr);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include <asm/time.h>
|
||||
#include <asm/machdep.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include <asm/mpc86xx.h>
|
||||
#include <asm/prom.h>
|
||||
#include <mm/mmu_decl.h>
|
||||
#include <asm/udbg.h>
|
||||
|
|
Loading…
Reference in New Issue