Skip to contentSkip to conversation

ppc64: actually call prom_send_capabilities

PATCH Benjamin Herrenschmidt 1 participant 1 message May 31, 2005 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 10 lines

Index: arch/ppc64/kernel/prom_init.c
===================================================================

arch/ppc64/kernel/prom_init.c (mode:100644 sha1:bc53967a86436d6b3f4a4f324273e01fdab934b3) renamed from arch/ppc64/kernel/prom_init.c (mode:100644 sha1:6f79b7b9b445e8669411e34b48c1ea8ce5135965) +0 -0
@@ -1881,6 +1881,12 @@ unsigned long __init prom_init(unsigned 
 		     &getprop_rval, sizeof(getprop_rval));
 
 	/*

arch/ppc64/kernel/prom_init.c (mode:100644 sha1:bc53967a86436d6b3f4a4f324273e01fdab934b3) unsigned long __init prom_init(unsigned

Quoted 10 lines
arch/ppc64/kernel/prom_init.c (mode:100644 sha1:bc53967a86436d6b3f4a4f324273e01fdab934b3) renamed from arch/ppc64/kernel/prom_init.c (mode:100644 sha1:6f79b7b9b445e8669411e34b48c1ea8ce5135965) +6 -1
+	 * On pSeries, inform the firmware about our capabilities
+	 */
+	if (RELOC(of_platform) & PLATFORM_PSERIES)
+		prom_send_capabilities();
+
+	/*
 	 * On pSeries, copy the CPU hold code
 	 */
        	if (RELOC(of_platform) & PLATFORM_PSERIES)
-

/* Platforms supported by PPC64 */
#define PLATFORM_PSERIES 0x0100
#define PLATFORM_PSERIES_LPAR 0x0101
#define PLATFORM_ISERIES_LPAR 0x0201

#define PLATFORM_LPAR         0x0001
#define PLATFORM_POWERMAC     0x0400
#define PLATFORM_MAPLE        0x0500

Hrm... this will trigger on Maple too... Should I change Maple definition ? That would break kexec of maple from existing to newer kernels though.