{"id":902007,"url":"http://patchwork.ozlabs.org/api/patches/902007/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20180420155314.8920-8-stefan@agner.ch/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20180420155314.8920-8-stefan@agner.ch>","list_archive_url":null,"date":"2018-04-20T15:53:12","name":"[U-Boot,v1,7/9] mtd: nand: mxs_nand: add support for specific ECC strength","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"36db3ceed7df0c691ca46d9346efc46836fa4d71","submitter":{"id":4137,"url":"http://patchwork.ozlabs.org/api/people/4137/?format=json","name":"Stefan Agner","email":"stefan@agner.ch"},"delegate":{"id":1693,"url":"http://patchwork.ozlabs.org/api/users/1693/?format=json","username":"sbabic","first_name":"Stefano","last_name":"Babic","email":"sbabic@denx.de"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20180420155314.8920-8-stefan@agner.ch/mbox/","series":[{"id":40110,"url":"http://patchwork.ozlabs.org/api/series/40110/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=40110","date":"2018-04-20T15:53:05","name":"mtd: nand: mxs_nand: add device tree support","version":1,"mbox":"http://patchwork.ozlabs.org/series/40110/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/902007/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/902007/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=agner.ch","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tsecure) header.d=agner.ch header.i=@agner.ch header.b=\"wRmQdKZ3\";\n\tdkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 40SL9p70Glz9s27\n\tfor ;\n\tSat, 21 Apr 2018 01:58:22 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid A9577C21DA1; Fri, 20 Apr 2018 15:55:46 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id ADC7BC21E16;\n\tFri, 20 Apr 2018 15:54:32 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 41E77C21C27; Fri, 20 Apr 2018 15:54:30 +0000 (UTC)","from mail.kmu-office.ch (mail.kmu-office.ch [178.209.48.109])\n\tby lists.denx.de (Postfix) with ESMTPS id 456EDC21DB6\n\tfor ; Fri, 20 Apr 2018 15:54:26 +0000 (UTC)","from trochilidae.toradex.int (unknown [IPv6:2001:1620:c6e:10::3])\n\tby mail.kmu-office.ch (Postfix) with ESMTPSA id B4E825C1775;\n\tFri, 20 Apr 2018 17:54:25 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED,\n\tSPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no\n\tversion=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=agner.ch; s=dkim;\n\tt=1524239666;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:content-type:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=r/uG1i1RR1c+zx1G9oHGR6yIAx/2u4EIaGzTQYGzKqI=;\n\tb=wRmQdKZ37DHWqRYt8nhOXW/WH2iQPSWRn3ANp6gJhwqFc/DvpW9wLiqOorGVvckMPduqnj\n\trs6v/Kl1rNtdrz22KAcluc2mCsu87eWp4mcJEB8uH7qGrtEwf0+L8PWlTSIx+99kpIAKll\n\tDzg5VgxYJD005YJ3cMCGqttaL+Cgyak=","From":"Stefan Agner ","To":"u-boot@lists.denx.de, Stefano Babic , oss@buserror.net","Date":"Fri, 20 Apr 2018 17:53:12 +0200","Message-Id":"<20180420155314.8920-8-stefan@agner.ch>","X-Mailer":"git-send-email 2.17.0","In-Reply-To":"<20180420155314.8920-1-stefan@agner.ch>","References":"<20180420155314.8920-1-stefan@agner.ch>","X-Spamd-Result":"default: False [-2.10 / 15.00]; RCVD_TLS_ALL(0.00)[];\n\tASN(0.00)[asn:13030, ipnet:2001:1620::/32, country:CH];\n\tRCVD_COUNT_ZERO(0.00)[0]; FROM_HAS_DN(0.00)[];\n\tMID_CONTAINS_FROM(1.00)[]; TO_DN_SOME(0.00)[];\n\tMIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[];\n\tTO_MATCH_ENVRCPT_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%];\n\tARC_NA(0.00)[]; DKIM_SIGNED(0.00)[]; RCPT_COUNT_SEVEN(0.00)[10]","Cc":"marex@denx.de, Stefan Agner ,\n\tMarcel Ziswiler ,\n\tMax Krummenacher , han.xu@nxp.com","Subject":"[U-Boot] [PATCH v1 7/9] mtd: nand: mxs_nand: add support for\n\tspecific ECC strength","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"From: Stefan Agner \n\nAdd support for specified ECC strength/size using device tree\nproperties nand-ecc-strength/nand-ecc-step-size.\n\nThis aligns behavior with the mainline driver, such that:\n- If fsl,use-minimal-ecc is requested it will use data from\n data sheet/ONFI. If this is not available the driver will fail.\n- If nand-ecc-strength/nand-ecc-step-size are specified those\n value will be used.\n- By default maximum possible ECC strength is used\n\nSigned-off-by: Stefan Agner \n---\n\n drivers/mtd/nand/mxs_nand.c | 44 +++++++++++++++++++++++++------------\n 1 file changed, 30 insertions(+), 14 deletions(-)","diff":"diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c\nindex 8c3f4f1871..746444d3fd 100644\n--- a/drivers/mtd/nand/mxs_nand.c\n+++ b/drivers/mtd/nand/mxs_nand.c\n@@ -162,15 +162,14 @@ static inline int mxs_nand_calc_mark_offset(struct bch_geometry *geo,\n }\n \n static inline int mxs_nand_calc_ecc_layout_by_info(struct bch_geometry *geo,\n-\t\t\t\t\t\t struct mtd_info *mtd)\n+\t\t\t\t\t\t struct mtd_info *mtd,\n+\t\t\t\t\t\t unsigned int ecc_strength,\n+\t\t\t\t\t\t unsigned int ecc_step)\n {\n \tstruct nand_chip *chip = mtd_to_nand(mtd);\n \tstruct mxs_nand_info *nand_info = nand_get_controller_data(chip);\n \n-\tif (!(chip->ecc_strength_ds > 0 && chip->ecc_step_ds > 0))\n-\t\treturn -ENOTSUPP;\n-\n-\tswitch (chip->ecc_step_ds) {\n+\tswitch (ecc_step) {\n \tcase SZ_512:\n \t\tgeo->gf_len = 13;\n \t\tbreak;\n@@ -181,8 +180,8 @@ static inline int mxs_nand_calc_ecc_layout_by_info(struct bch_geometry *geo,\n \t\treturn -EINVAL;\n \t}\n \n-\tgeo->ecc_chunk_size = chip->ecc_step_ds;\n-\tgeo->ecc_strength = round_up(chip->ecc_strength_ds, 2);\n+\tgeo->ecc_chunk_size = ecc_step;\n+\tgeo->ecc_strength = round_up(ecc_strength, 2);\n \n \t/* Keep the C >= O */\n \tif (geo->ecc_chunk_size < mtd->oobsize)\n@@ -965,6 +964,28 @@ static int mxs_nand_block_bad(struct mtd_info *mtd, loff_t ofs)\n \treturn 0;\n }\n \n+static int mxs_nand_set_geometry(struct mtd_info *mtd, struct bch_geometry *geo)\n+{\n+\tstruct nand_chip *chip = mtd_to_nand(mtd);\n+\tstruct nand_chip *nand = mtd_to_nand(mtd);\n+\tstruct mxs_nand_info *nand_info = nand_get_controller_data(nand);\n+\n+\tif (chip->ecc.strength > 0 && chip->ecc.size > 0)\n+\t\treturn mxs_nand_calc_ecc_layout_by_info(geo, mtd,\n+\t\t\t\tchip->ecc.strength, chip->ecc.size);\n+\n+\tif (nand_info->use_minimum_ecc ||\n+\t\tmxs_nand_calc_ecc_layout(geo, mtd)) {\n+\t\tif (!(chip->ecc_strength_ds > 0 && chip->ecc_step_ds > 0))\n+\t\t\treturn -EINVAL;\n+\n+\t\treturn mxs_nand_calc_ecc_layout_by_info(geo, mtd,\n+\t\t\t\tchip->ecc_strength_ds, chip->ecc_step_ds);\n+\t}\n+\n+\treturn 0;\n+}\n+\n /*\n * At this point, the physical NAND Flash chips have been identified and\n * counted, so we know the physical geometry. This enables us to make some\n@@ -981,14 +1002,9 @@ static int mxs_nand_setup_ecc(struct mtd_info *mtd)\n \tstruct bch_geometry *geo = &nand_info->bch_geometry;\n \tstruct mxs_bch_regs *bch_regs = nand_info->bch_regs;\n \tuint32_t tmp;\n-\tint ret = -ENOTSUPP;\n-\n-\tif (nand_info->use_minimum_ecc)\n-\t\tret = mxs_nand_calc_ecc_layout_by_info(geo, mtd);\n-\n-\tif (ret == -ENOTSUPP)\n-\t\tret = mxs_nand_calc_ecc_layout(geo, mtd);\n+\tint ret;\n \n+\tret = mxs_nand_set_geometry(mtd, geo);\n \tif (ret)\n \t\treturn ret;\n \n","prefixes":["U-Boot","v1","7/9"]}