From patchwork Fri Aug 17 10:07:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuanhua Han X-Patchwork-Id: 10568563 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CA20514BD for ; Fri, 17 Aug 2018 10:07:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7E252B272 for ; Fri, 17 Aug 2018 10:07:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ABE8D2B2AE; Fri, 17 Aug 2018 10:07:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42B062B272 for ; Fri, 17 Aug 2018 10:07:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726329AbeHQNKN (ORCPT ); Fri, 17 Aug 2018 09:10:13 -0400 Received: from inva020.nxp.com ([92.121.34.13]:44332 "EHLO inva020.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726226AbeHQNKN (ORCPT ); Fri, 17 Aug 2018 09:10:13 -0400 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 1D5421A026F; Fri, 17 Aug 2018 12:07:22 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 230B41A00F4; Fri, 17 Aug 2018 12:07:19 +0200 (CEST) Received: from mega.am.freescale.net (mega.ap.freescale.net [10.192.208.232]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 1ACBE402D8; Fri, 17 Aug 2018 18:07:15 +0800 (SGT) From: Chuanhua Han To: broonie@kernel.org, boris.brezillon@bootlin.com Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, cheetah0585@163.com, Chuanhua Han Subject: [PATCH] spi: fsl-espi: master->mem_ops is implemented in the controller Date: Fri, 17 Aug 2018 18:07:05 +0800 Message-Id: <1534500425-9977-1-git-send-email-chuanhua.han@nxp.com> X-Mailer: git-send-email 2.7.4 X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The length of the transmitted data needs to be adjusted due to the maximum length limit for espi transmission messages Signed-off-by: Chuanhua Han --- drivers/spi/spi-fsl-espi.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 1d332e2..4724127 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -22,6 +22,7 @@ #include #include #include +#include /* eSPI Controller registers */ #define ESPI_SPMODE 0x00 /* eSPI mode register */ @@ -659,6 +660,29 @@ static void fsl_espi_init_regs(struct device *dev, bool initial) fsl_espi_write_reg(espi, ESPI_SPMODE, SPMODE_INIT_VAL | SPMODE_ENABLE); } +static int fsl_espi_adjust_op_size(struct spi_mem *mem, struct spi_mem_op *op) +{ + if (!mem || !op) + return -EINVAL; + op->data.nbytes = min3((unsigned long)op->data.nbytes, + spi_max_transfer_size(mem->spi), + spi_max_message_size(mem->spi) - + sizeof(op->cmd.opcode) - + op->addr.nbytes - + op->dummy.nbytes); + return 0; +} + +static int fsl_espi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) +{ + return -ENOTSUPP; +} + +static const struct spi_controller_mem_ops fsl_espi_mem_ops = { + .adjust_op_size = fsl_espi_adjust_op_size, + .exec_op = fsl_espi_exec_op, +}; + static int fsl_espi_probe(struct device *dev, struct resource *mem, unsigned int irq, unsigned int num_cs) { @@ -682,6 +706,7 @@ static int fsl_espi_probe(struct device *dev, struct resource *mem, master->auto_runtime_pm = true; master->max_message_size = fsl_espi_max_message_size; master->num_chipselect = num_cs; + master->mem_ops = &fsl_espi_mem_ops; espi = spi_master_get_devdata(master); spin_lock_init(&espi->lock);