From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9742ECD8CA8 for ; Sat, 13 Jun 2026 06:58:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F277310ECA2; Sat, 13 Jun 2026 06:58:40 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NzVE9duA"; dkim-atps=neutral Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1F5A010ECA2 for ; Sat, 13 Jun 2026 06:58:39 +0000 (UTC) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-490be29c1c5so18026365e9.2 for ; Fri, 12 Jun 2026 23:58:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781333918; x=1781938718; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=O65kp4uYeS0m80wrjHhLdSErrpFdma2VMG6AHvedRp8=; b=NzVE9duAOPWP/MCiYt5ZEd0mrkddNwhtnEUtWRFigTVVVH42CF0yNScQUnKYQe7arE 7aA4rX9eUSUcVVx7HC7cR+VKB+FfyRdCsz/4TSrU5qlrJfyuMlPKzvtt18tBAEdRUuJa Nnk+DyuR7kAHsURDLnlVnQT2ZkJMCZPgdo0Uync7p3RV9b6/wVVjYKVU92GbUbkP3Gal EowHd22keFvkfSjYtpBmAmO+cp615rTeArHoZhHc9uvwyldlb6KbwwwOSBUQbc5Ca5ng tDuFvqihQNQmH5wMrkYyVFQzLCRW69vJyCvOLuLC9AmMpMJeqpx1k4nDUPZh2yuKMMYc +QzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781333918; x=1781938718; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=O65kp4uYeS0m80wrjHhLdSErrpFdma2VMG6AHvedRp8=; b=CtdT0Dx7Zg3sNqLS4oTGHB2XDbVdAWB03EjeSWyb47P0YYMre8Wc8U3ew/70imiaM4 RURPEDG7wH9tyCiZs0yYHGAfZfoxMRVK9KQzDaATRo0MPHi8OLXyxKuio0wuEZoBisq1 K0S4mO6NEbR1QXsHR5ys52wkxL1iaQ8x8+XUMxzs8cBmlXxU/53W0w/A4cwdCtnMJ2Yi 4PSuo/ADfpELpzSD7R/4R6tvkcm7oh8km5mQatZrRQgqCRY1NPbSnnZdOx3usySrBjYj 2Q7xRF3DsAGfR/jcLymuoUT4qbJyl+Idk3u6uKJArXaChZnVf6lvCLM1RjlX1J7RmGmJ 4MQg== X-Gm-Message-State: AOJu0Yxv3AKbhxXlbjR6FRnRJoE614uB9iCouRR4L2d59H67gkY1/KB4 qsUzCG+QwvJ4gFmL0ZQ7Hd9ib1Gipf9f6liSqSC4BNUREFOn+xBIshLx X-Gm-Gg: Acq92OHsPEWaPH/sTvOU4wOA3aTB9Og3SXl1kQr0714dmwiPrEmeQ28Be9DIdc4sYrn OJHXLUZL9HZtAqiQvBWS+BLY6YmAp37JE0bvEdYa/3BpAv9XVJvLcDJXXNfhnJeVOgVMW9/iHYv mpne3kTLBZtAQrW3TzzLQSg4ee1T+FZ+929WVEpj4OuDFeHIj6WRppIYE7Jo0sbuhzvL/CscUyW NxIz2c4ffmAwySgn6KoZ79jQ5mAuAHVHhX8Po07Uo6EpW5HSbnbzFvF+pvLLdVPCpYqWZh/DcFd cVJ9aAgE2UeO+WiAhCqlx+Q1gnnUhqh3EuZR8WGI/tqQQoo+qW5L2D6IZgLZtE/bQJk0fClBHRB 168F8kda47/C67ELqzLmF36KHzXfeb1rsNn0j+j/u7jcwOO0wcR6jiL9Qco1lfeHjAF//Y8sach qh1QF40cdPNMEZLhUKAoKhZjt/MEanecPzVS7DcGk4Qdf4IMtT/NRX X-Received: by 2002:a05:600c:5296:b0:492:1e7f:d426 with SMTP id 5b1f17b1804b1-4921e7fd54bmr38722125e9.2.1781333917619; Fri, 12 Jun 2026 23:58:37 -0700 (PDT) Received: from debian.tailb81abf.ts.net ([2a01:e0a:104a:4d80:14c0:9448:1c38:77df]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-492202e5cbasm42917705e9.2.2026.06.12.23.58.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 23:58:37 -0700 (PDT) From: MidG971 To: tomeu@tomeuvizoso.net, ogabbay@kernel.org, heiko@sntech.de, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, ulf.hansson@linaro.org Cc: dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, xxm@rock-chips.com, chaoyi.chen@rock-chips.com, finley.xiao@rock-chips.com, diederik@cknow-tech.com, jonas@kwiboo.se, Midgy BALON Subject: [RFC PATCH v4 5/9] accel: rocket: Keep the IOMMU domain attached across jobs Date: Sat, 13 Jun 2026 09:01:12 +0200 Message-Id: <20260613070116.438906-6-midgy971@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260613070116.438906-1-midgy971@gmail.com> References: <20260613070116.438906-1-midgy971@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Midgy BALON rocket attached the job's IOMMU domain in rocket_job_run() and detached it again on every completion and reset. Each attach/detach toggles the rk_iommu stall/force-reset/paging handshake, and on RK3568 the NPU MMU is idle between jobs, so that handshake times out and logs a burst of "stall/paging request timed out" errors for every job. Attach the per-context domain once and keep it: track the attached domain in the core, swap it only when a job from a different context runs, and detach it at core teardown. A reference on the attached domain is held so it outlives the job that first attached it and is released on swap/teardown. Because a hardware reset (on job timeout) wipes the IOMMU page-table base register, drop the attached domain after rocket_core_reset() so the next job re-attaches and reprograms it. Also tear down the scheduler before detaching the IOMMU in rocket_core_fini(), so an in-flight job can no longer reach the domain being detached. Signed-off-by: Midgy BALON --- drivers/accel/rocket/rocket_core.c | 14 +++++++++++- drivers/accel/rocket/rocket_core.h | 3 +++ drivers/accel/rocket/rocket_job.c | 35 +++++++++++++++++++++++++----- 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/drivers/accel/rocket/rocket_core.c b/drivers/accel/rocket/rocket_core.c index 779e951596a15..6c128f585cff4 100644 --- a/drivers/accel/rocket/rocket_core.c +++ b/drivers/accel/rocket/rocket_core.c @@ -13,6 +13,7 @@ #include #include "rocket_core.h" +#include "rocket_drv.h" #include "rocket_job.h" int rocket_core_init(struct rocket_core *core) @@ -112,9 +113,20 @@ void rocket_core_fini(struct rocket_core *core) { pm_runtime_dont_use_autosuspend(core->dev); pm_runtime_disable(core->dev); + + /* + * Stop the scheduler before tearing down the IOMMU so an in-flight + * job can no longer touch the (about to be detached) domain. + */ + rocket_job_fini(core); + + if (core->attached_domain) { + iommu_detach_group(NULL, core->iommu_group); + rocket_iommu_domain_put(core->attached_domain); + core->attached_domain = NULL; + } iommu_group_put(core->iommu_group); core->iommu_group = NULL; - rocket_job_fini(core); } void rocket_core_reset(struct rocket_core *core) diff --git a/drivers/accel/rocket/rocket_core.h b/drivers/accel/rocket/rocket_core.h index 5a145ba8c5a92..78791ecb32e75 100644 --- a/drivers/accel/rocket/rocket_core.h +++ b/drivers/accel/rocket/rocket_core.h @@ -42,6 +42,8 @@ struct rocket_soc_data { #define rocket_core_writel(core, reg, value) \ writel(value, (core)->core_iomem + (REG_CORE_##reg) - REG_CORE_S_STATUS) +struct rocket_iommu_domain; + struct rocket_core { struct device *dev; struct rocket_device *rdev; @@ -56,6 +58,7 @@ struct rocket_core { struct reset_control_bulk_data resets[2]; struct iommu_group *iommu_group; + struct rocket_iommu_domain *attached_domain; struct mutex job_lock; struct rocket_job *in_flight_job; diff --git a/drivers/accel/rocket/rocket_job.c b/drivers/accel/rocket/rocket_job.c index e25234261536b..368b2ebead1b3 100644 --- a/drivers/accel/rocket/rocket_job.c +++ b/drivers/accel/rocket/rocket_job.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -314,9 +315,26 @@ static struct dma_fence *rocket_job_run(struct drm_sched_job *sched_job) if (ret < 0) return fence; - ret = iommu_attach_group(job->domain->domain, core->iommu_group); - if (ret < 0) - return fence; + /* + * Attach the job's IOMMU domain only when it differs from the one + * already attached. Re-attaching per job toggles the rk_iommu + * stall/reset handshake on an idle NPU MMU, which is slow and + * noisy; keep the domain attached across jobs instead. + */ + if (core->attached_domain != job->domain) { + if (core->attached_domain) { + iommu_detach_group(NULL, core->iommu_group); + rocket_iommu_domain_put(core->attached_domain); + core->attached_domain = NULL; + } + + ret = iommu_attach_group(job->domain->domain, core->iommu_group); + if (ret < 0) + return fence; + + kref_get(&job->domain->kref); + core->attached_domain = job->domain; + } scoped_guard(mutex, &core->job_lock) { core->in_flight_job = job; @@ -340,7 +358,6 @@ static void rocket_job_handle_irq(struct rocket_core *core) return; } - iommu_detach_group(NULL, iommu_group_get(core->dev)); dma_fence_signal(core->in_flight_job->done_fence); pm_runtime_put_autosuspend(core->dev); core->in_flight_job = NULL; @@ -376,7 +393,15 @@ rocket_reset(struct rocket_core *core, struct drm_sched_job *bad) */ rocket_core_reset(core); - iommu_detach_group(NULL, core->iommu_group); + /* + * The reset wipes the IOMMU page-table base, so drop the attached + * domain to force the next job to re-attach and reprogram it. + */ + if (core->attached_domain) { + iommu_detach_group(NULL, core->iommu_group); + rocket_iommu_domain_put(core->attached_domain); + core->attached_domain = NULL; + } /* NPU has been reset, we can clear the reset pending bit. */ atomic_set(&core->reset.pending, 0); -- 2.39.5