From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D68BCD3437 for ; Tue, 19 Sep 2023 06:10:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231519AbjISGKq (ORCPT ); Tue, 19 Sep 2023 02:10:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230445AbjISGKp (ORCPT ); Tue, 19 Sep 2023 02:10:45 -0400 X-Greylist: delayed 314 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 18 Sep 2023 23:10:36 PDT Received: from relay.smtp-ext.broadcom.com (relay.smtp-ext.broadcom.com [192.19.144.205]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C700BFB for ; Mon, 18 Sep 2023 23:10:36 -0700 (PDT) Received: from bld-lvn-bcawlan-34.lvn.broadcom.net (bld-lvn-bcawlan-34.lvn.broadcom.net [10.75.138.137]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id C084FC0000F3; Mon, 18 Sep 2023 23:05:21 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com C084FC0000F3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1695103521; bh=09BueAXrkeyKTCSAtRksv4Oz3hkwQh7dOMwg03fXTmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lhcTLpttMD7jH7NmH1GjV8wAI7t9fvBveaEMdJtc8smzjj/QUcswQN9S7JFeymAzp zby44LMKeppP9YRL1K7D6ipXkINeFkxfmrFme9jinJAmBit8He2LYqsxHPdLbimNk8 qQ25bVi8NPGNa4lHctw7kmjY4UL+9Pfjyw9y+uGg= Received: from bcacpedev-irv-3.lvn.broadcom.net (bcacpedev-irv-3.lvn.broadcom.net [10.75.138.105]) by bld-lvn-bcawlan-34.lvn.broadcom.net (Postfix) with ESMTPSA id 7D4AC18728C; Mon, 18 Sep 2023 23:05:21 -0700 (PDT) From: William Zhang To: stable@vger.kernel.org Cc: William Zhang , Florian Fainelli , Kursad Oney , Kamal Dasu , Miquel Raynal Subject: [PATCH 4.14.y] mtd: rawnand: brcmnand: Fix crash during the panic_write Date: Mon, 18 Sep 2023 23:04:50 -0700 Message-Id: <20230919060450.148694-1-william.zhang@broadcom.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <2023091616-collapse-uncrown-ad3a@gregkh> References: <2023091616-collapse-uncrown-ad3a@gregkh> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org When executing a NAND command within the panic write path, wait for any pending command instead of calling BUG_ON to avoid crashing while already crashing. Fixes: 27c5b17cd1b1 ("mtd: nand: add NAND driver "library" for Broadcom STB NAND controller") Signed-off-by: William Zhang Reviewed-by: Florian Fainelli Reviewed-by: Kursad Oney Reviewed-by: Kamal Dasu Cc: stable@vger.kernel.org Signed-off-by: Miquel Raynal Link: https://lore.kernel.org/linux-mtd/20230706182909.79151-4-william.zhang@broadcom.com (cherry picked from commit e66dd317194daae0475fe9e5577c80aa97f16cb9) --- drivers/mtd/nand/brcmnand/brcmnand.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c index 2741147481c0..8ebc23041194 100644 --- a/drivers/mtd/nand/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/brcmnand/brcmnand.c @@ -1271,7 +1271,17 @@ static void brcmnand_send_cmd(struct brcmnand_host *host, int cmd) dev_dbg(ctrl->dev, "send native cmd %d addr 0x%llx\n", cmd, cmd_addr); - BUG_ON(ctrl->cmd_pending != 0); + /* + * If we came here through _panic_write and there is a pending + * command, try to wait for it. If it times out, rather than + * hitting BUG_ON, just return so we don't crash while crashing. + */ + if (oops_in_progress) { + if (ctrl->cmd_pending && + bcmnand_ctrl_poll_status(ctrl, NAND_CTRL_RDY, NAND_CTRL_RDY, 0)) + return; + } else + BUG_ON(ctrl->cmd_pending != 0); ctrl->cmd_pending = cmd; ret = bcmnand_ctrl_poll_status(ctrl, NAND_CTRL_RDY, NAND_CTRL_RDY, 0); -- 2.37.3