From patchwork Wed Nov 15 13:59:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Pfaff X-Patchwork-Id: 745630 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A11DC48BD7 for ; Wed, 15 Nov 2023 14:20:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344191AbjKOOUH (ORCPT ); Wed, 15 Nov 2023 09:20:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344181AbjKOOUH (ORCPT ); Wed, 15 Nov 2023 09:20:07 -0500 Received: from mail.pcs.gmbh (mail.pcs.gmbh [89.27.162.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26BB2B3 for ; Wed, 15 Nov 2023 06:20:02 -0800 (PST) Received: from mail.csna.de (mail.csna.de [89.27.162.50]) by mail.pcs.gmbh with ESMTPA ; Wed, 15 Nov 2023 14:59:17 +0100 Received: from EXCHANGE2019.pcs.ditec.de (mail.pcs.com [89.27.162.5]) by mail.csna.de with ESMTPSA (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256) ; Wed, 15 Nov 2023 14:59:17 +0100 Received: from EXCHANGE2019.pcs.ditec.de (192.168.8.214) by EXCHANGE2019.pcs.ditec.de (192.168.8.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42; Wed, 15 Nov 2023 14:59:11 +0100 Received: from lxtpfaff.pcs.ditec.de (192.168.9.96) by EXCHANGE2019.pcs.ditec.de (192.168.8.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42 via Frontend Transport; Wed, 15 Nov 2023 14:59:06 +0100 Date: Wed, 15 Nov 2023 14:59:06 +0100 From: Thomas Pfaff To: CC: , , , , , , Subject: [PATCH RFC 1/3 stable-6.1] spi: spi-atmel: switch to managed dma_alloc_coherent Message-ID: MIME-Version: 1.0 X-KSE-ServerInfo: EXCHANGE2019.pcs.ditec.de, 9 X-KSE-AntiSpam-Interceptor-Info: white sender email list X-KSE-AttachmentFiltering-Interceptor-Info: protection disabled X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 15.11.2023 11:15:00 X-KSE-BulkMessagesFiltering-Scan-Result: protection disabled Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org From: Thomas Pfaff use managed dma_alloc_coherent instead of unmanaged. Signed-off-by: Thomas Pfaff diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index c4f22d50dba5..fc566d22aa36 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1513,22 +1513,22 @@ static int atmel_spi_probe(struct platform_device *pdev) } if (IS_ENABLED(CONFIG_SOC_SAM_V4_V5)) { - as->addr_rx_bbuf = dma_alloc_coherent(&pdev->dev, - SPI_MAX_DMA_XFER, - &as->dma_addr_rx_bbuf, - GFP_KERNEL | GFP_DMA); + as->addr_rx_bbuf = dmam_alloc_coherent(&pdev->dev, + SPI_MAX_DMA_XFER, + &as->dma_addr_rx_bbuf, + GFP_KERNEL | GFP_DMA); if (!as->addr_rx_bbuf) { as->use_dma = false; } else { - as->addr_tx_bbuf = dma_alloc_coherent(&pdev->dev, - SPI_MAX_DMA_XFER, - &as->dma_addr_tx_bbuf, - GFP_KERNEL | GFP_DMA); + as->addr_tx_bbuf = dmam_alloc_coherent(&pdev->dev, + SPI_MAX_DMA_XFER, + &as->dma_addr_tx_bbuf, + GFP_KERNEL | GFP_DMA); if (!as->addr_tx_bbuf) { as->use_dma = false; - dma_free_coherent(&pdev->dev, SPI_MAX_DMA_XFER, - as->addr_rx_bbuf, - as->dma_addr_rx_bbuf); + dmam_free_coherent(&pdev->dev, SPI_MAX_DMA_XFER, + as->addr_rx_bbuf, + as->dma_addr_rx_bbuf); } } if (!as->use_dma) @@ -1607,14 +1607,6 @@ static int atmel_spi_remove(struct platform_device *pdev) if (as->use_dma) { atmel_spi_stop_dma(master); atmel_spi_release_dma(master); - if (IS_ENABLED(CONFIG_SOC_SAM_V4_V5)) { - dma_free_coherent(&pdev->dev, SPI_MAX_DMA_XFER, - as->addr_tx_bbuf, - as->dma_addr_tx_bbuf); - dma_free_coherent(&pdev->dev, SPI_MAX_DMA_XFER, - as->addr_rx_bbuf, - as->dma_addr_rx_bbuf); - } } spin_lock_irq(&as->lock); From patchwork Wed Nov 15 14:00:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Pfaff X-Patchwork-Id: 744411 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF1B3C48BD7 for ; Wed, 15 Nov 2023 14:21:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344204AbjKOOVH (ORCPT ); Wed, 15 Nov 2023 09:21:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344217AbjKOOVG (ORCPT ); Wed, 15 Nov 2023 09:21:06 -0500 Received: from mail.pcs.gmbh (mail.pcs.gmbh [89.27.162.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9003D121 for ; Wed, 15 Nov 2023 06:20:59 -0800 (PST) Received: from mail.csna.de (mail.csna.de [89.27.162.50]) by mail.pcs.gmbh with ESMTPA ; Wed, 15 Nov 2023 15:00:12 +0100 Received: from EXCHANGE2019.pcs.ditec.de (mail.pcs.com [89.27.162.5]) by mail.csna.de with ESMTPSA (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256) ; Wed, 15 Nov 2023 15:00:11 +0100 Received: from EXCHANGE2019.pcs.ditec.de (192.168.8.214) by EXCHANGE2019.pcs.ditec.de (192.168.8.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42; Wed, 15 Nov 2023 15:00:12 +0100 Received: from lxtpfaff.pcs.ditec.de (192.168.9.96) by EXCHANGE2019.pcs.ditec.de (192.168.8.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42 via Frontend Transport; Wed, 15 Nov 2023 15:00:12 +0100 Date: Wed, 15 Nov 2023 15:00:11 +0100 From: Thomas Pfaff To: CC: , , , , , , Subject: [PATCH RFC 2/3 stable-6.1] spi: spi-atmel: use dma buffers for pdc transfer Message-ID: MIME-Version: 1.0 X-KSE-ServerInfo: EXCHANGE2019.pcs.ditec.de, 9 X-KSE-AntiSpam-Interceptor-Info: white sender email list X-KSE-AttachmentFiltering-Interceptor-Info: protection disabled X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 15.11.2023 11:15:00 X-KSE-BulkMessagesFiltering-Scan-Result: protection disabled Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org From: Thomas Pfaff pdc transfer is broken (at least on AT91SAM9G45), because dma_map_single will always return false on vmalloc addresses. This can be avoided by using the buffers for dma transfers for pdc too. Signed-off-by: Thomas Pfaff diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index fc566d22aa36..eaf4f9ff2504 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -267,6 +267,7 @@ struct atmel_spi { dma_addr_t dma_addr_tx_bbuf; void *addr_rx_bbuf; void *addr_tx_bbuf; + void *addr_rx_buf; struct completion xfer_completion; @@ -906,42 +907,22 @@ static void atmel_spi_pdc_next_xfer(struct spi_master *master, } /* - * For DMA, tx_buf/tx_dma have the same relationship as rx_buf/rx_dma: - * - The buffer is either valid for CPU access, else NULL - * - If the buffer is valid, so is its DMA address - * - * This driver manages the dma address unless message->is_dma_mapped. + * Use the internal dma buffers for pdc transfers, */ -static int +static void atmel_spi_dma_map_xfer(struct atmel_spi *as, struct spi_transfer *xfer) { - struct device *dev = &as->pdev->dev; - xfer->tx_dma = xfer->rx_dma = INVALID_DMA_ADDRESS; if (xfer->tx_buf) { - /* tx_buf is a const void* where we need a void * for the dma - * mapping */ - void *nonconst_tx = (void *)xfer->tx_buf; - - xfer->tx_dma = dma_map_single(dev, - nonconst_tx, xfer->len, - DMA_TO_DEVICE); - if (dma_mapping_error(dev, xfer->tx_dma)) - return -ENOMEM; + memcpy(as->addr_tx_bbuf, xfer->tx_buf, xfer->len); + xfer->tx_dma = as->dma_addr_tx_bbuf; + xfer->tx_buf = as->addr_tx_bbuf; } if (xfer->rx_buf) { - xfer->rx_dma = dma_map_single(dev, - xfer->rx_buf, xfer->len, - DMA_FROM_DEVICE); - if (dma_mapping_error(dev, xfer->rx_dma)) { - if (xfer->tx_buf) - dma_unmap_single(dev, - xfer->tx_dma, xfer->len, - DMA_TO_DEVICE); - return -ENOMEM; - } + as->addr_rx_buf = xfer->rx_buf; + xfer->rx_dma = as->dma_addr_rx_bbuf; + xfer->rx_buf = as->addr_rx_bbuf; } - return 0; } static void atmel_spi_dma_unmap_xfer(struct spi_master *master, @@ -1125,6 +1106,11 @@ atmel_spi_pdc_interrupt(int irq, void *dev_id) spi_writel(as, IDR, pending); + if (as->addr_rx_buf) { + as->current_transfer->rx_buf = as->addr_rx_buf; + memcpy(as->current_transfer->rx_buf, as->addr_rx_bbuf, + as->current_transfer->len); + } complete(&as->xfer_completion); } @@ -1296,10 +1282,10 @@ static int atmel_spi_one_transfer(struct spi_master *master, * better fault reporting. */ if ((!master->cur_msg->is_dma_mapped) - && as->use_pdc) { - if (atmel_spi_dma_map_xfer(as, xfer) < 0) - return -ENOMEM; - } + && as->use_pdc) + atmel_spi_dma_map_xfer(as, xfer); + else + as->addr_rx_buf = NULL; atmel_spi_set_xfer_speed(as, spi, xfer); @@ -1512,28 +1498,25 @@ static int atmel_spi_probe(struct platform_device *pdev) as->use_pdc = true; } - if (IS_ENABLED(CONFIG_SOC_SAM_V4_V5)) { - as->addr_rx_bbuf = dmam_alloc_coherent(&pdev->dev, + as->addr_rx_bbuf = dmam_alloc_coherent(&pdev->dev, + SPI_MAX_DMA_XFER, + &as->dma_addr_rx_bbuf, + GFP_KERNEL | GFP_DMA); + if (!as->addr_rx_bbuf) { + as->use_dma = false; + as->use_pdc = false; + } else { + as->addr_tx_bbuf = dmam_alloc_coherent(&pdev->dev, SPI_MAX_DMA_XFER, - &as->dma_addr_rx_bbuf, + &as->dma_addr_tx_bbuf, GFP_KERNEL | GFP_DMA); - if (!as->addr_rx_bbuf) { + if (!as->addr_tx_bbuf) { as->use_dma = false; - } else { - as->addr_tx_bbuf = dmam_alloc_coherent(&pdev->dev, - SPI_MAX_DMA_XFER, - &as->dma_addr_tx_bbuf, - GFP_KERNEL | GFP_DMA); - if (!as->addr_tx_bbuf) { - as->use_dma = false; - dmam_free_coherent(&pdev->dev, SPI_MAX_DMA_XFER, - as->addr_rx_bbuf, - as->dma_addr_rx_bbuf); - } + as->use_pdc = false; + dmam_free_coherent(&pdev->dev, SPI_MAX_DMA_XFER, + as->addr_rx_bbuf, + as->dma_addr_rx_bbuf); } - if (!as->use_dma) - dev_info(master->dev.parent, - " can not allocate dma coherent memory\n"); } if (as->caps.has_dma_support && !as->use_dma) From patchwork Wed Nov 15 14:01:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Pfaff X-Patchwork-Id: 744412 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF3C5C48BF9 for ; Wed, 15 Nov 2023 14:01:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234969AbjKOOBS (ORCPT ); Wed, 15 Nov 2023 09:01:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234967AbjKOOBR (ORCPT ); Wed, 15 Nov 2023 09:01:17 -0500 X-Greylist: delayed 76 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 15 Nov 2023 06:01:13 PST Received: from mail.pcs.gmbh (mail.pcs.gmbh [89.27.162.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6A2B123; Wed, 15 Nov 2023 06:01:13 -0800 (PST) Received: from mail.csna.de (mail.csna.de [89.27.162.50]) by mail.pcs.gmbh with ESMTPA ; Wed, 15 Nov 2023 15:01:04 +0100 Received: from EXCHANGE2019.pcs.ditec.de (mail.pcs.com [89.27.162.5]) by mail.csna.de with ESMTPSA (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256) ; Wed, 15 Nov 2023 15:01:04 +0100 Received: from EXCHANGE2019.pcs.ditec.de (192.168.8.214) by EXCHANGE2019.pcs.ditec.de (192.168.8.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42; Wed, 15 Nov 2023 15:01:04 +0100 Received: from lxtpfaff.pcs.ditec.de (192.168.9.96) by EXCHANGE2019.pcs.ditec.de (192.168.8.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42 via Frontend Transport; Wed, 15 Nov 2023 15:01:04 +0100 Date: Wed, 15 Nov 2023 15:01:04 +0100 From: Thomas Pfaff To: CC: , , , , , , Subject: [PATCH RFC 3/3 stable-6.1] spi: spi-atmel: enable dma on AT91SAM9G45 Message-ID: <2863edc4-5daa-d8d6-5e8d-b9dc244bcb82@pcs.com> MIME-Version: 1.0 X-KSE-ServerInfo: EXCHANGE2019.pcs.ditec.de, 9 X-KSE-AntiSpam-Interceptor-Info: white sender email list X-KSE-AttachmentFiltering-Interceptor-Info: protection disabled X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 15.11.2023 13:02:00 X-KSE-BulkMessagesFiltering-Scan-Result: protection disabled Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org From: Thomas Pfaff AT91SAM9G45 spi has version 0x210, but dma is working on it. Signed-off-by: Thomas Pfaff diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index eaf4f9ff2504..1e4722bdcb2d 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1395,8 +1395,8 @@ static void atmel_get_caps(struct atmel_spi *as) as->caps.is_spi2 = version > 0x121; as->caps.has_wdrbt = version >= 0x210; - as->caps.has_dma_support = version >= 0x212; - as->caps.has_pdc_support = version < 0x212; + as->caps.has_dma_support = version >= 0x210; + as->caps.has_pdc_support = version < 0x210; } static void atmel_spi_init(struct atmel_spi *as)