accel: ethosu: Fix NPU_OP_ELEMENTWISE validation with scalar

[ Upstream commit 838ae99f9a77a5724ee6d4e7b7b1eb079147f888 ]

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: 5a5e9c0228e6 ("accel: Add Arm Ethos-U NPU driver")
Reviewed-and-Tested-by: Anders Roxell <anders.roxell@linaro.org>
Link: https://patch.msgid.link/20260218-ethos-fixes-v1-2-be3fa3ea9a30@kernel.org
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/accel/ethosu/ethosu_gem.c b/drivers/accel/ethosu/ethosu_gem.c
index 7b073116314baa98fb3c832b3ce9954c5fdb2478..4e84481a29d2f3c5cde9d0643b9fd757e39cc4b4 100644 (file)
--- a/drivers/accel/ethosu/ethosu_gem.c
+++ b/drivers/accel/ethosu/ethosu_gem.c
@@ -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);