Received: by 10.192.165.148 with SMTP id m20csp2003218imm; Thu, 3 May 2018 08:48:26 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr1J9Ds4BsNB6/BWFs0SqrwkrU/8WsGrkeccw16ZkKXH49z6jJ4ZZC+lg2NFOAJst6xuTPo X-Received: by 2002:a17:902:6941:: with SMTP id k1-v6mr18394427plt.161.1525362506487; Thu, 03 May 2018 08:48:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525362506; cv=none; d=google.com; s=arc-20160816; b=j89TLJRtWl87IPinaoeYVzElKnjdiigqQxjueYdB9rENvbsXnMdrYIenmT8+3Aoaty ia+ORQzbKJVLIYUdLuTsCEcj3sQk2t+RtNNdPXYMfWZYxUvDD+qi91s9pCaedjXx5vA/ VYFwXrrJhkUfQIEUJ3f9AjZBSZI/dFjqRW7hi3UPSBni1FAUdwft2BpTXWDQpra+xTQs UfGDuOdbSl+/5pC8ZXVv/rFYp8pl9+yleSuD7wcCR9PbCWft5EuGAxiJyYZpslLb3wyd 0nPVV2rPrkI+6Dc+LWrPO0WOi6VpQ+IsJa3OercIlu6a0vo6rnb071EFHVJeYOQKUndy 2bSQ== 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=GWGhrQ2EHl+PLORr1WOWCtUhtCJguAmJBWJKPrvL8Bg=; b=XSHHVcRsS21nP5A9O5RZqjpSXSBhgJI06gC8nQVFJ94XpgjQ6wasA4trvgI3Tsn78j FXhrG9IiF+0bLHb2uuBsRlrTLHiu71AdY0h4gQjREMMXCq38wCp0EdZ2z+08cBKrj5kW Qkir08Yb5R44+5E1lc/iXIPEhNP9E9+1I65tCWXXT3ZJ7eaWdYqfKet5f2kbUnk1zraJ Y4qYpbjz/dIXg6XlhJGuzg1ybqIY+UculOe1bDYzsnYrh1kppBO/VrKoBqSpFsOPxr5t ehZ+LAAXVt/3qe3E/UY8MNpxAo9VAoLMpDaOa/USvRTcWR/bOMGxxWs7Uj8mRh9GHR7o UeMg== 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 b6si14279681pfk.342.2018.05.03.08.48.11; Thu, 03 May 2018 08:48:26 -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 S1751417AbeECPqz (ORCPT + 99 others); Thu, 3 May 2018 11:46:55 -0400 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:44698 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751261AbeECPqw (ORCPT ); Thu, 3 May 2018 11:46:52 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from lsun@mellanox.com) with ESMTPS (AES256-SHA encrypted); 3 May 2018 18:48:23 +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 w43FkjOj002713; Thu, 3 May 2018 11:46:45 -0400 Received: (from lsun@localhost) by lab-14.mtbu.labs.mlnx (8.14.7/8.13.8/Submit) id w43Fk7NS040289; Thu, 3 May 2018 11:46:07 -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 Subject: [PATCH v6 1/3] mmc: dw_mmc-bluefield: Add driver extension Date: Thu, 3 May 2018 11:45:14 -0400 Message-Id: <1525362316-40240-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. 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 | 87 +++++++++++++++++++++++++++++++++++++ 3 files changed, 97 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..21db031 --- /dev/null +++ b/drivers/mmc/host/dw_mmc-bluefield.c @@ -0,0 +1,87 @@ +// 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" + +#define UHS_REG_EXT_SAMPLE_WIDTH 7 +#define UHS_REG_EXT_SAMPLE_SHIFT 16 +#define UHS_REG_EXT_DRIVE_WIDTH 7 +#define UHS_REG_EXT_DRIVE_SHIFT 23 + +#define BLUEFIELD_UHS_REG_EXT_SAMPLE 2 +#define BLUEFIELD_UHS_REG_EXT_DRIVE 4 + +#define SET_REG_FIELD(reg, value, width, shift) \ + ((reg) = (((reg) & ~(((1 << (width)) - 1) << (shift))) | \ + ((value) << (shift)))) + +static void dw_mci_bluefield_set_ios(struct dw_mci *host, struct mmc_ios *ios) +{ + u32 reg; + + /* Update the Drive and Sample fields in register UHS_REG_EXT. */ + reg = mci_readl(host, UHS_REG_EXT); + SET_REG_FIELD(reg, BLUEFIELD_UHS_REG_EXT_SAMPLE, + UHS_REG_EXT_SAMPLE_WIDTH, UHS_REG_EXT_SAMPLE_SHIFT); + SET_REG_FIELD(reg, BLUEFIELD_UHS_REG_EXT_DRIVE, + UHS_REG_EXT_DRIVE_WIDTH, UHS_REG_EXT_DRIVE_SHIFT); + mci_writel(host, UHS_REG_EXT, reg); +} + +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