From: Lorenzo Bianconi <lorenzo@kernel.org>
To: Deren Wu <Deren.Wu@mediatek.com>
Cc: Felix Fietkau <nbd@nbd.name>,
Lorenzo Bianconi <lorenzo.bianconi@redhat.com>,
Sean Wang <sean.wang@mediatek.com>,
Soul Huang <Soul.Huang@mediatek.com>,
YN Chen <YN.Chen@mediatek.com>, Leon Yen <Leon.Yen@mediatek.com>,
Eric-SY Chang <Eric-SY.Chang@mediatek.com>,
KM Lin <km.lin@mediatek.com>,
Robin Chiu <robin.chiu@mediatek.com>,
CH Yeh <ch.yeh@mediatek.com>, Posh Sun <posh.sun@mediatek.com>,
Eric Liang <Eric.Liang@mediatek.com>,
Stella Chang <Stella.Chang@mediatek.com>,
Evelyn Tsai <evelyn.tsai@mediatek.com>,
Ryder Lee <ryder.lee@mediatek.com>,
Shayne Chen <shayne.chen@mediatek.com>,
linux-wireless <linux-wireless@vger.kernel.org>,
linux-mediatek <linux-mediatek@lists.infradead.org>
Subject: Re: [PATCH v2] mt76: mt7921s: fix missing fc type/sub-type for 802.11 pkts
Date: Wed, 9 Feb 2022 10:50:10 +0100 [thread overview]
Message-ID: <YgOOUlK3ecD4nnP4@lore-desk> (raw)
In-Reply-To: <41839f21510756e08919ae7930212817e37f40f0.1644370695.git.deren.wu@mediatek.com>
[-- Attachment #1.1: Type: text/plain, Size: 2291 bytes --]
> From: Deren Wu <deren.wu@mediatek.com>
>
> For non-mmio devices, should set fc values to proper txwi config
>
> Fixes: 48fab5bbef40 ("mt76: mt7921: introduce mt7921s support")
> Tested-by: Sean Wang <sean.wang@mediatek.com>
> Co-developed-by: Leon Yen <Leon.Yen@mediatek.com>
> Signed-off-by: Leon Yen <Leon.Yen@mediatek.com>
> Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
> v2: remove is_mmio which is just used once
> ---
> drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 12 +++++++++---
> drivers/net/wireless/mediatek/mt76/mt7921/mac.h | 3 +++
> 2 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
> index d17558349a17..f0ebee670131 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
> @@ -912,9 +912,15 @@ mt7921_mac_write_txwi_80211(struct mt7921_dev *dev, __le32 *txwi,
> txwi[3] |= cpu_to_le32(val);
> }
>
> - val = FIELD_PREP(MT_TXD7_TYPE, fc_type) |
> - FIELD_PREP(MT_TXD7_SUB_TYPE, fc_stype);
> - txwi[7] |= cpu_to_le32(val);
> + if (mt76_is_mmio(&dev->mt76)) {
> + val = FIELD_PREP(MT_TXD7_TYPE, fc_type) |
> + FIELD_PREP(MT_TXD7_SUB_TYPE, fc_stype);
> + txwi[7] |= cpu_to_le32(val);
> + } else {
> + val = FIELD_PREP(MT_TXD8_L_TYPE, fc_type) |
> + FIELD_PREP(MT_TXD8_L_SUB_TYPE, fc_stype);
> + txwi[8] |= cpu_to_le32(val);
> + }
> }
>
> void mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi,
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.h b/drivers/net/wireless/mediatek/mt76/mt7921/mac.h
> index 544a1c33126a..12e1cf8abe6e 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.h
> @@ -284,6 +284,9 @@ enum tx_mcu_port_q_idx {
> #define MT_TXD7_HW_AMSDU BIT(10)
> #define MT_TXD7_TX_TIME GENMASK(9, 0)
>
> +#define MT_TXD8_L_TYPE GENMASK(5, 4)
> +#define MT_TXD8_L_SUB_TYPE GENMASK(3, 0)
> +
> #define MT_TX_RATE_STBC BIT(13)
> #define MT_TX_RATE_NSS GENMASK(12, 10)
> #define MT_TX_RATE_MODE GENMASK(9, 6)
> --
> 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
WARNING: multiple messages have this Message-ID (diff)
From: Lorenzo Bianconi <lorenzo@kernel.org>
To: Deren Wu <Deren.Wu@mediatek.com>
Cc: Felix Fietkau <nbd@nbd.name>,
Lorenzo Bianconi <lorenzo.bianconi@redhat.com>,
Sean Wang <sean.wang@mediatek.com>,
Soul Huang <Soul.Huang@mediatek.com>,
YN Chen <YN.Chen@mediatek.com>, Leon Yen <Leon.Yen@mediatek.com>,
Eric-SY Chang <Eric-SY.Chang@mediatek.com>,
KM Lin <km.lin@mediatek.com>,
Robin Chiu <robin.chiu@mediatek.com>,
CH Yeh <ch.yeh@mediatek.com>, Posh Sun <posh.sun@mediatek.com>,
Eric Liang <Eric.Liang@mediatek.com>,
Stella Chang <Stella.Chang@mediatek.com>,
Evelyn Tsai <evelyn.tsai@mediatek.com>,
Ryder Lee <ryder.lee@mediatek.com>,
Shayne Chen <shayne.chen@mediatek.com>,
linux-wireless <linux-wireless@vger.kernel.org>,
linux-mediatek <linux-mediatek@lists.infradead.org>
Subject: Re: [PATCH v2] mt76: mt7921s: fix missing fc type/sub-type for 802.11 pkts
Date: Wed, 9 Feb 2022 10:50:10 +0100 [thread overview]
Message-ID: <YgOOUlK3ecD4nnP4@lore-desk> (raw)
In-Reply-To: <41839f21510756e08919ae7930212817e37f40f0.1644370695.git.deren.wu@mediatek.com>
[-- Attachment #1: Type: text/plain, Size: 2291 bytes --]
> From: Deren Wu <deren.wu@mediatek.com>
>
> For non-mmio devices, should set fc values to proper txwi config
>
> Fixes: 48fab5bbef40 ("mt76: mt7921: introduce mt7921s support")
> Tested-by: Sean Wang <sean.wang@mediatek.com>
> Co-developed-by: Leon Yen <Leon.Yen@mediatek.com>
> Signed-off-by: Leon Yen <Leon.Yen@mediatek.com>
> Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
> v2: remove is_mmio which is just used once
> ---
> drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 12 +++++++++---
> drivers/net/wireless/mediatek/mt76/mt7921/mac.h | 3 +++
> 2 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
> index d17558349a17..f0ebee670131 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
> @@ -912,9 +912,15 @@ mt7921_mac_write_txwi_80211(struct mt7921_dev *dev, __le32 *txwi,
> txwi[3] |= cpu_to_le32(val);
> }
>
> - val = FIELD_PREP(MT_TXD7_TYPE, fc_type) |
> - FIELD_PREP(MT_TXD7_SUB_TYPE, fc_stype);
> - txwi[7] |= cpu_to_le32(val);
> + if (mt76_is_mmio(&dev->mt76)) {
> + val = FIELD_PREP(MT_TXD7_TYPE, fc_type) |
> + FIELD_PREP(MT_TXD7_SUB_TYPE, fc_stype);
> + txwi[7] |= cpu_to_le32(val);
> + } else {
> + val = FIELD_PREP(MT_TXD8_L_TYPE, fc_type) |
> + FIELD_PREP(MT_TXD8_L_SUB_TYPE, fc_stype);
> + txwi[8] |= cpu_to_le32(val);
> + }
> }
>
> void mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi,
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.h b/drivers/net/wireless/mediatek/mt76/mt7921/mac.h
> index 544a1c33126a..12e1cf8abe6e 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.h
> @@ -284,6 +284,9 @@ enum tx_mcu_port_q_idx {
> #define MT_TXD7_HW_AMSDU BIT(10)
> #define MT_TXD7_TX_TIME GENMASK(9, 0)
>
> +#define MT_TXD8_L_TYPE GENMASK(5, 4)
> +#define MT_TXD8_L_SUB_TYPE GENMASK(3, 0)
> +
> #define MT_TX_RATE_STBC BIT(13)
> #define MT_TX_RATE_NSS GENMASK(12, 10)
> #define MT_TX_RATE_MODE GENMASK(9, 6)
> --
> 2.18.0
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2022-02-09 9:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-09 1:40 [PATCH v2] mt76: mt7921s: fix missing fc type/sub-type for 802.11 pkts Deren Wu
2022-02-09 1:40 ` Deren Wu
2022-02-09 9:50 ` Lorenzo Bianconi [this message]
2022-02-09 9:50 ` Lorenzo Bianconi
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=YgOOUlK3ecD4nnP4@lore-desk \
--to=lorenzo@kernel.org \
--cc=Deren.Wu@mediatek.com \
--cc=Eric-SY.Chang@mediatek.com \
--cc=Eric.Liang@mediatek.com \
--cc=Leon.Yen@mediatek.com \
--cc=Soul.Huang@mediatek.com \
--cc=Stella.Chang@mediatek.com \
--cc=YN.Chen@mediatek.com \
--cc=ch.yeh@mediatek.com \
--cc=evelyn.tsai@mediatek.com \
--cc=km.lin@mediatek.com \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=nbd@nbd.name \
--cc=posh.sun@mediatek.com \
--cc=robin.chiu@mediatek.com \
--cc=ryder.lee@mediatek.com \
--cc=sean.wang@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.