Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4465224ybz; Tue, 28 Apr 2020 11:45:13 -0700 (PDT) X-Google-Smtp-Source: APiQypLwOM7YLJPmiCGY2lXK6h7w7nd0edK0O7/dg1UBFtmbSJ5C1kCU9Gc/iSzA7g+lsLQoDjgR X-Received: by 2002:aa7:df0a:: with SMTP id c10mr23845598edy.306.1588099513787; Tue, 28 Apr 2020 11:45:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588099513; cv=none; d=google.com; s=arc-20160816; b=cHDniWKB64w6fIY11swMZaw0E8eNBde6F1enI079SYcINPO37CoDZAbBiwXjEd0gsc IJCnamqf7Ep6gv83bMX6Ak+ROcmBHNRIvCpAQLisYp6dq1x9QMC52d+Yf67+02ug/Cnz KxS5CKXZddQyQpxfGmbputgigNheHzeqILuFgTtgSyFCeEGZbQGLiTQSh7+0+xd9k8pu Ts8fUBg3hokVSYXLLSMHTw5JeZvne7iVjufdU8s+F1jnnKYh4MYfbJJ2UnvPj5CadHd9 eWHx6QQlq6Q7zUx2YkfVu6WUsi6lv0pRQv181sMRe85ley5lWXIIzESMyfZIs0mWaIGJ qewg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=26u8z2waTNHHBbR7mKrKnR5r8Ftj1Yp3uXWwtaBeYUM=; b=dFi8pQKRgciN/oVyenf/Zu003GJmgJIPGz6H470dWwMoz2jTxiFxdt3Pv9xR+uBf1N KoejA1gO34bVq4V0LgJn76rAW0vSAb7pLjyJM4PgX9j9vMrn587l6V/ZcwyjrjhH+u6z OEAmy4f4tMFsY7vRkgBXTZlNH925JBFze1pN4odHY6Q69wmBn2cdo2qH8hCxsMmNlfcz corfeA58IsB6pAQyF37LD45Ld0UrDlfNsNJJ9bDbyyinDdhWeytvGGmAOuJuR3sShuA3 ecO/QSQV8EtoFkbln7mqyXb/XALD9dRwSIkBXUiAOT2dtwQUFo00Q0YDd5skCBvSuidn a/iA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LZQSw8gj; 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 y89si2200499edy.357.2020.04.28.11.44.50; Tue, 28 Apr 2020 11:45:13 -0700 (PDT) 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; dkim=pass header.i=@kernel.org header.s=default header.b=LZQSw8gj; 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 S1730393AbgD1Slh (ORCPT + 99 others); Tue, 28 Apr 2020 14:41:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:33120 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731004AbgD1Sle (ORCPT ); Tue, 28 Apr 2020 14:41:34 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D35782085B; Tue, 28 Apr 2020 18:41:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588099293; bh=hOYDr3W9wY/JWlZ8DY1wJ2I7TR7v+K/j8Rp2MUsSRnY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LZQSw8gj9IE0lwp1utX57GFS7KUCbPFi7dD4KYdDtPhGf++pyNEhtE+jpWCnenvrh ipqcnsR/LTwftHAgPrIRIQCZrB52O892VxKMyhFRaETpDApSeN84EgYgZ2u48fbCAB FAUJo96zK4U/elSrmTCzK/dHy3iAiQqoGbKZJmNw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Olivier Moysan , Fabrice Gasnier , Stable@vger.kernel.org, Jonathan Cameron Subject: [PATCH 5.4 089/168] iio: adc: stm32-adc: fix sleep in atomic context Date: Tue, 28 Apr 2020 20:24:23 +0200 Message-Id: <20200428182243.588223414@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200428182231.704304409@linuxfoundation.org> References: <20200428182231.704304409@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Olivier Moysan commit e2042d2936dfc84e9c600fe9b9d0039ca0e54b7d upstream. This commit fixes the following error: "BUG: sleeping function called from invalid context at kernel/irq/chip.c" In DMA mode suppress the trigger irq handler, and make the buffer transfers directly in DMA callback, instead. Fixes: 2763ea0585c9 ("iio: adc: stm32: add optional dma support") Signed-off-by: Olivier Moysan Acked-by: Fabrice Gasnier Cc: Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- drivers/iio/adc/stm32-adc.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) --- a/drivers/iio/adc/stm32-adc.c +++ b/drivers/iio/adc/stm32-adc.c @@ -1367,8 +1367,30 @@ static unsigned int stm32_adc_dma_residu static void stm32_adc_dma_buffer_done(void *data) { struct iio_dev *indio_dev = data; + struct stm32_adc *adc = iio_priv(indio_dev); + int residue = stm32_adc_dma_residue(adc); + + /* + * 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). + */ + dev_dbg(&indio_dev->dev, "%s bufi=%d\n", __func__, adc->bufi); + + while (residue >= indio_dev->scan_bytes) { + u16 *buffer = (u16 *)&adc->rx_buf[adc->bufi]; - iio_trigger_poll_chained(indio_dev->trig); + iio_push_to_buffers(indio_dev, buffer); + + residue -= indio_dev->scan_bytes; + adc->bufi += indio_dev->scan_bytes; + if (adc->bufi >= adc->rx_buf_sz) + adc->bufi = 0; + } } static int stm32_adc_dma_start(struct iio_dev *indio_dev) @@ -1778,6 +1800,7 @@ static int stm32_adc_probe(struct platfo { struct iio_dev *indio_dev; struct device *dev = &pdev->dev; + irqreturn_t (*handler)(int irq, void *p) = NULL; struct stm32_adc *adc; int ret; @@ -1843,9 +1866,11 @@ static int stm32_adc_probe(struct platfo if (ret < 0) return ret; + if (!adc->dma_chan) + handler = &stm32_adc_trigger_handler; + ret = iio_triggered_buffer_setup(indio_dev, - &iio_pollfunc_store_time, - &stm32_adc_trigger_handler, + &iio_pollfunc_store_time, handler, &stm32_adc_buffer_setup_ops); if (ret) { dev_err(&pdev->dev, "buffer setup failed\n");