summaryrefslogtreecommitdiff
path: root/sys/dev/flash
diff options
context:
space:
mode:
authorahoka <ahoka@NetBSD.org>2011-04-04 14:25:09 +0000
committerahoka <ahoka@NetBSD.org>2011-04-04 14:25:09 +0000
commit803690549a90cfedf778d92fb19faefdc395ce97 (patch)
tree69cc8e19e67bf9bb2fd9c8a94003083174e14354 /sys/dev/flash
parent950d01d7ed00bd2fec796f9373e06a6122f5efb6 (diff)
Fix badblock checking
Replace flash_addr_t with flash_off_t and use it to address flash everywhere
Diffstat (limited to 'sys/dev/flash')
-rw-r--r--sys/dev/flash/flash.c31
-rw-r--r--sys/dev/flash/flash.h30
2 files changed, 29 insertions, 32 deletions
diff --git a/sys/dev/flash/flash.c b/sys/dev/flash/flash.c
index b2eb31b7b2d..cd9269c18c1 100644
--- a/sys/dev/flash/flash.c
+++ b/sys/dev/flash/flash.c
@@ -1,4 +1,4 @@
-/* $NetBSD: flash.c,v 1.2 2011/03/30 14:34:26 uebayasi Exp $ */
+/* $NetBSD: flash.c,v 1.3 2011/04/04 14:25:09 ahoka Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.2 2011/03/30 14:34:26 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.3 2011/04/04 14:25:09 ahoka Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -88,7 +88,7 @@ bool flash_shutdown(device_t dev, int how);
int flash_nsectors(struct buf *bp);
int flash_sector(struct buf *bp);
-static inline off_t flash_get_part_offset(struct flash_softc *fl,
+static inline flash_off_t flash_get_part_offset(struct flash_softc *fl,
size_t poffset);
int flash_match(device_t parent, cfdata_t match, void *aux);
@@ -405,7 +405,8 @@ flashioctl(dev_t dev, u_long command, void *data, int flags, struct lwp *l)
struct flash_softc *sc;
int unit, err;
size_t retlen;
- flash_addr_t offset;
+ flash_off_t offset;
+ bool bad;
unit = minor(dev);
if ((sc = device_lookup_private(&flash_cd, unit)) == NULL)
@@ -441,15 +442,11 @@ flashioctl(dev_t dev, u_long command, void *data, int flags, struct lwp *l)
*/
bbp = data;
- err = flash_block_isbad(sc->sc_dev, bbp->bbp_addr);
- if (err == EIO) {
- bbp->bbp_isbad = true;
- err = 0;
- } else if (err) {
+ err = flash_block_isbad(sc->sc_dev, bbp->bbp_addr, &bad);
+ if (err) {
return err;
- } else {
- bbp->bbp_isbad = false;
}
+ bbp->bbp_isbad = bad;
break;
case FLASH_BLOCK_MARKBAD:
@@ -548,7 +545,7 @@ flash_get_device(dev_t dev)
return sc->sc_dev;
}
-static inline off_t
+static inline flash_off_t
flash_get_part_offset(struct flash_softc *fl, size_t poffset)
{
return fl->flash_if->partition.part_offset + poffset;
@@ -577,7 +574,7 @@ flash_erase(device_t self, struct flash_erase_instruction *ei)
int
flash_read(device_t self,
- off_t offset, size_t len, size_t *retlen, uint8_t *buf)
+ flash_off_t offset, size_t len, size_t *retlen, uint8_t *buf)
{
struct flash_softc *sc = device_private(self);
@@ -593,7 +590,7 @@ flash_read(device_t self,
int
flash_write(device_t self,
- off_t offset, size_t len, size_t *retlen, const uint8_t *buf)
+ flash_off_t offset, size_t len, size_t *retlen, const uint8_t *buf)
{
struct flash_softc *sc = device_private(self);
@@ -611,7 +608,7 @@ flash_write(device_t self,
}
int
-flash_block_markbad(device_t self, uint64_t offset)
+flash_block_markbad(device_t self, flash_off_t offset)
{
struct flash_softc *sc = device_private(self);
@@ -629,7 +626,7 @@ flash_block_markbad(device_t self, uint64_t offset)
}
int
-flash_block_isbad(device_t self, uint64_t offset)
+flash_block_isbad(device_t self, flash_off_t offset, bool *bad)
{
struct flash_softc *sc = device_private(self);
@@ -640,7 +637,7 @@ flash_block_isbad(device_t self, uint64_t offset)
sc->flash_if->partition.part_offset)
return EINVAL;
- return sc->flash_if->block_isbad(device_parent(self), offset);
+ return sc->flash_if->block_isbad(device_parent(self), offset, bad);
}
int
diff --git a/sys/dev/flash/flash.h b/sys/dev/flash/flash.h
index 91065968c08..bf4e21fd5a9 100644
--- a/sys/dev/flash/flash.h
+++ b/sys/dev/flash/flash.h
@@ -1,4 +1,4 @@
-/* $NetBSD: flash.h,v 1.2 2011/03/30 14:34:26 uebayasi Exp $ */
+/* $NetBSD: flash.h,v 1.3 2011/04/04 14:25:09 ahoka Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -73,8 +73,8 @@ device_t flash_get_device(dev_t);
* @state: the erase operation's result
*/
struct flash_erase_instruction {
- flash_addr_t ei_addr;
- flash_addr_t ei_len;
+ flash_off_t ei_addr;
+ flash_off_t ei_len;
void (*ei_callback)(struct flash_erase_instruction *);
u_long ei_priv;
u_char ei_state;
@@ -86,8 +86,8 @@ enum {
};
struct flash_partition {
- flash_addr_t part_offset;
- flash_addr_t part_size;
+ flash_off_t part_offset;
+ flash_off_t part_size;
int part_flags;
};
@@ -107,10 +107,10 @@ struct flash_partition {
*/
struct flash_interface {
int (*erase)(device_t, struct flash_erase_instruction *);
- int (*read)(device_t, off_t, size_t, size_t *, uint8_t *);
- int (*write)(device_t, off_t, size_t, size_t *, const uint8_t *);
- int (*block_markbad)(device_t, uint64_t);
- int (*block_isbad)(device_t, uint64_t);
+ int (*read)(device_t, flash_off_t, size_t, size_t *, uint8_t *);
+ int (*write)(device_t, flash_off_t, size_t, size_t *, const uint8_t *);
+ int (*block_markbad)(device_t, flash_off_t);
+ int (*block_isbad)(device_t, flash_off_t, bool *);
int (*sync)(device_t);
int (*submit)(device_t, struct buf *);
@@ -119,7 +119,7 @@ struct flash_interface {
struct flash_partition partition;
/* total size of mtd */
- flash_addr_t size;
+ flash_size_t size;
uint32_t page_size;
uint32_t erasesize;
uint32_t writesize;
@@ -132,16 +132,16 @@ struct flash_interface {
*/
struct flash_cache {
size_t fc_len;
- flash_addr_t fc_block;
+ flash_off_t fc_block;
uint8_t *fc_data;
};
/* flash operations should be used through these */
int flash_erase(device_t, struct flash_erase_instruction *);
-int flash_read(device_t, off_t, size_t, size_t *, uint8_t *);
-int flash_write(device_t, off_t, size_t, size_t *, const uint8_t *);
-int flash_block_markbad(device_t, uint64_t);
-int flash_block_isbad(device_t, uint64_t);
+int flash_read(device_t, flash_off_t, size_t, size_t *, uint8_t *);
+int flash_write(device_t, flash_off_t, size_t, size_t *, const uint8_t *);
+int flash_block_markbad(device_t, flash_off_t);
+int flash_block_isbad(device_t, flash_off_t, bool *);
int flash_sync(device_t);
/*