| From max.oss.09@gmail.com Wed Feb 21 12:00:21 2024 |
| From: max.oss.09@gmail.com |
| Date: Wed, 7 Feb 2024 18:49:11 +0100 |
| Subject: Revert "Revert "mtd: rawnand: gpmi: Fix setting busy timeout setting"" |
| To: stable@vger.kernel.org |
| Cc: gregkh@linuxfoundation.org, patches@lists.linux.dev, s.hauer@pengutronix.de, han.xu@nxp.com, tomasz.mon@camlingroup.com, richard@nod.at, tharvey@gateworks.com, linux-mtd@lists.infradead.org, Max Krummenacher <max.krummenacher@toradex.com> |
| Message-ID: <20240207174911.870822-2-max.oss.09@gmail.com> |
| |
| From: Max Krummenacher <max.krummenacher@toradex.com> |
| |
| This reverts commit 15a3adfe75937c9e4e0e48f0ed40dd39a0e526e2. |
| |
| The backport of [1] relies on having [2] also backported. Having only |
| one of the two results in a bogus hw->timing1 setting. |
| |
| If only [2] is backportet the 16 bit register value likely underflows |
| resulting in a busy_wait_timeout of 0. |
| Or if only [1] is applied the value likely overflows with chances of |
| having last 16 LSBs all 0 which would then result in a |
| busy_wait_timeout of 0 too. |
| |
| Both cases may lead to NAND data corruption, e.g. on a Colibri iMX7 |
| setup this has been seen. |
| |
| [1] commit 0fddf9ad06fd ("mtd: rawnand: gpmi: Set WAIT_FOR_READY timeout based on program/erase times") |
| [2] commit 06781a5026350 ("mtd: rawnand: gpmi: Fix setting busy timeout setting") |
| |
| Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c |
| +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c |
| @@ -684,7 +684,7 @@ static void gpmi_nfc_compute_timings(str |
| hw->timing0 = BF_GPMI_TIMING0_ADDRESS_SETUP(addr_setup_cycles) | |
| BF_GPMI_TIMING0_DATA_HOLD(data_hold_cycles) | |
| BF_GPMI_TIMING0_DATA_SETUP(data_setup_cycles); |
| - hw->timing1 = BF_GPMI_TIMING1_BUSY_TIMEOUT(busy_timeout_cycles * 4096); |
| + hw->timing1 = BF_GPMI_TIMING1_BUSY_TIMEOUT(DIV_ROUND_UP(busy_timeout_cycles, 4096)); |
| |
| /* |
| * Derive NFC ideal delay from {3}: |
