Subject: [PATCH 2/5] Use the base address of lmbs instead of drc index for dlpar

From: Nathan Fontenot <[email-masked]>
Date: Fri, 20 Jun 2008 16:30:47 -0500

Use the base address of the lmb to get the starting page frame number
instead of trying to extract it from the drc index of the lmb.

In the previous representations of memory in the device tree, the drc index
of a lmb would match up with the base address of the lmb.  For example a
lmb woulf have a drc index of 8000000a and a base address of a0000000.  This
allowed the starting page frame number to be extracted from the drc index.

The lmbs represented under the ibm,dynamic-reconfiguration-memory nodein the
device tree do not always have a drc index that matches, thus we need to
get the starting page frame number from the base address of an lmb instead
of the drc index.

Signed-off-by: Nathan Fontenot <[email-masked]>
---

Index: linux-2.6.git/arch/powerpc/platforms/pseries/hotplug-memory.c
===================================================================
--- linux-2.6.git.orig/arch/powerpc/platforms/pseries/hotplug-memory.c	2008-06-20 
12:08:41.000000000 -0500
+++ linux-2.6.git/arch/powerpc/platforms/pseries/hotplug-memory.c	2008-06-20 
12:40:21.000000000 -0500
@@ -18,8 +18,9 @@
  static int pseries_remove_memory(struct device_node *np)
  {
  	const char *type;
-	const unsigned int *my_index;
  	const unsigned int *regs;
+	unsigned long base;
+	unsigned int lmb_size;
  	u64 start_pfn, start;
  	struct zone *zone;
  	int ret = -EINVAL;
@@ -32,17 +33,16 @@
  		return 0;

  	/*
-	 * Find the memory index and size of the removing section
+	 * Find the base address and size of the lmb
  	 */
-	my_index = of_get_property(np, "ibm,my-drc-index", NULL);
-	if (!my_index)
-		return ret;
-
  	regs = of_get_property(np, "reg", NULL);
  	if (!regs)
  		return ret;

-	start_pfn = section_nr_to_pfn(*my_index & 0xffff);
+	base = *(unsigned long *)regs;
+	lmb_size = regs[3];
+
+	start_pfn = base >> PFN_SECTION_SHIFT;
  	zone = page_zone(pfn_to_page(start_pfn));

  	/*
@@ -54,29 +54,29 @@
  	 * to sysfs "state" file and we can't remove sysfs entries
  	 * while writing to it. So we have to defer it to here.
  	 */
-	ret = __remove_pages(zone, start_pfn, regs[3] >> PAGE_SHIFT);
+	ret = __remove_pages(zone, start_pfn, lmb_size >> PAGE_SHIFT);
  	if (ret)
  		return ret;

  	/*
  	 * Update memory regions for memory remove
  	 */
-	lmb_remove(start_pfn << PAGE_SHIFT, regs[3]);
+	lmb_remove(base, lmb_size);

  	/*
  	 * Remove htab bolted mappings for this section of memory
  	 */
-	start = (unsigned long)__va(start_pfn << PAGE_SHIFT);
-	ret = remove_section_mapping(start, start + regs[3]);
+	start = (unsigned long)__va(base);
+	ret = remove_section_mapping(start, start + lmb_size);
  	return ret;
  }

  static int pseries_add_memory(struct device_node *np)
  {
  	const char *type;
-	const unsigned int *my_index;
  	const unsigned int *regs;
-	u64 start_pfn;
+	unsigned long base;
+	unsigned int lmb_size;
  	int ret = -EINVAL;

  	/*
@@ -87,22 +87,19 @@
  		return 0;

  	/*
-	 * Find the memory index and size of the added section
+	 * Find the base and size of the lmb
  	 */
-	my_index = of_get_property(np, "ibm,my-drc-index", NULL);
-	if (!my_index)
-		return ret;
-
  	regs = of_get_property(np, "reg", NULL);
  	if (!regs)
  		return ret;

-	start_pfn = section_nr_to_pfn(*my_index & 0xffff);
+	base = *(unsigned long *)regs;
+	lmb_size = regs[3];

  	/*
  	 * Update memory region to represent the memory add
  	 */
-	lmb_add(start_pfn << PAGE_SHIFT, regs[3]);
+	lmb_add(base, lmb_size);
  	return 0;
  }