From patchwork Mon Aug 14 20:00:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= X-Patchwork-Id: 801311 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="CLb2q/Gs"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xWRL52L0Tz9t2y for ; Tue, 15 Aug 2017 06:00:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751604AbdHNUA1 (ORCPT ); Mon, 14 Aug 2017 16:00:27 -0400 Received: from 78-11-180-123.static.ip.netia.com.pl ([78.11.180.123]:46900 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751389AbdHNUA0 (ORCPT ); Mon, 14 Aug 2017 16:00:26 -0400 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 3xWRL01KmFz3y; Mon, 14 Aug 2017 22:00:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1502740824; bh=nxFb+BvDKe2S3Yd04xabsSLBlIfP+0oQoDErLzL4kS0=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=CLb2q/GsWr3Ism1TDZ5QbeMI2nQrrX9niMA7c2eW4jBFuqkXqiTQejQC5SJHKHVSY YjUKtMl/hxneGpKDyY5DScIxptYUQ2sp/wHxLmE86Y9AM0hnypnMJcIlRhvrBekERT CDD5v61dC3C1xom2Ec+68LFBOLVzEFwCR0GVFHccEdO/l09RqfcE1oc+QmdBT9Eiwd sUJ9Adf0r/LPTz357FN1zGAxJPlAwjH3YOb3YUhU3IKtOpIPpdwScqObhSmPQRzvaS RudI0Xu6hO2j+t6AqgeIIfpFYWB6MmO78XQLK78gKrgPQhcBQJMOQ0+Yo3jTHXpNMs 8bpoRSWBNgG/A== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.99.2 at rere Date: Mon, 14 Aug 2017 22:00:24 +0200 Message-Id: <48d72c32067a8e4ae50c77ee9cc5c077bb2809ae.1502740497.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Subject: [PATCH v2 1/4] mmc: sdhci: key 8BITBUS bit off MMC_CAP_8_BIT_DATA MIME-Version: 1.0 To: Adrian Hunter , Ulf Hansson , Thierry Reding , Jonathan Hunter , Ben Dooks , Jaehoon Chung Cc: linux-mmc@vger.kernel.org, linux-tegra@vger.kernel.org Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Hosts supporting 8-bit bus are marked accordingly. If MMC_CAP_8_BIT_DATA is not among host capabilities, 8BITBUS bit will never be set and it is not cleared in case some non-SDHCI3 host uses it for something else. Signed-off-by: Michał Mirosław Acked-by: Adrian Hunter Tested-by: Thierry Reding --- drivers/mmc/host/sdhci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index ecd0d4350e8a..cca21246cf61 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1544,10 +1544,9 @@ void sdhci_set_bus_width(struct sdhci_host *host, int width) ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL); if (width == MMC_BUS_WIDTH_8) { ctrl &= ~SDHCI_CTRL_4BITBUS; - if (host->version >= SDHCI_SPEC_300) - ctrl |= SDHCI_CTRL_8BITBUS; + ctrl |= SDHCI_CTRL_8BITBUS; } else { - if (host->version >= SDHCI_SPEC_300) + if (host->mmc->caps & MMC_CAP_8_BIT_DATA) ctrl &= ~SDHCI_CTRL_8BITBUS; if (width == MMC_BUS_WIDTH_4) ctrl |= SDHCI_CTRL_4BITBUS;