From nobody Thu Dec 18 04:47:16 2025 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C314813AD09; Tue, 7 May 2024 23:20:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=37.18.73.165 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715124010; cv=none; b=OQ2/9ujOid2chednbpelyEjuYckqjQzuxurt3lg+XBFlXVsd8V4Td0pC/A+31gI/5RESsSU18k5Ah92lP2OI+ctBqctZX0Lf48apcxyS/kf27CBb34srkvFmcfpQ3/QNqkF88mTpxUt1upWDUE+b919Mj5LFDSkXFOS2ymL48to= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715124010; c=relaxed/simple; bh=VXXp+vIcwUatnl8KxL30RNVCCUrO76jiXcAXDYXeP3A=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=oMvRJA+QzeofBYSQNYiiUuRGBuoOTFplHMVWyUFiTrIWmEJWycrgdgn1LUHRh+/T3lazVM7UkmwzwIt2/JBOApsieEQYJt/j+D9ZZThRE9+9BO+eK5ZD8KcAJe2S6kKcPFMBi3e/2w6kJiBOykaDWo/37/S53a+9sAh3jw8jl20= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com; spf=pass smtp.mailfrom=salutedevices.com; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b=tV9RFvpe; arc=none smtp.client-ip=37.18.73.165 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b="tV9RFvpe" Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 4B723100002; Wed, 8 May 2024 02:20:01 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 4B723100002 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1715124001; bh=Sg2NSSWydrUfExA0STQZrax0QRiPJJZL+IsAQDgDZr4=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=tV9RFvpe0KVjONwN3XoOres7K8W9UQQTfKCWASu0JlFMdcvlf0DgHwmDGhjzPyRTN 0vaAj39KBLLY+XxH/MdG2vvPChxSQdHpzj6/G5iCSOtwBxfJdZdoaiOQBBnKwAAeQH AUKROv7sOZj3RjNpO6qLOtghHznPWkQ73uQv5yY8nnGK4VucvclgZVJ0W1weia7csj B1HR/OKB8/Ahk8gyvviRF/WqAEwOdyePTcASVlECT5SpwUOKXJGkax6FoB2JM/Ude8 3G1lh2yp1qwvonJDSM6LKRqIhNNpkmGMC8S1Tl4kzIC33x4u4Lal+MCRwP/hHNw5hE o7pFgWJM30wUQ== Received: from smtp.sberdevices.ru (p-i-exch-sc-m02.sberdevices.ru [172.16.192.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Wed, 8 May 2024 02:20:01 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 8 May 2024 02:20:00 +0300 From: Arseniy Krasnov To: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl CC: , , , , , , , Arseniy Krasnov Subject: [PATCH v6 1/3] dt-bindings: mtd: amlogic,meson-nand: support fields for boot ROM code Date: Wed, 8 May 2024 02:09:01 +0300 Message-ID: <20240507230903.3399594-2-avkrasnov@salutedevices.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20240507230903.3399594-1-avkrasnov@salutedevices.com> References: <20240507230903.3399594-1-avkrasnov@salutedevices.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) To p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 185123 [May 07 2024] X-KSMG-AntiSpam-Version: 6.1.0.4 X-KSMG-AntiSpam-Envelope-From: avkrasnov@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 19 0.3.19 07c7fa124d1a1dc9662cdc5aace418c06ae99d2b, {Tracking_from_domain_doesnt_match_to}, 127.0.0.199:7.1.2;100.64.160.123:7.1.2;salutedevices.com:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;smtp.sberdevices.ru:7.1.1,5.0.1, FromAlignment: s, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2024/05/07 17:58:00 #25118681 X-KSMG-AntiVirus-Status: Clean, skipped Content-Type: text/plain; charset="utf-8" Boot ROM code on Meson requires that some pages on NAND must be written in special mode: "short" ECC mode where each block is 384 bytes and scrambling mode is on. Such pages are located on the chip in the following way (for example): [ p0 ][ p1 ][ p2 ][ p3 ][ p4 ][ p5 ][ p6 ][ p7 ] ... [ pN ] ^ ^ ^ ^ pX is page number "X". "^" means "special" page used by boot ROM - e.g. every 2nd page in the range of [0, 7]. Step (2 in example is set by 'amlogic,boot-page-step' field. Last page in range (7 in example) is set by 'amlogic,boot-pages' field. Signed-off-by: Arseniy Krasnov Reviewed-by: Rob Herring (Arm) --- .../bindings/mtd/amlogic,meson-nand.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml = b/Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml index 57b6957c8415..284f0f882c32 100644 --- a/Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml +++ b/Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml @@ -64,11 +64,29 @@ patternProperties: items: maximum: 0 =20 + amlogic,boot-pages: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + Number of pages starting from offset 0, where a special ECC + configuration must be used because it is accessed by the ROM + code. This ECC configuration uses 384 bytes data blocks. + Also scrambling mode is enabled for such pages. + + amlogic,boot-page-step: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + Interval between pages, accessed by the ROM code. For example + we have 8 pages [0, 7]. Pages 0,2,4,6 are accessed by the + ROM code, so this field will be 2 (e.g. every 2nd page). Rest + of pages - 1,3,5,7 are read/written without this mode. + unevaluatedProperties: false =20 dependencies: nand-ecc-strength: [nand-ecc-step-size] nand-ecc-step-size: [nand-ecc-strength] + amlogic,boot-pages: [nand-is-boot-medium, "amlogic,boot-page-step"] + amlogic,boot-page-step: [nand-is-boot-medium, "amlogic,boot-pages"] =20 =20 required: --=20 2.35.0 From nobody Thu Dec 18 04:47:16 2025 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72FA312B154; Tue, 7 May 2024 23:20:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.89.224.132 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715124008; cv=none; b=WWgwPfEcxTMWkqSgTV0MxO+hfGpUAWrH8fxETUoQb3J7Pnt7c+sqBK0PUBMGVN9nElGnV5dgeREtHUh1XW0+Hl8ASEI+SRi2Z3JGT2FjDCW0za3mJRtgvzq4q43t5qzV/N3kpEMm6gILSImeV1/pCMwnZFpmSDhtbqfKL38OvxA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715124008; c=relaxed/simple; bh=QwwAqOn46R/jiuKaFnlOs6padCpr74/QcIK37vuNntA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TfQSlXwU27S1VyOouBT4SXuwmjo+8F9VFfzuNkQycaj2AkObkRvGB0Iw4dLhDMDOjV2Gqdn0L61hWHaDWlFGTKb49s4Tza1RW2utj4I5linj64jLZ7HjaMVWLkblfJhAa6THuIsy3Qux0oNlt8Fg+0SGkeRs8UdjNSakCy9LyeU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com; spf=pass smtp.mailfrom=salutedevices.com; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b=p68wFcxT; arc=none smtp.client-ip=45.89.224.132 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b="p68wFcxT" Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 85E17120008; Wed, 8 May 2024 02:20:01 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 85E17120008 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1715124001; bh=JONu+0vUGzTkLvKnbTuMAODEVQdfxNTslB9TaWIptHk=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=p68wFcxTIL6zAYmhhobGhbu3l6gisJYcjZU30d2ezLJvM04Fh6Ng1f9aB8aLZS9l3 rGrwrrCbOFJt5H3Ic+6AKVTmZvslZBCjLRv7z0SnCKGOU3cwWtyO/4RlHQ+3KjPE5K gKUyF6WsW5xIK2PQZ0FU+E2LVra/1D280NIijFKfcAEbikpgS2MX9h3BBbBUTbgY20 Ix9OVu+O4OkpAt9o3PvdW0+nF/bocb2g8Dq1MfPUqyN7bayzWKIXxPrEPEieuzpLOi kNP07Khlm0GLrlWfsHQDJUvz9aGCOHwDxsw2bEsgtCrGYt3nswKsfWqokYJ08HPNrU Qe5BmLEBx0NVA== Received: from smtp.sberdevices.ru (p-i-exch-sc-m02.sberdevices.ru [172.16.192.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Wed, 8 May 2024 02:20:01 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 8 May 2024 02:20:00 +0300 From: Arseniy Krasnov To: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl CC: , , , , , , , Arseniy Krasnov Subject: [PATCH v6 2/3] mtd: rawnand: meson: refactor use of 'meson_nfc_cmd_access()' Date: Wed, 8 May 2024 02:09:02 +0300 Message-ID: <20240507230903.3399594-3-avkrasnov@salutedevices.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20240507230903.3399594-1-avkrasnov@salutedevices.com> References: <20240507230903.3399594-1-avkrasnov@salutedevices.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) To p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 185123 [May 07 2024] X-KSMG-AntiSpam-Version: 6.1.0.4 X-KSMG-AntiSpam-Envelope-From: avkrasnov@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 19 0.3.19 07c7fa124d1a1dc9662cdc5aace418c06ae99d2b, {Tracking_from_domain_doesnt_match_to}, salutedevices.com:7.1.1;100.64.160.123:7.1.2;smtp.sberdevices.ru:7.1.1,5.0.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2, FromAlignment: s, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2024/05/07 17:58:00 #25118681 X-KSMG-AntiVirus-Status: Clean, skipped Content-Type: text/plain; charset="utf-8" Move call 'meson_nfc_cmd_seed()' and check for 'NAND_NEED_SCRAMBLING' to 'meson_nfc_cmd_access()', thus removing code duplication. Signed-off-by: Arseniy Krasnov --- drivers/mtd/nand/raw/meson_nand.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson= _nand.c index 00ce0e5bb970..39f50cbd4ab9 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -298,14 +298,19 @@ static void meson_nfc_cmd_seed(struct meson_nfc *nfc,= u32 seed) nfc->reg_base + NFC_REG_CMD); } =20 -static void meson_nfc_cmd_access(struct nand_chip *nand, int raw, bool dir, - int scrambler) +static void meson_nfc_cmd_access(struct nand_chip *nand, int raw, bool dir= , int page) { struct mtd_info *mtd =3D nand_to_mtd(nand); struct meson_nfc *nfc =3D nand_get_controller_data(mtd_to_nand(mtd)); struct meson_nfc_nand_chip *meson_chip =3D to_meson_nand(nand); u32 bch =3D meson_chip->bch_mode, cmd; int len =3D mtd->writesize, pagesize, pages; + int scrambler; + + if (nand->options & NAND_NEED_SCRAMBLING) + scrambler =3D NFC_CMD_SCRAMBLER_ENABLE; + else + scrambler =3D NFC_CMD_SCRAMBLER_DISABLE; =20 pagesize =3D nand->ecc.size; =20 @@ -321,6 +326,9 @@ static void meson_nfc_cmd_access(struct nand_chip *nand= , int raw, bool dir, cmd =3D CMDRWGEN(DMA_DIR(dir), scrambler, bch, NFC_CMD_SHORTMODE_DISABLE, pagesize, pages); =20 + if (scrambler =3D=3D NFC_CMD_SCRAMBLER_ENABLE) + meson_nfc_cmd_seed(nfc, page); + writel(cmd, nfc->reg_base + NFC_REG_CMD); } =20 @@ -743,14 +751,7 @@ static int meson_nfc_write_page_sub(struct nand_chip *= nand, if (ret) return ret; =20 - if (nand->options & NAND_NEED_SCRAMBLING) { - meson_nfc_cmd_seed(nfc, page); - meson_nfc_cmd_access(nand, raw, DIRWRITE, - NFC_CMD_SCRAMBLER_ENABLE); - } else { - meson_nfc_cmd_access(nand, raw, DIRWRITE, - NFC_CMD_SCRAMBLER_DISABLE); - } + meson_nfc_cmd_access(nand, raw, DIRWRITE, page); =20 cmd =3D nfc->param.chip_select | NFC_CMD_CLE | NAND_CMD_PAGEPROG; writel(cmd, nfc->reg_base + NFC_REG_CMD); @@ -829,14 +830,7 @@ static int meson_nfc_read_page_sub(struct nand_chip *n= and, if (ret) return ret; =20 - if (nand->options & NAND_NEED_SCRAMBLING) { - meson_nfc_cmd_seed(nfc, page); - meson_nfc_cmd_access(nand, raw, DIRREAD, - NFC_CMD_SCRAMBLER_ENABLE); - } else { - meson_nfc_cmd_access(nand, raw, DIRREAD, - NFC_CMD_SCRAMBLER_DISABLE); - } + meson_nfc_cmd_access(nand, raw, DIRREAD, page); =20 ret =3D meson_nfc_wait_dma_finish(nfc); meson_nfc_check_ecc_pages_valid(nfc, nand, raw); --=20 2.35.0 From nobody Thu Dec 18 04:47:16 2025 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9BF0113B286; Tue, 7 May 2024 23:20:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=37.18.73.165 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715124011; cv=none; b=i+hvlyjiIy02zvC1znHUQh9iIdEb7ORlRClhJ4g/gkxRyXtjAp7kOu2KGX0XxF1d1/7qR8x5GfoYNPBlgA1bNPEn8RrTS6j7faBKitql3zAO5pGwM0K9DUyP1a4iSg+pXDiG/zFussnfFvtGFD1w4xORfvhkfGeNJaFJs/kyJho= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715124011; c=relaxed/simple; bh=v0EdtP1q+zCr974MUYleD8WuWJwDtW76IyufQ3VoZqY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GcBmxt8zWYFnzmyz60JLYrWa67Mgs1KqrGyz1qLuOeSjO/9WzwJFWw2JPDRbi5onZ01jnyL4ex+gtnNIWszR8N+fXH5tML9s2PZZeO9Xsn5DqxukVGJzvxRr8C+tySTgvgA5jFUE5BO9xK1EyF5Xae908Xyh1ObAMUpZFhEqczU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com; spf=pass smtp.mailfrom=salutedevices.com; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b=UpSDvpXU; arc=none smtp.client-ip=37.18.73.165 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b="UpSDvpXU" Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id D9DC2100004; Wed, 8 May 2024 02:20:01 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru D9DC2100004 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1715124001; bh=8ZYhKfZJ27Bg9mhE4x9FkjiYTdtndNlZ9xkVO7p4G9s=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=UpSDvpXUE3LQEvb5Gc91U1GSsex64FTbGel5lkka0jd+qKyrPtvTHQJVrJU1cJCJh gPYiCMCwiMA3Pu+Jp3F0w+7DMJ0jqQaDYONjFqXVIVv2TqjlS5Gc+qIY56llCqnkp+ k5ZryamUVCxAXvpYq5QNQqQPBMTYFFYeBwpWZmPaFvlPLkbbGy0slhXDLISybkuJmK sCN0A8n1lkmemrS/maaqgQ1obqKRNP8KCs+i+8SVS/ncL5tGd9Z03T2IivQFlTRIMJ ucH+qHh8TIl2IJKfM/n4BXOXOcE1K8nLbcWdy6XiHmdKnzVk8/1+IHq+M15zP2L84F 04ySJcMBMuCmw== Received: from smtp.sberdevices.ru (p-i-exch-sc-m02.sberdevices.ru [172.16.192.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Wed, 8 May 2024 02:20:01 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 8 May 2024 02:20:01 +0300 From: Arseniy Krasnov To: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl CC: , , , , , , , Arseniy Krasnov Subject: [PATCH v6 3/3] mtd: rawnand: meson: read/write access for boot ROM pages Date: Wed, 8 May 2024 02:09:03 +0300 Message-ID: <20240507230903.3399594-4-avkrasnov@salutedevices.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20240507230903.3399594-1-avkrasnov@salutedevices.com> References: <20240507230903.3399594-1-avkrasnov@salutedevices.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) To p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 185123 [May 07 2024] X-KSMG-AntiSpam-Version: 6.1.0.4 X-KSMG-AntiSpam-Envelope-From: avkrasnov@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 19 0.3.19 07c7fa124d1a1dc9662cdc5aace418c06ae99d2b, {Tracking_from_domain_doesnt_match_to}, 127.0.0.199:7.1.2;100.64.160.123:7.1.2;salutedevices.com:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;smtp.sberdevices.ru:7.1.1,5.0.1, FromAlignment: s, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2024/05/07 17:58:00 #25118681 X-KSMG-AntiVirus-Status: Clean, skipped Content-Type: text/plain; charset="utf-8" Boot ROM on Meson needs some pages to be read/written in a special mode: 384 byte ECC mode (so called "short" by Amlogic) and with scrambling enabled. Such pages are located on the chip in the following way (for example): [ p0 ][ p1 ][ p2 ][ p3 ][ p4 ][ p5 ][ p6 ][ p7 ] ... [ pN ] ^ ^ ^ ^ pX is page number "X". "^" means "special" page used by boot ROM - e.g. every 2nd page in the range of [0, 7]. Step (2 here) and last page in range is read from the device tree. Signed-off-by: Arseniy Krasnov --- drivers/mtd/nand/raw/meson_nand.c | 58 +++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson= _nand.c index 39f50cbd4ab9..c1bc04dc503e 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -35,6 +35,7 @@ #define NFC_CMD_RB BIT(20) #define NFC_CMD_SCRAMBLER_ENABLE BIT(19) #define NFC_CMD_SCRAMBLER_DISABLE 0 +#define NFC_CMD_SHORTMODE_ENABLE 1 #define NFC_CMD_SHORTMODE_DISABLE 0 #define NFC_CMD_RB_INT BIT(14) #define NFC_CMD_RB_INT_NO_PIN ((0xb << 10) | BIT(18) | BIT(16)) @@ -78,6 +79,8 @@ #define DMA_DIR(dir) ((dir) ? NFC_CMD_N2M : NFC_CMD_M2N) #define DMA_ADDR_ALIGN 8 =20 +#define NFC_SHORT_MODE_ECC_SZ 384 + #define ECC_CHECK_RETURN_FF (-1) =20 #define NAND_CE0 (0xe << 10) @@ -125,6 +128,8 @@ struct meson_nfc_nand_chip { u32 twb; u32 tadl; u32 tbers_max; + u32 boot_pages; + u32 boot_page_step; =20 u32 bch_mode; u8 *data_buf; @@ -298,33 +303,46 @@ static void meson_nfc_cmd_seed(struct meson_nfc *nfc,= u32 seed) nfc->reg_base + NFC_REG_CMD); } =20 +static int meson_nfc_is_boot_page(struct nand_chip *nand, int page) +{ + const struct meson_nfc_nand_chip *meson_chip =3D to_meson_nand(nand); + + return (nand->options & NAND_IS_BOOT_MEDIUM) && + !(page % meson_chip->boot_page_step) && + (page < meson_chip->boot_pages); +} + static void meson_nfc_cmd_access(struct nand_chip *nand, int raw, bool dir= , int page) { + const struct meson_nfc_nand_chip *meson_chip =3D to_meson_nand(nand); struct mtd_info *mtd =3D nand_to_mtd(nand); struct meson_nfc *nfc =3D nand_get_controller_data(mtd_to_nand(mtd)); - struct meson_nfc_nand_chip *meson_chip =3D to_meson_nand(nand); - u32 bch =3D meson_chip->bch_mode, cmd; int len =3D mtd->writesize, pagesize, pages; int scrambler; + u32 cmd; =20 if (nand->options & NAND_NEED_SCRAMBLING) scrambler =3D NFC_CMD_SCRAMBLER_ENABLE; else scrambler =3D NFC_CMD_SCRAMBLER_DISABLE; =20 - pagesize =3D nand->ecc.size; - if (raw) { len =3D mtd->writesize + mtd->oobsize; cmd =3D len | scrambler | DMA_DIR(dir); - writel(cmd, nfc->reg_base + NFC_REG_CMD); - return; - } + } else if (meson_nfc_is_boot_page(nand, page)) { + pagesize =3D NFC_SHORT_MODE_ECC_SZ >> 3; + pages =3D mtd->writesize / 512; =20 - pages =3D len / nand->ecc.size; + scrambler =3D NFC_CMD_SCRAMBLER_ENABLE; + cmd =3D CMDRWGEN(DMA_DIR(dir), scrambler, NFC_ECC_BCH8_1K, + NFC_CMD_SHORTMODE_ENABLE, pagesize, pages); + } else { + pagesize =3D nand->ecc.size >> 3; + pages =3D len / nand->ecc.size; =20 - cmd =3D CMDRWGEN(DMA_DIR(dir), scrambler, bch, - NFC_CMD_SHORTMODE_DISABLE, pagesize, pages); + cmd =3D CMDRWGEN(DMA_DIR(dir), scrambler, meson_chip->bch_mode, + NFC_CMD_SHORTMODE_DISABLE, pagesize, pages); + } =20 if (scrambler =3D=3D NFC_CMD_SCRAMBLER_ENABLE) meson_nfc_cmd_seed(nfc, page); @@ -1430,6 +1448,26 @@ meson_nfc_nand_chip_init(struct device *dev, if (ret) return ret; =20 + if (nand->options & NAND_IS_BOOT_MEDIUM) { + ret =3D of_property_read_u32(np, "amlogic,boot-pages", + &meson_chip->boot_pages); + if (ret) { + dev_err(dev, "could not retrieve 'amlogic,boot-pages' property: %d", + ret); + nand_cleanup(nand); + return ret; + } + + ret =3D of_property_read_u32(np, "amlogic,boot-page-step", + &meson_chip->boot_page_step); + if (ret) { + dev_err(dev, "could not retrieve 'amlogic,boot-page-step' property: %d", + ret); + nand_cleanup(nand); + return ret; + } + } + ret =3D mtd_device_register(mtd, NULL, 0); if (ret) { dev_err(dev, "failed to register MTD device: %d\n", ret); --=20 2.35.0