From patchwork Tue Mar 25 08:19:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 27011 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D9BE520062 for ; Tue, 25 Mar 2014 08:47:09 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id to1sf516410ieb.1 for ; Tue, 25 Mar 2014 01:47:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=DDFCBDK+x9l+rjAV8NwWrvYHIPn48S5n84q5KeB2+Qo=; b=PzXMhbxav8jtwn3lKFz3uFQX/PkQfD4C4LXewJtEcgOnmGd2l9VXF3P3+I6Oq9GfCk dSfWqnpjzYXcvzyhfS3RDng75AwHQhqvXyRYjbXpr6YJxEG3W7/v69kwHrCwZ/4OVC3T fua2wHK4b+WOaKZkRBZTBUVULQEL6aLELcQPyOzjvO2+A9Yj9/8eP8SM2s0Zhqurd0hU NjJMa075vYpoC4WwVf7CqiGhV5kL3faZPXI6hhNuate/+v21tu1zy5tATloWs7SQxKMh 2chdUANxHmHg6mD1WoXWp9GA8tO/GNJeokMdHPOBfQ8NsZuAttbZaqLW4QXu7FOS8aSi IU9A== X-Gm-Message-State: ALoCoQlYUDVpD4CxJrloVbULPnnbvr5ZZJemP2hwZvSrmjdAs2Bl91A4mD8OQLdpJ2U10xZp8s7Q X-Received: by 10.182.66.193 with SMTP id h1mr4816873obt.47.1395737229363; Tue, 25 Mar 2014 01:47:09 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.97.72 with SMTP id l66ls134720qge.16.gmail; Tue, 25 Mar 2014 01:47:09 -0700 (PDT) X-Received: by 10.58.133.15 with SMTP id oy15mr52665520veb.19.1395737229278; Tue, 25 Mar 2014 01:47:09 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id xo2si3591785vec.116.2014.03.25.01.47.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Mar 2014 01:47:09 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id il7so157558vcb.32 for ; Tue, 25 Mar 2014 01:47:09 -0700 (PDT) X-Received: by 10.58.207.74 with SMTP id lu10mr53639000vec.15.1395737229182; Tue, 25 Mar 2014 01:47:09 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp286705vck; Tue, 25 Mar 2014 01:47:08 -0700 (PDT) X-Received: by 10.180.207.10 with SMTP id ls10mr21831843wic.22.1395737227584; Tue, 25 Mar 2014 01:47:07 -0700 (PDT) Received: from casper.infradead.org (casper.infradead.org. [85.118.1.10]) by mx.google.com with ESMTPS id ca6si3028840wib.73.2014.03.25.01.47.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Mar 2014 01:47:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 85.118.1.10 as permitted sender) client-ip=85.118.1.10; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSMzm-0004YD-2J; Tue, 25 Mar 2014 08:46:06 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSMze-00042k-Qg; Tue, 25 Mar 2014 08:45:58 +0000 Received: from bombadil.infradead.org ([2001:1868:205::9]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSMsR-0003B8-Q1 for linux-arm-kernel@merlin.infradead.org; Tue, 25 Mar 2014 08:38:31 +0000 Received: from mail-we0-f169.google.com ([74.125.82.169]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSMbR-000250-Uj for linux-arm-kernel@lists.infradead.org; Tue, 25 Mar 2014 08:20:58 +0000 Received: by mail-we0-f169.google.com with SMTP id w62so80056wes.14 for ; Tue, 25 Mar 2014 01:20:34 -0700 (PDT) X-Received: by 10.180.72.239 with SMTP id g15mr21509094wiv.45.1395735634869; Tue, 25 Mar 2014 01:20:34 -0700 (PDT) Received: from lee--X1.home (host109-148-113-193.range109-148.btcentralplus.com. [109.148.113.193]) by mx.google.com with ESMTPSA id k4sm5567676wib.19.2014.03.25.01.20.33 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Mar 2014 01:20:34 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RFC 09/47] mtd: nand: stm_nand_bch: introduce and initialise some important data structures Date: Tue, 25 Mar 2014 08:19:26 +0000 Message-Id: <1395735604-26706-10-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395735604-26706-1-git-send-email-lee.jones@linaro.org> References: <1395735604-26706-1-git-send-email-lee.jones@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140325_012058_155709_7F2CF3FD X-CRM114-Status: GOOD ( 14.02 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.169 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record Cc: angus.clark@st.com, kernel@stlinux.com, lee.jones@linaro.org, linux-mtd@lists.infradead.org, pekon@ti.com, computersforpeace@gmail.com, dwmw2@infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Provide some more in-depth structures which will be used heavily within the driver. We also add a convenience function, used to set the default values. Signed-off-by: Lee Jones --- drivers/mtd/nand/stm_nand_bch.c | 76 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/drivers/mtd/nand/stm_nand_bch.c b/drivers/mtd/nand/stm_nand_bch.c index cc0159e..7333ad6 100644 --- a/drivers/mtd/nand/stm_nand_bch.c +++ b/drivers/mtd/nand/stm_nand_bch.c @@ -21,10 +21,30 @@ #include #include #include +#include #include #include "stm_nand_regs.h" +/* Bad Block Table (BBT) */ +struct nandi_bbt_info { + uint32_t bbt_size; /* Size of bad-block table */ + uint32_t bbt_vers[2]; /* Version (Primary/Mirror) */ + uint32_t bbt_block[2]; /* Block No. (Primary/Mirror) */ + uint8_t *bbt; /* Table data */ +}; + +/* Collection of MTD/NAND device information */ +struct nandi_info { + struct mtd_info mtd; /* MTD info */ + struct nand_chip chip; /* NAND chip info */ + + struct nand_ecclayout ecclayout; /* MTD ECC layout */ + struct nandi_bbt_info bbt_info; /* Bad Block Table */ + int nr_parts; /* Number of MTD partitions */ + struct mtd_partition *parts; /* MTD partitions */ +}; + /* NANDi Controller (Hamming/BCH) */ struct nandi_controller { void __iomem *base; /* Controller base*/ @@ -60,6 +80,8 @@ struct nandi_controller { int cached_page; /* page number of page in */ /* 'page_buf' */ + + struct nandi_info info; /* NAND device info */ }; /* @@ -107,6 +129,46 @@ static void nandi_disable_interrupts(struct nandi_controller *nandi, writel(val, nandi->base + NANDBCH_INT_EN); } +static void nandi_set_mtd_defaults(struct nandi_controller *nandi, + struct mtd_info *mtd, struct nand_chip *chip) +{ + struct nandi_info *info = &nandi->info; + int i; + + /* ecclayout */ + info->ecclayout.eccbytes = mtd->oobsize; + for (i = 0; i < 64; i++) + info->ecclayout.eccpos[i] = i; + info->ecclayout.oobfree[0].offset = 0; + info->ecclayout.oobfree[0].length = 0; + info->ecclayout.oobavail = 0; + + /* nand_chip */ + chip->controller = &chip->hwcontrol; + spin_lock_init(&chip->controller->lock); + init_waitqueue_head(&chip->controller->wq); + chip->state = FL_READY; + chip->priv = nandi; + chip->ecc.layout = &info->ecclayout; + + /* mtd_info */ + mtd->owner = THIS_MODULE; + mtd->type = MTD_NANDFLASH; + mtd->flags = MTD_CAP_NANDFLASH; + mtd->ecclayout = &info->ecclayout; + mtd->oobavail = 0; + mtd->subpage_sft = 0; + + mtd->_point = NULL; + mtd->_unpoint = NULL; + mtd->_lock = NULL; + mtd->_unlock = NULL; + + mtd->_sync = nand_sync; + mtd->_suspend = nand_suspend; + mtd->_resume = nand_resume; +} + static void nandi_clk_enable(struct nandi_controller *nandi) { if (nandi->emi_clk) @@ -271,7 +333,11 @@ static int stm_nand_bch_probe(struct platform_device *pdev) { struct stm_plat_nand_bch_data *pdata = pdev->dev.platform_data; struct stm_nand_bank_data *bank; + struct nandi_bbt_info *bbt_info; struct nandi_controller *nandi; + struct nandi_info *info; + struct nand_chip *chip; + struct mtd_info *mtd; if (!pdata) { dev_err(&pdev->dev, "no platform data found\n"); @@ -291,6 +357,16 @@ static int stm_nand_bch_probe(struct platform_device *pdev) if (bank) nandi_init_controller(nandi, bank->csn); + info = &nandi->info; + chip = &info->chip; + bbt_info = &info->bbt_info; + mtd = &info->mtd; + mtd->priv = chip; + mtd->name = dev_name(&pdev->dev); + mtd->dev.parent = &pdev->dev; + + nandi_set_mtd_defaults(nandi, mtd, chip); + return 0; }