lua: Fixed some cross-platform issues for PPC (and probably other architectures)

[openwrt.git] / target / linux / ifxmips / files / drivers / mtd / maps / ifxmips.c

diff --git a/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c b/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c
index b38c626..98359eb 100644 (file)
--- a/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c
+++ b/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c
@@ -27,10 +27,10 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/cfi.h>
 #include <asm/ifxmips/ifxmips.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/cfi.h>
 #include <asm/ifxmips/ifxmips.h>

+#include <asm/ifxmips/ifxmips_ebu.h>

 #include <linux/magic.h>
 #include <linux/platform_device.h>
 
 #include <linux/magic.h>
 #include <linux/platform_device.h>
 

-

 static struct map_info
 ifxmips_map = {
        .name = "ifxmips_mtd",
 static struct map_info
 ifxmips_map = {
        .name = "ifxmips_mtd",


@@ -41,19 +41,23 @@ ifxmips_map = {
 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;
        map_word temp;

-
+       spin_lock_irqsave(&ebu_lock, flags);

        adr ^= 2;
        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)
 {
        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;
        adr ^= 2;

-       *((__u16 *) (map->virt + adr)) = d.x[0];
+       *((__u16*)(map->virt + adr)) = d.x[0];
+       spin_unlock_irqrestore(&ebu_lock, flags);

 }
 
 void
 }
 
 void


@@ -61,12 +65,14 @@ ifxmips_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t le
 {
        unsigned char *p;
        unsigned char *to_8;
 {
        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++;
        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
 }
 
 void


@@ -74,12 +80,13 @@ ifxmips_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_
 {
        unsigned char *p =  (unsigned char*)from;
        unsigned char *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 = (unsigned char*)to;
        to += (unsigned long) map->virt;
        to_8 = (unsigned char*)to;

-       while(len--){
+       while(len--)

                *p++ = *to_8++;
                *p++ = *to_8++;

-       }
+       spin_unlock_irqrestore(&ebu_lock, flags);

 }
 
 static struct mtd_partition
 }
 
 static struct mtd_partition


@@ -109,7 +116,6 @@ ifxmips_partitions[4] = {
 int
 find_uImage_size(unsigned long start_offset){
        unsigned long temp;
 int
 find_uImage_size(unsigned long start_offset){
        unsigned long temp;

-

        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;
        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;


@@ -118,9 +124,7 @@ find_uImage_size(unsigned long start_offset){
 int
 detect_squashfs_partition(unsigned long start_offset){
        unsigned long temp;
 int
 detect_squashfs_partition(unsigned long start_offset){
        unsigned long temp;

-

        ifxmips_copy_from(&ifxmips_map, &temp, start_offset, 4);
        ifxmips_copy_from(&ifxmips_map, &temp, start_offset, 4);

-

        return (temp == SQUASHFS_MAGIC);
 }
 
        return (temp == SQUASHFS_MAGIC);
 }
 


@@ -137,10 +141,10 @@ ifxmips_mtd_probe(struct platform_device *dev)
        ifxmips_map.write = ifxmips_write16;
        ifxmips_map.copy_from = ifxmips_copy_from;
        ifxmips_map.copy_to = ifxmips_copy_to;
        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 "ifxmips_mtd: failed to ioremap!\n");
        if(!ifxmips_map.virt)
        {
                printk(KERN_WARNING "ifxmips_mtd: failed to ioremap!\n");


@@ -156,7 +160,6 @@ ifxmips_mtd_probe(struct platform_device *dev)
        }
 
        ifxmips_mtd->owner = THIS_MODULE;
        }
 
        ifxmips_mtd->owner = THIS_MODULE;

-

        uimage_size = find_uImage_size(ifxmips_partitions[2].offset);
 
        if(detect_squashfs_partition(ifxmips_partitions[2].offset + uimage_size))
        uimage_size = find_uImage_size(ifxmips_partitions[2].offset);
 
        if(detect_squashfs_partition(ifxmips_partitions[2].offset + uimage_size))


@@ -196,8 +199,7 @@ init_ifxmips_mtd(void)
        return ret;
 }
 
        return ret;
 }
 

-static void
-__exit
+static void __exit

 cleanup_ifxmips_mtd(void)
 {
        platform_driver_unregister(&ifxmips_mtd_driver);
 cleanup_ifxmips_mtd(void)
 {
        platform_driver_unregister(&ifxmips_mtd_driver);