On Sun, Jan 30, 2022 at 01:58:37AM -0600, Felipe Contreras wrote:
From: Lorenzo Bianconi lorenzo@kernel.org
[ Upstream commit 680a2ead741ad9b479a53adf154ed5eee74d2b9a ]
Similar to MCU_EXT_CMD, introduce MCU_CE_CMD for CE commands.
Upstream commit 547224024579 (mt76: connac: introduce MCU_UNI_CMD macro, 2021-12-09) introduced a bug by removing MCU_UNI_PREFIX, but not updating MCU_CMD_MASK accordingly, so when commands are compared in mt7921_mcu_parse_response() one has the extra bit __MCU_CMD_FIELD_UNI set and the comparison fails:
if (mcu_cmd != event->cid) if (20001 != 1)
The fix was sneaked by in the next commit 680a2ead741a (mt76: connac: introduce MCU_CE_CMD macro, 2021-12-09):
- int mcu_cmd = cmd & MCU_CMD_MASK;
- int mcu_cmd = FIELD_GET(__MCU_CMD_FIELD_ID, cmd);
But it was never merged into linux-stable.
We need either both commits, or none.
Cc: Sasha Levin sashal@kernel.org Signed-off-by: Lorenzo Bianconi lorenzo@kernel.org Signed-off-by: Felix Fietkau nbd@nbd.name Signed-off-by: Felipe Contreras felipe.contreras@gmail.com
.../net/wireless/mediatek/mt76/mt7615/mcu.c | 16 +++---- .../wireless/mediatek/mt76/mt76_connac_mcu.c | 47 ++++++++++-------- .../wireless/mediatek/mt76/mt76_connac_mcu.h | 48 ++++++++++--------- .../net/wireless/mediatek/mt76/mt7921/mcu.c | 24 +++++----- .../wireless/mediatek/mt76/mt7921/testmode.c | 4 +- 5 files changed, 73 insertions(+), 66 deletions(-)
Now queued up, thanks!
greg k-h