From patchwork Thu Sep 29 15:15:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 12994223 X-Patchwork-Delegate: nbd@nbd.name Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC68FC4332F for ; Thu, 29 Sep 2022 15:15:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235646AbiI2PPf (ORCPT ); Thu, 29 Sep 2022 11:15:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234729AbiI2PPd (ORCPT ); Thu, 29 Sep 2022 11:15:33 -0400 Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 560A0F84B4 for ; Thu, 29 Sep 2022 08:15:31 -0700 (PDT) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.7.64.31]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 915871C0089; Thu, 29 Sep 2022 15:15:28 +0000 (UTC) Received: from mail3.candelatech.com (mail2.candelatech.com [208.74.158.173]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 60EB7600087; Thu, 29 Sep 2022 15:15:28 +0000 (UTC) Received: from ben-dt4.candelatech.com (50-251-239-81-static.hfc.comcastbusiness.net [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id CDA1613C2B0; Thu, 29 Sep 2022 08:15:27 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com CDA1613C2B0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1664464527; bh=1glF0BrCEhCzmG8c+3ww9v+DtRNX8h30UNKqVWPAaGg=; h=From:To:Cc:Subject:Date:From; b=Ff/Jnmf9SZsk89P4wXlOA0iAdnBx6m1cTP3EOnDdcCkDywMzx70g119aG3XZEelYp dzWB5XdgBRo6lgqglcCtLwKACq0RcDWC7GkcmVQDlebeOsx4PO5PhfRKZoiZXNrZMM ojE243s/wBQLrdG55RyEoCzoeXE+1c2FNfLCwHAU= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: nbd@nbd.name, Ben Greear Subject: [PATCH 1/2] wifi: mt76: mt7915: fix bounds checking for tx-free-done command Date: Thu, 29 Sep 2022 08:15:25 -0700 Message-Id: <20220929151526.9559-1-greearb@candelatech.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-MDID: 1664464529-X_Ed7EJ7K0v8 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ben Greear According to the tx-free-done documentation, the DW4 can be repeated, so have to be more careful about how we test for walking off the end of the array. Signed-off-by: Ben Greear --- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c index 4e70f5d050ea..bbaa77af387c 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c @@ -1116,14 +1116,16 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len) total = le16_get_bits(free->ctrl, MT_TX_FREE_MSDU_CNT); /* NOTE: 'v3' actually is checking for API version 4 */ v3 = (FIELD_GET(MT_TX_FREE_VER, txd) == 0x4); - if (WARN_ON_ONCE((void *)&tx_info[total >> v3] > end)) - return; for (cur_info = tx_info; count < total; cur_info++) { - u32 msdu, info = le32_to_cpu(*cur_info); + u32 msdu, info; u8 i; u32 tx_cnt, tx_status, ampdu; + if (WARN_ON_ONCE((void*)cur_info > end)) + return; + + info = le32_to_cpu(*cur_info); /* * 1'b1: new wcid pair. * 1'b0: msdu_id with the same 'wcid pair' as above. From patchwork Thu Sep 29 15:15:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 12994222 X-Patchwork-Delegate: nbd@nbd.name Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17355C433F5 for ; Thu, 29 Sep 2022 15:15:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235539AbiI2PPe (ORCPT ); Thu, 29 Sep 2022 11:15:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230349AbiI2PPd (ORCPT ); Thu, 29 Sep 2022 11:15:33 -0400 Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.183]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BBCBF962E for ; Thu, 29 Sep 2022 08:15:31 -0700 (PDT) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.110.51.179]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id DFE952006C; Thu, 29 Sep 2022 15:15:29 +0000 (UTC) Received: from mail3.candelatech.com (mail2.candelatech.com [208.74.158.173]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id A3BC1AC007A; Thu, 29 Sep 2022 15:15:29 +0000 (UTC) Received: from ben-dt4.candelatech.com (50-251-239-81-static.hfc.comcastbusiness.net [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id 0DF2413C2B0; Thu, 29 Sep 2022 08:15:29 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com 0DF2413C2B0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1664464529; bh=a82NZpNM2XqN9NMLXMML8VSmIpuj6XiCTB9HcJ8sQKs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HNIIide954zRRBplElULF/98q7vV4nP7JZbFCa+2xBgH1ojsmxyg4xyG/iQxf8h36 TETM+lY4AJrARBPfQ6FIqPNmS5WN7aDzLXMO9aNWlbtGGHuUmqwUz80+9+GgljYeaq XPKKCBI6J7929w0cZ1AIsB9kxY/lJ1dAyJZ/An2o= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: nbd@nbd.name, Ben Greear Subject: [PATCH 2/2] wifi: mt76: mt7915: add two additional errors to ack-failure mask. Date: Thu, 29 Sep 2022 08:15:26 -0700 Message-Id: <20220929151526.9559-2-greearb@candelatech.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220929151526.9559-1-greearb@candelatech.com> References: <20220929151526.9559-1-greearb@candelatech.com> MIME-Version: 1.0 X-MDID: 1664464530-JeCLJNR05JiN Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ben Greear These other two bits also indicate tx failure as far as I can tell from reading the documents. Signed-off-by: Ben Greear --- drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h index 67ce216fb564..075048ab784f 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h @@ -133,10 +133,12 @@ enum { #define MT_TXS0_TXOP_TIMEOUT BIT(20) #define MT_TXS0_BIP_ERROR BIT(19) +#define MT_TXS0_TXOP_LIMIT BIT(20) +#define MT_TXS0_BIP_OR_BF_ERROR BIT(19) #define MT_TXS0_QUEUE_TIMEOUT BIT(18) #define MT_TXS0_RTS_TIMEOUT BIT(17) #define MT_TXS0_ACK_TIMEOUT BIT(16) -#define MT_TXS0_ACK_ERROR_MASK GENMASK(18, 16) +#define MT_TXS0_ACK_ERROR_MASK GENMASK(20, 16) #define MT_TXS0_TX_STATUS_HOST BIT(15) #define MT_TXS0_TX_STATUS_MCU BIT(14)