lkml.org 
[lkml]   [2010]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/14] MTD: add few workarounds to nand system for SmartMedia/xD chips.
    Date
    * Add an option NAND_SMARTMEDIA that can be set by nand driver
    If set, it will cause separate ID table to be used, which includes
    mask rom devices and new xD cards

    * Workaround for wrong write protect status on some xD cards

    Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
    ---
    drivers/mtd/nand/nand_base.c | 32 +++++++++++++++++++++++---------
    drivers/mtd/nand/nand_ids.c | 39 +++++++++++++++++++++++++++++++++++++++
    drivers/mtd/nand/sm_common.c | 2 +-
    include/linux/mtd/nand.h | 11 +++++++++++
    4 files changed, 74 insertions(+), 10 deletions(-)

    diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
    index 88750a6..bbdb8ff 100644
    --- a/drivers/mtd/nand/nand_base.c
    +++ b/drivers/mtd/nand/nand_base.c
    @@ -405,9 +405,18 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
    static int nand_check_wp(struct mtd_info *mtd)
    {
    struct nand_chip *chip = mtd->priv;
    + int wp;
    +
    + /* broken xD cards report WP despite beeing writable */
    + if (chip->options & NAND_BROKEN_XD)
    + return 0;
    +
    /* Check the WP bit */
    chip->cmdfunc(mtd, NAND_CMD_STATUS, -1, -1);
    - return (chip->read_byte(mtd) & NAND_STATUS_WP) ? 0 : 1;
    + wp = (chip->read_byte(mtd) & NAND_STATUS_WP) ? 0 : 1;
    +
    +
    + return wp;
    }

    /**
    @@ -2595,7 +2604,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
    int busw, int *maf_id)
    {
    struct nand_flash_dev *type = NULL;
    - int i, dev_id, maf_idx;
    + int dev_id, maf_idx;
    int tmp_id, tmp_manf;

    /* Select the device */
    @@ -2635,14 +2644,18 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
    }

    /* Lookup the flash id */
    - for (i = 0; nand_flash_ids[i].name != NULL; i++) {
    - if (dev_id == nand_flash_ids[i].id) {
    - type = &nand_flash_ids[i];
    +#ifdef CONFIG_MTD_NAND_SMARTMEDIA
    + if (chip->options & NAND_SMARTMEDIA)
    + type = nand_smartmedia_flash_ids;
    + else
    +#endif
    + type = nand_flash_ids;
    +
    + for (; type->name != NULL; type++)
    + if (dev_id == type->id)
    break;
    - }
    - }

    - if (!type)
    + if (!type->name)
    return ERR_PTR(-ENODEV);

    if (!mtd->name)
    @@ -3000,7 +3013,8 @@ int nand_scan_tail(struct mtd_info *mtd)

    /* Fill in remaining MTD driver data */
    mtd->type = MTD_NANDFLASH;
    - mtd->flags = MTD_CAP_NANDFLASH;
    + mtd->flags = chip->options & NAND_ROM ? MTD_CAP_ROM :
    + MTD_CAP_NANDFLASH;
    mtd->erase = nand_erase;
    mtd->point = NULL;
    mtd->unpoint = NULL;
    diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
    index 69ee2c9..f9e72d5 100644
    --- a/drivers/mtd/nand/nand_ids.c
    +++ b/drivers/mtd/nand/nand_ids.c
    @@ -127,6 +127,45 @@ struct nand_flash_dev nand_flash_ids[] = {
    {NULL,}
    };

    +#ifdef CONFIG_MTD_NAND_SMARTMEDIA
    +struct nand_flash_dev nand_smartmedia_flash_ids[] = {
    +
    + /* SmartMedia */
    + {"SmartMedia 1MiB 5V", 0x6e, 256, 1, 0x1000, 0},
    + {"SmartMedia 1MiB 3,3V", 0xe8, 256, 1, 0x1000, 0},
    + {"SmartMedia 1MiB 3,3V", 0xec, 256, 1, 0x1000, 0},
    + {"SmartMedia 2MiB 3,3V", 0xea, 256, 2, 0x1000, 0},
    + {"SmartMedia 2MiB 5V", 0x64, 256, 2, 0x1000, 0},
    + {"SmartMedia 2MiB 3,3V ROM", 0x5d, 512, 2, 0x2000, NAND_ROM},
    + {"SmartMedia 4MiB 3,3V", 0xe3, 512, 4, 0x2000, 0},
    + {"SmartMedia 4MiB 3,3/5V", 0xe5, 512, 4, 0x2000, 0},
    + {"SmartMedia 4MiB 5V", 0x6b, 512, 4, 0x2000, 0},
    + {"SmartMedia 4MiB 3,3V ROM", 0xd5, 512, 4, 0x2000, NAND_ROM},
    + {"SmartMedia 8MiB 3,3V", 0xe6, 512, 8, 0x2000, 0},
    + {"SmartMedia 8MiB 3,3V ROM", 0xd6, 512, 8, 0x2000, NAND_ROM},
    +
    +#define XD_TYPEM (NAND_NO_AUTOINCR | NAND_BROKEN_XD)
    + /* xD / SmartMedia */
    + {"SmartMedia/xD 16MiB 3,3V", 0x73, 512, 16, 0x4000, 0},
    + {"SmartMedia 16MiB 3,3V ROM", 0x57, 512, 16, 0x4000, NAND_ROM},
    + {"SmartMedia/xD 32MiB 3,3V", 0x75, 512, 32, 0x4000, 0},
    + {"SmartMedia 32MiB 3,3V ROM", 0x58, 512, 32, 0x4000, NAND_ROM},
    + {"SmartMedia/xD 64MiB 3,3V", 0x76, 512, 64, 0x4000, 0},
    + {"SmartMedia 64MiB 3,3V ROM", 0xd9, 512, 64, 0x4000, NAND_ROM},
    + {"SmartMedia/xD 128MiB 3,3V", 0x79, 512, 128, 0x4000, 0},
    + {"SmartMedia 128MiB 3,3V ROM", 0xda, 512, 128, 0x4000, NAND_ROM},
    + {"SmartMedia/xD 256MiB 3,3V", 0x71, 512, 256, 0x4000, XD_TYPEM},
    + {"SmartMedia 256MiB 3,3V ROM", 0x5b, 512, 256, 0x4000, NAND_ROM},
    +
    + /* xD only */
    + {"xD 512MiB 3,3V", 0xDC, 512, 512, 0x4000, XD_TYPEM},
    + {"xD 1GiB 3,3V", 0xD3, 512, 1024, 0x4000, XD_TYPEM},
    + {"xD 2GiB 3,3V", 0xD5, 512, 2048, 0x4000, XD_TYPEM},
    + {NULL,}
    +};
    +EXPORT_SYMBOL(nand_smartmedia_flash_ids);
    +#endif
    +
    /*
    * Manufacturer ID list
    */
    diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c
    index bc9614a..8c711c1 100644
    --- a/drivers/mtd/nand/sm_common.c
    +++ b/drivers/mtd/nand/sm_common.c
    @@ -20,7 +20,7 @@ static struct nand_ecclayout nand_oob_sm = {
    }
    };

    -/* NOTE: This layout is is not compatabable with SmartMedia, *
    +/* NOTE: This layout is is not compatabable with SmartMedia, */
    /* because the 256 byte devices have page depenent oob layout */
    /* However it does preserve the bad block markers */
    /* If you use smftl, it will bypass this and work correctly */
    diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
    index 27d998e..662e105 100644
    --- a/include/linux/mtd/nand.h
    +++ b/include/linux/mtd/nand.h
    @@ -170,6 +170,12 @@ typedef enum {
    /* Chip does not allow subpage writes */
    #define NAND_NO_SUBPAGE_WRITE 0x00000200

    +/* Device is one of 'new' xD cards that expose fake nand command set */
    +#define NAND_BROKEN_XD 0x00000400
    +
    +/* Device behaves just like nand, but is readonly */
    +#define NAND_ROM 0x00000800
    +
    /* Options valid for Samsung large page devices */
    #define NAND_SAMSUNG_LP_OPTIONS \
    (NAND_NO_PADDING | NAND_CACHEPRG | NAND_COPYBACK)
    @@ -195,9 +201,13 @@ typedef enum {
    /* This option is defined if the board driver allocates its own buffers
    (e.g. because it needs them DMA-coherent */
    #define NAND_OWN_BUFFERS 0x00040000
    +
    /* Chip may not exist, so silence any errors in scan */
    #define NAND_SCAN_SILENT_NODEV 0x00080000

    +/* controller supports only xD/SmartMedia cards*/
    +#define NAND_SMARTMEDIA 0x00100000
    +
    /* Options set by nand scan */
    /* Nand scan has allocated controller struct */
    #define NAND_CONTROLLER_ALLOC 0x80000000
    @@ -459,6 +469,7 @@ struct nand_manufacturers {
    };

    extern struct nand_flash_dev nand_flash_ids[];
    +extern struct nand_flash_dev nand_smartmedia_flash_ids[];
    extern struct nand_manufacturers nand_manuf_ids[];

    extern int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd);
    --
    1.6.3.3


    \
     
     \ /
      Last update: 2010-02-13 14:07    [W:0.032 / U:0.824 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site