Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754265Ab0KASmJ (ORCPT ); Mon, 1 Nov 2010 14:42:09 -0400 Received: from mail-gw0-f46.google.com ([74.125.83.46]:45912 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754168Ab0KASmF (ORCPT ); Mon, 1 Nov 2010 14:42:05 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=Mt9Zx8dDqvGxhB/ITDqeh+CpeHhqNOXkzJLQ2WEx+6YSl/xCheEz7CDoQpo8J1fXRG 116ljFy7poK6Usc+E/IjcwzBpQi4WZUQXrVsmFC0PL4NRkDG6GXRFMBy5CRmfmE3zZSQ Z8lk+idJ8ocociQzqoLM2Wz8Ut6KAkMGqIKbE= From: Tracey Dent To: greg@kroah.com Cc: manningc2@actrix.gen.nz, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Tracey Dent Subject: [PATCH 15/29] Staging: yaffs2: yaffs_mtdif2: Add files Date: Mon, 1 Nov 2010 14:41:03 -0400 Message-Id: <1288636877-7964-16-git-send-email-tdent48227@gmail.com> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1288636877-7964-1-git-send-email-tdent48227@gmail.com> References: <1288636877-7964-1-git-send-email-tdent48227@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 8946 Lines: 315 Adding files to yaffs2 directory. Signed-off-by: Tracey Dent --- drivers/staging/yaffs2/yaffs_mtdif2.c | 256 +++++++++++++++++++++++++++++++++ drivers/staging/yaffs2/yaffs_mtdif2.h | 29 ++++ 2 files changed, 285 insertions(+), 0 deletions(-) create mode 100644 drivers/staging/yaffs2/yaffs_mtdif2.c create mode 100644 drivers/staging/yaffs2/yaffs_mtdif2.h diff --git a/drivers/staging/yaffs2/yaffs_mtdif2.c b/drivers/staging/yaffs2/yaffs_mtdif2.c new file mode 100644 index 0000000..1c60a44 --- /dev/null +++ b/drivers/staging/yaffs2/yaffs_mtdif2.c @@ -0,0 +1,256 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * + * Copyright (C) 2002-2010 Aleph One Ltd. + * for Toby Churchill Ltd and Brightstar Engineering + * + * Created by Charles Manning + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/* mtd interface for YAFFS2 */ + +#include "yportenv.h" +#include "yaffs_trace.h" + +#include "yaffs_mtdif2.h" + +#include "linux/mtd/mtd.h" +#include "linux/types.h" +#include "linux/time.h" + +#include "yaffs_packedtags2.h" + +#include "yaffs_linux.h" + +/* NB For use with inband tags.... + * We assume that the data buffer is of size total_bytes_per_chunk so that we can also + * use it to load the tags. + */ +int nandmtd2_write_chunk_tags(yaffs_dev_t *dev, int nand_chunk, + const __u8 *data, + const yaffs_ext_tags *tags) +{ + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); +#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17)) + struct mtd_oob_ops ops; +#else + size_t dummy; +#endif + int retval = 0; + + loff_t addr; + + yaffs_packed_tags2 pt; + + int packed_tags_size = dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt); + void * packed_tags_ptr = dev->param.no_tags_ecc ? (void *) &pt.t : (void *)&pt; + + T(YAFFS_TRACE_MTD, + (TSTR + ("nandmtd2_write_chunk_tags chunk %d data %p tags %p" + TENDSTR), nand_chunk, data, tags)); + + + addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk; + + /* For yaffs2 writing there must be both data and tags. + * If we're using inband tags, then the tags are stuffed into + * the end of the data buffer. + */ + if (!data || !tags) + BUG(); + else if (dev->param.inband_tags) { + yaffs_packed_tags2_tags_only *pt2tp; + pt2tp = (yaffs_packed_tags2_tags_only *)(data + dev->data_bytes_per_chunk); + yaffs_pack_tags2_tags_only(pt2tp, tags); + } else + yaffs_pack_tags2(&pt, tags, !dev->param.no_tags_ecc); + +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) + ops.mode = MTD_OOB_AUTO; + ops.ooblen = (dev->param.inband_tags) ? 0 : packed_tags_size; + ops.len = dev->param.total_bytes_per_chunk; + ops.ooboffs = 0; + ops.datbuf = (__u8 *)data; + ops.oobbuf = (dev->param.inband_tags) ? NULL : packed_tags_ptr; + retval = mtd->write_oob(mtd, addr, &ops); + +#else + if (!dev->param.inband_tags) { + retval = + mtd->write_ecc(mtd, addr, dev->data_bytes_per_chunk, + &dummy, data, (__u8 *) packed_tags_ptr, NULL); + } else { + retval = + mtd->write(mtd, addr, dev->param.total_bytes_per_chunk, &dummy, + data); + } +#endif + + if (retval == 0) + return YAFFS_OK; + else + return YAFFS_FAIL; +} + +int nandmtd2_read_chunk_tags(yaffs_dev_t *dev, int nand_chunk, + __u8 *data, yaffs_ext_tags *tags) +{ + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); +#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17)) + struct mtd_oob_ops ops; +#endif + size_t dummy; + int retval = 0; + int local_data = 0; + + loff_t addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk; + + yaffs_packed_tags2 pt; + + int packed_tags_size = dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt); + void * packed_tags_ptr = dev->param.no_tags_ecc ? (void *) &pt.t: (void *)&pt; + + T(YAFFS_TRACE_MTD, + (TSTR + ("nandmtd2_read_chunk_tags chunk %d data %p tags %p" + TENDSTR), nand_chunk, data, tags)); + + if (dev->param.inband_tags) { + + if (!data) { + local_data = 1; + data = yaffs_get_temp_buffer(dev, __LINE__); + } + + + } + + +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) + if (dev->param.inband_tags || (data && !tags)) + retval = mtd->read(mtd, addr, dev->param.total_bytes_per_chunk, + &dummy, data); + else if (tags) { + ops.mode = MTD_OOB_AUTO; + ops.ooblen = packed_tags_size; + ops.len = data ? dev->data_bytes_per_chunk : packed_tags_size; + ops.ooboffs = 0; + ops.datbuf = data; + ops.oobbuf = yaffs_dev_to_lc(dev)->spare_buffer; + retval = mtd->read_oob(mtd, addr, &ops); + } +#else + if (!dev->param.inband_tags && data && tags) { + + retval = mtd->read_ecc(mtd, addr, dev->data_bytes_per_chunk, + &dummy, data, dev->spare_buffer, + NULL); + } else { + if (data) + retval = + mtd->read(mtd, addr, dev->data_bytes_per_chunk, &dummy, + data); + if (!dev->param.inband_tags && tags) + retval = + mtd->read_oob(mtd, addr, mtd->oobsize, &dummy, + dev->spare_buffer); + } +#endif + + + if (dev->param.inband_tags) { + if (tags) { + yaffs_packed_tags2_tags_only *pt2tp; + pt2tp = (yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk]; + yaffs_unpack_tags2_tags_only(tags, pt2tp); + } + } else { + if (tags) { + memcpy(packed_tags_ptr, yaffs_dev_to_lc(dev)->spare_buffer, packed_tags_size); + yaffs_unpack_tags2(tags, &pt, !dev->param.no_tags_ecc); + } + } + + if (local_data) + yaffs_release_temp_buffer(dev, data, __LINE__); + + if (tags && retval == -EBADMSG && tags->ecc_result == YAFFS_ECC_RESULT_NO_ERROR) { + tags->ecc_result = YAFFS_ECC_RESULT_UNFIXED; + dev->n_ecc_unfixed++; + } + if(tags && retval == -EUCLEAN && tags->ecc_result == YAFFS_ECC_RESULT_NO_ERROR) { + tags->ecc_result = YAFFS_ECC_RESULT_FIXED; + dev->n_ecc_fixed++; + } + if (retval == 0) + return YAFFS_OK; + else + return YAFFS_FAIL; +} + +int nandmtd2_mark_block_bad(struct yaffs_dev_s *dev, int block_no) +{ + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); + int retval; + T(YAFFS_TRACE_MTD, + (TSTR("nandmtd2_mark_block_bad %d" TENDSTR), block_no)); + + retval = + mtd->block_markbad(mtd, + block_no * dev->param.chunks_per_block * + dev->param.total_bytes_per_chunk); + + if (retval == 0) + return YAFFS_OK; + else + return YAFFS_FAIL; + +} + +int nandmtd2_query_block(struct yaffs_dev_s *dev, int block_no, + yaffs_block_state_t *state, __u32 *seq_number) +{ + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); + int retval; + + T(YAFFS_TRACE_MTD, + (TSTR("nandmtd2_query_block %d" TENDSTR), block_no)); + retval = + mtd->block_isbad(mtd, + block_no * dev->param.chunks_per_block * + dev->param.total_bytes_per_chunk); + + if (retval) { + T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR))); + + *state = YAFFS_BLOCK_STATE_DEAD; + *seq_number = 0; + } else { + yaffs_ext_tags t; + nandmtd2_read_chunk_tags(dev, block_no * + dev->param.chunks_per_block, NULL, + &t); + + if (t.chunk_used) { + *seq_number = t.seq_number; + *state = YAFFS_BLOCK_STATE_NEEDS_SCANNING; + } else { + *seq_number = 0; + *state = YAFFS_BLOCK_STATE_EMPTY; + } + } + T(YAFFS_TRACE_MTD, + (TSTR("block is bad seq %d state %d" TENDSTR), *seq_number, + *state)); + + if (retval == 0) + return YAFFS_OK; + else + return YAFFS_FAIL; +} + diff --git a/drivers/staging/yaffs2/yaffs_mtdif2.h b/drivers/staging/yaffs2/yaffs_mtdif2.h new file mode 100644 index 0000000..b33b84d --- /dev/null +++ b/drivers/staging/yaffs2/yaffs_mtdif2.h @@ -0,0 +1,29 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * + * Copyright (C) 2002-2010 Aleph One Ltd. + * for Toby Churchill Ltd and Brightstar Engineering + * + * Created by Charles Manning + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 2.1 as + * published by the Free Software Foundation. + * + * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL. + */ + +#ifndef __YAFFS_MTDIF2_H__ +#define __YAFFS_MTDIF2_H__ + +#include "yaffs_guts.h" +int nandmtd2_write_chunk_tags(yaffs_dev_t *dev, int nand_chunk, + const __u8 *data, + const yaffs_ext_tags *tags); +int nandmtd2_read_chunk_tags(yaffs_dev_t *dev, int nand_chunk, + __u8 *data, yaffs_ext_tags *tags); +int nandmtd2_mark_block_bad(struct yaffs_dev_s *dev, int block_no); +int nandmtd2_query_block(struct yaffs_dev_s *dev, int block_no, + yaffs_block_state_t *state, __u32 *seq_number); + +#endif -- 1.7.3.2.146.gca209 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/