From patchwork Mon Mar 22 17:21:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhengxun X-Patchwork-Id: 1457153 X-Patchwork-Delegate: trini@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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=U5i51EZu; 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F4TCM6dN6z9sS8 for ; Tue, 23 Mar 2021 22:09:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 73EBB828E6; Tue, 23 Mar 2021 12:08:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.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=gmail.com header.i=@gmail.com header.b="U5i51EZu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 21DE380200; Mon, 22 Mar 2021 10:22:45 +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=-0.1 required=5.0 tests=BAYES_00, DATE_IN_FUTURE_06_12, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) (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 9C8EC80200 for ; Mon, 22 Mar 2021 10:22:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=zhengxunli.mxic@gmail.com Received: by mail-pj1-x1033.google.com with SMTP id il9-20020a17090b1649b0290114bcb0d6c2so2849728pjb.0 for ; Mon, 22 Mar 2021 02:22:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=lAo8Bc97TCxzxOYFLq4ymot0hU34QEE2myrv708c1Og=; b=U5i51EZuhlgSohsq0K++tf8FFQ8cb3N3+xpmfK82GQ/w836KZ3oeWQYkUoM4rFFFeZ 258e/MHlaTvOVoMCPZMNs+0nihE7RZG/otqINpJ4QqxicnubPOvdOh6yFUK1l0RUUrYH 0l16zHeWOnIx1uAPOwiKxL1Ot6F2Rn3UqUKhePTGCPlLIsHyZiLcyh0W7APd+I0EU3cg lv+O3TIiIa/MrsAxdbdnePdNZ9I5kWkwzseVa5ViJNJXxbFwAEzncG7rh694gmh0GSjw 5JprIc/G7HbFDZfONBoP4/eHIgtKDTfsdmSeDweD2HrjnFWAuBjJdGImJ13v6fD9jfoW ldiw== 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; bh=lAo8Bc97TCxzxOYFLq4ymot0hU34QEE2myrv708c1Og=; b=gp5TJTAqzsmdXvH5baVOLRZVhHROxC1wB3zsfQEBzZw4jNXwAP01R7/sMNOU8OOVx2 u3J5rkI7yY+hKKWV9LcG7n1VbIJOwCUK+MH7HOlHVo0sjbG2G/Yuq4n2cihE4NmhA6O5 ewLWVmSdlIIC1UNACV1HHxXI6JLt/NdasogFacKhv1FsLWALmwfBjUa10xZIQxhntte+ K/V2R1aIGNZYO2trFvd9BSSkDB1DrJ+xPaX/CqoeKx7Jir0unbyC6UTAuV0ZqXQAvKMj GJXZ6MVDOOYFWZ6QV8rhGAVOaagbIxHpzQ7jwuny/+Nl0h7WXTx1TMSq8AyahPUrISDU S3Vw== X-Gm-Message-State: AOAM532WmnccrqEcvXFC33oR7GS2hZP3SLfzD+pVP9WJiDBkkF4SY2x/ yEKwLiKCGIX7JYDTaCqCw2g= X-Google-Smtp-Source: ABdhPJz1Yj4N8V9XxrESdOeq3zPBPW1PkHFWoyTyIqjbyxaraxCoL8RjXbPr8AJvG7LrvJD2U0TmOg== X-Received: by 2002:a17:90a:f008:: with SMTP id bt8mr12592472pjb.13.1616404959949; Mon, 22 Mar 2021 02:22:39 -0700 (PDT) Received: from localhost.localdomain ([123.51.145.88]) by smtp.gmail.com with ESMTPSA id a30sm13100792pfr.66.2021.03.22.02.22.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 02:22:39 -0700 (PDT) From: zhengxun To: jagan@amarulasolutions.com, u-boot@lists.denx.de, marek.vasut+renesas@gmail.com, marex@denx.de, zhengxunli@mxic.com.tw Cc: zhengxun Subject: [PATCH] driver: spi: renesas_rpc_spi: Add mem_ops Date: Mon, 22 Mar 2021 17:21:47 +0000 Message-Id: <20210322172147.12018-1-zhengxunli.mxic@gmail.com> X-Mailer: git-send-email 2.17.1 X-Mailman-Approved-At: Tue, 23 Mar 2021 12:08:30 +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.4 at phobos.denx.de X-Virus-Status: Clean This patch adds an implementation of exec_op, which support octal mode and quad mode for reading flash and support existing single mode for reading and writing flash concurrently. Signed-off-by: zhengxun --- drivers/spi/renesas_rpc_spi.c | 144 ++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c index 26b6aa85c9..b317995dae 100644 --- a/drivers/spi/renesas_rpc_spi.c +++ b/drivers/spi/renesas_rpc_spi.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #define RPC_CMNCR 0x0000 /* R/W */ @@ -368,6 +369,144 @@ err: return ret; } +static int rpc_spi_exec_mem_op(struct spi_slave *slave, + const struct spi_mem_op *op) +{ + struct rpc_spi_priv *priv; + struct udevice *bus; + u32 wloop = (op->data.dir == SPI_MEM_DATA_OUT) ? + DIV_ROUND_UP(op->data.nbytes, 4) : 0; + u32 smenr, smcr, cmncr; + u32 *datout; + int ret = 0; + + bus = slave->dev->parent; + priv = dev_get_priv(bus); + + if (op->cmd.buswidth == 2 || op->addr.buswidth == 2 || + op->data.buswidth == 2 || op->addr.nbytes > 4) + return -ENOTSUPP; + + smenr = 0; + + if (op->data.dir == SPI_MEM_DATA_OUT || + op->data.dir == SPI_MEM_NO_DATA) { + rpc_spi_claim_bus(slave->dev, true); + + writel(0, priv->regs + RPC_SMCR); + + /* Commnad(1) */ + writel(RPC_SMCMR_CMD(op->cmd.opcode), priv->regs + RPC_SMCMR); + + smenr |= RPC_SMENR_CDE; + + smenr |= RPC_SMENR_CDB(fls(op->cmd.buswidth) - 1); + + /* Address(3 or 4) */ + if (op->addr.nbytes) { + writel(op->addr.val, priv->regs + RPC_SMADR); + if (op->addr.nbytes == 3) + smenr |= RPC_SMENR_ADE(0x7); + else + smenr |= RPC_SMENR_ADE(0xf); + smenr |= RPC_SMENR_ADB(fls(op->addr.buswidth) - 1); + } else { + writel(0, priv->regs + RPC_SMADR); + } + + /* Dummy(0) */ + writel(0, priv->regs + RPC_SMDMCR); + + writel(0, priv->regs + RPC_SMOPR); + + writel(0, priv->regs + RPC_SMDRENR); + + /* Data(n) */ + if (op->data.nbytes) { + datout = (u32 *)op->data.buf.out; + + smenr |= RPC_SMENR_SPIDE(0xf); + + smenr |= RPC_SMENR_SPIDB(fls(op->data.buswidth) - 1); + + while (wloop--) { + smcr = RPC_SMCR_SPIWE | RPC_SMCR_SPIE; + if (wloop >= 1) + smcr |= RPC_SMCR_SSLKP; + writel(smenr, priv->regs + RPC_SMENR); + writel(*datout, priv->regs + RPC_SMWDR0); + writel(smcr, priv->regs + RPC_SMCR); + ret = rpc_spi_wait_tend(slave->dev); + if (ret) + goto err; + datout++; + smenr = RPC_SMENR_SPIDE(0xf); + } + + ret = rpc_spi_wait_sslf(slave->dev); + } else { + writel(smenr, priv->regs + RPC_SMENR); + writel(RPC_SMCR_SPIE, priv->regs + RPC_SMCR); + ret = rpc_spi_wait_tend(slave->dev); + } + } else { /* Read data only, using DRx ext access */ + rpc_spi_claim_bus(slave->dev, false); + + if (op->cmd.buswidth > 4 || op->addr.buswidth > 4 || + op->data.buswidth > 4) { + cmncr = readl(priv->regs + RPC_CMNCR); + cmncr |= RPC_CMNCR_BSZ(1); + writel(cmncr, priv->regs + RPC_CMNCR); + } + + /* Command(1) */ + writel(RPC_DRCMR_CMD(op->cmd.opcode), priv->regs + RPC_DRCMR); + + smenr |= RPC_DRENR_CDE; + + smenr |= RPC_DRENR_CDB(fls(op->cmd.buswidth) - 1); + + /* Address(3 or 4) */ + if (op->addr.nbytes) { + if (op->addr.nbytes == 3) + smenr |= RPC_DRENR_ADE(0x7); + else + smenr |= RPC_DRENR_ADE(0xf); + smenr |= RPC_DRENR_ADB(fls(op->addr.buswidth) - 1); + } + + /* Dummy(n) */ + if (op->dummy.nbytes) { + writel(op->dummy.nbytes, priv->regs + RPC_DRDMCR); + smenr |= RPC_DRENR_DME; + } else { + writel(0, priv->regs + RPC_DRDMCR); + } + + writel(0, priv->regs + RPC_DROPR); + + if (op->data.buswidth > 4) + smenr |= RPC_DRENR_SPIDB(2); + else + smenr |= RPC_DRENR_SPIDB(fls(op->data.buswidth) - 1); + + writel(smenr, priv->regs + RPC_DRENR); + + if (op->data.nbytes) { + memcpy_fromio(op->data.buf.in, + (void *)(priv->extr + op->addr.val), + op->data.nbytes); + } else { + readl(priv->extr); /* Dummy read */ + } + } + +err: + rpc_spi_release_bus(slave->dev); + + return ret; +} + static int rpc_spi_set_speed(struct udevice *bus, uint speed) { /* This is a SPI NOR controller, do nothing. */ @@ -442,10 +581,15 @@ static int rpc_spi_of_to_plat(struct udevice *bus) return 0; } +static const struct spi_controller_mem_ops rpc_spi_mem_ops = { + .exec_op = rpc_spi_exec_mem_op, +}; + static const struct dm_spi_ops rpc_spi_ops = { .xfer = rpc_spi_xfer, .set_speed = rpc_spi_set_speed, .set_mode = rpc_spi_set_mode, + .mem_ops = &rpc_spi_mem_ops, }; static const struct udevice_id rpc_spi_ids[] = {