Merge tag 'iwlwifi-for-kalle-2015-01-05' of https://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / drivers / base / memory.c

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index a2e13e250bba2f54eea93e72e9692340d3298d66..85be040a21c80505c09183c1578eb9c15f524244 100644 (file)
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -228,8 +228,8 @@ memory_block_action(unsigned long phys_index, unsigned long action, int online_t
        struct page *first_page;
        int ret;
 
-       first_page = pfn_to_page(phys_index << PFN_SECTION_SHIFT);
-       start_pfn = page_to_pfn(first_page);
+       start_pfn = phys_index << PFN_SECTION_SHIFT;
+       first_page = pfn_to_page(start_pfn);
 
        switch (action) {
                case MEM_ONLINE:
@@ -373,6 +373,45 @@ static ssize_t show_phys_device(struct device *dev,
        return sprintf(buf, "%d\n", mem->phys_device);
 }
 
+#ifdef CONFIG_MEMORY_HOTREMOVE
+static ssize_t show_valid_zones(struct device *dev,
+                               struct device_attribute *attr, char *buf)
+{
+       struct memory_block *mem = to_memory_block(dev);
+       unsigned long start_pfn, end_pfn;
+       unsigned long nr_pages = PAGES_PER_SECTION * sections_per_block;
+       struct page *first_page;
+       struct zone *zone;
+
+       start_pfn = section_nr_to_pfn(mem->start_section_nr);
+       end_pfn = start_pfn + nr_pages;
+       first_page = pfn_to_page(start_pfn);
+
+       /* The block contains more than one zone can not be offlined. */
+       if (!test_pages_in_a_zone(start_pfn, end_pfn))
+               return sprintf(buf, "none\n");
+
+       zone = page_zone(first_page);
+
+       if (zone_idx(zone) == ZONE_MOVABLE - 1) {
+               /*The mem block is the last memoryblock of this zone.*/
+               if (end_pfn == zone_end_pfn(zone))
+                       return sprintf(buf, "%s %s\n",
+                                       zone->name, (zone + 1)->name);
+       }
+
+       if (zone_idx(zone) == ZONE_MOVABLE) {
+               /*The mem block is the first memoryblock of ZONE_MOVABLE.*/
+               if (start_pfn == zone->zone_start_pfn)
+                       return sprintf(buf, "%s %s\n",
+                                       zone->name, (zone - 1)->name);
+       }
+
+       return sprintf(buf, "%s\n", zone->name);
+}
+static DEVICE_ATTR(valid_zones, 0444, show_valid_zones, NULL);
+#endif
+
 static DEVICE_ATTR(phys_index, 0444, show_mem_start_phys_index, NULL);
 static DEVICE_ATTR(state, 0644, show_mem_state, store_mem_state);
 static DEVICE_ATTR(phys_device, 0444, show_phys_device, NULL);
@@ -523,6 +562,9 @@ static struct attribute *memory_memblk_attrs[] = {
        &dev_attr_state.attr,
        &dev_attr_phys_device.attr,
        &dev_attr_removable.attr,
+#ifdef CONFIG_MEMORY_HOTREMOVE
+       &dev_attr_valid_zones.attr,
+#endif
        NULL
 };