From nobody Mon Feb 9 00:02:22 2026 Received: from mail-oa1-f45.google.com (mail-oa1-f45.google.com [209.85.160.45]) (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 E9A3370CB4 for ; Mon, 25 Mar 2024 22:04:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711404275; cv=none; b=p/JXTElQHUOJ94RdG5Osz3sP6J9Za0rZls4XJQ8ErzyhRpTP2V2Yep2bYBnirJ5Ug5aNkf4FbYSTwECmaW8HdLRz3aULD8YjNI85XRFI46z5cTMMj02gxXEQ5EJsjw6/8OSDf+Y72I3Bq9b3p/iaNdoZfe8Jcl5fZi3caRA+0l8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711404275; c=relaxed/simple; bh=yF1sq2YPQ2TPw93z5U5pn/DAoF1k8JLyhryca4ogEM0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=KhlOppYYAWL2H460QbNGU7VceDOVGF1OIZr5uP4Z40lFd8o5SNNqunigEEaUqQjLPQxbgzfo+wFzuAFZXCJGSLTKiQFGdBhiAv3yf9tn9HJQV3Woz/g6cveIJT1BBxQHU9OQD0pNpsxe1/OV5Kf8nRVrW5QafI4eArqblN2UTqk= 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=Eqmuq35q; arc=none smtp.client-ip=209.85.160.45 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="Eqmuq35q" Received: by mail-oa1-f45.google.com with SMTP id 586e51a60fabf-221822a7dc7so2595262fac.3 for ; Mon, 25 Mar 2024 15:04:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1711404272; x=1712009072; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=CjXGYJw5dXwvdxus40r7I6gcFP0lejncjGW57vGc8Lc=; b=Eqmuq35qekxgZtz09HAEFEyRBROy109UwcW1ONFRVGNfdGZZCJvqAtQ5Gu02uYZk4j 3CBDoD5I7tlTqlVEyvhAvhW2UjhBPFQER/gX8Z0grsRmxzcGQGqDpkgV1ALgEdFyOb6m xHcWwxb0qVIvXnWMsNVk3SwMQBHCG7j5mxdI6XlWohOks8Qr1Ai9BZoo4M3jwpwV2EfQ OL4IxILvpLy5+E2+G7kPJoUPZoESBgZFS5OMJ9BTRhUfEzZquznaSTmnCr68yUDEY6ha 9p+jf1fwLndXqyYrYwfmMmWZuzRpJ31gngpOssds0PWoo2iijg/7mtjWaT/E+sq2jNF5 vUnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711404272; x=1712009072; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CjXGYJw5dXwvdxus40r7I6gcFP0lejncjGW57vGc8Lc=; b=EqNV6oohr5S0X1GJ78R1pgzJ81TNO28GrhGFGzJjIYCXsNAPR2AuIPovD55ah4Jtro E9AJE6h8txizlGtocDDotvqy5l2TC8CJcWB2COfYOikQYW/HM92NVrAIuT+iLlxocpOu VRij0jvGVMOt/FSbUZtuQtEMWCDkH7PAS09jGKxv6kZai0Q2dlSaLuEFnAllLteTPX6o ZD/h+2XE7otWKt6TXdXioVu82XX76qoudeHRiuPlVLpYPOPYJdhnewsK9ilJqTsRa1ki 5EuyXgVutLp4PCEwo3vpa7VRPA/+lLVEcn5ZgfrOwScysAOMHQx6x1WrZbIkta9g2SEl mu+w== X-Forwarded-Encrypted: i=1; AJvYcCWWJAz+uQWUJ6OiE2fDQJk5K7KhYE8t9p7e/3F8b6FJKgpc91l/czz5q4H5ToCRq67wVLPQC03nsN4QTC2KrKtllMPFT4uWNtRfsI5J X-Gm-Message-State: AOJu0YxIS7a2DIpcCUG8lB1yWSJrZ2wVuTPyyVjplPo8kEM0wPnHOE2t I8+qHjFp/vFkayn5DXiG5TNSo3/LFJDe6gE3raXgIguh31rymS7ZKFFRoZ/LqzQ= X-Google-Smtp-Source: AGHT+IE1gsXGo3HHr2b05fM533KZAA1WTWHmTgSSj4HJQufRdPPcaGIZuIqAuE1QzTHLdkeVhD0mAw== X-Received: by 2002:a05:6870:8997:b0:22a:5690:f056 with SMTP id f23-20020a056870899700b0022a5690f056mr2112618oaq.44.1711404271848; Mon, 25 Mar 2024 15:04:31 -0700 (PDT) Received: from freyr.lechnology.com (ip98-183-112-25.ok.ok.cox.net. [98.183.112.25]) by smtp.gmail.com with ESMTPSA id qa17-20020a056871e71100b0022a05f6647asm1791991oac.24.2024.03.25.15.04.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 15:04:31 -0700 (PDT) From: David Lechner To: Jonathan Cameron Cc: David Lechner , Michael Hennerich , =?utf-8?q?Nuno_S=C3=A1?= , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] iio: adc: ad7944: use spi_optimize_message() Date: Mon, 25 Mar 2024 17:03:13 -0500 Message-ID: <20240325-ad7944-spi-optimize-message-v1-1-cded69b9e27f@baylibre.com> X-Mailer: git-send-email 2.43.2 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" X-Mailer: b4 0.12.4 Content-Transfer-Encoding: quoted-printable This modifies the ad7944 driver to use spi_optimize_message() to reduce CPU usage and increase the max sample rate by avoiding repeating validation of the spi message on each transfer. Signed-off-by: David Lechner --- drivers/iio/adc/ad7944.c | 177 +++++++++++++++++++++++++++----------------= ---- 1 file changed, 103 insertions(+), 74 deletions(-) diff --git a/drivers/iio/adc/ad7944.c b/drivers/iio/adc/ad7944.c index 261a3f645fd8..c767401712af 100644 --- a/drivers/iio/adc/ad7944.c +++ b/drivers/iio/adc/ad7944.c @@ -51,6 +51,8 @@ static const char * const ad7944_spi_modes[] =3D { struct ad7944_adc { struct spi_device *spi; enum ad7944_spi_mode spi_mode; + struct spi_transfer xfers[3]; + struct spi_message msg; /* Chip-specific timing specifications. */ const struct ad7944_timing_spec *timing_spec; /* GPIO connected to CNV pin. */ @@ -130,6 +132,88 @@ AD7944_DEFINE_CHIP_INFO(ad7985, ad7944, 16, 0); /* fully differential */ AD7944_DEFINE_CHIP_INFO(ad7986, ad7986, 18, 1); =20 +static void ad7944_unoptimize_msg(void *msg) +{ + spi_unoptimize_message(msg); +} + +static int ad7944_3wire_cs_mode_init_msg(struct device *dev, struct ad7944= _adc *adc, + const struct iio_chan_spec *chan) +{ + unsigned int t_conv_ns =3D adc->always_turbo ? adc->timing_spec->turbo_co= nv_ns + : adc->timing_spec->conv_ns; + struct spi_transfer *xfers =3D adc->xfers; + int ret; + + /* + * NB: can get better performance from some SPI controllers if we use + * the same bits_per_word in every transfer. + */ + xfers[0].bits_per_word =3D chan->scan_type.realbits; + /* + * CS is tied to CNV and we need a low to high transition to start the + * conversion, so place CNV low for t_QUIET to prepare for this. + */ + xfers[0].delay.value =3D T_QUIET_NS; + xfers[0].delay.unit =3D SPI_DELAY_UNIT_NSECS; + + /* + * CS has to be high for full conversion time to avoid triggering the + * busy indication. + */ + xfers[1].cs_off =3D 1; + xfers[1].delay.value =3D t_conv_ns; + xfers[1].delay.unit =3D SPI_DELAY_UNIT_NSECS; + xfers[0].bits_per_word =3D chan->scan_type.realbits; + + /* Then we can read the data during the acquisition phase */ + xfers[2].rx_buf =3D &adc->sample.raw; + xfers[2].len =3D BITS_TO_BYTES(chan->scan_type.storagebits); + xfers[2].bits_per_word =3D chan->scan_type.realbits; + + spi_message_init_with_transfers(&adc->msg, xfers, 3); + + ret =3D spi_optimize_message(adc->spi, &adc->msg); + if (ret) + return ret; + + return devm_add_action_or_reset(dev, ad7944_unoptimize_msg, &adc->msg); +} + +static int ad7944_4wire_mode_init_msg(struct device *dev, struct ad7944_ad= c *adc, + const struct iio_chan_spec *chan) +{ + unsigned int t_conv_ns =3D adc->always_turbo ? adc->timing_spec->turbo_co= nv_ns + : adc->timing_spec->conv_ns; + struct spi_transfer *xfers =3D adc->xfers; + int ret; + + /* + * NB: can get better performance from some SPI controllers if we use + * the same bits_per_word in every transfer. + */ + xfers[0].bits_per_word =3D chan->scan_type.realbits; + /* + * CS has to be high for full conversion time to avoid triggering the + * busy indication. + */ + xfers[0].cs_off =3D 1; + xfers[0].delay.value =3D t_conv_ns; + xfers[0].delay.unit =3D SPI_DELAY_UNIT_NSECS; + + xfers[1].rx_buf =3D &adc->sample.raw; + xfers[1].len =3D BITS_TO_BYTES(chan->scan_type.storagebits); + xfers[1].bits_per_word =3D chan->scan_type.realbits; + + spi_message_init_with_transfers(&adc->msg, xfers, 3); + + ret =3D spi_optimize_message(adc->spi, &adc->msg); + if (ret) + return ret; + + return devm_add_action_or_reset(dev, ad7944_unoptimize_msg, &adc->msg); +} + /* * ad7944_3wire_cs_mode_conversion - Perform a 3-wire CS mode conversion a= nd * acquisition @@ -145,48 +229,7 @@ AD7944_DEFINE_CHIP_INFO(ad7986, ad7986, 18, 1); static int ad7944_3wire_cs_mode_conversion(struct ad7944_adc *adc, const struct iio_chan_spec *chan) { - unsigned int t_conv_ns =3D adc->always_turbo ? adc->timing_spec->turbo_co= nv_ns - : adc->timing_spec->conv_ns; - struct spi_transfer xfers[] =3D { - { - /* - * NB: can get better performance from some SPI - * controllers if we use the same bits_per_word - * in every transfer. - */ - .bits_per_word =3D chan->scan_type.realbits, - /* - * CS is tied to CNV and we need a low to high - * transition to start the conversion, so place CNV - * low for t_QUIET to prepare for this. - */ - .delay =3D { - .value =3D T_QUIET_NS, - .unit =3D SPI_DELAY_UNIT_NSECS, - }, - - }, - { - .bits_per_word =3D chan->scan_type.realbits, - /* - * CS has to be high for full conversion time to avoid - * triggering the busy indication. - */ - .cs_off =3D 1, - .delay =3D { - .value =3D t_conv_ns, - .unit =3D SPI_DELAY_UNIT_NSECS, - }, - }, - { - /* Then we can read the data during the acquisition phase */ - .rx_buf =3D &adc->sample.raw, - .len =3D BITS_TO_BYTES(chan->scan_type.storagebits), - .bits_per_word =3D chan->scan_type.realbits, - }, - }; - - return spi_sync_transfer(adc->spi, xfers, ARRAY_SIZE(xfers)); + return spi_sync(adc->spi, &adc->msg); } =20 /* @@ -200,33 +243,6 @@ static int ad7944_3wire_cs_mode_conversion(struct ad79= 44_adc *adc, static int ad7944_4wire_mode_conversion(struct ad7944_adc *adc, const struct iio_chan_spec *chan) { - unsigned int t_conv_ns =3D adc->always_turbo ? adc->timing_spec->turbo_co= nv_ns - : adc->timing_spec->conv_ns; - struct spi_transfer xfers[] =3D { - { - /* - * NB: can get better performance from some SPI - * controllers if we use the same bits_per_word - * in every transfer. - */ - .bits_per_word =3D chan->scan_type.realbits, - /* - * CS has to be high for full conversion time to avoid - * triggering the busy indication. - */ - .cs_off =3D 1, - .delay =3D { - .value =3D t_conv_ns, - .unit =3D SPI_DELAY_UNIT_NSECS, - }, - - }, - { - .rx_buf =3D &adc->sample.raw, - .len =3D BITS_TO_BYTES(chan->scan_type.storagebits), - .bits_per_word =3D chan->scan_type.realbits, - }, - }; int ret; =20 /* @@ -234,7 +250,7 @@ static int ad7944_4wire_mode_conversion(struct ad7944_a= dc *adc, * and acquisition process. */ gpiod_set_value_cansleep(adc->cnv, 1); - ret =3D spi_sync_transfer(adc->spi, xfers, ARRAY_SIZE(xfers)); + ret =3D spi_sync(adc->spi, &adc->msg); gpiod_set_value_cansleep(adc->cnv, 0); =20 return ret; @@ -395,10 +411,6 @@ static int ad7944_probe(struct spi_device *spi) adc->spi_mode =3D ret; } =20 - if (adc->spi_mode =3D=3D AD7944_SPI_MODE_CHAIN) - return dev_err_probe(dev, -EINVAL, - "chain mode is not implemented\n"); - /* * Some chips use unusual word sizes, so check now instead of waiting * for the first xfer. @@ -491,6 +503,23 @@ static int ad7944_probe(struct spi_device *spi) return dev_err_probe(dev, -EINVAL, "cannot have both chain mode and always turbo\n"); =20 + switch (adc->spi_mode) { + case AD7944_SPI_MODE_DEFAULT: + ret =3D ad7944_4wire_mode_init_msg(dev, adc, &chip_info->channels[0]); + if (ret) + return ret; + + break; + case AD7944_SPI_MODE_SINGLE: + ret =3D ad7944_3wire_cs_mode_init_msg(dev, adc, &chip_info->channels[0]); + if (ret) + return ret; + + break; + case AD7944_SPI_MODE_CHAIN: + return dev_err_probe(dev, -EINVAL, "chain mode is not implemented\n"); + } + indio_dev->name =3D chip_info->name; indio_dev->modes =3D INDIO_DIRECT_MODE; indio_dev->info =3D &ad7944_iio_info; --- base-commit: 526f7f17b651c78ead26fea7cea20948c00e47a5 change-id: 20240325-ad7944-spi-optimize-message-82debaa2a5a7