]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/s390/sysinfo.c
[PATCH] improve idle cputime accounting
[linux-2.6-omap-h63xx.git] / drivers / s390 / sysinfo.c
index 291ff6235fe2f0e234a5be1747fc57231a09d25c..0eea90781385784ae4ab838dce905dcaf4942a89 100644 (file)
 /*
  *  drivers/s390/sysinfo.c
  *
- *    Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Ulrich Weigand (Ulrich.Weigand@de.ibm.com)
+ *  Copyright IBM Corp. 2001, 2008
+ *  Author(s): Ulrich Weigand (Ulrich.Weigand@de.ibm.com)
+ *            Martin Schwidefsky <schwidefsky@de.ibm.com>
  */
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include <asm/ebcdic.h>
+#include <asm/sysinfo.h>
+#include <asm/cpcmd.h>
 
 /* Sigh, math-emu. Don't ask. */
 #include <asm/sfp-util.h>
 #include <math-emu/soft-fp.h>
 #include <math-emu/single.h>
 
-struct sysinfo_1_1_1 {
-       char reserved_0[32];
-       char manufacturer[16];
-       char type[4];
-       char reserved_1[12];
-       char model_capacity[16];
-       char sequence[16];
-       char plant[4];
-       char model[16];
-};
-
-struct sysinfo_1_2_1 {
-       char reserved_0[80];
-       char sequence[16];
-       char plant[4];
-       char reserved_1[2];
-       unsigned short cpu_address;
-};
-
-struct sysinfo_1_2_2 {
-       char format;
-       char reserved_0[1];
-       unsigned short acc_offset;
-       char reserved_1[24];
-       unsigned int secondary_capability;
-       unsigned int capability;
-       unsigned short cpus_total;
-       unsigned short cpus_configured;
-       unsigned short cpus_standby;
-       unsigned short cpus_reserved;
-       unsigned short adjustment[0];
-};
-
-struct sysinfo_1_2_2_extension {
-       unsigned int alt_capability;
-       unsigned short alt_adjustment[0];
-};
-
-struct sysinfo_2_2_1 {
-       char reserved_0[80];
-       char sequence[16];
-       char plant[4];
-       unsigned short cpu_id;
-       unsigned short cpu_address;
-};
-
-struct sysinfo_2_2_2 {
-       char reserved_0[32];
-       unsigned short lpar_number;
-       char reserved_1;
-       unsigned char characteristics;
-       unsigned short cpus_total;
-       unsigned short cpus_configured;
-       unsigned short cpus_standby;
-       unsigned short cpus_reserved;
-       char name[8];
-       unsigned int caf;
-       char reserved_2[16];
-       unsigned short cpus_dedicated;
-       unsigned short cpus_shared;
-};
-
-#define LPAR_CHAR_DEDICATED    (1 << 7)
-#define LPAR_CHAR_SHARED       (1 << 6)
-#define LPAR_CHAR_LIMITED      (1 << 5)
-
-struct sysinfo_3_2_2 {
-       char reserved_0[31];
-       unsigned char count;
-       struct {
-               char reserved_0[4];
-               unsigned short cpus_total;
-               unsigned short cpus_configured;
-               unsigned short cpus_standby;
-               unsigned short cpus_reserved;
-               char name[8];
-               unsigned int caf;
-               char cpi[16];
-               char reserved_1[24];
-
-       } vm[8];
-};
-
-static inline int stsi(void *sysinfo, int fc, int sel1, int sel2)
-{
-       register int r0 asm("0") = (fc << 28) | sel1;
-       register int r1 asm("1") = sel2;
-
-       asm volatile(
-               "   stsi 0(%2)\n"
-               "0: jz   2f\n"
-               "1: lhi  %0,%3\n"
-               "2:\n"
-               EX_TABLE(0b,1b)
-               : "+d" (r0) : "d" (r1), "a" (sysinfo), "K" (-ENOSYS)
-               : "cc", "memory" );
-       return r0;
-}
-
 static inline int stsi_0(void)
 {
        int rc = stsi (NULL, 0, 0, 0);
@@ -133,6 +39,8 @@ static int stsi_1_1_1(struct sysinfo_1_1_1 *info, char *page, int len)
        EBCASC(info->sequence, sizeof(info->sequence));
        EBCASC(info->plant, sizeof(info->plant));
        EBCASC(info->model_capacity, sizeof(info->model_capacity));
+       EBCASC(info->model_perm_cap, sizeof(info->model_perm_cap));
+       EBCASC(info->model_temp_cap, sizeof(info->model_temp_cap));
        len += sprintf(page + len, "Manufacturer:         %-16.16s\n",
                       info->manufacturer);
        len += sprintf(page + len, "Type:                 %-4.4s\n",
@@ -155,8 +63,18 @@ static int stsi_1_1_1(struct sysinfo_1_1_1 *info, char *page, int len)
                       info->sequence);
        len += sprintf(page + len, "Plant:                %-4.4s\n",
                       info->plant);
-       len += sprintf(page + len, "Model Capacity:       %-16.16s\n",
-                      info->model_capacity);
+       len += sprintf(page + len, "Model Capacity:       %-16.16s %08u\n",
+                      info->model_capacity, *(u32 *) info->model_cap_rating);
+       if (info->model_perm_cap[0] != '\0')
+               len += sprintf(page + len,
+                              "Model Perm. Capacity: %-16.16s %08u\n",
+                              info->model_perm_cap,
+                              *(u32 *) info->model_perm_cap_rating);
+       if (info->model_temp_cap[0] != '\0')
+               len += sprintf(page + len,
+                              "Model Temp. Capacity: %-16.16s %08u\n",
+                              info->model_temp_cap,
+                              *(u32 *) info->model_temp_cap_rating);
        return len;
 }
 
