From patchwork Sun Nov 29 10:39:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Pihet X-Patchwork-Id: 1407911 X-Patchwork-Delegate: lokeshvutla@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=newoldbits.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=newoldbits-com.20150623.gappssmtp.com header.i=@newoldbits-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=qijxZ2Wu; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cklf56NX8z9sVH for ; Mon, 30 Nov 2020 10:57:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1A0F782786; Mon, 30 Nov 2020 00:56:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=newoldbits.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=newoldbits-com.20150623.gappssmtp.com header.i=@newoldbits-com.20150623.gappssmtp.com header.b="qijxZ2Wu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 876F282770; Sun, 29 Nov 2020 11:40:09 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com [IPv6:2a00:1450:4864:20::641]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 313CF8273B for ; Sun, 29 Nov 2020 11:40:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=newoldbits.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=jean.pihet@newoldbits.com Received: by mail-ej1-x641.google.com with SMTP id jx16so14471179ejb.10 for ; Sun, 29 Nov 2020 02:40:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=newoldbits-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+WMkYasSfqwNMndUTHGHbVQ5J1W9cCWkxkTbEgLknso=; b=qijxZ2WuZoP4xHuFluv/3zhPrRMkWUjdtQkep4LNvYPD0MELf0lT+8cKY3OwIIdCDe IbW2j8WWy/AD5jBrvSYmFNDAdN1w3gIg3+1ZGt2NeR+SVij3WuT5dDS5ziZOqlC9lbqx dO5l98lrlq1jHxtfZaE0XxwrqPnEGisZmeffbxyikvazcLj2HigoFTnNIekcjwycwIuu Bd+zWMPnY6AzsUDOwW4AgFFZIPYGEKlfqpjdBU1e6Qh9MRgfD0moa2M0BSWsjFtuw/7w 9bYgWtNb07Yul9fer96QdVMIlbttZWh+PLub3cAeJKKWA+hgKt1EgjtYqlGnLS41D0jZ ogSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+WMkYasSfqwNMndUTHGHbVQ5J1W9cCWkxkTbEgLknso=; b=LWv4Lm64831I0VibRqU0t3bnH8ir/FTONwS5iLEtZc5A9NBeL3m55T2UuiFTnd2TWK GQiX/CBjmMcdG5BPBceNoYDk1JhQVab3d9soRHyRQgubzV0K06NgIR3fX/NiFb5sH3Sv M5jwoNbVeTNjkfQ+xBwpY0AIRLfe1T0BDQoCQH5S7HlBWZd3seHfJGMksGXTWF6dTAh9 0Kkt+Poq75lfJNNawWtVgKw/obKT/y2MRff7TcM5WU9YgvxhesCb2cx8EaKocgZqMxlB ZEg+VR90eLNkrvSjWq1fBrtS8qmse5CemNvd9+z0ot0zhBjwnMDm5XhtkcxFKz1euQzv 9IwA== X-Gm-Message-State: AOAM530BSxZcmiJFyqbJwzj0W3QjjxNJo/cc55XUaRHB3r2K1+s322zk vUy5cGzdmY1X9FZ4O3U8IuknVs6AYFh7YA== X-Google-Smtp-Source: ABdhPJyzjSrpGFrAgv8QBtXQzF0EX2uCmjxWhhgHfSsf+WAZZL3Yqz4BZ4LeHGFNDF82AjzV7+9H+Q== X-Received: by 2002:a17:906:40c1:: with SMTP id a1mr1047543ejk.520.1606646404401; Sun, 29 Nov 2020 02:40:04 -0800 (PST) Received: from nuc1.lan (208.2-240-81.adsl-dyn.isp.belgacom.be. [81.240.2.208]) by smtp.gmail.com with ESMTPSA id w3sm7667691edt.84.2020.11.29.02.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Nov 2020 02:40:03 -0800 (PST) From: Jean Pihet To: u-boot@lists.denx.de Cc: Ryan Barnett , Conrad Ratschan , Hugo Cornelis , Arnout Vandecappelle , Jean Pihet Subject: [PATCH 2/3] TI QSPI: add support for dual and quad-bit I/O read Date: Sun, 29 Nov 2020 11:39:47 +0100 Message-Id: <20201129103948.158293-2-jean.pihet@newoldbits.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201129103948.158293-1-jean.pihet@newoldbits.com> References: <20201129103948.158293-1-jean.pihet@newoldbits.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 30 Nov 2020 00:56:47 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean TI QSPI: the TI QSPI IP has a limitation of 64MB of MMIO so use the MMIO mode to read below 64MB and fallback to the SW generated sequences to read above 64MB. The TI QSPI IP has another limitation of 4096 words per frame, so split the accesses into smaller ones. Also fix the TI QSPI operating frequency in order to correctly generate the required SPI CLK frequency. Signed-off-by: Jean Pihet --- drivers/spi/Kconfig | 9 ++++++ drivers/spi/ti_qspi.c | 68 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 66 insertions(+), 11 deletions(-) diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index f7a9852565..5d24029ff0 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -395,10 +395,19 @@ config TEGRA210_QSPI config TI_QSPI bool "TI QSPI driver" imply TI_EDMA3 + imply TI_QSPI_MQX_FRAME_SIZE help Enable the TI Quad-SPI (QSPI) driver for DRA7xx and AM43xx evms. This driver support spi flash single, quad and memory reads. +config TI_QSPI_MAX_FRAME_SIZE + int "TI QSPI max frame size" + default 4096 + help + TI Quad-SPI (QSPI) IP block has a maximum number of 4096 words in a + frame, in non-memory mapped mode. A frame includes the command, + arguments and dummy bytes. + config UNIPHIER_SPI bool "Socionext UniPhier SPI driver" depends on ARCH_UNIPHIER diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c index 5fdbb49442..57192b9c0a 100644 --- a/drivers/spi/ti_qspi.c +++ b/drivers/spi/ti_qspi.c @@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR; /* ti qpsi register bit masks */ #define QSPI_TIMEOUT 2000000 -#define QSPI_FCLK 192000000 +#define QSPI_FCLK 48000000 #define QSPI_DRA7XX_FCLK 76800000 #define QSPI_WLEN_MAX_BITS 128 #define QSPI_WLEN_MAX_BYTES (QSPI_WLEN_MAX_BITS >> 3) @@ -41,10 +41,11 @@ DECLARE_GLOBAL_DATA_PTR; #define QSPI_EN_CS(n) (n << 28) #define QSPI_WLEN(n) ((n-1) << 19) #define QSPI_3_PIN BIT(18) -#define QSPI_RD_SNGL BIT(16) +#define QSPI_RD_SNGL (1 << 16) +#define QSPI_RD_DUAL (3 << 16) +#define QSPI_RD_QUAD (7 << 16) #define QSPI_WR_SNGL (2 << 16) #define QSPI_INVAL (4 << 16) -#define QSPI_RD_QUAD (7 << 16) /* device control */ #define QSPI_CKPHA(n) (1 << (2 + n*8)) #define QSPI_CSPOL(n) (1 << (1 + n*8)) @@ -155,6 +156,7 @@ static int ti_qspi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct dm_spi_slave_platdata *slave = dev_get_parent_platdata(dev); + struct spi_slave *spi_slave = dev_get_parent_priv(dev); struct ti_qspi_priv *priv; struct udevice *bus; uint words = bitlen >> 3; /* fixed 8-bit word length */ @@ -182,7 +184,6 @@ static int ti_qspi_xfer(struct udevice *dev, unsigned int bitlen, /* Setup command reg */ priv->cmd = 0; - priv->cmd |= QSPI_WLEN(8); priv->cmd |= QSPI_EN_CS(cs); if (priv->mode & SPI_3WIRE) priv->cmd |= QSPI_3_PIN; @@ -206,15 +207,16 @@ static int ti_qspi_xfer(struct udevice *dev, unsigned int bitlen, writel(data, &priv->base->data1); data = cpu_to_be32(*txbuf++); writel(data, &priv->base->data); - cmd &= ~QSPI_WLEN_MASK; cmd |= QSPI_WLEN(QSPI_WLEN_MAX_BITS); xfer_len = QSPI_WLEN_MAX_BYTES; } else { writeb(*txp, &priv->base->data); + cmd |= QSPI_WLEN(8); xfer_len = 1; } debug("tx cmd %08x dc %08x\n", cmd | QSPI_WR_SNGL, priv->dc); + // Only 1-bit write is supported writel(cmd | QSPI_WR_SNGL, &priv->base->cmd); status = readl(&priv->base->status); timeout = QSPI_TIMEOUT; @@ -229,9 +231,17 @@ static int ti_qspi_xfer(struct udevice *dev, unsigned int bitlen, debug("tx done, status %08x\n", status); } if (rxp) { + u32 rx; + /* Check for dual and quad reads */ + u32 readcmd_cmd = QSPI_RD_SNGL | QSPI_WLEN(8); + if (spi_slave->flags & SPI_XFER_DUAL_READ) + readcmd_cmd = QSPI_RD_DUAL | QSPI_WLEN(16); + if (spi_slave->flags & SPI_XFER_QUAD_READ) + readcmd_cmd = QSPI_RD_QUAD | QSPI_WLEN(32); + debug("rx cmd %08x dc %08x\n", - ((u32)(priv->cmd | QSPI_RD_SNGL)), priv->dc); - writel(priv->cmd | QSPI_RD_SNGL, &priv->base->cmd); + ((u32)(priv->cmd | readcmd_cmd)), priv->dc); + writel(priv->cmd | readcmd_cmd, &priv->base->cmd); status = readl(&priv->base->status); timeout = QSPI_TIMEOUT; while ((status & QSPI_WC_BUSY) != QSPI_XFER_DONE) { @@ -241,10 +251,28 @@ static int ti_qspi_xfer(struct udevice *dev, unsigned int bitlen, } status = readl(&priv->base->status); } - *rxp++ = readl(&priv->base->data); - xfer_len = 1; - debug("rx done, status %08x, read %02x\n", - status, *(rxp-1)); + rx = readl(&priv->base->data); + if (spi_slave->flags & SPI_XFER_QUAD_READ) { + if (words >= 1) + *rxp++ = rx >> 24; + if (words >= 2) + *rxp++ = rx >> 16; + if (words >= 3) + *rxp++ = rx >> 8; + if (words >= 4) + *rxp++ = rx; + xfer_len = (words >= 4) ? 4 : words; + } else if (spi_slave->flags & SPI_XFER_DUAL_READ) { + if (words >= 1) + *rxp++ = rx >> 8; + if (words >= 2) + *rxp++ = rx; + xfer_len = (words >= 2) ? 2 : words; + } else { + *rxp++ = rx; + xfer_len = 1; + } + debug("rx done, status %08x, rx=%08x\n", status, rx); } words -= xfer_len; } @@ -353,6 +381,23 @@ static int ti_qspi_exec_mem_op(struct spi_slave *slave, return ret; } +static int ti_qspi_adjust_size(struct spi_slave *slave, struct spi_mem_op *op) +{ +#ifdef CONFIG_TI_QSPI_MAX_FRAME_SIZE + // Adjust the data length to fit in the QSPI max frame length + if (op->data.dir == SPI_MEM_DATA_IN) { + unsigned int data_len = CONFIG_TI_QSPI_MAX_FRAME_SIZE - + sizeof(op->cmd.opcode) - op->addr.nbytes - + op->dummy.nbytes; + // Align the data on cache line + data_len = data_len & ~(ARCH_DMA_MINALIGN - 1); + op->data.nbytes = min(op->data.nbytes, data_len); + } +#endif + + return 0; +} + static int ti_qspi_claim_bus(struct udevice *dev) { struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); @@ -482,6 +527,7 @@ static int ti_qspi_ofdata_to_platdata(struct udevice *bus) static const struct spi_controller_mem_ops ti_qspi_mem_ops = { .exec_op = ti_qspi_exec_mem_op, + .adjust_op_size = ti_qspi_adjust_size, }; static const struct dm_spi_ops ti_qspi_ops = {