sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/cfi'

This commit is contained in:
Sascha Hauer 2013-06-02 12:35:47 +02:00
parent 5e7f855847 0d7ac7c381
commit 619fdd01ab
3 changed files with 58 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mtd/core.c
View File

@ -107,6 +107,12 @@ static int mtd_op_erase(struct cdev *cdev, size_t count, loff_t offset)
memset(&erase, 0, sizeof(erase));
erase.mtd = mtd;
erase.addr = offset;
if (!mtd->block_isbad) {
erase.len = count;
return mtd_erase(mtd, &erase);
}
erase.len = mtd->erasesize;
while (count > 0) {

78
drivers/mtd/nor/cfi_flash.c
View File

@ -187,10 +187,10 @@ static ulong flash_read_long (struct flash_info *info, flash_sect_t sect, uint o
addr = flash_make_addr (info, sect, offset);
#ifdef DEBUG
debug ("long addr is at %p info->portwidth = %d\n", addr,
dev_dbg(info->dev, "long addr is at %p info->portwidth = %d\n", addr,
info->portwidth);
for (x = 0; x < 4 * info->portwidth; x++) {
debug ("addr[%x] = 0x%x\n", x, flash_read8(addr + x));
dev_dbg(info->dev, "addr[%x] = 0x%x\n", x, flash_read8(addr + x));
}
#endif
#if defined __LITTLE_ENDIAN
@ -240,10 +240,10 @@ static void flash_read_cfi (struct flash_info *info, void *buf,
p[i] = flash_read_uchar(info, start + i);
}
static int flash_detect_cfi (struct flash_info *info, struct cfi_qry *qry)
static int flash_detect_width (struct flash_info *info, struct cfi_qry *qry)
{
int cfi_offset;
debug ("flash detect cfi\n");
for (info->portwidth = CFG_FLASH_CFI_WIDTH;
info->portwidth <= FLASH_CFI_64BIT; info->portwidth <<= 1) {
@ -262,11 +262,11 @@ static int flash_detect_cfi (struct flash_info *info, struct cfi_qry *qry)
info->interface = le16_to_cpu(qry->interface_desc);
info->cfi_offset=flash_offset_cfi[cfi_offset];
debug ("device interface is %d\n",
dev_dbg(info->dev, "device interface is %d\n",
info->interface);
debug ("found port %d chip %d ",
info->portwidth, info->chipwidth);
debug ("port %d bits chip %d bits\n",
dev_dbg(info->dev, "found port %d chip %d chip_lsb %d ",
info->portwidth, info->chipwidth, info->chip_lsb);
dev_dbg(info->dev, "port %d bits chip %d bits\n",
info->portwidth << CFI_FLASH_SHIFT_WIDTH,
info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
return 1;
@ -274,10 +274,25 @@ static int flash_detect_cfi (struct flash_info *info, struct cfi_qry *qry)
}
}
}
debug ("not found\n");
dev_dbg(info->dev, "not found\n");
return 0;
}
static int flash_detect_cfi (struct flash_info *info, struct cfi_qry *qry)
{
int ret;
dev_dbg(info->dev, "flash detect cfi\n");
info->chip_lsb = 0;
ret = flash_detect_width (info, qry);
if (!ret) {
info->chip_lsb = 1;
ret = flash_detect_width (info, qry);
}
return ret;
}
/*
* The following code cannot be run from FLASH!
*/
@ -339,7 +354,7 @@ static ulong flash_get_size (struct flash_info *info)
break;
#endif
default:
printf("unsupported vendor\n");
dev_err(info->dev, "unsupported vendor\n");
return 0;
}
info->cfi_cmd_set->flash_read_jedec_ids (info);
@ -347,22 +362,23 @@ static ulong flash_get_size (struct flash_info *info)
info->cfi_cmd_set->flash_fixup (info, &qry);
debug ("manufacturer is %d\n", info->vendor);
debug ("manufacturer id is 0x%x\n", info->manufacturer_id);
debug ("device id is 0x%x\n", info->device_id);
debug ("device id2 is 0x%x\n", info->device_id2);
debug ("cfi version is 0x%04x\n", info->cfi_version);
dev_dbg(info->dev, "manufacturer is %d\n", info->vendor);
dev_dbg(info->dev, "manufacturer id is 0x%x\n", info->manufacturer_id);
dev_dbg(info->dev, "device id is 0x%x\n", info->device_id);
dev_dbg(info->dev, "device id2 is 0x%x\n", info->device_id2);
dev_dbg(info->dev, "cfi version is 0x%04x\n", info->cfi_version);
size_ratio = info->portwidth / info->chipwidth;
/* if the chip is x8/x16 reduce the ratio by half */
if ((info->interface == FLASH_CFI_X8X16)
&& (info->chipwidth == FLASH_CFI_BY8)) {
&& (info->chipwidth == FLASH_CFI_BY8)
&& (size_ratio != 1)) {
size_ratio >>= 1;
}
debug ("size_ratio %d port %d bits chip %d bits\n",
dev_dbg(info->dev, "size_ratio %d port %d bits chip %d bits\n",
size_ratio, info->portwidth << CFI_FLASH_SHIFT_WIDTH,
info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
debug ("found %d erase regions\n", num_erase_regions);
dev_dbg(info->dev, "found %d erase regions\n", num_erase_regions);
info->eraseregions = xzalloc(sizeof(*(info->eraseregions)) * num_erase_regions);
info->numeraseregions = num_erase_regions;
sect_cnt = 0;
@ -372,19 +388,19 @@ static ulong flash_get_size (struct flash_info *info)
struct mtd_erase_region_info *region = &info->eraseregions[i];
if (i > NUM_ERASE_REGIONS) {
printf ("%d erase regions found, only %d used\n",
dev_info(info->dev, "%d erase regions found, only %d used\n",
num_erase_regions, NUM_ERASE_REGIONS);
break;
}
tmp = le32_to_cpu(qry.erase_region_info[i]);
debug("erase region %u: 0x%08lx\n", i, tmp);
dev_dbg(info->dev, "erase region %u: 0x%08lx\n", i, tmp);
erase_region_count = (tmp & 0xffff) + 1;
tmp >>= 16;
erase_region_size =
(tmp & 0xffff) ? ((tmp & 0xffff) * 256) : 128;
debug ("erase_region_count = %d erase_region_size = %d\n",
dev_dbg(info->dev, "erase_region_count = %d erase_region_size = %d\n",
erase_region_count, erase_region_size);
region->offset = cur_offset;
@ -459,7 +475,7 @@ static int cfi_erase(struct flash_info *finfo, size_t count, loff_t offset)
unsigned long start, end;
int i, ret = 0;
debug("%s: erase 0x%08llx (size %zu)\n", __func__, offset, count);
dev_dbg(finfo->dev, "%s: erase 0x%08llx (size %zu)\n", __func__, offset, count);
start = find_sector(finfo, (unsigned long)finfo->base + offset);
end = find_sector(finfo, (unsigned long)finfo->base + offset +
@ -786,7 +802,7 @@ int flash_generic_status_check (struct flash_info *info, flash_sect_t sector,
start = get_time_ns();
while (info->cfi_cmd_set->flash_is_busy (info, sector)) {
if (is_timeout(start, tout)) {
printf ("Flash %s timeout at address %lx data %lx\n",
dev_err(info->dev, "Flash %s timeout at address %lx data %lx\n",
prompt, info->start[sector],
flash_read_long (info, sector, 0));
flash_write_cmd (info, sector, 0, info->cmd_reset);
@ -823,7 +839,7 @@ void flash_write_cmd(struct flash_info *info, flash_sect_t sect,
addr = flash_make_addr (info, sect, offset);
flash_make_cmd (info, cmd, &cword);
debug("%s: %p %lX %X => %p " CFI_WORD_FMT "\n", __func__,
dev_dbg(info->dev, "%s: %p %lX %X => %p " CFI_WORD_FMT "\n", __func__,
info, sect, offset, addr, cword);
flash_write_word(info, cword, addr);
@ -839,15 +855,15 @@ int flash_isequal(struct flash_info *info, flash_sect_t sect,
addr = flash_make_addr (info, sect, offset);
flash_make_cmd (info, cmd, &cword);
debug ("is= cmd %x(%c) addr %p ", cmd, cmd, addr);
dev_dbg(info->dev, "is= cmd %x(%c) addr %p ", cmd, cmd, addr);
if (bankwidth_is_1(info)) {
debug ("is= %x %x\n", flash_read8(addr), (u8)cword);
dev_dbg(info->dev, "is= %x %x\n", flash_read8(addr), (u8)cword);
retval = (flash_read8(addr) == cword);
} else if (bankwidth_is_2(info)) {
debug ("is= %4.4x %4.4x\n", flash_read16(addr), (u16)cword);
dev_dbg(info->dev, "is= %4.4x %4.4x\n", flash_read16(addr), (u16)cword);
retval = (flash_read16(addr) == cword);
} else if (bankwidth_is_4(info)) {
debug ("is= %8.8x %8.8x\n", flash_read32(addr), (u32)cword);
dev_dbg(info->dev, "is= %8.8x %8.8x\n", flash_read32(addr), (u32)cword);
retval = (flash_read32(addr) == cword);
} else if (bankwidth_is_8(info)) {
#ifdef DEBUG
@ -857,7 +873,7 @@ int flash_isequal(struct flash_info *info, flash_sect_t sect,
print_longlong (str1, flash_read32(addr));
print_longlong (str2, cword);
debug ("is= %s %s\n", str1, str2);
dev_dbg(info->dev, "is= %s %s\n", str1, str2);
}
#endif
retval = (flash_read64(addr) == cword);
@ -947,6 +963,7 @@ static void cfi_init_mtd(struct flash_info *info)
mtd->numeraseregions = info->numeraseregions;
mtd->flags = MTD_CAP_NORFLASH;
mtd->type = MTD_NORFLASH;
mtd->parent = info->dev;
add_mtd_device(mtd, "nor");
}
@ -962,9 +979,10 @@ static int cfi_probe (struct device_d *dev)
info->cmd_reset = FLASH_CMD_RESET;
info->base = dev_request_mem_region(dev, 0);
info->size = flash_get_size(info);
info->dev = dev;
if (info->flash_id == FLASH_UNKNOWN) {
printf ("## Unknown FLASH on Bank at 0x%08x - Size = 0x%08lx = %ld MB\n",
dev_warn(dev, "## Unknown FLASH on Bank at 0x%08x - Size = 0x%08lx = %ld MB\n",
dev->resource[0].start, info->size, info->size << 20);
return -ENODEV;
}

6
drivers/mtd/nor/cfi_flash.h
View File

@ -48,7 +48,7 @@ struct cfi_cmd_set;
*/
struct flash_info {
struct driver_d driver;
struct device_d *dev;
ulong size; /* total bank size in bytes */
ushort sector_count; /* number of erase units */
ulong flash_id; /* combined device & manufacturer code */
@ -57,6 +57,8 @@ struct flash_info {
uchar portwidth; /* the width of the port */
uchar chipwidth; /* the width of the chip */
uchar chip_lsb; /* extra Least Significant Bit in the */
/* address of chip. */
ushort buffer_size; /* # of bytes in write buffer */
ulong erase_blk_tout; /* maximum block erase timeout */
ulong write_tout; /* maximum write timeout */
@ -298,7 +300,7 @@ static inline u64 flash_read64(void *addr)
*/
static inline uchar *flash_make_addr (struct flash_info *info, flash_sect_t sect, uint offset)
{
return ((uchar *) (info->start[sect] + (offset * info->portwidth)));
return ((uchar *) (info->start[sect] + ((offset * info->portwidth) << info->chip_lsb)));
}
uchar flash_read_uchar (struct flash_info *info, uint offset);