]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: ipa: fix GENERIC_CMD register field masks for IPA v5.0+
authorAlexander Koskovich <akoskovich@pm.me>
Fri, 3 Apr 2026 16:43:47 +0000 (18:43 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Apr 2026 11:30:42 +0000 (13:30 +0200)
[ Upstream commit 9709b56d908acc120fe8b4ae250b3c9d749ea832 ]

Fix the field masks to match the hardware layout documented in
downstream GSI (GSI_V3_0_EE_n_GSI_EE_GENERIC_CMD_*).

Notably this fixes a WARN I was seeing when I tried to send "stop"
to the MPSS remoteproc while IPA was up.

Fixes: faf0678ec8a0 ("net: ipa: add IPA v5.0 GSI register definitions")
Signed-off-by: Alexander Koskovich <akoskovich@pm.me>
Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20260403-milos-ipa-v1-1-01e9e4e03d3e@fairphone.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ipa/reg/gsi_reg-v5.0.c

index 36d1e65df71bb1e783d033bb050758cad7723116..3334d8e20ad28b3aa28972625e99333fca6dad49 100644 (file)
@@ -156,9 +156,10 @@ REG_FIELDS(EV_CH_CMD, ev_ch_cmd, 0x00025010 + 0x12000 * GSI_EE_AP);
 
 static const u32 reg_generic_cmd_fmask[] = {
        [GENERIC_OPCODE]                                = GENMASK(4, 0),
-       [GENERIC_CHID]                                  = GENMASK(9, 5),
-       [GENERIC_EE]                                    = GENMASK(13, 10),
-                                               /* Bits 14-31 reserved */
+       [GENERIC_CHID]                                  = GENMASK(12, 5),
+       [GENERIC_EE]                                    = GENMASK(16, 13),
+                                               /* Bits 17-23 reserved */
+       [GENERIC_PARAMS]                                = GENMASK(31, 24),
 };
 
 REG_FIELDS(GENERIC_CMD, generic_cmd, 0x00025018 + 0x12000 * GSI_EE_AP);