qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-10-05 23:44:11 +03:00
Code

[ar71xx] update flash locking code

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16359 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2009-06-06 15:56:03 +00:00
parent dd385a9449
commit 282cd9f4b2
5 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/linux/ar71xx/files/arch/mips/ar71xx/ar71xx.c
View File

@ -17,7 +17,6 @@
#include <asm/mach-ar71xx/ar71xx.h> #include <asm/mach-ar71xx/ar71xx.h>
static DEFINE_MUTEX(ar71xx_flash_mutex); static DEFINE_MUTEX(ar71xx_flash_mutex);
static int ar71xx_flash_lock_enabled;
void __iomem *ar71xx_ddr_base; void __iomem *ar71xx_ddr_base;
EXPORT_SYMBOL_GPL(ar71xx_ddr_base); EXPORT_SYMBOL_GPL(ar71xx_ddr_base);
@ -102,21 +101,14 @@ void ar71xx_ddr_flush(u32 reg)
} }
EXPORT_SYMBOL_GPL(ar71xx_ddr_flush); EXPORT_SYMBOL_GPL(ar71xx_ddr_flush);
void __init ar71xx_flash_lock_enable(void)
{
ar71xx_flash_lock_enabled = 1;
}
void ar71xx_flash_acquire(void) void ar71xx_flash_acquire(void)
{ {
if (ar71xx_flash_lock_enabled) mutex_lock(&ar71xx_flash_mutex);
mutex_lock(&ar71xx_flash_mutex);
} }
EXPORT_SYMBOL_GPL(ar71xx_flash_acquire); EXPORT_SYMBOL_GPL(ar71xx_flash_acquire);
void ar71xx_flash_release(void) void ar71xx_flash_release(void)
{ {
if (ar71xx_flash_lock_enabled) mutex_unlock(&ar71xx_flash_mutex);
mutex_unlock(&ar71xx_flash_mutex);
} }
EXPORT_SYMBOL_GPL(ar71xx_flash_release); EXPORT_SYMBOL_GPL(ar71xx_flash_release);

2
target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
View File

@ -221,7 +221,7 @@ static void __init ap83_generic_setup(void)
static void __init ap83_040_setup(void) static void __init ap83_040_setup(void)
{ {
ar71xx_flash_lock_enable(); ap83_flash_data.is_shared=1;
ap83_generic_setup(); ap83_generic_setup();
platform_device_register(&ap83_040_spi_device); platform_device_register(&ap83_040_spi_device);
} }

1
target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
View File

@ -422,7 +422,6 @@ void ar71xx_device_start(u32 mask);
#define SPI_IOC_CS2 SPI_IOC_CS(2) #define SPI_IOC_CS2 SPI_IOC_CS(2)
#define SPI_IOC_CS_ALL (SPI_IOC_CS0 | SPI_IOC_CS1 | SPI_IOC_CS2) #define SPI_IOC_CS_ALL (SPI_IOC_CS0 | SPI_IOC_CS1 | SPI_IOC_CS2)
void ar71xx_flash_lock_enable(void) __init;
void ar71xx_flash_acquire(void); void ar71xx_flash_acquire(void);
void ar71xx_flash_release(void); void ar71xx_flash_release(void);

1
target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h
View File

@ -55,6 +55,7 @@ struct ar71xx_spi_platform_data {
struct ar91xx_flash_platform_data { struct ar91xx_flash_platform_data {
unsigned int width; unsigned int width;
u8 is_shared:1;
#ifdef CONFIG_MTD_PARTITIONS #ifdef CONFIG_MTD_PARTITIONS
unsigned int nr_parts; unsigned int nr_parts;
struct mtd_partition *parts; struct mtd_partition *parts;

46
target/linux/ar71xx/files/drivers/mtd/maps/ar91xx_flash.c
View File

@ -60,6 +60,41 @@ static void ar91xx_flash_write(struct map_info *map, map_word d,
mb(); mb();
} }
static map_word ar91xx_flash_read_lock(struct map_info *map, unsigned long ofs)
{
map_word ret;
ar71xx_flash_acquire();
ret = ar91xx_flash_read(map, ofs);
ar71xx_flash_release();
return ret;
}
static void ar91xx_flash_write_lock(struct map_info *map, map_word d,
unsigned long ofs)
{
ar71xx_flash_acquire();
ar91xx_flash_write(map, d, ofs);
ar71xx_flash_release();
}
static void ar91xx_flash_copy_from_lock(struct map_info *map, void *to,
unsigned long from, ssize_t len)
{
ar71xx_flash_acquire();
inline_map_copy_from(map, to, from, len);
ar71xx_flash_release();
}
static void ar91xx_flash_copy_to_lock(struct map_info *map, unsigned long to,
const void *from, ssize_t len)
{
ar71xx_flash_acquire();
inline_map_copy_to(map, to, from, len);
ar71xx_flash_release();
}
static int ar91xx_flash_remove(struct platform_device *pdev) static int ar91xx_flash_remove(struct platform_device *pdev)
{ {
struct ar91xx_flash_platform_data *pdata; struct ar91xx_flash_platform_data *pdata;
@ -152,8 +187,15 @@ static int ar91xx_flash_probe(struct platform_device *pdev)
} }
simple_map_init(&info->map); simple_map_init(&info->map);
info->map.read = ar91xx_flash_read; if (pdata->is_shared) {
info->map.write = ar91xx_flash_write; info->map.read = ar91xx_flash_read_lock;
info->map.write = ar91xx_flash_write_lock;
info->map.copy_from = ar91xx_flash_copy_from_lock;
info->map.copy_to = ar91xx_flash_copy_to_lock;
} else {
info->map.read = ar91xx_flash_read;
info->map.write = ar91xx_flash_write;
}
probe_type = rom_probe_types; probe_type = rom_probe_types;
for (; info->mtd == NULL && *probe_type != NULL; probe_type++) for (; info->mtd == NULL && *probe_type != NULL; probe_type++)