From patchwork Mon Feb 5 12:50:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kishon Vijay Abraham I X-Patchwork-Id: 126851 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1942273ljc; Mon, 5 Feb 2018 04:51:58 -0800 (PST) X-Google-Smtp-Source: AH8x224vVz13XxjpX6nBDvOFIiMZFNobUlBTO8BdHiWiNsORafLgz+nPLoVdi3FyHFiXnxXMPsTE X-Received: by 10.98.204.132 with SMTP id j4mr1401447pfk.161.1517835118344; Mon, 05 Feb 2018 04:51:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517835118; cv=none; d=google.com; s=arc-20160816; b=xzacXcSekyoTM0K9sUe3qb8mFYxAwI+dVr75Dej+O6JSjKXn5ticQjt/ZdLN//2Qpr aUoQ8W3iQgVkhCNzZMJI4r+zRVzICHS1P8rUGrbgA0q5DK/4etDweFkiGuBftN40VtKV TTbNZ9kPyOyJ3G8QniSTxOcTHaY6x9N6obxBM82/vVZn5R3xoB8JyKLwIE51yEpCl5hR xpfZtfo+fkiePXAIyz3XO//dLdZPreA+ZIv/WBtsQx2WVPEyCM0poVfj1cBMh5JYfxlt JjifSVFHZBFVVtAJ4AN3/75WqX8FflYwSPeytUoan2cdDzSC8ozZhA1wjcxpF3wfYNAN wvPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=bWEdFN6mzcr6s+ZRBbVdYlTgrYjuVXn1U7YoLA6bPkM=; b=Ob2Un3rcCAABnDhv1/UR2wJ6aDYWlWkO7emne9t6ugV8aw2h3kxzopGfdlIeab0plI yQ03euHKgeKqHxMhRROlQuZGiKR7zHVshLFNwbE6KtQGAONGDll/K4rZWJTBXLn4qB9l Ce+GEopoVTrWWSdaafW6Xu53cYhNjHrag2jS1dBq7WomOSKBcmHLG/ttwLLb3PcLlidD YJ4uChUdwV3NkAiFgezevY5k1Vs+FWyhMLHAyxH7gjFSb7ki8SsDq8V+KviJff+Uc4qL THl8/Gxt21wW6hzUGeFomnhpUXTAIGDwAJv00xa4eXCOHyPt3xUrYIO8SKRg7bXDk7TI cxnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com header.s=ti-com-17Q1 header.b=xU7/weHe; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=NONE dis=QUARANTINE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j11si4433170pff.406.2018.02.05.04.51.58; Mon, 05 Feb 2018 04:51:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com header.s=ti-com-17Q1 header.b=xU7/weHe; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=NONE dis=QUARANTINE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752986AbeBEMvy (ORCPT + 6 others); Mon, 5 Feb 2018 07:51:54 -0500 Received: from lelnx193.ext.ti.com ([198.47.27.77]:63872 "EHLO lelnx193.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752743AbeBEMvl (ORCPT ); Mon, 5 Feb 2018 07:51:41 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx193.ext.ti.com (8.15.1/8.15.1) with ESMTP id w15CpDXQ011279; Mon, 5 Feb 2018 06:51:13 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1517835073; bh=gYK+df7B1xvZxSjTlmkgPPWGXrZQ+sLIAlX5wFwIaoc=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=xU7/weHeNuY/iNWb+bEfcuc8HQaZf2m3fuOvfO/cyCRchLhp+Cvzhfz8+kiA4SPvs afdgRqNEwoVIQ/VTCjlmLRwe1hVmCzxuec2LE5i+W3TwG1xMcta7aSpH1yEu3/X7BY XxJOKIrqy3oyrklvPrjYcv/tQhghknEqg/+a1xY8= Received: from DFLE107.ent.ti.com (dfle107.ent.ti.com [10.64.6.28]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id w15CpDvP007613; Mon, 5 Feb 2018 06:51:13 -0600 Received: from DFLE106.ent.ti.com (10.64.6.27) by DFLE107.ent.ti.com (10.64.6.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1261.35; Mon, 5 Feb 2018 06:51:13 -0600 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1261.35 via Frontend Transport; Mon, 5 Feb 2018 06:51:13 -0600 Received: from a0393678ub.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id w15CoaGe023963; Mon, 5 Feb 2018 06:51:10 -0600 From: Kishon Vijay Abraham I To: Ulf Hansson , Tony Lindgren , Adrian Hunter CC: Rob Herring , Mark Rutland , Russell King , Kishon Vijay Abraham I , , , , , Subject: [PATCH v2 09/16] mmc: sdhci: Add quirk to disable HW timeout Date: Mon, 5 Feb 2018 18:20:22 +0530 Message-ID: <20180205125029.21570-10-kishon@ti.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180205125029.21570-1-kishon@ti.com> References: <20180205125029.21570-1-kishon@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add quirk to disable HW timeout if the requested timeout is more than the maximum obtainable timeout. Signed-off-by: Kishon Vijay Abraham I --- drivers/mmc/host/sdhci.c | 12 ++++++++++++ drivers/mmc/host/sdhci.h | 7 +++++++ 2 files changed, 19 insertions(+) -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 070aff9c108f..1aa74b4682f3 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -735,6 +735,12 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd) DBG("Too large timeout 0x%x requested for CMD%d!\n", count, cmd->opcode); count = 0xE; + if (host->quirks2 & SDHCI_QUIRK2_DISABLE_HW_TIMEOUT) { + host->ier &= ~SDHCI_INT_DATA_TIMEOUT; + sdhci_writel(host, host->ier, SDHCI_INT_ENABLE); + sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE); + host->hw_timeout_disabled = true; + } } return count; @@ -2349,6 +2355,12 @@ static bool sdhci_request_done(struct sdhci_host *host) } sdhci_del_timer(host, mrq); + if (sdhci_data_line_cmd(mrq->cmd) && host->hw_timeout_disabled) { + host->ier |= SDHCI_INT_DATA_TIMEOUT; + sdhci_writel(host, host->ier, SDHCI_INT_ENABLE); + sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE); + host->hw_timeout_disabled = false; + } /* * Always unmap the data buffers if they were mapped by diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index afab26fd70e6..3a967a56fcc3 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -437,6 +437,11 @@ struct sdhci_host { #define SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN (1<<15) /* Controller has CRC in 136 bit Command Response */ #define SDHCI_QUIRK2_RSP_136_HAS_CRC (1<<16) +/* + * Disable HW timeout if the requested timeout is more than the maximum + * obtainable timeout + */ +#define SDHCI_QUIRK2_DISABLE_HW_TIMEOUT (1<<17) int irq; /* Device IRQ */ void __iomem *ioaddr; /* Mapped address */ @@ -522,6 +527,8 @@ struct sdhci_host { unsigned int ocr_avail_mmc; u32 ocr_mask; /* available voltages */ + bool hw_timeout_disabled; + unsigned timing; /* Current timing */ u32 thread_isr;