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 93ACAC4167E for ; Wed, 1 Dec 2021 15:38:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351085AbhLAPlw (ORCPT ); Wed, 1 Dec 2021 10:41:52 -0500 Received: from smtp2.axis.com ([195.60.68.18]:17640 "EHLO smtp2.axis.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350676AbhLAPlv (ORCPT ); Wed, 1 Dec 2021 10:41:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1638373111; x=1669909111; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NeRpLsWyPIeNTXYAGIU96z1OBWXWfVQIvsePl4gHj9M=; b=fHASomY4GU3ZzBQf75XYjJSL/37kC//KhEbSXDndOjDr2prdja1/2bSc 3WVT1ITxEA+QNLMP3EHjW6qN+lW0XJtKz5f3CH8bLmBH09PsAKaEU8UB4 89K4/JFLdIhkwaoUkhKmACGIyhAfwN2+QmGeS4DvLFz74mvMTmj0UsH6v 0BW9In852l7J69hUdg1DL0YMmrxBJ08h1XUJNrmur60K6nvSdDrCaOXIL RbOLtcTbTb6DuXn3/pMJkYWHTGsAoFNEu6lb9fyF7CdHuE0Up3pPgU6V5 1ii7sUNarz5+k4/TZyF2C7tpODHW6ipIuEnzqU+xuMTsY9PTkMCvVJDDv w==; From: =?UTF-8?q?M=C3=A5rten=20Lindahl?= To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Jaehoon Chung CC: Doug Anderson , , , , , , =?UTF-8?q?M=C3=A5rten=20Lindahl?= Subject: [PATCH 4/4] mmc: dw_mmc: Do not wait for DTO in case of error Date: Wed, 1 Dec 2021 16:38:04 +0100 Message-ID: <20211201153804.27655-5-marten.lindahl@axis.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211201153804.27655-1-marten.lindahl@axis.com> References: <20211201153804.27655-1-marten.lindahl@axis.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org When running the ARTPEC-8 DWMMC IP version, and a data error interrupt comes during a data read transfer, there is no guarantee for the data transfer over interrupt (DTO) to come within the specified data timeout. This case is handled by the dto_timer handler which will complete the request with the comment: /* * If DTO interrupt does NOT come in sending data state, * we should notify the driver to terminate current transfer * and report a data timeout to the core. */ But since the ARTPEC-8 DWMMC IP version, supports an extended TMOUT register which allows longer timeouts than the non ARTPEC-8 version does, waiting for the dto_timer to complete the request in error cases may cause the request to take significantly longer time than necessary. This is specifically true for the failing steps during tuning of a device. Fix this by completing the request when the error interrupt comes. Signed-off-by: Mårten Lindahl --- drivers/mmc/host/dw_mmc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 45ea9fd97a6a..d6b76f47b1a2 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2777,11 +2777,19 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id) if (pending & DW_MCI_DATA_ERROR_FLAGS) { spin_lock(&host->irq_lock); + if (host->quirks & DW_MMC_QUIRK_EXTENDED_TMOUT) + del_timer(&host->dto_timer); + /* if there is an error report DATA_ERROR */ mci_writel(host, RINTSTS, DW_MCI_DATA_ERROR_FLAGS); host->data_status = pending; smp_wmb(); /* drain writebuffer */ set_bit(EVENT_DATA_ERROR, &host->pending_events); + + if (host->quirks & DW_MMC_QUIRK_EXTENDED_TMOUT) + /* In case of error, we cannot expect a DTO */ + set_bit(EVENT_DATA_COMPLETE, &host->pending_events); + tasklet_schedule(&host->tasklet); spin_unlock(&host->irq_lock); -- 2.20.1 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5E209C433F5 for ; Wed, 1 Dec 2021 15:40:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GGq4SCEkoLX2smNVGl3XVsn/SsK/kZoR4/Js+p02qnE=; b=wO8chGXJ1D9CR2 voPI5KfdNpfjBkcZRRmIk/Gcaw9H1QhsPvv6ncmWJ9P99geehLOtBr1GCz/9BxOw/CqUr3VDlNqoz CFIAfCOZaJtIHT1LbQBHeA4EXlRjVZYICpvq1m9KviQku6mPIBioeGRHcW23ekli8BviBppWQvrP7 3/6eV0f0Z1KOshdTst4m88nmPuQun4MvKOSQrRIwcPdcQYPJPDKMsFtLLMCe1b8KXrnQxwwM3hGDX yBHfjNbh97V9eQhgRAQZzrV5tZ/dApYixxZU8XUT4nFaeb5hH7siD+B+UjEWZ6JP/pWYGeN0Tpw4+ az6JdlNgUif969oVDtuw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1msRhQ-009Dxr-0h; Wed, 01 Dec 2021 15:39:12 +0000 Received: from smtp2.axis.com ([195.60.68.18]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1msRgk-009Dp6-90 for linux-arm-kernel@lists.infradead.org; Wed, 01 Dec 2021 15:38:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1638373110; x=1669909110; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NeRpLsWyPIeNTXYAGIU96z1OBWXWfVQIvsePl4gHj9M=; b=fYsXZfehB2wXq9zf8uyCq7sr+YoaLAQqGMFJaGCGKlo3MIBF28k9bX6C a0D/j5osWvStwuMUXyU43XI1A8Y1GvLT0LZ1qYxSKbgxjXXiuc8wZ0NRb u74vNrhIzoSSdBb58gGKNz8uw5mJqEvR1ojs6Uxi1z1EfqesRuHFN8/OP C0kgKHZEIGaS8OORY2BaiCiXsH6L8QclS/gX3rtV/gdGJYuO7bg0cpAL4 vqERFTcAO/IQIRWy0tUnLOyw6tz4EBinMvbU+jCG94IYfS1eT3MEjj+ei L9/35FifpiB20GN88XcXPbCmNmwTxS3waTvPDbuEQKZQbEw0M5R0CCdod A==; From: =?UTF-8?q?M=C3=A5rten=20Lindahl?= To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Jaehoon Chung CC: Doug Anderson , , , , , , =?UTF-8?q?M=C3=A5rten=20Lindahl?= Subject: [PATCH 4/4] mmc: dw_mmc: Do not wait for DTO in case of error Date: Wed, 1 Dec 2021 16:38:04 +0100 Message-ID: <20211201153804.27655-5-marten.lindahl@axis.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211201153804.27655-1-marten.lindahl@axis.com> References: <20211201153804.27655-1-marten.lindahl@axis.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211201_073830_679275_B7D6F96B X-CRM114-Status: GOOD ( 14.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org V2hlbiBydW5uaW5nIHRoZSBBUlRQRUMtOCBEV01NQyBJUCB2ZXJzaW9uLCBhbmQgYSBkYXRhIGVy cm9yIGludGVycnVwdApjb21lcyBkdXJpbmcgYSBkYXRhIHJlYWQgdHJhbnNmZXIsIHRoZXJlIGlz IG5vIGd1YXJhbnRlZSBmb3IgdGhlIGRhdGEKdHJhbnNmZXIgb3ZlciBpbnRlcnJ1cHQgKERUTykg dG8gY29tZSB3aXRoaW4gdGhlIHNwZWNpZmllZCBkYXRhIHRpbWVvdXQuClRoaXMgY2FzZSBpcyBo YW5kbGVkIGJ5IHRoZSBkdG9fdGltZXIgaGFuZGxlciB3aGljaCB3aWxsIGNvbXBsZXRlIHRoZQpy ZXF1ZXN0IHdpdGggdGhlIGNvbW1lbnQ6CgogLyoKICAqIElmIERUTyBpbnRlcnJ1cHQgZG9lcyBO T1QgY29tZSBpbiBzZW5kaW5nIGRhdGEgc3RhdGUsCiAgKiB3ZSBzaG91bGQgbm90aWZ5IHRoZSBk cml2ZXIgdG8gdGVybWluYXRlIGN1cnJlbnQgdHJhbnNmZXIKICAqIGFuZCByZXBvcnQgYSBkYXRh IHRpbWVvdXQgdG8gdGhlIGNvcmUuCiAgKi8KCkJ1dCBzaW5jZSB0aGUgQVJUUEVDLTggRFdNTUMg SVAgdmVyc2lvbiwgc3VwcG9ydHMgYW4gZXh0ZW5kZWQgVE1PVVQKcmVnaXN0ZXIgd2hpY2ggYWxs b3dzIGxvbmdlciB0aW1lb3V0cyB0aGFuIHRoZSBub24gQVJUUEVDLTggdmVyc2lvbgpkb2VzLCB3 YWl0aW5nIGZvciB0aGUgZHRvX3RpbWVyIHRvIGNvbXBsZXRlIHRoZSByZXF1ZXN0IGluIGVycm9y IGNhc2VzCm1heSBjYXVzZSB0aGUgcmVxdWVzdCB0byB0YWtlIHNpZ25pZmljYW50bHkgbG9uZ2Vy IHRpbWUgdGhhbiBuZWNlc3NhcnkuClRoaXMgaXMgc3BlY2lmaWNhbGx5IHRydWUgZm9yIHRoZSBm YWlsaW5nIHN0ZXBzIGR1cmluZyB0dW5pbmcgb2YgYQpkZXZpY2UuCgpGaXggdGhpcyBieSBjb21w bGV0aW5nIHRoZSByZXF1ZXN0IHdoZW4gdGhlIGVycm9yIGludGVycnVwdCBjb21lcy4KClNpZ25l ZC1vZmYtYnk6IE3DpXJ0ZW4gTGluZGFobCA8bWFydGVuLmxpbmRhaGxAYXhpcy5jb20+Ci0tLQog ZHJpdmVycy9tbWMvaG9zdC9kd19tbWMuYyB8IDggKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCA4 IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL21tYy9ob3N0L2R3X21tYy5jIGIv ZHJpdmVycy9tbWMvaG9zdC9kd19tbWMuYwppbmRleCA0NWVhOWZkOTdhNmEuLmQ2Yjc2ZjQ3YjFh MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9tbWMvaG9zdC9kd19tbWMuYworKysgYi9kcml2ZXJzL21t Yy9ob3N0L2R3X21tYy5jCkBAIC0yNzc3LDExICsyNzc3LDE5IEBAIHN0YXRpYyBpcnFyZXR1cm5f dCBkd19tY2lfaW50ZXJydXB0KGludCBpcnEsIHZvaWQgKmRldl9pZCkKIAkJaWYgKHBlbmRpbmcg JiBEV19NQ0lfREFUQV9FUlJPUl9GTEFHUykgewogCQkJc3Bpbl9sb2NrKCZob3N0LT5pcnFfbG9j ayk7CiAKKwkJCWlmIChob3N0LT5xdWlya3MgJiBEV19NTUNfUVVJUktfRVhURU5ERURfVE1PVVQp CisJCQkJZGVsX3RpbWVyKCZob3N0LT5kdG9fdGltZXIpOworCiAJCQkvKiBpZiB0aGVyZSBpcyBh biBlcnJvciByZXBvcnQgREFUQV9FUlJPUiAqLwogCQkJbWNpX3dyaXRlbChob3N0LCBSSU5UU1RT LCBEV19NQ0lfREFUQV9FUlJPUl9GTEFHUyk7CiAJCQlob3N0LT5kYXRhX3N0YXR1cyA9IHBlbmRp bmc7CiAJCQlzbXBfd21iKCk7IC8qIGRyYWluIHdyaXRlYnVmZmVyICovCiAJCQlzZXRfYml0KEVW RU5UX0RBVEFfRVJST1IsICZob3N0LT5wZW5kaW5nX2V2ZW50cyk7CisKKwkJCWlmIChob3N0LT5x dWlya3MgJiBEV19NTUNfUVVJUktfRVhURU5ERURfVE1PVVQpCisJCQkJLyogSW4gY2FzZSBvZiBl cnJvciwgd2UgY2Fubm90IGV4cGVjdCBhIERUTyAqLworCQkJCXNldF9iaXQoRVZFTlRfREFUQV9D T01QTEVURSwgJmhvc3QtPnBlbmRpbmdfZXZlbnRzKTsKKwogCQkJdGFza2xldF9zY2hlZHVsZSgm aG9zdC0+dGFza2xldCk7CiAKIAkJCXNwaW5fdW5sb2NrKCZob3N0LT5pcnFfbG9jayk7Ci0tIAoy LjIwLjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwps aW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJh ZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51 eC1hcm0ta2VybmVsCg==