From patchwork Sat Feb 24 18:17:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meghana Madhyastha X-Patchwork-Id: 10240449 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E219B602B8 for ; Sat, 24 Feb 2018 18:17:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D484B2950F for ; Sat, 24 Feb 2018 18:17:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C8E1029B44; Sat, 24 Feb 2018 18:17:19 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 63BFD2950F for ; Sat, 24 Feb 2018 18:17:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751449AbeBXSRT (ORCPT ); Sat, 24 Feb 2018 13:17:19 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:41662 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751357AbeBXSRS (ORCPT ); Sat, 24 Feb 2018 13:17:18 -0500 Received: by mail-pf0-f194.google.com with SMTP id a17so4859130pff.8 for ; Sat, 24 Feb 2018 10:17:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=f9/sEPE047zSzYQIupgAdNxulnhDSmqdGoCc4yJfbNU=; b=fHR1VGsn++RvJDHRNb0Upo/MuQCFoCgCO4Aw7j4zJohJP1jVpPxWC3ADHvl1Pjcwhy jeZFJSwOcWrHfBZYJPl1ZyVhp24BoCFoFkOnwE+HsBE7CgqsmDXLojeGazLeXS8sPexh YztahKTQK9a9OO8jf5MtQZlrwIsKJdlwglHel5tB+u2Dls4QiQ0wpioKeU+gjve5EqfN 6Zxqi9ejC/LZPJQsKU61lFSYnzaj+kSOOLUuBjnw4ZVHAFXVxZKwMYKJac28MQl1lBz9 Ekm57OTj36ZkC05cixw/c9oKF8oa0chqYrpZE69Ugm3y+BxeWM6rQKoBzeeBmvCdfC0C Z1Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=f9/sEPE047zSzYQIupgAdNxulnhDSmqdGoCc4yJfbNU=; b=dKtlb3ZvtA1v/u9815JVsLUPooKT1Lme9XTLH1cWMOEX3gt/K7x7eciEgwZ8jm4QZO QfoECNTSxfbySBv13XfgiLIPnkciJr28Ty6vBJkbGfdb5a1mimKy6ePFrR+v8PPLxAO4 jZkuSWu/oJg9Zam9bC7ztIQa7MMm0+RbNZA1XrS3FyXEB13lXIxoNFPW8Q7ht/SJUX3A FD6TC7xLGbk8EBv/5RyByvlv8jb6FVcuRFGqriq/aL2CqujwBYw9coJvw+xrdoSucGKW newkjrgNrilN9akQ7mDbpDfxyHFSwtcRBwGNE4w8vwv/dxn+X/47J7c67ls5nCnritC4 o9tA== X-Gm-Message-State: APf1xPBvlHwfvXyiNlQ3QrqZq5kcDmHMUdbOUDGCd/+8p1q3aLTNQh9P IkzUQ+vlr0Iaw6SicIGWpYY= X-Google-Smtp-Source: AH8x226W/YKdK87eYSl3P5fvAhYH5kwpCwhT4TPAbWiGEA65D3A0Da/Gye46KQsnDP5hZjnCOq3hbw== X-Received: by 10.98.200.80 with SMTP id z77mr5449404pff.85.1519496237600; Sat, 24 Feb 2018 10:17:17 -0800 (PST) Received: from raspberrypi ([122.167.31.206]) by smtp.gmail.com with ESMTPSA id b5sm11541850pfc.12.2018.02.24.10.17.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 24 Feb 2018 10:17:16 -0800 (PST) Date: Sat, 24 Feb 2018 18:17:12 +0000 From: Meghana Madhyastha To: Daniel Vetter , linux-spi@vger.kernel.org, Noralf =?iso-8859-1?Q?Tr=F8nnes?= , Sean Paul , dri-devel@lists.freedesktop.org, kernel@martin.sperl.org Subject: [PATCH v2 2/2] spi/spi-bcm2835: Add bcm2835_spi_transfer_one_message in spi-bcm2835.c Message-ID: <91a77832e7d4c5ca5f5ec6f81251922ee8019e77.1519492575.git.meghana.madhyastha@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20170113 (1.7.2) 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 Add bcm2835_spi_transfer_one_message in spi-bcm2835.c. This function calls the helper spi_split_transfers_maxsize before calling spi_transfer_one_message to split the message into smaller chunks to be able to use dma. Signed-off-by: Meghana Madhyastha --- drivers/spi/spi-bcm2835.c | 14 ++++++++++++++ drivers/spi/spi.c | 5 ++--- include/linux/spi/spi.h | 2 ++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c index 2fd650891c07..68d35407e7a3 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -579,6 +579,19 @@ static int bcm2835_spi_transfer_one(struct spi_master *master, return bcm2835_spi_transfer_one_irq(master, spi, tfr, cs); } +static int bcm2835_spi_transfer_one_message(struct spi_controller *ctlr, + struct spi_message *msg) +{ + int ret; + gfp_t gfp_flags = GFP_KERNEL | GFP_DMA; + size_t max_transfer_size = 64; + ret = spi_split_transfers_maxsize(ctlr, msg, max_transfer_size, gfp_flags); + if (ret) + return ret; + + return spi_transfer_one_message(ctlr, msg); +} + static int bcm2835_spi_prepare_message(struct spi_master *master, struct spi_message *msg) { @@ -739,6 +752,7 @@ static int bcm2835_spi_probe(struct platform_device *pdev) master->setup = bcm2835_spi_setup; master->set_cs = bcm2835_spi_set_cs; master->transfer_one = bcm2835_spi_transfer_one; + master->transfer_one_message = bcm2835_spi_transfer_one_message; master->handle_err = bcm2835_spi_handle_err; master->prepare_message = bcm2835_spi_prepare_message; master->dev.of_node = pdev->dev.of_node; diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index b33a727a0158..3a352a0a6cdf 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1003,7 +1003,7 @@ static int spi_map_msg(struct spi_controller *ctlr, struct spi_message *msg) * drivers which implement a transfer_one() operation. It provides * standard handling of delays and chip select management. */ -static int spi_transfer_one_message(struct spi_controller *ctlr, +int spi_transfer_one_message(struct spi_controller *ctlr, struct spi_message *msg) { struct spi_transfer *xfer; @@ -1026,7 +1026,6 @@ static int spi_transfer_one_message(struct spi_controller *ctlr, if (xfer->tx_buf || xfer->rx_buf) { reinit_completion(&ctlr->xfer_completion); - ret = ctlr->transfer_one(ctlr, msg->spi, xfer); if (ret < 0) { SPI_STATISTICS_INCREMENT_FIELD(statm, @@ -1111,6 +1110,7 @@ static int spi_transfer_one_message(struct spi_controller *ctlr, return ret; } +EXPORT_SYMBOL_GPL(spi_transfer_one_message); /** * spi_finalize_current_transfer - report completion of a transfer @@ -2583,7 +2583,6 @@ static int __spi_split_transfer_maxsize(struct spi_controller *ctlr, /* calculate how many we have to replace */ count = DIV_ROUND_UP(xfer->len, maxsize); - /* create replacement */ srt = spi_replace_transfers(msg, xfer, 1, count, NULL, 0, gfp); if (IS_ERR(srt)) diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index bc6bb325d1bf..49b6dbce3e6d 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -622,6 +622,8 @@ extern void spi_finalize_current_transfer(struct spi_controller *ctlr); /* the spi driver core manages memory for the spi_controller classdev */ extern struct spi_controller *__spi_alloc_controller(struct device *host, unsigned int size, bool slave); +extern int spi_transfer_one_message(struct spi_controller *ctlr, + struct spi_message *msg); static inline struct spi_controller *spi_alloc_master(struct device *host, unsigned int size)