auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: cleanup src/flash directory

Browse Source 
Change-Id: I33c32a884095cff139546f760bc8fa6586e8c5b0
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/417
Tested-by: jenkins
This commit is contained in:
Spencer Oliver
2012-01-30 16:38:09 +00:00
parent 7b032df3aa
commit 1e9f8836a1
4 changed files with 380 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/flash/common.c
View File

@@ -16,6 +16,7 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
@@ -32,17 +33,17 @@ unsigned get_flash_name_index(const char *name)
return ~0U; return ~0U;
unsigned requested; unsigned requested;
int retval = parse_uint(name_index + 1, &requested); int retval = parse_uint(name_index + 1, &requested);
// detect parsing error by forcing past end of bank list /* detect parsing error by forcing past end of bank list */
return (ERROR_OK == retval) ? requested : ~0U; return (ERROR_OK == retval) ? requested : ~0U;
} }
bool flash_driver_name_matches(const char *name, const char *expected) bool flash_driver_name_matches(const char *name, const char *expected)
{ {
unsigned blen = strlen(name); unsigned blen = strlen(name);
// only match up to the length of the driver name... /* only match up to the length of the driver name... */
if (strncmp(name, expected, blen) != 0) if (strncmp(name, expected, blen) != 0)
return false; return false;
// ...then check that name terminates at this spot. /* ...then check that name terminates at this spot. */
return expected[blen] == '.' || expected[blen] == '\0'; return expected[blen] == '.' || expected[blen] == '\0';
} }

3
src/flash/common.h
View File

@@ -16,6 +16,7 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifndef FLASH_COMMON_H #ifndef FLASH_COMMON_H
#define FLASH_COMMON_H #define FLASH_COMMON_H
@@ -46,4 +47,4 @@ bool flash_driver_name_matches(const char *name, const char *expected);
#define ERROR_FLASH_BANK_NOT_PROBED (-907) #define ERROR_FLASH_BANK_NOT_PROBED (-907)
#define ERROR_FLASH_OPER_UNSUPPORTED (-908) #define ERROR_FLASH_OPER_UNSUPPORTED (-908)
#endif // FLASH_COMMON_H #endif /* FLASH_COMMON_H */

292
src/flash/mflash.c
View File

