| Message ID | 1255932706-23824-1-git-send-email-akinobu.mita@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
On Mon, Oct 19, 2009 at 11:41 AM, Akinobu Mita <akinobu.mita@gmail.com> wrote: > Add __nand_calculate_ecc() which does not take struct mtd_info. > The built-in 256/512 software ECC calculation and correction tester > will use it. > > Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> > Cc: David Woodhouse <dwmw2@infradead.org> > Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> > Cc: linux-mtd@lists.infradead.org > --- > drivers/mtd/nand/nand_ecc.c | 25 ++++++++++++++++++++----- > include/linux/mtd/nand_ecc.h | 6 ++++++ > 2 files changed, 26 insertions(+), 5 deletions(-) > > diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c > index db7ae9d..809fb53 100644 > --- a/drivers/mtd/nand/nand_ecc.c > +++ b/drivers/mtd/nand/nand_ecc.c > @@ -150,20 +150,19 @@ static const char addressbits[256] = { > }; > > /** > - * nand_calculate_ecc - [NAND Interface] Calculate 3-byte ECC for 256/512-byte > + * __nand_calculate_ecc - [NAND Interface] Calculate 3-byte ECC for 256/512-byte > * block > - * @mtd: MTD block structure > * @buf: input buffer with raw data > + * @eccsize: data bytes per ecc step (256 or 512) > * @code: output buffer with ECC > */ > -int nand_calculate_ecc(struct mtd_info *mtd, const unsigned char *buf, > +void __nand_calculate_ecc(const unsigned char *buf, unsigned int eccsize, > unsigned char *code) > { > int i; > const uint32_t *bp = (uint32_t *)buf; > /* 256 or 512 bytes/ecc */ > - const uint32_t eccsize_mult = > - (((struct nand_chip *)mtd->priv)->ecc.size) >> 8; > + const uint32_t eccsize_mult = eccsize >> 8; > uint32_t cur; /* current value in buffer */ > /* rp0..rp15..rp17 are the various accumulated parities (per byte) */ > uint32_t rp0, rp1, rp2, rp3, rp4, rp5, rp6, rp7; > @@ -412,6 +411,22 @@ int nand_calculate_ecc(struct mtd_info *mtd, const unsigned char *buf, > (invparity[par & 0x55] << 2) | > (invparity[rp17] << 1) | > (invparity[rp16] << 0); > +} > +EXPORT_SYMBOL(__nand_calculate_ecc); > + > +/** > + * nand_calculate_ecc - [NAND Interface] Calculate 3-byte ECC for 256/512-byte > + * block > + * @mtd: MTD block structure > + * @buf: input buffer with raw data > + * @code: output buffer with ECC > + */ > +int nand_calculate_ecc(struct mtd_info *mtd, const unsigned char *buf, > + unsigned char *code) > +{ > + __nand_calculate_ecc(buf, > + ((struct nand_chip *)mtd->priv)->ecc.size, code); > + > return 0; > } > EXPORT_SYMBOL(nand_calculate_ecc); > diff --git a/include/linux/mtd/nand_ecc.h b/include/linux/mtd/nand_ecc.h > index 052ea8c..9cb10ff 100644 > --- a/include/linux/mtd/nand_ecc.h > +++ b/include/linux/mtd/nand_ecc.h > @@ -16,6 +16,12 @@ > struct mtd_info; > > /* > + * Calculate 3 byte ECC code for eccsize byte block > + */ > +void __nand_calculate_ecc(const u_char *dat, unsigned int eccsize, > + u_char *ecc_code); > + > +/* > * Calculate 3 byte ECC code for 256 byte block > */ Could you please correct above comment too?
diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c index db7ae9d..809fb53 100644 --- a/drivers/mtd/nand/nand_ecc.c +++ b/drivers/mtd/nand/nand_ecc.c @@ -150,20 +150,19 @@ static const char addressbits[256] = { }; /** - * nand_calculate_ecc - [NAND Interface] Calculate 3-byte ECC for 256/512-byte + * __nand_calculate_ecc - [NAND Interface] Calculate 3-byte ECC for 256/512-byte * block - * @mtd: MTD block structure * @buf: input buffer with raw data + * @eccsize: data bytes per ecc step (256 or 512) * @code: output buffer with ECC */ -int nand_calculate_ecc(struct mtd_info *mtd, const unsigned char *buf, +void __nand_calculate_ecc(const unsigned char *buf, unsigned int eccsize, unsigned char *code) { int i; const uint32_t *bp = (uint32_t *)buf; /* 256 or 512 bytes/ecc */ - const uint32_t eccsize_mult = - (((struct nand_chip *)mtd->priv)->ecc.size) >> 8; + const uint32_t eccsize_mult = eccsize >> 8; uint32_t cur; /* current value in buffer */ /* rp0..rp15..rp17 are the various accumulated parities (per byte) */ uint32_t rp0, rp1, rp2, rp3, rp4, rp5, rp6, rp7; @@ -412,6 +411,22 @@ int nand_calculate_ecc(struct mtd_info *mtd, const unsigned char *buf, (invparity[par & 0x55] << 2) | (invparity[rp17] << 1) | (invparity[rp16] << 0); +} +EXPORT_SYMBOL(__nand_calculate_ecc); + +/** + * nand_calculate_ecc - [NAND Interface] Calculate 3-byte ECC for 256/512-byte + * block + * @mtd: MTD block structure + * @buf: input buffer with raw data + * @code: output buffer with ECC + */ +int nand_calculate_ecc(struct mtd_info *mtd, const unsigned char *buf, + unsigned char *code) +{ + __nand_calculate_ecc(buf, + ((struct nand_chip *)mtd->priv)->ecc.size, code); + return 0; } EXPORT_SYMBOL(nand_calculate_ecc); diff --git a/include/linux/mtd/nand_ecc.h b/include/linux/mtd/nand_ecc.h index 052ea8c..9cb10ff 100644 --- a/include/linux/mtd/nand_ecc.h +++ b/include/linux/mtd/nand_ecc.h @@ -16,6 +16,12 @@ struct mtd_info; /* + * Calculate 3 byte ECC code for eccsize byte block + */ +void __nand_calculate_ecc(const u_char *dat, unsigned int eccsize, + u_char *ecc_code); + +/* * Calculate 3 byte ECC code for 256 byte block */ int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code);
Add __nand_calculate_ecc() which does not take struct mtd_info. The built-in 256/512 software ECC calculation and correction tester will use it. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Cc: linux-mtd@lists.infradead.org --- drivers/mtd/nand/nand_ecc.c | 25 ++++++++++++++++++++----- include/linux/mtd/nand_ecc.h | 6 ++++++ 2 files changed, 26 insertions(+), 5 deletions(-)