From patchwork Wed Mar 7 13:20:15 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: 130890 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp5177303lja; Wed, 7 Mar 2018 05:23:15 -0800 (PST) X-Google-Smtp-Source: AG47ELuFHFOhSpwVnmsBkv+3Kc+VW6HxUDltjrJRhEnGfEoaUnm2ICx5Zkv/Uo24l1ffUB/FHInu X-Received: by 2002:a17:902:6a8a:: with SMTP id n10-v6mr7108176plk.430.1520428995329; Wed, 07 Mar 2018 05:23:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520428995; cv=none; d=google.com; s=arc-20160816; b=IQ7dnoXgjollCRdZQ0GdxCWzm87nlkJIsVqtZbisYKJ2jvKyGDOf9cq0+PQb0SAbOq QdIiqPHK8rFQdONXDGtkDMUj8WhfDM9nv8uKJOu/lVPxAtDgUQxUepGuFID8TEEFR2t1 14b96Adjn+4YkJ+CPvRqFXBogelBtf1JNMS0QOvqmHnvmzri3Sihf2gYJdRRFlhLXbZ/ pvWGjoWz3hMS2xURrFD8ko/KBzKK0Gcu2pZGCWOtqU1+z5qqZyA2jLOfTsHQF9lvFyOQ tyTNQwxU27gb3bl/YocUC/MtWg+qcnJ1Pda7lGmGTimh53iQVpVSctkl1qmDnLKErkAC t2ZQ== 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=5wa1I8NDJT80cueaiALWRsb/bFohVv9GfSM3SQK5sDM=; b=nBieUXVY0pXlZUPiQkQFs6ceb8wiOfpSmjqrSQBKEp+Nl0GpLUFtqE3AbxyyIJrkvV yAhkYNFeJks7RG0bUsMQ/oRqLW/nvNoU0XtlMeJuUJ3DsdvpG03Qi0r810sGZjQjt3Sf 61ype8cOVYMmQb0pUp7F/QAblNkI0EMFawtpl1DqnufoeDDE52H+FcK9rQg2kkWD6RaS t4kptKH5ZXQAfCdGVam2t2ftwZcTKIp2Gj3CY/ECGgLKAeGkmAH9jaVweQG+9OSYcrYw RWOzRpQhlBMy40bT/wvm8CUgszU1gDYpdKXTzWwo0nWtbumKBmlmO2w8zQ4ko2Lt0F1z C8+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=fiQz62Ne; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) 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 u7si11374305pgq.796.2018.03.07.05.23.15; Wed, 07 Mar 2018 05:23:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=fiQz62Ne; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754438AbeCGNVh (ORCPT + 28 others); Wed, 7 Mar 2018 08:21:37 -0500 Received: from fllnx210.ext.ti.com ([198.47.19.17]:52218 "EHLO fllnx210.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754495AbeCGNVV (ORCPT ); Wed, 7 Mar 2018 08:21:21 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by fllnx210.ext.ti.com (8.15.1/8.15.1) with ESMTP id w27DKuXZ004128; Wed, 7 Mar 2018 07:20:56 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1520428856; bh=Fq8jR+vUv/L44qwts955TAg73QY/itDEQbf33gP+nkI=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=fiQz62NeaEZHjE1tA9Ix90p/cQJvA9FhzrzFzq6PViJCOipaKE9FeHVaxNH3GOAvk njS1GHXDJ74kCw6Vett9L0VS//XNwl+8kA0Zl63YJAThXJSMT8JQstVyr+osJ9FFbE sbz6AbTd6FlGVDnHqyr6t4KKeoecxQJn4NV+We/M= Received: from DLEE102.ent.ti.com (dlee102.ent.ti.com [157.170.170.32]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id w27DKur1003369; Wed, 7 Mar 2018 07:20:56 -0600 Received: from DLEE112.ent.ti.com (157.170.170.23) by DLEE102.ent.ti.com (157.170.170.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1261.35; Wed, 7 Mar 2018 07:20:55 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1261.35 via Frontend Transport; Wed, 7 Mar 2018 07:20:55 -0600 Received: from a0393678ub.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id w27DKMnQ018331; Wed, 7 Mar 2018 07:20:52 -0600 From: Kishon Vijay Abraham I To: Ulf Hansson , Tony Lindgren , Adrian Hunter CC: Rob Herring , Mark Rutland , Russell King , , , , , , Subject: [PATCH v3 06/11] mmc: sdhci: Add quirk to disable HW timeout Date: Wed, 7 Mar 2018 18:50:15 +0530 Message-ID: <20180307132020.30951-7-kishon@ti.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180307132020.30951-1-kishon@ti.com> References: <20180307132020.30951-1-kishon@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 | 27 +++++++++++++++++++++------ drivers/mmc/host/sdhci.h | 5 +++++ 2 files changed, 26 insertions(+), 6 deletions(-) -- 2.11.0 diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index aa8b5ca0d1b0..1dd117cbeb6e 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -767,12 +767,6 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd) break; } - if (count >= 0xF) { - DBG("Too large timeout 0x%x requested for CMD%d!\n", - count, cmd->opcode); - count = 0xE; - } - return count; } @@ -790,6 +784,16 @@ static void sdhci_set_transfer_irqs(struct sdhci_host *host) sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE); } +static void sdhci_set_data_timeout_irq(struct sdhci_host *host, bool enable) +{ + if (enable) + host->ier |= SDHCI_INT_DATA_TIMEOUT; + else + host->ier &= ~SDHCI_INT_DATA_TIMEOUT; + sdhci_writel(host, host->ier, SDHCI_INT_ENABLE); + sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE); +} + static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd) { u8 count; @@ -798,6 +802,17 @@ static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd) host->ops->set_timeout(host, cmd); } else { count = sdhci_calc_timeout(host, cmd); + if (count >= 0xF && + host->quirks2 & SDHCI_QUIRK2_DISABLE_HW_TIMEOUT) + sdhci_set_data_timeout_irq(host, false); + else if (!(host->ier & SDHCI_INT_DATA_TIMEOUT)) + sdhci_set_data_timeout_irq(host, true); + + if (count >= 0xF) { + DBG("Too large timeout 0x%x requested for CMD%d!\n", + count, cmd->opcode); + count = 0xE; + } sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL); } } diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index c95b0a4a7594..ff283ee08854 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 */