From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE4043403F2 for ; Sat, 5 Sep 2026 00:44:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788569044; cv=none; b=UF2FXaV0FucHwAPF75UTAdo9xsPJFdYAktDRsZym619u+R6IsjO+JqySohZra5y6+KL2hIcUI3nGa/G+wIpaWn6TZeAf/2tqLCfoqNIrRylPw52LTUBrYedVHkbeS+ng1w8rlyvzGOIWhO8gUoQPqslzQci9iiQOGIz41Tc0Kz0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788569044; c=relaxed/simple; bh=391EmbYMLzYHWIt3dmG7s0TzDkExk1eqEf/OgOKgo6Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=D3co+bEwISCOrgQe3mbp1JE7AJfyolehw8UquCiscriouaL5Rmz6YgbxoBgjbr6cUpxrLZmKD2xHrEMLkLD81qaGXwFIfSDaQgjbTFMUXzzcTLEufy+JTChXJGNzuCPV2iwb+137+1CJ8z87icyH38XmqbI+MB6SEQm0Kx1gz4o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cUkf/Ru5; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cUkf/Ru5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3930C1F00A3D; Sat, 5 Sep 2026 00:44:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788569042; bh=XF9OA4b6VIaFYhiwlBjDAlKanfkpMhSK31WBha0eHKs=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=cUkf/Ru5Uw3zFPHsLG6FDzUn3SUweRX+4uiUNiLO9bKPqqG2vVLgtuy7c3eKaHduf 9y3CJRCvJH+zz64Gxhxg7MFbCUG7l2C58Y64NU3yTbie0APrwBW18NE+9ERk5bUOlN 5VQOUM5oTnu/xY8dZWeD5muXhN7mr2RJgYqfB+AjLUdWFu5ilXdhNzDEHHL5OcY/T6 hlbz0Oy1IFJSGyPeyQLk+kxscIxt3SIa3tzx+YXu9U/edaLtL2vcJMQIdk10Fw9SHe IYs5aSyXZrVoLDXBRh+J/Hg4v0RUOukmgH1ShjKHnf4af9JxdnrS8Ts+PywrG4eua6 9W8y7GRr9Jq5g== From: "Rob Herring (Arm)" Date: Fri, 04 Sep 2026 19:43:34 -0500 Subject: [PATCH v2 15/19] accel: ethosu: Validate accumulator input Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260904-ethosu-fixes-v2-15-3767738756a4@kernel.org> References: <20260904-ethosu-fixes-v2-0-3767738756a4@kernel.org> In-Reply-To: <20260904-ethosu-fixes-v2-0-3767738756a4@kernel.org> To: Tomeu Vizoso , Oded Gabbay , Frank Li , Thomas Zimmermann Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.16-dev The U85 ACC_FORMAT command can select IFM2 as the accumulator input. This is used by null-pool operations and can also be used by convolution. Track this selection and validate the IFM2 feature map against the OFM extent before submitting the operation. Fixes: 5a5e9c0228e6 ("accel: Add Arm Ethos-U NPU driver") Cc: stable@vger.kernel.org Assisted-by: LLM Signed-off-by: Rob Herring (Arm) --- v2: - new patch --- drivers/accel/ethosu/ethosu_device.h | 4 ++++ drivers/accel/ethosu/ethosu_gem.c | 42 ++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/drivers/accel/ethosu/ethosu_device.h b/drivers/accel/ethosu/ethosu_device.h index 68e2969b6f79..6b9d093d73e6 100644 --- a/drivers/accel/ethosu/ethosu_device.h +++ b/drivers/accel/ethosu/ethosu_device.h @@ -126,6 +126,7 @@ enum ethosu_cmds { NPU_SET_KERNEL_WIDTH_M1 = 0x120, NPU_SET_KERNEL_HEIGHT_M1 = 0x121, NPU_SET_KERNEL_STRIDE = 0x122, + NPU_SET_ACC_FORMAT = 0x124, NPU_SET_WEIGHT_REGION = 0x128, NPU_SET_SCALE_REGION = 0x129, NPU_SET_DMA0_SRC_REGION = 0x130, @@ -180,6 +181,9 @@ enum ethosu_cmds { NPU_SET_WEIGHT3_LENGTH = 0x4095, }; +#define NPU_ACC_FORMAT_INPUT_MASK GENMASK(5, 4) +#define NPU_ACC_INPUT_IFM2 2 + #define ETHOSU_SRAM_REGION 2 /* Matching Vela compiler */ struct ethosu_perfmon; diff --git a/drivers/accel/ethosu/ethosu_gem.c b/drivers/accel/ethosu/ethosu_gem.c index d5c3a2c530dc..05a3cc04e7d1 100644 --- a/drivers/accel/ethosu/ethosu_gem.c +++ b/drivers/accel/ethosu/ethosu_gem.c @@ -145,6 +145,7 @@ struct feat_matrix { struct cmd_state { DECLARE_BITMAP(cmd0, NPU_CMD0_REGS); DECLARE_BITMAP(cmd1, NPU_CMD1_REGS); + bool acc_input_ifm2; struct dma_state dma; struct buffer scale[2]; struct buffer weight[4]; @@ -491,6 +492,32 @@ static int feat_matrix_size(struct ethosu_device *edev, max_len); } +static int +calc_acc_input_size(struct drm_device *ddev, + struct ethosu_validated_cmdstream_info *info, + struct cmd_state *st) +{ + struct ethosu_device *edev = to_ethosu_device(ddev); + u64 len; + int ret; + + if (!ethosu_is_u65(edev) && + !cmd_state_reg_is_set(st, NPU_SET_ACC_FORMAT)) + return -EINVAL; + + if (!st->acc_input_ifm2) + return 0; + + /* The accumulator has one input value for each OFM element. */ + ret = feat_matrix_size(edev, info, st, &st->ifm2, + FEAT_MATRIX_IFM2, st->ofm.width, + st->ofm.height[2], st->ofm.depth, false, &len); + dev_dbg(ddev->dev, "ACC IFM2:%d:0x%llx-0x%llx\n", + st->ifm2.region, st->ifm2.base[0], len); + + return ret; +} + 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) @@ -612,6 +639,9 @@ static int calc_sizes(struct drm_device *ddev, true, &len); dev_dbg(ddev->dev, "op %d: OFM:%d:0x%llx-0x%llx\n", op, st->ofm.region, st->ofm.base[0], len); + if (ret) + return ret; + ret = calc_acc_input_size(ddev, info, st); if (ret) return ret; if (!feat_matrix_chained(edev, &st->ofm)) @@ -661,6 +691,9 @@ static int calc_sizes_elemwise(struct drm_device *ddev, true, &len); dev_dbg(ddev->dev, "op %d: OFM:%d:0x%llx-0x%llx\n", op, st->ofm.region, st->ofm.base[0], len); + if (ret) + return ret; + ret = calc_acc_input_size(ddev, info, st); if (ret) return ret; if (!feat_matrix_chained(edev, &st->ofm)) @@ -799,6 +832,15 @@ 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_ACC_FORMAT: + if (!ethosu_is_u65(edev)) { + u32 acc_input = FIELD_GET(NPU_ACC_FORMAT_INPUT_MASK, param); + + if (acc_input > NPU_ACC_INPUT_IFM2) + return -EINVAL; + st.acc_input_ifm2 = acc_input == NPU_ACC_INPUT_IFM2; + } + break; case NPU_SET_IFM_PAD_TOP: st.ifm.pad_top = param & 0x7f; break; -- 2.53.0