stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Olivier Moysan <olivier.moysan@st.com>,
	Stable@vger.kernel.org,
	Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: [PATCH 5.4 061/102] iio: adc: stm32-dfsdm: fix sleep in atomic context
Date: Tue, 24 Mar 2020 14:10:53 +0100	[thread overview]
Message-ID: <20200324130812.848303537@linuxfoundation.org> (raw)
In-Reply-To: <20200324130806.544601211@linuxfoundation.org>

From: Olivier Moysan <olivier.moysan@st.com>

commit e19ac9d9a978f8238a85a28ed624094a497d5ae6 upstream.

This commit fixes the error message:
"BUG: sleeping function called from invalid context at kernel/irq/chip.c"
Suppress the trigger irq handler. Make the buffer transfers directly
in DMA callback, instead.
Push buffers without timestamps, as timestamps are not supported
in DFSDM driver.

Fixes: 11646e81d775 ("iio: adc: stm32-dfsdm: add support for buffer modes")

Signed-off-by: Olivier Moysan <olivier.moysan@st.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/iio/adc/stm32-dfsdm-adc.c |   43 ++++++++------------------------------
 1 file changed, 10 insertions(+), 33 deletions(-)

--- a/drivers/iio/adc/stm32-dfsdm-adc.c
+++ b/drivers/iio/adc/stm32-dfsdm-adc.c
@@ -842,31 +842,6 @@ static inline void stm32_dfsdm_process_d
 	}
 }
 
