Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp418742pxb; Thu, 21 Jan 2021 10:07:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzMpzcu3eDHcYWKltIeYAPwGU2DcKAtw4f4yK+9RAXgKzBEGkD/w1kIMf/rrTcFSH7MNPIA X-Received: by 2002:a17:907:c01:: with SMTP id ga1mr450128ejc.488.1611252421393; Thu, 21 Jan 2021 10:07:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611252421; cv=none; d=google.com; s=arc-20160816; b=DKkyM7sn5HKdASqtGRCSO1WpDg/Lc5eTTrgkxYwV09O7gRDrveqzXwyb8HLhuNh9ff vB9ePHhDP0KB2VgIAI8FI8As8Fv0RUE/QwZlUexerqNQN49BI5X5J5EZk4VovzmJ3nvT dxFVp0Q9c6Jf8OmLtUMiEHZy9pPWm4wzdFuNxFzh3Y8S9DuVpPekZBwty61k2klZUX9q R51mHvXtoHFByO4RsQ/PEiknBe1cqwwC/p++JGqgvOjhn/Qz+1enOabpufDUXMgIztHN 93KOX9r+iInGL5LTrc4GeSF8pfGmWBNN7qKAxRE1tgkXPcRdIKv2MRdEb5So51R1X5j0 L54g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=o/JZhyxqQ/PjU+enHrT0/8PvRlz4LWzcT10+tQN5If0=; b=CSb6++BKQHa/5DKU/dMlGC5GguwrBK4w9bAPR9ZJIQDaKSv4Itk7c3z68pOdKr6Csy yn6+ZVPOqeNNly7mjO4tKw46kogiSGJ+QyjCS3Il8nkxVx7/FP4W+HbAKCUv69qAYB/2 ne1rHHWWxtxyTpM8oESQEJnSW77bG8DVJShEfiAm4YO771cl6DbsIsDDNXI6q0q22B71 3AE8d2+azzi5y03ihAUl6KL7Om2zlSo62uHfKPfCgRZp8I1nnDp1r5IyH3oAjmBFSTpK DCWtPF8Rx1QwBXW+UaP6/HxfeG0iT5BlqgzcuqoXggeHs/TMNS81zEqrjxpxm0m1mQQL pVXw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cd24si2030960ejb.666.2021.01.21.10.06.35; Thu, 21 Jan 2021 10:07:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731858AbhAUSDu (ORCPT + 99 others); Thu, 21 Jan 2021 13:03:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389517AbhAUSDW (ORCPT ); Thu, 21 Jan 2021 13:03:22 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8AE3C0613D6 for ; Thu, 21 Jan 2021 10:02:42 -0800 (PST) Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l2eHw-0003po-Es; Thu, 21 Jan 2021 19:02:32 +0100 Received: from afa by dude.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1l2eHt-0007zB-Mn; Thu, 21 Jan 2021 19:02:29 +0100 From: Ahmad Fatoum To: Jonathan Cameron , Lars-Peter Clausen , Peter Meerwald-Stadler , Maxime Coquelin , Alexandre Torgue Cc: kernel@pengutronix.de, Holger Assmann , Ahmad Fatoum , linux-iio@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] iio: adc: stm32-adc: enable timestamping for non-DMA usage Date: Thu, 21 Jan 2021 19:02:28 +0100 Message-Id: <20210121180228.30621-1-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: afa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For non-DMA usage, we have an easy way to associate a timestamp with a sample: iio_pollfunc_store_time stores a timestamp in the primary trigger IRQ handler and stm32_adc_trigger_handler runs in the IRQ thread to push out the buffer along with the timestamp. For this to work, the driver needs to register an IIO_TIMESTAMP channel. Do this. For DMA, it's not as easy, because we don't push the buffers out of stm32_adc_trigger, but out of stm32_adc_dma_buffer_done, which runs in a tasklet scheduled after a DMA completion. Preferably, the DMA controller would copy us the timestamp into that buffer as well. Until this is implemented, restrict timestamping support to only PIO. For low-frequency sampling, PIO is probably good enough. Cc: Holger Assmann Signed-off-by: Ahmad Fatoum --- drivers/iio/adc/stm32-adc.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c index c067c994dae2..91d9483e1f5f 100644 --- a/drivers/iio/adc/stm32-adc.c +++ b/drivers/iio/adc/stm32-adc.c @@ -1718,7 +1718,7 @@ static void stm32_adc_chan_init_one(struct iio_dev *indio_dev, } } -static int stm32_adc_chan_of_init(struct iio_dev *indio_dev) +static int stm32_adc_chan_of_init(struct iio_dev *indio_dev, bool timestamping) { struct device_node *node = indio_dev->dev.of_node; struct stm32_adc *adc = iio_priv(indio_dev); @@ -1766,6 +1766,9 @@ static int stm32_adc_chan_of_init(struct iio_dev *indio_dev) return -EINVAL; } + if (timestamping) + num_channels++; + channels = devm_kcalloc(&indio_dev->dev, num_channels, sizeof(struct iio_chan_spec), GFP_KERNEL); if (!channels) @@ -1816,6 +1819,19 @@ static int stm32_adc_chan_of_init(struct iio_dev *indio_dev) stm32_adc_smpr_init(adc, channels[i].channel, smp); } + if (timestamping) { + struct iio_chan_spec *timestamp = &channels[scan_index]; + + timestamp->type = IIO_TIMESTAMP; + timestamp->channel = -1; + timestamp->scan_index = scan_index; + timestamp->scan_type.sign = 's'; + timestamp->scan_type.realbits = 64; + timestamp->scan_type.storagebits = 64; + + scan_index++; + } + indio_dev->num_channels = scan_index; indio_dev->channels = channels; @@ -1875,6 +1891,7 @@ static int stm32_adc_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; irqreturn_t (*handler)(int irq, void *p) = NULL; struct stm32_adc *adc; + bool timestamping = false; int ret; if (!pdev->dev.of_node) @@ -1931,16 +1948,18 @@ static int stm32_adc_probe(struct platform_device *pdev) if (ret < 0) return ret; - ret = stm32_adc_chan_of_init(indio_dev); - if (ret < 0) - return ret; - ret = stm32_adc_dma_request(dev, indio_dev); if (ret < 0) return ret; - if (!adc->dma_chan) + if (!adc->dma_chan) { handler = &stm32_adc_trigger_handler; + timestamping = true; + } + + ret = stm32_adc_chan_of_init(indio_dev, timestamping); + if (ret < 0) + return ret; ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time, handler, -- 2.30.0