1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-18 19:19:42 +02:00

add brcm47xx mtd corruption fix by b.sander (#1502)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7675 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-06-19 22:29:51 +00:00
parent 222c1e2350
commit fa0682d1cb

View File

@ -80,6 +80,22 @@ extern struct ssb_bus ssb;
#endif #endif
static struct mtd_info *bcm947xx_mtd; static struct mtd_info *bcm947xx_mtd;
static void bcm947xx_map_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
{
if (len==1) {
memcpy_fromio(to, map->virt + from, len);
} else {
int i;
u16 *dest = (u16 *) to;
u16 *src = (u16 *) (map->virt + from);
for (i = 0; i < (len / 2); i++) {
dest[i] = src[i];
}
if (len & 1)
*((u8 *)dest+len-1) = src[i] & 0xff;
}
}
static struct map_info bcm947xx_map = { static struct map_info bcm947xx_map = {
name: "Physically mapped flash", name: "Physically mapped flash",
size: WINDOW_SIZE, size: WINDOW_SIZE,
@ -372,6 +388,7 @@ int __init init_bcm947xx_map(void)
printk("Failed to ioremap\n"); printk("Failed to ioremap\n");
return -EIO; return -EIO;
} }
simple_map_init(&bcm947xx_map); simple_map_init(&bcm947xx_map);
if (!(bcm947xx_mtd = do_map_probe("cfi_probe", &bcm947xx_map))) { if (!(bcm947xx_mtd = do_map_probe("cfi_probe", &bcm947xx_map))) {
@ -380,6 +397,9 @@ int __init init_bcm947xx_map(void)
return -ENXIO; return -ENXIO;
} }
/* override copy_from routine */
bcm947xx_map.copy_from = bcm947xx_map_copy_from;
bcm947xx_mtd->owner = THIS_MODULE; bcm947xx_mtd->owner = THIS_MODULE;
size = bcm947xx_mtd->size; size = bcm947xx_mtd->size;