-static irqreturn_t stm32_dfsdm_adc_trigger_handler(int irq, void *p)
-{
-	struct iio_poll_func *pf = p;
-	struct iio_dev *indio_dev = pf->indio_dev;
-	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
-	int available = stm32_dfsdm_adc_dma_residue(adc);
-
-	while (available >= indio_dev->scan_bytes) {
-		s32 *buffer = (s32 *)&adc->rx_buf[adc->bufi];
-
-		stm32_dfsdm_process_data(adc, buffer);
-
-		iio_push_to_buffers_with_timestamp(indio_dev, buffer,
-						   pf->timestamp);
-		available -= indio_dev->scan_bytes;
-		adc->bufi += indio_dev->scan_bytes;
-		if (adc->bufi >= adc->buf_sz)
-			adc->bufi = 0;
-	}
-
-	iio_trigger_notify_done(indio_dev->trig);
-
-	return IRQ_HANDLED;
-}
-
 static void stm32_dfsdm_dma_buffer_done(void *data)
 {
 	struct iio_dev *indio_dev = data;
@@ -874,11 +849,6 @@ static void stm32_dfsdm_dma_buffer_done(
 	int available = stm32_dfsdm_adc_dma_residue(adc);
 	size_t old_pos;
 
-	if (indio_dev->currentmode & INDIO_BUFFER_TRIGGERED) {
-		iio_trigger_poll_chained(indio_dev->trig);
-		return;
-	}
-
 	/*
 	 * FIXME: In Kernel interface does not support cyclic DMA buffer,and
 	 * offers only an interface to push data samples per samples.
@@ -906,7 +876,15 @@ static void stm32_dfsdm_dma_buffer_done(
 			adc->bufi = 0;
 			old_pos = 0;
 		}
-		/* regular iio buffer without trigger */
+		/*
+		 * In DMA mode the trigger services of IIO are not used
+		 * (e.g. no call to iio_trigger_poll).
+		 * Calling irq handler associated to the hardware trigger is not
+		 * relevant as the conversions have already been done. Data
+		 * transfers are performed directly in DMA callback instead.
+		 * This implementation avoids to call trigger irq handler that
+		 * may sleep, in an atomic context (DMA irq handler context).
+		 */
 		if (adc->dev_data->type == DFSDM_IIO)
 			iio_push_to_buffers(indio_dev, buffer);
 	}
@@ -1517,8 +1495,7 @@ static int stm32_dfsdm_adc_init(struct i
 	}
 
 	ret = iio_triggered_buffer_setup(indio_dev,
-					 &iio_pollfunc_store_time,
-					 &stm32_dfsdm_adc_trigger_handler,
+					 &iio_pollfunc_store_time, NULL,
 					 &stm32_dfsdm_buffer_setup_ops);
 	if (ret) {
 		stm32_dfsdm_dma_release(indio_dev);



  parent reply	other threads:[~2020-03-24 13:18 UTC|newest]

Thread overview: 106+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-24 13:09 [PATCH 5.4 000/102] 5.4.28-rc1 review Greg Kroah-Hartman
2020-03-24 13:09 ` [PATCH 5.4 001/102] locks: fix a potential use-after-free problem when wakeup a waiter Greg Kroah-Hartman
2020-03-24 13:09 ` [PATCH 5.4 002/102] locks: reinstate locks_delete_block optimization Greg Kroah-Hartman
2020-03-24 13:09 ` [PATCH 5.4 003/102] spi: spi-omap2-mcspi: Support probe deferral for DMA channels Greg Kroah-Hartman
2020-03-24 13:09 ` [PATCH 5.4 004/102] drm/mediatek: Find the cursor plane instead of hard coding it Greg Kroah-Hartman
2020-03-24 13:09 ` [PATCH 5.4 005/102] phy: ti: gmii-sel: fix set of copy-paste errors Greg Kroah-Hartman
2020-03-24 13:09 ` [PATCH 5.4 006/102] phy: ti: gmii-sel: do not fail in case of gmii Greg Kroah-Hartman
2020-03-24 13:09 ` [PATCH 5.4 007/102] ARM: dts: dra7-l4: mark timer13-16 as pwm capable Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 008/102] spi: qup: call spi_qup_pm_resume_runtime before suspending Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 009/102] powerpc: Include .BTF section Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 010/102] cifs: fix potential mismatch of UNC paths Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 011/102] cifs: add missing mount option to /proc/mounts Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 012/102] ARM: dts: dra7: Add "dma-ranges" property to PCIe RC DT nodes Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 013/102] spi: pxa2xx: Add CS control clock quirk Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 014/102] spi/zynqmp: remove entry that causes a cs glitch Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 015/102] drm/exynos: dsi: propagate error value and silence meaningless warning Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 016/102] drm/exynos: dsi: fix workaround for the legacy clock name Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 017/102] drm/exynos: hdmi: dont leak enable HDMI_EN regulator if probe fails Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 018/102] drivers/perf: fsl_imx8_ddr: Correct the CLEAR bit definition Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 019/102] drivers/perf: arm_pmu_acpi: Fix incorrect checking of gicc pointer Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 020/102] altera-stapl: altera_get_note: prevent write beyond end of key Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 021/102] dm bio record: save/restore bi_end_io and bi_integrity Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 022/102] dm integrity: use dm_bio_record and dm_bio_restore Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 023/102] riscv: avoid the PIC offset of static percpu data in module beyond 2G limits Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 024/102] ASoC: stm32: sai: manage rebind issue Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 025/102] spi: spi_register_controller(): free bus id on error paths Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 026/102] riscv: Force flat memory model with no-mmu Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 027/102] riscv: Fix range looking for kernel image memblock Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 028/102] drm/amdgpu: clean wptr on wb when gpu recovery Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 029/102] drm/amd/display: Clear link settings on MST disable connector Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 030/102] drm/amd/display: fix dcc swath size calculations on dcn1 Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 031/102] xenbus: req->body should be updated before req->state Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 032/102] xenbus: req->err " Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 033/102] block, bfq: fix overwrite of bfq_group pointer in bfq_find_set_group() Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 034/102] parse-maintainers: Mark as executable Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 035/102] binderfs: use refcount for binder control devices too Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 036/102] Revert "drm/fbdev: Fallback to non tiled mode if all tiles not present" Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 037/102] USB: Disable LPM on WD19s Realtek Hub Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 038/102] usb: quirks: add NO_LPM quirk for RTL8153 based ethernet adapters Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 039/102] USB: serial: option: add ME910G1 ECM composition 0x110b Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 040/102] usb: host: xhci-plat: add a shutdown Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 041/102] USB: serial: pl2303: add device-id for HP LD381 Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 042/102] usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller 1022:145c Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 043/102] usb: typec: ucsi: displayport: Fix NULL pointer dereference Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 044/102] usb: typec: ucsi: displayport: Fix a potential race during registration Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 045/102] USB: cdc-acm: fix close_delay and closing_wait units in TIOCSSERIAL Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 046/102] USB: cdc-acm: fix rounding error " Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 047/102] ALSA: line6: Fix endless MIDI read loop Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 048/102] ALSA: hda/realtek - Enable headset mic of Acer X2660G with ALC662 Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 049/102] ALSA: hda/realtek - Enable the headset of Acer N50-600 " Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 050/102] ALSA: seq: virmidi: Fix running status after receiving sysex Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 051/102] ALSA: seq: oss: " Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 052/102] ALSA: pcm: oss: Avoid plugin buffer overflow Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 053/102] ALSA: pcm: oss: Remove WARNING from snd_pcm_plug_alloc() checks Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 054/102] tty: fix compat TIOCGSERIAL leaking uninitialized memory Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 055/102] tty: fix compat TIOCGSERIAL checking wrong function ptr Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 056/102] iio: chemical: sps30: fix missing triggered buffer dependency Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 057/102] iio: st_sensors: remap SMO8840 to LIS2DH12 Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 058/102] iio: trigger: stm32-timer: disable master mode when stopping Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 059/102] iio: accel: adxl372: Set iio_chan BE Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 060/102] iio: magnetometer: ak8974: Fix negative raw values in sysfs Greg Kroah-Hartman
2020-03-24 13:10 ` Greg Kroah-Hartman [this message]
2020-03-24 13:10 ` [PATCH 5.4 062/102] iio: adc: at91-sama5d2_adc: fix differential channels in triggered mode Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 063/102] iio: light: vcnl4000: update sampling periods for vcnl4200 Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 064/102] iio: light: vcnl4000: update sampling periods for vcnl4040 Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 065/102] mmc: rtsx_pci: Fix support for speed-modes that relies on tuning Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 066/102] mmc: sdhci-of-at91: fix cd-gpios for SAMA5D2 Greg Kroah-Hartman
2020-03-24 13:10 ` [PATCH 5.4 067/102] mmc: sdhci-cadence: set SDHCI_QUIRK2_PRESET_VALUE_BROKEN for UniPhier Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 068/102] CIFS: fiemap: do not return EINVAL if get nothing Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 069/102] kbuild: Disable -Wpointer-to-enum-cast Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 070/102] staging: rtl8188eu: Add device id for MERCUSYS MW150US v2 Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 071/102] staging: greybus: loopback_test: fix poll-mask build breakage Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 072/102] staging/speakup: fix get_word non-space look-ahead Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 073/102] intel_th: msu: Fix the unexpected state warning Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 074/102] intel_th: Fix user-visible error codes Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 075/102] intel_th: pci: Add Elkhart Lake CPU support Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 076/102] modpost: move the namespace field in Module.symvers last Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 077/102] rtc: max8907: add missing select REGMAP_IRQ Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 078/102] arm64: compat: Fix syscall number of compat_clock_getres Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 079/102] xhci: Do not open code __print_symbolic() in xhci trace events Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 080/102] btrfs: fix log context list corruption after rename whiteout error Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 081/102] drm/amd/amdgpu: Fix GPR read from debugfs (v2) Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 082/102] drm/lease: fix WARNING in idr_destroy Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 083/102] stm class: sys-t: Fix the use of time_after() Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 084/102] memcg: fix NULL pointer dereference in __mem_cgroup_usage_unregister_event Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 085/102] mm, memcg: fix corruption on 64-bit divisor in memory.high throttling Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 086/102] mm, memcg: throttle allocators based on ancestral memory.high Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 087/102] mm/hotplug: fix hot remove failure in SPARSEMEM|!VMEMMAP case Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 088/102] mm: do not allow MADV_PAGEOUT for CoW pages Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 089/102] epoll: fix possible lost wakeup on epoll_ctl() path Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 090/102] mm: slub: be more careful about the double cmpxchg of freelist Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 091/102] mm, slub: prevent kmalloc_node crashes and memory leaks Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 092/102] page-flags: fix a crash at SetPageError(THP_SWAP) Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 093/102] x86/mm: split vmalloc_sync_all() Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 094/102] futex: Fix inode life-time issue Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 095/102] futex: Unbreak futex hashing Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 096/102] ALSA: hda/realtek: Fix pop noise on ALC225 Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 097/102] arm64: smp: fix smp_send_stop() behaviour Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 098/102] arm64: smp: fix crash_smp_send_stop() behaviour Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 099/102] nvmet-tcp: set MSG_MORE only if we actually have more to send Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 100/102] drm/bridge: dw-hdmi: fix AVI frame colorimetry Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 101/102] staging: greybus: loopback_test: fix potential path truncation Greg Kroah-Hartman
2020-03-24 13:11 ` [PATCH 5.4 102/102] staging: greybus: loopback_test: fix potential path truncations Greg Kroah-Hartman
2020-03-24 19:49 ` [PATCH 5.4 000/102] 5.4.28-rc1 review shuah
2020-03-24 20:56 ` Guenter Roeck
2020-03-25  5:15 ` Naresh Kamboju

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200324130812.848303537@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=olivier.moysan@st.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).