summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-19 22:29:51 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-19 22:29:51 +0000
commitfa0682d1cb9bd288f5b8a40479ba36c8501fde39 (patch)
tree5687a7bd5028234adba0b6f8bc1fbc2f828721c1 /target
parent222c1e2350d58e5d2d6b3d0253226ed8beca81ae (diff)
add brcm47xx mtd corruption fix by b.sander (#1502)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7675 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c b/target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c
index 5068af848..6a82f362c 100644
--- a/target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c
+++ b/target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c
@@ -80,6 +80,22 @@ extern struct ssb_bus ssb;
#endif
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 = {
name: "Physically mapped flash",
size: WINDOW_SIZE,
@@ -372,6 +388,7 @@ int __init init_bcm947xx_map(void)
printk("Failed to ioremap\n");
return -EIO;
}
+
simple_map_init(&bcm947xx_map);
if (!(bcm947xx_mtd = do_map_probe("cfi_probe", &bcm947xx_map))) {
@@ -380,6 +397,9 @@ int __init init_bcm947xx_map(void)
return -ENXIO;
}
+ /* override copy_from routine */
+ bcm947xx_map.copy_from = bcm947xx_map_copy_from;
+
bcm947xx_mtd->owner = THIS_MODULE;
size = bcm947xx_mtd->size;