]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - arch/powerpc/platforms/pseries/phyp_dump.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
[karo-tx-linux.git] / arch / powerpc / platforms / pseries / phyp_dump.c
index 5cdba6a6f70c2358d59e9c8d12b35fae3337d177..edbc012c2ebca1cff90c13d713d2e442e3ac52a1 100644 (file)
@@ -70,6 +70,10 @@ static struct phyp_dump_header phdr;
 #define DUMP_SOURCE_CPU                0x0001
 #define DUMP_SOURCE_HPTE       0x0002
 #define DUMP_SOURCE_RMO                0x0011
+#define DUMP_ERROR_FLAG                0x2000
+#define DUMP_TRIGGERED         0x4000
+#define DUMP_PERFORMED         0x8000
+
 
 /**
  * init_dump_header() - initialize the header declaring a dump
@@ -178,12 +182,30 @@ static void print_dump_header(const struct phyp_dump_header *ph)
 #endif
 }
 
+static ssize_t show_phyp_dump_active(struct kobject *kobj,
+                       struct kobj_attribute *attr, char *buf)
+{
+
+       /* create filesystem entry so kdump is phyp-dump aware */
+       return sprintf(buf, "%lx\n", phyp_dump_info->phyp_dump_at_boot);
+}
+
+static struct kobj_attribute pdl = __ATTR(phyp_dump_active, 0600,
+                                       show_phyp_dump_active,
+                                       NULL);
+
 static void register_dump_area(struct phyp_dump_header *ph, unsigned long addr)
 {
        int rc;
-       ph->cpu_data.destination_address += addr;
-       ph->hpte_data.destination_address += addr;
-       ph->kernel_data.destination_address += addr;
+
+       /* Add addr value if not initialized before */
+       if (ph->cpu_data.destination_address == 0) {
+               ph->cpu_data.destination_address += addr;
+               ph->hpte_data.destination_address += addr;
+               ph->kernel_data.destination_address += addr;
+       }
+
+       /* ToDo Invalidate kdump and free memory range. */
 
        do {
                rc = rtas_call(ibm_configure_kernel_dump, 3, 1, NULL,
@@ -194,6 +216,36 @@ static void register_dump_area(struct phyp_dump_header *ph, unsigned long addr)
                printk(KERN_ERR "phyp-dump: unexpected error (%d) on "
                                                "register\n", rc);
                print_dump_header(ph);
+               return;
+       }
+
+       rc = sysfs_create_file(kernel_kobj, &pdl.attr);
+       if (rc)
+               printk(KERN_ERR "phyp-dump: unable to create sysfs"
+                               " file (%d)\n", rc);
+}
+
+static
+void invalidate_last_dump(struct phyp_dump_header *ph, unsigned long addr)
+{
+       int rc;
+
+       /* Add addr value if not initialized before */
+       if (ph->cpu_data.destination_address == 0) {
+               ph->cpu_data.destination_address += addr;
+               ph->hpte_data.destination_address += addr;
+               ph->kernel_data.destination_address += addr;
+       }
+
+       do {
+               rc = rtas_call(ibm_configure_kernel_dump, 3, 1, NULL,
+                               2, ph, sizeof(struct phyp_dump_header));
+       } while (rtas_busy_delay(rc));
+
+       if (rc) {
+               printk(KERN_ERR "phyp-dump: unexpected error (%d) "
+                                               "on invalidate\n", rc);
+               print_dump_header(ph);
        }
 }
 
@@ -207,8 +259,8 @@ static void register_dump_area(struct phyp_dump_header *ph, unsigned long addr)
  * lmb_reserved in early boot. The released memory becomes
  * available for genreal use.
  */
-static void
-release_memory_range(unsigned long start_pfn, unsigned long nr_pages)
+static void release_memory_range(unsigned long start_pfn,
+                       unsigned long nr_pages)
 {
        struct page *rpage;
        unsigned long end_pfn;
@@ -227,6 +279,39 @@ release_memory_range(unsigned long start_pfn, unsigned long nr_pages)
        }
 }
 
