diff mbox series

[1/1] mt76: add mt7916 to set wlan_idx_hi

Message ID 5b82d68ee7c879591e22da51bfdb4af2e5fad228.1640175865.git.Bo.Jiao@mediatek.com (mailing list archive)
State Accepted
Delegated to: Felix Fietkau
Headers show
Series [1/1] mt76: add mt7916 to set wlan_idx_hi | expand

Commit Message

Bo Jiao Dec. 22, 2021, 12:29 p.m. UTC 
From: Bo Jiao <Bo.Jiao@mediatek.com>

since mt7916 support up to 544 wcid entries,
add it to set wlan_idx_hi.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
---
 drivers/net/wireless/mediatek/mt76/mt76_connac.h     | 5 +++++
 drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

Comments

Lorenzo Bianconi Dec. 23, 2021, 9:55 p.m. UTC | #1 
> From: Bo Jiao <Bo.Jiao@mediatek.com>
> 
> since mt7916 support up to 544 wcid entries,
> add it to set wlan_idx_hi.
> 
> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
> Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
> ---
>  drivers/net/wireless/mediatek/mt76/mt76_connac.h     | 5 +++++
>  drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 2 +-
>  2 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
> index e999d71..8701f04 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
> @@ -110,6 +110,11 @@ static inline bool is_mt7915(struct mt76_dev *dev)
>  	return mt76_chip(dev) == 0x7915;
>  }
>  
> +static inline bool is_mt7916(struct mt76_dev *dev)
> +{
> +	return mt76_chip(dev) == 0x7906;
> +}
> +
>  static inline u8 mt76_connac_chan_bw(struct cfg80211_chan_def *chandef)
>  {
>  	static const u8 width_to_bw[] = {
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> index edad583..fc9a084 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> @@ -1464,7 +1464,7 @@ mt76_connac_mcu_get_wlan_idx(struct mt76_dev *dev, struct mt76_wcid *wcid,
>  {
>  	*wlan_idx_hi = 0;
>  
> -	if (is_mt7921(dev) || is_mt7915(dev)) {
> +	if (is_mt7921(dev) || is_mt7915(dev) || is_mt7916(dev)) {
>  		*wlan_idx_lo = wcid ? to_wcid_lo(wcid->idx) : 0;
>  		*wlan_idx_hi = wcid ? to_wcid_hi(wcid->idx) : 0;

I guess I have already included the fix here:
https://patchwork.kernel.org/project/linux-wireless/patch/df4d462f1ef4cfc1ae4f6482051a28a10c78262b.1640260901.git.lorenzo@kernel.org/

Regards,
Lorenzo

>  	} else {
> -- 
> 2.18.0
>
Ryder Lee Dec. 23, 2021, 11:50 p.m. UTC | #2 
On Thu, 2021-12-23 at 22:55 +0100, Lorenzo Bianconi wrote:
> > From: Bo Jiao <Bo.Jiao@mediatek.com>
> > 
> > since mt7916 support up to 544 wcid entries,
> > add it to set wlan_idx_hi.
> > 
> > Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
> > Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
> > ---
> >  drivers/net/wireless/mediatek/mt76/mt76_connac.h     | 5 +++++
> >  drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 2 +-
> >  2 files changed, 6 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h
> > b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
> > index e999d71..8701f04 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h
> > +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
> > @@ -110,6 +110,11 @@ static inline bool is_mt7915(struct mt76_dev
> > *dev)
> >  	return mt76_chip(dev) == 0x7915;
> >  }
> >  
> > +static inline bool is_mt7916(struct mt76_dev *dev)
> > +{
> > +	return mt76_chip(dev) == 0x7906;
> > +}
> > +
> >  static inline u8 mt76_connac_chan_bw(struct cfg80211_chan_def
> > *chandef)
> >  {
> >  	static const u8 width_to_bw[] = {
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > index edad583..fc9a084 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > @@ -1464,7 +1464,7 @@ mt76_connac_mcu_get_wlan_idx(struct mt76_dev
> > *dev, struct mt76_wcid *wcid,
> >  {
> >  	*wlan_idx_hi = 0;
> >  
> > -	if (is_mt7921(dev) || is_mt7915(dev)) {
> > +	if (is_mt7921(dev) || is_mt7915(dev) || is_mt7916(dev)) {
> >  		*wlan_idx_lo = wcid ? to_wcid_lo(wcid->idx) : 0;
> >  		*wlan_idx_hi = wcid ? to_wcid_hi(wcid->idx) : 0;
> 
> I guess I have already included the fix here:
> 
https://patchwork.kernel.org/project/linux-wireless/patch/df4d462f1ef4cfc1ae4f6482051a28a10c78262b.1640260901.git.lorenzo@kernel.org/
> 
> Regards,
> Lorenzo
> 

I think we can fold these patches together and use !is_connac_v1
instead so that we can avoid endless is_mtxxxx || ... || ...

Ryder
Lorenzo Bianconi Dec. 24, 2021, 9:30 a.m. UTC | #3 
> On Thu, 2021-12-23 at 22:55 +0100, Lorenzo Bianconi wrote:
> > > From: Bo Jiao <Bo.Jiao@mediatek.com>
> > > 
> > > since mt7916 support up to 544 wcid entries,
> > > add it to set wlan_idx_hi.
> > > 
> > > Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
> > > Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
> > > ---
> > >  drivers/net/wireless/mediatek/mt76/mt76_connac.h     | 5 +++++
> > >  drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 2 +-
> > >  2 files changed, 6 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h
> > > b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
> > > index e999d71..8701f04 100644
> > > --- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h
> > > +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
> > > @@ -110,6 +110,11 @@ static inline bool is_mt7915(struct mt76_dev
> > > *dev)
> > >  	return mt76_chip(dev) == 0x7915;
> > >  }
> > >  
> > > +static inline bool is_mt7916(struct mt76_dev *dev)
> > > +{
> > > +	return mt76_chip(dev) == 0x7906;
> > > +}
> > > +
> > >  static inline u8 mt76_connac_chan_bw(struct cfg80211_chan_def
> > > *chandef)
> > >  {
> > >  	static const u8 width_to_bw[] = {
> > > diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > > b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > > index edad583..fc9a084 100644
> > > --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > > +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> > > @@ -1464,7 +1464,7 @@ mt76_connac_mcu_get_wlan_idx(struct mt76_dev
> > > *dev, struct mt76_wcid *wcid,
> > >  {
> > >  	*wlan_idx_hi = 0;
> > >  
> > > -	if (is_mt7921(dev) || is_mt7915(dev)) {
> > > +	if (is_mt7921(dev) || is_mt7915(dev) || is_mt7916(dev)) {
> > >  		*wlan_idx_lo = wcid ? to_wcid_lo(wcid->idx) : 0;
> > >  		*wlan_idx_hi = wcid ? to_wcid_hi(wcid->idx) : 0;
> > 
> > I guess I have already included the fix here:
> > 
> https://patchwork.kernel.org/project/linux-wireless/patch/df4d462f1ef4cfc1ae4f6482051a28a10c78262b.1640260901.git.lorenzo@kernel.org/
> > 
> > Regards,
> > Lorenzo
> > 
> 
> I think we can fold these patches together and use !is_connac_v1
> instead so that we can avoid endless is_mtxxxx || ... || ...

yes, it is already in my tree and I will post it in the next series.
@Felix: can you please ignore this patch?

Regards,
Lorenzo

> 
> Ryder
> 
>
diff mbox series

Patch

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
index e999d71..8701f04 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
@@ -110,6 +110,11 @@  static inline bool is_mt7915(struct mt76_dev *dev)
 	return mt76_chip(dev) == 0x7915;
 }
 
+static inline bool is_mt7916(struct mt76_dev *dev)
+{
+	return mt76_chip(dev) == 0x7906;
+}
+
 static inline u8 mt76_connac_chan_bw(struct cfg80211_chan_def *chandef)
 {
 	static const u8 width_to_bw[] = {
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index edad583..fc9a084 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -1464,7 +1464,7 @@  mt76_connac_mcu_get_wlan_idx(struct mt76_dev *dev, struct mt76_wcid *wcid,
 {
 	*wlan_idx_hi = 0;
 
-	if (is_mt7921(dev) || is_mt7915(dev)) {
+	if (is_mt7921(dev) || is_mt7915(dev) || is_mt7916(dev)) {
 		*wlan_idx_lo = wcid ? to_wcid_lo(wcid->idx) : 0;
 		*wlan_idx_hi = wcid ? to_wcid_hi(wcid->idx) : 0;
 	} else {