Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH 06/10] mt76: rely on mt76_phy in tx_queue_skb signature
To:     Lorenzo Bianconi <lorenzo@kernel.org>
Cc:     lorenzo.bianconi@redhat.com, linux-wireless@vger.kernel.org,
        ryder.lee@mediatek.com, sean.wang@mediatek.com
References: <cover.1605048763.git.lorenzo@kernel.org>
 <2d64149efd52e67ab0865fc8d12a66d6f80e948a.1605048763.git.lorenzo@kernel.org>
From:   Felix Fietkau <nbd@nbd.name>
Message-ID: <ba325bef-3ff2-a8e1-67cb-b0e6f949d6b9@nbd.name>
Date:   Wed, 11 Nov 2020 09:24:17 +0100
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:78.0)
 Gecko/20100101 Thunderbird/78.4.1
MIME-Version: 1.0
In-Reply-To: <2d64149efd52e67ab0865fc8d12a66d6f80e948a.1605048763.git.lorenzo@kernel.org>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 2020-11-11 00:02, Lorenzo Bianconi wrote:
> Rely on mt76_phy instead of mt76_dev in tx_queue_skb signature.
> This is a preliminary patch to move data queues in mt76_phy and add
> dbdc support to mt7915 driver
> 
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
>  drivers/net/wireless/mediatek/mt76/dma.c      |  3 +-
>  drivers/net/wireless/mediatek/mt76/mt76.h     |  4 +--
>  .../wireless/mediatek/mt76/mt7603/beacon.c    | 28 ++++++++++---------
>  .../net/wireless/mediatek/mt76/mt76x02_mmio.c | 11 ++++----
>  drivers/net/wireless/mediatek/mt76/sdio.c     |  3 +-
>  drivers/net/wireless/mediatek/mt76/testmode.c |  3 +-
>  drivers/net/wireless/mediatek/mt76/tx.c       | 19 +++++++------
>  drivers/net/wireless/mediatek/mt76/usb.c      |  3 +-
>  8 files changed, 41 insertions(+), 33 deletions(-)
> 
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
> index d2e36f5f92b6..8a9c87301fea 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt76.h
> @@ -167,7 +167,7 @@ struct mt76_queue_ops {
>  		     int idx, int n_desc, int bufsize,
>  		     u32 ring_base);
>  
> -	int (*tx_queue_skb)(struct mt76_dev *dev, enum mt76_txq_id qid,
> +	int (*tx_queue_skb)(struct mt76_phy *phy, enum mt76_txq_id qid,
>  			    struct sk_buff *skb, struct mt76_wcid *wcid,
>  			    struct ieee80211_sta *sta);
>  
> @@ -749,7 +749,7 @@ static inline u16 mt76_rev(struct mt76_dev *dev)
>  #define mt76_init_queues(dev)		(dev)->mt76.queue_ops->init(&((dev)->mt76))
>  #define mt76_queue_alloc(dev, ...)	(dev)->mt76.queue_ops->alloc(&((dev)->mt76), __VA_ARGS__)
>  #define mt76_tx_queue_skb_raw(dev, ...)	(dev)->mt76.queue_ops->tx_queue_skb_raw(&((dev)->mt76), __VA_ARGS__)
> -#define mt76_tx_queue_skb(dev, ...)	(dev)->mt76.queue_ops->tx_queue_skb(&((dev)->mt76), __VA_ARGS__)
> +#define mt76_tx_queue_skb(phy, ...)	(phy)->mt76->dev->queue_ops->tx_queue_skb((phy)->mt76, __VA_ARGS__)
I'd prefer having a second macro here for the case where we pass a dev
instead of a phy, so we don't have to change all the older drivers to
use mdev->queue_ops->... directly.

- Felix