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

Commit a0c49b6b 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: Really fix build without CONFIG_PCI
  powerpc: Fix build without CONFIG_PCI
  powerpc/4xx: Fix build of PCI code on 405
  powerpc/pseries: Simplify vpa deregistration functions
  powerpc/pseries: Cleanup VPA registration and deregistration errors
  powerpc/pseries: Fix kexec on recent firmware versions
  MAINTAINERS: change maintainership of mpc5xxx
  powerpc: Make KVM_GUEST default to n
  powerpc/kvm: Fix build errors with older toolchains
  powerpc: Lack of ibm,io-events not that important!
  powerpc: Move kdump default base address to half RMO size on 64bit
  powerpc/perf: Disable pagefaults during callchain stack read
  ppc: Remove duplicate definition of PV_POWER7
  powerpc: pseries: Fix kexec on machines with more than 4TB of RAM
  powerpc: Jump label misalignment causes oops at boot
  powerpc: Clean up some panic messages in prom_init
  powerpc: Fix device tree claim code
  powerpc: Return the_cpu_ spec from identify_cpu
  powerpc: mtspr/mtmsr should take an unsigned long
parents d55140ce a85fe3fc

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -3905,9 +3905,9 @@ F: arch/powerpc/platforms/powermac/ 
F:	drivers/macintosh/



LINUX FOR POWERPC EMBEDDED MPC5XXX

M:	Grant Likely <grant.likely@secretlab.ca>

M:	Anatolij Gustschin <agust@denx.de>

L:	linuxppc-dev@lists.ozlabs.org

T:	git git://git.secretlab.ca/git/linux-2.6.git

T:	git git://git.denx.de/linux-2.6-agust.git

S:	Maintained

F:	arch/powerpc/platforms/512x/

F:	arch/powerpc/platforms/52xx/

arch/powerpc/include/asm/jump_label.h

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ static __always_inline bool arch_static_branch(struct jump_label_key *key) 
	asm goto("1:\n\t"

		 "nop\n\t"

		 ".pushsection __jump_table,  \"aw\"\n\t"

		 ".align 4\n\t"

		 JUMP_ENTRY_TYPE "1b, %l[l_yes], %c0\n\t"

		 ".popsection \n\t"

		 : :  "i" (key) : : l_yes);
@@ -41,7 +40,6 @@ struct jump_entry { 
	jump_label_t code;

	jump_label_t target;

	jump_label_t key;

	jump_label_t pad;

};



#endif /* _ASM_POWERPC_JUMP_LABEL_H */

arch/powerpc/include/asm/kdump.h

+0 −10
Original line number Diff line number Diff line
@@ -3,17 +3,7 @@ 


#include <asm/page.h>



/*

 * If CONFIG_RELOCATABLE is enabled we can place the kdump kernel anywhere.

 * To keep enough space in the RMO for the first stage kernel on 64bit, we

 * place it at 64MB. If CONFIG_RELOCATABLE is not enabled we must place

 * the second stage at 32MB.

 */

#if defined(CONFIG_RELOCATABLE) && defined(CONFIG_PPC64)

#define KDUMP_KERNELBASE	0x4000000

#else

#define KDUMP_KERNELBASE	0x2000000

#endif



/* How many bytes to reserve at zero for kdump. The reserve limit should

 * be greater or equal to the trampoline's end address.

arch/powerpc/include/asm/reg.h

+5 −3
Original line number Diff line number Diff line
@@ -1003,7 +1003,6 @@ 
#define PV_970		0x0039

#define PV_POWER5	0x003A

#define PV_POWER5p	0x003B

#define PV_POWER7	0x003F

#define PV_970FX	0x003C

#define PV_POWER6	0x003E

#define PV_POWER7	0x003F
@@ -1024,13 +1023,16 @@ 
#define mtmsrd(v)	__mtmsrd((v), 0)

#define mtmsr(v)	mtmsrd(v)

#else

#define mtmsr(v)	asm volatile("mtmsr %0" : : "r" (v) : "memory")

#define mtmsr(v)	asm volatile("mtmsr %0" : \

				     : "r" ((unsigned long)(v)) \

				     : "memory")

#endif



#define mfspr(rn)	({unsigned long rval; \

			asm volatile("mfspr %0," __stringify(rn) \

				: "=r" (rval)); rval;})

#define mtspr(rn, v)	asm volatile("mtspr " __stringify(rn) ",%0" : : "r" (v)\

#define mtspr(rn, v)	asm volatile("mtspr " __stringify(rn) ",%0" : \

				     : "r" ((unsigned long)(v)) \

				     : "memory")



#ifdef __powerpc64__

arch/powerpc/kernel/cputable.c

+6 −5
Original line number Diff line number Diff line
@@ -2051,7 +2051,8 @@ static struct cpu_spec __initdata cpu_specs[] = { 


static struct cpu_spec the_cpu_spec;



static void __init setup_cpu_spec(unsigned long offset, struct cpu_spec *s)

static struct cpu_spec * __init setup_cpu_spec(unsigned long offset,

					       struct cpu_spec *s)

{

	struct cpu_spec *t = &the_cpu_spec;

	struct cpu_spec old;
@@ -2114,6 +2115,8 @@ static void __init setup_cpu_spec(unsigned long offset, struct cpu_spec *s) 
		t->cpu_setup(offset, t);

	}

#endif /* CONFIG_PPC64 || CONFIG_BOOKE */



	return t;

}



struct cpu_spec * __init identify_cpu(unsigned long offset, unsigned int pvr)
@@ -2124,10 +2127,8 @@ struct cpu_spec * __init identify_cpu(unsigned long offset, unsigned int pvr) 
	s = PTRRELOC(s);



	for (i = 0; i < ARRAY_SIZE(cpu_specs); i++,s++) {

		if ((pvr & s->pvr_mask) == s->pvr_value) {

			setup_cpu_spec(offset, s);

			return s;

		}

		if ((pvr & s->pvr_mask) == s->pvr_value)

			return setup_cpu_spec(offset, s);

	}



	BUG();