Received: by 10.192.165.148 with SMTP id m20csp5244368imm; Tue, 1 May 2018 11:30:02 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrwrScHtCjylWZNnQAeRi5egJEPo3h6ExoupD9NCnsTTmNg6TK5nKmT+ZG0JJJpFw5HnW0R X-Received: by 2002:a63:7154:: with SMTP id b20-v6mr14131819pgn.426.1525199402610; Tue, 01 May 2018 11:30:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525199402; cv=none; d=google.com; s=arc-20160816; b=p1zEVDYPuQ6wYlQ3JkfkrmxFSVwGU29Hq2fIfqeHz1t62qupV3+Y/CQWwWsSfufn9N BLYJPOQaarQ/cNosS0iERQxM9hVPxrYI4asThc2Ff1mYxYHn62zyOFFZ7jZm5bc2dmQv TaFmSnn/11LTa86XexEpXPJoUXXiC6iEfPIJ9KItqsPq4FVp1gJacx7hfVBmgTxO6Wu5 1SQsaN1Q38nDL+gE93Mn5ueZdQjBtE7NNEZG/loyMn2yx4htMQIynoKy1uyvakhs2+4q U4ZoaCz8luco7h4vwwz8fRMuFAEond52GauwnBN/yOQ3ak9quBbq4KbkMI9nWH6W2njH bAlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=0tm/6o7Lzev2LoqLj8lVPrCUyC0S6CcVxrHUxkzi5ow=; b=yjIlmpQ0Lo5FwI7O1ssK5nMKIA9F2TDZYJG+vRiwa5XbsPQJs5+LhoB/zFD46WLiqZ 4xSqUv1aUescrG0ruiS7n2RJ1fZU/kbWRHs5PqsnQZcd702G23OkhCUk4bcjED5SuV6Q 5Hpj+FKN+T7yN6RON5L2uqZMYFRvsSgtHL03igjdOLd4uRFfxxOqd9YdsCo+tIfTNh0B iiuDfQwd5umhUmk3hmEWWk/Um7VpEC9aKD3Nm4w6BHfLjmrhP0JRUkUJnF5/gd4P5yl7 mdNU/uge4r6KYv7gBbitpvQpyKEJ9ziNqppSpSucFssLE2M44KW8CeikdQ7isv8wbggO VTqQ== 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=mellanox.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p17-v6si8179035pgn.662.2018.05.01.11.29.47; Tue, 01 May 2018 11:30:02 -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=mellanox.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756592AbeEAS3S (ORCPT + 99 others); Tue, 1 May 2018 14:29:18 -0400 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:44613 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756374AbeEAS3R (ORCPT ); Tue, 1 May 2018 14:29:17 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from lsun@mellanox.com) with ESMTPS (AES256-SHA encrypted); 1 May 2018 21:22:49 +0300 Received: from lab-14.mtbu.labs.mlnx (lab-14.mtbu.labs.mlnx [10.15.8.98]) by mtbu-labmailer.labs.mlnx (8.14.4/8.14.4) with ESMTP id w41ILCaJ023384; Tue, 1 May 2018 14:21:12 -0400 Received: (from lsun@localhost) by lab-14.mtbu.labs.mlnx (8.14.7/8.13.8/Submit) id w41IKZxG046442; Tue, 1 May 2018 14:20:35 -0400 From: Liming Sun To: Ulf Hansson , Rob Herring , Mark Rutland , Jaehoon Chung , Catalin Marinas , Will Deacon Cc: Liming Sun , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, stable@kernel.org Subject: [PATCH v5 1/3] mmc: dw_mmc-bluefield: Add driver extension Date: Tue, 1 May 2018 14:19:45 -0400 Message-Id: <1525198787-46403-1-git-send-email-lsun@mellanox.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <026fa942828c54fda5bad225981e56abc808b949.1524497286.git.lsun@mellanox.com> References: <026fa942828c54fda5bad225981e56abc808b949.1524497286.git.lsun@mellanox.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This commit adds extension to the dw_mmc driver for Mellanox BlueField SoC. It updates the UHS_REG_EXT register to bring up the eMMC card on this SoC. Cc: stable@kernel.org Signed-off-by: Liming Sun Reviewed-by: David Woods --- drivers/mmc/host/Kconfig | 9 +++++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/dw_mmc-bluefield.c | 72 +++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 drivers/mmc/host/dw_mmc-bluefield.c diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 9589f9c..26ac6b5 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -717,6 +717,15 @@ config MMC_DW_K3 Synopsys DesignWare Memory Card Interface driver. Select this option for platforms based on Hisilicon K3 SoC's. +config MMC_DW_BLUEFIELD + tristate "BlueField specific extensions for Synopsys DW Memory Card Interface" + depends on MMC_DW + select MMC_DW_PLTFM + help + This selects support for Mellanox BlueField SoC specific extensions to + the Synopsys DesignWare Memory Card Interface driver. Select this + option for platforms based on Mellanox BlueField SoC's. + config MMC_DW_PCI tristate "Synopsys Designware MCI support on PCI bus" depends on MMC_DW && PCI diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index 6aead24..267b3f1 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -55,6 +55,7 @@ obj-$(CONFIG_MMC_DW_K3) += dw_mmc-k3.o obj-$(CONFIG_MMC_DW_PCI) += dw_mmc-pci.o obj-$(CONFIG_MMC_DW_ROCKCHIP) += dw_mmc-rockchip.o obj-$(CONFIG_MMC_DW_ZX) += dw_mmc-zx.o +obj-$(CONFIG_MMC_DW_BLUEFIELD) += dw_mmc-bluefield.o obj-$(CONFIG_MMC_SH_MMCIF) += sh_mmcif.o obj-$(CONFIG_MMC_JZ4740) += jz4740_mmc.o obj-$(CONFIG_MMC_VUB300) += vub300.o diff --git a/drivers/mmc/host/dw_mmc-bluefield.c b/drivers/mmc/host/dw_mmc-bluefield.c new file mode 100644 index 0000000..12067b1 --- /dev/null +++ b/drivers/mmc/host/dw_mmc-bluefield.c @@ -0,0 +1,72 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2018 Mellanox Technologies. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "dw_mmc.h" +#include "dw_mmc-pltfm.h" + +static void dw_mci_bluefield_set_ios(struct dw_mci *host, struct mmc_ios *ios) +{ + u32 regs; + + /* Set drive=4 (bit 29:23) and sample=2 (bit 22:16) in UHS_REG_EXT. */ + regs = mci_readl(host, UHS_REG_EXT); + regs = (regs & ~0x3F100000 & ~0x7F0000) | (4 << 23) | (2 << 16); + mci_writel(host, UHS_REG_EXT, regs); +} + +static const struct dw_mci_drv_data bluefield_drv_data = { + .set_ios = dw_mci_bluefield_set_ios +}; + +static const struct of_device_id dw_mci_bluefield_match[] = { + { .compatible = "mellanox,bluefield-dw-mshc", + .data = &bluefield_drv_data }, + {}, +}; +MODULE_DEVICE_TABLE(of, dw_mci_bluefield_match); + +static int dw_mci_bluefield_probe(struct platform_device *pdev) +{ + const struct dw_mci_drv_data *drv_data = NULL; + const struct of_device_id *match; + + if (pdev->dev.of_node) { + match = of_match_node(dw_mci_bluefield_match, + pdev->dev.of_node); + drv_data = match->data; + } + + return dw_mci_pltfm_register(pdev, drv_data); +} + +static struct platform_driver dw_mci_bluefield_pltfm_driver = { + .probe = dw_mci_bluefield_probe, + .remove = dw_mci_pltfm_remove, + .driver = { + .name = "dwmmc_bluefield", + .of_match_table = dw_mci_bluefield_match, + .pm = &dw_mci_pltfm_pmops, + }, +}; + +module_platform_driver(dw_mci_bluefield_pltfm_driver); + +MODULE_DESCRIPTION("BlueField DW Multimedia Card driver"); +MODULE_AUTHOR("Mellanox Technologies"); +MODULE_LICENSE("GPL v2"); -- 1.8.3.1