From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= Subject: [PATCHv4 5/5] mtd: gpmi: prevent creating a new BBT when blockmark swapping is disabled Date: Thu, 12 Jun 2014 15:20:45 +0200 Message-ID: <1402579245-13377-6-git-send-email-LW@KARO-electronics.de> References: <1402579245-13377-1-git-send-email-LW@KARO-electronics.de> <1402579245-13377-2-git-send-email-LW@KARO-electronics.de> <1402579245-13377-3-git-send-email-LW@KARO-electronics.de> <1402579245-13377-4-git-send-email-LW@KARO-electronics.de> <1402579245-13377-5-git-send-email-LW@KARO-electronics.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1402579245-13377-5-git-send-email-LW@KARO-electronics.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Arnd Bergmann , Artem Bityutskiy , Brian Norris , David Woodhouse , Fabio Estevam , Huang Shijie , Ian Campbell , Kumar Gala , =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= , Mark Rutland , Pawel Moll , Rob Herring , Rob Landley , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, Shawn Guo , Boris BREZILLON , Ezequie List-Id: devicetree@vger.kernel.org V2l0aG91dCBibG9ja21hcmsgc3dhcHBpbmcsIHRoZXJlIGlzIG5vIHVzZSBpbiBjcmVhdGluZyBh IEJCVCBmcm9tCnNjcmF0Y2gsIHNvIHVzZSBhIEJCVCBkZXNjcmlwdG9yIHdpdGggTkFORF9CQlRf Q1JFQVRFIHVuc2V0IGluIHRoaXMKY2FzZS4KClNpZ25lZC1vZmYtYnk6IExvdGhhciBXYcOfbWFu biA8TFdAS0FSTy1lbGVjdHJvbmljcy5kZT4KLS0tCiBkcml2ZXJzL210ZC9uYW5kL2dwbWktbmFu ZC9ncG1pLW5hbmQuYyB8ICAgMjggKysrKysrKysrKysrKysrKysrKysrKysrKysrLQogMSBmaWxl IGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL210ZC9uYW5kL2dwbWktbmFuZC9ncG1pLW5hbmQuYyBiL2RyaXZlcnMvbXRkL25hbmQv Z3BtaS1uYW5kL2dwbWktbmFuZC5jCmluZGV4IDM3NTM3YjQuLmZjNzEwZDcgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvbXRkL25hbmQvZ3BtaS1uYW5kL2dwbWktbmFuZC5jCisrKyBiL2RyaXZlcnMvbXRk L25hbmQvZ3BtaS1uYW5kL2dwbWktbmFuZC5jCkBAIC00Myw2ICs0MywyOSBAQCBzdGF0aWMgc3Ry dWN0IG5hbmRfYmJ0X2Rlc2NyIGdwbWlfYmJ0X2Rlc2NyID0gewogCS5wYXR0ZXJuCT0gc2Nhbl9m Zl9wYXR0ZXJuCiB9OwogCitzdGF0aWMgdWludDhfdCBiYnRfcGF0dGVybltdID0geydCJywgJ2In LCAndCcsICcwJyB9Oworc3RhdGljIHVpbnQ4X3QgbWlycm9yX3BhdHRlcm5bXSA9IHsnMScsICd0 JywgJ2InLCAnQicgfTsKKworc3RhdGljIHN0cnVjdCBuYW5kX2JidF9kZXNjciBiYnRfbWFpbl9u b19vb2JfZGVzY3IgPSB7CisJLm9wdGlvbnMgPSBOQU5EX0JCVF9MQVNUQkxPQ0sgfCBOQU5EX0JC VF9XUklURSB8CisJTkFORF9CQlRfMkJJVCB8IE5BTkRfQkJUX1ZFUlNJT04gfCBOQU5EX0JCVF9Q RVJDSElQIHwKKwlOQU5EX0JCVF9OT19PT0IsCisJLmxlbiA9IDQsCisJLnZlcm9mZnMgPSA0LAor CS5tYXhibG9ja3MgPSBOQU5EX0JCVF9TQ0FOX01BWEJMT0NLUywKKwkucGF0dGVybiA9IGJidF9w YXR0ZXJuLAorfTsKKworc3RhdGljIHN0cnVjdCBuYW5kX2JidF9kZXNjciBiYnRfbWlycm9yX25v X29vYl9kZXNjciA9IHsKKwkub3B0aW9ucyA9IE5BTkRfQkJUX0xBU1RCTE9DSyB8IE5BTkRfQkJU X1dSSVRFIHwKKwlOQU5EX0JCVF8yQklUIHwgTkFORF9CQlRfVkVSU0lPTiB8IE5BTkRfQkJUX1BF UkNISVAgfAorCU5BTkRfQkJUX05PX09PQiwKKwkubGVuID0gNCwKKwkudmVyb2ZmcyA9IDQsCisJ Lm1heGJsb2NrcyA9IE5BTkRfQkJUX1NDQU5fTUFYQkxPQ0tTLAorCS5wYXR0ZXJuID0gbWlycm9y X3BhdHRlcm4sCit9OworCiAvKgogICogV2UgbWF5IGNoYW5nZSB0aGUgbGF5b3V0IGlmIHdlIGNh biBnZXQgdGhlIEVDQyBpbmZvIGZyb20gdGhlIGRhdGFzaGVldCwKICAqIGVsc2Ugd2Ugd2lsbCB1 c2UgYWxsIHRoZSAocGFnZSArIE9PQikuCkBAIC0xNzI4LDggKzE3NTEsMTEgQEAgc3RhdGljIGlu dCBncG1pX25hbmRfaW5pdChzdHJ1Y3QgZ3BtaV9uYW5kX2RhdGEgKnRoaXMpCiAJCQljaGlwLT5i YnRfb3B0aW9ucyB8PSBOQU5EX0JCVF9OT19PT0JfQkJNOwogCiAJCWlmIChvZl9wcm9wZXJ0eV9y ZWFkX2Jvb2wodGhpcy0+ZGV2LT5vZl9ub2RlLAotCQkJCQkJImZzbCxuby1ibG9ja21hcmstc3dh cCIpKQorCQkJCQkJImZzbCxuby1ibG9ja21hcmstc3dhcCIpKSB7CiAJCQl0aGlzLT5zd2FwX2Js b2NrX21hcmsgPSBmYWxzZTsKKwkJCWNoaXAtPmJidF90ZCA9ICZiYnRfbWFpbl9ub19vb2JfZGVz Y3I7CisJCQljaGlwLT5iYnRfbWQgPSAmYmJ0X21pcnJvcl9ub19vb2JfZGVzY3I7CisJCX0KIAl9 CiAJZGV2X2RiZyh0aGlzLT5kZXYsICJCbG9ja21hcmsgc3dhcHBpbmcgJXNhYmxlZFxuIiwKIAkJ dGhpcy0+c3dhcF9ibG9ja19tYXJrID8gImVuIiA6ICJkaXMiKTsKLS0gCjEuNy4xMC40CgoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtl cm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0 dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5l bAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= To: Arnd Bergmann , Artem Bityutskiy , Brian Norris , David Woodhouse , Fabio Estevam , Huang Shijie , Ian Campbell , Kumar Gala , =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= , Mark Rutland , Pawel Moll , Rob Herring , Rob Landley , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, Shawn Guo , Boris BREZILLON , Ezequiel Garcia , Grant Likely , Jingoo Han , Michael Grzeschik , Michael Opdenacker , Wei Yongjun Subject: [PATCHv4 5/5] mtd: gpmi: prevent creating a new BBT when blockmark swapping is disabled Date: Thu, 12 Jun 2014 15:20:45 +0200 Message-Id: <1402579245-13377-6-git-send-email-LW@KARO-electronics.de> In-Reply-To: <1402579245-13377-5-git-send-email-LW@KARO-electronics.de> References: <1402579245-13377-1-git-send-email-LW@KARO-electronics.de> <1402579245-13377-2-git-send-email-LW@KARO-electronics.de> <1402579245-13377-3-git-send-email-LW@KARO-electronics.de> <1402579245-13377-4-git-send-email-LW@KARO-electronics.de> <1402579245-13377-5-git-send-email-LW@KARO-electronics.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Without blockmark swapping, there is no use in creating a BBT from scratch, so use a BBT descriptor with NAND_BBT_CREATE unset in this case. Signed-off-by: Lothar Waßmann --- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index 37537b4..fc710d7 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c @@ -43,6 +43,29 @@ static struct nand_bbt_descr gpmi_bbt_descr = { .pattern = scan_ff_pattern }; +static uint8_t bbt_pattern[] = {'B', 'b', 't', '0' }; +static uint8_t mirror_pattern[] = {'1', 't', 'b', 'B' }; + +static struct nand_bbt_descr bbt_main_no_oob_descr = { + .options = NAND_BBT_LASTBLOCK | NAND_BBT_WRITE | + NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP | + NAND_BBT_NO_OOB, + .len = 4, + .veroffs = 4, + .maxblocks = NAND_BBT_SCAN_MAXBLOCKS, + .pattern = bbt_pattern, +}; + +static struct nand_bbt_descr bbt_mirror_no_oob_descr = { + .options = NAND_BBT_LASTBLOCK | NAND_BBT_WRITE | + NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP | + NAND_BBT_NO_OOB, + .len = 4, + .veroffs = 4, + .maxblocks = NAND_BBT_SCAN_MAXBLOCKS, + .pattern = mirror_pattern, +}; + /* * We may change the layout if we can get the ECC info from the datasheet, * else we will use all the (page + OOB). @@ -1728,8 +1751,11 @@ static int gpmi_nand_init(struct gpmi_nand_data *this) chip->bbt_options |= NAND_BBT_NO_OOB_BBM; if (of_property_read_bool(this->dev->of_node, - "fsl,no-blockmark-swap")) + "fsl,no-blockmark-swap")) { this->swap_block_mark = false; + chip->bbt_td = &bbt_main_no_oob_descr; + chip->bbt_md = &bbt_mirror_no_oob_descr; + } } dev_dbg(this->dev, "Blockmark swapping %sabled\n", this->swap_block_mark ? "en" : "dis"); -- 1.7.10.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: LW@KARO-electronics.de (=?UTF-8?q?Lothar=20Wa=C3=9Fmann?=) Date: Thu, 12 Jun 2014 15:20:45 +0200 Subject: [PATCHv4 5/5] mtd: gpmi: prevent creating a new BBT when blockmark swapping is disabled In-Reply-To: <1402579245-13377-5-git-send-email-LW@KARO-electronics.de> References: <1402579245-13377-1-git-send-email-LW@KARO-electronics.de> <1402579245-13377-2-git-send-email-LW@KARO-electronics.de> <1402579245-13377-3-git-send-email-LW@KARO-electronics.de> <1402579245-13377-4-git-send-email-LW@KARO-electronics.de> <1402579245-13377-5-git-send-email-LW@KARO-electronics.de> Message-ID: <1402579245-13377-6-git-send-email-LW@KARO-electronics.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Without blockmark swapping, there is no use in creating a BBT from scratch, so use a BBT descriptor with NAND_BBT_CREATE unset in this case. Signed-off-by: Lothar Wa?mann --- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index 37537b4..fc710d7 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c @@ -43,6 +43,29 @@ static struct nand_bbt_descr gpmi_bbt_descr = { .pattern = scan_ff_pattern }; +static uint8_t bbt_pattern[] = {'B', 'b', 't', '0' }; +static uint8_t mirror_pattern[] = {'1', 't', 'b', 'B' }; + +static struct nand_bbt_descr bbt_main_no_oob_descr = { + .options = NAND_BBT_LASTBLOCK | NAND_BBT_WRITE | + NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP | + NAND_BBT_NO_OOB, + .len = 4, + .veroffs = 4, + .maxblocks = NAND_BBT_SCAN_MAXBLOCKS, + .pattern = bbt_pattern, +}; + +static struct nand_bbt_descr bbt_mirror_no_oob_descr = { + .options = NAND_BBT_LASTBLOCK | NAND_BBT_WRITE | + NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP | + NAND_BBT_NO_OOB, + .len = 4, + .veroffs = 4, + .maxblocks = NAND_BBT_SCAN_MAXBLOCKS, + .pattern = mirror_pattern, +}; + /* * We may change the layout if we can get the ECC info from the datasheet, * else we will use all the (page + OOB). @@ -1728,8 +1751,11 @@ static int gpmi_nand_init(struct gpmi_nand_data *this) chip->bbt_options |= NAND_BBT_NO_OOB_BBM; if (of_property_read_bool(this->dev->of_node, - "fsl,no-blockmark-swap")) + "fsl,no-blockmark-swap")) { this->swap_block_mark = false; + chip->bbt_td = &bbt_main_no_oob_descr; + chip->bbt_md = &bbt_mirror_no_oob_descr; + } } dev_dbg(this->dev, "Blockmark swapping %sabled\n", this->swap_block_mark ? "en" : "dis"); -- 1.7.10.4