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 X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BAA09C28CC2 for ; Thu, 30 May 2019 03:37:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 928BA23D47 for ; Thu, 30 May 2019 03:37:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559187478; bh=wUuPyAX2ppJJU0VJUP2I/prKq02WHLRGr4uP8I5EG4Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UezgtcIz9YopGlL7dbHp0EgI5D50Te+OV/0tmS2TdNBz7zVWbUNzEI8T+eaW8qzMn B9lfECeBEySBL/rX29UVJlriioKDCWSmRD/mI4EPqosVkU3enEZzIXo1QiNNfDN1ia gqxn1kbrM1tbQVH3FF2kKbiZCyPd17ygXw9yuL8Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733088AbfE3DXl (ORCPT ); Wed, 29 May 2019 23:23:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:47300 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730267AbfE3DR3 (ORCPT ); Wed, 29 May 2019 23:17:29 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D27B0246CC; Thu, 30 May 2019 03:17:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186248; bh=wUuPyAX2ppJJU0VJUP2I/prKq02WHLRGr4uP8I5EG4Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PLzam1ntjS0BpvfiYHSD5Ts5Ntq0oaaFF1bDzfU0W7z6wF9EH001iCttbnaUgxECv 6LgfN4yreqt/f25B5/BJU7kTifST8AQDfAAg3vXOXGPcoq6Jl5/OYUENk2j3cOvMh2 NtD9adkCvtVN1NKlfWhGLQaGl/7oVI5kQymPfC24= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yinbo Zhu , Adrian Hunter , Ulf Hansson , Sasha Levin Subject: [PATCH 4.19 166/276] mmc: sdhci-of-esdhc: add erratum A-009204 support Date: Wed, 29 May 2019 20:05:24 -0700 Message-Id: <20190530030535.804146226@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030523.133519668@linuxfoundation.org> References: <20190530030523.133519668@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 5dd195522562542bc6ebe6e7bd47890d8b7ca93c ] In the event of that any data error (like, IRQSTAT[DCE]) occurs during an eSDHC data transaction where DMA is used for data transfer to/from the system memory, setting the SYSCTL[RSTD] register may cause a system hang. If software sets the register SYSCTL[RSTD] to 1 for error recovery while DMA transferring is not complete, eSDHC may hang the system bus. This happens because the software register SYSCTL[RSTD] resets the DMA engine without waiting for the completion of pending system transactions. This erratum is to fix this issue. Signed-off-by: Yinbo Zhu Acked-by: Adrian Hunter Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/sdhci-of-esdhc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index b2199d621b8c5..e63d22fb99edf 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -643,6 +643,9 @@ static void esdhc_reset(struct sdhci_host *host, u8 mask) sdhci_writel(host, host->ier, SDHCI_INT_ENABLE); sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE); + if (of_find_compatible_node(NULL, NULL, "fsl,p2020-esdhc")) + mdelay(5); + if (mask & SDHCI_RESET_ALL) { val = sdhci_readl(host, ESDHC_TBCTL); val &= ~ESDHC_TB_EN; -- 2.20.1