From: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
To: Ryder Lee <ryder.lee@mediatek.com>
Cc: linux-mediatek@lists.infradead.org,
Shayne Chen <shayne.chen@mediatek.com>,
linux-wireless@vger.kernel.org, Felix Fietkau <nbd@nbd.name>
Subject: Re: [PATCH 1/3] mt76: mt7615: enable hw rx-amsdu de-aggregation
Date: Thu, 18 Feb 2021 13:13:57 +0100 [thread overview]
Message-ID: <YC5aBTfl3Hguglc0@lore-desk> (raw)
In-Reply-To: <b7883f5ee09d13f7cbdf5ab1d5fef61ebc79dcc4.1613603857.git.ryder.lee@mediatek.com>
[-- Attachment #1.1: Type: text/plain, Size: 4317 bytes --]
> Enable hw rx-amsdu de-aggregation support.
> This is a preliminary patch to enable rx checksum offload.
>
> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
For the series:
Tested-by Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
> ---
> drivers/net/wireless/mediatek/mt76/mt7615/init.c | 3 +--
> drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 15 ++++++++++++++-
> drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 3 +++
> drivers/net/wireless/mediatek/mt76/mt7615/regs.h | 1 +
> 4 files changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
> index 571390fa4de7..a97cc723094c 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7615/init.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
> @@ -116,10 +116,9 @@ mt7615_mac_init(struct mt7615_dev *dev)
> mt76_set(dev, MT_WF_RMAC_MIB_TIME0, MT_WF_RMAC_MIB_RXTIME_EN);
> mt76_set(dev, MT_WF_RMAC_MIB_AIRTIME0, MT_WF_RMAC_MIB_RXTIME_EN);
>
> - /* disable hdr translation and hw AMSDU */
> mt76_wr(dev, MT_DMA_DCR0,
> FIELD_PREP(MT_DMA_DCR0_MAX_RX_LEN, 3072) |
> - MT_DMA_DCR0_RX_VEC_DROP);
> + MT_DMA_DCR0_RX_VEC_DROP | MT_DMA_DCR0_DAMSDU_EN);
> /* disable TDLS filtering */
> mt76_clear(dev, MT_WF_PFCR, MT_WF_PFCR_TDLS_EN);
> mt76_set(dev, MT_WF_MIB_SCR0, MT_MIB_SCR0_AGG_CNT_RANGE_EN);
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
> index 9bae2f66e1ce..928edd158f64 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
> @@ -238,7 +238,7 @@ static int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)
> bool unicast, remove_pad, insert_ccmp_hdr = false;
> int phy_idx;
> int i, idx;
> - u8 chfreq;
> + u8 chfreq, amsdu_info;
>
> memset(status, 0, sizeof(*status));
>
> @@ -254,6 +254,9 @@ static int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)
> else
> phy_idx = -1;
>
> + if (rxd2 & MT_RXD2_NORMAL_AMSDU_ERR)
> + return -EINVAL;
> +
> unicast = (rxd1 & MT_RXD1_NORMAL_ADDR_TYPE) == MT_RXD1_NORMAL_U2M;
> idx = FIELD_GET(MT_RXD2_NORMAL_WLAN_IDX, rxd2);
> status->wcid = mt7615_rx_get_wcid(dev, idx, unicast);
> @@ -446,6 +449,16 @@ static int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)
>
> skb_pull(skb, (u8 *)rxd - skb->data + 2 * remove_pad);
>
> + amsdu_info = FIELD_GET(MT_RXD1_NORMAL_PAYLOAD_FORMAT, rxd1);
> + status->amsdu = !!amsdu_info;
> + if (status->amsdu) {
> + status->first_amsdu = amsdu_info == MT_RXD1_FIRST_AMSDU_FRAME;
> + status->last_amsdu = amsdu_info == MT_RXD1_LAST_AMSDU_FRAME;
> + memmove(skb->data + 2, skb->data,
> + ieee80211_get_hdrlen_from_skb(skb));
> + skb_pull(skb, 2);
> + }
> +
> if (insert_ccmp_hdr) {
> u8 key_id = FIELD_GET(MT_RXD1_NORMAL_KEY_ID, rxd1);
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.h b/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
> index 169f4e17b5b4..ed009d085a53 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.h
> @@ -33,6 +33,9 @@ enum rx_pkt_type {
>
> #define MT_RXD1_NORMAL_BSSID GENMASK(31, 26)
> #define MT_RXD1_NORMAL_PAYLOAD_FORMAT GENMASK(25, 24)
> +#define MT_RXD1_FIRST_AMSDU_FRAME GENMASK(1, 0)
> +#define MT_RXD1_MID_AMSDU_FRAME BIT(1)
> +#define MT_RXD1_LAST_AMSDU_FRAME BIT(0)
> #define MT_RXD1_NORMAL_HDR_TRANS BIT(23)
> #define MT_RXD1_NORMAL_HDR_OFFSET BIT(22)
> #define MT_RXD1_NORMAL_MAC_HDR_LEN GENMASK(21, 16)
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h b/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
> index 6e5db015b32c..4ebffe52cb8e 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
> @@ -368,6 +368,7 @@ enum mt7615_reg_base {
>
> #define MT_DMA_DCR0 MT_WF_DMA(0x000)
> #define MT_DMA_DCR0_MAX_RX_LEN GENMASK(15, 2)
> +#define MT_DMA_DCR0_DAMSDU_EN BIT(16)
> #define MT_DMA_DCR0_RX_VEC_DROP BIT(17)
>
> #define MT_DMA_RCFR0(_band) MT_WF_DMA(0x070 + (_band) * 0x40)
> --
> 2.18.0
>
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
[-- Attachment #2: Type: text/plain, Size: 170 bytes --]
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
prev parent reply other threads:[~2021-02-18 12:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-18 1:34 [PATCH 1/3] mt76: mt7615: enable hw rx-amsdu de-aggregation Ryder Lee
2021-02-18 1:34 ` [PATCH 2/3] mt76: mt7615: add rx checksum offload support Ryder Lee
2021-02-18 1:34 ` [PATCH 3/3] mt76: mt7615: add support for rx decapsulation offload Ryder Lee
2021-02-18 12:13 ` Lorenzo Bianconi [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YC5aBTfl3Hguglc0@lore-desk \
--to=lorenzo.bianconi@redhat.com \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=nbd@nbd.name \
--cc=ryder.lee@mediatek.com \
--cc=shayne.chen@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox