nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

blk/mtdoutstream: remove mtd bytewrite support, readback before update

Browse source 
Signed-off-by: buxiasen <buxiasen@xiaomi.com>
This commit is contained in:
buxiasen 2024-11-08 20:51:23 +08:00 committed by Xiang Xiao
parent d6c746e88d
commit 2433094ebd
2 changed files with 70 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libs/libc/stream/lib_blkoutstream.c
View file

@ -104,11 +104,14 @@ static int blkoutstream_puts(FAR struct lib_outstream_s *self,
} }
else if (remain < sectorsize) else if (remain < sectorsize)
{ {
/* Set content to all 0 before caching, /* Read sector back to keep as more as possible old data */
* so no random content will be flushed
*/ ret = inode->u.i_bops->read(inode, stream->cache, sector, 1);
if (ret < 0)
{
return ret;
}
memset(stream->cache, 0, sectorsize);
memcpy(stream->cache, ptr, remain); memcpy(stream->cache, ptr, remain);
self->nput += remain; self->nput += remain;
remain = 0; remain = 0;

163
libs/libc/stream/lib_mtdoutstream.c
View file

@ -58,23 +58,16 @@ static int mtdoutstream_flush(FAR struct lib_outstream_s *self)
if (self->nput % erasesize > 0) if (self->nput % erasesize > 0)
{ {
#ifdef CONFIG_MTD_BYTE_WRITE size_t sblock = self->nput / erasesize;
/* if byte write, flush won't be needed */
if (inode->u.i_mtd->write == NULL) ret = MTD_ERASE(inode->u.i_mtd, sblock, 1);
#endif if (ret < 0)
{ {
size_t sblock = self->nput / erasesize; return ret;
ret = MTD_ERASE(inode->u.i_mtd, sblock, 1);
if (ret < 0)
{
return ret;
}
ret = MTD_BWRITE(inode->u.i_mtd, sblock * nblkpererase,
nblkpererase, stream->cache);
} }
ret = MTD_BWRITE(inode->u.i_mtd, sblock * nblkpererase,
nblkpererase, stream->cache);
} }
return ret; return ret;
@ -101,99 +94,74 @@ static int mtdoutstream_puts(FAR struct lib_outstream_s *self,
return -ENOSPC; return -ENOSPC;
} }
#ifdef CONFIG_MTD_BYTE_WRITE while (remain > 0)
if (inode->u.i_mtd->write != NULL)
{ {
size_t sblock = (self->nput + erasesize - 1) / erasesize; size_t sblock = self->nput / erasesize;
size_t eblock = (self->nput + len + erasesize - 1) / erasesize; size_t offset = self->nput % erasesize;
if (sblock != eblock) if (offset > 0)
{ {
ret = MTD_ERASE(inode->u.i_mtd, sblock, eblock - sblock); size_t copyin = offset + remain > erasesize ?
if (ret < 0) erasesize - offset : remain;
memcpy(stream->cache + offset, ptr, copyin);
ptr += copyin;
offset += copyin;
self->nput += copyin;
remain -= copyin;
if (offset == erasesize)
{ {
return ret; ret = MTD_ERASE(inode->u.i_mtd, sblock, 1);
}
}
ret = MTD_WRITE(inode->u.i_mtd, self->nput, len, buf);
if (ret < 0)
{
return ret;
}
self->nput += len;
}
else
#endif
{
while (remain > 0)
{
size_t sblock = self->nput / erasesize;
size_t offset = self->nput % erasesize;
if (offset > 0)
{
size_t copyin = offset + remain > erasesize ?
erasesize - offset : remain;
memcpy(stream->cache + offset, ptr, copyin);
ptr += copyin;
offset += copyin;
self->nput += copyin;
remain -= copyin;
if (offset == erasesize)
{
ret = MTD_ERASE(inode->u.i_mtd, sblock, 1);
if (ret < 0)
{
return ret;
}
ret = MTD_BWRITE(inode->u.i_mtd, sblock * nblkpererase,
nblkpererase, stream->cache);
if (ret < 0)
{
return ret;
}
}
}
else if (remain < erasesize)
{
/* erase content to all 0 before caching,
* so no random content will be flushed
*/
memset(stream->cache, 0, erasesize);
memcpy(stream->cache, ptr, remain);
self->nput += remain;
remain = 0;
}
else
{
size_t nblock = remain / erasesize;
size_t copyin = nblock * erasesize;
ret = MTD_ERASE(inode->u.i_mtd, sblock, nblock);
if (ret < 0) if (ret < 0)
{ {
return ret; return ret;
} }
ret = MTD_BWRITE(inode->u.i_mtd, sblock * nblkpererase, ret = MTD_BWRITE(inode->u.i_mtd, sblock * nblkpererase,
nblock * nblkpererase, ptr); nblkpererase, stream->cache);
if (ret < 0) if (ret < 0)
{ {
return ret; return ret;
} }
ptr += copyin;
self->nput += copyin;
remain -= copyin;
} }
} }
else if (remain < erasesize)
{
ret = MTD_READ(stream->inode->u.i_mtd, sblock * erasesize,
erasesize, stream->cache);
if (ret < 0)
{
return ret;
}
memcpy(stream->cache, ptr, remain);
self->nput += remain;
remain = 0;
}
else
{
size_t nblock = remain / erasesize;
size_t copyin = nblock * erasesize;
ret = MTD_ERASE(inode->u.i_mtd, sblock, nblock);
if (ret < 0)
{
return ret;
}
ret = MTD_BWRITE(inode->u.i_mtd, sblock * nblkpererase,
nblock * nblkpererase, ptr);
if (ret < 0)
{
return ret;
}
ptr += copyin;
self->nput += copyin;
remain -= copyin;
}
} }
return len; return len;
@ -295,16 +263,11 @@ int lib_mtdoutstream_open(FAR struct lib_mtdoutstream_s *stream,
return -EINVAL; return -EINVAL;
} }
#ifdef CONFIG_MTD_BYTE_WRITE stream->cache = lib_malloc(stream->geo.erasesize);
if (node->u.i_mtd->write == NULL) if (stream->cache == NULL)
#endif
{ {
stream->cache = lib_malloc(stream->geo.erasesize); close_mtddriver(node);
if (stream->cache == NULL) return -ENOMEM;
{
close_mtddriver(node);
return -ENOMEM;
}
} }
stream->inode = node; stream->inode = node;