Linux-ARM-Kernel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Heiko Stuebner <heiko@sntech.de>
To: broonie@kernel.org
Cc: Heiko Stuebner <heiko@sntech.de>,
	linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org, quentin.schulz@cherry.de,
	Lee Jones <lee@kernel.org>,
	Sebastian Reichel <sebastian.reichel@collabora.com>,
	Heiko Stuebner <heiko.stuebner@cherry.de>
Subject: [PATCH v3 2/7] spi: Allow spi_delay_exec() to be used from atomic contexts
Date: Wed, 18 Nov 2026 00:50:16 +0100	[thread overview]
Message-ID: <20261117235021.2013719-3-heiko@sntech.de> (raw)
In-Reply-To: <20261117235021.2013719-1-heiko@sntech.de>

From: Heiko Stuebner <heiko.stuebner@cherry.de>

When using spi_delay_exec() only the fsleep in the subsequent
_spi_transfer_delay_ns() can actually sleep.

As we might want to use spi_delay_exec() from atomic contexts in the
future, move the might_sleep() up to the actual place that matters
and fall back to the existing ndelay if called from an atomic context.

Signed-off-by: Heiko Stuebner <heiko.stuebner@cherry.de>
---
 drivers/spi/spi.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 3aeee3b11c0c..8a82d7f5b9fa 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1714,11 +1714,12 @@ static void _spi_transfer_delay_ns(u32 ns)
 {
 	if (!ns)
 		return;
-	if (ns <= NSEC_PER_USEC) {
+	if (ns <= NSEC_PER_USEC || spi_in_atomic()) {
 		ndelay(ns);
 	} else {
 		u32 us = DIV_ROUND_UP(ns, NSEC_PER_USEC);
 
+		might_sleep();
 		fsleep(us);
 	}
 }
@@ -1766,8 +1767,6 @@ int spi_delay_exec(struct spi_delay *_delay, struct spi_transfer *xfer)
 {
 	int delay;
 
-	might_sleep();
-
 	if (!_delay)
 		return -EINVAL;
 
-- 
2.53.0



  parent reply	other threads:[~2026-11-17 23:50 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17 23:50 [PATCH v3 0/7] spi: Implement a atomic transfer as a last resort Heiko Stuebner
2026-11-17 23:50 ` [PATCH v3 1/7] spi: Allow spi_toggle_csgpiod() to get called from atomic contexts Heiko Stuebner
2026-11-17 23:50 ` Heiko Stuebner [this message]
2026-11-17 23:50 ` [PATCH v3 3/7] spi: Export spi_set_cs() function Heiko Stuebner
2026-11-17 23:50 ` [PATCH v3 4/7] spi: Add infrastructure for atomic sync transfers Heiko Stuebner
2026-11-17 23:50 ` [PATCH v3 5/7] spi: rockchip: Fix runtime resume error handling Heiko Stuebner
2026-11-17 23:50 ` [PATCH v3 6/7] spi: rockchip: Move to pm_runtime_resume_and_get Heiko Stuebner
2026-11-17 23:50 ` [PATCH v3 7/7] spi: rockchip: Add an atomic transfer function Heiko Stuebner

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=20261117235021.2013719-3-heiko@sntech.de \
    --to=heiko@sntech.de \
    --cc=broonie@kernel.org \
    --cc=heiko.stuebner@cherry.de \
    --cc=lee@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=linux-spi@vger.kernel.org \
    --cc=quentin.schulz@cherry.de \
    --cc=sebastian.reichel@collabora.com \
    /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