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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DD56C76195 for ; Fri, 19 Jul 2019 04:04:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A8E4218A3 for ; Fri, 19 Jul 2019 04:04:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563509085; bh=tijgJh1plN8JWV3M348QLvNiZoPxkDTPiqGdRF4rG7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nFgJTBVOj79zYd5g/T9zI2kqbVexPOMbj80zmViO3u0KYQLv4xgMG0ZQJCQLpcuXI kE4dSKSw2uXezTVbEIZTmdO5X1Cn07Yo72cJzsmrG82286J07FkJNEvp+TF8pCMe/T N6DDuyK9t+qJTJaqhU3EBv7I5tcCqvjZNHvTevog= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727811AbfGSEEn (ORCPT ); Fri, 19 Jul 2019 00:04:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:36902 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731124AbfGSEEh (ORCPT ); Fri, 19 Jul 2019 00:04:37 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 03BA4218A3; Fri, 19 Jul 2019 04:04:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563509076; bh=tijgJh1plN8JWV3M348QLvNiZoPxkDTPiqGdRF4rG7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R8hnLA7f2HAAzIgo3ac7atQcroOnLNEhqrrd/fkcw2OMjG2gSIQZvikcFtDf+x6EF Dt6GP9lOSXVm6qboENA7wfECU8izQkQaNk2+KSSMWGpGcOrUWcuccZgbcbeCcDDCsu RZs4c9xXT9HOEogkPi4PLnRzgHw2OJ+NySSGaLYE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Raul E Rangel , Adrian Hunter , Ulf Hansson , Sasha Levin , linux-mmc@vger.kernel.org Subject: [PATCH AUTOSEL 5.1 055/141] mmc: sdhci: sdhci-pci-o2micro: Check if controller supports 8-bit width Date: Fri, 19 Jul 2019 00:01:20 -0400 Message-Id: <20190719040246.15945-55-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719040246.15945-1-sashal@kernel.org> References: <20190719040246.15945-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Raul E Rangel [ Upstream commit de23f0b757766d9fae59df97da6e8bdc5b231351 ] The O2 controller supports 8-bit EMMC access. JESD84-B51 section A.6.3.a defines the bus testing procedure that `mmc_select_bus_width()` implements. This is used to determine the actual bus width of the eMMC. Signed-off-by: Raul E Rangel Acked-by: Adrian Hunter Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/sdhci-pci-o2micro.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c index 423c3339c03b..fb35ca205e04 100644 --- a/drivers/mmc/host/sdhci-pci-o2micro.c +++ b/drivers/mmc/host/sdhci-pci-o2micro.c @@ -404,11 +404,21 @@ int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot) { struct sdhci_pci_chip *chip; struct sdhci_host *host; - u32 reg; + u32 reg, caps; int ret; chip = slot->chip; host = slot->host; + + caps = sdhci_readl(host, SDHCI_CAPABILITIES); + + /* + * mmc_select_bus_width() will test the bus to determine the actual bus + * width. + */ + if (caps & SDHCI_CAN_DO_8BIT) + host->mmc->caps |= MMC_CAP_8_BIT_DATA; + switch (chip->pdev->device) { case PCI_DEVICE_ID_O2_SDS0: case PCI_DEVICE_ID_O2_SEABIRD0: -- 2.20.1