[POWERPC] pseries/phyp dump: Reserve a variable amount of space at boot

[linux-2.6] / arch / powerpc / platforms / pseries / rtasd.c

diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index 762fe87629ff6ac2f9db5654ddc9077e26e75b9d..e3078ce41518aec0abb0579a5c2f9cb21315dd44 100644 (file)
--- a/arch/powerpc/platforms/pseries/rtasd.c
+++ b/arch/powerpc/platforms/pseries/rtasd.c
@@ -53,9 +53,11 @@ static unsigned int rtas_event_scan_rate;
 
 static int full_rtas_msgs = 0;
 
-extern int no_logging;
-
-volatile int error_log_cnt = 0;
+/* Stop logging to nvram after first fatal error */
+static int logging_enabled; /* Until we initialize everything,
+                             * make sure we don't try logging
+                             * anything */
+static int error_log_cnt;
 
 /*
  * Since we use 32 bit RTAS, the physical address of this must be below
@@ -64,8 +66,6 @@ volatile int error_log_cnt = 0;
  */
 static unsigned char logdata[RTAS_ERROR_LOG_MAX];
 
-static int get_eventscan_parms(void);
-
 static char *rtas_type[] = {
        "Unknown", "Retry", "TCE Error", "Internal Device Failure",
        "Timeout", "Data Parity", "Address Parity", "Cache Parity",
@@ -169,9 +169,9 @@ static int log_rtas_len(char * buf)
                len += err->extended_log_length;
        }
 
-       if (rtas_error_log_max == 0) {
-               get_eventscan_parms();
-       }
+       if (rtas_error_log_max == 0)
+               rtas_error_log_max = rtas_get_error_log_max();
+
        if (len > rtas_error_log_max)
                len = rtas_error_log_max;
 
@@ -218,8 +218,8 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
        }
 
        /* Write error to NVRAM */
-       if (!no_logging && !(err_type & ERR_FLAG_BOOT))
-               nvram_write_error_log(buf, len, err_type);
+       if (logging_enabled && !(err_type & ERR_FLAG_BOOT))
+               nvram_write_error_log(buf, len, err_type, error_log_cnt);
 
        /*
         * rtas errors can occur during boot, and we do want to capture
@@ -230,8 +230,8 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
                printk_log_rtas(buf, len);
 
        /* Check to see if we need to or have stopped logging */
-       if (fatal || no_logging) {
-               no_logging = 1;
+       if (fatal || !logging_enabled) {
+               logging_enabled = 0;
                spin_unlock_irqrestore(&rtasd_log_lock, s);
                return;
        }
@@ -303,7 +303,7 @@ static ssize_t rtas_log_read(struct file * file, char __user * buf,
 
        spin_lock_irqsave(&rtasd_log_lock, s);
        /* if it's 0, then we know we got the last one (the one in NVRAM) */
-       if (rtas_log_size == 0 && !no_logging)
+       if (rtas_log_size == 0 && logging_enabled)
                nvram_clear_error_log();
        spin_unlock_irqrestore(&rtasd_log_lock, s);
 
@@ -359,31 +359,6 @@ static int enable_surveillance(int timeout)
        return -1;
 }
 
-static int get_eventscan_parms(void)
-{
-       struct device_node *node;
-       const int *ip;
-
-       node = of_find_node_by_path("/rtas");
-
-       ip = of_get_property(node, "rtas-event-scan-rate", NULL);
-       if (ip == NULL) {
-               printk(KERN_ERR "rtasd: no rtas-event-scan-rate\n");
-               of_node_put(node);
-               return -1;
-       }
-       rtas_event_scan_rate = *ip;
-       DEBUG("rtas-event-scan-rate %d\n", rtas_event_scan_rate);
-
-       /* Make room for the sequence number */
-       rtas_error_log_max = rtas_get_error_log_max();
-       rtas_error_log_buffer_max = rtas_error_log_max + sizeof(int);
-
-       of_node_put(node);
-
-       return 0;
-}
-
 static void do_event_scan(void)
 {
        int error;
@@ -407,7 +382,7 @@ static void do_event_scan_all_cpus(long delay)
 {
        int cpu;
 
-       lock_cpu_hotplug();
+       get_online_cpus();
        cpu = first_cpu(cpu_online_map);
        for (;;) {
                set_cpus_allowed(current, cpumask_of_cpu(cpu));
@@ -415,15 +390,15 @@ static void do_event_scan_all_cpus(long delay)
                set_cpus_allowed(current, CPU_MASK_ALL);
 
                /* Drop hotplug lock, and sleep for the specified delay */
-               unlock_cpu_hotplug();
+               put_online_cpus();
                msleep_interruptible(delay);
-               lock_cpu_hotplug();
+               get_online_cpus();
 
                cpu = next_cpu(cpu, cpu_online_map);
                if (cpu == NR_CPUS)
                        break;
        }
-       unlock_cpu_hotplug();
+       put_online_cpus();
 }
 
 static int rtasd(void *unused)
@@ -433,26 +408,15 @@ static int rtasd(void *unused)
 
        daemonize("rtasd");
 
-       if (get_eventscan_parms() == -1)
-               goto error;
-
-       rtas_log_buf = vmalloc(rtas_error_log_buffer_max*LOG_NUMBER);
-       if (!rtas_log_buf) {
-               printk(KERN_ERR "rtasd: no memory\n");
-               goto error;
-       }
-
        printk(KERN_DEBUG "RTAS daemon started\n");
-
        DEBUG("will sleep for %d milliseconds\n", (30000/rtas_event_scan_rate));
 
        /* See if we have any error stored in NVRAM */
        memset(logdata, 0, rtas_error_log_max);
-
-       rc = nvram_read_error_log(logdata, rtas_error_log_max, &err_type);
-
+       rc = nvram_read_error_log(logdata, rtas_error_log_max,
+                                 &err_type, &error_log_cnt);
        /* We can use rtas_log_buf now */
-       no_logging = 0;
+       logging_enabled = 1;
 
        if (!rc) {
                if (err_type != ERR_FLAG_ALREADY_LOGGED) {
@@ -475,8 +439,6 @@ static int rtasd(void *unused)
        for (;;)
                do_event_scan_all_cpus(30000/rtas_event_scan_rate);
 
-error:
-       /* Should delete proc entries */
        return -EINVAL;
 }
 
@@ -494,6 +456,22 @@ static int __init rtas_init(void)
                return -ENODEV;
        }
 
+       rtas_event_scan_rate = rtas_token("rtas-event-scan-rate");
+       if (rtas_event_scan_rate == RTAS_UNKNOWN_SERVICE) {
+               printk(KERN_ERR "rtasd: no rtas-event-scan-rate on system\n");
+               return -ENODEV;
+       }
+
+       /* Make room for the sequence number */
+       rtas_error_log_max = rtas_get_error_log_max();
+       rtas_error_log_buffer_max = rtas_error_log_max + sizeof(int);
+
+       rtas_log_buf = vmalloc(rtas_error_log_buffer_max*LOG_NUMBER);
+       if (!rtas_log_buf) {
+               printk(KERN_ERR "rtasd: no memory\n");
+               return -ENOMEM;
+       }
+
        entry = create_proc_entry("ppc64/rtas/error_log", S_IRUSR, NULL);
        if (entry)
                entry->proc_fops = &proc_rtas_log_operations;