+/**
+ * track_freed_range -- Counts the range being freed.
+ * Once the counter goes to zero, it re-registers dump for
+ * future use.
+ */
+static void
+track_freed_range(unsigned long addr, unsigned long length)
+{
+       static unsigned long scratch_area_size, reserved_area_size;
+
+       if (addr < phyp_dump_info->init_reserve_start)
+               return;
+
+       if ((addr >= phyp_dump_info->init_reserve_start) &&
+           (addr <= phyp_dump_info->init_reserve_start +
+            phyp_dump_info->init_reserve_size))
+               reserved_area_size += length;
+
+       if ((addr >= phyp_dump_info->reserved_scratch_addr) &&
+           (addr <= phyp_dump_info->reserved_scratch_addr +
+            phyp_dump_info->reserved_scratch_size))
+               scratch_area_size += length;
+
+       if ((reserved_area_size == phyp_dump_info->init_reserve_size) &&
+           (scratch_area_size == phyp_dump_info->reserved_scratch_size)) {
+
+               invalidate_last_dump(&phdr,
+                               phyp_dump_info->reserved_scratch_addr);
+               register_dump_area(&phdr,
+                               phyp_dump_info->reserved_scratch_addr);
+       }
+}
+
 /* ------------------------------------------------- */
 /**
  * sysfs_release_region -- sysfs interface to release memory range.
@@ -251,6 +336,8 @@ static ssize_t store_release_region(struct kobject *kobj,
        if (ret != 2)
                return -EINVAL;
 
+       track_freed_range(start_addr, length);
+
        /* Range-check - don't free any reserved memory that
         * wasn't reserved for phyp-dump */
        if (start_addr < phyp_dump_info->init_reserve_start)
@@ -269,8 +356,29 @@ static ssize_t store_release_region(struct kobject *kobj,
        return count;
 }
 
+static ssize_t show_release_region(struct kobject *kobj,
+                       struct kobj_attribute *attr, char *buf)
+{
+       u64 second_addr_range;
+
+       /* total reserved size - start of scratch area */
+       second_addr_range = phyp_dump_info->init_reserve_size -
+                               phyp_dump_info->reserved_scratch_size;
+       return sprintf(buf, "CPU:0x%lx-0x%lx: HPTE:0x%lx-0x%lx:"
+                           " DUMP:0x%lx-0x%lx, 0x%lx-0x%lx:\n",
+               phdr.cpu_data.destination_address,
+               phdr.cpu_data.length_copied,
+               phdr.hpte_data.destination_address,
+               phdr.hpte_data.length_copied,
+               phdr.kernel_data.destination_address,
+               phdr.kernel_data.length_copied,
+               phyp_dump_info->init_reserve_start,
+               second_addr_range);
+}
+
 static struct kobj_attribute rr = __ATTR(release_region, 0600,
-                                        NULL, store_release_region);
+                                       show_release_region,
+                                       store_release_region);
 
 static int __init phyp_dump_setup(void)
 {
@@ -313,6 +421,22 @@ static int __init phyp_dump_setup(void)
                return 0;
        }
 
+       /* re-register the dump area, if old dump was invalid */
+       if ((dump_header) && (dump_header->status & DUMP_ERROR_FLAG)) {
+               invalidate_last_dump(&phdr, dump_area_start);
+               register_dump_area(&phdr, dump_area_start);
+               return 0;
+       }
+
+       if (dump_header) {
+               phyp_dump_info->reserved_scratch_addr =
+                               dump_header->cpu_data.destination_address;
+               phyp_dump_info->reserved_scratch_size =
+                               dump_header->cpu_data.source_length +
+                               dump_header->hpte_data.source_length +
+                               dump_header->kernel_data.source_length;
+       }
+
        /* Should we create a dump_subsys, analogous to s390/ipl.c ? */
        rc = sysfs_create_file(kernel_kobj, &rr.attr);
        if (rc)
@@ -354,3 +478,30 @@ int __init early_init_dt_scan_phyp_dump(unsigned long node,
                                                *((unsigned long *)&sizes[4]);
        return 1;
 }
+
+/* Look for phyp_dump= cmdline option */
+static int __init early_phyp_dump_enabled(char *p)
+{
+       phyp_dump_info->phyp_dump_at_boot = 1;
+
+        if (!p)
+                return 0;
+
+        if (strncmp(p, "1", 1) == 0)
+               phyp_dump_info->phyp_dump_at_boot = 1;
+        else if (strncmp(p, "0", 1) == 0)
+               phyp_dump_info->phyp_dump_at_boot = 0;
+
+        return 0;
+}
+early_param("phyp_dump", early_phyp_dump_enabled);
+
+/* Look for phyp_dump_reserve_size= cmdline option */
+static int __init early_phyp_dump_reserve_size(char *p)
+{
+        if (p)
+               phyp_dump_info->reserve_bootvar = memparse(p, &p);
+
+        return 0;
+}
+early_param("phyp_dump_reserve_size", early_phyp_dump_reserve_size);