From patchwork Mon Jul 10 12:42:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 13306931 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 684D2EB64DA for ; Mon, 10 Jul 2023 12:42:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:References:Cc:To:Subject: From:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yRpQA67oqqZSTF6BS/pG3xSRUN5zKE1N1K3bG9AEgNA=; b=IfQBQucTx/SsHv D+IO1GaB6aN6htdT3xDP2HM96KoeHrYaxcUgsm8rl2nqW7XCqvHP5hLe+VIIesT81sjxI9N7+L35r /MHKrHs8XwFVCQMUy1JspHCQdfutfVYHgnEn9xk1TF3KHU3oHprgsOuNQoX2M+y4nqiqfJIkh6sZw h6e6CF209N9tzKuH+cArUG1xhhVTSoZ77HK/wAg1nq619tIPE8XZUgB2sv2uIwws1Oxg83cd2mabM CTat6jhU0IZN6G0gF8d/3I4oEUIuNPnxcFNqtCmIW2j/Z7LSOAdc/H486Z4mdHFMjAgnaXOfraLUx lW7xodkuHwM3RydOyNCA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qIqDd-00BdAP-2G; Mon, 10 Jul 2023 12:42:21 +0000 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qIqDZ-00Bd8x-0L; Mon, 10 Jul 2023 12:42:18 +0000 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3fbab0d0b88so42098725e9.0; Mon, 10 Jul 2023 05:42:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688992935; x=1691584935; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=pBd1Lu1Lca2z3up8dzZ0bUwRcOK91MQPeC1b10XMPe4=; b=jMayj+6FlyzWisJa44u1vRVzWTqzkkr+hAgEqmGIvhditBR6u9AfV21PT8niYQk2WU 9UL48NjJw19HLqdX83VpGrvCYR8rcxLqauGy0ioZpWd9BVq7GV99DrfYCGBVjLoEj5X7 v+l1Z3m0B4PK/tTI80IYslI/+sWfb1hyVraBfwnwtBErzZyh1+WYjxSwIKKFLj8oHR2R e6+tmLxj6YBn1G0B24s1RiNZEn3XrG0AMpAgxxOhBZKW6hJo0YHsW5SMwiP1ZKXcLNC7 ZLjqoI3KjmYJOBdQxlevWgF8QzeU37YSmnoch4wmSbV7jmuFK+atJdJ6ziy8HJtC1SiT KNbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688992935; x=1691584935; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=pBd1Lu1Lca2z3up8dzZ0bUwRcOK91MQPeC1b10XMPe4=; b=A6I+9AoyAhiOBDM47aggshIks88Mf90zv2NsPsGRxOk4thgBbQQ5bIODFaa06u2adc kJwYbYkcE+OVMDjfV9GPQZOZFihI2hwo/QEcDoV7A8oGVtLTa827ZVdJISPoiJbVtzvP ns3KA9kNtocsP4UGIZ0h0kjnUDDWkUuRLE9On0JrutUfGLMl8+NyH/fluaHJ7D4zGVTc g/xolKjlpz3Qv4WUk6Io1OHX/5v1bCSq3eTLfbwGWKQ2xuwwZudwEdJvX70Kqmd2Trjz dXhzoa/oD8ocSntXdtldXUHlY7AnGFoudYSA7MnLoSgj4jDB6iTvyBvjbtfoEKiVRkSa GM7g== X-Gm-Message-State: ABy/qLYaegJRU1wPl+mubmb61Pth6KCONdypgjCJozb4DTX0+KXaa+I0 YJkVW1bWgew/Omapxq78i/A= X-Google-Smtp-Source: APBJJlHsd3OjEmoDoMtV1lj2Xvfy9YGaqMv5Pv0DobeXvA2Ss7TEnthuzrVy/NImHSoytpm3lJI96g== X-Received: by 2002:a5d:6e11:0:b0:315:a155:5294 with SMTP id h17-20020a5d6e11000000b00315a1555294mr851620wrz.34.1688992934466; Mon, 10 Jul 2023 05:42:14 -0700 (PDT) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id u12-20020adfdd4c000000b0030ab5ebefa8sm11582335wrm.46.2023.07.10.05.42.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Jul 2023 05:42:14 -0700 (PDT) Message-ID: <876e58f3-e3c2-6295-9137-312e686026bb@gmail.com> Date: Mon, 10 Jul 2023 14:42:13 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 From: Johan Jonker Subject: [PATCH v4 1/3] mtd: rawnand: rockchip: fix oobfree offset and description To: miquel.raynal@bootlin.com Cc: richard@nod.at, vigneshr@ti.com, heiko@sntech.de, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, yifeng.zhao@rock-chips.com References: <08f694df-4c1d-f059-43fd-f1aee678062c@gmail.com> Content-Language: en-US In-Reply-To: <08f694df-4c1d-f059-43fd-f1aee678062c@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230710_054217_151237_FFEC5F72 X-CRM114-Status: GOOD ( 16.08 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Rockchip boot blocks are written per 4 x 512 byte sectors per page. Each page with boot blocks must have a page address (PA) pointer in OOB to the next page. The currently advertised free OOB area starts at offset 6, like if 4 PA bytes were located right after the BBM. This is wrong as the PA bytes are located right before the ECC bytes. Fix the layout by allowing access to all bytes between the BBM and the PA bytes instead of reserving 4 bytes right after the BBM. This change breaks existing jffs2 users. Fixes: 058e0e847d54 ("mtd: rawnand: rockchip: NFC driver for RK3308, RK2928 and others") Signed-off-by: Johan Jonker --- Changed V4: Reduce subject size Add 'Fixes:' tag Reword Changed V3: Change prefixes Reword State break existing users. --- Example: Wrong free OOB offset starts at OOB6: oob_region->offset = NFC_SYS_DATA_SIZE + 2; = 4 + 2 = 6 oob_region->length = rknand->metadata_size - NFC_SYS_DATA_SIZE - 2; = 32 - 4 - 2 = 26 Together with this length above it overlaps a reserved space for the boot blocks Page Address(PA) chip->oob_poi buffer layout for 8 steps: BBM0 BBM1 OOB2 OOB3 | OOB4 OOB5 OOB6 OOB7 OOB8 OOB9 OOB10 OOB11 | OOB12 OOB13 OOB15 OOB15 OOB16 OOB17 OOB18 OOB19 | OOB20 OOB21 OOB22 OOB23 OOB24 OOB25 OOB26 OOB27 | PA0 PA1 PA2 PA3 ECC0 ECC1 ECC2 ECC3 | ... ... ... ... Fix by new offset at OOB2: oob_region->offset = 2; The full range of free OOB with 8 steps runs from OOB2 till/including OOB27. --- drivers/mtd/nand/raw/rockchip-nand-controller.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) -- 2.30.2 diff --git a/drivers/mtd/nand/raw/rockchip-nand-controller.c b/drivers/mtd/nand/raw/rockchip-nand-controller.c index 2312e27362cb..37fc07ba57aa 100644 --- a/drivers/mtd/nand/raw/rockchip-nand-controller.c +++ b/drivers/mtd/nand/raw/rockchip-nand-controller.c @@ -562,9 +562,10 @@ static int rk_nfc_write_page_raw(struct nand_chip *chip, const u8 *buf, * BBM OOB1 OOB2 OOB3 |......| PA0 PA1 PA2 PA3 * * The rk_nfc_ooblayout_free() function already has reserved - * these 4 bytes with: + * these 4 bytes together with 2 bytes for BBM + * by reducing it's length: * - * oob_region->offset = NFC_SYS_DATA_SIZE + 2; + * oob_region->length = rknand->metadata_size - NFC_SYS_DATA_SIZE - 2; */ if (!i) memcpy(rk_nfc_oob_ptr(chip, i), @@ -933,12 +934,8 @@ static int rk_nfc_ooblayout_free(struct mtd_info *mtd, int section, if (section) return -ERANGE; - /* - * The beginning of the OOB area stores the reserved data for the NFC, - * the size of the reserved data is NFC_SYS_DATA_SIZE bytes. - */ oob_region->length = rknand->metadata_size - NFC_SYS_DATA_SIZE - 2; - oob_region->offset = NFC_SYS_DATA_SIZE + 2; + oob_region->offset = 2; return 0; } From patchwork Mon Jul 10 12:42:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 13306932 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 11004EB64D9 for ; Mon, 10 Jul 2023 12:42:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:References:Cc:To:Subject: From:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=eEY6AJQdcFLra33IKNMvnnuD9fLA7QuZhBwwWih9EZU=; b=ZLE67888SLEdi7 Uzpvlj7UY3RnT5O/Luh9fQvIpH6mpgmQLfYSkur+gOgnHd+IPfQvl1BQx5WK1c5ma7CBJzEiZk8U0 FOquCnhEWG0bnGug96H2mDKZlsc88C9cmMlhrOuwEEVWK3K3R4aumcPC4vBVxpXEilxgJtSYmIce4 +PBKSfiNVJLKHxNYMuv7uytF5CcAy+eNEZ/rtsjogcBeZz1GI7DUePfs+l7JBAemTrT9ZmQbHa6q0 78hxHh6YUjcexNIfEhZRU07Zrc7A05zpd7q8cCYTpTET9ILPmeUEM4AEauzTGiGAbSfGG/TnnExYc JCGylMHfSX+Q8Uw5L3KQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qIqDt-00BdFu-30; Mon, 10 Jul 2023 12:42:37 +0000 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qIqDp-00BdCr-0p; Mon, 10 Jul 2023 12:42:34 +0000 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3fbf1b82dc7so45787095e9.2; Mon, 10 Jul 2023 05:42:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688992949; x=1691584949; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=3KmubX1E3kf+Z0JsXX9s3WNORY3qIwuBuczZRTUW+jU=; b=Krqub1hTt/iuxj040EXCNQNckp5a2XtiXqy8i8jBHwBJdllpNl/QucK4fUyPnzkiEX /j5sq9USFWZ5/jKLmr5SgQKd4IX4Rx5YKBRXkP1Fdsjz7EkXfwlFUkWu9tsva1kGD4Yj /unYxx/sHPEpuEDpq92Rre39bFtZi42a0yvqtvxDBziLwaERfWfRGCdflBDJfBPcQGZF P85SsueKUO99aOundaP4712ebz9BaegWIkxhiwWR5TIAUZZU/LpbWAW6jKKVWgHC1FHP M+lsIjGNaqkrvh0b0BkNyawH36MkpUYcmbSovMMQwY0WOfZZaCwRY+dm9HyrdkUnOv13 P8rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688992949; x=1691584949; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3KmubX1E3kf+Z0JsXX9s3WNORY3qIwuBuczZRTUW+jU=; b=QJZrHaiqEs2tbL3Gpl6fB522TyrCtGXtEn6BL3GTR+0/bvopNN40e50KFN7vlaF2e0 5coTRYND01Hcv0y0zUSBsFn5lmpwbRfTNQWnF/fo5qxQoZZsNYUQk3r4ZDrIYfYVlNpF pNAH1aPd2/Fd/6MmGGLqD6P6V+GedF8EKwzE9gxtzFjkNvRlCMEsIS7AR9oDlDNn7Rfb imWWgfNW6iSqykmjWxfJT5Ht+LzCHGo4x69SxBijLfTe1d/6jpGZfrJg2VcxOA73APuA isLCnTEl9lcdZuuVr6iXtvu0lO3J3M7V/OslNVMlx3zlGzqbFZM024u6EiLkFa/ETPNQ 3VDw== X-Gm-Message-State: ABy/qLYnXHrtSg9xwy4BIwP5d1nx4bOGg37SOdWEJcjSE/FL/2q+tm3P FVExE++qNgZiFgjCy+VWk3Y= X-Google-Smtp-Source: APBJJlFF0t5fBxHHkDGpaeNGqnT0ItgSQi3wb/R+3SqxeyzOmTl403VCI4fNB1Bs2ZKS+wWGwR+5RA== X-Received: by 2002:a05:600c:228d:b0:3f9:82f:bad1 with SMTP id 13-20020a05600c228d00b003f9082fbad1mr11514405wmf.40.1688992949326; Mon, 10 Jul 2023 05:42:29 -0700 (PDT) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id c26-20020a05600c0ada00b003fbcdba1a52sm10293044wmr.3.2023.07.10.05.42.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Jul 2023 05:42:29 -0700 (PDT) Message-ID: <04ed6472-13e4-d139-2ed0-ce2b1aa9e90c@gmail.com> Date: Mon, 10 Jul 2023 14:42:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 From: Johan Jonker Subject: [PATCH v4 2/3] mtd: rawnand: rockchip: copy hwecc PA data to oob_poi buffer To: miquel.raynal@bootlin.com Cc: richard@nod.at, vigneshr@ti.com, heiko@sntech.de, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, yifeng.zhao@rock-chips.com References: <08f694df-4c1d-f059-43fd-f1aee678062c@gmail.com> Content-Language: en-US In-Reply-To: <08f694df-4c1d-f059-43fd-f1aee678062c@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230710_054233_292623_DCA51070 X-CRM114-Status: GOOD ( 17.20 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Rockchip boot blocks are written per 4 x 512 byte sectors per page. Each page with boot blocks must have a page address (PA) pointer in OOB to the next page. Pages are written in a pattern depending on the NAND chip ID. This logic used to build a page pattern table is not fully disclosed and is not easy to fit in the MTD framework. The formula in rk_nfc_write_page_hwecc() function is not correct. read/write_page_hwecc and read/write_page_raw are not aligned. Make hwecc and raw behavior identical. Generate boot block page address and pattern for hwecc in user space and copy PA data to/from the already reserved last 4 bytes before ECC in the chip->oob_poi data layout. This patch breaks all existing jffs2 users that have free OOB overlap with the reserved space for PA data. Fixes: 058e0e847d54 ("mtd: rawnand: rockchip: NFC driver for RK3308, RK2928 and others") Signed-off-by: Johan Jonker --- Changed V4: Reduce subject size Add 'Fixes:' tag Fix abbreviation Reword Changed V3: Change prefixes Reword --- .../mtd/nand/raw/rockchip-nand-controller.c | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) -- 2.30.2 diff --git a/drivers/mtd/nand/raw/rockchip-nand-controller.c b/drivers/mtd/nand/raw/rockchip-nand-controller.c index 37fc07ba57aa..5a04680342c3 100644 --- a/drivers/mtd/nand/raw/rockchip-nand-controller.c +++ b/drivers/mtd/nand/raw/rockchip-nand-controller.c @@ -598,7 +598,7 @@ static int rk_nfc_write_page_hwecc(struct nand_chip *chip, const u8 *buf, int pages_per_blk = mtd->erasesize / mtd->writesize; int ret = 0, i, boot_rom_mode = 0; dma_addr_t dma_data, dma_oob; - u32 reg; + u32 tmp; u8 *oob; nand_prog_page_begin_op(chip, page, 0, NULL, 0); @@ -625,6 +625,13 @@ static int rk_nfc_write_page_hwecc(struct nand_chip *chip, const u8 *buf, * * 0xFF 0xFF 0xFF 0xFF | BBM OOB1 OOB2 OOB3 | ... * + * The code here just swaps the first 4 bytes with the last + * 4 bytes without losing any data. + * + * The chip->oob_poi data layout: + * + * BBM OOB1 OOB2 OOB3 |......| PA0 PA1 PA2 PA3 + * * Configure the ECC algorithm supported by the boot ROM. */ if ((page < (pages_per_blk * rknand->boot_blks)) && @@ -635,21 +642,17 @@ static int rk_nfc_write_page_hwecc(struct nand_chip *chip, const u8 *buf, } for (i = 0; i < ecc->steps; i++) { - if (!i) { - reg = 0xFFFFFFFF; - } else { + if (!i) + oob = chip->oob_poi + (ecc->steps - 1) * NFC_SYS_DATA_SIZE; + else oob = chip->oob_poi + (i - 1) * NFC_SYS_DATA_SIZE; - reg = oob[0] | oob[1] << 8 | oob[2] << 16 | - oob[3] << 24; - } - if (!i && boot_rom_mode) - reg = (page & (pages_per_blk - 1)) * 4; + tmp = oob[0] | oob[1] << 8 | oob[2] << 16 | oob[3] << 24; if (nfc->cfg->type == NFC_V9) - nfc->oob_buf[i] = reg; + nfc->oob_buf[i] = tmp; else - nfc->oob_buf[i * (oob_step / 4)] = reg; + nfc->oob_buf[i * (oob_step / 4)] = tmp; } dma_data = dma_map_single(nfc->dev, (void *)nfc->page_buf, @@ -812,12 +815,17 @@ static int rk_nfc_read_page_hwecc(struct nand_chip *chip, u8 *buf, int oob_on, goto timeout_err; } - for (i = 1; i < ecc->steps; i++) { - oob = chip->oob_poi + (i - 1) * NFC_SYS_DATA_SIZE; + for (i = 0; i < ecc->steps; i++) { + if (!i) + oob = chip->oob_poi + (ecc->steps - 1) * NFC_SYS_DATA_SIZE; + else + oob = chip->oob_poi + (i - 1) * NFC_SYS_DATA_SIZE; + if (nfc->cfg->type == NFC_V9) tmp = nfc->oob_buf[i]; else tmp = nfc->oob_buf[i * (oob_step / 4)]; + *oob++ = (u8)tmp; *oob++ = (u8)(tmp >> 8); *oob++ = (u8)(tmp >> 16); From patchwork Mon Jul 10 12:42:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 13306933 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0ED24EB64DC for ; Mon, 10 Jul 2023 12:42:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:References:Cc:To:Subject: From:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5TJEAxlrQuKwHsoSutS9KViU8QbW05tXGGWXq9WwywE=; b=KUzlDSn2Ir49jg bIlfh4zOK2wpKDMMi58UgNL6kqrMRkc8MxV+SBYSxa3Yi2Smaos0WP7CS1hFeRWxPV4BF8fxT+EoS 7aN74Gy/xsaN9EDRdEkLU7edwKYk+bJud2ep/Su/Ey/i6hT8BEpYH7qh+BaL6qdmXFQn8KuC1f6FO mOCqM6eGtjF8DLH4K+kHEa07PPnAOFUeoXskMUGpUj1SpT9O+p98n3CXQ8JSnjD2hnOPhIfyKr/Rp uAtrxwNUOxfe0td2yHLm1kvd0cWq1OLPN0MYopCeBdWLWMZlIcpHWQZyDt1G2vitWUcuOaM4SOuPP Ibqq/FghnIGeX/48vvZg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qIqE4-00BdNG-1E; Mon, 10 Jul 2023 12:42:48 +0000 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qIqDz-00BdJ5-1s; Mon, 10 Jul 2023 12:42:44 +0000 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-3fbc244d384so45481385e9.0; Mon, 10 Jul 2023 05:42:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688992962; x=1691584962; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=TdvM16o5h23jwD1okqOHQiuKkM8L7IpEOiBotY2IGmY=; b=b376hUBVwU5cG0vV849R90AbgHClWR5m0B0ip65d7lLM9lEjoEwc5JayOE5aBw1QWX b5bc3XGTXrLab8Vol+LypXiM7YozU6vCehy1UgWdXKnRUbzAxcuf3jD3mHKCLihQnTbt 2ECT/v7hdYss29tOsNN/+7uQmX9S/toJpC2ipJ0kEYWK7rOYfnP51klWTWVEWZM3inYG wvCQZoqU3Ac9v7ROA07LO0/1ACRT258GaaUcxrTdGiCAzpPRx8VNORi88g7HuqMlN/CI SbKQahle6Va+QU6n+8MeOKUcO5358RHYMp+fKK3/50Zmoow6bjq6YzhwNI9BeTM73JQp 4ESg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688992962; x=1691584962; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TdvM16o5h23jwD1okqOHQiuKkM8L7IpEOiBotY2IGmY=; b=HUEQdZvp1XggLpschcFjHk5UFJCnmx87qdj6z382NWLi/csjQPoDOxq93GtS8XTnm6 efGX5ePQ4wSAOMpIj/r8CxUDZeymyMSkscTa1kaExNdmrfbc6RJjAFctEq6m0E2a9akk VvkDea50fHR55mOFRjQBRTMzLMwp+atkn0qZgKSwGeWZZGmeb6cSbFNvVigsWqPJL1W/ fLzGbpnghj4a247+JhvKNVZhMDrcw1NvV1AmdhgrYZYTJRjD6HqAEpZRXMcvCH2zTMPx 78wE/RI+ZXlKXAhyvS0NxJasU3f4T+y9+LGx7pVwnek29l9ph+bKaBVzdw2R5174xmyy 7ajw== X-Gm-Message-State: ABy/qLYCaXNkxyxnaBZR52YiI7mQP+3kFCh6WxLzf14KpWYxtDSl0dhV c+A3oZoysjI2uiZe/K71VSU= X-Google-Smtp-Source: APBJJlHd019CoyCypGiulVzj6NCOiOfzkSWrETKAuTfVD3XhhcYEgNfYy/2loWPSYkCuLickws37OA== X-Received: by 2002:a1c:ed14:0:b0:3fb:4149:b816 with SMTP id l20-20020a1ced14000000b003fb4149b816mr10732743wmh.8.1688992962064; Mon, 10 Jul 2023 05:42:42 -0700 (PDT) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id e32-20020a5d5960000000b0031432f1528csm11637235wri.45.2023.07.10.05.42.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Jul 2023 05:42:41 -0700 (PDT) Message-ID: <0d6d0c57-c1e3-6761-9ecd-48176b4b6d4c@gmail.com> Date: Mon, 10 Jul 2023 14:42:40 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 From: Johan Jonker Subject: [PATCH v4 3/3] mtd: rawnand: rockchip: add skipbbt option To: miquel.raynal@bootlin.com Cc: richard@nod.at, vigneshr@ti.com, heiko@sntech.de, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, yifeng.zhao@rock-chips.com References: <08f694df-4c1d-f059-43fd-f1aee678062c@gmail.com> Content-Language: en-US In-Reply-To: <08f694df-4c1d-f059-43fd-f1aee678062c@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230710_054243_622772_4C310B95 X-CRM114-Status: GOOD ( 12.92 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org On Rockchip SoCs the first boot stages are written on NAND with help of manufacturer software that uses a different format then the MTD framework. Skip the automatic BBT scan with the NAND_SKIP_BBTSCAN option so that the original content is unchanged during the driver probe. The NAND_NO_BBM_QUIRK option allows us to erase bad blocks with the nand_erase_nand() function and the flash_erase command. With these options the user has the "freedom of choice" by neutral access mode to read and write in whatever format is needed. Signed-off-by: Johan Jonker --- Changed V4: Reduce subject size Changes V3: Change prefixes Changed V2: reword --- I'm aware that the maintainer finds it "awful", but it's absolute necessary to: 1: read/write boot blocks in user space without touching original content 2: format a NAND for MTD either with built in or external driver module So we keep it include in this serie. --- drivers/mtd/nand/raw/rockchip-nand-controller.c | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.30.2 diff --git a/drivers/mtd/nand/raw/rockchip-nand-controller.c b/drivers/mtd/nand/raw/rockchip-nand-controller.c index 5a04680342c3..fcda4c760ffa 100644 --- a/drivers/mtd/nand/raw/rockchip-nand-controller.c +++ b/drivers/mtd/nand/raw/rockchip-nand-controller.c @@ -188,6 +188,10 @@ struct rk_nfc { unsigned long assigned_cs; }; +static int skipbbt; +module_param(skipbbt, int, 0644); +MODULE_PARM_DESC(skipbbt, "Skip BBT scan if data on the NAND chip is not in MTD format."); + static inline struct rk_nfc_nand_chip *rk_nfc_to_rknand(struct nand_chip *chip) { return container_of(chip, struct rk_nfc_nand_chip, chip); @@ -1153,6 +1157,9 @@ static int rk_nfc_nand_chip_init(struct device *dev, struct rk_nfc *nfc, nand_set_controller_data(chip, nfc); + if (skipbbt) + chip->options |= NAND_SKIP_BBTSCAN | NAND_NO_BBM_QUIRK; + chip->options |= NAND_USES_DMA | NAND_NO_SUBPAGE_WRITE; chip->bbt_options = NAND_BBT_USE_FLASH | NAND_BBT_NO_OOB;