kernel: bump 5.10 to 5.10.32
Deleted (reverse-appliable): mediatek/patches-5.10/360-mtd-rawnand-mtk-Fix-WAITRDY-break-condition-and-time.patch Automatically refreshed: ath79/patches-5.10/0036-GPIO-add-named-gpio-exports.patch generic/backport-5.10/600-v5.12-net-extract-napi-poll-functionality-to-__napi_poll.patch generic/backport-5.10/601-v5.12-net-implement-threaded-able-napi-poll-loop-support.patch generic/backport-5.10/602-v5.12-net-add-sysfs-attribute-to-control-napi-threaded-mod.patch generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch generic/pending-5.10/600-netfilter_conntrack_flush.patch generic/pending-5.10/613-netfilter_optional_tcp_window_check.patch generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch generic/pending-5.10/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch lantiq/patches-5.10/0030-GPIO-add-named-gpio-exports.patch ramips/patches-5.10/800-GPIO-add-named-gpio-exports.patch Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
This commit is contained in:
committed by
Kevin Darbyshire-Bryant
parent
3e3af1908c
commit
182eaa4916
@@ -1,36 +0,0 @@
|
||||
From 4a4854761c9dedeedbf72c25d1317ab2e7600d4f Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Mon, 8 Mar 2021 23:16:17 +0100
|
||||
Subject: [PATCH] mtd: rawnand: mtk: Fix WAITRDY break condition and timeout
|
||||
|
||||
This fixes NAND_OP_WAITRDY_INSTR operation in the driver. Without this
|
||||
change the driver waits till the system is busy, but we should wait till
|
||||
the busy flag is cleared. The readl_poll_timeout() function gets a break
|
||||
condition, not a wait condition.
|
||||
|
||||
In addition fix the timeout. The timeout_ms is given in ms, but the
|
||||
readl_poll_timeout() function takes the timeout in us. Multiple the
|
||||
given timeout by 1000 to convert it.
|
||||
|
||||
Without this change, the driver does not work at all, it doesn't even
|
||||
identify the NAND chip.
|
||||
|
||||
Fixes: 5197360f9e09 ("mtd: rawnand: mtk: Convert the driver to exec_op()")
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
drivers/mtd/nand/raw/mtk_nand.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/drivers/mtd/nand/raw/mtk_nand.c
|
||||
+++ b/drivers/mtd/nand/raw/mtk_nand.c
|
||||
@@ -488,8 +488,8 @@ static int mtk_nfc_exec_instr(struct nan
|
||||
return 0;
|
||||
case NAND_OP_WAITRDY_INSTR:
|
||||
return readl_poll_timeout(nfc->regs + NFI_STA, status,
|
||||
- status & STA_BUSY, 20,
|
||||
- instr->ctx.waitrdy.timeout_ms);
|
||||
+ !(status & STA_BUSY), 20,
|
||||
+ instr->ctx.waitrdy.timeout_ms * 1000);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
Reference in New Issue
Block a user