Blackfin arch: SMP supporting patchset: Blackfin CPLB related code

[safe/jmp/linux-2.6] / arch / blackfin / kernel / cplb-nompu / cplbinfo.c

diff --git a/arch/blackfin/kernel/cplb-nompu/cplbinfo.c b/arch/blackfin/kernel/cplb-nompu/cplbinfo.c
index 1e74f0b..3f00809 100644 (file)
--- a/arch/blackfin/kernel/cplb-nompu/cplbinfo.c
+++ b/arch/blackfin/kernel/cplb-nompu/cplbinfo.c
@@ -68,22 +68,22 @@ static int cplb_find_entry(unsigned long *cplb_addr,
        return -1;
 }
 
-static char *cplb_print_entry(char *buf, int type)
+static char *cplb_print_entry(char *buf, int type, unsigned int cpu)
 {
-       unsigned long *p_addr = dpdt_table;
-       unsigned long *p_data = dpdt_table + 1;
-       unsigned long *p_icount = dpdt_swapcount_table;
-       unsigned long *p_ocount = dpdt_swapcount_table + 1;
+       unsigned long *p_addr = dpdt_tables[cpu];
+       unsigned long *p_data = dpdt_tables[cpu] + 1;
+       unsigned long *p_icount = dpdt_swapcount_tables[cpu];
+       unsigned long *p_ocount = dpdt_swapcount_tables[cpu] + 1;
        unsigned long *cplb_addr = (unsigned long *)DCPLB_ADDR0;
        unsigned long *cplb_data = (unsigned long *)DCPLB_DATA0;
        int entry = 0, used_cplb = 0;
 
        if (type == CPLB_I) {
                buf += sprintf(buf, "Instruction CPLB entry:\n");
-               p_addr = ipdt_table;
-               p_data = ipdt_table + 1;
-               p_icount = ipdt_swapcount_table;
-               p_ocount = ipdt_swapcount_table + 1;
+               p_addr = ipdt_tables[cpu];
+               p_data = ipdt_tables[cpu] + 1;
+               p_icount = ipdt_swapcount_tables[cpu];
+               p_ocount = ipdt_swapcount_tables[cpu] + 1;
                cplb_addr = (unsigned long *)ICPLB_ADDR0;
                cplb_data = (unsigned long *)ICPLB_DATA0;
        } else
@@ -134,24 +134,24 @@ static char *cplb_print_entry(char *buf, int type)
        return buf;
 }
 
-static int cplbinfo_proc_output(char *buf)
+static int cplbinfo_proc_output(char *buf, void *data)
 {
+       unsigned int cpu = (unsigned int)data;
        char *p;
 
        p = buf;
 
-       p += sprintf(p, "------------------ CPLB Information ------------------\n\n");
+       p += sprintf(p, "------------- CPLB Information on CPU%u--------------\n\n", cpu);
 
        if (bfin_read_IMEM_CONTROL() & ENICPLB)
-               p = cplb_print_entry(p, CPLB_I);
+               p = cplb_print_entry(p, CPLB_I, cpu);
        else
                p += sprintf(p, "Instruction CPLB is disabled.\n\n");
 
        if (bfin_read_DMEM_CONTROL() & ENDCPLB)
-               p = cplb_print_entry(p, CPLB_D);
+               p = cplb_print_entry(p, CPLB_D, cpu);
        else
                p += sprintf(p, "Data CPLB is disabled.\n");
-
        return p - buf;
 }
 
@@ -160,7 +160,7 @@ static int cplbinfo_read_proc(char *page, char **start, off_t off,
 {
        int len;
 
-       len = cplbinfo_proc_output(page);
+       len = cplbinfo_proc_output(page, data);
        if (len <= off + count)
                *eof = 1;
        *start = page + off;
@@ -174,20 +174,33 @@ static int cplbinfo_read_proc(char *page, char **start, off_t off,
 
 static int __init cplbinfo_init(void)
 {
-       struct proc_dir_entry *entry;
+       struct proc_dir_entry *parent, *entry;
+       unsigned int cpu;
+       unsigned char str[10];
+
+       parent = proc_mkdir("cplbinfo", NULL);
 
-       entry = create_proc_entry("cplbinfo", 0, NULL);
-       if (!entry)
-               return -ENOMEM;
+       for_each_online_cpu(cpu) {
+               sprintf(str, "cpu%u", cpu);
+               entry = create_proc_entry(str, 0, parent);
+               if (!entry)
+                       return -ENOMEM;
 
-       entry->read_proc = cplbinfo_read_proc;
-       entry->data = NULL;
+               entry->read_proc = cplbinfo_read_proc;
+               entry->data = (void *)cpu;
+       }
 
        return 0;
 }
 
 static void __exit cplbinfo_exit(void)
 {
+       unsigned int cpu;
+       unsigned char str[20];
+       for_each_online_cpu(cpu) {
+               sprintf(str, "cplbinfo/cpu%u", cpu);
+               remove_proc_entry(str, NULL);
+       }
        remove_proc_entry("cplbinfo", NULL);
 }