Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / drivers / s390 / char / zcore.c

diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index 047dd92ae804505ed9e363e526060b1822a6f102..eefc6611412e120fd3b5ad896ca3c0a426f9d4b0 100644 (file)
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -9,6 +9,9 @@
  * Author(s): Michael Holzheu
  */
 
+#define KMSG_COMPONENT "zdump"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
 #include <linux/init.h>
 #include <linux/miscdevice.h>
 #include <linux/utsname.h>
@@ -24,11 +27,10 @@
 #include "sclp.h"
 
 #define TRACE(x...) debug_sprintf_event(zcore_dbf, 1, x)
-#define MSG(x...) printk( KERN_ALERT x )
-#define ERROR_MSG(x...) printk ( KERN_ALERT "DUMP: " x )
 
 #define TO_USER                0
 #define TO_KERNEL      1
+#define CHUNK_INFO_SIZE        34 /* 2 16-byte char, each followed by blank */
 
 enum arch_id {
        ARCH_S390       = 0,
@@ -51,6 +53,7 @@ static struct debug_info *zcore_dbf;
 static int hsa_available;
 static struct dentry *zcore_dir;
 static struct dentry *zcore_file;
+static struct dentry *zcore_memmap_file;
 
 /*
  * Copy memory from HSA to kernel or user memory (not reentrant):
@@ -476,6 +479,54 @@ static const struct file_operations zcore_fops = {
        .release        = zcore_release,
 };
 
+static ssize_t zcore_memmap_read(struct file *filp, char __user *buf,
+                                size_t count, loff_t *ppos)
+{
+       return simple_read_from_buffer(buf, count, ppos, filp->private_data,
+                                      MEMORY_CHUNKS * CHUNK_INFO_SIZE);
+}
+
+static int zcore_memmap_open(struct inode *inode, struct file *filp)
+{
+       int i;
+       char *buf;
+       struct mem_chunk *chunk_array;
+
+       chunk_array = kzalloc(MEMORY_CHUNKS * sizeof(struct mem_chunk),
+                             GFP_KERNEL);
+       if (!chunk_array)
+               return -ENOMEM;
+       detect_memory_layout(chunk_array);
+       buf = kzalloc(MEMORY_CHUNKS * CHUNK_INFO_SIZE, GFP_KERNEL);
+       if (!buf) {
+               kfree(chunk_array);
+               return -ENOMEM;
+       }
+       for (i = 0; i < MEMORY_CHUNKS; i++) {
+               sprintf(buf + (i * CHUNK_INFO_SIZE), "%016llx %016llx ",
+                       (unsigned long long) chunk_array[i].addr,
+                       (unsigned long long) chunk_array[i].size);
+               if (chunk_array[i].size == 0)
+                       break;
+       }
+       kfree(chunk_array);
+       filp->private_data = buf;
+       return 0;
+}
+
+static int zcore_memmap_release(struct inode *inode, struct file *filp)
+{
+       kfree(filp->private_data);
+       return 0;
+}
+
+static const struct file_operations zcore_memmap_fops = {
+       .owner          = THIS_MODULE,
+       .read           = zcore_memmap_read,
+       .open           = zcore_memmap_open,
+       .release        = zcore_memmap_release,
+};
+
 
 static void __init set_s390_lc_mask(union save_area *map)
 {
@@ -513,19 +564,19 @@ static int __init sys_info_init(enum arch_id arch)
 
        switch (arch) {
        case ARCH_S390X:
-               MSG("DETECTED 'S390X (64 bit) OS'\n");
+               pr_alert("DETECTED 'S390X (64 bit) OS'\n");
                sys_info.sa_base = SAVE_AREA_BASE_S390X;
                sys_info.sa_size = sizeof(struct save_area_s390x);
                set_s390x_lc_mask(&sys_info.lc_mask);
                break;
        case ARCH_S390:
-               MSG("DETECTED 'S390 (32 bit) OS'\n");
+               pr_alert("DETECTED 'S390 (32 bit) OS'\n");
                sys_info.sa_base = SAVE_AREA_BASE_S390;
                sys_info.sa_size = sizeof(struct save_area_s390);
                set_s390_lc_mask(&sys_info.lc_mask);
                break;
        default:
-               ERROR_MSG("unknown architecture 0x%x.\n",arch);
+               pr_alert("0x%x is an unknown architecture.\n",arch);
                return -EINVAL;
        }
        sys_info.arch = arch;
@@ -554,18 +605,44 @@ static int __init check_sdias(void)
        return 0;
 }
 
-static void __init zcore_header_init(int arch, struct zcore_header *hdr)
+static int __init get_mem_size(unsigned long *mem)
+{
+       int i;
+       struct mem_chunk *chunk_array;
+
+       chunk_array = kzalloc(MEMORY_CHUNKS * sizeof(struct mem_chunk),
+                             GFP_KERNEL);
+       if (!chunk_array)
+               return -ENOMEM;
+       detect_memory_layout(chunk_array);
+       for (i = 0; i < MEMORY_CHUNKS; i++) {
+               if (chunk_array[i].size == 0)
+                       break;
+               *mem += chunk_array[i].size;
+       }
+       kfree(chunk_array);
+       return 0;
+}
+
+static int __init zcore_header_init(int arch, struct zcore_header *hdr)
 {
+       int rc;
+       unsigned long memory = 0;
+
        if (arch == ARCH_S390X)
                hdr->arch_id = DUMP_ARCH_S390X;
        else
                hdr->arch_id = DUMP_ARCH_S390;
-       hdr->mem_size = sys_info.mem_size;
-       hdr->rmem_size = sys_info.mem_size;
+       rc = get_mem_size(&memory);
+       if (rc)
+               return rc;
+       hdr->mem_size = memory;
+       hdr->rmem_size = memory;
        hdr->mem_end = sys_info.mem_size;
-       hdr->num_pages = sys_info.mem_size / PAGE_SIZE;
+       hdr->num_pages = memory / PAGE_SIZE;
        hdr->tod = get_clock();
        get_cpu_id(&hdr->cpu_id);
+       return 0;
 }
 
 static int __init zcore_init(void)
@@ -598,7 +675,8 @@ static int __init zcore_init(void)
 
 #ifndef __s390x__
        if (arch == ARCH_S390X) {
-               ERROR_MSG("32 bit dumper can't dump 64 bit system!\n");
+               pr_alert("The 32-bit dump tool cannot be used for a "
+                        "64-bit system\n");
                rc = -EINVAL;
                goto fail;
        }
@@ -608,7 +686,9 @@ static int __init zcore_init(void)
        if (rc)
                goto fail;
 
-       zcore_header_init(arch, &zcore_header);
+       rc = zcore_header_init(arch, &zcore_header);
+       if (rc)
+               goto fail;
 
        zcore_dir = debugfs_create_dir("zcore" , NULL);
        if (!zcore_dir) {
@@ -618,13 +698,22 @@ static int __init zcore_init(void)
        zcore_file = debugfs_create_file("mem", S_IRUSR, zcore_dir, NULL,
                                         &zcore_fops);
        if (!zcore_file) {
-               debugfs_remove(zcore_dir);
                rc = -ENOMEM;
-               goto fail;
+               goto fail_dir;
+       }
+       zcore_memmap_file = debugfs_create_file("memmap", S_IRUSR, zcore_dir,
+                                               NULL, &zcore_memmap_fops);
+       if (!zcore_memmap_file) {
+               rc = -ENOMEM;
+               goto fail_file;
        }
        hsa_available = 1;
        return 0;
 
+fail_file:
+       debugfs_remove(zcore_file);
+fail_dir:
+       debugfs_remove(zcore_dir);
 fail:
        diag308(DIAG308_REL_HSA, NULL);
        return rc;