X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=warm.git;a=blobdiff_plain;f=module%2Fwarm_main.c;h=18e9762b5422731cced148114e481e266c3325a5;hp=5b8e9100282bd76166d0dc426d1fbeebb6a9a95b;hb=159a48bbefdb7205b9757693e63e79b40da8bc0e;hpb=198a1649dcb74c973706066d37bb955c139232b1 diff --git a/module/warm_main.c b/module/warm_main.c index 5b8e910..18e9762 100644 --- a/module/warm_main.c +++ b/module/warm_main.c @@ -14,9 +14,19 @@ #include #include #include -#include #include +#include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11) +#include +#else +#include +#include +#include +#define __user +#define unlocked_ioctl ioctl +#endif + #define WARM_CODE #include "../warm.h" #include "warm_ops.h" @@ -25,21 +35,37 @@ #error need proc_fs #endif -#define WARM_VER "r1" +#define WARM_VER "r2" #define PFX "wARM: " +#define WARM_INFO(fmt, ...) \ + if (verbose) \ + pr_info(PFX fmt, ##__VA_ARGS__) + +#define SECTION_SIZE 0x100000 #define MAX_CACHEOP_RANGE 16384 /* assume RAM starts at phys addr 0 (this is really machine specific) */ #define RAM_PHYS_START 0 #define RAM_MAX_SIZE 0x10000000 /* 256M, try to be future proof */ +/* expected CPU id */ +#if defined(CONFIG_CPU_ARM926T) +#define EXPECTED_ID 0x069260 +#elif defined(CONFIG_CPU_ARM920T) +#define EXPECTED_ID 0x029200 +#else +#error "unsupported CPU" +#endif + extern unsigned long max_mapnr; /* "upper" physical memory, not seen by Linux and to be mmap'ed */ static u32 uppermem_start; static u32 uppermem_end; +static int verbose; + static u32 *get_pgtable(void) { u32 ttb; @@ -68,8 +94,8 @@ static int do_set_cb_uppermem(int in_cb, int is_set) for (i = 0; i < 4096; i++) { - if (!(pgtable[i] & 1)) - /* must be course of fine page table */ + if ((pgtable[i] & 3) != 1) + /* must be coarse page table */ continue; cpt = __va(pgtable[i] & 0xfffffc00); @@ -110,7 +136,7 @@ static int do_set_cb_uppermem(int in_cb, int is_set) warm_cop_clean_d(); warm_drain_wb_inval_tlb(); - pr_info(PFX "%c%c bit(s) %s for phys %08x-%08x (%d pages)\n", + WARM_INFO("%c%c bit(s) %s for phys %08x-%08x (%d pages)\n", bits & 8 ? 'c' : ' ', bits & 4 ? 'b' : ' ', is_set ? "set" : "cleared", uppermem_start, uppermem_end - 1, count); @@ -121,17 +147,19 @@ static int do_set_cb_uppermem(int in_cb, int is_set) static int do_set_cb_virt(int in_cb, int is_set, u32 addr, u32 size) { int count = 0, bits = 0; - u32 desc1, desc2; - u32 *pgtable, *cpt; + u32 desc1, desc2 = 0; + u32 *pgtable, *cpt = NULL; u32 start, end; + u32 mask; if (in_cb & WCB_C_BIT) bits |= 8; if (in_cb & WCB_B_BIT) bits |= 4; - size += addr & ~(PAGE_SIZE - 1); - size = ALIGN(size, PAGE_SIZE); + mask = PAGE_SIZE - 1; + size += addr & mask; + size = (size + mask) & ~mask; addr &= ~(PAGE_SIZE - 1); start = addr; @@ -139,18 +167,39 @@ static int do_set_cb_virt(int in_cb, int is_set, u32 addr, u32 size) pgtable = get_pgtable(); - for (; addr < end; addr += PAGE_SIZE) + while (addr < end) { desc1 = pgtable[addr >> 20]; - if (!(desc1 & 3)) + switch (desc1 & 3) { + case 0: + printk(KERN_WARNING PFX "address %08x not mapped.\n", addr); return -EINVAL; + case 1: + /* coarse table */ + cpt = __va(desc1 & 0xfffffc00); + desc2 = cpt[(addr >> 12) & 0xff]; + break; + case 2: + /* section */ + if (is_set) + desc1 |= bits; + else + desc1 &= ~bits; + pgtable[addr >> 20] = desc1; + addr += SECTION_SIZE; + count++; + continue; + case 3: + cpt = __va(desc1 & 0xfffff000); + desc2 = cpt[(addr >> 10) & 0x3ff]; + break; + } - cpt = __va(desc1 & 0xfffffc00); - desc2 = cpt[(addr >> 12) & 0xff]; - if ((desc2 & 3) != 2) { - printk(KERN_WARNING PFX "not small page? %08x %08x\n", desc2, addr); + if ((desc2 & 3) == 0) { + printk(KERN_WARNING PFX "address %08x not mapped (%08x)\n", + addr, desc2); return -EINVAL; } @@ -158,16 +207,30 @@ static int do_set_cb_virt(int in_cb, int is_set, u32 addr, u32 size) desc2 |= bits; else desc2 &= ~bits; - desc2 |= 0xff0; - cpt[(addr >> 12) & 0xff] = desc2; + /* this might be bad idea, better let it fault so that Linux does + * it's accounting, but that will drop CB bits, so keep this + * for compatibility */ + if ((desc2 & 3) == 2) + desc2 |= 0xff0; + + switch (desc1 & 3) { + case 1: + cpt[(addr >> 12) & 0xff] = desc2; + break; + case 3: + cpt[(addr >> 10) & 0x3ff] = desc2; + break; + } + + addr += PAGE_SIZE; count++; } warm_cop_clean_d(); warm_drain_wb_inval_tlb(); - pr_info(PFX "%c%c bit(s) %s virt %08x-%08x (%d pages)\n", + WARM_INFO("%c%c bit(s) %s virt %08x-%08x (%d pages)\n", bits & 8 ? 'c' : ' ', bits & 4 ? 'b' : ' ', is_set ? "set" : "cleared", start, end - 1, count); @@ -183,24 +246,36 @@ static int do_virt2phys(unsigned long *_addr) pgtable = get_pgtable(); desc1 = pgtable[addr >> 20]; - if (!(desc1 & 3)) - return -EINVAL; - - if ((desc1 & 3) == 2) { - /* 1MB section */ + switch (desc1 & 3) { + case 1: /* coarse table */ + cpt = __va(desc1 & 0xfffffc00); + desc2 = cpt[(addr >> 12) & 0xff]; + break; + case 2: /* 1MB section */ *_addr = (desc1 & 0xfff00000) | (addr & 0xfffff); return 0; + case 3: /* fine table */ + cpt = __va(desc1 & 0xfffff000); + desc2 = cpt[(addr >> 10) & 0x3ff]; + break; + default: + return -EINVAL; } - - cpt = __va(desc1 & 0xfffffc00); - desc2 = cpt[(addr >> 12) & 0xff]; - - if ((desc2 & 3) != 2) { - printk(KERN_WARNING PFX "not small page? %08x %08x\n", desc2, addr); + + switch (desc2 & 3) { + case 1: /* large page */ + *_addr = (desc2 & ~0xffff) | (addr & 0xffff); + break; + case 2: /* small page */ + *_addr = (desc2 & ~0x0fff) | (addr & 0x0fff); + break; + case 3: /* tiny page */ + *_addr = (desc2 & ~0x03ff) | (addr & 0x03ff); + break; + default: return -EINVAL; } - *_addr = (desc2 & 0xfffffc00) | (addr & 0x3ff); return 0; } @@ -262,7 +337,12 @@ static int do_cache_ops(int ops, u32 addr, u32 size) return 0; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11) static long warm_ioctl(struct file *file, unsigned int cmd, unsigned long __arg) +#else +static int warm_ioctl(struct inode *inode, struct file *file, + unsigned int cmd, unsigned long __arg) +#endif { void __user *arg = (void __user *) __arg; union { @@ -278,7 +358,8 @@ static long warm_ioctl(struct file *file, unsigned int cmd, unsigned long __arg) return -EFAULT; if (u.wcop.ops & ~(WOP_D_CLEAN|WOP_D_INVALIDATE|WOP_I_INVALIDATE)) return -EINVAL; - if (u.wcop.size > MAX_CACHEOP_RANGE) + if (u.wcop.size == (unsigned long)-1 || + (u.wcop.size > MAX_CACHEOP_RANGE && !(u.wcop.ops & WOP_D_INVALIDATE))) ret = do_cache_ops_whole(u.wcop.ops); else ret = do_cache_ops(u.wcop.ops, u.wcop.addr, u.wcop.size); @@ -444,6 +525,13 @@ static const struct file_operations warm_fops = { static int __init warm_module_init(void) { struct proc_dir_entry *pret; + u32 cpuid; + + asm ("mrc p15, 0, %0, c0, c0, 0" : "=r"(cpuid)); + if ((cpuid & 0x0ffff0) != EXPECTED_ID) { + printk(KERN_ERR PFX "module was compiled for different CPU, aborting\n"); + return -1; + } pret = create_proc_entry("warm", S_IWUGO | S_IRUGO, NULL); if (!pret) { @@ -480,6 +568,8 @@ static void __exit warm_module_exit(void) module_init(warm_module_init); module_exit(warm_module_exit); +module_param(verbose, int, 0644); + MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("ARM processor services"); MODULE_AUTHOR("Grazvydas Ignotas");