From nobody Thu Oct 9 04:14:02 2025 Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) (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 33F70261595 for ; Fri, 20 Jun 2025 22:21:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750458101; cv=none; b=Us/d8s2eIEyiyt7miRLD8UbiTdtSRETMiaZ+fmlqL+4l9+gQMrwZ3XZg0rvMGoT+XpgUoBGWFFFnUhqYwYjs1VYxYHYojYQE+StFvUnBcBrZcNIovm8GmSBTQaQyhJsDcai1Njz2oCb2Igb6g0ryWRpqIs7EqlEG7QyzjFZ3C5k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750458101; c=relaxed/simple; bh=IbUsb0IIrRbh86CcQ9q0Bs053cQYEkTsgXdxSwZMBi4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ivc7/PVKyMG0IsFbHuEBey0iOY7ZBf+KDNMU9Ly4yAPQcC7fh9wKPxexhEC3c+2nst0cWT7MWp2tQV76CwjJuK3sXkRB/XJ5/beTInVCZUS0eeXMCbbZnJE8hpMDQ3/mhIxn2907LTfthZ1U7AlQ77JDTIP40v+3IdNH2ZpzRTI= 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=RTmqVQm6; arc=none smtp.client-ip=209.85.160.49 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="RTmqVQm6" Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-2eacb421554so619476fac.1 for ; Fri, 20 Jun 2025 15:21:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1750458097; x=1751062897; 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=BTBvz5OHgnYilXTL9sKwLw3ZA7PkxwmvAPdMSwI1B94=; b=RTmqVQm65fB0/Air51ZXWggjZeFU29HExx/zMQJldzKK4/ld9+JfUNZzBW+EbvDP8y XUNZ1cHjQy4zH5OTo0IaZq1b4DPbTJGRAoNqk4OUTSYLFEvsKYCc5fugs6bvhm6ujqP/ gBYhU+HrHMEB5xAgZUCAEDKdB5oug63xKx5SXrL+289jMqJosuxWtmrWtILMIqedV3qj uqLyz+1L68M/8PZGMW8KMHVt7tXVXGTx3CQ9Z9/PmojG49L/EWhOMHD3Vt9R+VOmXzGJ zeCaVjd/7DtMHHBqNZ6crD2UyM+zoUDX6i9IZ78yjAucn50TnJaaimpF3x/QGwgrFJFg PDIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750458097; x=1751062897; 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=BTBvz5OHgnYilXTL9sKwLw3ZA7PkxwmvAPdMSwI1B94=; b=bbY3hG7vOPao2FH53argYoFNB6c3swR4lpvKRD34AeR4cup1OgnxISE7k93e2umIAH S5Kvj91CZCRPfAD/Fs/KsPcYYBrzxTalp5tIbRmIcSIBV1Pr5YIsFNDdE/YH6MS8pfKz MGpOH8KZzS1xfbLIagFab48ThcF2mjzMBtxYMBl5OiVGGgzY79OcWV0dmYsHL4BqwSvh 7oIJhv94jFxcAy54NWGerBHRNknPR40AcUvwgHf+2DCCntbv9GWYROQV1q/64mlJonUk +OaxmA0g4J/UkRyg2SWAkE7C4cWWp9nmPz0xJoyHakFv+rtUZq8kjKSQQUIcUupuOAb/ Emog== X-Forwarded-Encrypted: i=1; AJvYcCVa/314cojG1SIrLnxoC99gn8acbWmz12VvFoKbQK1Xn22bxea7lX241x9WIDAbGCO5XXwQ3igAWDl03DM=@vger.kernel.org X-Gm-Message-State: AOJu0Yx193eiAVfSvBFd/b2vs4JK6EXbvo1cKGY8cBVSfQshoC+BOIbn JMM/sYu6WtVTnlwmiaA04GN/Yyghg8iBnUe7T9VxpM1+Xmq9xTm9STyvHgcOrjI+RFk= X-Gm-Gg: ASbGnctwHZATKIvpou90sFHSUYF3pE4A8qnjAMscihsvfdxC1WNZHQntA+7KPWk/30b UMeWStDwoc4Lmgx8hoB1hfmcG7cl+VaqyMOwKG/nNdBosodfYQ4GXwgPy/Y6iLfryXUfbGCiHMm FmYDWkmtSG/tZ1qcuP5SYYGGGJu/3AxiadMfPi7bS5f2wOhcXOScY+f61C262iB1uScxYqe+vtb g9OZyMiDm28i5lyNWuRpO1Uew2fiolmFI0qI4uf+GjyXl+2DvAWz/Uwg/TuHT3uXVvqk6XPVecS y+U7ER3tYVOJYfbmGEWlf7IUSV4kqFL+cUfYErliDzqLmPKBywHt53Dq+nJ0GbeJ9Tt/ X-Google-Smtp-Source: AGHT+IExoXWKwinwKDXq3Vo+jK8Oj/C9dDlKCw/jO6YruhoWC/nvZZXKjVbM4r23Zba1ujtBTZZ/DQ== X-Received: by 2002:a05:6870:6c05:b0:2cc:3d66:b6ea with SMTP id 586e51a60fabf-2eeee62f882mr3489259fac.34.1750458097025; Fri, 20 Jun 2025 15:21:37 -0700 (PDT) Received: from [127.0.1.1] ([2600:8803:e7e4:1d00:c4bf:cf27:203c:f8b0]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-2ef481fe06esm7561fac.35.2025.06.20.15.21.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jun 2025 15:21:35 -0700 (PDT) From: David Lechner Date: Fri, 20 Jun 2025 17:20:14 -0500 Subject: [PATCH 8/9] 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: <20250620-iio-adc-ad7173-add-spi-offload-support-v1-8-0766f6297430@baylibre.com> References: <20250620-iio-adc-ad7173-add-spi-offload-support-v1-0-0766f6297430@baylibre.com> In-Reply-To: <20250620-iio-adc-ad7173-add-spi-offload-support-v1-0-0766f6297430@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=11663; i=dlechner@baylibre.com; h=from:subject:message-id; bh=IbUsb0IIrRbh86CcQ9q0Bs053cQYEkTsgXdxSwZMBi4=; b=owEBbQGS/pANAwAKAcLMIAH/AY/AAcsmYgBoVd7QIEkpAm8At8ewr1QJ5Q4JTRXtrGFfKuABn btA2SOVrXqJATMEAAEKAB0WIQTsGNmeYg6D1pzYaJjCzCAB/wGPwAUCaFXe0AAKCRDCzCAB/wGP wO8hCACCwizbe0fpq3oB952erC2Os8cWTEUSeYu0/ZQllThL5X6FAKGEMZAZHK/qxP8InCOZB+U XGUs3LgDG2RH9oKE0YX4vPB0UHKUS7dpt+wshQgUgdVW7x4nEEbINSrEJPaaoCg+O0SmwkKWYeP 0Ui0jFgpTNxSfKub+Ltqei9sVbx3CI708zVkeD/q1f7jDixv0VjuQd0bEKasMPeS2EadpOKBD7+ k+M5tN1FoWfvo17YAV5iXRRqyHzkL9lRr7zGEsVFuWiE7BTjkdRLX9YWhmhwLrG5c5finf9DkqG xWcV5TzJwhfWjJHm0AOD5tgngAgUpzca0XHZ63HGq8pibzdm 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 | 160 +++++++++++++++++++++++------= ---- include/linux/iio/adc/ad_sigma_delta.h | 14 +++ 2 files changed, 129 insertions(+), 45 deletions(-) diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_de= lta.c index a9b97f5d4107a2e1bb74877d30403445e9b04a44..449b0756be96d3f864a6e7f0704= 67ad7311bf7d5 100644 --- a/drivers/iio/adc/ad_sigma_delta.c +++ b/drivers/iio/adc/ad_sigma_delta.c @@ -14,11 +14,13 @@ #include #include #include +#include #include #include #include =20 #include +#include #include #include #include @@ -460,8 +462,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 @@ -489,23 +490,33 @@ 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 * scan_type->storagebits, 8); - samples_buf_size +=3D sizeof(int64_t); - 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); - 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 * scan_type->storagebits, 8); + samples_buf_size +=3D sizeof(int64_t); + 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); + + 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) { @@ -521,6 +532,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; @@ -537,7 +550,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 @@ -552,10 +577,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); @@ -670,7 +700,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; } @@ -703,17 +734,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; @@ -733,14 +753,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; } @@ -760,12 +799,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); } @@ -828,6 +884,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; 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