Commit 838ae99f authored by Rob Herring (Arm)'s avatar Rob Herring (Arm)
Browse files

accel: ethosu: Fix NPU_OP_ELEMENTWISE validation with scalar 



The NPU_OP_ELEMENTWISE instruction uses a scalar value for IFM2 if the
IFM2_BROADCAST "scalar" mode is set. It is a bit (7) on the u65 and
part of a field (bits 3:0) on the u85. The driver was hardcoded to the
u85.

Fixes: 5a5e9c02 ("accel: Add Arm Ethos-U NPU driver")
Reviewed-and-Tested-by: default avatarAnders Roxell <anders.roxell@linaro.org>
Link: https://patch.msgid.link/20260218-ethos-fixes-v1-2-be3fa3ea9a30@kernel.org


Signed-off-by: default avatarRob Herring (Arm) <robh@kernel.org>
parent 150bceb3

drivers/accel/ethosu/ethosu_gem.c

+4 −1
Original line number Diff line number Diff line
@@ -417,7 +417,10 @@ static int ethosu_gem_cmdstream_copy_and_validate(struct drm_device *ddev, 
				return ret;

			break;

		case NPU_OP_ELEMENTWISE:

			use_ifm2 = !((st.ifm2.broadcast == 8) || (param == 5) ||

			use_scale = ethosu_is_u65(edev) ?

				    (st.ifm2.broadcast & 0x80) :

				    (st.ifm2.broadcast == 8);

			use_ifm2 = !(use_scale || (param == 5) ||

				(param == 6) || (param == 7) || (param == 0x24));

			use_ifm = st.ifm.broadcast != 8;

			ret = calc_sizes_elemwise(ddev, info, cmd, &st, use_ifm, use_ifm2);