@@ -27,7 +27,6 @@
#include <helper/fileio.h> #include <helper/fileio.h>
#include <helper/log.h> #include <helper/log.h>
static int s3c2440_set_gpio_to_output(struct mflash_gpio_num gpio); static int s3c2440_set_gpio_to_output(struct mflash_gpio_num gpio);
static int s3c2440_set_gpio_output_val(struct mflash_gpio_num gpio, uint8_t val); static int s3c2440_set_gpio_output_val(struct mflash_gpio_num gpio, uint8_t val);
static int pxa270_set_gpio_to_output(struct mflash_gpio_num gpio); static int pxa270_set_gpio_to_output(struct mflash_gpio_num gpio);
@@ -47,8 +46,7 @@ static struct mflash_gpio_drv s3c2440_gpio = {
.set_gpio_output_val = s3c2440_set_gpio_output_val .set_gpio_output_val = s3c2440_set_gpio_output_val
}; };
static struct mflash_gpio_drv *mflash_gpio[] = static struct mflash_gpio_drv *mflash_gpio[] = {
{
&pxa270_gpio, &pxa270_gpio,
&s3c2440_gpio, &s3c2440_gpio,
NULL NULL
@@ -74,14 +72,16 @@ static int pxa270_set_gpio_to_output (struct mflash_gpio_num gpio)
addr = PXA270_GAFR0_L + (gpio.num >> 4) * 4; addr = PXA270_GAFR0_L + (gpio.num >> 4) * 4;
if ((ret = target_read_u32(target, addr, &value)) != ERROR_OK) ret = target_read_u32(target, addr, &value);
if (ret != ERROR_OK)
return ret; return ret;
value &= ~mask; value &= ~mask;
if (addr == PXA270_GAFR3_U) if (addr == PXA270_GAFR3_U)
value &= ~PXA270_GAFR3_U_RESERVED_BITS; value &= ~PXA270_GAFR3_U_RESERVED_BITS;
if ((ret = target_write_u32(target, addr, value)) != ERROR_OK) ret = target_write_u32(target, addr, value);
if (ret != ERROR_OK)
return ret; return ret;
/* set direction to output */ /* set direction to output */
@@ -89,7 +89,8 @@ static int pxa270_set_gpio_to_output (struct mflash_gpio_num gpio)
addr = PXA270_GPDR0 + (gpio.num >> 5) * 4; addr = PXA270_GPDR0 + (gpio.num >> 5) * 4;
if ((ret = target_read_u32(target, addr, &value)) != ERROR_OK) ret = target_read_u32(target, addr, &value);
if (ret != ERROR_OK)
return ret; return ret;
value |= mask; value |= mask;
@@ -108,13 +109,13 @@ static int pxa270_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val)
mask = 0x1u << (gpio.num & 0x1F); mask = 0x1u << (gpio.num & 0x1F);
if (val) { if (val)
addr = PXA270_GPSR0 + (gpio.num >> 5) * 4; addr = PXA270_GPSR0 + (gpio.num >> 5) * 4;
} else { else
addr = PXA270_GPCR0 + (gpio.num >> 5) * 4; addr = PXA270_GPCR0 + (gpio.num >> 5) * 4;
}
if ((ret = target_read_u32(target, addr, &value)) != ERROR_OK) ret = target_read_u32(target, addr, &value);
if (ret != ERROR_OK)
return ret; return ret;
value |= mask; value |= mask;
@@ -135,11 +136,11 @@ static int s3c2440_set_gpio_to_output (struct mflash_gpio_num gpio)
struct target *target = mflash_bank->target; struct target *target = mflash_bank->target;
int ret; int ret;
if (gpio.port[0] >= 'a' && gpio.port[0] <= 'h') { if (gpio.port[0] >= 'a' && gpio.port[0] <= 'h')
gpio_con = S3C2440_GPACON + (gpio.port[0] - 'a') * 0x10; gpio_con = S3C2440_GPACON + (gpio.port[0] - 'a') * 0x10;
} else if (gpio.port[0] == 'j') { else if (gpio.port[0] == 'j')
gpio_con = S3C2440_GPJCON; gpio_con = S3C2440_GPJCON;
} else { else {
LOG_ERROR("mflash: invalid port %d%s", gpio.num, gpio.port); LOG_ERROR("mflash: invalid port %d%s", gpio.num, gpio.port);
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
} }
@@ -167,11 +168,11 @@ static int s3c2440_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val
struct target *target = mflash_bank->target; struct target *target = mflash_bank->target;
int ret; int ret;
if (gpio.port[0] >= 'a' && gpio.port[0] <= 'h') { if (gpio.port[0] >= 'a' && gpio.port[0] <= 'h')
gpio_dat = S3C2440_GPADAT + (gpio.port[0] - 'a') * 0x10; gpio_dat = S3C2440_GPADAT + (gpio.port[0] - 'a') * 0x10;
} else if (gpio.port[0] == 'j') { else if (gpio.port[0] == 'j')
gpio_dat = S3C2440_GPJDAT; gpio_dat = S3C2440_GPJDAT;
} else { else {
LOG_ERROR("mflash: invalid port %d%s", gpio.num, gpio.port); LOG_ERROR("mflash: invalid port %d%s", gpio.num, gpio.port);
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
} }
@@ -226,13 +227,11 @@ static int mg_dsk_wait(mg_io_type_wait wait_local, uint32_t time_var)
if (ret != ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
if (status & mg_io_rbit_status_busy) if (status & mg_io_rbit_status_busy) {
{
if (wait_local == mg_io_wait_bsy) if (wait_local == mg_io_wait_bsy)
return ERROR_OK; return ERROR_OK;
} else { } else {
switch (wait_local) switch (wait_local) {
{
case mg_io_wait_not_bsy: case mg_io_wait_not_bsy:
return ERROR_OK; return ERROR_OK;
case mg_io_wait_rdy_noerr: case mg_io_wait_rdy_noerr:
@@ -248,8 +247,7 @@ static int mg_dsk_wait(mg_io_type_wait wait_local, uint32_t time_var)
} }
/* Now we check the error condition! */ /* Now we check the error condition! */
if (status & mg_io_rbit_status_error) if (status & mg_io_rbit_status_error) {
{
ret = target_read_u8(target, mg_task_reg + MG_REG_ERROR, &error); ret = target_read_u8(target, mg_task_reg + MG_REG_ERROR, &error);
if (ret != ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
@@ -259,8 +257,7 @@ static int mg_dsk_wait(mg_io_type_wait wait_local, uint32_t time_var)
return ERROR_MG_IO; return ERROR_MG_IO;
} }
switch (wait_local) switch (wait_local) {
{
case mg_io_wait_rdy: case mg_io_wait_rdy:
if (status & mg_io_rbit_status_ready) if (status & mg_io_rbit_status_ready)
return ERROR_OK; return ERROR_OK;
@@ -295,14 +292,14 @@ static int mg_dsk_srst(uint8_t on)
uint8_t value; uint8_t value;
int ret; int ret;
if ((ret = target_read_u8(target, mg_task_reg + MG_REG_DRV_CTRL, &value)) != ERROR_OK) ret = target_read_u8(target, mg_task_reg + MG_REG_DRV_CTRL, &value);
if (ret != ERROR_OK)
return ret; return ret;
if (on) { if (on)
value |= (mg_io_rbit_devc_srst); value |= (mg_io_rbit_devc_srst);
} else { else
value &= ~mg_io_rbit_devc_srst; value &= ~mg_io_rbit_devc_srst;
}
ret = target_write_u8(target, mg_task_reg + MG_REG_DRV_CTRL, value); ret = target_write_u8(target, mg_task_reg + MG_REG_DRV_CTRL, value);
return ret; return ret;
@@ -339,7 +336,8 @@ static int mg_dsk_drv_info(void)
uint32_t mg_buff = mflash_bank->base + MG_BUFFER_OFFSET; uint32_t mg_buff = mflash_bank->base + MG_BUFFER_OFFSET;
int ret; int ret;
if ((ret = mg_dsk_io_cmd(0, 1, mg_io_cmd_identify)) != ERROR_OK) ret = mg_dsk_io_cmd(0, 1, mg_io_cmd_identify);
if (ret != ERROR_OK)
return ret; return ret;
ret = mg_dsk_wait(mg_io_wait_drq, MG_OEM_DISK_WAIT_TIME_NORMAL); ret = mg_dsk_wait(mg_io_wait_drq, MG_OEM_DISK_WAIT_TIME_NORMAL);
@@ -357,41 +355,53 @@ static int mg_dsk_drv_info(void)
if (ret != ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
mflash_bank->drv_info->tot_sects = (uint32_t)(mflash_bank->drv_info->drv_id.total_user_addressable_sectors_hi << 16) mflash_bank->drv_info->tot_sects =
(uint32_t)(mflash_bank->drv_info->drv_id.total_user_addressable_sectors_hi << 16)
+ mflash_bank->drv_info->drv_id.total_user_addressable_sectors_lo; + mflash_bank->drv_info->drv_id.total_user_addressable_sectors_lo;
return target_write_u8(target, mflash_bank->base + MG_REG_OFFSET + MG_REG_COMMAND, mg_io_cmd_confirm_read); return target_write_u8(target,
mflash_bank->base + MG_REG_OFFSET + MG_REG_COMMAND,
mg_io_cmd_confirm_read);
} }
static int mg_mflash_rst(void) static int mg_mflash_rst(void)
{ {
int ret; int ret;
if ((ret = mg_init_gpio()) != ERROR_OK) ret = mg_init_gpio();
if (ret != ERROR_OK)
return ret; return ret;
if ((ret = mg_hdrst(0)) != ERROR_OK) ret = mg_hdrst(0);
if (ret != ERROR_OK)
return ret; return ret;
if ((ret = mg_dsk_wait(mg_io_wait_bsy, MG_OEM_DISK_WAIT_TIME_LONG)) != ERROR_OK) ret = mg_dsk_wait(mg_io_wait_bsy, MG_OEM_DISK_WAIT_TIME_LONG);
if (ret != ERROR_OK)
return ret; return ret;
if ((ret = mg_hdrst(1)) != ERROR_OK) ret = mg_hdrst(1);
if (ret != ERROR_OK)
return ret; return ret;
if ((ret = mg_dsk_wait(mg_io_wait_not_bsy, MG_OEM_DISK_WAIT_TIME_LONG)) != ERROR_OK) ret = mg_dsk_wait(mg_io_wait_not_bsy, MG_OEM_DISK_WAIT_TIME_LONG);
if (ret != ERROR_OK)
return ret; return ret;
if ((ret = mg_dsk_srst(1)) != ERROR_OK) ret = mg_dsk_srst(1);
if (ret != ERROR_OK)
return ret; return ret;
if ((ret = mg_dsk_wait(mg_io_wait_bsy, MG_OEM_DISK_WAIT_TIME_LONG)) != ERROR_OK) ret = mg_dsk_wait(mg_io_wait_bsy, MG_OEM_DISK_WAIT_TIME_LONG);
if (ret != ERROR_OK)
return ret; return ret;
if ((ret = mg_dsk_srst(0)) != ERROR_OK) ret = mg_dsk_srst(0);
if (ret != ERROR_OK)
return ret; return ret;
if ((ret = mg_dsk_wait(mg_io_wait_not_bsy, MG_OEM_DISK_WAIT_TIME_LONG)) != ERROR_OK) ret = mg_dsk_wait(mg_io_wait_not_bsy, MG_OEM_DISK_WAIT_TIME_LONG);
if (ret != ERROR_OK)
return ret; return ret;
LOG_INFO("mflash: reset ok"); LOG_INFO("mflash: reset ok");
@@ -401,9 +411,8 @@ static int mg_mflash_rst(void)
static int mg_mflash_probe(void) static int mg_mflash_probe(void)
{ {
int ret; int ret = mg_mflash_rst();
if (ret != ERROR_OK)
if ((ret = mg_mflash_rst()) != ERROR_OK)
return ret; return ret;
return mg_dsk_drv_info(); return mg_dsk_drv_info();
@@ -416,8 +425,10 @@ COMMAND_HANDLER(mg_probe_cmd)
ret = mg_mflash_probe(); ret = mg_mflash_probe();
if (ret == ERROR_OK) { if (ret == ERROR_OK) {
command_print(CMD_CTX, "mflash (total %" PRIu32 " sectors) found at 0x%8.8" PRIx32 "", command_print(CMD_CTX,
mflash_bank->drv_info->tot_sects, mflash_bank->base); "mflash (total %" PRIu32 " sectors) found at 0x%8.8" PRIx32 "",
mflash_bank->drv_info->tot_sects,
mflash_bank->base);
} }
return ret; return ret;
@@ -430,7 +441,8 @@ static int mg_mflash_do_read_sects(void *buff, uint32_t sect_num, uint32_t sect_
struct target *target = mflash_bank->target; struct target *target = mflash_bank->target;
uint8_t *buff_ptr = buff; uint8_t *buff_ptr = buff;
if ((ret = mg_dsk_io_cmd(sect_num, sect_cnt, mg_io_cmd_read)) != ERROR_OK) ret = mg_dsk_io_cmd(sect_num, sect_cnt, mg_io_cmd_read);
if (ret != ERROR_OK)
return ret; return ret;
address = mflash_bank->base + MG_BUFFER_OFFSET; address = mflash_bank->base + MG_BUFFER_OFFSET;
@@ -449,11 +461,14 @@ static int mg_mflash_do_read_sects(void *buff, uint32_t sect_num, uint32_t sect_
buff_ptr += MG_MFLASH_SECTOR_SIZE; buff_ptr += MG_MFLASH_SECTOR_SIZE;
ret = target_write_u8(target, mflash_bank->base + MG_REG_OFFSET + MG_REG_COMMAND, mg_io_cmd_confirm_read); ret = target_write_u8(target,
mflash_bank->base + MG_REG_OFFSET + MG_REG_COMMAND,
mg_io_cmd_confirm_read);
if (ret != ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
LOG_DEBUG("mflash: %" PRIu32 " (0x%8.8" PRIx32 ") sector read", sect_num + i, (sect_num + i) * MG_MFLASH_SECTOR_SIZE); LOG_DEBUG("mflash: %" PRIu32 " (0x%8.8" PRIx32 ") sector read", sect_num + i,
(sect_num + i) * MG_MFLASH_SECTOR_SIZE);
ret = duration_measure(&bench); ret = duration_measure(&bench);
if ((ERROR_OK == ret) && (duration_elapsed(&bench) > 3)) { if ((ERROR_OK == ret) && (duration_elapsed(&bench) > 3)) {
@@ -502,7 +517,8 @@ static int mg_mflash_do_write_sects(void *buff, uint32_t sect_num, uint32_t sect
struct target *target = mflash_bank->target; struct target *target = mflash_bank->target;
uint8_t *buff_ptr = buff; uint8_t *buff_ptr = buff;
if ((ret = mg_dsk_io_cmd(sect_num, sect_cnt, cmd)) != ERROR_OK) ret = mg_dsk_io_cmd(sect_num, sect_cnt, cmd);
if (ret != ERROR_OK)
return ret; return ret;
address = mflash_bank->base + MG_BUFFER_OFFSET; address = mflash_bank->base + MG_BUFFER_OFFSET;
@@ -521,11 +537,14 @@ static int mg_mflash_do_write_sects(void *buff, uint32_t sect_num, uint32_t sect
buff_ptr += MG_MFLASH_SECTOR_SIZE; buff_ptr += MG_MFLASH_SECTOR_SIZE;
ret = target_write_u8(target, mflash_bank->base + MG_REG_OFFSET + MG_REG_COMMAND, mg_io_cmd_confirm_write); ret = target_write_u8(target,
mflash_bank->base + MG_REG_OFFSET + MG_REG_COMMAND,
mg_io_cmd_confirm_write);
if (ret != ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
LOG_DEBUG("mflash: %" PRIu32 " (0x%8.8" PRIx32 ") sector write", sect_num + i, (sect_num + i) * MG_MFLASH_SECTOR_SIZE); LOG_DEBUG("mflash: %" PRIu32 " (0x%8.8" PRIx32 ") sector write", sect_num + i,
(sect_num + i) * MG_MFLASH_SECTOR_SIZE);
ret = duration_measure(&bench); ret = duration_measure(&bench);
if ((ERROR_OK == ret) && (duration_elapsed(&bench) > 3)) { if ((ERROR_OK == ret) && (duration_elapsed(&bench) > 3)) {
@@ -591,12 +610,22 @@ static int mg_mflash_read (uint32_t addr, uint8_t *buff, uint32_t len)
return ret; return ret;
if (end_addr < next_sec_addr) { if (end_addr < next_sec_addr) {
memcpy(buff_ptr, sect_buff + (cur_addr & MG_MFLASH_SECTOR_SIZE_MASK), end_addr - cur_addr); memcpy(buff_ptr,
LOG_DEBUG("mflash: copies %" PRIu32 " byte from sector offset 0x%8.8" PRIx32 "", end_addr - cur_addr, cur_addr); sect_buff + (cur_addr & MG_MFLASH_SECTOR_SIZE_MASK),
end_addr - cur_addr);
LOG_DEBUG(
"mflash: copies %" PRIu32 " byte from sector offset 0x%8.8" PRIx32 "",
end_addr - cur_addr,
cur_addr);
cur_addr = end_addr; cur_addr = end_addr;
} else { } else {
memcpy(buff_ptr, sect_buff + (cur_addr & MG_MFLASH_SECTOR_SIZE_MASK), next_sec_addr - cur_addr); memcpy(buff_ptr,
LOG_DEBUG("mflash: copies %" PRIu32 " byte from sector offset 0x%8.8" PRIx32 "", next_sec_addr - cur_addr, cur_addr); sect_buff + (cur_addr & MG_MFLASH_SECTOR_SIZE_MASK),
next_sec_addr - cur_addr);
LOG_DEBUG(
"mflash: copies %" PRIu32 " byte from sector offset 0x%8.8" PRIx32 "",
next_sec_addr - cur_addr,
cur_addr);
buff_ptr += (next_sec_addr - cur_addr); buff_ptr += (next_sec_addr - cur_addr);
cur_addr = next_sec_addr; cur_addr = next_sec_addr;
} }
@@ -612,9 +641,11 @@ static int mg_mflash_read (uint32_t addr, uint8_t *buff, uint32_t len)
next_sec_addr += MG_MFLASH_SECTOR_SIZE; next_sec_addr += MG_MFLASH_SECTOR_SIZE;
} }
if (cnt) if (cnt) {
if ((ret = mg_mflash_read_sects(buff_ptr, sect_num, cnt)) != ERROR_OK) ret = mg_mflash_read_sects(buff_ptr, sect_num, cnt);
if (ret != ERROR_OK)
return ret; return ret;
}
buff_ptr += cnt * MG_MFLASH_SECTOR_SIZE; buff_ptr += cnt * MG_MFLASH_SECTOR_SIZE;
cur_addr += cnt * MG_MFLASH_SECTOR_SIZE; cur_addr += cnt * MG_MFLASH_SECTOR_SIZE;
@@ -628,7 +659,6 @@ static int mg_mflash_read (uint32_t addr, uint8_t *buff, uint32_t len)
memcpy(buff_ptr, sect_buff, end_addr - cur_addr); memcpy(buff_ptr, sect_buff, end_addr - cur_addr);
LOG_DEBUG("mflash: copies %u byte", (unsigned)(end_addr - cur_addr)); LOG_DEBUG("mflash: copies %u byte", (unsigned)(end_addr - cur_addr));
} }
} }
@@ -655,12 +685,22 @@ static int mg_mflash_write(uint32_t addr, uint8_t *buff, uint32_t len)
return ret; return ret;
if (end_addr < next_sec_addr) { if (end_addr < next_sec_addr) {
memcpy(sect_buff + (cur_addr & MG_MFLASH_SECTOR_SIZE_MASK), buff_ptr, end_addr - cur_addr); memcpy(sect_buff + (cur_addr & MG_MFLASH_SECTOR_SIZE_MASK),
LOG_DEBUG("mflash: copies %" PRIu32 " byte to sector offset 0x%8.8" PRIx32 "", end_addr - cur_addr, cur_addr); buff_ptr,
end_addr - cur_addr);
LOG_DEBUG(
"mflash: copies %" PRIu32 " byte to sector offset 0x%8.8" PRIx32 "",
end_addr - cur_addr,
cur_addr);
cur_addr = end_addr; cur_addr = end_addr;
} else { } else {
memcpy(sect_buff + (cur_addr & MG_MFLASH_SECTOR_SIZE_MASK), buff_ptr, next_sec_addr - cur_addr); memcpy(sect_buff + (cur_addr & MG_MFLASH_SECTOR_SIZE_MASK),
LOG_DEBUG("mflash: copies %" PRIu32 " byte to sector offset 0x%8.8" PRIx32 "", next_sec_addr - cur_addr, cur_addr); buff_ptr,
next_sec_addr - cur_addr);
LOG_DEBUG(
"mflash: copies %" PRIu32 " byte to sector offset 0x%8.8" PRIx32 "",
next_sec_addr - cur_addr,
cur_addr);
buff_ptr += (next_sec_addr - cur_addr); buff_ptr += (next_sec_addr - cur_addr);
cur_addr = next_sec_addr; cur_addr = next_sec_addr;
} }
@@ -680,9 +720,11 @@ static int mg_mflash_write(uint32_t addr, uint8_t *buff, uint32_t len)
next_sec_addr += MG_MFLASH_SECTOR_SIZE; next_sec_addr += MG_MFLASH_SECTOR_SIZE;
} }
if (cnt) if (cnt) {
if ((ret = mg_mflash_write_sects(buff_ptr, sect_num, cnt)) != ERROR_OK) ret = mg_mflash_write_sects(buff_ptr, sect_num, cnt);
if (ret != ERROR_OK)
return ret; return ret;
}
buff_ptr += cnt * MG_MFLASH_SECTOR_SIZE; buff_ptr += cnt * MG_MFLASH_SECTOR_SIZE;
cur_addr += cnt * MG_MFLASH_SECTOR_SIZE; cur_addr += cnt * MG_MFLASH_SECTOR_SIZE;
@@ -710,9 +752,8 @@ COMMAND_HANDLER(mg_write_cmd)
struct fileio fileio; struct fileio fileio;
int ret; int ret;
if (CMD_ARGC != 3) { if (CMD_ARGC != 3)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
}
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], address); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], address);
@@ -740,23 +781,25 @@ COMMAND_HANDLER(mg_write_cmd)
size_t buf_cnt; size_t buf_cnt;
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {
if ((ret = fileio_read(&fileio, MG_FILEIO_CHUNK, buffer, &buf_cnt)) != ret = fileio_read(&fileio, MG_FILEIO_CHUNK, buffer, &buf_cnt);
ERROR_OK) if (ret != ERROR_OK)
goto mg_write_cmd_err; goto mg_write_cmd_err;
if ((ret = mg_mflash_write(address, buffer, MG_FILEIO_CHUNK)) != ERROR_OK) ret = mg_mflash_write(address, buffer, MG_FILEIO_CHUNK);
if (ret != ERROR_OK)
goto mg_write_cmd_err; goto mg_write_cmd_err;
address += MG_FILEIO_CHUNK; address += MG_FILEIO_CHUNK;
} }
if (res) { if (res) {
if ((ret = fileio_read(&fileio, res, buffer, &buf_cnt)) != ERROR_OK) ret = fileio_read(&fileio, res, buffer, &buf_cnt);
if (ret != ERROR_OK)
goto mg_write_cmd_err; goto mg_write_cmd_err;
if ((ret = mg_mflash_write(address, buffer, res)) != ERROR_OK) ret = mg_mflash_write(address, buffer, res);
if (ret != ERROR_OK)
goto mg_write_cmd_err; goto mg_write_cmd_err;
} }
if (duration_measure(&bench) == ERROR_OK) if (duration_measure(&bench) == ERROR_OK) {
{
command_print(CMD_CTX, "wrote %ld bytes from file %s " command_print(CMD_CTX, "wrote %ld bytes from file %s "
"in %fs (%0.3f kB/s)", (long)filesize, CMD_ARGV[1], "in %fs (%0.3f kB/s)", (long)filesize, CMD_ARGV[1],
duration_elapsed(&bench), duration_kbps(&bench, filesize)); duration_elapsed(&bench), duration_kbps(&bench, filesize));
@@ -781,9 +824,8 @@ COMMAND_HANDLER(mg_dump_cmd)
struct fileio fileio; struct fileio fileio;
int ret; int ret;
if (CMD_ARGC != 4) { if (CMD_ARGC != 4)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
}
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], address); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], address);
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], size); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], size);
@@ -806,23 +848,25 @@ COMMAND_HANDLER(mg_dump_cmd)
size_t size_written; size_t size_written;
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {
if ((ret = mg_mflash_read(address, buffer, MG_FILEIO_CHUNK)) != ERROR_OK) ret = mg_mflash_read(address, buffer, MG_FILEIO_CHUNK);
if (ret != ERROR_OK)
goto mg_dump_cmd_err; goto mg_dump_cmd_err;
if ((ret = fileio_write(&fileio, MG_FILEIO_CHUNK, buffer, &size_written)) ret = fileio_write(&fileio, MG_FILEIO_CHUNK, buffer, &size_written);
!= ERROR_OK) if (ret != ERROR_OK)
goto mg_dump_cmd_err; goto mg_dump_cmd_err;
address += MG_FILEIO_CHUNK; address += MG_FILEIO_CHUNK;
} }
if (res) { if (res) {
if ((ret = mg_mflash_read(address, buffer, res)) != ERROR_OK) ret = mg_mflash_read(address, buffer, res);
if (ret != ERROR_OK)
goto mg_dump_cmd_err; goto mg_dump_cmd_err;
if ((ret = fileio_write(&fileio, res, buffer, &size_written)) != ERROR_OK) ret = fileio_write(&fileio, res, buffer, &size_written);
if (ret != ERROR_OK)
goto mg_dump_cmd_err; goto mg_dump_cmd_err;
} }
if (duration_measure(&bench) == ERROR_OK) if (duration_measure(&bench) == ERROR_OK) {
{
command_print(CMD_CTX, "dump image (address 0x%8.8" PRIx32 " " command_print(CMD_CTX, "dump image (address 0x%8.8" PRIx32 " "
"size %" PRIu32 ") to file %s in %fs (%0.3f kB/s)", "size %" PRIu32 ") to file %s in %fs (%0.3f kB/s)",
address, size, CMD_ARGV[1], address, size, CMD_ARGV[1],
@@ -847,8 +891,8 @@ static int mg_set_feature(mg_feature_id feature, mg_feature_val config)
uint32_t mg_task_reg = mflash_bank->base + MG_REG_OFFSET; uint32_t mg_task_reg = mflash_bank->base + MG_REG_OFFSET;
int ret; int ret;
if ((ret = mg_dsk_wait(mg_io_wait_rdy_noerr, MG_OEM_DISK_WAIT_TIME_NORMAL)) ret = mg_dsk_wait(mg_io_wait_rdy_noerr, MG_OEM_DISK_WAIT_TIME_NORMAL);
!= ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
ret = target_write_u8(target, mg_task_reg + MG_REG_FEATURE, feature); ret = target_write_u8(target, mg_task_reg + MG_REG_FEATURE, feature);
@@ -928,9 +972,10 @@ static double mg_do_calc_pll(double XIN, mg_pll_t * p_pll_val, int is_approximat
if ((int)((CLK_OUT + ROUND) / DIV) if ((int)((CLK_OUT + ROUND) / DIV)
== (int)(MG_PLL_CLK_OUT / DIV)) { == (int)(MG_PLL_CLK_OUT / DIV)) {
if (mg_is_valid_pll(XIN, N, CLK_OUT, NO) == ERROR_OK) if (mg_is_valid_pll(XIN, N, CLK_OUT, NO) == ERROR_OK) {
{ p_pll_val->lock_cyc =
p_pll_val->lock_cyc = (int)(XIN * MG_PLL_STD_LOCKCYCLE / MG_PLL_STD_INPUTCLK); (int)(XIN * MG_PLL_STD_LOCKCYCLE /
MG_PLL_STD_INPUTCLK);
p_pll_val->feedback_div = i; p_pll_val->feedback_div = i;
p_pll_val->input_div = j; p_pll_val->input_div = j;
p_pll_val->output_div = k; p_pll_val->output_div = k;
@@ -1123,18 +1168,18 @@ static int mg_storage_config(void)
uint8_t buff[512]; uint8_t buff[512];
int ret; int ret;
if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd)) ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd);
!= ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
mg_gen_ataid((mg_io_type_drv_info *)(void *)buff); mg_gen_ataid((mg_io_type_drv_info *)(void *)buff);
if ((ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_update_stgdrvinfo)) ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_update_stgdrvinfo);
!= ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_default)) ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_default);
!= ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
LOG_INFO("mflash: storage config ok"); LOG_INFO("mflash: storage config ok");
@@ -1146,8 +1191,8 @@ static int mg_boot_config(void)
uint8_t buff[512]; uint8_t buff[512];
int ret; int ret;
if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd)) ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd);
!= ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
memset(buff, 0xff, 512); memset(buff, 0xff, 512);
@@ -1157,12 +1202,12 @@ static int mg_boot_config(void)
buff[2] = 4; /* boot size */ buff[2] = 4; /* boot size */
*((uint32_t *)(void *)(buff + 4)) = 0; /* XIP size */ *((uint32_t *)(void *)(buff + 4)) = 0; /* XIP size */
if ((ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_update_xipinfo)) ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_update_xipinfo);
!= ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_default)) ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_default);
!= ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
LOG_INFO("mflash: boot config ok"); LOG_INFO("mflash: boot config ok");
@@ -1181,16 +1226,16 @@ static int mg_set_pll(mg_pll_t *pll)
buff[6] = pll->input_div; /* PLL Input 5bit Divider */ buff[6] = pll->input_div; /* PLL Input 5bit Divider */
buff[7] = pll->output_div; /* PLL Output Divider */ buff[7] = pll->output_div; /* PLL Output Divider */
if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd)) ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd);
!= ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
if ((ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_wr_pll)) ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_wr_pll);
!= ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_default)) ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_default);
!= ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
LOG_INFO("mflash: set pll ok"); LOG_INFO("mflash: set pll ok");
@@ -1201,16 +1246,16 @@ static int mg_erase_nand(void)
{ {
int ret; int ret;
if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd)) ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd);
!= ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
if ((ret = mg_mflash_do_write_sects(NULL, 0, 0, mg_vcmd_purge_nand)) ret = mg_mflash_do_write_sects(NULL, 0, 0, mg_vcmd_purge_nand);
!= ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_default)) ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_default);
!= ERROR_OK) if (ret != ERROR_OK)
return ret; return ret;
LOG_INFO("mflash: erase nand ok"); LOG_INFO("mflash: erase nand ok");
@@ -1223,10 +1268,12 @@ COMMAND_HANDLER(mg_config_cmd)
mg_pll_t pll; mg_pll_t pll;
int ret; int ret;
if ((ret = mg_verify_interface()) != ERROR_OK) ret = mg_verify_interface();
if (ret != ERROR_OK)
return ret; return ret;
if ((ret = mg_mflash_rst()) != ERROR_OK) ret = mg_mflash_rst();
if (ret != ERROR_OK)
return ret; return ret;
switch (CMD_ARGC) { switch (CMD_ARGC) {
@@ -1262,7 +1309,8 @@ COMMAND_HANDLER(mg_config_cmd)
pll.input_div, pll.output_div, pll.input_div, pll.output_div,
pll.lock_cyc); pll.lock_cyc);
if ((ret = mg_erase_nand()) != ERROR_OK) ret = mg_erase_nand();
if (ret != ERROR_OK)
return ret; return ret;
return mg_set_pll(&pll); return mg_set_pll(&pll);
@@ -1320,9 +1368,8 @@ COMMAND_HANDLER(handle_mflash_init_command)
if (CMD_ARGC != 0) if (CMD_ARGC != 0)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
static bool mflash_initialized = false; static bool mflash_initialized;
if (mflash_initialized) if (mflash_initialized) {
{
LOG_INFO("'mflash init' has already been called"); LOG_INFO("'mflash init' has already been called");
return ERROR_OK; return ERROR_OK;
} }
@@ -1338,19 +1385,17 @@ COMMAND_HANDLER(mg_bank_cmd)
int i; int i;
if (CMD_ARGC < 4) if (CMD_ARGC < 4)
{
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
}
if ((target = get_target(CMD_ARGV[3])) == NULL) target = get_target(CMD_ARGV[3]);
{ if (target == NULL) {
LOG_ERROR("target '%s' not defined", CMD_ARGV[3]); LOG_ERROR("target '%s' not defined", CMD_ARGV[3]);
return ERROR_FAIL; return ERROR_FAIL;
} }
mflash_bank = calloc(sizeof(struct mflash_bank), 1); mflash_bank = calloc(sizeof(struct mflash_bank), 1);
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], mflash_bank->base); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], mflash_bank->base);
/// @todo Verify how this parsing should work, then document it. /* / @todo Verify how this parsing should work, then document it. */
char *str; char *str;
mflash_bank->rst_pin.num = strtoul(CMD_ARGV[2], &str, 0); mflash_bank->rst_pin.num = strtoul(CMD_ARGV[2], &str, 0);
if (*str) if (*str)
@@ -1360,10 +1405,9 @@ COMMAND_HANDLER(mg_bank_cmd)
mflash_bank->target = target; mflash_bank->target = target;
for (i = 0; mflash_gpio[i]; i++) { for (i = 0; mflash_gpio[i]; i++) {
if (! strcmp(mflash_gpio[i]->name, CMD_ARGV[0])) { if (!strcmp(mflash_gpio[i]->name, CMD_ARGV[0]))
mflash_bank->gpio_drv = mflash_gpio[i]; mflash_bank->gpio_drv = mflash_gpio[i];
} }
}
if (!mflash_bank->gpio_drv) { if (!mflash_bank->gpio_drv) {
LOG_ERROR("%s is unsupported soc", CMD_ARGV[0]); LOG_ERROR("%s is unsupported soc", CMD_ARGV[0]);

27
src/flash/mflash.h
View File

@@ -26,14 +26,12 @@ typedef unsigned long mg_io_uint32;
typedef unsigned short mg_io_uint16; typedef unsigned short mg_io_uint16;
typedef unsigned char mg_io_uint8; typedef unsigned char mg_io_uint8;
struct mflash_gpio_num struct mflash_gpio_num {
{
char port[2]; char port[2];
signed short num; signed short num;
}; };
struct mflash_gpio_drv struct mflash_gpio_drv {
{
const char *name; const char *name;
int (*set_gpio_to_output)(struct mflash_gpio_num gpio); int (*set_gpio_to_output)(struct mflash_gpio_num gpio);
int (*set_gpio_output_val)(struct mflash_gpio_num gpio, uint8_t val); int (*set_gpio_output_val)(struct mflash_gpio_num gpio, uint8_t val);
@@ -117,8 +115,7 @@ typedef struct _mg_io_type_drv_info {
} mg_io_type_drv_info; } mg_io_type_drv_info;
typedef struct _mg_pll_t typedef struct _mg_pll_t {
{
unsigned int lock_cyc; unsigned int lock_cyc;
unsigned short feedback_div; /* 9bit divider */ unsigned short feedback_div; /* 9bit divider */
unsigned char input_div; /* 5bit divider */ unsigned char input_div; /* 5bit divider */
@@ -130,8 +127,7 @@ struct mg_drv_info {
uint32_t tot_sects; uint32_t tot_sects;
}; };
struct mflash_bank struct mflash_bank {
{
uint32_t base; uint32_t base;
struct mflash_gpio_num rst_pin; struct mflash_gpio_num rst_pin;
@@ -239,8 +235,7 @@ typedef enum _mg_io_type_rval_dev{
} mg_io_type_rval_dev; } mg_io_type_rval_dev;
typedef enum _mg_io_type_cmd typedef enum _mg_io_type_cmd {
{
mg_io_cmd_read = 0x20, mg_io_cmd_read = 0x20,
mg_io_cmd_write = 0x30, mg_io_cmd_write = 0x30,
@@ -264,20 +259,17 @@ typedef enum _mg_io_type_cmd
} mg_io_type_cmd; } mg_io_type_cmd;
typedef enum _mg_feature_id typedef enum _mg_feature_id {
{
mg_feature_id_transmode = 0x3 mg_feature_id_transmode = 0x3
} mg_feature_id; } mg_feature_id;
typedef enum _mg_feature_val typedef enum _mg_feature_val {
{
mg_feature_val_trans_default = 0x0, mg_feature_val_trans_default = 0x0,
mg_feature_val_trans_vcmd = 0x3, mg_feature_val_trans_vcmd = 0x3,
mg_feature_val_trand_vcmds = 0x2 mg_feature_val_trand_vcmds = 0x2
} mg_feature_val; } mg_feature_val;
typedef enum _mg_vcmd typedef enum _mg_vcmd {
{
mg_vcmd_update_xipinfo = 0xFA, /* FWPATCH commmand through IOM I/O */ mg_vcmd_update_xipinfo = 0xFA, /* FWPATCH commmand through IOM I/O */
mg_vcmd_verify_fwpatch = 0xFB, /* FWPATCH commmand through IOM I/O */ mg_vcmd_verify_fwpatch = 0xFB, /* FWPATCH commmand through IOM I/O */
mg_vcmd_update_stgdrvinfo = 0xFC, /* IOM identificatin info program command */ mg_vcmd_update_stgdrvinfo = 0xFC, /* IOM identificatin info program command */
@@ -290,8 +282,7 @@ typedef enum _mg_vcmd
mg_vcmd_wr_otp = 0x8F mg_vcmd_wr_otp = 0x8F
} mg_vcmd; } mg_vcmd;
typedef enum _mg_opmode typedef enum _mg_opmode {
{
mg_op_mode_xip = 1, /* TRUE XIP */ mg_op_mode_xip = 1, /* TRUE XIP */
mg_op_mode_snd = 2, /* BOOT + Storage */ mg_op_mode_snd = 2, /* BOOT + Storage */
mg_op_mode_stg = 0 /* Only Storage */ mg_op_mode_stg = 0 /* Only Storage */