* [PATCH] mt76: mt7915: disable RX_HDR_TRANS_SHORT
@ 2022-04-20 7:11 ` Bo Jiao
0 siblings, 0 replies; 7+ messages in thread
From: Bo Jiao @ 2022-04-20 7:11 UTC (permalink / raw)
To: Felix Fietkau
Cc: linux-wireless, Ryder Lee, Sujuan Chen, lian . chen, Shayne Chen,
Evelyn Tsai, linux-mediatek, Bo Jiao
From: Bo Jiao <Bo.Jiao@mediatek.com>
This patch disables RX_TRANS_SHORT to make MDP to do header translation
when payload less than 8 bytes, hence the (QoS) null data can be encapsulated
to 802.3 format. However, WDS requires (QoS) null data in 802.11 format
to created vlan AP interfaces.
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: lian.chen <lian.chen@mediatek.com>
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
---
drivers/net/wireless/mediatek/mt76/agg-rx.c | 3 +++
drivers/net/wireless/mediatek/mt76/mt7915/init.c | 3 +++
drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 4 ----
drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 3 +++
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/agg-rx.c b/drivers/net/wireless/mediatek/mt76/agg-rx.c
index 7262222..efd1a85 100644
--- a/drivers/net/wireless/mediatek/mt76/agg-rx.c
+++ b/drivers/net/wireless/mediatek/mt76/agg-rx.c
@@ -167,6 +167,9 @@ void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames)
return;
}
+ if (!status->aggr)
+ return;
+
/* not part of a BA session */
ackp = status->qos_ctl & IEEE80211_QOS_CTL_ACK_POLICY_MASK;
if (ackp != IEEE80211_QOS_CTL_ACK_POLICY_BLOCKACK &&
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index facd604..12f8757 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -453,6 +453,9 @@ static void mt7915_mac_init(struct mt7915_dev *dev)
mt76_rmw_field(dev, MT_MDP_DCR1, MT_MDP_DCR1_MAX_RX_LEN, rx_len);
+ if (!is_mt7915(&dev->mt76))
+ mt76_clear(dev, MT_MDP_DCR2, MT_MDP_DCR2_RX_TRANS_SHORT);
+
/* enable hardware de-agg */
mt76_set(dev, MT_MDP_DCR0, MT_MDP_DCR0_DAMSDU_EN);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index 5080280..bc2fb00 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -842,10 +842,6 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)
if (!status->wcid || !ieee80211_is_data_qos(fc))
return 0;
- /* drop no data frame */
- if (fc & cpu_to_le16(IEEE80211_STYPE_NULLFUNC))
- return -EINVAL;
-
status->aggr = unicast &&
!ieee80211_is_qos_nullfunc(fc);
status->qos_ctl = qos_ctl;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
index e4dbf99..bb0dec8 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
@@ -158,6 +158,9 @@ enum offs_rev {
#define MT_MDP_DCR1 MT_MDP(0x004)
#define MT_MDP_DCR1_MAX_RX_LEN GENMASK(15, 3)
+#define MT_MDP_DCR2 MT_MDP(0x0e8)
+#define MT_MDP_DCR2_RX_TRANS_SHORT BIT(2)
+
#define MT_MDP_BNRCFR0(_band) MT_MDP(__OFFS(MDP_BNRCFR0) + \
((_band) << 8))
#define MT_MDP_RCFR0_MCU_RX_MGMT GENMASK(5, 4)
--
2.18.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH] mt76: mt7915: disable RX_HDR_TRANS_SHORT
@ 2022-04-20 7:11 ` Bo Jiao
0 siblings, 0 replies; 7+ messages in thread
From: Bo Jiao @ 2022-04-20 7:11 UTC (permalink / raw)
To: Felix Fietkau
Cc: linux-wireless, Ryder Lee, Sujuan Chen, lian . chen, Shayne Chen,
Evelyn Tsai, linux-mediatek, Bo Jiao
From: Bo Jiao <Bo.Jiao@mediatek.com>
This patch disables RX_TRANS_SHORT to make MDP to do header translation
when payload less than 8 bytes, hence the (QoS) null data can be encapsulated
to 802.3 format. However, WDS requires (QoS) null data in 802.11 format
to created vlan AP interfaces.
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: lian.chen <lian.chen@mediatek.com>
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
---
drivers/net/wireless/mediatek/mt76/agg-rx.c | 3 +++
drivers/net/wireless/mediatek/mt76/mt7915/init.c | 3 +++
drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 4 ----
drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 3 +++
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/agg-rx.c b/drivers/net/wireless/mediatek/mt76/agg-rx.c
index 7262222..efd1a85 100644
--- a/drivers/net/wireless/mediatek/mt76/agg-rx.c
+++ b/drivers/net/wireless/mediatek/mt76/agg-rx.c
@@ -167,6 +167,9 @@ void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames)
return;
}
+ if (!status->aggr)
+ return;
+
/* not part of a BA session */
ackp = status->qos_ctl & IEEE80211_QOS_CTL_ACK_POLICY_MASK;
if (ackp != IEEE80211_QOS_CTL_ACK_POLICY_BLOCKACK &&
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index facd604..12f8757 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -453,6 +453,9 @@ static void mt7915_mac_init(struct mt7915_dev *dev)
mt76_rmw_field(dev, MT_MDP_DCR1, MT_MDP_DCR1_MAX_RX_LEN, rx_len);
+ if (!is_mt7915(&dev->mt76))
+ mt76_clear(dev, MT_MDP_DCR2, MT_MDP_DCR2_RX_TRANS_SHORT);
+
/* enable hardware de-agg */
mt76_set(dev, MT_MDP_DCR0, MT_MDP_DCR0_DAMSDU_EN);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index 5080280..bc2fb00 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -842,10 +842,6 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)
if (!status->wcid || !ieee80211_is_data_qos(fc))
return 0;
- /* drop no data frame */
- if (fc & cpu_to_le16(IEEE80211_STYPE_NULLFUNC))
- return -EINVAL;
-
status->aggr = unicast &&
!ieee80211_is_qos_nullfunc(fc);
status->qos_ctl = qos_ctl;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
index e4dbf99..bb0dec8 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
@@ -158,6 +158,9 @@ enum offs_rev {
#define MT_MDP_DCR1 MT_MDP(0x004)
#define MT_MDP_DCR1_MAX_RX_LEN GENMASK(15, 3)
+#define MT_MDP_DCR2 MT_MDP(0x0e8)
+#define MT_MDP_DCR2_RX_TRANS_SHORT BIT(2)
+
#define MT_MDP_BNRCFR0(_band) MT_MDP(__OFFS(MDP_BNRCFR0) + \
((_band) << 8))
#define MT_MDP_RCFR0_MCU_RX_MGMT GENMASK(5, 4)
--
2.18.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] mt76: mt7915: disable RX_HDR_TRANS_SHORT
2022-04-20 7:11 ` Bo Jiao
@ 2022-04-20 11:25 ` Felix Fietkau
-1 siblings, 0 replies; 7+ messages in thread
From: Felix Fietkau @ 2022-04-20 11:25 UTC (permalink / raw)
To: Bo Jiao
Cc: linux-wireless, Ryder Lee, Sujuan Chen, lian . chen, Shayne Chen,
Evelyn Tsai, linux-mediatek
On 20.04.22 09:11, Bo Jiao wrote:
> From: Bo Jiao <Bo.Jiao@mediatek.com>
>
> This patch disables RX_TRANS_SHORT to make MDP to do header translation
> when payload less than 8 bytes, hence the (QoS) null data can be encapsulated
> to 802.3 format. However, WDS requires (QoS) null data in 802.11 format
> to created vlan AP interfaces.
>
> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
> Signed-off-by: lian.chen <lian.chen@mediatek.com>
> Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
> Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
> ---
> drivers/net/wireless/mediatek/mt76/agg-rx.c | 3 +++
> drivers/net/wireless/mediatek/mt76/mt7915/init.c | 3 +++
> drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 4 ----
> drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 3 +++
> 4 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/agg-rx.c b/drivers/net/wireless/mediatek/mt76/agg-rx.c
> index 7262222..efd1a85 100644
> --- a/drivers/net/wireless/mediatek/mt76/agg-rx.c
> +++ b/drivers/net/wireless/mediatek/mt76/agg-rx.c
> @@ -167,6 +167,9 @@ void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames)
> return;
> }
>
> + if (!status->aggr)
> + return;
> +
> /* not part of a BA session */
> ackp = status->qos_ctl & IEEE80211_QOS_CTL_ACK_POLICY_MASK;
> if (ackp != IEEE80211_QOS_CTL_ACK_POLICY_BLOCKACK &&
This is an unrelated change, for which I've just sent a replacement
patch. The rest is applied.
Thanks,
- Felix
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mt76: mt7915: disable RX_HDR_TRANS_SHORT
@ 2022-04-20 11:25 ` Felix Fietkau
0 siblings, 0 replies; 7+ messages in thread
From: Felix Fietkau @ 2022-04-20 11:25 UTC (permalink / raw)
To: Bo Jiao
Cc: linux-wireless, Ryder Lee, Sujuan Chen, lian . chen, Shayne Chen,
Evelyn Tsai, linux-mediatek
On 20.04.22 09:11, Bo Jiao wrote:
> From: Bo Jiao <Bo.Jiao@mediatek.com>
>
> This patch disables RX_TRANS_SHORT to make MDP to do header translation
> when payload less than 8 bytes, hence the (QoS) null data can be encapsulated
> to 802.3 format. However, WDS requires (QoS) null data in 802.11 format
> to created vlan AP interfaces.
>
> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
> Signed-off-by: lian.chen <lian.chen@mediatek.com>
> Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
> Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
> ---
> drivers/net/wireless/mediatek/mt76/agg-rx.c | 3 +++
> drivers/net/wireless/mediatek/mt76/mt7915/init.c | 3 +++
> drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 4 ----
> drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 3 +++
> 4 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/agg-rx.c b/drivers/net/wireless/mediatek/mt76/agg-rx.c
> index 7262222..efd1a85 100644
> --- a/drivers/net/wireless/mediatek/mt76/agg-rx.c
> +++ b/drivers/net/wireless/mediatek/mt76/agg-rx.c
> @@ -167,6 +167,9 @@ void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames)
> return;
> }
>
> + if (!status->aggr)
> + return;
> +
> /* not part of a BA session */
> ackp = status->qos_ctl & IEEE80211_QOS_CTL_ACK_POLICY_MASK;
> if (ackp != IEEE80211_QOS_CTL_ACK_POLICY_BLOCKACK &&
This is an unrelated change, for which I've just sent a replacement
patch. The rest is applied.
Thanks,
- Felix
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mt76: mt7915: disable RX_HDR_TRANS_SHORT
2022-04-20 11:25 ` Felix Fietkau
(?)
@ 2022-04-21 1:44 ` bo.jiao
2022-04-21 21:14 ` Felix Fietkau
-1 siblings, 1 reply; 7+ messages in thread
From: bo.jiao @ 2022-04-21 1:44 UTC (permalink / raw)
To: Felix Fietkau
Cc: linux-wireless, Ryder Lee, Sujuan Chen, lian . chen, Shayne Chen,
Evelyn Tsai, linux-mediatek
hi felix:
mt7915_mac_fill_rx:
......
if (!status->wcid || !ieee80211_is_data_qos(fc))
return 0;
status->aggr = unicast &&
!ieee80211_is_qos_nullfunc(fc);
status->qos_ctl = qos_ctl;
status->seqno = IEEE80211_SEQ_TO_SN(seq_ctrl);
return 0;
it will be returned by the condition !ieee80211_is_data_qos(fc) when
receive non-Qos (null) data, and the status->aggr/status-
>qos_ctl/status->seqno keep the default value 0.
mt76_rx_aggr_reorder:
....
sta = wcid_to_sta(wcid);
if (!sta)
return;
if (!status->aggr && !(status->flag & RX_FLAG_8023)) {
mt76_rx_aggr_check_ctl(skb, frames);
return;
}
....
those packet will be forced to do rx reorder and may incorrectly update
tid->head.
https://patchwork.kernel.org/project/linux-wireless/patch/2022042010503
8.36443-1-nbd@nbd.name/
Your replacement patch did not include this change.
+ if (!status->aggr)
+ return;
+
Thanks.
On Wed, 2022-04-20 at 13:25 +0200, Felix Fietkau wrote:
> On 20.04.22 09:11, Bo Jiao wrote:
> > From: Bo Jiao <Bo.Jiao@mediatek.com>
> >
> > This patch disables RX_TRANS_SHORT to make MDP to do header
> > translation
> > when payload less than 8 bytes, hence the (QoS) null data can be
> > encapsulated
> > to 802.3 format. However, WDS requires (QoS) null data in 802.11
> > format
> > to created vlan AP interfaces.
> >
> > Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
> > Signed-off-by: lian.chen <lian.chen@mediatek.com>
> > Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
> > Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
> > ---
> > drivers/net/wireless/mediatek/mt76/agg-rx.c | 3 +++
> > drivers/net/wireless/mediatek/mt76/mt7915/init.c | 3 +++
> > drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 4 ----
> > drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 3 +++
> > 4 files changed, 9 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/net/wireless/mediatek/mt76/agg-rx.c
> > b/drivers/net/wireless/mediatek/mt76/agg-rx.c
> > index 7262222..efd1a85 100644
> > --- a/drivers/net/wireless/mediatek/mt76/agg-rx.c
> > +++ b/drivers/net/wireless/mediatek/mt76/agg-rx.c
> > @@ -167,6 +167,9 @@ void mt76_rx_aggr_reorder(struct sk_buff *skb,
> > struct sk_buff_head *frames)
> > return;
> > }
> >
> > + if (!status->aggr)
> > + return;
> > +
> > /* not part of a BA session */
> > ackp = status->qos_ctl &
> > IEEE80211_QOS_CTL_ACK_POLICY_MASK;
> > if (ackp != IEEE80211_QOS_CTL_ACK_POLICY_BLOCKACK &&
>
> This is an unrelated change, for which I've just sent a replacement
> patch. The rest is applied.
>
> Thanks,
>
> - Felix
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] mt76: mt7915: disable RX_HDR_TRANS_SHORT
2022-04-21 1:44 ` bo.jiao
@ 2022-04-21 21:14 ` Felix Fietkau
0 siblings, 0 replies; 7+ messages in thread
From: Felix Fietkau @ 2022-04-21 21:14 UTC (permalink / raw)
To: bo.jiao
Cc: linux-wireless, Ryder Lee, Sujuan Chen, lian . chen, Shayne Chen,
Evelyn Tsai, linux-mediatek
Hi,
On 21.04.22 03:44, bo.jiao wrote:
> hi felix:
>
> mt7915_mac_fill_rx:
> ......
>
> if (!status->wcid || !ieee80211_is_data_qos(fc))
> return 0;
>
> status->aggr = unicast &&
> !ieee80211_is_qos_nullfunc(fc);
> status->qos_ctl = qos_ctl;
> status->seqno = IEEE80211_SEQ_TO_SN(seq_ctrl);
>
> return 0;
>
> it will be returned by the condition !ieee80211_is_data_qos(fc) when
> receive non-Qos (null) data, and the status->aggr/status-
>>qos_ctl/status->seqno keep the default value 0.
>
> mt76_rx_aggr_reorder:
> ....
>
> sta = wcid_to_sta(wcid);
> if (!sta)
> return;
>
> if (!status->aggr && !(status->flag & RX_FLAG_8023)) {
> mt76_rx_aggr_check_ctl(skb, frames);
> return;
> }
>
> ....
>
> those packet will be forced to do rx reorder and may incorrectly update
> tid->head.
> https://patchwork.kernel.org/project/linux-wireless/patch/2022042010503
> 8.36443-1-nbd@nbd.name/
> Your replacement patch did not include this change.
> + if (!status->aggr)
> + return;
> +
>
> Thanks.
I posted this patch: https://patchwork.kernel.org/project/linux-wireless/patch/20220420112524.52430-1-nbd@nbd.name/
- Felix
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] mt76: mt7915: disable RX_HDR_TRANS_SHORT
@ 2022-04-21 21:14 ` Felix Fietkau
0 siblings, 0 replies; 7+ messages in thread
From: Felix Fietkau @ 2022-04-21 21:14 UTC (permalink / raw)
To: bo.jiao
Cc: linux-wireless, Ryder Lee, Sujuan Chen, lian . chen, Shayne Chen,
Evelyn Tsai, linux-mediatek
Hi,
On 21.04.22 03:44, bo.jiao wrote:
> hi felix:
>
> mt7915_mac_fill_rx:
> ......
>
> if (!status->wcid || !ieee80211_is_data_qos(fc))
> return 0;
>
> status->aggr = unicast &&
> !ieee80211_is_qos_nullfunc(fc);
> status->qos_ctl = qos_ctl;
> status->seqno = IEEE80211_SEQ_TO_SN(seq_ctrl);
>
> return 0;
>
> it will be returned by the condition !ieee80211_is_data_qos(fc) when
> receive non-Qos (null) data, and the status->aggr/status-
>>qos_ctl/status->seqno keep the default value 0.
>
> mt76_rx_aggr_reorder:
> ....
>
> sta = wcid_to_sta(wcid);
> if (!sta)
> return;
>
> if (!status->aggr && !(status->flag & RX_FLAG_8023)) {
> mt76_rx_aggr_check_ctl(skb, frames);
> return;
> }
>
> ....
>
> those packet will be forced to do rx reorder and may incorrectly update
> tid->head.
> https://patchwork.kernel.org/project/linux-wireless/patch/2022042010503
> 8.36443-1-nbd@nbd.name/
> Your replacement patch did not include this change.
> + if (!status->aggr)
> + return;
> +
>
> Thanks.
I posted this patch: https://patchwork.kernel.org/project/linux-wireless/patch/20220420112524.52430-1-nbd@nbd.name/
- Felix
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-04-21 21:14 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-20 7:11 [PATCH] mt76: mt7915: disable RX_HDR_TRANS_SHORT Bo Jiao
2022-04-20 7:11 ` Bo Jiao
2022-04-20 11:25 ` Felix Fietkau
2022-04-20 11:25 ` Felix Fietkau
2022-04-21 1:44 ` bo.jiao
2022-04-21 21:14 ` Felix Fietkau
2022-04-21 21:14 ` Felix Fietkau
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.