From nobody Fri Feb 13 02:47:32 2026 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 F1AA1180A75; Wed, 10 Apr 2024 19:05:07 +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=1712775911; cv=none; b=eOcy+pzZiTU506U/8xknphOCfflk9z44KgOTmWFCeSTSBBFOAc5C5pTtbhZEIK5nCXzfV4r0lB9w9NT6AHFLBpmlK+V8HTagsedLyd8wl3AyecsTKqPQEvwBle24r9aLwu3TxiJF9L2iEIWNX9yp6xLB8xD2ja7J0zpUX0k5FjA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712775911; c=relaxed/simple; bh=g/FqV19rKWb535cexKioS66bqLX57/QzG0Uv51rTSZs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=O2KbJS27lFc564yyNDYZqiKkCqcn3C/qIqO651EgXnIoP9Ttp3cIqhB1Nx1OQb0eXVI0Wxkyt/P7O2otWUAl35gXS2mZB+VPdoZ0gzWw/sw0srOLLl6NaZw1gKzFxwWErWPB9YTRkra3SL0KCKJogtpykMmJC31u4wWVXWFeEg4= 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=YXRKntLK; 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="YXRKntLK" Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id CC67B10007C; Wed, 10 Apr 2024 22:04:59 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru CC67B10007C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1712775899; bh=nlvCjxCsDmswnKHUR9zLC0s4ABtaZZnkhgMtH/U3PBg=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=YXRKntLKo5upqcu6QBNT6qnDkhTJScyKLOu+7vm7d2wRSrasEaKWxrGYJrfE2uSNP iA0PFOvbf01UwsWpCvTdlMQj+Nl7bLMqCEHhFW+HMbt43DXAotbY/EqyUjm8568Gem Oc7ARSAE+uoDA7CNEbHeTnE0xgeSer2l+VBC8Pr0p2JxLF6WOU1VmTT7TG/C/+Qts5 GdspLkbLxj6cvaBwO55gaMy5xQIpX5lZdDIzSjAL6m5zF8bl2bfNbq/ankkftHJXtf SY7faaWAW9tdZNvc4WU5tzJh8+8MX8shxgi+N2D+o+wjsekSvShMCA7M8z21+lthBN zlR+HFV9Kw/3w== 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, 10 Apr 2024 22:04:59 +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, 10 Apr 2024 22:04:59 +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 v4 2/2] mtd: rawnand: meson: support R/W mode for boot ROM Date: Wed, 10 Apr 2024 21:54:09 +0300 Message-ID: <20240410185409.2635622-3-avkrasnov@salutedevices.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20240410185409.2635622-1-avkrasnov@salutedevices.com> References: <20240410185409.2635622-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: 184659 [Apr 10 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: 16 0.3.16 6e64c33514fcbd07e515710c86ba61de7f56194e, {Tracking_from_domain_doesnt_match_to}, 100.64.160.123:7.1.2;salutedevices.com:7.1.1;smtp.sberdevices.ru:5.0.1,7.1.1;127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.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/04/10 15:26:00 #24739493 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 located with the specified interval within specified offset. Both interval and offset are located in the device tree and used by driver if 'nand-is-boot-medium' is set for NAND chip. Signed-off-by: Arseniy Krasnov --- drivers/mtd/nand/raw/meson_nand.c | 88 +++++++++++++++++++++---------- 1 file changed, 59 insertions(+), 29 deletions(-) diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson= _nand.c index 00ce0e5bb970..9ee11243b257 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,28 +303,49 @@ 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 int meson_nfc_page_is_boot(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, bool raw, bool di= r, 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 - pagesize =3D nand->ecc.size; + if (nand->options & NAND_NEED_SCRAMBLING) + scrambler =3D NFC_CMD_SCRAMBLER_ENABLE; + else + scrambler =3D NFC_CMD_SCRAMBLER_DISABLE; =20 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_page_is_boot(nand, page)) { + pagesize =3D NFC_SHORT_MODE_ECC_SZ >> 3; + pages =3D mtd->writesize / 512; + + 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 - pages =3D len / nand->ecc.size; + cmd =3D CMDRWGEN(DMA_DIR(dir), scrambler, meson_chip->bch_mode, + NFC_CMD_SHORTMODE_DISABLE, pagesize, pages); + } =20 - cmd =3D CMDRWGEN(DMA_DIR(dir), scrambler, bch, - NFC_CMD_SHORTMODE_DISABLE, pagesize, pages); + if (scrambler =3D=3D NFC_CMD_SCRAMBLER_ENABLE) + meson_nfc_cmd_seed(nfc, page); =20 writel(cmd, nfc->reg_base + NFC_REG_CMD); } @@ -743,15 +769,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); cmd =3D nfc->param.chip_select | NFC_CMD_CLE | NAND_CMD_PAGEPROG; writel(cmd, nfc->reg_base + NFC_REG_CMD); meson_nfc_queue_rb(nand, PSEC_TO_MSEC(sdr->tPROG_max), false); @@ -829,15 +847,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); ret =3D meson_nfc_wait_dma_finish(nfc); meson_nfc_check_ecc_pages_valid(nfc, nand, raw); =20 @@ -1436,6 +1446,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