From nobody Wed Oct 8 07:07:12 2025 Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2436C30AAA1 for ; Tue, 1 Jul 2025 21:39:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751405990; cv=none; b=QZK8f6bASf3SmfK34YYhA3z9QlSfVjIEUvco58A8jc8YO8O4nsSt7wMkw4Bt341+N8npnn4CmA/4eaG3fQAQ0ZPfCSbMwZAWLik1YjzvP7nTwnXs7NzEGxnX+geH19SgBp7d7DbzkWp3tIRn8KkZlqixqZBarYp9zNS/H/J9/fo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751405990; c=relaxed/simple; bh=+d+NxpTsTAufeAHbXn6vZokwn73QBsqhiRNIGn6xEMg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=b3msMcnbix7fj5jbr0jihVIfM8+fM6DbSITkssScJc7sbp675I/zU+9PhY4wo3oTp3KHAISbwLXxTqXboOgNivijr6uwIATzY96EHvYgVlFSTpZi32jWEwHsfNSUkKKhsXkPQz8fFldrFQKVxB+9AxcaQ3OO7FFInYR/282tTSU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=lXN1VDL3; arc=none smtp.client-ip=209.85.167.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="lXN1VDL3" Received: by mail-oi1-f174.google.com with SMTP id 5614622812f47-4080548891fso2153635b6e.3 for ; Tue, 01 Jul 2025 14:39:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1751405987; x=1752010787; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=8HARK4yUyt3ToLiXOsTRFjUOUUAN/T6uBl9MD5Q99x4=; b=lXN1VDL3SFcvUiim5P71UXmlsgvOX/y1Yraf5zcJrl142SkfuV45pVOXtq34F9ZAT9 53T+sehLPWJLCxemOhtFcQd5CDD8yPmJ+TTqNJU15ZXgkHoDI9Zu/RMpijq0JD2uNOA1 uxUm3XiKPEofw21imurxCX+l4NiXsFUfT8P5iRSs9vfYpCF1iNIHyopSbZlrQy+Wzf3m 2cZhRiIA5Tx2c7QGdqxby0KzqpX5XtCZDwVYuMB1/SiGtbD18c2rdNYeAtEMfJ5gVoV8 lW1ArmZ3dWrdfclr9YI9t32sYyMCrG7OhwN/0nyxVMQdoweH/ebB349ibrIaWZCIS/rq NquQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751405987; x=1752010787; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8HARK4yUyt3ToLiXOsTRFjUOUUAN/T6uBl9MD5Q99x4=; b=JEErl7vnftmfmEilSbz95RuEUF6NLCq03irmCKMEl9GdZdx9yaKaElAr7tqjpmY2gr YshokxCnGOOXqBgxM9h4J6pN4XMtL1l0Ynv/Sj0Bb8gzRUh/vGLtS1Qg2WHbT36no76i 4ZVgbjGfPaltVzxBQV/5iMwe6CSqqION9TJJMsGBebG03P9XRAMuD2Tcvm7xyNfuEBSJ /3sgh6euC/hlfmeCrY609hTeP6Pxpz2FwKEEu6WahOlQmdOzxR+4jc4yEbpci8LpaRyQ v2gxUda+vgxR6dRJfAqZ9wNo8wgPztZQux0DvyYfBA/FcVTflO7Fiofvl6cQ6hR8RDUl Z+4A== X-Forwarded-Encrypted: i=1; AJvYcCVruwGrf7V4abcfmNb0y+QIIeJj5v00eDH6jOsxSLT4mx6E7v0Ew8z98+Z3BFh6m4cjTII+K33DJWp8xSg=@vger.kernel.org X-Gm-Message-State: AOJu0YwZcTXktb7OEkZsy8EcilN4XmpGDuZWKBZFhoHv5eIykpIVtchT rS0r05VOSfsDmfPJvf8u3dmBz4ICwqfO30FieoSkRc031Ss82lEIotvGseRlIzLrbHc= X-Gm-Gg: ASbGnctHvAqtbxxVq32mgssREpMdeg42LyCW5PdzsDmqKAi1ZKsKu9gkEgRBZ9ezlUD 6hkKK5C3dR2MAOGxPkvM65xbEPWmejXEn84usJLLnK80QVOQQrFPNrfxAspBgdwbkFzOwCK3aaI 4gLHUOtwn+bfkmaC35exOpYwyfeFxcac/IAC4RGcN4Wj955moAcFu/4I059S2J/qmZ5u0T1isEw 2ZmnEbak03s9Prl6WNDVe9h1oS5qLnaPtYgDFfoKLSWI71blvh/G/lzMZDLWrXW74ZqLWGWurjw s2Vwx01ZFitR/tXNdtBoADBmoAT+1VvSR5u+gSAnrMPSv0xPEdY5Ls5tntLE6p6QmagOWp4Iju6 XKYE= X-Google-Smtp-Source: AGHT+IHNvbIlM9B8xBbwOrEGY91WUX6qfGb1IgkqoOC/5A2b9xtY0fWbRtmKupZRSWPVdAK+GHh8ig== X-Received: by 2002:a05:6808:4f14:b0:404:764:f7b6 with SMTP id 5614622812f47-40b8876a215mr265046b6e.9.1751405982526; Tue, 01 Jul 2025 14:39:42 -0700 (PDT) Received: from [127.0.1.1] ([2600:8803:e7e4:1d00:70a7:ca49:a250:f1d5]) by smtp.gmail.com with ESMTPSA id 5614622812f47-40b3243deeesm2288335b6e.48.2025.07.01.14.39.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Jul 2025 14:39:42 -0700 (PDT) From: David Lechner Date: Tue, 01 Jul 2025 16:37:59 -0500 Subject: [PATCH v3 11/12] iio: adc: ad_sigma_delta: add SPI offload support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250701-iio-adc-ad7173-add-spi-offload-support-v3-11-42abb83e3dac@baylibre.com> References: <20250701-iio-adc-ad7173-add-spi-offload-support-v3-0-42abb83e3dac@baylibre.com> In-Reply-To: <20250701-iio-adc-ad7173-add-spi-offload-support-v3-0-42abb83e3dac@baylibre.com> To: Michael Hennerich , Jonathan Cameron , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Mark Brown Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-spi@vger.kernel.org, David Lechner X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=12172; i=dlechner@baylibre.com; h=from:subject:message-id; bh=+d+NxpTsTAufeAHbXn6vZokwn73QBsqhiRNIGn6xEMg=; b=owEBbAGT/pANAwAKAcLMIAH/AY/AAcsmYgBoZFWDmWkRubXMkuTiJqJVkkzxUBUyHg9U/GTIO n6FQf2+ha6JATIEAAEKAB0WIQTsGNmeYg6D1pzYaJjCzCAB/wGPwAUCaGRVgwAKCRDCzCAB/wGP wLhEB/dNn1oI1gAw2yzlTJ3TEzgEes0rXs7gal2teIWD2lz+kkGhtLq8TMW0ZGL7c2/3Gw34VdG tAHfy0Yo3yn9TuJfyDZ4MJLwa2kSt6kxTnXR3lKJe/LG3Bv3VYdAbwfpg7jIM8/XT+mBW80OtZI 5jnPqV0qtM/+4x6vW3Y5n6WqDsU2UaQsIf+GsgRvqWCrlpMv3TYwy5+mjrUXVVnBzmv00BATqtz sbcTplgrWhJliRjA44VO1CHfX07yJ120rzh0w+MBKSNhZK3GJzmE5KohiFsegCIteAbrSCdq5o0 WF/byPQ/V5iMVuvfp6xcJyYKadhOU+XKUbWl7Yz27S88n8E= X-Developer-Key: i=dlechner@baylibre.com; a=openpgp; fpr=8A73D82A6A1F509907F373881F8AF88C82F77C03 Add SPI offload support to the ad_sigma_delta module. When the SPI controller has SPI offload capabilities, the module will now use that for buffered reads instead of the RDY interrupt trigger. Drivers that use the ad_sigma_delta module will have to opt into this by setting supports_spi_offload since each driver will likely need additional changes before SPI offload can be used. This will allow us to gradually enable SPI offload support for each driver. Signed-off-by: David Lechner --- drivers/iio/adc/ad_sigma_delta.c | 165 +++++++++++++++++++++++------= ---- include/linux/iio/adc/ad_sigma_delta.h | 14 +++ 2 files changed, 132 insertions(+), 47 deletions(-) diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_de= lta.c index 124c42e19f2e25723b67ea38f7d016f00ff91342..9d2dba0a0ee6d7fe60c8ea188ed= 614100419081d 100644 --- a/drivers/iio/adc/ad_sigma_delta.c +++ b/drivers/iio/adc/ad_sigma_delta.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -27,6 +28,7 @@ #include =20 #include +#include #include #include #include @@ -467,8 +469,7 @@ static int ad_sd_buffer_postenable(struct iio_dev *indi= o_dev) struct ad_sigma_delta *sigma_delta =3D iio_device_get_drvdata(indio_dev); const struct iio_scan_type *scan_type =3D &indio_dev->channels[0].scan_ty= pe; struct spi_transfer *xfer =3D sigma_delta->sample_xfer; - unsigned int i, slot, samples_buf_size; - unsigned int channel, scan_size; + unsigned int i, slot, channel; u8 *samples_buf; int ret; =20 @@ -496,25 +497,35 @@ static int ad_sd_buffer_postenable(struct iio_dev *in= dio_dev) sigma_delta->active_slots =3D slot; sigma_delta->current_slot =3D 0; =20 - if (sigma_delta->active_slots > 1) { - ret =3D ad_sigma_delta_append_status(sigma_delta, true); - if (ret) - return ret; - } + if (ad_sigma_delta_has_spi_offload(sigma_delta)) { + xfer[1].offload_flags =3D SPI_OFFLOAD_XFER_RX_STREAM; + xfer[1].bits_per_word =3D scan_type->realbits; + xfer[1].len =3D spi_bpw_to_bytes(scan_type->realbits); + } else { + unsigned int samples_buf_size, scan_size; =20 - samples_buf_size =3D ALIGN(slot * BITS_TO_BYTES(scan_type->storagebits), - sizeof(s64)); - samples_buf_size +=3D sizeof(s64); - samples_buf =3D devm_krealloc(&sigma_delta->spi->dev, sigma_delta->sample= s_buf, - samples_buf_size, GFP_KERNEL); - if (!samples_buf) - return -ENOMEM; + if (sigma_delta->active_slots > 1) { + ret =3D ad_sigma_delta_append_status(sigma_delta, true); + if (ret) + return ret; + } =20 - sigma_delta->samples_buf =3D samples_buf; - scan_size =3D BITS_TO_BYTES(scan_type->realbits + scan_type->shift); - /* For 24-bit data, there is an extra byte of padding. */ - xfer[1].rx_buf =3D &sigma_delta->rx_buf[scan_size =3D=3D 3 ? 1 : 0]; - xfer[1].len =3D scan_size + (sigma_delta->status_appended ? 1 : 0); + samples_buf_size =3D + ALIGN(slot * BITS_TO_BYTES(scan_type->storagebits), + sizeof(s64)); + samples_buf_size +=3D sizeof(s64); + samples_buf =3D devm_krealloc(&sigma_delta->spi->dev, + sigma_delta->samples_buf, + samples_buf_size, GFP_KERNEL); + if (!samples_buf) + return -ENOMEM; + + sigma_delta->samples_buf =3D samples_buf; + scan_size =3D BITS_TO_BYTES(scan_type->realbits + scan_type->shift); + /* For 24-bit data, there is an extra byte of padding. */ + xfer[1].rx_buf =3D &sigma_delta->rx_buf[scan_size =3D=3D 3 ? 1 : 0]; + xfer[1].len =3D scan_size + (sigma_delta->status_appended ? 1 : 0); + } xfer[1].cs_change =3D 1; =20 if (sigma_delta->info->has_registers) { @@ -530,6 +541,8 @@ static int ad_sd_buffer_postenable(struct iio_dev *indi= o_dev) &xfer[1], 1); } =20 + sigma_delta->sample_msg.offload =3D sigma_delta->offload; + ret =3D spi_optimize_message(sigma_delta->spi, &sigma_delta->sample_msg); if (ret) return ret; @@ -546,7 +559,19 @@ static int ad_sd_buffer_postenable(struct iio_dev *ind= io_dev) if (ret) goto err_unlock; =20 - ad_sd_enable_irq(sigma_delta); + if (ad_sigma_delta_has_spi_offload(sigma_delta)) { + struct spi_offload_trigger_config config =3D { + .type =3D SPI_OFFLOAD_TRIGGER_DATA_READY, + }; + + ret =3D spi_offload_trigger_enable(sigma_delta->offload, + sigma_delta->offload_trigger, + &config); + if (ret) + goto err_unlock; + } else { + ad_sd_enable_irq(sigma_delta); + } =20 return 0; =20 @@ -561,10 +586,15 @@ static int ad_sd_buffer_postdisable(struct iio_dev *i= ndio_dev) { struct ad_sigma_delta *sigma_delta =3D iio_device_get_drvdata(indio_dev); =20 - reinit_completion(&sigma_delta->completion); - wait_for_completion_timeout(&sigma_delta->completion, HZ); + if (ad_sigma_delta_has_spi_offload(sigma_delta)) { + spi_offload_trigger_disable(sigma_delta->offload, + sigma_delta->offload_trigger); + } else { + reinit_completion(&sigma_delta->completion); + wait_for_completion_timeout(&sigma_delta->completion, HZ); =20 - ad_sd_disable_irq(sigma_delta); + ad_sd_disable_irq(sigma_delta); + } =20 sigma_delta->keep_cs_asserted =3D false; ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE); @@ -679,7 +709,8 @@ static irqreturn_t ad_sd_data_rdy_trig_poll(int irq, vo= id *private) if ((!sigma_delta->rdy_gpiod || gpiod_get_value(sigma_delta->rdy_gpiod)) = && ad_sd_disable_irq(sigma_delta)) { complete(&sigma_delta->completion); - iio_trigger_poll(sigma_delta->trig); + if (sigma_delta->trig) + iio_trigger_poll(sigma_delta->trig); =20 return IRQ_HANDLED; } @@ -712,17 +743,6 @@ static int devm_ad_sd_probe_trigger(struct device *dev= , struct iio_dev *indio_de unsigned long irq_flags =3D irq_get_trigger_type(sigma_delta->irq_line); int ret; =20 - if (dev !=3D &sigma_delta->spi->dev) { - dev_err(dev, "Trigger parent should be '%s', got '%s'\n", - dev_name(dev), dev_name(&sigma_delta->spi->dev)); - return -EFAULT; - } - - sigma_delta->trig =3D devm_iio_trigger_alloc(dev, "%s-dev%d", indio_dev->= name, - iio_device_id(indio_dev)); - if (sigma_delta->trig =3D=3D NULL) - return -ENOMEM; - init_completion(&sigma_delta->completion); =20 sigma_delta->irq_dis =3D true; @@ -742,14 +762,33 @@ static int devm_ad_sd_probe_trigger(struct device *de= v, struct iio_dev *indio_de if (ret) return ret; =20 - iio_trigger_set_drvdata(sigma_delta->trig, sigma_delta); + if (ad_sigma_delta_has_spi_offload(sigma_delta)) { + sigma_delta->offload_trigger =3D + devm_spi_offload_trigger_get(dev, sigma_delta->offload, + SPI_OFFLOAD_TRIGGER_DATA_READY); + if (IS_ERR(sigma_delta->offload_trigger)) + return dev_err_probe(dev, PTR_ERR(sigma_delta->offload_trigger), + "Failed to get SPI offload trigger\n"); + } else { + if (dev !=3D &sigma_delta->spi->dev) + return dev_err_probe(dev, -EFAULT, + "Trigger parent should be '%s', got '%s'\n", + dev_name(dev), dev_name(&sigma_delta->spi->dev)); =20 - ret =3D devm_iio_trigger_register(dev, sigma_delta->trig); - if (ret) - return ret; + sigma_delta->trig =3D devm_iio_trigger_alloc(dev, "%s-dev%d", + indio_dev->name, iio_device_id(indio_dev)); + if (!sigma_delta->trig) + return -ENOMEM; =20 - /* select default trigger */ - indio_dev->trig =3D iio_trigger_get(sigma_delta->trig); + iio_trigger_set_drvdata(sigma_delta->trig, sigma_delta); + + ret =3D devm_iio_trigger_register(dev, sigma_delta->trig); + if (ret) + return ret; + + /* select default trigger */ + indio_dev->trig =3D iio_trigger_get(sigma_delta->trig); + } =20 return 0; } @@ -769,12 +808,29 @@ int devm_ad_sd_setup_buffer_and_trigger(struct device= *dev, struct iio_dev *indi if (!sigma_delta->slots) return -ENOMEM; =20 - ret =3D devm_iio_triggered_buffer_setup(dev, indio_dev, - &iio_pollfunc_store_time, - &ad_sd_trigger_handler, - &ad_sd_buffer_setup_ops); - if (ret) - return ret; + if (ad_sigma_delta_has_spi_offload(sigma_delta)) { + struct dma_chan *rx_dma; + + rx_dma =3D devm_spi_offload_rx_stream_request_dma_chan(dev, + sigma_delta->offload); + if (IS_ERR(rx_dma)) + return dev_err_probe(dev, PTR_ERR(rx_dma), + "Failed to get RX DMA channel\n"); + + ret =3D devm_iio_dmaengine_buffer_setup_with_handle(dev, indio_dev, + rx_dma, IIO_BUFFER_DIRECTION_IN); + if (ret) + return dev_err_probe(dev, ret, "Cannot setup DMA buffer\n"); + + indio_dev->setup_ops =3D &ad_sd_buffer_setup_ops; + } else { + ret =3D devm_iio_triggered_buffer_setup(dev, indio_dev, + &iio_pollfunc_store_time, + &ad_sd_trigger_handler, + &ad_sd_buffer_setup_ops); + if (ret) + return ret; + } =20 return devm_ad_sd_probe_trigger(dev, indio_dev); } @@ -837,6 +893,20 @@ int ad_sd_init(struct ad_sigma_delta *sigma_delta, str= uct iio_dev *indio_dev, return sigma_delta->irq_line; } =20 + if (info->supports_spi_offload) { + struct spi_offload_config offload_config =3D { + .capability_flags =3D SPI_OFFLOAD_CAP_TRIGGER | + SPI_OFFLOAD_CAP_RX_STREAM_DMA, + }; + int ret; + + sigma_delta->offload =3D devm_spi_offload_get(&spi->dev, spi, + &offload_config); + ret =3D PTR_ERR_OR_ZERO(sigma_delta->offload); + if (ret && ret !=3D -ENODEV) + return dev_err_probe(&spi->dev, ret, "Failed to get SPI offload\n"); + } + iio_device_set_drvdata(indio_dev, sigma_delta); =20 return 0; @@ -846,3 +916,4 @@ EXPORT_SYMBOL_NS_GPL(ad_sd_init, "IIO_AD_SIGMA_DELTA"); MODULE_AUTHOR("Lars-Peter Clausen "); MODULE_DESCRIPTION("Analog Devices Sigma-Delta ADCs"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS("IIO_DMAENGINE_BUFFER"); diff --git a/include/linux/iio/adc/ad_sigma_delta.h b/include/linux/iio/adc= /ad_sigma_delta.h index 2037bb68b44115681ff48f66b580b63f50c2ea9e..6e70a412e218d54bbf9bb6861b1= a4cc89be868e8 100644 --- a/include/linux/iio/adc/ad_sigma_delta.h +++ b/include/linux/iio/adc/ad_sigma_delta.h @@ -31,6 +31,8 @@ struct ad_sigma_delta; struct device; struct gpio_desc; struct iio_dev; +struct spi_offload; +struct spi_offload_trigger; =20 /** * struct ad_sigma_delta_info - Sigma Delta driver specific callbacks and = options @@ -47,6 +49,10 @@ struct iio_dev; * @has_registers: true if the device has writable and readable registers,= false * if there is just one read-only sample data shift register. * @has_named_irqs: Set to true if there is more than one IRQ line. + * @supports_spi_offload: Set to true if the driver supports SPI offload. = Often + * special considerations are needed for scan_type and other channel + * info, so individual drivers have to set this to let the core + * code know that it can use SPI offload if it is available. * @addr_shift: Shift of the register address in the communications regist= er. * @read_mask: Mask for the communications register having the read bit se= t. * @status_ch_mask: Mask for the channel number stored in status register. @@ -65,6 +71,7 @@ struct ad_sigma_delta_info { int (*postprocess_sample)(struct ad_sigma_delta *, unsigned int raw_sampl= e); bool has_registers; bool has_named_irqs; + bool supports_spi_offload; unsigned int addr_shift; unsigned int read_mask; unsigned int status_ch_mask; @@ -108,6 +115,8 @@ struct ad_sigma_delta { struct spi_message sample_msg; struct spi_transfer sample_xfer[2]; u8 *samples_buf; + struct spi_offload *offload; + struct spi_offload_trigger *offload_trigger; =20 /* * DMA (thus cache coherency maintenance) requires the @@ -121,6 +130,11 @@ struct ad_sigma_delta { u8 sample_addr; }; =20 +static inline bool ad_sigma_delta_has_spi_offload(struct ad_sigma_delta *s= d) +{ + return sd->offload !=3D NULL; +} + static inline int ad_sigma_delta_set_channel(struct ad_sigma_delta *sd, unsigned int channel) { --=20 2.43.0