Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Sun, 30 Jan 2022 13:28:14 +0100
From:   Greg KH <greg@kroah.com>
To:     Felipe Contreras <felipe.contreras@gmail.com>
Cc:     stable@vger.kernel.org, linux-wireless@vger.kernel.org,
        Ryder Lee <ryder.lee@mediatek.com>,
        Lorenzo Bianconi <lorenzo@kernel.org>,
        Sasha Levin <sashal@kernel.org>, Felix Fietkau <nbd@nbd.name>
Subject: Re: [PATCH] mt76: connac: introduce MCU_CE_CMD macro
Message-ID: <YfaEXktLe4G9pL7D@kroah.com>
References: <20220130075837.5270-1-felipe.contreras@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220130075837.5270-1-felipe.contreras@gmail.com>
Precedence: bulk

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