From patchwork Thu Jun 15 17:34:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 108668 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp815311vqr; Thu, 15 Jun 2023 10:57:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ggaxpSdyV7liwn2cpqOTW3w74EgwkGkB+JV5KQKAq1/y2fWd8+ygxT2Mpfx5FOKdUheLh X-Received: by 2002:a05:6a00:2406:b0:650:2660:1bcc with SMTP id z6-20020a056a00240600b0065026601bccmr6694388pfh.8.1686851856999; Thu, 15 Jun 2023 10:57:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686851856; cv=none; d=google.com; s=arc-20160816; b=UtWPMOCELTwcy+sYPk0tSwW/Vxn7vyY7dw2Xq6flw+3w/eM1vu0ZWWvCZvT5qbTGvG CtZXbqb0yx0HHUA3TTvUW+SAqgPcM0pt0Tod8P3j5K5zBFsceSTnX5NDIupKqLG4cySp OtXQ5FzrfTOlarHQFHuT7ln6+Q44bWRN2bfLKWVxg+bhx3LRUHLx036ZmVnbyFsVu4/q wLxFuKaKnH3u9vta3rc7/hAuCu53vr+/YuFKuE3/B+slvQYn90VHdwBgrLSg99spgDvu 8QSDH6RbK94sKi7A1xfVGrfb6xqD+nO4Q9vOZ5hIDqWTO7QCy0FHPPojWmw2DLucNwic mPrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :content-language:references:cc:to:subject:from:user-agent :mime-version:date:message-id:dkim-signature; bh=onV5CTTksC2Qd78lIixG0/dIqB3m8E1M6AA6FD8Jbs0=; b=cifUsQN4uF7yFpAAnm7fi+n9I3F4NokF0dHJcS49jVvmmMXMGqFpgpfF6ge0F55vyd bGF0d2qfMJarAxBjQn3zoKKiWQTGCnDXptx95YXXwgwjxgQ65ALHbu+Jk8xssLfsNwCY bOrOHvb8e4vUiqGA9bXvm2x8jWWtzU8AcKp4xXsd/ZT/R9CbmuKAt1L1PhRLo6Kg4+g2 Y+D8Z9ndDD0Ai4MozIy/qKi1dtMlz/0h+6s/EHnCdfysTTo80CrWZAB5TbE6S09Rb8bo MiiOFMkrgz73rjfOBY89F6hW/ZqGGDMqkFhjbOTERpD9+CJVpebwDvu8VP+F42z/7/Pz DpoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=prWxaZ36; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l8-20020a637008000000b0054f993c6e36si7225626pgc.481.2023.06.15.10.57.24; Thu, 15 Jun 2023 10:57:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=prWxaZ36; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236672AbjFOReK (ORCPT + 99 others); Thu, 15 Jun 2023 13:34:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236728AbjFOReG (ORCPT ); Thu, 15 Jun 2023 13:34:06 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19DE62710 for ; Thu, 15 Jun 2023 10:34:05 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-51a21185130so1631358a12.0 for ; Thu, 15 Jun 2023 10:34:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686850443; x=1689442443; 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=onV5CTTksC2Qd78lIixG0/dIqB3m8E1M6AA6FD8Jbs0=; b=prWxaZ36pGTgPaazXWWLSZ/xe/uSXBNIHmD1xZ7n5pE3rJGVNhR0N9Zm23NkJFrUaX 23X1HZj+C9gLiF3S2wI4MyAWgNOYENKQhq1kaOcWW9A3n5U8qc2s3L4U+OiTGCDSZ+dl Qwk4OmTavRtpKxzglgdJ3cCggklFJ/wLxLq5239yhVxe5zGikHCWEciVS+C1L/06GyVb rJwug9nP3s50XCidh0wzVYY6HrVRZPHorWCfYqoyabW9o9fauqFnoK33z0+lP1KceyNI HD4g9S/10dq66w1VFds9N1AyvSFP/qsDfpYJ2O37DLOOJ+xsvpIdME3n6vg7nx2kLdDd OmlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686850443; x=1689442443; 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=onV5CTTksC2Qd78lIixG0/dIqB3m8E1M6AA6FD8Jbs0=; b=iZd3tCFPWtinsch+mTwIwO+4BBjy/JZAy48OAteQXVLWXTuLgzMsXjIP9Xtuli2X3b A+iakV4OMDbU3GXkgmjwNLoc5RhscCcnct5ntK7rVSkzhVTYh72eZ2ES0n0K/8GM8JjT B0Q4UjDe6U0c8ZsI4nSttGdS+iWtZbIzabkjoNr0PIpdJGmk68McoJ6ftJWTBIEnfc9u oDojxfGNImoISPcBvZjxfzMQ97Q2kajgQf9yhGOmAOGTcMGDM7GLiMyycBjATpCnFT3G uEpsj2+thmH19nAImVlmIM2GFwV7Mqj4S8yBNf2ZbC2PC+kLF4ppIcJtt2lfkCgafqAY Jd6A== X-Gm-Message-State: AC+VfDwPRVGbFQzG6oKK/y9d3JXfhKx7Nt2pn+JXf3n0VbNendEasutS K30RsHh0Jpcy/KlIdxJ54Ds= X-Received: by 2002:aa7:c994:0:b0:518:7954:d082 with SMTP id c20-20020aa7c994000000b005187954d082mr5824467edt.10.1686850443301; Thu, 15 Jun 2023 10:34:03 -0700 (PDT) Received: from [192.168.2.2] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id b20-20020aa7d494000000b00514a3c04646sm9172936edr.73.2023.06.15.10.34.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 15 Jun 2023 10:34:02 -0700 (PDT) Message-ID: Date: Thu, 15 Jun 2023 19:34:01 +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 v3 1/3] mtd: rawnand: rockchip-nand-controller: 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: <0047fc52-bc45-a768-8bdd-c0f12cddc17e@gmail.com> Content-Language: en-US In-Reply-To: <0047fc52-bc45-a768-8bdd-c0f12cddc17e@gmail.com> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768792373122312143?= X-GMAIL-MSGID: =?utf-8?q?1768792373122312143?= The MTD framework reserves 1 or 2 bytes for the bad block marker depending on the bus size. The rockchip-nand-controller driver currently only supports a 8 bit bus, but reserves standard 2 bytes for the BBM in the chip->oob_poi buffer. The first free OOB byte is therefore OOB2 at offset 2. Page Address (PA) bytes are located at the last 4 positions before ECC. The current advertised free OOB area has an offset that starts at OOB6 and a length that overlaps with the space reserved for the PA bytes. Writing unrelated data to a reserved space with a specific task can corrupt our boot block page read order. Fix by changing the free OOB offset to 2. This change breaks existing jffs2 users. Signed-off-by: Johan Jonker --- 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 2312e2736..37fc07ba5 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 Thu Jun 15 17:34: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: 108671 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp819890vqr; Thu, 15 Jun 2023 11:03:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4v7PuSgc2qeL7Un5blxXhxCGy60r0D0UKlK9iR/1NcOs8fzoL41c7Yjs90/inEZgMQkuUl X-Received: by 2002:aa7:d712:0:b0:518:7959:e10 with SMTP id t18-20020aa7d712000000b0051879590e10mr6414133edq.22.1686852232485; Thu, 15 Jun 2023 11:03:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686852232; cv=none; d=google.com; s=arc-20160816; b=F5TarVqDwBdyE5ErevOHnmCe+hV4FKNQ6LrMcR47i45YRZunMAALfGXuoTeZ8yamrU n1GV9t2dwlKVDpmqbC2c/h/p4xE4u4FS6rMTk6sOj3XLQct45wzXr2uqxhbTM7HirNaF UPedDy0uAF7FOg0HG8R4V/2bW7JG0M1KUdsCmf4Z56pzEs5ClV0bZx+IY4k3hK82I7wp b2Uqa7Fw9PcevupxyQQIiAilnBHBmiAOVOrvfkHmE+P8+CQ1ejkHdLGHWlBwjvwITQlh yWplumG4M/uqoJmB9AiPiYXtm6dX3qUD4ABBaPchfkDz8kV30gt+uS3CnNekbdYrVvOq TOIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :content-language:references:cc:to:subject:from:user-agent :mime-version:date:message-id:dkim-signature; bh=AATBn5YLXyzdI1LR5/a8tiR4gJT09RugCUbqiVh3Rxw=; b=mTcNEKTenCy/ByoQi0Qa6WOi1SJ3HTiXLuhnzuEgtJjyz3AAZQjWlBNQRkoKzgRiYC 1RZGRYAvS1kn8nbFvq70+usnx5XERgjnElA2Q+IwUkaJfK8s7zwC/UipdcTgP8KkjnIX xwAYWfxLQcQo/JgFUoQCy1oLCNI9Ow8ta0zGpO1JAKuVrBIE7uOz6wvBQG8ygGTMDytY 3QObdkt/dIT7SANBln/r3arPb+cbNFMLZ/eiDai+HQW1OOMna5KhfbnIME1H/thb/k22 TRfN53/09ZfV6C2Ufy/J04rIENOdX+E8jM2rRyp1fX08LRMblFvbt10eYcqMo10ZW/vg DNHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=LCxgZGYd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z8-20020aa7cf88000000b00514a0a4b1c1si10455547edx.23.2023.06.15.11.03.26; Thu, 15 Jun 2023 11:03:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=LCxgZGYd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237974AbjFORe0 (ORCPT + 99 others); Thu, 15 Jun 2023 13:34:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237826AbjFOReV (ORCPT ); Thu, 15 Jun 2023 13:34:21 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DBAB2962 for ; Thu, 15 Jun 2023 10:34:16 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-98220bb31c6so327742666b.3 for ; Thu, 15 Jun 2023 10:34:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686850455; x=1689442455; 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=AATBn5YLXyzdI1LR5/a8tiR4gJT09RugCUbqiVh3Rxw=; b=LCxgZGYdHmRtIa1epcAMXaTawFX1hoAbqO+/VQyDMM0o2VWiFkxJyosGfgNV87DmX3 LasbD4KBEzGP+RTVPhMr7jTuj7XzhaoWRougNeDjoTErIsNh0nlHC/nruRBiyOEWFc5a rCGs/Li5bAxAQOJ1YdhyzfbHuGGsLkuY0tNTs8Uy9rlek7Z2s55hqRHsXf7JNCSejTCV gVQPH8NCBqiuJP3w4JU/vtSWyhF+sOvQ14qztC1Nwnj0n8XJoUXsLgQsEI+cTbNwjtKN DdEJgRrc/t/UufumzQJTcW57oWjygDq25syEf7nmlEVKhSZf11jsWb5ZXtKpJ8CnqOxq a73A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686850455; x=1689442455; 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=AATBn5YLXyzdI1LR5/a8tiR4gJT09RugCUbqiVh3Rxw=; b=TLIgRz1+XxxiLoa8QIswUQf/M++7uiRYG2aQwjRCSwHHjVa0QLDtjgJFz060XBsYzT 9dazxwUraxPp7INQyyZiEfnhlN8fAcQ9tTkSKaWRQ1z6xGEOqF692IzbZ1vWYUa/Xl+L y98+JESBpInLm5Ra+5E0SaD6kN7Z+m26kbEKZfxlcq5QlXOjv3DZrBTC3u9W3dQSf1+d vAuMEjsYcLNtAalLZS8ln1TjhKhdvJaWsD2BWxpKzUiAvZm8ZsmW9ORS3Yz6SmjvewoK 6vmXeg37oBr3GAu+MjjKRIbDdBtadLNuOKSCs5emDTW/0HEBjLmY1wJNCTjAhZ42L7n4 1o5A== X-Gm-Message-State: AC+VfDxMYWE0ugwhr2+yRoAGuCZyM+Ga4+cKXFCrTqTkI8l14UTC9ZZn gCa7CZpjmdKDynsDRKy3QijFlwqyxFY= X-Received: by 2002:a17:907:9342:b0:973:8198:bbfb with SMTP id bv2-20020a170907934200b009738198bbfbmr21130029ejc.31.1686850454927; Thu, 15 Jun 2023 10:34:14 -0700 (PDT) Received: from [192.168.2.2] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id p14-20020a170906140e00b009786ae9ed50sm9599908ejc.194.2023.06.15.10.34.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 15 Jun 2023 10:34:14 -0700 (PDT) Message-ID: <539cfba7-dd6f-015e-b990-a2335cb3aac9@gmail.com> Date: Thu, 15 Jun 2023 19:34: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 v3 2/3] mtd: rawnand: rockchip-nand-controller: 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: <0047fc52-bc45-a768-8bdd-c0f12cddc17e@gmail.com> Content-Language: en-US In-Reply-To: <0047fc52-bc45-a768-8bdd-c0f12cddc17e@gmail.com> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768792766453185498?= X-GMAIL-MSGID: =?utf-8?q?1768792766453185498?= Rockchip boot blocks are written per 4 x 512 byte sectors per page. Each page 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. 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 EEC 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. Signed-off-by: Johan Jonker --- 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 37fc07ba5..5a0468034 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 Thu Jun 15 17:34:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 108681 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp837791vqr; Thu, 15 Jun 2023 11:32:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5pJeqis5URnq4wieabFz9geQ/LJsNqtmjshWkegkE1WfrIZJTweFLQ62tmlMbHc3RJahnR X-Received: by 2002:a05:6a00:b83:b0:65f:2fbd:370a with SMTP id g3-20020a056a000b8300b0065f2fbd370amr5639831pfj.30.1686853977317; Thu, 15 Jun 2023 11:32:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686853977; cv=none; d=google.com; s=arc-20160816; b=GzXwdg8Fm+qVNxQUOMkjOON9blEAjmmgauXUWTIPVs7IDUPaBVz1DDaKfwPOT9gLgY AuCWO2PB5Fv45fz4YmT2hS1imm4RTXb9Lv/wVPLFhifE+B2hZ2sOuUePvrpx0of7SAHH GGto5/J6cBpC+72rD3ov0lU5MOY0NzJY6ohW5YnPka3X7i+ZMSxGvs+uiWMNlCTrolOM 3YW1n/A5bKs3fMzdCgjZiWiv/ctbp3xkgTV1a4vFPkqSBVEfgcggVcocwd5bEOnuCfra Fxk7JeEm7Vu8zstlD5Lq4QFu8R0DqpmXGjvtV6DphJzayIW6rHRmJeKdbLb6rvtHrjc7 8jUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :content-language:references:cc:to:subject:from:user-agent :mime-version:date:message-id:dkim-signature; bh=6YhjaIcOgdSC4loqdzWjGFqfQ0Mx8Oy4umDdDUkZduk=; b=mTe/z5E2CAhBzZHM2Bgf6pVNiFJYKGLBCFAxXaAvGdil+COAW/OTAhH+wy6RAkQTEt e8B3QpM9TNFNBtOjO6Rz/Mf/PZYghKBUOBedVSRRlu3VkMDdIcU9EgSaf8XzW5SQ0Hsb vagMcwxMUBLdAKi4iQNll06k8o2FICZTA56SrNXZSZOJHgbKDzgaO5rNYF03EXvVO70M hfbxAKE8Dj0dKgAKFFmy+whE5/yJz4haGoj60MI/22q7IuoKEMAYjNIDAq3XW2uJ0JMy qC0e6xuZK34u6SrWpsXVhopA8gQnMJuhTZ2mR++3S5zkowdXpXeAURrX+v+usH9u+PQ1 k79g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=jwM1Pqg8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q29-20020aa7961d000000b006546d0d5832si10406871pfg.183.2023.06.15.11.32.44; Thu, 15 Jun 2023 11:32:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=jwM1Pqg8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229719AbjFORel (ORCPT + 99 others); Thu, 15 Jun 2023 13:34:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238199AbjFOReh (ORCPT ); Thu, 15 Jun 2023 13:34:37 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8484D295D for ; Thu, 15 Jun 2023 10:34:29 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-982af24987fso109562166b.0 for ; Thu, 15 Jun 2023 10:34:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686850468; x=1689442468; 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=6YhjaIcOgdSC4loqdzWjGFqfQ0Mx8Oy4umDdDUkZduk=; b=jwM1Pqg8HWVT/EJnvWaYVy3KEBqmdy1Y++omiie2N9IE8Qyoh0Lf08ez8cpR2OBQQW vfLYhT7fAUSZoBuz1+20EBDtxawgNkuuLBo2tzxhU+7xFy31ABGx3LRZShTVNxUSukSe MN+INi2UbtRiCuaNZ/WnSV2WJ3szOiGLECvIlxDJ9IBqCbtlw6C4Xpdrn91bXXv1P73l 9he9MsGsfpyL5ljmD2lphS5vamDzmtLGF6yVL7DCW8jzkEbyoRi5pZnZGqG5YQW06KFT gJlaSoNEZZd3VqHgdsstWA/OD26H98tGrow2pKaPU7h+5QPKDmrc1jHSYJeTu62/z8bX D/+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686850468; x=1689442468; 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=6YhjaIcOgdSC4loqdzWjGFqfQ0Mx8Oy4umDdDUkZduk=; b=MiSntZol9Fg8MKnrRIicTqFjqSlXeo5H9XPYgKms0I/yTz9yGBrcZGCzhIQ9KHB+xN DycK6NMXvlmWnqCiDJpyAZDVF6bfnorakNikkmCvf5W5dQYE605QV3XzNruDvELZJlGh tBDHUEEqnb2OsTJ0u8uM4u11YRXQPn2gw6AZ0sVbq0w7ujf+3IEpwUDSoM0EJD/dlraI X8l+iAw/QfSSr0pjY1z8S02YLEHdOVb1tPLHnrNI75jmFRqJ4D9S5PSeSP5lzpuCO/w4 Pl41xp0qfHfOF+vXZq5EbLS0djst3SwCxwOxeQul7PbCi+uvTmU1ZZHkokqdD7Wfnfic ej4g== X-Gm-Message-State: AC+VfDzaFmRJ15tgyk7NbO/l+q5SNEkssaZXBne0yplaTcwtSD5K507e DtHiDJpgkIwgoxWpOgK9uAQ= X-Received: by 2002:a17:907:1613:b0:96f:b58e:7e21 with SMTP id hb19-20020a170907161300b0096fb58e7e21mr23568267ejc.52.1686850467735; Thu, 15 Jun 2023 10:34:27 -0700 (PDT) Received: from [192.168.2.2] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id lf29-20020a170907175d00b009787062d21csm9647072ejc.77.2023.06.15.10.34.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 15 Jun 2023 10:34:27 -0700 (PDT) Message-ID: <457c1da7-61dc-2a56-4f86-47413795138c@gmail.com> Date: Thu, 15 Jun 2023 19:34:26 +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 v3 3/3] mtd: rawnand: rockchip-nand-controller: 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: <0047fc52-bc45-a768-8bdd-c0f12cddc17e@gmail.com> Content-Language: en-US In-Reply-To: <0047fc52-bc45-a768-8bdd-c0f12cddc17e@gmail.com> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768794596118418068?= X-GMAIL-MSGID: =?utf-8?q?1768794596118418068?= 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 --- 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 5a0468034..fcda4c760 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;