Message ID | d4ef0bd6-816e-f6fa-9385-f05f775f0ae2@sberdevices.ru |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1053491wrd; Mon, 13 Mar 2023 00:58:50 -0700 (PDT) X-Google-Smtp-Source: AK7set9T1/W4nRzDygPO7zCmM81fzSw2Zmy5ViY8mJNWbMuxgjoGhkYWCGnnco7+SnaGhTibSp/k X-Received: by 2002:a17:90b:3907:b0:234:b964:5703 with SMTP id ob7-20020a17090b390700b00234b9645703mr35513227pjb.18.1678694330686; Mon, 13 Mar 2023 00:58:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678694330; cv=none; d=google.com; s=arc-20160816; b=yWDWB1aXhaPiQHMaC3JZET3Z7NtdfiJu3oLX/810hLJqn991V1mMSdRJKon5H/2vn+ uKmJNZL0f2LffGh+Ujp+aYVvvW3OiO9EznJE61Jifa125tkv4/Ol+8TCvNJ+1akFSKMd cjIfCVwoitpNWHkM7I9o8Niu4zueuUMV+3Xqz1i/Qb12/fQaqeU1mQTI6B7Bc4Xc/yDW IbZjbu2wyHgqt4+XhyRwd19Zd4ax5rEGN3XnYzoFKeuCZq7u7Y40RFr+EmJ32AErKJYG ZCzIuwKWgkbuK+ge/msjF3K/2Jxc4ur1TKICrInYvJ7LMq/aHtdcKydz1MOuYQdAGpRp ek5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id :dkim-signature; bh=MjAjGAw6favgxqmSJTuoTBm/E5xM29RbzZXGon97h6w=; b=OzxtkDed7xjcjU6CgXavXa5Yim+xmt8ihFMxs6sqB/m+z2biF9DD5lt9ANdkf3/HjV 5vLd5gBrALjvViDnwxCMO71mRB5SFs4pOMOygnP0jLblZg8G/BHN4o61ciOXw8x53s/0 NrxHzy3Hl5MA6g8SKurv9O9422dXeI/KrKs3VtaCXPx1j5vzx0CSiFWeJeIg762XDHRZ nkRf3DuYrAXg745Z76Ud0xFX+ExtctDHj6R303MyhNKjshDcgoQoLN05pmn/URPr3wIB CRXcrCrRvyeX2eHzcKfMNViCLg6NFw3XGcU+slo4r1lVWsI1bc5rFlg9R9ZykZBqXUvQ ASAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=oh9qrTNJ; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e12-20020a17090a9a8c00b0023bfddf2a84si3248309pjp.63.2023.03.13.00.58.36; Mon, 13 Mar 2023 00:58:50 -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=@sberdevices.ru header.s=mail header.b=oh9qrTNJ; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229891AbjCMHgC (ORCPT <rfc822;realc9580@gmail.com> + 99 others); Mon, 13 Mar 2023 03:36:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229757AbjCMHgB (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 13 Mar 2023 03:36:01 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F6112CC6B for <linux-kernel@vger.kernel.org>; Mon, 13 Mar 2023 00:35:56 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 2D79C5FD05; Mon, 13 Mar 2023 10:35:54 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678692954; bh=MjAjGAw6favgxqmSJTuoTBm/E5xM29RbzZXGon97h6w=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=oh9qrTNJ9QMW2wTJ71o5N2i2jED3ZWE+PGaj/AM0A8VuLm7PMBU+uq6iCIF8nmodA kT02E8P3l8jmy4jD7d4N6i2vDwsp7whiWKPG4dvsiAeMRx4jHQJ5R8NdqJWUumeQVY xmFmf8FgZ9Qn1GYB/9eR+LprBeZUXX4guRtgmqFH3IeLXaAXlvhbFlvZMf6n2jpod1 v5Vq7xo5/BCbyRPHhNMg1CnbTL4gETVbQu+/sl8FVIs95N492g8jTv+Sx56/0WP0Fj ytEUaYPy2EHRWvjtVWSq1WCXtajrjP4Q1NU5zSuWtrywkoQfrFCfE2/uYaVk9Alwuu abK+4fczzRR1A== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Mon, 13 Mar 2023 10:35:51 +0300 (MSK) Message-ID: <d4ef0bd6-816e-f6fa-9385-f05f775f0ae2@sberdevices.ru> Date: Mon, 13 Mar 2023 10:32:44 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Content-Language: en-US To: Liang Yang <liang.yang@amlogic.com>, Miquel Raynal <miquel.raynal@bootlin.com>, Richard Weinberger <richard@nod.at>, Vignesh Raghavendra <vigneshr@ti.com>, Neil Armstrong <neil.armstrong@linaro.org>, Kevin Hilman <khilman@baylibre.com>, Jerome Brunet <jbrunet@baylibre.com>, Martin Blumenstingl <martin.blumenstingl@googlemail.com>, Jianxin Pan <jianxin.pan@amlogic.com>, Yixun Lan <yixun.lan@amlogic.com> CC: <linux-mtd@lists.infradead.org>, <linux-arm-kernel@lists.infradead.org>, <linux-amlogic@lists.infradead.org>, <linux-kernel@vger.kernel.org>, <kernel@sberdevices.ru>, <oxffffaa@gmail.com> From: Arseniy Krasnov <avkrasnov@sberdevices.ru> Subject: [RFC PATCH v1] mtd: rawnand: meson: invalidate cache on polling ECC bit Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH02.sberdevices.ru (172.16.1.5) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/03/13 03:18:00 #20941028 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760238586594512271?= X-GMAIL-MSGID: =?utf-8?q?1760238586594512271?= |
Series |
[RFC,v1] mtd: rawnand: meson: invalidate cache on polling ECC bit
|
|
Commit Message
Arseniy Krasnov
March 13, 2023, 7:32 a.m. UTC
'info_buf' memory is cached and driver polls ECC bit in it. This bit
is set by the NAND controller. If 'usleep_range()' returns before device
sets this bit, 'info_buf' will be cached and driver won't see update of
this bit and will loop forever.
Fixes: 8fae856c5350 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller")
Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru>
---
drivers/mtd/nand/raw/meson_nand.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
Comments
Hello, we reproduced this problem on one of our boards. It triggers very rare when 'usleep_range()' is present, but when sleeping is removed - it fires always. I suppose problem is with caching, as 'info_buf' memory is mapped by 'dma_map_single()'. Thanks, Arseniy On 13.03.2023 10:32, Arseniy Krasnov wrote: > 'info_buf' memory is cached and driver polls ECC bit in it. This bit > is set by the NAND controller. If 'usleep_range()' returns before device > sets this bit, 'info_buf' will be cached and driver won't see update of > this bit and will loop forever. > > Fixes: 8fae856c5350 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller") > Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> > --- > drivers/mtd/nand/raw/meson_nand.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c > index 5ee01231ac4c..2c05c08a0eaf 100644 > --- a/drivers/mtd/nand/raw/meson_nand.c > +++ b/drivers/mtd/nand/raw/meson_nand.c > @@ -176,6 +176,7 @@ struct meson_nfc { > > dma_addr_t daddr; > dma_addr_t iaddr; > + u32 info_bytes; > > unsigned long assigned_cs; > }; > @@ -503,6 +504,7 @@ static int meson_nfc_dma_buffer_setup(struct nand_chip *nand, void *databuf, > nfc->daddr, datalen, dir); > return ret; > } > + nfc->info_bytes = infolen; > cmd = GENCMDIADDRL(NFC_CMD_AIL, nfc->iaddr); > writel(cmd, nfc->reg_base + NFC_REG_CMD); > > @@ -520,8 +522,10 @@ static void meson_nfc_dma_buffer_release(struct nand_chip *nand, > struct meson_nfc *nfc = nand_get_controller_data(nand); > > dma_unmap_single(nfc->dev, nfc->daddr, datalen, dir); > - if (infolen) > + if (infolen) { > dma_unmap_single(nfc->dev, nfc->iaddr, infolen, dir); > + nfc->info_bytes = 0; > + } > } > > static int meson_nfc_read_buf(struct nand_chip *nand, u8 *buf, int len) > @@ -710,6 +714,8 @@ static void meson_nfc_check_ecc_pages_valid(struct meson_nfc *nfc, > usleep_range(10, 15); > /* info is updated by nfc dma engine*/ > smp_rmb(); > + dma_sync_single_for_cpu(nfc->dev, nfc->iaddr, nfc->info_bytes, > + DMA_FROM_DEVICE); > ret = *info & ECC_COMPLETE; > } while (!ret); > }
Hi Arseniy, avkrasnov@sberdevices.ru wrote on Mon, 13 Mar 2023 10:36:11 +0300: > Hello, > > we reproduced this problem on one of our boards. It triggers very rare > when 'usleep_range()' is present, but when sleeping is removed - it fires > always. I suppose problem is with caching, as 'info_buf' memory is mapped by > 'dma_map_single()'. The fix looks really legitimate, indeed I get that the usleep_range() might make it work most of the time but not always. Having this bit in a DMA buf area is a bit strange. Well, the fix LGTM anyway. > > Thanks, Arseniy > > On 13.03.2023 10:32, Arseniy Krasnov wrote: > > 'info_buf' memory is cached and driver polls ECC bit in it. This bit > > is set by the NAND controller. If 'usleep_range()' returns before device > > sets this bit, 'info_buf' will be cached and driver won't see update of > > this bit and will loop forever. > > > > Fixes: 8fae856c5350 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller") > > Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> > > --- > > drivers/mtd/nand/raw/meson_nand.c | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c > > index 5ee01231ac4c..2c05c08a0eaf 100644 > > --- a/drivers/mtd/nand/raw/meson_nand.c > > +++ b/drivers/mtd/nand/raw/meson_nand.c > > @@ -176,6 +176,7 @@ struct meson_nfc { > > > > dma_addr_t daddr; > > dma_addr_t iaddr; > > + u32 info_bytes; > > > > unsigned long assigned_cs; > > }; > > @@ -503,6 +504,7 @@ static int meson_nfc_dma_buffer_setup(struct nand_chip *nand, void *databuf, > > nfc->daddr, datalen, dir); > > return ret; > > } > > + nfc->info_bytes = infolen; > > cmd = GENCMDIADDRL(NFC_CMD_AIL, nfc->iaddr); > > writel(cmd, nfc->reg_base + NFC_REG_CMD); > > > > @@ -520,8 +522,10 @@ static void meson_nfc_dma_buffer_release(struct nand_chip *nand, > > struct meson_nfc *nfc = nand_get_controller_data(nand); > > > > dma_unmap_single(nfc->dev, nfc->daddr, datalen, dir); > > - if (infolen) > > + if (infolen) { > > dma_unmap_single(nfc->dev, nfc->iaddr, infolen, dir); > > + nfc->info_bytes = 0; > > + } > > } > > > > static int meson_nfc_read_buf(struct nand_chip *nand, u8 *buf, int len) > > @@ -710,6 +714,8 @@ static void meson_nfc_check_ecc_pages_valid(struct meson_nfc *nfc, > > usleep_range(10, 15); > > /* info is updated by nfc dma engine*/ > > smp_rmb(); > > + dma_sync_single_for_cpu(nfc->dev, nfc->iaddr, nfc->info_bytes, > > + DMA_FROM_DEVICE); > > ret = *info & ECC_COMPLETE; > > } while (!ret); > > } Thanks, Miquèl
On 13/03/2023 12:18, Miquel Raynal wrote: > Hi Arseniy, > > avkrasnov@sberdevices.ru wrote on Mon, 13 Mar 2023 10:36:11 +0300: > >> Hello, >> >> we reproduced this problem on one of our boards. It triggers very rare >> when 'usleep_range()' is present, but when sleeping is removed - it fires >> always. I suppose problem is with caching, as 'info_buf' memory is mapped by >> 'dma_map_single()'. > > The fix looks really legitimate, indeed I get that the usleep_range() > might make it work most of the time but not always. Having this bit in > a DMA buf area is a bit strange. Well, the fix LGTM anyway. Yep it looks legitimate! LGTM Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> > >> >> Thanks, Arseniy >> >> On 13.03.2023 10:32, Arseniy Krasnov wrote: >>> 'info_buf' memory is cached and driver polls ECC bit in it. This bit >>> is set by the NAND controller. If 'usleep_range()' returns before device >>> sets this bit, 'info_buf' will be cached and driver won't see update of >>> this bit and will loop forever. >>> >>> Fixes: 8fae856c5350 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller") >>> Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> >>> --- >>> drivers/mtd/nand/raw/meson_nand.c | 8 +++++++- >>> 1 file changed, 7 insertions(+), 1 deletion(-) >>> >>> diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c >>> index 5ee01231ac4c..2c05c08a0eaf 100644 >>> --- a/drivers/mtd/nand/raw/meson_nand.c >>> +++ b/drivers/mtd/nand/raw/meson_nand.c >>> @@ -176,6 +176,7 @@ struct meson_nfc { >>> >>> dma_addr_t daddr; >>> dma_addr_t iaddr; >>> + u32 info_bytes; >>> >>> unsigned long assigned_cs; >>> }; >>> @@ -503,6 +504,7 @@ static int meson_nfc_dma_buffer_setup(struct nand_chip *nand, void *databuf, >>> nfc->daddr, datalen, dir); >>> return ret; >>> } >>> + nfc->info_bytes = infolen; >>> cmd = GENCMDIADDRL(NFC_CMD_AIL, nfc->iaddr); >>> writel(cmd, nfc->reg_base + NFC_REG_CMD); >>> >>> @@ -520,8 +522,10 @@ static void meson_nfc_dma_buffer_release(struct nand_chip *nand, >>> struct meson_nfc *nfc = nand_get_controller_data(nand); >>> >>> dma_unmap_single(nfc->dev, nfc->daddr, datalen, dir); >>> - if (infolen) >>> + if (infolen) { >>> dma_unmap_single(nfc->dev, nfc->iaddr, infolen, dir); >>> + nfc->info_bytes = 0; >>> + } >>> } >>> >>> static int meson_nfc_read_buf(struct nand_chip *nand, u8 *buf, int len) >>> @@ -710,6 +714,8 @@ static void meson_nfc_check_ecc_pages_valid(struct meson_nfc *nfc, >>> usleep_range(10, 15); >>> /* info is updated by nfc dma engine*/ >>> smp_rmb(); >>> + dma_sync_single_for_cpu(nfc->dev, nfc->iaddr, nfc->info_bytes, >>> + DMA_FROM_DEVICE); >>> ret = *info & ECC_COMPLETE; >>> } while (!ret); >>> } > > > Thanks, > Miquèl
Hello guys! Was it applied to some nand 'prepare-for-merge' release branch? On Mon, Mar 13, 2023 at 12:23:12PM +0100, Neil Armstrong wrote: > On 13/03/2023 12:18, Miquel Raynal wrote: > > Hi Arseniy, > > > > avkrasnov@sberdevices.ru wrote on Mon, 13 Mar 2023 10:36:11 +0300: > > > > > Hello, > > > > > > we reproduced this problem on one of our boards. It triggers very rare > > > when 'usleep_range()' is present, but when sleeping is removed - it fires > > > always. I suppose problem is with caching, as 'info_buf' memory is mapped by > > > 'dma_map_single()'. > > > > The fix looks really legitimate, indeed I get that the usleep_range() > > might make it work most of the time but not always. Having this bit in > > a DMA buf area is a bit strange. Well, the fix LGTM anyway. > > Yep it looks legitimate! > > LGTM > > > Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> > > > > > > > > > Thanks, Arseniy > > > > > > On 13.03.2023 10:32, Arseniy Krasnov wrote: > > > > 'info_buf' memory is cached and driver polls ECC bit in it. This bit > > > > is set by the NAND controller. If 'usleep_range()' returns before device > > > > sets this bit, 'info_buf' will be cached and driver won't see update of > > > > this bit and will loop forever. > > > > > > > > Fixes: 8fae856c5350 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller") > > > > Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> > > > > --- > > > > drivers/mtd/nand/raw/meson_nand.c | 8 +++++++- > > > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c > > > > index 5ee01231ac4c..2c05c08a0eaf 100644 > > > > --- a/drivers/mtd/nand/raw/meson_nand.c > > > > +++ b/drivers/mtd/nand/raw/meson_nand.c > > > > @@ -176,6 +176,7 @@ struct meson_nfc { > > > > dma_addr_t daddr; > > > > dma_addr_t iaddr; > > > > + u32 info_bytes; > > > > unsigned long assigned_cs; > > > > }; > > > > @@ -503,6 +504,7 @@ static int meson_nfc_dma_buffer_setup(struct nand_chip *nand, void *databuf, > > > > nfc->daddr, datalen, dir); > > > > return ret; > > > > } > > > > + nfc->info_bytes = infolen; > > > > cmd = GENCMDIADDRL(NFC_CMD_AIL, nfc->iaddr); > > > > writel(cmd, nfc->reg_base + NFC_REG_CMD); > > > > @@ -520,8 +522,10 @@ static void meson_nfc_dma_buffer_release(struct nand_chip *nand, > > > > struct meson_nfc *nfc = nand_get_controller_data(nand); > > > > dma_unmap_single(nfc->dev, nfc->daddr, datalen, dir); > > > > - if (infolen) > > > > + if (infolen) { > > > > dma_unmap_single(nfc->dev, nfc->iaddr, infolen, dir); > > > > + nfc->info_bytes = 0; > > > > + } > > > > } > > > > static int meson_nfc_read_buf(struct nand_chip *nand, u8 *buf, int len) > > > > @@ -710,6 +714,8 @@ static void meson_nfc_check_ecc_pages_valid(struct meson_nfc *nfc, > > > > usleep_range(10, 15); > > > > /* info is updated by nfc dma engine*/ > > > > smp_rmb(); > > > > + dma_sync_single_for_cpu(nfc->dev, nfc->iaddr, nfc->info_bytes, > > > > + DMA_FROM_DEVICE); > > > > ret = *info & ECC_COMPLETE; > > > > } while (!ret); > > > > } > > > > > > Thanks, > > Miquèl >
Hi Dmitry, ddrokosov@sberdevices.ru wrote on Mon, 20 Mar 2023 13:43:14 +0300: > Hello guys! > > Was it applied to some nand 'prepare-for-merge' release branch? Not yet, I'll apply it this week in mtd/fixes, you'll be noticed. Thanks, Miquèl > On Mon, Mar 13, 2023 at 12:23:12PM +0100, Neil Armstrong wrote: > > On 13/03/2023 12:18, Miquel Raynal wrote: > > > Hi Arseniy, > > > > > > avkrasnov@sberdevices.ru wrote on Mon, 13 Mar 2023 10:36:11 +0300: > > > > > > > Hello, > > > > > > > > we reproduced this problem on one of our boards. It triggers very rare > > > > when 'usleep_range()' is present, but when sleeping is removed - it fires > > > > always. I suppose problem is with caching, as 'info_buf' memory is mapped by > > > > 'dma_map_single()'. > > > > > > The fix looks really legitimate, indeed I get that the usleep_range() > > > might make it work most of the time but not always. Having this bit in > > > a DMA buf area is a bit strange. Well, the fix LGTM anyway. > > > > Yep it looks legitimate! > > > > LGTM > > > > > > Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> > > > > > > > > > > > > > Thanks, Arseniy > > > > > > > > On 13.03.2023 10:32, Arseniy Krasnov wrote: > > > > > 'info_buf' memory is cached and driver polls ECC bit in it. This bit > > > > > is set by the NAND controller. If 'usleep_range()' returns before device > > > > > sets this bit, 'info_buf' will be cached and driver won't see update of > > > > > this bit and will loop forever. > > > > > > > > > > Fixes: 8fae856c5350 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller") > > > > > Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> > > > > > --- > > > > > drivers/mtd/nand/raw/meson_nand.c | 8 +++++++- > > > > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > > > > > > > diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c > > > > > index 5ee01231ac4c..2c05c08a0eaf 100644 > > > > > --- a/drivers/mtd/nand/raw/meson_nand.c > > > > > +++ b/drivers/mtd/nand/raw/meson_nand.c > > > > > @@ -176,6 +176,7 @@ struct meson_nfc { > > > > > dma_addr_t daddr; > > > > > dma_addr_t iaddr; > > > > > + u32 info_bytes; > > > > > unsigned long assigned_cs; > > > > > }; > > > > > @@ -503,6 +504,7 @@ static int meson_nfc_dma_buffer_setup(struct nand_chip *nand, void *databuf, > > > > > nfc->daddr, datalen, dir); > > > > > return ret; > > > > > } > > > > > + nfc->info_bytes = infolen; > > > > > cmd = GENCMDIADDRL(NFC_CMD_AIL, nfc->iaddr); > > > > > writel(cmd, nfc->reg_base + NFC_REG_CMD); > > > > > @@ -520,8 +522,10 @@ static void meson_nfc_dma_buffer_release(struct nand_chip *nand, > > > > > struct meson_nfc *nfc = nand_get_controller_data(nand); > > > > > dma_unmap_single(nfc->dev, nfc->daddr, datalen, dir); > > > > > - if (infolen) > > > > > + if (infolen) { > > > > > dma_unmap_single(nfc->dev, nfc->iaddr, infolen, dir); > > > > > + nfc->info_bytes = 0; > > > > > + } > > > > > } > > > > > static int meson_nfc_read_buf(struct nand_chip *nand, u8 *buf, int len) > > > > > @@ -710,6 +714,8 @@ static void meson_nfc_check_ecc_pages_valid(struct meson_nfc *nfc, > > > > > usleep_range(10, 15); > > > > > /* info is updated by nfc dma engine*/ > > > > > smp_rmb(); > > > > > + dma_sync_single_for_cpu(nfc->dev, nfc->iaddr, nfc->info_bytes, > > > > > + DMA_FROM_DEVICE); > > > > > ret = *info & ECC_COMPLETE; > > > > > } while (!ret); > > > > > } > > > > > > > > > Thanks, > > > Miquèl > > >
Hello Miquèl, On Mon, Mar 20, 2023 at 11:55:58AM +0100, Miquel Raynal wrote: > Hi Dmitry, > > ddrokosov@sberdevices.ru wrote on Mon, 20 Mar 2023 13:43:14 +0300: > > > Hello guys! > > > > Was it applied to some nand 'prepare-for-merge' release branch? > > Not yet, I'll apply it this week in mtd/fixes, you'll be noticed. > > Thanks, > Miquèl > Thank you for clarification! [...]
On Mon, 2023-03-13 at 07:32:44 UTC, Arseniy Krasnov wrote: > 'info_buf' memory is cached and driver polls ECC bit in it. This bit > is set by the NAND controller. If 'usleep_range()' returns before device > sets this bit, 'info_buf' will be cached and driver won't see update of > this bit and will loop forever. > > Fixes: 8fae856c5350 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller") > Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> > Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/fixes, thanks. Miquel
diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c index 5ee01231ac4c..2c05c08a0eaf 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -176,6 +176,7 @@ struct meson_nfc { dma_addr_t daddr; dma_addr_t iaddr; + u32 info_bytes; unsigned long assigned_cs; }; @@ -503,6 +504,7 @@ static int meson_nfc_dma_buffer_setup(struct nand_chip *nand, void *databuf, nfc->daddr, datalen, dir); return ret; } + nfc->info_bytes = infolen; cmd = GENCMDIADDRL(NFC_CMD_AIL, nfc->iaddr); writel(cmd, nfc->reg_base + NFC_REG_CMD); @@ -520,8 +522,10 @@ static void meson_nfc_dma_buffer_release(struct nand_chip *nand, struct meson_nfc *nfc = nand_get_controller_data(nand); dma_unmap_single(nfc->dev, nfc->daddr, datalen, dir); - if (infolen) + if (infolen) { dma_unmap_single(nfc->dev, nfc->iaddr, infolen, dir); + nfc->info_bytes = 0; + } } static int meson_nfc_read_buf(struct nand_chip *nand, u8 *buf, int len) @@ -710,6 +714,8 @@ static void meson_nfc_check_ecc_pages_valid(struct meson_nfc *nfc, usleep_range(10, 15); /* info is updated by nfc dma engine*/ smp_rmb(); + dma_sync_single_for_cpu(nfc->dev, nfc->iaddr, nfc->info_bytes, + DMA_FROM_DEVICE); ret = *info & ECC_COMPLETE; } while (!ret); }