From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 294EAC07E99 for ; Mon, 12 Jul 2021 06:33:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 120EF61152 for ; Mon, 12 Jul 2021 06:33:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234942AbhGLGgm (ORCPT ); Mon, 12 Jul 2021 02:36:42 -0400 Received: from smtp-relay-canonical-1.canonical.com ([185.125.188.121]:33578 "EHLO smtp-relay-canonical-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236618AbhGLGaT (ORCPT ); Mon, 12 Jul 2021 02:30:19 -0400 Received: from mail-oo1-f70.google.com (mail-oo1-f70.google.com [209.85.161.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 33D8C40572 for ; Mon, 12 Jul 2021 06:18:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1626070733; bh=RtjiaRn1J7xnCAz5c64rPrmdY4IFZ2fXVXNphP7I2r8=; h=MIME-Version:From:Date:Message-ID:Subject:To:Content-Type; b=PoX5OFR7zV/EXf4ZNdAc032FnewFZ/pp6OdMII1B5zpKdVRvFhRZ0ylihk8Pcuwwz YdJHoQ90QCstPdnhBpHFJB2pw6iWEE2ai4FBcZcAbSyvCjFRq8uNuPNlHFJffyQNHZ DUSSaqDeJdGLxIqlJw1MislG1CrK464zg6oypM5OHQOrJyaHwULJ1Ep0OpXB8c7nmg g9rpCXMdLZChLCiKBLPKmUqvdfRspdMT6/R7VcS+0X/iZzG4wSamZz/TNSuW67cUKi 6oBwovC0y2Xs7nfXVMcKb94j6lB7L5vudKCmPiwDAheDguZ9QOLhnoh3wS6Xl7zldt 8v23Pdn9bGmMg== Received: by mail-oo1-f70.google.com with SMTP id g4-20020a4adc840000b029025e89d69142so979418oou.8 for ; Sun, 11 Jul 2021 23:18:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=RtjiaRn1J7xnCAz5c64rPrmdY4IFZ2fXVXNphP7I2r8=; b=LZ9WuVbcb6ZHKI17YtlG+5VWokMMVReTknl6Fj2NcaZ1blQ0UKG2OxYHt4P8UQEDsl +kYSgJzS0jwQqSoFWaACpucXvzcYOnA3TEPNDu91+0CCjdB6FExIK5o2YWQN7fqCNohx +93XLb3Dc295egZWqi+PkM5b9reT8V8eVmUQQkbL1psGm0AFv8zltjroP2XWHYkoT+xj /1mE1Bz5z7yOnfDegXUbOFYBLj6GUzgtxUMexsE++SuX4x/u2jndR4iN+RjwdOkOS6Kp aYuPvAgV8/v15ICDmgw7SxyfHJOn3pU05Vmn8TuJ3rur+St+ms6VRUY/dkIn3a/witWZ q/SQ== X-Gm-Message-State: AOAM532RIcgqO+lIfNHZ1bZjDmhEh9V8Wl8lB9sIrogP6a64sRU/QYiw y2Fsw6Ty7N2zoFQZOoYgZNby2qWcSWI4/NOZ1EvS8BHFMUiStPlj/3tMOVoTPzkKZ/bZ4OgQN2G AhhpVYL3s4JwViwmUxIacIOcvzep7qCfI7Maq91ufXXe7J9ilVhvVCxpW4A== X-Received: by 2002:a9d:3406:: with SMTP id v6mr37766044otb.347.1626070732030; Sun, 11 Jul 2021 23:18:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxA9Jql3O6KfluSO4TvCntaJA5kid7yqtgXbiloZZlEKG/c+AOhPizZ/fhkrmAaj++s8A8feLipZuakBYlhZ8= X-Received: by 2002:a9d:3406:: with SMTP id v6mr37766029otb.347.1626070731813; Sun, 11 Jul 2021 23:18:51 -0700 (PDT) MIME-Version: 1.0 References: <20210630160151.28227-1-chris.chiu@canonical.com> In-Reply-To: <20210630160151.28227-1-chris.chiu@canonical.com> From: Chris Chiu Date: Mon, 12 Jul 2021 14:18:41 +0800 Message-ID: Subject: Re: [PATCH] rtl8xxxu: Fix the handling of TX A-MPDU aggregation To: Jes.Sorensen@gmail.com, Kalle Valo , davem@davemloft.net, kuba@kernel.org Cc: code@reto-schneider.ch, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Linux Kernel Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 1, 2021 at 12:02 AM wrote: > > From: Chris Chiu > > The TX A-MPDU aggregation is not handled in the driver since the > ieee80211_start_tx_ba_session has never been started properly. > Start and stop the TX BA session by tracking the TX aggregation > status of each TID. Fix the ampdu_action and the tx descriptor > accordingly with the given TID. > > Signed-off-by: Chris Chiu > --- > .../net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 2 ++ > .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 33 ++++++++++++++----- > 2 files changed, 26 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h > index d1a566cc0c9e..3f7ff84f2056 100644 > --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h > +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h > @@ -1383,6 +1383,8 @@ struct rtl8xxxu_priv { > u8 no_pape:1; > u8 int_buf[USB_INTR_CONTENT_LENGTH]; > u8 rssi_level; > + bool tx_aggr_started[IEEE80211_NUM_TIDS]; > + DECLARE_BITMAP(tid_bitmap, IEEE80211_NUM_TIDS); > /* > * Only one virtual interface permitted because only STA mode > * is supported and no iface_combinations are provided. > diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c > index 9ff09cf7eb62..03c6ed7efe06 100644 > --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c > +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c > @@ -4805,6 +4805,8 @@ rtl8xxxu_fill_txdesc_v1(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr, > struct ieee80211_rate *tx_rate = ieee80211_get_tx_rate(hw, tx_info); > struct rtl8xxxu_priv *priv = hw->priv; > struct device *dev = &priv->udev->dev; > + u8 *qc = ieee80211_get_qos_ctl(hdr); > + u8 tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK; > u32 rate; > u16 rate_flags = tx_info->control.rates[0].flags; > u16 seq_number; > @@ -4828,7 +4830,7 @@ rtl8xxxu_fill_txdesc_v1(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr, > > tx_desc->txdw3 = cpu_to_le32((u32)seq_number << TXDESC32_SEQ_SHIFT); > > - if (ampdu_enable) > + if (ampdu_enable && test_bit(tid, priv->tid_bitmap)) > tx_desc->txdw1 |= cpu_to_le32(TXDESC32_AGG_ENABLE); > else > tx_desc->txdw1 |= cpu_to_le32(TXDESC32_AGG_BREAK); > @@ -4876,6 +4878,8 @@ rtl8xxxu_fill_txdesc_v2(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr, > struct rtl8xxxu_priv *priv = hw->priv; > struct device *dev = &priv->udev->dev; > struct rtl8xxxu_txdesc40 *tx_desc40; > + u8 *qc = ieee80211_get_qos_ctl(hdr); > + u8 tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK; > u32 rate; > u16 rate_flags = tx_info->control.rates[0].flags; > u16 seq_number; > @@ -4902,7 +4906,7 @@ rtl8xxxu_fill_txdesc_v2(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr, > > tx_desc40->txdw9 = cpu_to_le32((u32)seq_number << TXDESC40_SEQ_SHIFT); > > - if (ampdu_enable) > + if (ampdu_enable && test_bit(tid, priv->tid_bitmap)) > tx_desc40->txdw2 |= cpu_to_le32(TXDESC40_AGG_ENABLE); > else > tx_desc40->txdw2 |= cpu_to_le32(TXDESC40_AGG_BREAK); > @@ -5015,12 +5019,19 @@ static void rtl8xxxu_tx(struct ieee80211_hw *hw, > if (ieee80211_is_data_qos(hdr->frame_control) && sta) { > if (sta->ht_cap.ht_supported) { > u32 ampdu, val32; > + u8 *qc = ieee80211_get_qos_ctl(hdr); > + u8 tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK; > > ampdu = (u32)sta->ht_cap.ampdu_density; > val32 = ampdu << TXDESC_AMPDU_DENSITY_SHIFT; > tx_desc->txdw2 |= cpu_to_le32(val32); > > ampdu_enable = true; > + > + if (!priv->tx_aggr_started[tid] && > + !(skb->protocol == cpu_to_be16(ETH_P_PAE))) > + if (!ieee80211_start_tx_ba_session(sta, tid, 0)) > + priv->tx_aggr_started[tid] = true; > } > } > > @@ -6089,6 +6100,7 @@ rtl8xxxu_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, > struct device *dev = &priv->udev->dev; > u8 ampdu_factor, ampdu_density; > struct ieee80211_sta *sta = params->sta; > + u16 tid = params->tid; > enum ieee80211_ampdu_mlme_action action = params->action; > > switch (action) { > @@ -6101,17 +6113,20 @@ rtl8xxxu_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, > dev_dbg(dev, > "Changed HT: ampdu_factor %02x, ampdu_density %02x\n", > ampdu_factor, ampdu_density); > - break; > + return IEEE80211_AMPDU_TX_START_IMMEDIATE; > + case IEEE80211_AMPDU_TX_STOP_CONT: > case IEEE80211_AMPDU_TX_STOP_FLUSH: > - dev_dbg(dev, "%s: IEEE80211_AMPDU_TX_STOP_FLUSH\n", __func__); > - rtl8xxxu_set_ampdu_factor(priv, 0); > - rtl8xxxu_set_ampdu_min_space(priv, 0); > - break; > case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT: > - dev_dbg(dev, "%s: IEEE80211_AMPDU_TX_STOP_FLUSH_CONT\n", > - __func__); > + dev_dbg(dev, "%s: IEEE80211_AMPDU_TX_STOP\n", __func__); > rtl8xxxu_set_ampdu_factor(priv, 0); > rtl8xxxu_set_ampdu_min_space(priv, 0); > + priv->tx_aggr_started[tid] = false; > + clear_bit(tid, priv->tid_bitmap); > + ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid); > + break; > + case IEEE80211_AMPDU_TX_OPERATIONAL: > + dev_dbg(dev, "%s: IEEE80211_AMPDU_TX_OPERATIONAL\n", __func__); > + set_bit(tid, priv->tid_bitmap); > break; > case IEEE80211_AMPDU_RX_START: > dev_dbg(dev, "%s: IEEE80211_AMPDU_RX_START\n", __func__); > -- > 2.20.1 > Gentle ping. Any suggestion is welcome. Thanks Chris