From: "Rob Herring (Arm)" <robh@kernel.org>
To: Tomeu Vizoso <tomeu@tomeuvizoso.net>,
Oded Gabbay <ogabbay@kernel.org>, Frank Li <Frank.Li@nxp.com>,
Thomas Zimmermann <tzimmermann@suse.de>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH v5 17/19] accel: ethosu: Require active weight streams setup
Date: Fri, 20 Nov 2026 08:57:41 -0600 [thread overview]
Message-ID: <20261120-ethosu-fixes-v5-17-52d459acdb84@kernel.org> (raw)
In-Reply-To: <20261120-ethosu-fixes-v5-0-52d459acdb84@kernel.org>
An active weight or scale stream must be explicitly disabled or configured.
Otherwise retained stream state can bypass buffer bounds validation.
Derive the active stream count from the NPU configuration on U85 and
from PARALLEL_MODE on U65. Require each active stream's length command,
while allowing a zero length to disable it.
Require U85 weight operations to set WEIGHT_FORMAT explicitly so stream
validation does not depend on format state retained from another job.
An inactive secondary stream can retain its length and base after a mode
change. Skip it regardless of that retained setup: checking stale bounds
against a newly selected region can reject a valid job even though the
operation never accesses that stream.
Fixes: 5a5e9c0228e6 ("accel: Add Arm Ethos-U NPU driver")
Cc: stable@vger.kernel.org
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
v5:
- Require explicit U85 weight format setup before weight operations.
- Skip inactive streams even when they retain old base/length setup.
- Handle U85 fast weights mode
v4:
- New patch
---
drivers/accel/ethosu/ethosu_device.h | 5 +++
drivers/accel/ethosu/ethosu_gem.c | 72 ++++++++++++++++++++++++++++++++----
2 files changed, 70 insertions(+), 7 deletions(-)
diff --git a/drivers/accel/ethosu/ethosu_device.h b/drivers/accel/ethosu/ethosu_device.h
index 6aa7f035f32c..f8066a9cf610 100644
--- a/drivers/accel/ethosu/ethosu_device.h
+++ b/drivers/accel/ethosu/ethosu_device.h
@@ -61,6 +61,7 @@ struct gen_pool;
#define CONFIG_MACS_PER_CC_MASK GENMASK(3, 0)
#define CONFIG_CMD_STREAM_VER_MASK GENMASK(7, 4)
+#define CONFIG_NUM_WD_MASK GENMASK(13, 12)
#define STATUS_STATE_RUNNING BIT(0)
#define STATUS_IRQ_RAISED BIT(1)
@@ -126,6 +127,7 @@ enum ethosu_cmds {
NPU_SET_KERNEL_WIDTH_M1 = 0x120,
NPU_SET_KERNEL_HEIGHT_M1 = 0x121,
NPU_SET_KERNEL_STRIDE = 0x122,
+ NPU_SET_PARALLEL_MODE = 0x123, // U65 only
NPU_SET_ACC_FORMAT = 0x124,
NPU_SET_WEIGHT_REGION = 0x128,
NPU_SET_SCALE_REGION = 0x129,
@@ -133,6 +135,7 @@ enum ethosu_cmds {
NPU_SET_RESIZE_Y_SCALE_N_M1 = 0x12b,
NPU_SET_RESIZE_X_OFFSET = 0x12c,
NPU_SET_RESIZE_Y_OFFSET = 0x12d,
+ NPU_SET_WEIGHT_FORMAT = 0x12e, // U85 only
NPU_SET_DMA0_SRC_REGION = 0x130,
NPU_SET_DMA0_DST_REGION = 0x131,
NPU_SET_DMA0_SIZE0 = 0x132,
@@ -189,6 +192,8 @@ enum ethosu_cmds {
#define NPU_ACC_FORMAT_INPUT_MASK GENMASK(5, 4)
#define NPU_ACC_INPUT_IFM2 2
+#define NPU_MACS_PER_CC_256 8
+#define NPU_PARALLEL_MODE_DUAL_CORE_DEPTH 1
#define ETHOSU_SRAM_REGION 2 /* Matching Vela compiler */
diff --git a/drivers/accel/ethosu/ethosu_gem.c b/drivers/accel/ethosu/ethosu_gem.c
index fc31372a2c08..d2884d9922ae 100644
--- a/drivers/accel/ethosu/ethosu_gem.c
+++ b/drivers/accel/ethosu/ethosu_gem.c
@@ -165,6 +165,8 @@ struct cmd_state {
DECLARE_BITMAP(cmd0, NPU_CMD0_REGS);
DECLARE_BITMAP(cmd1, NPU_CMD1_REGS);
u8 acc_input_precision;
+ bool fast_weights;
+ u8 parallel_mode;
struct dma_state dma;
struct buffer scale[2];
struct buffer weight[4];
@@ -785,19 +787,47 @@ static int calc_sizes_resize(struct drm_device *ddev,
return 0;
}
+static int weight_streams(struct ethosu_device *edev, struct cmd_state *st,
+ u8 *streams)
+{
+ if (ethosu_is_u65(edev)) {
+ if (FIELD_GET(CONFIG_MACS_PER_CC_MASK, edev->npu_info.config) ==
+ NPU_MACS_PER_CC_256) {
+ *streams = 1;
+ return 0;
+ }
+
+ if (!cmd_state_reg_is_set(st, NPU_SET_PARALLEL_MODE))
+ return -EINVAL;
+
+ *streams = st->parallel_mode + 1;
+ } else if (st->fast_weights) {
+ *streams = 1;
+ } else {
+ *streams = 1 << FIELD_GET(CONFIG_NUM_WD_MASK,
+ edev->npu_info.config);
+ }
+
+ return 0;
+}
+
static int buffer_size(struct ethosu_validated_cmdstream_info *info,
struct cmd_state *st, struct buffer *buf, s8 region,
- u16 region_cmd, u16 base_cmd, u16 length_cmd, bool optional)
+ u16 region_cmd, u16 base_cmd, u16 length_cmd, bool inactive)
{
u64 end;
bool base_set = cmd_state_reg_is_set(st, base_cmd);
bool length_set = cmd_state_reg_is_set(st, length_cmd);
- if (optional && !base_set && !length_set)
+ if (inactive)
return 0;
if (region < 0 || !cmd_state_reg_is_set(st, region_cmd) ||
- !base_set || !length_set)
+ !length_set)
+ return -EINVAL;
+ if (!buf->length)
+ return 0;
+ if (!base_set)
return -EINVAL;
if (check_add_overflow(buf->base, (u64)buf->length, &end))
@@ -815,6 +845,7 @@ static int calc_sizes(struct drm_device *ddev,
{
struct ethosu_device *edev = to_ethosu_device(ddev);
u64 len;
+ u8 streams;
int ret;
if (ifm) {
@@ -860,6 +891,15 @@ static int calc_sizes(struct drm_device *ddev,
}
if (weight) {
+ /* The weight format can persist from a previous job. */
+ if (!ethosu_is_u65(edev) &&
+ !cmd_state_reg_is_set(st, NPU_SET_WEIGHT_FORMAT))
+ return -EINVAL;
+
+ ret = weight_streams(edev, st, &streams);
+ if (ret)
+ return ret;
+
dev_dbg(ddev->dev, "op %d: W:%d:0x%llx-0x%llx\n",
op, st->weight[0].region, st->weight[0].base,
st->weight[0].base + st->weight[0].length - 1);
@@ -870,19 +910,23 @@ static int calc_sizes(struct drm_device *ddev,
if (buffer_size(info, st, &st->weight[1], st->weight[0].region,
NPU_SET_WEIGHT_REGION, NPU_SET_WEIGHT1_BASE,
- NPU_SET_WEIGHT1_LENGTH, true) ||
+ NPU_SET_WEIGHT1_LENGTH, streams < 2) ||
buffer_size(info, st, &st->weight[3], st->weight[0].region,
NPU_SET_WEIGHT_REGION, NPU_SET_WEIGHT3_BASE,
- NPU_SET_WEIGHT3_LENGTH, true))
+ NPU_SET_WEIGHT3_LENGTH, streams < 4))
return -EINVAL;
if (!ethosu_is_u65(edev) &&
buffer_size(info, st, &st->weight[2], st->weight[0].region,
NPU_SET_WEIGHT_REGION, NPU_SET_WEIGHT2_BASE,
- NPU_SET_WEIGHT2_LENGTH, true))
+ NPU_SET_WEIGHT2_LENGTH, streams < 3))
return -EINVAL;
}
if (scale) {
+ ret = weight_streams(edev, st, &streams);
+ if (ret)
+ return ret;
+
dev_dbg(ddev->dev, "op %d: S:%d:0x%llx-0x%llx\n",
op, st->scale[0].region, st->scale[0].base,
st->scale[0].base + st->scale[0].length - 1);
@@ -894,7 +938,7 @@ static int calc_sizes(struct drm_device *ddev,
if (ethosu_is_u65(edev) &&
buffer_size(info, st, &st->scale[1], st->scale[0].region,
NPU_SET_SCALE_REGION, NPU_SET_SCALE1_BASE,
- NPU_SET_SCALE1_LENGTH, true))
+ NPU_SET_SCALE1_LENGTH, streams < 2))
return -EINVAL;
}
@@ -1119,6 +1163,16 @@ static int ethosu_gem_cmdstream_copy_and_validate(struct drm_device *ddev,
case NPU_SET_KERNEL_STRIDE:
st.ifm.stride_kernel = param;
break;
+ case NPU_SET_PARALLEL_MODE:
+ if (!ethosu_is_u65(edev) ||
+ param > NPU_PARALLEL_MODE_DUAL_CORE_DEPTH)
+ return -EINVAL;
+ if (FIELD_GET(CONFIG_MACS_PER_CC_MASK, edev->npu_info.config) ==
+ NPU_MACS_PER_CC_256 &&
+ param)
+ return -EINVAL;
+ st.parallel_mode = param;
+ break;
case NPU_SET_ACC_FORMAT:
if (!ethosu_is_u65(edev)) {
u32 acc_input = FIELD_GET(NPU_ACC_FORMAT_INPUT_MASK, param);
@@ -1130,6 +1184,10 @@ static int ethosu_gem_cmdstream_copy_and_validate(struct drm_device *ddev,
(param & 0x3) + 2 : 0;
}
break;
+ case NPU_SET_WEIGHT_FORMAT:
+ if (!ethosu_is_u65(edev))
+ st.fast_weights = param & BIT(0);
+ break;
case NPU_SET_IFM_PAD_TOP:
st.ifm.pad_top = param & 0x7f;
break;
--
2.53.0
next prev parent reply other threads:[~2026-11-20 14:58 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 14:57 [PATCH v5 00/19] accel: ethosu: Cmd stream validation fixes Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 01/19] accel: ethosu: Prevent command stream export Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 02/19] accel: ethosu: Move DMA mode to src/dst struct Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 03/19] accel: ethosu: Track command stream register setup Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 04/19] accel: ethosu: Factor buffer bounds checks Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 05/19] accel: ethosu: Fix NHCWB16 bounds calculation Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 06/19] accel: ethosu: Validate secondary streams Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 07/19] accel: ethosu: Reject unsupported commands and params Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 08/19] accel: ethosu: Validate all feature map tiles Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 09/19] accel: ethosu: Account for feature map element size Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 10/19] accel: ethosu: Validate convolution parameter Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 11/19] accel: ethosu: Validate accumulator input Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 12/19] accel: ethosu: Restrict dynamic IFM2 weights Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 13/19] accel: ethosu: Split U65 and U85 DMA length validation Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 14/19] accel: ethosu: Validate OFM transpose Rob Herring (Arm)
2026-11-20 15:07 ` sashiko-bot
2026-11-20 14:57 ` [PATCH v5 15/19] accel: ethosu: Validate resize operations Rob Herring (Arm)
2026-11-20 14:57 ` [PATCH v5 16/19] accel: ethosu: Ensure cmd stream is multiple of 4 bytes Rob Herring (Arm)
2026-11-20 14:57 ` Rob Herring (Arm) [this message]
2026-11-20 14:57 ` [PATCH v5 18/19] accel: ethosu: Support IFM upscaling Rob Herring (Arm)
2026-11-20 15:12 ` sashiko-bot
2026-11-20 14:57 ` [PATCH v5 19/19] accel: ethosu: Reject IFM broadcast on U65 Rob Herring (Arm)
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=20261120-ethosu-fixes-v5-17-52d459acdb84@kernel.org \
--to=robh@kernel.org \
--cc=Frank.Li@nxp.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ogabbay@kernel.org \
--cc=tomeu@tomeuvizoso.net \
--cc=tzimmermann@suse.de \
/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.