Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp955292ybt; Fri, 19 Jun 2020 19:26:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYFDXNPNa6RafCoibCeUlCF4PnG6txTp+yw3S6P+kAby/LumcWWVf6YrDQEWTynuGXWeck X-Received: by 2002:a05:6402:128b:: with SMTP id w11mr5925089edv.377.1592620018520; Fri, 19 Jun 2020 19:26:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592620018; cv=none; d=google.com; s=arc-20160816; b=QARw2AJwfdom74YK+eSTwWe7gLwty9jYGeTRf2iKI4XbaWTaVilorHsiGRcoT2uWUB RG2nPBv4hYEG/dor4BCFmtvCBiiGF/PaKU7FRYjfRF6HzvspLgtqNHyd3W0ODFcthnWP t9ijTpqWpXMmOH37P916K35o/0SlY2X/2KwWzddVb2g3kzmEioyCfA0sax9f9yI/+wFQ 6fraaL6+/ZwpbwVWkTp/IgVOhPJmzLa4nMjIXsjdpnFiha1BulJiouROIQKFDwjttB08 +5AYP1RLgotQsdfoTglKFsnitHxFLocPlixUROYb5KrWuV7G03CYNZj/EKhfk5NevB4c jToQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=C8IsHt6vc9L8870IjZ0Mwr3rRE6Btud1kK7ZcmSAwb8=; b=vwQo+hgcAVsfgjPbiRtvbp5eqvfdFrSwtjM4r4fMUageNIyPYL85GkaWnYXRnnyQnE EEqLfRv2Y4O0lpiJNgdMwGY3/hlaxB3izv+4SHUZP1lo2yv927aepKiCaMCBfiZMOqk0 EkYgxN5AIqK31crnSZqj/5LqFRUPLwkuJYMJPkYFBddYUHfqCjjQLwKN8zm3hwq90Wgt nifCncfzVelj3vtPyDrBYhv9PBk4cInpY9ug3mSWchuLRRksPaemCiHiGsXrosTZ5KI5 gROPNI8rFqNzzw0dUxi6h5eX5C7fdPASQ4zJ+dFu96OWKIz9FCcG3uXRtpM39QtKbjjg XRGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DL0vHHu4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id de11si5179984edb.306.2020.06.19.19.26.30; Fri, 19 Jun 2020 19:26:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DL0vHHu4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390899AbgFSPsh (ORCPT + 99 others); Fri, 19 Jun 2020 11:48:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:57234 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393423AbgFSPZ3 (ORCPT ); Fri, 19 Jun 2020 11:25:29 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5741B21556; Fri, 19 Jun 2020 15:25:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592580327; bh=LyC5reHuKcgTb4gEK4bP1Zn7mJplEn+GKnZZgfiDpzE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DL0vHHu4UQDhmN/rUbtpOhB1Er+3gCmaP9+/UV3+YrxBzc6JF7zagr9X0VKX+VxfC VxhsPSbFo0PVIuSfV8qZTH0K/xpCKWOoNgFJKiNEOmNNkQiIUrJCYyt0s6aUZDnrtF L1PnWtuXLwWEFXKenGWUvpwxUuzupVuwU9bzqrvQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lorenzo Bianconi , Sasha Levin Subject: [PATCH 5.7 180/376] mt76: mt7622: fix DMA unmap length Date: Fri, 19 Jun 2020 16:31:38 +0200 Message-Id: <20200619141718.877691046@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141710.350494719@linuxfoundation.org> References: <20200619141710.350494719@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lorenzo Bianconi [ Upstream commit c0f8055b3986f9c9f990268b578173259769ba1c ] Fix DMA unmap length estimation in mt7615_txp_skb_unmap_hw for mt7622 chipset Fixes: 6aa4ed7927f1 ("mt76: mt7615: implement DMA support for MT7622") Signed-off-by: Lorenzo Bianconi Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c index 656231786d55..b5249d08564c 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c @@ -675,7 +675,7 @@ mt7615_txp_skb_unmap_hw(struct mt76_dev *dev, struct mt7615_hw_txp *txp) len = le16_to_cpu(ptr->len0); last = len & MT_TXD_LEN_MSDU_LAST; - len &= ~MT_TXD_LEN_MSDU_LAST; + len &= MT_TXD_LEN_MASK; dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf0), len, DMA_TO_DEVICE); if (last) @@ -683,7 +683,7 @@ mt7615_txp_skb_unmap_hw(struct mt76_dev *dev, struct mt7615_hw_txp *txp) len = le16_to_cpu(ptr->len1); last = len & MT_TXD_LEN_MSDU_LAST; - len &= ~MT_TXD_LEN_MSDU_LAST; + len &= MT_TXD_LEN_MASK; dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf1), len, DMA_TO_DEVICE); if (last) @@ -1107,8 +1107,8 @@ mt7615_write_hw_txp(struct mt7615_dev *dev, struct mt76_tx_info *tx_info, txp->msdu_id[0] = cpu_to_le16(id | MT_MSDU_ID_VALID); for (i = 0; i < nbuf; i++) { + u16 len = tx_info->buf[i + 1].len & MT_TXD_LEN_MASK; u32 addr = tx_info->buf[i + 1].addr; - u16 len = tx_info->buf[i + 1].len; if (i == nbuf - 1) len |= MT_TXD_LEN_MSDU_LAST | diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.h b/drivers/net/wireless/mediatek/mt76/mt7615/mac.h index e0b89257db90..53ac184ab2d6 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.h +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.h @@ -252,6 +252,7 @@ enum tx_phy_bandwidth { #define MT_MSDU_ID_VALID BIT(15) +#define MT_TXD_LEN_MASK GENMASK(11, 0) #define MT_TXD_LEN_MSDU_LAST BIT(14) #define MT_TXD_LEN_AMSDU_LAST BIT(15) -- 2.25.1