X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=target%2Flinux%2Fifxmips%2Ffiles%2Fdrivers%2Fmtd%2Fmaps%2Fifxmips.c;h=aed241b983f320060e2b9f4ae5bb3a812d382fdf;hb=49b34728f956238c5fdbec568be0247fb8be95c6;hp=3dd41d1ce227329b929abcffa65a4edec89e8c77;hpb=a69c163d3209fcb43c480b8a4bbaa4bf60076ba7;p=openwrt.git diff --git a/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c b/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c index 3dd41d1ce2..aed241b983 100644 --- a/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c +++ b/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c @@ -1,11 +1,9 @@ /* - * Driver for IFXMIPS flashmap - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -16,198 +14,263 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Copyright (C) 2004 Liu Peng Infineon IFAP DC COM CPE - * Copyright (C) 2007 John Crispin + * Copyright (C) 2008 John Crispin */ #include #include #include -#include +#include #include #include #include #include #include #include +#include +#include #include #include -#define DRVNAME "ifxmips_mtd" +#ifndef CONFIG_MTD_PARTITIONS +#error Please enable CONFIG_MTD_PARTITIONS +#endif -static struct map_info -ifxmips_map = { - .name = DRVNAME, +static struct map_info ifxmips_map = { + .name = "ifx-nor", .bankwidth = 2, .size = 0x400000, }; -static map_word -ifxmips_read16 (struct map_info * map, unsigned long adr) +static map_word ifxmips_read16(struct map_info *map, unsigned long adr) { + unsigned long flags; map_word temp; - + spin_lock_irqsave(&ebu_lock, flags); adr ^= 2; - temp.x[0] = *((__u16 *) (map->virt + adr)); - + temp.x[0] = *((__u16 *)(map->virt + adr)); + spin_unlock_irqrestore(&ebu_lock, flags); return temp; } -static void -ifxmips_write16 (struct map_info *map, map_word d, unsigned long adr) +static void ifxmips_write16(struct map_info *map, map_word d, unsigned long adr) { + unsigned long flags; + spin_lock_irqsave(&ebu_lock, flags); adr ^= 2; - *((__u16 *) (map->virt + adr)) = d.x[0]; + *((__u16 *)(map->virt + adr)) = d.x[0]; + spin_unlock_irqrestore(&ebu_lock, flags); } -void -ifxmips_copy_from (struct map_info *map, void *to, unsigned long from, ssize_t len) +void ifxmips_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len) { - u8 *p; - u8 *to_8; - - from = (unsigned long) (from + map->virt); - p = (u8 *) from; - to_8 = (u8 *) to; - while(len--){ + unsigned char *p; + unsigned char *to_8; + unsigned long flags; + spin_lock_irqsave(&ebu_lock, flags); + from = (unsigned long)(from + map->virt); + p = (unsigned char *) from; + to_8 = (unsigned char *) to; + while (len--) *to_8++ = *p++; - } + spin_unlock_irqrestore(&ebu_lock, flags); } -void -ifxmips_copy_to (struct map_info *map, unsigned long to, const void *from, ssize_t len) +void ifxmips_copy_to(struct map_info *map, + unsigned long to, + const void *from, + ssize_t len) { - u8 *p = (u8*) from; - u8 *to_8; - + unsigned char *p = (unsigned char *)from; + unsigned char *to_8; + unsigned long flags; + spin_lock_irqsave(&ebu_lock, flags); to += (unsigned long) map->virt; - to_8 = (u8*)to; - while(len--){ + to_8 = (unsigned char *)to; + while (len--) *p++ = *to_8++; - } + spin_unlock_irqrestore(&ebu_lock, flags); } -static struct mtd_partition -ifxmips_partitions[4] = { +static struct mtd_partition ifxmips_partitions[] = { { - name:"U-Boot", - offset:0x00000000, - size:0x00020000, + .name = "uboot", + .offset = 0x00000000, + .size = 0x00020000, }, { - name:"U-Boot-Env", - offset:0x00020000, - size:0x00010000, + .name = "uboot_env", + .offset = 0x00020000, + .size = 0x00010000, }, { - name:"kernel", - offset:0x00030000, - size:0x0, + .name = "kernel", + .offset = 0x00030000, + .size = 0x0, }, { - name:"rootfs", - offset:0x0, - size:0x0, + .name = "rootfs", + .offset = 0x0, + .size = 0x0, + }, + { + .name = "board_config", + .offset = 0x0, + .size = 0x0, }, }; -int -find_uImage_size (unsigned long start_offset){ - unsigned long temp; +static struct mtd_partition ifxmips_meta_partition = { + .name = "linux", + .offset = 0x00030000, + .size = 0x0, +}; + +static const char *part_probe_types[] = { "cmdlinepart", NULL }; +int find_uImage_size(unsigned long start_offset) +{ + unsigned long magic; + unsigned long temp; + ifxmips_copy_from(&ifxmips_map, &magic, start_offset, 4); + if (!(ntohl(magic) == 0x27051956)) { + printk(KERN_INFO "ifxmips_mtd: invalid magic (0x%08X) of kernel at 0x%08lx \n", ntohl(magic), start_offset); + return 0; + } ifxmips_copy_from(&ifxmips_map, &temp, start_offset + 12, 4); - printk(KERN_INFO DRVNAME ": kernel size is %ld \n", temp + 0x40); + printk(KERN_INFO "ifxmips_mtd: kernel size is %ld \n", temp + 0x40); return temp + 0x40; } -int -detect_squashfs_partition (unsigned long start_offset){ - unsigned long temp; +int find_brn_block(unsigned long start_offset) +{ + unsigned char temp[9]; + ifxmips_copy_from(&ifxmips_map, &temp, start_offset, 8); + temp[8] = '\0'; + printk(KERN_INFO "data in brn block %s\n", temp); + if (memcmp(temp, "BRN-BOOT", 8) == 0) + return 1; + else + return 0; +} +int detect_squashfs_partition(unsigned long start_offset) +{ + unsigned long temp; ifxmips_copy_from(&ifxmips_map, &temp, start_offset, 4); - - return (temp == SQUASHFS_MAGIC); + return temp == SQUASHFS_MAGIC; } -static int -ifxmips_mtd_probe (void) +static int ifxmips_mtd_probe(struct platform_device *dev) { struct mtd_info *ifxmips_mtd = NULL; struct mtd_partition *parts = NULL; unsigned long uimage_size; + int err, i; + int kernel_part = 2, rootfs_part = 3; + int num_parts = ARRAY_SIZE(ifxmips_partitions); - writel(0x1d7ff, IFXMIPS_EBU_BUSCON0); + ifxmips_w32(0x1d7ff, IFXMIPS_EBU_BUSCON0); ifxmips_map.read = ifxmips_read16; ifxmips_map.write = ifxmips_write16; ifxmips_map.copy_from = ifxmips_copy_from; ifxmips_map.copy_to = ifxmips_copy_to; + ifxmips_map.phys = dev->resource->start; + ifxmips_map.size = dev->resource->end - ifxmips_map.phys + 1; + ifxmips_map.virt = ioremap_nocache(ifxmips_map.phys, ifxmips_map.size); - ifxmips_map.phys = IFXMIPS_FLASH_START; - ifxmips_map.virt = ioremap_nocache(IFXMIPS_FLASH_START, IFXMIPS_FLASH_MAX); - ifxmips_map.size = IFXMIPS_FLASH_MAX; if (!ifxmips_map.virt) { - printk(KERN_WARNING DRVNAME ": failed to ioremap!\n"); + printk(KERN_WARNING "ifxmips_mtd: failed to ioremap!\n"); return -EIO; } ifxmips_mtd = (struct mtd_info *) do_map_probe("cfi_probe", &ifxmips_map); if (!ifxmips_mtd) { iounmap(ifxmips_map.virt); - printk(KERN_WARNING DRVNAME ": probing failed\n"); + printk(KERN_WARNING "ifxmips_mtd: probing failed\n"); return -ENXIO; } ifxmips_mtd->owner = THIS_MODULE; - uimage_size = find_uImage_size(ifxmips_partitions[2].offset); - - if(detect_squashfs_partition(ifxmips_partitions[2].offset + uimage_size)){ - printk(KERN_INFO DRVNAME ": found a squashfs following the uImage\n"); + err = parse_mtd_partitions(ifxmips_mtd, part_probe_types, &parts, 0); + if (err > 0) { + printk(KERN_INFO "ifxmips_mtd: found %d partitions from cmdline\n", err); + num_parts = err; + kernel_part = 0; + rootfs_part = 0; + for (i = 0; i < num_parts; i++) { + if (strcmp(parts[i].name, "kernel") == 0) + kernel_part = i; + if (strcmp(parts[i].name, "rootfs") == 0) + rootfs_part = i; + } } else { - uimage_size &= ~0xffff; - uimage_size += 0x10000; + parts = &ifxmips_partitions[0]; + } + + /* dynamic size detection only if rootfs-part follows kernel-part */ + if (kernel_part+1 == rootfs_part) { + uimage_size = find_uImage_size(parts[kernel_part].offset); + + if (detect_squashfs_partition(parts[kernel_part].offset + uimage_size)) { + printk(KERN_INFO "ifxmips_mtd: found a squashfs following the uImage\n"); + } else { + uimage_size &= ~0xffff; + uimage_size += 0x10000; + } + + parts[kernel_part].size = uimage_size; + parts[rootfs_part].offset = parts[kernel_part].offset + parts[kernel_part].size; + parts[rootfs_part].size = ((ifxmips_mtd->size >> 20) * 1024 * 1024) - parts[rootfs_part].offset; + + ifxmips_meta_partition.offset = parts[kernel_part].offset; + ifxmips_meta_partition.size = parts[kernel_part].size + parts[rootfs_part].size; } - ifxmips_partitions[2].size = uimage_size; - ifxmips_partitions[3].offset = ifxmips_partitions[2].offset + ifxmips_partitions[2].size; - ifxmips_partitions[3].size = ((ifxmips_mtd->size >> 20) * 1024 * 1024) - ifxmips_partitions[3].offset; + if (err <= 0) { + if (ifxmips_has_brn_block()) { + parts[4].size -= ifxmips_mtd->erasesize; + parts[5].offset = ifxmips_mtd->size - ifxmips_mtd->erasesize; + parts[5].size = ifxmips_mtd->erasesize; + } else { + num_parts--; + } + } - parts = &ifxmips_partitions[0]; - add_mtd_partitions(ifxmips_mtd, parts, 4); + add_mtd_partitions(ifxmips_mtd, parts, num_parts); + add_mtd_partitions(ifxmips_mtd, &ifxmips_meta_partition, 1); - printk(KERN_INFO DRVNAME ": added ifxmips flash with %dMB\n", ifxmips_mtd->size >> 20); + printk(KERN_INFO "ifxmips_mtd: added %s flash with %dMB\n", + ifxmips_map.name, ifxmips_mtd->size >> 20); return 0; } -static struct -platform_driver ifxmips_mtd_driver = { - .probe = ifxmips_mtd_probe, - .driver = { - .name = DRVNAME, - .owner = THIS_MODULE, - }, -}; - -int __init -init_ifxmips_mtd (void) -{ - int ret = platform_driver_register(&ifxmips_mtd_driver); - if (ret) - printk(KERN_INFO DRVNAME ": error registering platfom driver!"); +static struct platform_driver ifxmips_mtd_driver = { + .probe = ifxmips_mtd_probe, + .driver = { + .name = "ifxmips_mtd", + .owner = THIS_MODULE, + }, +}; - return ret; +int __init init_ifxmips_mtd(void) +{ + int ret = platform_driver_register(&ifxmips_mtd_driver); + if (ret) + printk(KERN_INFO "ifxmips_mtd: error registering platfom driver!"); + return ret; } -static void -__exit -cleanup_ifxmips_mtd (void) +static void __exit cleanup_ifxmips_mtd(void) { platform_driver_unregister(&ifxmips_mtd_driver); } -module_init (init_ifxmips_mtd); -module_exit (cleanup_ifxmips_mtd); +module_init(init_ifxmips_mtd); +module_exit(cleanup_ifxmips_mtd); -MODULE_LICENSE ("GPL"); -MODULE_AUTHOR ("John Crispin "); -MODULE_DESCRIPTION ("MTD map driver for IFXMIPS boards"); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("John Crispin "); +MODULE_DESCRIPTION("MTD map driver for IFXMIPS boards");