@@ -357,6 +275,125 @@ static __init int create_proc_sysinfo(void)
 
 __initcall(create_proc_sysinfo);
 
+/*
+ * Service levels interface.
+ */
+
+static DECLARE_RWSEM(service_level_sem);
+static LIST_HEAD(service_level_list);
+
+int register_service_level(struct service_level *slr)
+{
+       struct service_level *ptr;
+
+       down_write(&service_level_sem);
+       list_for_each_entry(ptr, &service_level_list, list)
+               if (ptr == slr) {
+                       up_write(&service_level_sem);
+                       return -EEXIST;
+               }
+       list_add_tail(&slr->list, &service_level_list);
+       up_write(&service_level_sem);
+       return 0;
+}
+EXPORT_SYMBOL(register_service_level);
+
+int unregister_service_level(struct service_level *slr)
+{
+       struct service_level *ptr, *next;
+       int rc = -ENOENT;
+
+       down_write(&service_level_sem);
+       list_for_each_entry_safe(ptr, next, &service_level_list, list) {
+               if (ptr != slr)
+                       continue;
+               list_del(&ptr->list);
+               rc = 0;
+               break;
+       }
+       up_write(&service_level_sem);
+       return rc;
+}
+EXPORT_SYMBOL(unregister_service_level);
+
+static void *service_level_start(struct seq_file *m, loff_t *pos)
+{
+       down_read(&service_level_sem);
+       return seq_list_start(&service_level_list, *pos);
+}
+
+static void *service_level_next(struct seq_file *m, void *p, loff_t *pos)
+{
+       return seq_list_next(p, &service_level_list, pos);
+}
+
+static void service_level_stop(struct seq_file *m, void *p)
+{
+       up_read(&service_level_sem);
+}
+
+static int service_level_show(struct seq_file *m, void *p)
+{
+       struct service_level *slr;
+
+       slr = list_entry(p, struct service_level, list);
+       slr->seq_print(m, slr);
+       return 0;
+}
+
+static const struct seq_operations service_level_seq_ops = {
+       .start          = service_level_start,
+       .next           = service_level_next,
+       .stop           = service_level_stop,
+       .show           = service_level_show
+};
+
+static int service_level_open(struct inode *inode, struct file *file)
+{
+       return seq_open(file, &service_level_seq_ops);
+}
+
+static const struct file_operations service_level_ops = {
+       .open           = service_level_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = seq_release
+};
+
+static void service_level_vm_print(struct seq_file *m,
+                                  struct service_level *slr)
+{
+       char *query_buffer, *str;
+
+       query_buffer = kmalloc(1024, GFP_KERNEL | GFP_DMA);
+       if (!query_buffer)
+               return;
+       cpcmd("QUERY CPLEVEL", query_buffer, 1024, NULL);
+       str = strchr(query_buffer, '\n');
+       if (str)
+               *str = 0;
+       seq_printf(m, "VM: %s\n", query_buffer);
+       kfree(query_buffer);
+}
+
+static struct service_level service_level_vm = {
+       .seq_print = service_level_vm_print
+};
+
+static __init int create_proc_service_level(void)
+{
+       proc_create("service_levels", 0, NULL, &service_level_ops);
+       if (MACHINE_IS_VM)
+               register_service_level(&service_level_vm);
+       return 0;
+}
+
+subsys_initcall(create_proc_service_level);
+
+/*
+ * Bogomips calculation based on cpu capability.
+ */
+
 int get_cpu_capability(unsigned int *capability)
 {
        struct sysinfo_1_2_2 *info;