X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/9d03573661b506cccf95810176c2a1c0a23ad399..cbd083f77e670109507819d3f592cf3bf6bc6044:/target/linux/ifxmips/patches-2.6.30/140-mtd.patch diff --git a/target/linux/ifxmips/patches-2.6.30/140-mtd.patch b/target/linux/ifxmips/patches-2.6.30/140-mtd.patch index 55d4f897a..797a11cff 100644 --- a/target/linux/ifxmips/patches-2.6.30/140-mtd.patch +++ b/target/linux/ifxmips/patches-2.6.30/140-mtd.patch @@ -1,9 +1,291 @@ -Index: linux-2.6.30.5/drivers/mtd/maps/Makefile +Index: linux-2.6.30.8/drivers/mtd/maps/Makefile =================================================================== ---- linux-2.6.30.5.orig/drivers/mtd/maps/Makefile 2009-08-16 23:19:38.000000000 +0200 -+++ linux-2.6.30.5/drivers/mtd/maps/Makefile 2009-09-02 18:30:09.000000000 +0200 +--- linux-2.6.30.8.orig/drivers/mtd/maps/Makefile 2009-09-24 17:28:02.000000000 +0200 ++++ linux-2.6.30.8/drivers/mtd/maps/Makefile 2009-10-19 21:31:32.000000000 +0200 @@ -62,3 +62,4 @@ obj-$(CONFIG_MTD_BFIN_ASYNC) += bfin-async-flash.o obj-$(CONFIG_MTD_RBTX4939) += rbtx4939-flash.o obj-$(CONFIG_MTD_VMU) += vmu-flash.o +obj-$(CONFIG_MTD_IFXMIPS) += ifxmips.o +Index: linux-2.6.30.8/drivers/mtd/maps/ifxmips.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.30.8/drivers/mtd/maps/ifxmips.c 2009-10-19 21:40:44.000000000 +0200 +@@ -0,0 +1,277 @@ ++/* ++ * 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 ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ * Copyright (C) 2004 Liu Peng Infineon IFAP DC COM CPE ++ * Copyright (C) 2008 John Crispin ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#ifndef CONFIG_MTD_PARTITIONS ++#error Please enable CONFIG_MTD_PARTITIONS ++#endif ++ ++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) ++{ ++ unsigned long flags; ++ map_word temp; ++ spin_lock_irqsave(&ebu_lock, flags); ++ adr ^= 2; ++ 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) ++{ ++ unsigned long flags; ++ spin_lock_irqsave(&ebu_lock, flags); ++ adr ^= 2; ++ *((__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) ++{ ++ 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) ++{ ++ 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 = (unsigned char *)to; ++ while (len--) ++ *p++ = *to_8++; ++ spin_unlock_irqrestore(&ebu_lock, flags); ++} ++ ++static struct mtd_partition ifxmips_partitions[] = { ++ { ++ .name = "uboot", ++ .offset = 0x00000000, ++ .size = 0x00020000, ++ }, ++ { ++ .name = "uboot_env", ++ .offset = 0x00020000, ++ .size = 0x00010000, ++ }, ++ { ++ .name = "kernel", ++ .offset = 0x00030000, ++ .size = 0x0, ++ }, ++ { ++ .name = "rootfs", ++ .offset = 0x0, ++ .size = 0x0, ++ }, ++ { ++ .name = "board_config", ++ .offset = 0x0, ++ .size = 0x0, ++ }, ++}; ++ ++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 (le32_to_cpu(magic) != 0x56190527) { ++ printk(KERN_INFO "ifxmips_mtd: invalid magic (0x%08X) of kernel at 0x%08lx \n", le32_to_cpu(magic), start_offset); ++ return 0; ++ } ++ ifxmips_copy_from(&ifxmips_map, &temp, start_offset + 12, 4); ++ printk(KERN_INFO "ifxmips_mtd: kernel size is %ld \n", temp + 0x40); ++ return temp + 0x40; ++} ++ ++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 le32_to_cpu(temp) == SQUASHFS_MAGIC; ++} ++ ++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); ++ ++ 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); ++ ++ if (!ifxmips_map.virt) { ++ 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 "ifxmips_mtd: probing failed\n"); ++ return -ENXIO; ++ } ++ ++ ifxmips_mtd->owner = THIS_MODULE; ++ ++ 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 { ++ 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; ++ } ++ ++ if (err <= 0) { ++ if (ifxmips_has_brn_block()) { ++ parts[3].size -= ifxmips_mtd->erasesize; ++ parts[4].offset = ifxmips_mtd->size - ifxmips_mtd->erasesize; ++ parts[4].size = ifxmips_mtd->erasesize; ++ } else { ++ num_parts--; ++ } ++ } ++ ++ add_mtd_partitions(ifxmips_mtd, parts, num_parts); ++ add_mtd_partitions(ifxmips_mtd, &ifxmips_meta_partition, 1); ++ ++ printk(KERN_INFO "ifxmips_mtd: added %s flash with %dMB\n", ++ ifxmips_map.name, ((int)ifxmips_mtd->size) >> 20); ++ return 0; ++} ++ ++static struct platform_driver ifxmips_mtd_driver = { ++ .probe = ifxmips_mtd_probe, ++ .driver = { ++ .name = "ifxmips_mtd", ++ .owner = THIS_MODULE, ++ }, ++}; ++ ++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) ++{ ++ platform_driver_unregister(&ifxmips_mtd_driver); ++} ++ ++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");