From patchwork Mon Jul 8 04:10:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1128862 X-Patchwork-Delegate: van.freenix@gmail.com 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=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="TRdxkbFL"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="dU2orJTf"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45hsSh08lkz9s3l for ; Mon, 8 Jul 2019 14:10:59 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8F8C0C21DF3; Mon, 8 Jul 2019 04:10:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 5F81DC21D8E; Mon, 8 Jul 2019 04:10:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4E7DDC21D8E; Mon, 8 Jul 2019 04:10:44 +0000 (UTC) Received: from esa4.hgst.iphmx.com (esa4.hgst.iphmx.com [216.71.154.42]) by lists.denx.de (Postfix) with ESMTPS id 42605C21DD9 for ; Mon, 8 Jul 2019 04:10:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1562559041; x=1594095041; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=C3ka5ZUwCwlJczS+ZmnB6FIGKl3n50ABLercfq68Ikg=; b=TRdxkbFL1rRt/Obu52l9bnY8eCgtwDs7k9lWSkGsCVKaTU99Zg6nI3Lh q72ltT9Af2Vz+MH0wkKHNC7xP6zOQ0xmJmbLGEycP3kmUuFeHmb3aUcTn x9ETDA1LkjF7ogvBVlHIU8KHyk/uSu7v4Exo9A3drCBHxYEbNClMrYznQ dDOyZ5A6y999GBIc6MKnr7eLRayNs7/COq4CzoAggg27GxsloIANMdMgN DG/M4+wtUwUspHhKf+AZnnEnjzOO8MSJKPQPAVrqQdMDZfKJVw5pp/+5c rPhf20zW0KJoSsaSUuRAmKGt0P6nwA5d3GNL8V0W/aHVWhbzlZ4ux3VxX A==; IronPort-SDR: VkYBOH1iqaZDW9FkrSu/65hu+6oO/E3Vj9znnxuOvOH/Tg376ixKHlJQRcenwdvpHCxzWXBE6d +cbm8ydlTLYEms5Fijp9d2VGzip5vqfnEgjRXOtv1n2/cEdEVQgQ/nkeJSVWct6horBEUVIIhz Is6TmmgrmNU2V2yTuXmc+ytQyf2VatArFXFSV3CdQv5XQGWTHVZZBpycgbclUBD50rCtgqkZoB VefKnGNzsw4ORzWVhm+TQ1Pd7YCpw7SOc1Z9rIY4cGXXERhh5uOesX1OFlKPpNd5j1u3AOxV7H HGw= X-IronPort-AV: E=Sophos;i="5.63,465,1557158400"; d="scan'208";a="112409371" Received: from mail-by2nam01lp2050.outbound.protection.outlook.com (HELO NAM01-BY2-obe.outbound.protection.outlook.com) ([104.47.34.50]) by ob1.hgst.iphmx.com with ESMTP; 08 Jul 2019 12:10:39 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qgPEXxUXvJ/j15Te2EeOvyRw3PUYLMKQJXu3d6vmt2s=; b=dU2orJTf7UJ6EyMwUuSts9hx5lyt6x+fRt162IeQ4zaNEoqwtk5W1/HW85ab2EfFMcr+CqkqrELGEvRFOMcKmTJm/JeyIf+OdUPvh+uCS7H/lappoXHDzWkARZb+76K6tGky8YgTkpisT+TtmcNvAGxS4PWAy++yV26HZjEGjYY= Received: from MN2PR04MB6061.namprd04.prod.outlook.com (20.178.246.15) by MN2PR04MB6720.namprd04.prod.outlook.com (10.186.145.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2052.18; Mon, 8 Jul 2019 04:10:37 +0000 Received: from MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::1d4a:f9e2:5761:dcb9]) by MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::1d4a:f9e2:5761:dcb9%3]) with mapi id 15.20.2052.020; Mon, 8 Jul 2019 04:10:37 +0000 From: Anup Patel To: Rick Chen , Bin Meng , Lukas Auer , Peng Fan , Jagan Teki , Oleksandr Zhadan and Michael Durrant Thread-Topic: [PATCH v3 1/6] spi: Add SiFive SPI driver Thread-Index: AQHVNUMYBnAvRjFZ+kCiLiB72oJZeg== Date: Mon, 8 Jul 2019 04:10:37 +0000 Message-ID: <20190708041004.6252-2-anup.patel@wdc.com> References: <20190708041004.6252-1-anup.patel@wdc.com> In-Reply-To: <20190708041004.6252-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0076.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00::16) To MN2PR04MB6061.namprd04.prod.outlook.com (2603:10b6:208:d8::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [129.253.179.161] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7da65bf6-e5a3-4f6a-0aaa-08d7035a3b17 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:MN2PR04MB6720; x-ms-traffictypediagnostic: MN2PR04MB6720: x-microsoft-antispam-prvs: wdcipoutbound: EOP-TRUE x-ms-oob-tlc-oobclassifiers: OLM:2043; x-forefront-prvs: 00922518D8 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(6029001)(4636009)(366004)(376002)(346002)(136003)(396003)(39860400002)(189003)(199004)(6506007)(386003)(14444005)(256004)(110136005)(478600001)(52116002)(81166006)(81156014)(8936002)(54906003)(26005)(6486002)(72206003)(6436002)(6512007)(316002)(53936002)(102836004)(76176011)(4326008)(36756003)(5660300002)(30864003)(66476007)(7736002)(1076003)(66556008)(3846002)(64756008)(66446008)(6116002)(305945005)(73956011)(66946007)(7416002)(486006)(68736007)(14454004)(44832011)(99286004)(66066001)(2906002)(11346002)(186003)(86362001)(71190400001)(71200400001)(2616005)(25786009)(50226002)(8676002)(446003)(476003); DIR:OUT; SFP:1102; SCL:1; SRVR:MN2PR04MB6720; H:MN2PR04MB6061.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: y0TLmbehL66HmZA/lynIvulhG9POV+0nnao3q9axIAXjJ8A9vmLG+4n90OrxMh/jboXbGxfBbo0Rm6eZTnqSMPtXtBHlygFqC3DRFLeVQjfHRA/2tZxWD8xttWx2C0O5UQn28aWmt2d0zRZlt/fOIHNQOAl7UrzMyMpswQg1aO+PhNiXFUYC6AlIkGdK2jHnr9sCfPTIOwxF8u7cZlGCS/31CCoXjMiy7TZDh8bVRxWui1yUnWpjE9/g4WOdAb5vvjaytK7iL7hS/KS/Fqf00xlbrTRpW+FBn351wJNLuXIEitjMlDXQK4UWVdY9GTzRw29IVUDwg5Lxrhj3kp/K+XDzL/cM1lUYlx9VxDPrOXLQAvWBL8eJSWDFeEpkrlprccjG/wwzkqfBdiPcGX0hh3TfS0qmZicJTfgWcah8KJ8= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7da65bf6-e5a3-4f6a-0aaa-08d7035a3b17 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jul 2019 04:10:37.5396 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Anup.Patel@wdc.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB6720 Cc: Palmer Dabbelt , U-Boot Mailing List Subject: [U-Boot] [PATCH v3 1/6] spi: Add SiFive SPI driver X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Bhargav Shah This patch adds SiFive SPI driver. The driver is 100% DM driver and it determines input clock using clk framework. The SiFive SPI block is found on SiFive FU540 SOC and is used to access flash and MMC devices on SiFive Unleashed board. This driver implementation is inspired from the Linux SiFive SPI driver available in Linux-5.2 or higher and SiFive FSBL sources. Signed-off-by: Bhargav Shah Signed-off-by: Anup Patel Reviewed-by: Bin Meng Tested-by: Bin Meng --- drivers/spi/Kconfig | 8 + drivers/spi/Makefile | 1 + drivers/spi/spi-sifive.c | 403 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 412 insertions(+) create mode 100644 drivers/spi/spi-sifive.c diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index eb32f082fe..2712bad310 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -224,6 +224,14 @@ config SANDBOX_SPI }; }; +config SIFIVE_SPI + bool "SiFive SPI driver" + help + This driver supports the SiFive SPI IP. If unsure say N. + Enable the SiFive SPI controller driver. + + The SiFive SPI controller driver is found on various SiFive SoCs. + config SPI_SUNXI bool "Allwinner SoC SPI controllers" help diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 8be9a4baa2..09a9d3697e 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -49,6 +49,7 @@ obj-$(CONFIG_PL022_SPI) += pl022_spi.o obj-$(CONFIG_RENESAS_RPC_SPI) += renesas_rpc_spi.o obj-$(CONFIG_ROCKCHIP_SPI) += rk_spi.o obj-$(CONFIG_SANDBOX_SPI) += sandbox_spi.o +obj-$(CONFIG_SIFIVE_SPI) += spi-sifive.o obj-$(CONFIG_SPI_SUNXI) += spi-sunxi.o obj-$(CONFIG_SH_SPI) += sh_spi.o obj-$(CONFIG_SH_QSPI) += sh_qspi.o diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c new file mode 100644 index 0000000000..1186f6e8f5 --- /dev/null +++ b/drivers/spi/spi-sifive.c @@ -0,0 +1,403 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2018 SiFive, Inc. + * Copyright 2019 Bhargav Shah + * + * SiFive SPI controller driver (master mode only) + */ + +#include +#include +#include +#include +#include +#include +#include + +#define SIFIVE_SPI_MAX_CS 32 + +#define SIFIVE_SPI_DEFAULT_DEPTH 8 +#define SIFIVE_SPI_DEFAULT_BITS 8 + +/* register offsets */ +#define SIFIVE_SPI_REG_SCKDIV 0x00 /* Serial clock divisor */ +#define SIFIVE_SPI_REG_SCKMODE 0x04 /* Serial clock mode */ +#define SIFIVE_SPI_REG_CSID 0x10 /* Chip select ID */ +#define SIFIVE_SPI_REG_CSDEF 0x14 /* Chip select default */ +#define SIFIVE_SPI_REG_CSMODE 0x18 /* Chip select mode */ +#define SIFIVE_SPI_REG_DELAY0 0x28 /* Delay control 0 */ +#define SIFIVE_SPI_REG_DELAY1 0x2c /* Delay control 1 */ +#define SIFIVE_SPI_REG_FMT 0x40 /* Frame format */ +#define SIFIVE_SPI_REG_TXDATA 0x48 /* Tx FIFO data */ +#define SIFIVE_SPI_REG_RXDATA 0x4c /* Rx FIFO data */ +#define SIFIVE_SPI_REG_TXMARK 0x50 /* Tx FIFO watermark */ +#define SIFIVE_SPI_REG_RXMARK 0x54 /* Rx FIFO watermark */ +#define SIFIVE_SPI_REG_FCTRL 0x60 /* SPI flash interface control */ +#define SIFIVE_SPI_REG_FFMT 0x64 /* SPI flash instruction format */ +#define SIFIVE_SPI_REG_IE 0x70 /* Interrupt Enable Register */ +#define SIFIVE_SPI_REG_IP 0x74 /* Interrupt Pendings Register */ + +/* sckdiv bits */ +#define SIFIVE_SPI_SCKDIV_DIV_MASK 0xfffU + +/* sckmode bits */ +#define SIFIVE_SPI_SCKMODE_PHA BIT(0) +#define SIFIVE_SPI_SCKMODE_POL BIT(1) +#define SIFIVE_SPI_SCKMODE_MODE_MASK (SIFIVE_SPI_SCKMODE_PHA | \ + SIFIVE_SPI_SCKMODE_POL) + +/* csmode bits */ +#define SIFIVE_SPI_CSMODE_MODE_AUTO 0U +#define SIFIVE_SPI_CSMODE_MODE_HOLD 2U +#define SIFIVE_SPI_CSMODE_MODE_OFF 3U + +/* delay0 bits */ +#define SIFIVE_SPI_DELAY0_CSSCK(x) ((u32)(x)) +#define SIFIVE_SPI_DELAY0_CSSCK_MASK 0xffU +#define SIFIVE_SPI_DELAY0_SCKCS(x) ((u32)(x) << 16) +#define SIFIVE_SPI_DELAY0_SCKCS_MASK (0xffU << 16) + +/* delay1 bits */ +#define SIFIVE_SPI_DELAY1_INTERCS(x) ((u32)(x)) +#define SIFIVE_SPI_DELAY1_INTERCS_MASK 0xffU +#define SIFIVE_SPI_DELAY1_INTERXFR(x) ((u32)(x) << 16) +#define SIFIVE_SPI_DELAY1_INTERXFR_MASK (0xffU << 16) + +/* fmt bits */ +#define SIFIVE_SPI_FMT_PROTO_SINGLE 0U +#define SIFIVE_SPI_FMT_PROTO_DUAL 1U +#define SIFIVE_SPI_FMT_PROTO_QUAD 2U +#define SIFIVE_SPI_FMT_PROTO_MASK 3U +#define SIFIVE_SPI_FMT_ENDIAN BIT(2) +#define SIFIVE_SPI_FMT_DIR BIT(3) +#define SIFIVE_SPI_FMT_LEN(x) ((u32)(x) << 16) +#define SIFIVE_SPI_FMT_LEN_MASK (0xfU << 16) + +/* txdata bits */ +#define SIFIVE_SPI_TXDATA_DATA_MASK 0xffU +#define SIFIVE_SPI_TXDATA_FULL BIT(31) + +/* rxdata bits */ +#define SIFIVE_SPI_RXDATA_DATA_MASK 0xffU +#define SIFIVE_SPI_RXDATA_EMPTY BIT(31) + +/* ie and ip bits */ +#define SIFIVE_SPI_IP_TXWM BIT(0) +#define SIFIVE_SPI_IP_RXWM BIT(1) + +struct sifive_spi { + void *regs; /* base address of the registers */ + u32 fifo_depth; + u32 bits_per_word; + u32 cs_inactive; /* Level of the CS pins when inactive*/ + u32 freq; + u32 num_cs; +}; + +static void sifive_spi_write(struct sifive_spi *spi, int offset, u32 value) +{ + writel(value, spi->regs + offset); +} + +static u32 sifive_spi_read(struct sifive_spi *spi, int offset) +{ + return readl(spi->regs + offset); +} + +static void sifive_spi_prep_device(struct sifive_spi *spi, + struct dm_spi_slave_platdata *slave) +{ + /* Update the chip select polarity */ + if (slave->mode & SPI_CS_HIGH) + spi->cs_inactive &= ~BIT(slave->cs); + else + spi->cs_inactive |= BIT(slave->cs); + sifive_spi_write(spi, SIFIVE_SPI_REG_CSDEF, spi->cs_inactive); + + /* Select the correct device */ + sifive_spi_write(spi, SIFIVE_SPI_REG_CSID, slave->cs); +} + +static int sifive_spi_set_cs(struct sifive_spi *spi, + struct dm_spi_slave_platdata *slave) +{ + u32 cs_mode = SIFIVE_SPI_CSMODE_MODE_HOLD; + + if (slave->cs > spi->num_cs) + return -EINVAL; + + if (slave->mode & SPI_CS_HIGH) + cs_mode = SIFIVE_SPI_CSMODE_MODE_AUTO; + + sifive_spi_write(spi, SIFIVE_SPI_REG_CSMODE, cs_mode); + + return 0; +} + +static void sifive_spi_clear_cs(struct sifive_spi *spi) +{ + sifive_spi_write(spi, SIFIVE_SPI_REG_CSMODE, + SIFIVE_SPI_CSMODE_MODE_AUTO); +} + +static void sifive_spi_prep_transfer(struct sifive_spi *spi, + bool is_rx_xfer, + struct dm_spi_slave_platdata *slave) +{ + u32 cr; + + /* Modify the SPI protocol mode */ + cr = sifive_spi_read(spi, SIFIVE_SPI_REG_FMT); + + /* Bits per word ? */ + cr &= ~SIFIVE_SPI_FMT_LEN_MASK; + cr |= SIFIVE_SPI_FMT_LEN(spi->bits_per_word); + + /* LSB first? */ + cr &= ~SIFIVE_SPI_FMT_ENDIAN; + if (slave->mode & SPI_LSB_FIRST) + cr |= SIFIVE_SPI_FMT_ENDIAN; + + /* Number of wires ? */ + cr &= ~SIFIVE_SPI_FMT_PROTO_MASK; + if ((slave->mode & SPI_TX_QUAD) || (slave->mode & SPI_RX_QUAD)) + cr |= SIFIVE_SPI_FMT_PROTO_QUAD; + else if ((slave->mode & SPI_TX_DUAL) || (slave->mode & SPI_RX_DUAL)) + cr |= SIFIVE_SPI_FMT_PROTO_DUAL; + else + cr |= SIFIVE_SPI_FMT_PROTO_SINGLE; + + /* SPI direction in/out ? */ + cr &= ~SIFIVE_SPI_FMT_DIR; + if (!is_rx_xfer) + cr |= SIFIVE_SPI_FMT_DIR; + + sifive_spi_write(spi, SIFIVE_SPI_REG_FMT, cr); +} + +static void sifive_spi_rx(struct sifive_spi *spi, u8 *rx_ptr) +{ + u32 data; + + do { + data = sifive_spi_read(spi, SIFIVE_SPI_REG_RXDATA); + } while (data & SIFIVE_SPI_RXDATA_EMPTY); + + if (rx_ptr) + *rx_ptr = data & SIFIVE_SPI_RXDATA_DATA_MASK; +} + +static void sifive_spi_tx(struct sifive_spi *spi, const u8 *tx_ptr) +{ + u32 data; + u8 tx_data = (tx_ptr) ? *tx_ptr & SIFIVE_SPI_TXDATA_DATA_MASK : + SIFIVE_SPI_TXDATA_DATA_MASK; + + do { + data = sifive_spi_read(spi, SIFIVE_SPI_REG_TXDATA); + } while (data & SIFIVE_SPI_TXDATA_FULL); + + sifive_spi_write(spi, SIFIVE_SPI_REG_TXDATA, tx_data); +} + +static u8 sifive_spi_txrx(struct sifive_spi *spi, const u8 *tx_ptr) +{ + u8 rx = 0; + + sifive_spi_tx(spi, tx_ptr); + sifive_spi_rx(spi, &rx); + + return rx; +} + +static int sifive_spi_claim_bus(struct udevice *dev) +{ + int ret; + struct udevice *bus = dev->parent; + struct sifive_spi *spi = dev_get_priv(bus); + struct dm_spi_slave_platdata *slave = dev_get_parent_platdata(dev); + + sifive_spi_prep_device(spi, slave); + + ret = sifive_spi_set_cs(spi, slave); + if (ret) + return ret; + + return 0; +} + +static int sifive_spi_release_bus(struct udevice *dev) +{ + struct sifive_spi *spi = dev_get_priv(dev->parent); + + sifive_spi_clear_cs(spi); + + return 0; +} + +static int sifive_spi_xfer(struct udevice *dev, unsigned int bitlen, + const void *dout, void *din, unsigned long flags) +{ + struct udevice *bus = dev->parent; + struct sifive_spi *spi = dev_get_priv(bus); + struct dm_spi_slave_platdata *slave = dev_get_parent_platdata(dev); + const unsigned char *tx_ptr = dout; + unsigned char *rx_ptr = din; + u32 remaining_len; + + sifive_spi_prep_transfer(spi, true, slave); + + remaining_len = bitlen / 8; + + while (remaining_len) { + int n_words, tx_words, rx_words; + + n_words = min(remaining_len, spi->fifo_depth); + + /* Enqueue n_words for transmission */ + if (tx_ptr) { + for (tx_words = 0; tx_words < n_words; ++tx_words) { + sifive_spi_txrx(spi, tx_ptr); + tx_ptr++; + } + } + + /* Read out all the data from the RX FIFO */ + if (rx_ptr) { + for (rx_words = 0; rx_words < n_words; ++rx_words) { + *rx_ptr = sifive_spi_txrx(spi, NULL); + rx_ptr++; + } + } + + remaining_len -= n_words; + } + + return 0; +} + +static int sifive_spi_set_speed(struct udevice *bus, uint speed) +{ + struct sifive_spi *spi = dev_get_priv(bus); + u32 scale; + + if (speed > spi->freq) + speed = spi->freq; + + /* Cofigure max speed */ + scale = (DIV_ROUND_UP(spi->freq >> 1, speed) - 1) + & SIFIVE_SPI_SCKDIV_DIV_MASK; + sifive_spi_write(spi, SIFIVE_SPI_REG_SCKDIV, scale); + return 0; +} + +static int sifive_spi_set_mode(struct udevice *bus, uint mode) +{ + struct sifive_spi *spi = dev_get_priv(bus); + u32 cr; + + /* Switch clock mode bits */ + cr = sifive_spi_read(spi, SIFIVE_SPI_REG_SCKMODE) & + ~SIFIVE_SPI_SCKMODE_MODE_MASK; + if (mode & SPI_CPHA) + cr |= SIFIVE_SPI_SCKMODE_PHA; + if (mode & SPI_CPOL) + cr |= SIFIVE_SPI_SCKMODE_POL; + + sifive_spi_write(spi, SIFIVE_SPI_REG_SCKMODE, cr); + + return 0; +} + +static int sifive_spi_cs_info(struct udevice *bus, uint cs, + struct spi_cs_info *info) +{ + return 0; +} + +static void sifive_spi_init_hw(struct sifive_spi *spi) +{ + u32 cs_bits; + + /* probe the number of CS lines */ + spi->cs_inactive = sifive_spi_read(spi, SIFIVE_SPI_REG_CSDEF); + sifive_spi_write(spi, SIFIVE_SPI_REG_CSDEF, 0xffffffffU); + cs_bits = sifive_spi_read(spi, SIFIVE_SPI_REG_CSDEF); + sifive_spi_write(spi, SIFIVE_SPI_REG_CSDEF, spi->cs_inactive); + if (!cs_bits) { + printf("Could not auto probe CS lines\n"); + return; + } + + spi->num_cs = ilog2(cs_bits) + 1; + if (spi->num_cs > SIFIVE_SPI_MAX_CS) { + printf("Invalid number of spi slaves\n"); + return; + } + + /* Watermark interrupts are disabled by default */ + sifive_spi_write(spi, SIFIVE_SPI_REG_IE, 0); + + /* Set CS/SCK Delays and Inactive Time to defaults */ + sifive_spi_write(spi, SIFIVE_SPI_REG_DELAY0, + SIFIVE_SPI_DELAY0_CSSCK(1) | + SIFIVE_SPI_DELAY0_SCKCS(1)); + sifive_spi_write(spi, SIFIVE_SPI_REG_DELAY1, + SIFIVE_SPI_DELAY1_INTERCS(1) | + SIFIVE_SPI_DELAY1_INTERXFR(0)); + + /* Exit specialized memory-mapped SPI flash mode */ + sifive_spi_write(spi, SIFIVE_SPI_REG_FCTRL, 0); +} + +static int sifive_spi_probe(struct udevice *bus) +{ + struct sifive_spi *spi = dev_get_priv(bus); + struct clk clkdev; + int ret; + + spi->regs = (void *)(ulong)dev_remap_addr(bus); + if (!spi->regs) + return -ENODEV; + + spi->fifo_depth = dev_read_u32_default(bus, + "sifive,fifo-depth", + SIFIVE_SPI_DEFAULT_DEPTH); + + spi->bits_per_word = dev_read_u32_default(bus, + "sifive,max-bits-per-word", + SIFIVE_SPI_DEFAULT_BITS); + + ret = clk_get_by_index(bus, 0, &clkdev); + if (ret) + return ret; + spi->freq = clk_get_rate(&clkdev); + + /* init the sifive spi hw */ + sifive_spi_init_hw(spi); + + return 0; +} + +static const struct dm_spi_ops sifive_spi_ops = { + .claim_bus = sifive_spi_claim_bus, + .release_bus = sifive_spi_release_bus, + .xfer = sifive_spi_xfer, + .set_speed = sifive_spi_set_speed, + .set_mode = sifive_spi_set_mode, + .cs_info = sifive_spi_cs_info, +}; + +static const struct udevice_id sifive_spi_ids[] = { + { .compatible = "sifive,spi0" }, + { } +}; + +U_BOOT_DRIVER(sifive_spi) = { + .name = "sifive_spi", + .id = UCLASS_SPI, + .of_match = sifive_spi_ids, + .ops = &sifive_spi_ops, + .priv_auto_alloc_size = sizeof(struct sifive_spi), + .probe = sifive_spi_probe, +}; From patchwork Mon Jul 8 04:10:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1128864 X-Patchwork-Delegate: van.freenix@gmail.com 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=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="RcJHINWP"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="sxgPmewK"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45hsV66Fgnz9s3l for ; Mon, 8 Jul 2019 14:12:14 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 3DEF8C21D9A; Mon, 8 Jul 2019 04:11:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 073B9C21D8A; Mon, 8 Jul 2019 04:11:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 47988C21DA6; Mon, 8 Jul 2019 04:10:49 +0000 (UTC) Received: from esa4.hgst.iphmx.com (esa4.hgst.iphmx.com [216.71.154.42]) by lists.denx.de (Postfix) with ESMTPS id 6889FC21DC1 for ; Mon, 8 Jul 2019 04:10:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1562559046; x=1594095046; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=lLycTni9dcAGeoVr+MWiWdRoyLAav7MAbXHxnlf2PDA=; b=RcJHINWP7wIhQB90UuosO2m3hMTorOLrSumUn5ukLl3s9sKDgzSCAz4r NidlTGyqQKuOaBaWYoNvMS7cbWbW9rUtY6K6tDWoC2cof+6WGk50hKsxp sCrGMhRzF009VUxbLwFWCrkvWznH+VQOatjebw6l7hnkGkWQL06ntF7xC yR/giLq/FS4E4XPWD6TmSqaz0dO/tkgwCI9a2O0qZ2OnEpKWXbB3h+Blx Zdvj4rxiF/Nq6PQWSXRREsbBl5PXyeUmCn5XNtZepgKgCs/KXx0tWHRdk e8RLpi8gWUeKzEt0+AD5IM7wGbd1xJKipMCEy9srV85Dg1Rl5iisLUdxP A==; IronPort-SDR: tdSUgeZQqaOK7IBsiOG3M40eEOpaiT7dM/cDIOmgHiRJ9tejmG/tJzF+Pij43PNkHo44tHrfMP v6Vt6xkNYTCdPUDcYdzVH5fqFrrnoaDhq+19c8MUhMVg1BT47vr0PpS8YV9xrPXnVWp/fp8ic8 D4xTAx6vu4TSshLKFpOcr3eqgRCWDNTIZ05vWPyXckGZaYDZ3k7BqolOB/XzJfGVpFO4Ywu253 o8LrglRtXSweKFxQ+y5CWwhxiZkWv8dTsGQQuMVCVkrc0Cnhixb0+jcOD73R5hgAn6Jq7btyiT PWc= X-IronPort-AV: E=Sophos;i="5.63,465,1557158400"; d="scan'208";a="112409373" Received: from mail-by2nam01lp2059.outbound.protection.outlook.com (HELO NAM01-BY2-obe.outbound.protection.outlook.com) ([104.47.34.59]) by ob1.hgst.iphmx.com with ESMTP; 08 Jul 2019 12:10:44 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cIlaCN7KKtd3SupjMvOOwD1ngZlzWuFl+6+q1EocmvQ=; b=sxgPmewKtVgfUyt0JHk8UeKkAw2QqoxMuCG/3ISIu0+gXwNXQ6jZ2OdRuhAekhMcDH4O8QhG1uLaViITB0GrF8cPmls1mNWNVuPaLANTtz0swp1ZKk3nyNk0cA0Qn64EP3qzVlld90wvsh5uBAHDpaQ/uv0weYJq1XhXkqV5Kcc= Received: from MN2PR04MB6061.namprd04.prod.outlook.com (20.178.246.15) by MN2PR04MB6720.namprd04.prod.outlook.com (10.186.145.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2052.18; Mon, 8 Jul 2019 04:10:43 +0000 Received: from MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::1d4a:f9e2:5761:dcb9]) by MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::1d4a:f9e2:5761:dcb9%3]) with mapi id 15.20.2052.020; Mon, 8 Jul 2019 04:10:43 +0000 From: Anup Patel To: Rick Chen , Bin Meng , Lukas Auer , Peng Fan , Jagan Teki , Oleksandr Zhadan and Michael Durrant Thread-Topic: [PATCH v3 2/6] mmc: skip select_mode_and_width for MMC SPI host Thread-Index: AQHVNUMcrEa5thw1QECic+QCNcFJ5w== Date: Mon, 8 Jul 2019 04:10:43 +0000 Message-ID: <20190708041004.6252-3-anup.patel@wdc.com> References: <20190708041004.6252-1-anup.patel@wdc.com> In-Reply-To: <20190708041004.6252-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0076.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00::16) To MN2PR04MB6061.namprd04.prod.outlook.com (2603:10b6:208:d8::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [129.253.179.161] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2fd578c1-35c8-4620-4b59-08d7035a3e6a x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:MN2PR04MB6720; x-ms-traffictypediagnostic: MN2PR04MB6720: x-microsoft-antispam-prvs: wdcipoutbound: EOP-TRUE x-ms-oob-tlc-oobclassifiers: OLM:5516; x-forefront-prvs: 00922518D8 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(366004)(376002)(346002)(136003)(396003)(39860400002)(189003)(199004)(6506007)(386003)(256004)(110136005)(478600001)(52116002)(81166006)(81156014)(8936002)(54906003)(26005)(6486002)(72206003)(6436002)(6512007)(316002)(53936002)(102836004)(76176011)(4326008)(36756003)(5660300002)(66476007)(7736002)(1076003)(66556008)(3846002)(64756008)(66446008)(6116002)(305945005)(73956011)(66946007)(7416002)(486006)(68736007)(14454004)(44832011)(99286004)(66066001)(2906002)(11346002)(186003)(86362001)(71190400001)(71200400001)(2616005)(25786009)(50226002)(8676002)(446003)(476003); DIR:OUT; SFP:1102; SCL:1; SRVR:MN2PR04MB6720; H:MN2PR04MB6061.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: cE3ioL1HQu9cxGVU1v06Dn5lL3MDvEZ9kZcoXzaEPVzO0AOQQEYYlTfROTuZcXBHDcu2GiV9RtQL540WZEAXvZdtzCum2KMm512IMyQX9M52zxplfbFa51jTDai2leuGxIkhyE0NDLsbX7FGTpjWLnfaiOtJOV3T/vRaIbjglYD/Qu08JmoduO/9GSdzvsPlGxpgG6GDs+nt4FLMG3c1tl9HDlMYpjX2OCeNReJk8SD3DnhyK/vGNOFHho9w3c7I2aa/Gc/5b+lK1zAFOtRTE913k3Bjb3HEDmbq+fN1x+4/ABuw6SmiLuexseA+P7BpbmBfFsmHFiOzwSJzFcUJdtXsBKv59iGEJMMG/CDcSNZ6rhVePn8iK1vSKNdpOZEWn7t8evY8ur4sYHbE1VJsTp0B0ahDEA+FaKEhSdG7uSY= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2fd578c1-35c8-4620-4b59-08d7035a3e6a X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jul 2019 04:10:43.0774 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Anup.Patel@wdc.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB6720 Cc: Palmer Dabbelt , U-Boot Mailing List Subject: [U-Boot] [PATCH v3 2/6] mmc: skip select_mode_and_width for MMC SPI host X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The MMC mode and width are fixed for MMC SPI host hence we skip sd_select_mode_and_width() and mmc_select_mode_and_width() for MMC SPI host. Signed-off-by: Anup Patel Reviewed-by: Bin Meng Tested-by: Bin Meng --- drivers/mmc/mmc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 456c1b4cc9..95008c72c3 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1672,6 +1672,13 @@ static int sd_select_mode_and_width(struct mmc *mmc, uint card_caps) mmc_dump_capabilities("host", mmc->host_caps); #endif + if (mmc_host_is_spi(mmc)) { + mmc_set_bus_width(mmc, 1); + mmc_select_mode(mmc, SD_LEGACY); + mmc_set_clock(mmc, mmc->tran_speed, MMC_CLK_ENABLE); + return 0; + } + /* Restrict card's capabilities by what the host can do */ caps = card_caps & mmc->host_caps; @@ -1934,6 +1941,13 @@ static int mmc_select_mode_and_width(struct mmc *mmc, uint card_caps) mmc_dump_capabilities("host", mmc->host_caps); #endif + if (mmc_host_is_spi(mmc)) { + mmc_set_bus_width(mmc, 1); + mmc_select_mode(mmc, MMC_LEGACY); + mmc_set_clock(mmc, mmc->tran_speed, MMC_CLK_ENABLE); + return 0; + } + /* Restrict card's capabilities by what the host can do */ card_caps &= mmc->host_caps; From patchwork Mon Jul 8 04:10:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1128863 X-Patchwork-Delegate: van.freenix@gmail.com 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=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="W9zR+yBq"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="uJhFQQbk"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45hsTW5YXrz9s3l for ; Mon, 8 Jul 2019 14:11:43 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 05DDBC21C6A; Mon, 8 Jul 2019 04:11:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A538AC21DB6; Mon, 8 Jul 2019 04:11:14 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E7893C21DA6; Mon, 8 Jul 2019 04:11:00 +0000 (UTC) Received: from esa2.hgst.iphmx.com (esa2.hgst.iphmx.com [68.232.143.124]) by lists.denx.de (Postfix) with ESMTPS id 9B9F2C21DFA for ; Mon, 8 Jul 2019 04:10:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1562559101; x=1594095101; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=7OKd1VxAwahtvO3Z5GCHIvUsNDVA0tP0hGRzMXpBttg=; b=W9zR+yBq0Xz1IXAJx7c5JfE2UbeiZsX2Mndf7Pggg1QNEy364inQ+Zig 0861kDwq8HToDCL/bV2ufUV1vSGMAQVzPrtT288Ao9af0AEQ+E7nnFIuk UUaVevjKvwKYYXa7X+t8V5cTxTSRNepxfS9P3AI04oOVI9kpvpJXhsgy/ 4H1BOSumw7eTl5+GXSZt8LAdZ68cRvkjWcdyI5itxz7VUi0q7Pgvr0ce8 XRMXOomcJ8SebFoPZFbJgyLg9SMfZEczlGRiOWkqghwFLiMWu71mTLeXt 4wb/mc07qecyEAal+bsfCKKLg9qvx+WbLCXxrvxDhIlEdLzs0EB/fqg1W g==; IronPort-SDR: Iq3l5WDuuXQcaWL0X8808VEjBIDzWfDb9nOKFOSiEdpejnLxhrTaZdNv2kg+fVbCWWOBDUF0jN kkfKnEJBJT0sO5Z/9ty6coGTlasJ+YbYf0BAzHmTCBS1OFg3XBwbQKypBYwf4wRimYJb5UeXyB EdN3c7/czUaBF+yzSvwlGUKPMB7zmcY1zhTR9BybZB/tHrBCBqQB38G/7yRY9/3WRcscR5Hg/C e490Lets6fdfx7FmA72faJJ2KQbvYLm6RflWsYXbG0Mz3hW5X1aCeWC51XyuZHhNWRpv5in1sR CVg= X-IronPort-AV: E=Sophos;i="5.63,465,1557158400"; d="scan'208";a="212295445" Received: from mail-co1nam05lp2059.outbound.protection.outlook.com (HELO NAM05-CO1-obe.outbound.protection.outlook.com) ([104.47.48.59]) by ob1.hgst.iphmx.com with ESMTP; 08 Jul 2019 12:11:36 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1sBxpl68uANsnwyP1FoqBonUizf/PcHfX9NhMjENInA=; b=uJhFQQbk1Lzyd+xwdcX6QMPphwxmfkxBuYo1X3B5CLizi9moC8kaW+w0/zQGyHbt7ye4Ms19e6tFrLGjh6IV0iqNdU4vV9+MULpCy/LZjV6C+IwPJ2C+zfrVQ55BBnfTUrb0w6b4FEjcdgLRmQs3x07eclrj1X9qT656tti8Z8U= Received: from MN2PR04MB6061.namprd04.prod.outlook.com (20.178.246.15) by MN2PR04MB6720.namprd04.prod.outlook.com (10.186.145.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2052.18; Mon, 8 Jul 2019 04:10:48 +0000 Received: from MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::1d4a:f9e2:5761:dcb9]) by MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::1d4a:f9e2:5761:dcb9%3]) with mapi id 15.20.2052.020; Mon, 8 Jul 2019 04:10:48 +0000 From: Anup Patel To: Rick Chen , Bin Meng , Lukas Auer , Peng Fan , Jagan Teki , Oleksandr Zhadan and Michael Durrant Thread-Topic: [PATCH v3 3/6] mmc: mmc_spi: Re-write driver using DM framework Thread-Index: AQHVNUMfejzaEnGK6E2ppeT8KPwp3w== Date: Mon, 8 Jul 2019 04:10:48 +0000 Message-ID: <20190708041004.6252-4-anup.patel@wdc.com> References: <20190708041004.6252-1-anup.patel@wdc.com> In-Reply-To: <20190708041004.6252-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0076.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00::16) To MN2PR04MB6061.namprd04.prod.outlook.com (2603:10b6:208:d8::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [129.253.179.161] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ab29879a-d3d5-4e0d-38e7-08d7035a418b x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:MN2PR04MB6720; x-ms-traffictypediagnostic: MN2PR04MB6720: x-microsoft-antispam-prvs: wdcipoutbound: EOP-TRUE x-ms-oob-tlc-oobclassifiers: OLM:15; x-forefront-prvs: 00922518D8 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(366004)(376002)(346002)(136003)(396003)(39860400002)(189003)(199004)(6506007)(386003)(14444005)(256004)(110136005)(478600001)(52116002)(81166006)(81156014)(8936002)(54906003)(26005)(6486002)(72206003)(6436002)(6512007)(316002)(53936002)(53946003)(102836004)(76176011)(4326008)(36756003)(5660300002)(30864003)(66476007)(7736002)(1076003)(66556008)(3846002)(64756008)(66446008)(6116002)(305945005)(73956011)(66946007)(7416002)(486006)(68736007)(14454004)(44832011)(99286004)(66066001)(2906002)(11346002)(186003)(86362001)(71190400001)(71200400001)(2616005)(25786009)(50226002)(8676002)(446003)(476003); DIR:OUT; SFP:1102; SCL:1; SRVR:MN2PR04MB6720; H:MN2PR04MB6061.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: K+drrAuFSHhD9RKb0Fin5U5FjPH2FShVigK2TqK4Ku8HLXD6qoUddfy4UAMoS4hD/kGlflcy1RtLbqK2GJ6fTcMDqXJYVziAmeALuf/w+RPXEthlFgFiDjz3egq1Vzh6x0Zr6Pq2PiTdgShC3+cf+cwHYCJN53hkBzcF0dWTlh+6oLliabnNU5MIZwJ35TsqvFrCTYoiDBSwO5Dyp8JtLLiPtxxVvNfJ0mfseD2iMrAh80j4F9DM0+y51I5vs/w3kdUyiVqcHQbEFPmzeXzhbizSRhU/0Tg8tM43hkDsHxu1a7nQCD+p5yDDGuGwFHiHpwDxgYoz7Yf6sR+Yhu6H0eUXVOlDZyur+SUfbX0aRtWj6O1llel9uIxpiNF93Csq9OZjZydpki7+T6CdJS4bun9t0f2x2UVfGUtYJ6LLRM0= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab29879a-d3d5-4e0d-38e7-08d7035a418b X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jul 2019 04:10:48.1025 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Anup.Patel@wdc.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB6720 Cc: Palmer Dabbelt , U-Boot Mailing List Subject: [U-Boot] [PATCH v3 3/6] mmc: mmc_spi: Re-write driver using DM framework X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Bhargav Shah This patch rewrites MMC SPI driver using U-Boot DM framework and get it's working on SiFive Unleashed board. Signed-off-by: Bhargav Shah Signed-off-by: Anup Patel Reviewed-by: Bin Meng Tested-by: Bin Meng --- drivers/mmc/Kconfig | 18 ++ drivers/mmc/mmc_spi.c | 469 ++++++++++++++++++++++------------- scripts/config_whitelist.txt | 6 - 3 files changed, 320 insertions(+), 173 deletions(-) diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index c23299ea96..f750dad00a 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -46,6 +46,24 @@ config SPL_DM_MMC if MMC +config MMC_SPI + bool "Support for SPI-based MMC controller" + depends on DM_MMC && DM_SPI + help + This selects SPI-based MMC controllers. + If you have an MMC controller on a SPI bus, say Y here. + + If unsure, say N. + +config MMC_SPI_CRC_ON + bool "Support CRC for SPI-based MMC controller" + depends on MMC_SPI + default y + help + This enables CRC for SPI-based MMC controllers. + + If unsure, say N. + config ARM_PL180_MMCI bool "ARM AMBA Multimedia Card Interface and compatible support" depends on DM_MMC && OF_CONTROL diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c index 4f57990d9c..f3d687ae80 100644 --- a/drivers/mmc/mmc_spi.c +++ b/drivers/mmc/mmc_spi.c @@ -2,6 +2,8 @@ * generic mmc spi driver * * Copyright (C) 2010 Thomas Chou + * Copyright 2019 Bhargav Shah + * * Licensed under the GPL-2 or later. */ #include @@ -9,21 +11,23 @@ #include #include #include -#include +#include #include #include #include +#include +#include /* MMC/SD in SPI mode reports R1 status always */ -#define R1_SPI_IDLE (1 << 0) -#define R1_SPI_ERASE_RESET (1 << 1) -#define R1_SPI_ILLEGAL_COMMAND (1 << 2) -#define R1_SPI_COM_CRC (1 << 3) -#define R1_SPI_ERASE_SEQ (1 << 4) -#define R1_SPI_ADDRESS (1 << 5) -#define R1_SPI_PARAMETER (1 << 6) +#define R1_SPI_IDLE BIT(0) +#define R1_SPI_ERASE_RESET BIT(1) +#define R1_SPI_ILLEGAL_COMMAND BIT(2) +#define R1_SPI_COM_CRC BIT(3) +#define R1_SPI_ERASE_SEQ BIT(4) +#define R1_SPI_ADDRESS BIT(5) +#define R1_SPI_PARAMETER BIT(6) /* R1 bit 7 is always zero, reuse this bit for error */ -#define R1_SPI_ERROR (1 << 7) +#define R1_SPI_ERROR BIT(7) /* Response tokens used to ack each block written: */ #define SPI_MMC_RESPONSE_CODE(x) ((x) & 0x1f) @@ -34,28 +38,45 @@ /* Read and write blocks start with these tokens and end with crc; * on error, read tokens act like a subset of R2_SPI_* values. */ -#define SPI_TOKEN_SINGLE 0xfe /* single block r/w, multiblock read */ -#define SPI_TOKEN_MULTI_WRITE 0xfc /* multiblock write */ -#define SPI_TOKEN_STOP_TRAN 0xfd /* terminate multiblock write */ +/* single block write multiblock read */ +#define SPI_TOKEN_SINGLE 0xfe +/* multiblock write */ +#define SPI_TOKEN_MULTI_WRITE 0xfc +/* terminate multiblock write */ +#define SPI_TOKEN_STOP_TRAN 0xfd /* MMC SPI commands start with a start bit "0" and a transmit bit "1" */ -#define MMC_SPI_CMD(x) (0x40 | (x & 0x3f)) +#define MMC_SPI_CMD(x) (0x40 | (x)) /* bus capability */ -#define MMC_SPI_VOLTAGE (MMC_VDD_32_33 | MMC_VDD_33_34) -#define MMC_SPI_MIN_CLOCK 400000 /* 400KHz to meet MMC spec */ +#define MMC_SPI_VOLTAGE (MMC_VDD_32_33 | MMC_VDD_33_34) +#define MMC_SPI_MIN_CLOCK 400000 /* 400KHz to meet MMC spec */ +#define MMC_SPI_MAX_CLOCK 25000000 /* SD/MMC legacy speed */ /* timeout value */ -#define CTOUT 8 -#define RTOUT 3000000 /* 1 sec */ -#define WTOUT 3000000 /* 1 sec */ +#define CMD_TIMEOUT 8 +#define READ_TIMEOUT 3000000 /* 1 sec */ +#define WRITE_TIMEOUT 3000000 /* 1 sec */ -static uint mmc_spi_sendcmd(struct mmc *mmc, ushort cmdidx, u32 cmdarg) +struct mmc_spi_priv { + struct spi_slave *spi; + struct mmc_config cfg; + struct mmc mmc; +}; + +static int mmc_spi_sendcmd(struct udevice *dev, + ushort cmdidx, u32 cmdarg, u32 resp_type, + u8 *resp, u32 resp_size, + bool resp_match, u8 resp_match_value) { - struct spi_slave *spi = mmc->priv; - u8 cmdo[7]; - u8 r1; - int i; + int i, rpos = 0, ret = 0; + u8 cmdo[7], r; + + debug("%s: cmd%d cmdarg=0x%x resp_type=0x%x " + "resp_size=%d resp_match=%d resp_match_value=0x%x\n", + __func__, cmdidx, cmdarg, resp_type, + resp_size, resp_match, resp_match_value); + cmdo[0] = 0xff; cmdo[1] = MMC_SPI_CMD(cmdidx); cmdo[2] = cmdarg >> 24; @@ -63,37 +84,79 @@ static uint mmc_spi_sendcmd(struct mmc *mmc, ushort cmdidx, u32 cmdarg) cmdo[4] = cmdarg >> 8; cmdo[5] = cmdarg; cmdo[6] = (crc7(0, &cmdo[1], 5) << 1) | 0x01; - spi_xfer(spi, sizeof(cmdo) * 8, cmdo, NULL, 0); - for (i = 0; i < CTOUT; i++) { - spi_xfer(spi, 1 * 8, NULL, &r1, 0); - if (i && (r1 & 0x80) == 0) /* r1 response */ - break; + ret = dm_spi_xfer(dev, sizeof(cmdo) * 8, cmdo, NULL, 0); + if (ret) + return ret; + + ret = dm_spi_xfer(dev, 1 * 8, NULL, &r, 0); + if (ret) + return ret; + + if (!resp || !resp_size) + return 0; + + debug("%s: cmd%d", __func__, cmdidx); + + if (resp_match) { + r = ~resp_match_value; + i = CMD_TIMEOUT; + while (i--) { + ret = dm_spi_xfer(dev, 1 * 8, NULL, &r, 0); + if (ret) + return ret; + debug(" resp%d=0x%x", rpos, r); + rpos++; + if (r == resp_match_value) + break; + } + if (!i && (r != resp_match_value)) + return -ETIMEDOUT; + } + + for (i = 0; i < resp_size; i++) { + if (i == 0 && resp_match) { + resp[i] = resp_match_value; + continue; + } + ret = dm_spi_xfer(dev, 1 * 8, NULL, &r, 0); + if (ret) + return ret; + debug(" resp%d=0x%x", rpos, r); + rpos++; + resp[i] = r; } - debug("%s:cmd%d resp%d %x\n", __func__, cmdidx, i, r1); - return r1; + + debug("\n"); + + return 0; } -static uint mmc_spi_readdata(struct mmc *mmc, void *xbuf, - u32 bcnt, u32 bsize) +static int mmc_spi_readdata(struct udevice *dev, + void *xbuf, u32 bcnt, u32 bsize) { - struct spi_slave *spi = mmc->priv; - u8 *buf = xbuf; - u8 r1; u16 crc; - int i; + u8 *buf = xbuf, r1; + int i, ret = 0; + while (bcnt--) { - for (i = 0; i < RTOUT; i++) { - spi_xfer(spi, 1 * 8, NULL, &r1, 0); - if (r1 != 0xff) /* data token */ + for (i = 0; i < READ_TIMEOUT; i++) { + ret = dm_spi_xfer(dev, 1 * 8, NULL, &r1, 0); + if (ret) + return ret; + if (r1 == SPI_TOKEN_SINGLE) break; } - debug("%s:tok%d %x\n", __func__, i, r1); + debug("%s: data tok%d 0x%x\n", __func__, i, r1); if (r1 == SPI_TOKEN_SINGLE) { - spi_xfer(spi, bsize * 8, NULL, buf, 0); - spi_xfer(spi, 2 * 8, NULL, &crc, 0); + ret = dm_spi_xfer(dev, bsize * 8, NULL, buf, 0); + if (ret) + return ret; + ret = dm_spi_xfer(dev, 2 * 8, NULL, &crc, 0); + if (ret) + return ret; #ifdef CONFIG_MMC_SPI_CRC_ON - if (be_to_cpu16(crc16_ccitt(0, buf, bsize)) != crc) { - debug("%s: CRC error\n", mmc->cfg->name); + if (be16_to_cpu(crc16_ccitt(0, buf, bsize)) != crc) { + debug("%s: data crc error\n", __func__); r1 = R1_SPI_COM_CRC; break; } @@ -105,48 +168,56 @@ static uint mmc_spi_readdata(struct mmc *mmc, void *xbuf, } buf += bsize; } - return r1; + + if (r1 & R1_SPI_COM_CRC) + ret = -ECOMM; + else if (r1) /* other errors */ + ret = -ETIMEDOUT; + + return ret; } -static uint mmc_spi_writedata(struct mmc *mmc, const void *xbuf, - u32 bcnt, u32 bsize, int multi) +static int mmc_spi_writedata(struct udevice *dev, const void *xbuf, + u32 bcnt, u32 bsize, int multi) { - struct spi_slave *spi = mmc->priv; const u8 *buf = xbuf; - u8 r1; + u8 r1, tok[2]; u16 crc; - u8 tok[2]; - int i; + int i, ret = 0; + tok[0] = 0xff; tok[1] = multi ? SPI_TOKEN_MULTI_WRITE : SPI_TOKEN_SINGLE; + while (bcnt--) { #ifdef CONFIG_MMC_SPI_CRC_ON crc = cpu_to_be16(crc16_ccitt(0, (u8 *)buf, bsize)); #endif - spi_xfer(spi, 2 * 8, tok, NULL, 0); - spi_xfer(spi, bsize * 8, buf, NULL, 0); - spi_xfer(spi, 2 * 8, &crc, NULL, 0); - for (i = 0; i < CTOUT; i++) { - spi_xfer(spi, 1 * 8, NULL, &r1, 0); + dm_spi_xfer(dev, 2 * 8, tok, NULL, 0); + dm_spi_xfer(dev, bsize * 8, buf, NULL, 0); + dm_spi_xfer(dev, 2 * 8, &crc, NULL, 0); + for (i = 0; i < CMD_TIMEOUT; i++) { + dm_spi_xfer(dev, 1 * 8, NULL, &r1, 0); if ((r1 & 0x10) == 0) /* response token */ break; } - debug("%s:tok%d %x\n", __func__, i, r1); + debug("%s: data tok%d 0x%x\n", __func__, i, r1); if (SPI_MMC_RESPONSE_CODE(r1) == SPI_RESPONSE_ACCEPTED) { - for (i = 0; i < WTOUT; i++) { /* wait busy */ - spi_xfer(spi, 1 * 8, NULL, &r1, 0); + debug("%s: data accepted\n", __func__); + for (i = 0; i < WRITE_TIMEOUT; i++) { /* wait busy */ + dm_spi_xfer(dev, 1 * 8, NULL, &r1, 0); if (i && r1 == 0xff) { r1 = 0; break; } } - if (i == WTOUT) { - debug("%s:wtout %x\n", __func__, r1); + if (i == WRITE_TIMEOUT) { + debug("%s: data write timeout 0x%x\n", + __func__, r1); r1 = R1_SPI_ERROR; break; } } else { - debug("%s: err %x\n", __func__, r1); + debug("%s: data error 0x%x\n", __func__, r1); r1 = R1_SPI_COM_CRC; break; } @@ -154,140 +225,204 @@ static uint mmc_spi_writedata(struct mmc *mmc, const void *xbuf, } if (multi && bcnt == -1) { /* stop multi write */ tok[1] = SPI_TOKEN_STOP_TRAN; - spi_xfer(spi, 2 * 8, tok, NULL, 0); - for (i = 0; i < WTOUT; i++) { /* wait busy */ - spi_xfer(spi, 1 * 8, NULL, &r1, 0); + dm_spi_xfer(dev, 2 * 8, tok, NULL, 0); + for (i = 0; i < WRITE_TIMEOUT; i++) { /* wait busy */ + dm_spi_xfer(dev, 1 * 8, NULL, &r1, 0); if (i && r1 == 0xff) { r1 = 0; break; } } - if (i == WTOUT) { - debug("%s:wstop %x\n", __func__, r1); + if (i == WRITE_TIMEOUT) { + debug("%s: data write timeout 0x%x\n", __func__, r1); r1 = R1_SPI_ERROR; } } - return r1; -} -static int mmc_spi_request(struct mmc *mmc, struct mmc_cmd *cmd, - struct mmc_data *data) -{ - struct spi_slave *spi = mmc->priv; - u8 r1; - int i; - int ret = 0; - debug("%s:cmd%d %x %x\n", __func__, - cmd->cmdidx, cmd->resp_type, cmd->cmdarg); - spi_claim_bus(spi); - spi_cs_activate(spi); - r1 = mmc_spi_sendcmd(mmc, cmd->cmdidx, cmd->cmdarg); - if (r1 == 0xff) { /* no response */ - ret = -ENOMEDIUM; - goto done; - } else if (r1 & R1_SPI_COM_CRC) { + if (r1 & R1_SPI_COM_CRC) ret = -ECOMM; - goto done; - } else if (r1 & ~R1_SPI_IDLE) { /* other errors */ + else if (r1) /* other errors */ ret = -ETIMEDOUT; + + return ret; +} + +static int dm_mmc_spi_set_ios(struct udevice *dev) +{ + return 0; +} + +static int dm_mmc_spi_request(struct udevice *dev, struct mmc_cmd *cmd, + struct mmc_data *data) +{ + int i, multi, ret = 0; + u8 *resp = NULL; + u32 resp_size = 0; + bool resp_match = false; + u8 resp8 = 0, resp40[5] = { 0 }, resp_match_value = 0; + + dm_spi_claim_bus(dev); + + for (i = 0; i < 4; i++) + cmd->response[i] = 0; + + switch (cmd->cmdidx) { + case SD_CMD_APP_SEND_OP_COND: + case MMC_CMD_SEND_OP_COND: + resp = &resp8; + resp_size = sizeof(resp8); + cmd->cmdarg = 0x40000000; + break; + case SD_CMD_SEND_IF_COND: + resp = (u8 *)&resp40[0]; + resp_size = sizeof(resp40); + resp_match = true; + resp_match_value = R1_SPI_IDLE; + break; + case MMC_CMD_SPI_READ_OCR: + resp = (u8 *)&resp40[0]; + resp_size = sizeof(resp40); + break; + case MMC_CMD_SEND_STATUS: + case MMC_CMD_SET_BLOCKLEN: + case MMC_CMD_SPI_CRC_ON_OFF: + case MMC_CMD_STOP_TRANSMISSION: + resp = &resp8; + resp_size = sizeof(resp8); + resp_match = true; + resp_match_value = 0x0; + break; + case MMC_CMD_SEND_CSD: + case MMC_CMD_SEND_CID: + case MMC_CMD_READ_SINGLE_BLOCK: + case MMC_CMD_READ_MULTIPLE_BLOCK: + case MMC_CMD_WRITE_SINGLE_BLOCK: + case MMC_CMD_WRITE_MULTIPLE_BLOCK: + break; + default: + resp = &resp8; + resp_size = sizeof(resp8); + resp_match = true; + resp_match_value = R1_SPI_IDLE; + break; + }; + + ret = mmc_spi_sendcmd(dev, cmd->cmdidx, cmd->cmdarg, cmd->resp_type, + resp, resp_size, resp_match, resp_match_value); + if (ret) goto done; - } else if (cmd->resp_type == MMC_RSP_R2) { - r1 = mmc_spi_readdata(mmc, cmd->response, 1, 16); + + switch (cmd->cmdidx) { + case SD_CMD_APP_SEND_OP_COND: + case MMC_CMD_SEND_OP_COND: + cmd->response[0] = (resp8 & R1_SPI_IDLE) ? 0 : OCR_BUSY; + break; + case SD_CMD_SEND_IF_COND: + case MMC_CMD_SPI_READ_OCR: + cmd->response[0] = resp40[4]; + cmd->response[0] |= (uint)resp40[3] << 8; + cmd->response[0] |= (uint)resp40[2] << 16; + cmd->response[0] |= (uint)resp40[1] << 24; + break; + case MMC_CMD_SEND_STATUS: + cmd->response[0] = (resp8 & 0xff) ? + MMC_STATUS_ERROR : MMC_STATUS_RDY_FOR_DATA; + break; + case MMC_CMD_SEND_CID: + case MMC_CMD_SEND_CSD: + ret = mmc_spi_readdata(dev, cmd->response, 1, 16); + if (ret) + return ret; for (i = 0; i < 4; i++) - cmd->response[i] = be32_to_cpu(cmd->response[i]); - debug("r128 %x %x %x %x\n", cmd->response[0], cmd->response[1], - cmd->response[2], cmd->response[3]); - } else if (!data) { - switch (cmd->cmdidx) { - case SD_CMD_APP_SEND_OP_COND: - case MMC_CMD_SEND_OP_COND: - cmd->response[0] = (r1 & R1_SPI_IDLE) ? 0 : OCR_BUSY; - break; - case SD_CMD_SEND_IF_COND: - case MMC_CMD_SPI_READ_OCR: - spi_xfer(spi, 4 * 8, NULL, cmd->response, 0); - cmd->response[0] = be32_to_cpu(cmd->response[0]); - debug("r32 %x\n", cmd->response[0]); - break; - case MMC_CMD_SEND_STATUS: - spi_xfer(spi, 1 * 8, NULL, cmd->response, 0); - cmd->response[0] = (cmd->response[0] & 0xff) ? - MMC_STATUS_ERROR : MMC_STATUS_RDY_FOR_DATA; - break; - } - } else { - debug("%s:data %x %x %x\n", __func__, - data->flags, data->blocks, data->blocksize); + cmd->response[i] = + cpu_to_be32(cmd->response[i]); + break; + default: + cmd->response[0] = resp8; + break; + } + + debug("%s: cmd%d resp0=0x%x resp1=0x%x resp2=0x%x resp3=0x%x\n", + __func__, cmd->cmdidx, cmd->response[0], cmd->response[1], + cmd->response[2], cmd->response[3]); + + if (data) { + debug("%s: data flags=0x%x blocks=%d block_size=%d\n", + __func__, data->flags, data->blocks, data->blocksize); + multi = (cmd->cmdidx == MMC_CMD_WRITE_MULTIPLE_BLOCK); if (data->flags == MMC_DATA_READ) - r1 = mmc_spi_readdata(mmc, data->dest, - data->blocks, data->blocksize); + ret = mmc_spi_readdata(dev, data->dest, + data->blocks, data->blocksize); else if (data->flags == MMC_DATA_WRITE) - r1 = mmc_spi_writedata(mmc, data->src, - data->blocks, data->blocksize, - (cmd->cmdidx == MMC_CMD_WRITE_MULTIPLE_BLOCK)); - if (r1 & R1_SPI_COM_CRC) - ret = -ECOMM; - else if (r1) /* other errors */ - ret = -ETIMEDOUT; + ret = mmc_spi_writedata(dev, data->src, + data->blocks, data->blocksize, + multi); } + done: - spi_cs_deactivate(spi); - spi_release_bus(spi); + dm_spi_release_bus(dev); + return ret; } -static int mmc_spi_set_ios(struct mmc *mmc) +static int mmc_spi_probe(struct udevice *dev) { - struct spi_slave *spi = mmc->priv; + struct mmc_spi_priv *priv = dev_get_priv(dev); + struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); + char *name; + + priv->spi = dev_get_parent_priv(dev); + if (!priv->spi->max_hz) + priv->spi->max_hz = MMC_SPI_MAX_CLOCK; + priv->spi->speed = 0; + priv->spi->mode = SPI_MODE_0; + priv->spi->wordlen = 8; + + name = malloc(strlen(dev->parent->name) + strlen(dev->name) + 4); + if (!name) + return -ENOMEM; + sprintf(name, "%s:%s", dev->parent->name, dev->name); + + priv->cfg.name = name; + priv->cfg.host_caps = MMC_MODE_SPI; + priv->cfg.voltages = MMC_SPI_VOLTAGE; + priv->cfg.f_min = MMC_SPI_MIN_CLOCK; + priv->cfg.f_max = priv->spi->max_hz; + priv->cfg.part_type = PART_TYPE_DOS; + priv->cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT; + + priv->mmc.cfg = &priv->cfg; + priv->mmc.priv = priv; + priv->mmc.dev = dev; + + upriv->mmc = &priv->mmc; - debug("%s: clock %u\n", __func__, mmc->clock); - if (mmc->clock) - spi_set_speed(spi, mmc->clock); return 0; } -static int mmc_spi_init_p(struct mmc *mmc) +static int mmc_spi_bind(struct udevice *dev) { - struct spi_slave *spi = mmc->priv; - spi_set_speed(spi, MMC_SPI_MIN_CLOCK); - spi_claim_bus(spi); - /* cs deactivated for 100+ clock */ - spi_xfer(spi, 18 * 8, NULL, NULL, 0); - spi_release_bus(spi); - return 0; + struct mmc_spi_priv *priv = dev_get_priv(dev); + + return mmc_bind(dev, &priv->mmc, &priv->cfg); } -static const struct mmc_ops mmc_spi_ops = { - .send_cmd = mmc_spi_request, - .set_ios = mmc_spi_set_ios, - .init = mmc_spi_init_p, +static const struct dm_mmc_ops mmc_spi_ops = { + .send_cmd = dm_mmc_spi_request, + .set_ios = dm_mmc_spi_set_ios, }; -static struct mmc_config mmc_spi_cfg = { - .name = "MMC_SPI", - .ops = &mmc_spi_ops, - .host_caps = MMC_MODE_SPI, - .voltages = MMC_SPI_VOLTAGE, - .f_min = MMC_SPI_MIN_CLOCK, - .part_type = PART_TYPE_DOS, - .b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT, +static const struct udevice_id dm_mmc_spi_match[] = { + { .compatible = "mmc-spi-slot" }, + { /* sentinel */ } }; -struct mmc *mmc_spi_init(uint bus, uint cs, uint speed, uint mode) -{ - struct mmc *mmc; - struct spi_slave *spi; - - spi = spi_setup_slave(bus, cs, speed, mode); - if (spi == NULL) - return NULL; - - mmc_spi_cfg.f_max = speed; - - mmc = mmc_create(&mmc_spi_cfg, spi); - if (mmc == NULL) { - spi_free_slave(spi); - return NULL; - } - return mmc; -} +U_BOOT_DRIVER(mmc_spi) = { + .name = "mmc_spi", + .id = UCLASS_MMC, + .of_match = dm_mmc_spi_match, + .ops = &mmc_spi_ops, + .probe = mmc_spi_probe, + .bind = mmc_spi_bind, + .priv_auto_alloc_size = sizeof(struct mmc_spi_priv), +}; diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8651d569c5..0ce7016e84 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1182,12 +1182,6 @@ CONFIG_MMCBOOTCOMMAND CONFIG_MMCROOT CONFIG_MMC_DEFAULT_DEV CONFIG_MMC_RPMB_TRACE -CONFIG_MMC_SPI -CONFIG_MMC_SPI_BUS -CONFIG_MMC_SPI_CRC_ON -CONFIG_MMC_SPI_CS -CONFIG_MMC_SPI_MODE -CONFIG_MMC_SPI_SPEED CONFIG_MMC_SUNXI_SLOT CONFIG_MMU CONFIG_MONITOR_IS_IN_RAM From patchwork Mon Jul 8 04:10:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1128866 X-Patchwork-Delegate: van.freenix@gmail.com 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=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="rIKrQ4ub"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="iLHyiEPv"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45hsW03F28z9s3l for ; Mon, 8 Jul 2019 14:13:00 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 176AAC21DF3; Mon, 8 Jul 2019 04:11:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 60E5FC21DA6; Mon, 8 Jul 2019 04:11:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8F948C21E0F; Mon, 8 Jul 2019 04:11:05 +0000 (UTC) Received: from esa4.hgst.iphmx.com (esa4.hgst.iphmx.com [216.71.154.42]) by lists.denx.de (Postfix) with ESMTPS id EC4FFC21E07 for ; Mon, 8 Jul 2019 04:10:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1562559059; x=1594095059; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=F8SxBOGDrcQFtPWK6uBKMOCPtOjA8BZUcc2SGWBGAdo=; b=rIKrQ4ubVE7K7GBdLCTDyNqNKBnYnV5mM/9Qd63/kC/W50vZ8awy0Qw+ ddpE501wYgf6nX3dqQfbp0iEFQGqhgjIa0c0D20LfwRyB09dfeili85og AAXSR3AM9l/sgck7zoSmX+D+jp4GVOG04vUN7j0eu7KJwoj3BNIJgHR5G sWjtE6HzrszUiZbMAVmIHRtLafZfXFaGwS063TUHoReggVKQRPRMB/0Hg 26W8jrjiy84chRdkKpDnWjoq1X+50CqxOYDoozGZwvx1tYPTEnG+Ammlt QzV7dKqE51qeih/vfsfWZCL4biH8Ar4TIzXYbPZc/cxubNJQNrXUTD3ko w==; IronPort-SDR: PkTRSl8Y60pdn4nio7oYTcBdsitfQAUFRRJSXsheOd1rAZt9mx/+/DUsgL/JQKAkC6VnAf1DVB +GSCYbpBUPJE4HuWIAcltXp23+3R7RrYQ1nesWS+rGi/jkx+LbmLKwBEdkqAmkkLLe0KboH+JZ xXUuq+rLdILw+gGkkZXehSyuax/W7os3t8mO281KBzY1gSzF/L+2eOgFE9t7LQo0Aj1GsI9DSb tsnqhBhpFxHIJqAelwqcui+wL+tjGO/bZg2M6JA9xFI2u2ayCQXUGCKueaAywSDaP9KkcaO3/c Gsg= X-IronPort-AV: E=Sophos;i="5.63,465,1557158400"; d="scan'208";a="112409378" Received: from mail-sn1nam04lp2050.outbound.protection.outlook.com (HELO NAM04-SN1-obe.outbound.protection.outlook.com) ([104.47.44.50]) by ob1.hgst.iphmx.com with ESMTP; 08 Jul 2019 12:10:57 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Kfzmd3j5CtWJNGxB5cDU64RSb7e3AO4NdfOJTLMFqvo=; b=iLHyiEPvV/jVv1DCvYRd2xH+TnI66bRvkpMHEmRmN+NoanpiiLlaIWDSLPbgt9065XtGx193mkuRcHYhFSR/ZGNJuDC4VxarjUhiYkZJ5qKPFhDg6+susd39ptEBSKa3lq0DzjUfRFEDaQfk/stqaImv4XI1VK+BeoME/bunBRg= Received: from MN2PR04MB6061.namprd04.prod.outlook.com (20.178.246.15) by MN2PR04MB6864.namprd04.prod.outlook.com (10.186.145.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2052.19; Mon, 8 Jul 2019 04:10:55 +0000 Received: from MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::1d4a:f9e2:5761:dcb9]) by MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::1d4a:f9e2:5761:dcb9%3]) with mapi id 15.20.2052.020; Mon, 8 Jul 2019 04:10:55 +0000 From: Anup Patel To: Rick Chen , Bin Meng , Lukas Auer , Peng Fan , Jagan Teki , Oleksandr Zhadan and Michael Durrant Thread-Topic: [PATCH v3 4/6] cmd: Remove mmc_spi command Thread-Index: AQHVNUMjq6Vwr/GhQUC2uuxBEEpONA== Date: Mon, 8 Jul 2019 04:10:55 +0000 Message-ID: <20190708041004.6252-5-anup.patel@wdc.com> References: <20190708041004.6252-1-anup.patel@wdc.com> In-Reply-To: <20190708041004.6252-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0076.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00::16) To MN2PR04MB6061.namprd04.prod.outlook.com (2603:10b6:208:d8::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [129.253.179.161] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e0958754-98d6-44d3-7c04-08d7035a45eb x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:MN2PR04MB6864; x-ms-traffictypediagnostic: MN2PR04MB6864: x-microsoft-antispam-prvs: wdcipoutbound: EOP-TRUE x-ms-oob-tlc-oobclassifiers: OLM:7691; x-forefront-prvs: 00922518D8 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(346002)(366004)(396003)(39860400002)(376002)(136003)(199004)(189003)(110136005)(54906003)(6116002)(3846002)(6512007)(53936002)(4326008)(72206003)(25786009)(6486002)(478600001)(6436002)(36756003)(68736007)(66066001)(316002)(6506007)(386003)(52116002)(102836004)(76176011)(50226002)(99286004)(186003)(26005)(476003)(2616005)(11346002)(71200400001)(446003)(71190400001)(5660300002)(81156014)(486006)(8676002)(7416002)(14444005)(81166006)(66556008)(86362001)(8936002)(73956011)(66946007)(2906002)(1076003)(66476007)(64756008)(66446008)(7736002)(256004)(305945005)(14454004)(44832011); DIR:OUT; SFP:1102; SCL:1; SRVR:MN2PR04MB6864; H:MN2PR04MB6061.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: MBwip6C6jHOE74pVitVJMBA+GCeW9/U0GBYjLnbDJzh1QSqf7VWFeOZ4PI+cmVeWps4mVFeWd5iGmFRGte8JTMFGoV2vELXP2YB5K9AcevLrMzZ1S+k+PH2StjPnVsbOfkpO0fKPoFE8HPDwHdmezKXd9bBux5/A+74ndTQ/K0GZvfEKwK9tZ9qIE99eJNQRl8KSkGTJSP+P7OPHk8UpaDUohRK4ObvQA7Dyn0GEpUouEsBCLFTOW/SXFps5A9mC9CiqCoTjHCaqG72tWaN853pi5KS2efacKsed2YC7uaWHMvvS7M1Ql4kfwnGqTVqKerWbSouDmYCZ/mFEgbSiUExBUbEnbqmu0L55PuH/XyScR47btWv7oIub8/ngDNFAB5+0DKG2LE8SYaNsBNurHzW2nlxDKBwBGd+kpSLb3zA= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0958754-98d6-44d3-7c04-08d7035a45eb X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jul 2019 04:10:55.3553 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Anup.Patel@wdc.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB6864 Cc: Palmer Dabbelt , U-Boot Mailing List Subject: [U-Boot] [PATCH v3 4/6] cmd: Remove mmc_spi command X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The mmc_spi command was added to manually setup MMC over SPI bus using command. This was required by the legacy non-DM MMC_SPI driver. With DM based MMC_SPI driver in-place, we can now use all general storge commands and mmc command for MMC over SPI bus hence we remove the mmc_spi command all it's references. Suggested-by: Bin Meng Signed-off-by: Anup Patel Reviewed-by: Bin Meng --- cmd/Kconfig | 9 --- cmd/Makefile | 1 - cmd/mmc_spi.c | 88 ------------------------------ configs/UCP1020_SPIFLASH_defconfig | 1 - configs/UCP1020_defconfig | 1 - include/configs/UCP1020.h | 1 - include/mmc.h | 1 - 7 files changed, 102 deletions(-) delete mode 100644 cmd/mmc_spi.c diff --git a/cmd/Kconfig b/cmd/Kconfig index 0badcb3fe0..2cdde28cbe 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -925,15 +925,6 @@ config CMD_NVME help NVM Express device support -config CMD_MMC_SPI - bool "mmc_spi - Set up MMC SPI device" - help - Provides a way to set up an MMC (Multimedia Card) SPI (Serial - Peripheral Interface) device. The device provides a means of - accessing an MMC device via SPI using a single data line, limited - to 20MHz. It is useful since it reduces the amount of protocol code - required. - config CMD_ONENAND bool "onenand - access to onenand device" help diff --git a/cmd/Makefile b/cmd/Makefile index f982564ab9..9fc8df9004 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -92,7 +92,6 @@ obj-$(CONFIG_CMD_MII) += mdio.o endif obj-$(CONFIG_CMD_MISC) += misc.o obj-$(CONFIG_CMD_MMC) += mmc.o -obj-$(CONFIG_CMD_MMC_SPI) += mmc_spi.o obj-$(CONFIG_MP) += mp.o obj-$(CONFIG_CMD_MTD) += mtd.o obj-$(CONFIG_CMD_MTDPARTS) += mtdparts.o diff --git a/cmd/mmc_spi.c b/cmd/mmc_spi.c deleted file mode 100644 index 0c44d06817..0000000000 --- a/cmd/mmc_spi.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Command for mmc_spi setup. - * - * Copyright (C) 2010 Thomas Chou - * Licensed under the GPL-2 or later. - */ - -#include -#include -#include - -#ifndef CONFIG_MMC_SPI_BUS -# define CONFIG_MMC_SPI_BUS 0 -#endif -#ifndef CONFIG_MMC_SPI_CS -# define CONFIG_MMC_SPI_CS 1 -#endif -/* in SPI mode, MMC speed limit is 20MHz, while SD speed limit is 25MHz */ -#ifndef CONFIG_MMC_SPI_SPEED -# define CONFIG_MMC_SPI_SPEED 25000000 -#endif -/* MMC and SD specs only seem to care that sampling is on the - * rising edge ... meaning SPI modes 0 or 3. So either SPI mode - * should be legit. We'll use mode 0 since the steady state is 0, - * which is appropriate for hotplugging, unless the platform data - * specify mode 3 (if hardware is not compatible to mode 0). - */ -#ifndef CONFIG_MMC_SPI_MODE -# define CONFIG_MMC_SPI_MODE SPI_MODE_0 -#endif - -static int do_mmc_spi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ - uint bus = CONFIG_MMC_SPI_BUS; - uint cs = CONFIG_MMC_SPI_CS; - uint speed = CONFIG_MMC_SPI_SPEED; - uint mode = CONFIG_MMC_SPI_MODE; - char *endp; - struct mmc *mmc; - - if (argc < 2) - goto usage; - - cs = simple_strtoul(argv[1], &endp, 0); - if (*argv[1] == 0 || (*endp != 0 && *endp != ':')) - goto usage; - if (*endp == ':') { - if (endp[1] == 0) - goto usage; - bus = cs; - cs = simple_strtoul(endp + 1, &endp, 0); - if (*endp != 0) - goto usage; - } - if (argc >= 3) { - speed = simple_strtoul(argv[2], &endp, 0); - if (*argv[2] == 0 || *endp != 0) - goto usage; - } - if (argc >= 4) { - mode = simple_strtoul(argv[3], &endp, 16); - if (*argv[3] == 0 || *endp != 0) - goto usage; - } - if (!spi_cs_is_valid(bus, cs)) { - printf("Invalid SPI bus %u cs %u\n", bus, cs); - return 1; - } - - mmc = mmc_spi_init(bus, cs, speed, mode); - if (!mmc) { - printf("Failed to create MMC Device\n"); - return 1; - } - printf("%s: %d at %u:%u hz %u mode %u\n", mmc->cfg->name, - mmc->block_dev.devnum, bus, cs, speed, mode); - mmc_init(mmc); - return 0; - -usage: - return CMD_RET_USAGE; -} - -U_BOOT_CMD( - mmc_spi, 4, 0, do_mmc_spi, - "mmc_spi setup", - "[bus:]cs [hz] [mode] - setup mmc_spi device" -); diff --git a/configs/UCP1020_SPIFLASH_defconfig b/configs/UCP1020_SPIFLASH_defconfig index a2d7e6622a..cb8ed47f5b 100644 --- a/configs/UCP1020_SPIFLASH_defconfig +++ b/configs/UCP1020_SPIFLASH_defconfig @@ -21,7 +21,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y # CONFIG_CMD_NAND is not set -CONFIG_CMD_MMC_SPI=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y diff --git a/configs/UCP1020_defconfig b/configs/UCP1020_defconfig index 0a676d48c9..a0ffd35c3a 100644 --- a/configs/UCP1020_defconfig +++ b/configs/UCP1020_defconfig @@ -21,7 +21,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y # CONFIG_CMD_NAND is not set -CONFIG_CMD_MMC_SPI=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index b518c222d4..6e0a6a11b3 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -386,7 +386,6 @@ #ifdef CONFIG_MMC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR -#define CONFIG_MMC_SPI #endif /* Misc Extra Settings */ diff --git a/include/mmc.h b/include/mmc.h index 1f30f71d25..b854e9f33a 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -828,7 +828,6 @@ void mmc_set_preinit(struct mmc *mmc, int preinit); #else #define mmc_host_is_spi(mmc) 0 #endif -struct mmc *mmc_spi_init(uint bus, uint cs, uint speed, uint mode); void board_mmc_power_init(void); int board_mmc_init(bd_t *bis); From patchwork Mon Jul 8 04:11:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1128865 X-Patchwork-Delegate: van.freenix@gmail.com 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=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="UHZBCC0o"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="e7YHRTPR"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45hsVv2YKdz9sNF for ; Mon, 8 Jul 2019 14:12:54 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8B2B0C21DD4; Mon, 8 Jul 2019 04:12:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id ED362C21D8E; Mon, 8 Jul 2019 04:11:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0A3F0C21DA2; Mon, 8 Jul 2019 04:11:08 +0000 (UTC) Received: from esa4.hgst.iphmx.com (esa4.hgst.iphmx.com [216.71.154.42]) by lists.denx.de (Postfix) with ESMTPS id 81D76C21E08 for ; Mon, 8 Jul 2019 04:11:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1562559063; x=1594095063; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=S1ppPhLPRKkEXDvbQmeiIcze+T9wBpMhhhUvZqanTZU=; b=UHZBCC0oKt6tiyikSovnRqucPpBTfCz3Otv6G0IRSAg92CfOIrFNuxP9 fL8Sv7JIoHm0R2njKLd6UeEjIYgFXStuRhXa8MOihh4SAtaD1/hm52LGL tm9kK+HVlyQlRyViJT9KYE1JN9MVBGL5+bCVVBbUKyhQYYuOjEy2zSMnB vzrYkTd2o2UvlSdoTL7n70KeMW+CQPGoFV6a3xXuDI3w1OTnnG5amPXZm mLcFHEoqoTOJ5V2E7YeLwL0b4pVObns7uEF96NiyNPVlHyRz4Wkqz9GeZ TH5j9St7r2CzVFu/CNa+S3oL0VKBGn5i5YUhsohJWftRQX7RHMhJHmN9h Q==; IronPort-SDR: tprKL4K8XBroBZvzDYeppmI6VSS90ZrfEzpGCGaX3EtUZNH97nSspX/FnvqWM/yqZ5qk1x+L+J dduYGN63mH/fZ0tORu2wahoW8UYJUOcfwoDUIfS3oLu+6ZxJ5USdAvk7QBPdm3tPX8gCcx1cDk 2JetpyN/NUU3+jgr3bWp7u5Opm94kOCRYjJ16jpgP6qluhoU5MB0XEM4ssmluC2yGC+WyPwoMY yw6lK6VobZ2MohVOiaWOQv5TnQkZO4gfWnroZeDu80UH0CSzi9uq0dsn4AF8IzcB3xUwDkSUb3 Gx4= X-IronPort-AV: E=Sophos;i="5.63,465,1557158400"; d="scan'208";a="112409384" Received: from mail-sn1nam04lp2056.outbound.protection.outlook.com (HELO NAM04-SN1-obe.outbound.protection.outlook.com) ([104.47.44.56]) by ob1.hgst.iphmx.com with ESMTP; 08 Jul 2019 12:11:02 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Vd5HK6WC8mDYN6h/0ynE1X6oBgGxDomCyLEEVrVZ7Go=; b=e7YHRTPRIQSG47cSXXbcPsyrBJa3LkkOK0Ltpu8RT+Wmn/IQ13uCsBkEPN6JzEzhYsXg4H9reH0ETzQhujEH2lPdoiTPmOmGWPvt6a6maEb3bAffUchsBoOD31HhWD4mWxHmtxRjBRAhIKE0WdOp2bHHOjMnHjaDbvitLxgxC6s= Received: from MN2PR04MB6061.namprd04.prod.outlook.com (20.178.246.15) by MN2PR04MB6864.namprd04.prod.outlook.com (10.186.145.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2052.19; Mon, 8 Jul 2019 04:11:00 +0000 Received: from MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::1d4a:f9e2:5761:dcb9]) by MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::1d4a:f9e2:5761:dcb9%3]) with mapi id 15.20.2052.020; Mon, 8 Jul 2019 04:11:00 +0000 From: Anup Patel To: Rick Chen , Bin Meng , Lukas Auer , Peng Fan , Jagan Teki , Oleksandr Zhadan and Michael Durrant Thread-Topic: [PATCH v3 5/6] riscv: sifive: fu540: Enable SiFive SPI and MMC SPI drivers Thread-Index: AQHVNUMmWtqOuPzLhEi33oe/RnNThw== Date: Mon, 8 Jul 2019 04:11:00 +0000 Message-ID: <20190708041004.6252-6-anup.patel@wdc.com> References: <20190708041004.6252-1-anup.patel@wdc.com> In-Reply-To: <20190708041004.6252-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0076.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00::16) To MN2PR04MB6061.namprd04.prod.outlook.com (2603:10b6:208:d8::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [129.253.179.161] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7bfb30ad-a266-4a30-1343-08d7035a48ca x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:MN2PR04MB6864; x-ms-traffictypediagnostic: MN2PR04MB6864: x-microsoft-antispam-prvs: wdcipoutbound: EOP-TRUE x-ms-oob-tlc-oobclassifiers: OLM:2449; x-forefront-prvs: 00922518D8 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(6029001)(4636009)(346002)(366004)(396003)(39860400002)(376002)(136003)(199004)(189003)(110136005)(54906003)(6116002)(3846002)(6512007)(53936002)(4326008)(72206003)(25786009)(6486002)(478600001)(6436002)(36756003)(68736007)(66066001)(316002)(6506007)(386003)(52116002)(102836004)(76176011)(50226002)(99286004)(186003)(26005)(476003)(2616005)(11346002)(71200400001)(446003)(71190400001)(4744005)(5660300002)(81156014)(486006)(8676002)(7416002)(81166006)(66556008)(86362001)(8936002)(73956011)(66946007)(2906002)(1076003)(66476007)(64756008)(66446008)(7736002)(256004)(305945005)(14454004)(44832011); DIR:OUT; SFP:1102; SCL:1; SRVR:MN2PR04MB6864; H:MN2PR04MB6061.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: +M+Jvj2CWJJOXGbPOpz8xnpPEfSggFLt/3eAbO1UZsBRpkYfQGGGnsSjPF4RzszWEbgIsxr0z6KRw8HRcHMaQDbU5Bk88fJTEPFOPPaEv3FBP1/9F3n+i3dFT3i8lvi0LX+l0gdJc00o32g7e52Gvg50Uh44JedUjtX4kn2X7ETXN7NM5ZtK+7E23B+ah343s+RmCmKj/0Im5CK8+9FQKYdyauAsR6ebrfzBgFhoR8nFvpqkygNGqH7iEgGh+964+ID8huOgP+mqpW28f0kNOfH5gLwUp7auaAbeE8osZcceDi8gj0SMXxj7GIPh2BDBjKgkg76SpWk0o0LpJtRD7yqSUh6CAv9Ufj2BdZWVP00ANvBFTuwInXVRdDr0GBmxNr0QZRgNM5F7kjklhLgektXVYA+W50HOhV5mwk7RLaw= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7bfb30ad-a266-4a30-1343-08d7035a48ca X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jul 2019 04:11:00.4084 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Anup.Patel@wdc.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB6864 Cc: Palmer Dabbelt , U-Boot Mailing List Subject: [U-Boot] [PATCH v3 5/6] riscv: sifive: fu540: Enable SiFive SPI and MMC SPI drivers X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Bhargav Shah This patch enables SiFive SPI and MMC SPI drivers for the SiFive Unleashed board. Signed-off-by: Bhargav Shah Signed-off-by: Anup Patel Reviewed-by: Bin Meng Tested-by: Bin Meng --- board/sifive/fu540/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/board/sifive/fu540/Kconfig b/board/sifive/fu540/Kconfig index f46437901d..662c379b1b 100644 --- a/board/sifive/fu540/Kconfig +++ b/board/sifive/fu540/Kconfig @@ -38,6 +38,12 @@ config BOARD_SPECIFIC_OPTIONS # dummy imply PHY_LIB imply PHY_MSCC imply SIFIVE_SERIAL + imply SPI + imply SIFIVE_SPI + imply MMC + imply MMC_SPI + imply MMC_BROKEN_CD + imply CMD_MMC imply SMP endif From patchwork Mon Jul 8 04:11:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1128867 X-Patchwork-Delegate: van.freenix@gmail.com 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=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="dzMd45+l"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="GQW7JjWl"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45hsWr1SrGz9s3l for ; Mon, 8 Jul 2019 14:13:44 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id DC94AC21E16; Mon, 8 Jul 2019 04:12:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D0593C21DAF; Mon, 8 Jul 2019 04:12:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1F865C21DAF; Mon, 8 Jul 2019 04:11:15 +0000 (UTC) Received: from esa4.hgst.iphmx.com (esa4.hgst.iphmx.com [216.71.154.42]) by lists.denx.de (Postfix) with ESMTPS id F14BDC21C50 for ; Mon, 8 Jul 2019 04:11:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1562559070; x=1594095070; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=Hg9X9MdoJOWMCwWNMq0BCmBxrb/Lq4kJfklcWlPu91Q=; b=dzMd45+lFMLVc4exBtMOYAzpAhIqjLF8mntDldPwl4qWbaYL9aQuF6ME XSrAe9bqyZjjLCiDxOE6r8Vs9fF9Rb7vVJwk51miCWToyXaKiOdZ1Nv1E prKWHHv+YF+DKJ0cPgwu/Ncy1pGUfiIUmn5E0X83yIUeUCX7tRpJjY2nM EyNnT99y2itNK8qC6aJuZwQfUDvZIAIUSnuS/alKr2gqp7AvyFLMCeEEf vUSL39hU/+xc9mJxOobCkuKVrZ1NuBMHDbxZrbl4ZyLiECNYeAp07LkmK 3d08Dz3d9ElfkY99e3h22alNgIC0xhcazQAt5Yjep31LojVy8Rb04383w g==; IronPort-SDR: B+j4f9o3X7D1VTKqOMlbre57egEH8YokyaJ07dXQj6ZjSdF/e/g/7KWjI2delAn5DWtEj+saTu xsbj6PIGxn5WaiV7sN2ZtnyFKPwqLMmBO18rFuDuL2xGTnANWyuN6HLcBTQsHbbCGYqLwLj81n QEBAYM3GRfUvpN8E677T/9o5DIOUAzOUi8pPlnHvLMctKkTf7uk9JFcN1nnOFqM+ToYfwxUkzW lYtSViV2WOf/mCNbez1tOiLGQg5c+7qTnweM1R3ESqJ8T92YsYfJ2gHhS57+SM4WVqNxEofW4J qqs= X-IronPort-AV: E=Sophos;i="5.63,465,1557158400"; d="scan'208";a="112409388" Received: from mail-sn1nam04lp2053.outbound.protection.outlook.com (HELO NAM04-SN1-obe.outbound.protection.outlook.com) ([104.47.44.53]) by ob1.hgst.iphmx.com with ESMTP; 08 Jul 2019 12:11:08 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Hg7uQQxOyZqc5BlFtJr1E4UGPe0/CbGEyDOd1+TyzoM=; b=GQW7JjWlOWpm+TuueTepVE8bFfqWlfWReOwE1LsEWAAVg7ha9S3AvSXCDnANVEoVYltqkXHJyW1iemZpo88yk3NoiL5cB9pD1u7CTm8/kyxKsNaU07PYoWdb8gkqyZ+m2K0kYAXzRkLfKRXvc3S6TW4K234A42c1cfcCuzBHnic= Received: from MN2PR04MB6061.namprd04.prod.outlook.com (20.178.246.15) by MN2PR04MB6864.namprd04.prod.outlook.com (10.186.145.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2052.19; Mon, 8 Jul 2019 04:11:06 +0000 Received: from MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::1d4a:f9e2:5761:dcb9]) by MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::1d4a:f9e2:5761:dcb9%3]) with mapi id 15.20.2052.020; Mon, 8 Jul 2019 04:11:06 +0000 From: Anup Patel To: Rick Chen , Bin Meng , Lukas Auer , Peng Fan , Jagan Teki , Oleksandr Zhadan and Michael Durrant Thread-Topic: [PATCH v3 6/6] doc: sifive-fu540: Update README for SiFive SPI and MMC SPI drivers Thread-Index: AQHVNUMqowd5VhfEfEucj1g0m0L75Q== Date: Mon, 8 Jul 2019 04:11:06 +0000 Message-ID: <20190708041004.6252-7-anup.patel@wdc.com> References: <20190708041004.6252-1-anup.patel@wdc.com> In-Reply-To: <20190708041004.6252-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0076.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00::16) To MN2PR04MB6061.namprd04.prod.outlook.com (2603:10b6:208:d8::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [129.253.179.161] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6851d0d1-36a0-4fd0-754c-08d7035a4c6e x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:MN2PR04MB6864; x-ms-traffictypediagnostic: MN2PR04MB6864: x-microsoft-antispam-prvs: wdcipoutbound: EOP-TRUE x-ms-oob-tlc-oobclassifiers: OLM:3826; x-forefront-prvs: 00922518D8 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(6029001)(4636009)(346002)(366004)(396003)(39860400002)(376002)(136003)(199004)(189003)(110136005)(54906003)(6116002)(3846002)(6512007)(53936002)(4326008)(72206003)(25786009)(6486002)(478600001)(6436002)(36756003)(68736007)(66066001)(316002)(6506007)(386003)(52116002)(102836004)(76176011)(50226002)(99286004)(186003)(26005)(476003)(2616005)(11346002)(71200400001)(446003)(71190400001)(4744005)(5660300002)(81156014)(486006)(8676002)(7416002)(81166006)(66556008)(86362001)(8936002)(73956011)(66946007)(2906002)(1076003)(66476007)(64756008)(66446008)(7736002)(256004)(305945005)(14454004)(44832011); DIR:OUT; SFP:1102; SCL:1; SRVR:MN2PR04MB6864; H:MN2PR04MB6061.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: U89loZlXkJo7KPFp4rQNufd9dwcfSbkGOKbenHv8/qveRFkzoNPGWeejGcWWwrdgjWCHhFt4tjltcm0zDoO8JYPHIoO/t4xc/NPCNkP6q8/7p9tlWbKIakEgjCGo6xMqU1cSl8Wroc+KL0goyyfWCmzMMr/FOfDOUi3mOaqKmiimqgS9sUMhsGm99zHzOmOOyBeTFF76O5s5P6OQrwp3P+wqCep30J0eKyktSjkMa00eb5PzfC+tc9qRLgjGk0DteWmjwrCs1x64lVvJ0K/dZF6UGuoXm9siA80NUBVGEa7AcN7YDTme+kbE6k8OipN877H6BmDbg6N2QdQjUtolMofy1UtO0Ziv5NK4362fRC0Im0mBhPP/b1LYmvXuRdQNkn4rcbXlAP2Pc46UmHHVIPN8EE8YoMCUeRZQa3Uj6bE= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6851d0d1-36a0-4fd0-754c-08d7035a4c6e X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jul 2019 04:11:06.5399 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Anup.Patel@wdc.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB6864 Cc: Palmer Dabbelt , U-Boot Mailing List Subject: [U-Boot] [PATCH v3 6/6] doc: sifive-fu540: Update README for SiFive SPI and MMC SPI drivers X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This patch removes SiFive SPI driver and MMC SPI drive from the TODO list in SiFive FU540 README. Signed-off-by: Anup Patel Reviewed-by: Bin Meng Tested-by: Bin Meng --- doc/README.sifive-fu540 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/README.sifive-fu540 b/doc/README.sifive-fu540 index 33e03dc861..944ba1c8a0 100644 --- a/doc/README.sifive-fu540 +++ b/doc/README.sifive-fu540 @@ -13,9 +13,7 @@ The support for following drivers are already enabled: 3. Cadence MACB ethernet driver for networking support. TODO: -1. SPI host driver is still missing. -2. SPI MMC driver does not compile and needs a re-write using U-Boot DM. -2. U-Boot expects the serial console device entry to be present under /chosen +1. U-Boot expects the serial console device entry to be present under /chosen DT node. Example: chosen { stdout-path = "/soc/serial@10010000:115200";