From: Alan Previn <alan.previn.teres.alexis@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>,
dri-devel@lists.freedesktop.org,
Matt Roper <matthew.d.roper@intel.com>
Subject: [PATCH] drm/xe/mmio: Fix xe_mmio_wait32() to honor delay/sleep maximums
Date: Mon, 7 Sep 2026 16:55:23 -0700 [thread overview]
Message-ID: <20260907235524.7807-2-alan.previn.teres.alexis@intel.com> (raw)
Check for overflow in udelay/usleep_range use in __xe_mmio_wait32
and pick the correct helper accordingly. Fix sign-overflow and avoid
growing delays becoming intollerably large by capping the in-loop
wait time. Simplify sleep_min assignment by removing redundant cast.
Fixes: 5c09bd6ccd41 ("drm/xe/mmio: Move xe_mmio_wait32() to xe_mmio.c")
Signed-off-by: Alan Previn <alan.previn.teres.alexis@intel.com>
Assisted-by: Github-Copilot:Claude-Sonnet-4-6
---
drivers/gpu/drm/xe/xe_mmio.c | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c
index 7fa18dfcb5a2..cf2e05aaa4b2 100644
--- a/drivers/gpu/drm/xe/xe_mmio.c
+++ b/drivers/gpu/drm/xe/xe_mmio.c
@@ -349,11 +349,23 @@ static int __xe_mmio_wait32(struct xe_mmio *mmio, struct xe_reg reg, u32 mask, u
if (ktime_after(ktime_add_us(cur, wait), end))
wait = ktime_us_delta(end, cur);
- if (atomic)
- udelay(wait);
- else
- usleep_range(wait, wait << 1);
- wait <<= 1;
+#define __XE_MMIO_WAIT_MAX_INLOOP_TIME (100 * USEC_PER_MSEC)
+ if (atomic) {
+ if (wait <= MAX_UDELAY_MS * USEC_PER_MSEC)
+ udelay(wait);
+ else
+ mdelay(DIV_ROUND_UP(wait, USEC_PER_MSEC));
+ } else {
+ usleep_range(wait, __XE_MMIO_WAIT_MAX_INLOOP_TIME);
+ }
+ /*
+ * As we keep doubling the wait time for every check that fails, cap the
+ * in-loop delay-or-sleep to less than 2x 100 miliseconds to prevent from
+ * expanding 'wait' into exponentially longer wait times per loop that
+ * end up delaying the next completion check way later than tolerable.
+ */
+ wait = wait < __XE_MMIO_WAIT_MAX_INLOOP_TIME >> 1 ?
+ wait << 1 : __XE_MMIO_WAIT_MAX_INLOOP_TIME;
}
if (ret != 0) {
base-commit: 71bc3b7cc55631a9b3807da98e2b2880838b9623
--
2.43.0
next reply other threads:[~2026-09-07 23:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-07 23:55 Alan Previn [this message]
2026-09-08 0:01 ` ✗ CI.checkpatch: warning for drm/xe/mmio: Fix xe_mmio_wait32() to honor delay/sleep maximums Patchwork
2026-09-08 0:02 ` [PATCH] " sashiko-bot
2026-09-08 0:03 ` ✓ CI.KUnit: success for " Patchwork
2026-09-08 0:41 ` ✓ Xe.CI.BAT: " Patchwork
2026-09-08 4:22 ` ✗ Xe.CI.FULL: failure " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2026-09-08 18:56 [PATCH] " Alan Previn
2026-09-08 19:03 ` sashiko-bot
2026-09-09 8:00 ` Jani Nikula
2026-09-11 0:05 ` Teres Alexis, Alan Previn
2026-09-08 20:33 Alan Previn
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=20260907235524.7807-2-alan.previn.teres.alexis@intel.com \
--to=alan.previn.teres.alexis@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=matthew.d.roper@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.