From patchwork Fri Jan 29 14:51:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 43922 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F29D4B7D14 for ; Sat, 30 Jan 2010 01:53:34 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NasCP-0001Ja-2P; Fri, 29 Jan 2010 14:51:53 +0000 Received: from mail-bw0-f212.google.com ([209.85.218.212]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NasC9-00011c-9u for linux-mtd@lists.infradead.org; Fri, 29 Jan 2010 14:51:41 +0000 Received: by mail-bw0-f212.google.com with SMTP id 4so1893203bwz.2 for ; Fri, 29 Jan 2010 06:51:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=oHUHRQb0MRfYKgKanhaQdpL27XhmvNMpUUiBHfiXuQ8=; b=hgF06uPmuTB8d72YmiUufpAJJXBjzVRusCXuld5WlEzLVZ2wH7Rh56ywES53lRqlJK qZfr3W9S+iSaujmvCcj3Ek5LoWj616Y5vn3tvv/kGuIWnoaZxOF6GLtB66l0PgqUr3fN /YRtAPNzY8daeg/1CokV6oGxaEJhAedWbRwLQ= 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=Wz3MpMTCcfIfmGBiqLG/7ZuHhcEP01dwbC3wvv7i8FuX3YlN0VyilKLV2V5Cu4QNHT MbUZ4NX5jAacZESpwAXlgBYAasA7HZD9qRzzX1+SwRf8j+pJ4FlcTM/e5iZscREEYauS p0NuFqmMLJ0NvFp/1Nw0pbYpawxkR7AwiU9dg= Received: by 10.204.30.214 with SMTP id v22mr576202bkc.58.1264776696909; Fri, 29 Jan 2010 06:51:36 -0800 (PST) Received: from localhost.localdomain (IGLD-84-229-248-49.inter.net.il [84.229.248.49]) by mx.google.com with ESMTPS id 16sm937528bwz.3.2010.01.29.06.51.35 (version=SSLv3 cipher=RC4-MD5); Fri, 29 Jan 2010 06:51:36 -0800 (PST) From: Maxim Levitsky To: linux-mtd Subject: [PATCH 14/16] MTD: add few workarounds to nand system for SmartMedia/xD chips. Date: Fri, 29 Jan 2010 16:51:01 +0200 Message-Id: <1264776663-7042-15-git-send-email-maximlevitsky@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1264776663-7042-1-git-send-email-maximlevitsky@gmail.com> References: <1264776663-7042-1-git-send-email-maximlevitsky@gmail.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100129_095137_464290_D4A30BC2 X-CRM114-Status: GOOD ( 23.72 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.2.5 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- _SUMMARY_ Cc: Maxim Levitsky X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org * 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 --- drivers/mtd/nand/nand_base.c | 30 ++++++++++++++++++++++-------- drivers/mtd/nand/nand_ids.c | 39 +++++++++++++++++++++++++++++++++++++++ include/linux/mtd/nand.h | 11 +++++++++++ 3 files changed, 72 insertions(+), 8 deletions(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 3949d8c..093b868 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -397,9 +397,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; } /** @@ -2622,14 +2631,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 (i = 0; type->name != NULL; type++) + if (dev_id == type->id) break; - } - } - if (!type) + if (!type->name) return ERR_PTR(-ENODEV); if (!mtd->name) @@ -2986,7 +2999,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/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 8c2333a..bb25cd8 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 @@ -458,6 +468,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);