Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp283842imm; Fri, 10 Aug 2018 11:10:45 -0700 (PDT) X-Google-Smtp-Source: AA+uWPwleMVqWppjIokf/LvUG5RULKUqhTQO6ZT0y1dv2iK1SOOyTOquSdNkPP2qUb8qmHHKsOz1 X-Received: by 2002:a62:9849:: with SMTP id q70-v6mr8029575pfd.178.1533924645355; Fri, 10 Aug 2018 11:10:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533924645; cv=none; d=google.com; s=arc-20160816; b=Uk/nhxXAxgqkk5taogAFAfsjKz8cP7yjxGvY9VZMn/YmJKG5ZNcWSM7cDGUp3SRffB 1u6bqzkS6XmDJdhU+b3yIn/eLeU45lUx5i2gVOLknZTqUykd9AxIyQauRbtY9QHJ3f39 Lq+q4/GKyHL9bYOBeZziZbztmexG/GCsjG9q98h/A9HogUW0UX6K3vJxsUOy8zDk4hR/ QobcAe37AYXgg8ha+J0o4xoNqUwAq+jG+5sCtruKBxmEQuaCVKyFpNzT5ocRGqeXuKCy 6aJecjTQzw/bBGoqciyI0FE5qO2Q0LhlhcHmFMe9GtkXvMab2V7n9kxpuvPo6VH1WUuB LzfQ== 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:arc-authentication-results; bh=LuJFoX5FGo74eUX5cu84yv5vPWDwW9/JZtt+sfwNBDU=; b=wqH/KhN1S5y7QuCmLWxgRn1hxNlPHTm5ChlHb5poRiYGgawmwLEpE4DIfd71Qh/Ff2 GQUfcVfBWbXcQmGtn4/1SpNGif1XR+NdoPusQd0q4s3wKp0CW996qhmID+svVHEWLhxx hXGqlxvLtvMHlNnmlQ+zRkScV+9oROgl7IeMPjR+B/Jie5jneMh0nwM8CjzwydUmzfKf ZsrkEP2fxgqJennIn1spm0jPgbZoavnCf7FUFYeM+JeR9yGiCm2oDZ1ClbrAOa+b43oC 9D4futPdi6JLKJaKIXdnVpDSBFHEAS3aCrQGGSoKx+4yBhEcQYuhaw+uJaKTvA3KTo3f /mYg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v127-v6si10800726pgb.200.2018.08.10.11.10.30; Fri, 10 Aug 2018 11:10:45 -0700 (PDT) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729910AbeHJUkS (ORCPT + 99 others); Fri, 10 Aug 2018 16:40:18 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:11341 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729867AbeHJUkR (ORCPT ); Fri, 10 Aug 2018 16:40:17 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate15.nvidia.com (using TLS: TLSv1, AES128-SHA) id ; Fri, 10 Aug 2018 11:09:07 -0700 Received: from HQMAIL107.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Fri, 10 Aug 2018 11:09:22 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Fri, 10 Aug 2018 11:09:22 -0700 Received: from HQMAIL108.nvidia.com (172.18.146.13) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Fri, 10 Aug 2018 18:09:21 +0000 Received: from hqnvemgw02.nvidia.com (172.16.227.111) by HQMAIL108.nvidia.com (172.18.146.13) with Microsoft SMTP Server (TLS) id 15.0.1347.2 via Frontend Transport; Fri, 10 Aug 2018 18:09:21 +0000 Received: from dhcp-10-21-25-168.Nvidia.com (Not Verified[10.21.25.201]) by hqnvemgw02.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Fri, 10 Aug 2018 11:09:21 -0700 From: Aapo Vienamo To: Rob Herring , Mark Rutland , Thierry Reding , Jonathan Hunter , Ulf Hansson , Adrian Hunter , Mikko Perttunen , Stefan Agner CC: , , , , Aapo Vienamo Subject: [PATCH v2 11/40] mmc: sdhci: Add a quirk to skip clearing the transfer mode register on tuning Date: Fri, 10 Aug 2018 21:08:13 +0300 Message-ID: <1533924522-1037-12-git-send-email-avienamo@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533924522-1037-1-git-send-email-avienamo@nvidia.com> References: <1533924522-1037-1-git-send-email-avienamo@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add SDHCI_QUIRK2_TUNE_SKIP_XFERRMODE_REG_PROG to skip programming the SDHCI_TRANSFER_MODE in sdhci_set_transfer_mode() if tuning command is being sent. On Tegra210 and Tegra186 the tuning sequence hangs if the SDHCI transfer mode register is touched. Signed-off-by: Aapo Vienamo --- drivers/mmc/host/sdhci.c | 6 ++++++ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index a7b5602..04dc443 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1028,6 +1028,12 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host, if (data == NULL) { if (host->quirks2 & + SDHCI_QUIRK2_TUNE_SKIP_XFERMODE_REG_PROG && + (cmd->opcode == MMC_SEND_TUNING_BLOCK || + cmd->opcode == MMC_SEND_TUNING_BLOCK_HS200)) { + return; + } + if (host->quirks2 & SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD) { sdhci_writew(host, 0x0, SDHCI_TRANSFER_MODE); } else { diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 23966f8..0a99008 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -450,6 +450,8 @@ struct sdhci_host { * obtainable timeout. */ #define SDHCI_QUIRK2_DISABLE_HW_TIMEOUT (1<<17) +/* Don't clear the SDHCI_TRANSFER_MODE register on tuning commands */ +#define SDHCI_QUIRK2_TUNE_SKIP_XFERMODE_REG_PROG (1<<18) int irq; /* Device IRQ */ void __iomem *ioaddr; /* Mapped address */ -- 2.7.4