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

Commit 47e89798 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/pseries: Fix build without CONFIG_HOTPLUG_CPU
  powerpc: Set nr_cpu_ids early and use it to free PACAs
  powerpc/pseries: Don't register global initcall
  powerpc/kexec: Fix mismatched ifdefs for PPC64/SMP.
  edac/mpc85xx: Limit setting/clearing of HID1[RFXE] to e500v1/v2 cores
  powerpc/85xx: Update dts for PCIe memory maps to match u-boot of Px020RDB
parents 884b8267 c60e65d7

arch/powerpc/boot/dts/p1020rdb.dts

+6 −6
Original line number Original line Diff line number Diff line 
/*

/*

 * P1020 RDB Device Tree Source

 * P1020 RDB Device Tree Source

 *

 *

 * Copyright 2009 Freescale Semiconductor Inc.

 * Copyright 2009-2011 Freescale Semiconductor Inc.

 *

 *

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

 * 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

 * under  the terms of  the GNU General  Public License as published by the
@@ -553,7 +553,7 @@ 
		reg = <0 0xffe09000 0 0x1000>;

		reg = <0 0xffe09000 0 0x1000>;

		bus-range = <0 255>;

		bus-range = <0 255>;

		ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000

		ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000

			  0x1000000 0x0 0x00000000 0 0xffc30000 0x0 0x10000>;

			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;

		clock-frequency = <33333333>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupt-parent = <&mpic>;

		interrupts = <16 2>;

		interrupts = <16 2>;
@@ -580,8 +580,8 @@ 
		#address-cells = <3>;

		#address-cells = <3>;

		reg = <0 0xffe0a000 0 0x1000>;

		reg = <0 0xffe0a000 0 0x1000>;

		bus-range = <0 255>;

		bus-range = <0 255>;

		ranges = <0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000

		ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000

			  0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x10000>;

			  0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;

		clock-frequency = <33333333>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupt-parent = <&mpic>;

		interrupts = <16 2>;

		interrupts = <16 2>;
@@ -590,8 +590,8 @@ 
			#size-cells = <2>;

			#size-cells = <2>;

			#address-cells = <3>;

			#address-cells = <3>;

			device_type = "pci";

			device_type = "pci";

			ranges = <0x2000000 0x0 0xc0000000

			ranges = <0x2000000 0x0 0x80000000

				  0x2000000 0x0 0xc0000000

				  0x2000000 0x0 0x80000000

				  0x0 0x20000000

				  0x0 0x20000000





				  0x1000000 0x0 0x0

				  0x1000000 0x0 0x0

arch/powerpc/boot/dts/p2020rdb.dts

+6 −6
Original line number Original line Diff line number Diff line 
/*

/*

 * P2020 RDB Device Tree Source

 * P2020 RDB Device Tree Source

 *

 *

 * Copyright 2009 Freescale Semiconductor Inc.

 * Copyright 2009-2011 Freescale Semiconductor Inc.

 *

 *

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

 * 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

 * under  the terms of  the GNU General  Public License as published by the
@@ -537,7 +537,7 @@ 
		reg = <0 0xffe09000 0 0x1000>;

		reg = <0 0xffe09000 0 0x1000>;

		bus-range = <0 255>;

		bus-range = <0 255>;

		ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000

		ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000

			  0x1000000 0x0 0x00000000 0 0xffc30000 0x0 0x10000>;

			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;

		clock-frequency = <33333333>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupt-parent = <&mpic>;

		interrupts = <25 2>;

		interrupts = <25 2>;
@@ -564,8 +564,8 @@ 
		#address-cells = <3>;

		#address-cells = <3>;

		reg = <0 0xffe0a000 0 0x1000>;

		reg = <0 0xffe0a000 0 0x1000>;

		bus-range = <0 255>;

		bus-range = <0 255>;

		ranges = <0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000

		ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000

			  0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x10000>;

			  0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;

		clock-frequency = <33333333>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupt-parent = <&mpic>;

		interrupts = <26 2>;

		interrupts = <26 2>;
@@ -574,8 +574,8 @@ 
			#size-cells = <2>;

			#size-cells = <2>;

			#address-cells = <3>;

			#address-cells = <3>;

			device_type = "pci";

			device_type = "pci";

			ranges = <0x2000000 0x0 0xc0000000

			ranges = <0x2000000 0x0 0x80000000

				  0x2000000 0x0 0xc0000000

				  0x2000000 0x0 0x80000000

				  0x0 0x20000000

				  0x0 0x20000000





				  0x1000000 0x0 0x0

				  0x1000000 0x0 0x0

arch/powerpc/boot/dts/p2020rdb_camp_core0.dts

+2 −2
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * This dts file allows core0 to have memory, l2, i2c, spi, gpio, dma1, usb,

 * This dts file allows core0 to have memory, l2, i2c, spi, gpio, dma1, usb,

 * eth1, eth2, sdhc, crypto, global-util, pci0.

 * eth1, eth2, sdhc, crypto, global-util, pci0.

 *

 *

 * Copyright 2009 Freescale Semiconductor Inc.

 * Copyright 2009-2011 Freescale Semiconductor Inc.

 *

 *

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

 * 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

 * under  the terms of  the GNU General  Public License as published by the
@@ -342,7 +342,7 @@ 
		reg = <0 0xffe09000 0 0x1000>;

		reg = <0 0xffe09000 0 0x1000>;

		bus-range = <0 255>;

		bus-range = <0 255>;

		ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000

		ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000

			  0x1000000 0x0 0x00000000 0 0xffc30000 0x0 0x10000>;

			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;

		clock-frequency = <33333333>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupt-parent = <&mpic>;

		interrupts = <25 2>;

		interrupts = <25 2>;

arch/powerpc/boot/dts/p2020rdb_camp_core1.dts

+5 −5
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 *

 * Please note to add "-b 1" for core1's dts compiling.

 * Please note to add "-b 1" for core1's dts compiling.

 *

 *

 * Copyright 2009 Freescale Semiconductor Inc.

 * Copyright 2009-2011 Freescale Semiconductor Inc.

 *

 *

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

 * 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

 * under  the terms of  the GNU General  Public License as published by the
@@ -162,8 +162,8 @@ 
		#address-cells = <3>;

		#address-cells = <3>;

		reg = <0 0xffe0a000 0 0x1000>;

		reg = <0 0xffe0a000 0 0x1000>;

		bus-range = <0 255>;

		bus-range = <0 255>;

		ranges = <0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000

		ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000

			  0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x10000>;

			  0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;

		clock-frequency = <33333333>;

		clock-frequency = <33333333>;

		interrupt-parent = <&mpic>;

		interrupt-parent = <&mpic>;

		interrupts = <26 2>;

		interrupts = <26 2>;
@@ -172,8 +172,8 @@ 
			#size-cells = <2>;

			#size-cells = <2>;

			#address-cells = <3>;

			#address-cells = <3>;

			device_type = "pci";

			device_type = "pci";

			ranges = <0x2000000 0x0 0xc0000000

			ranges = <0x2000000 0x0 0x80000000

				  0x2000000 0x0 0xc0000000

				  0x2000000 0x0 0x80000000

				  0x0 0x20000000

				  0x0 0x20000000





				  0x1000000 0x0 0x0

				  0x1000000 0x0 0x0

arch/powerpc/kernel/crash.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -163,7 +163,7 @@ static void crash_kexec_prepare_cpus(int cpu) 
}

}





/* wait for all the CPUs to hit real mode but timeout if they don't come in */

/* wait for all the CPUs to hit real mode but timeout if they don't come in */

#ifdef CONFIG_PPC_STD_MMU_64

#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)

static void crash_kexec_wait_realmode(int cpu)

static void crash_kexec_wait_realmode(int cpu)

{

{

	unsigned int msecs;

	unsigned int msecs;
@@ -188,6 +188,8 @@ static void crash_kexec_wait_realmode(int cpu) 
	}

	}

	mb();

	mb();

}

}

#else

static inline void crash_kexec_wait_realmode(int cpu) {}

#endif

#endif





/*

/*
@@ -344,9 +346,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs) 
	crash_save_cpu(regs, crashing_cpu);

	crash_save_cpu(regs, crashing_cpu);

	crash_kexec_prepare_cpus(crashing_cpu);

	crash_kexec_prepare_cpus(crashing_cpu);

	cpu_set(crashing_cpu, cpus_in_crash);

	cpu_set(crashing_cpu, cpus_in_crash);

#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)

	crash_kexec_wait_realmode(crashing_cpu);

	crash_kexec_wait_realmode(crashing_cpu);

#endif





	machine_kexec_mask_interrupts();

	machine_kexec_mask_interrupts();