mt76: usb: move mt76u_skb_dma_info in mt76x02_usb_core.c (c2db13ac) · Commits · 戴 / test

drivers/net/wireless/mediatek/mt76/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ CFLAGS_usb_trace.o := -I$(src)

		mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o

		mt76x02-usb-y := mt76x02_usb_mcu.o
		mt76x02-usb-y := mt76x02_usb_mcu.o mt76x02_usb_core.o

		mt76x2-common-y := \
		mt76x2_eeprom.o mt76x2_tx_common.o mt76x2_mac_common.o \

drivers/net/wireless/mediatek/mt76/mt76.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -650,7 +650,6 @@ int mt76u_alloc_queues(struct mt76_dev *dev);
		void mt76u_stop_queues(struct mt76_dev *dev);
		void mt76u_stop_stat_wk(struct mt76_dev *dev);
		void mt76u_queues_deinit(struct mt76_dev *dev);
		int mt76u_skb_dma_info(struct sk_buff *skb, int port, u32 flags);

		void mt76u_mcu_complete_urb(struct urb *urb);
		int mt76u_mcu_init_rx(struct mt76_dev *dev);

drivers/net/wireless/mediatek/mt76/mt76x0/tx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		#include "mt76x0.h"
		#include "trace.h"
		#include "../mt76x02_util.h"
		#include "../mt76x02_usb.h"

		static struct mt76x02_txwi *
		mt76x0_push_txwi(struct mt76x0_dev dev, struct sk_buff skb,
		@@ -93,7 +94,7 @@ int mt76x0_tx_prepare_skb(struct mt76_dev mdev, void data,
		mt76x02_insert_hdr_pad(skb);
		txwi = mt76x0_push_txwi(dev, skb, sta, wcid, len);

		return mt76x02_set_txinfo(skb, wcid, q2ep(q->hw_idx));
		return mt76x02u_set_txinfo(skb, wcid, q2ep(q->hw_idx));
		}
		EXPORT_SYMBOL_GPL(mt76x0_tx_prepare_skb);

drivers/net/wireless/mediatek/mt76/mt76x02_usb.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -24,4 +24,6 @@ void mt76x02u_mcu_fw_reset(struct mt76_dev *dev);
		int mt76x02u_mcu_fw_send_data(struct mt76_dev dev, const void data,
		int data_len, u32 max_payload, u32 offset);

		int mt76x02u_skb_dma_info(struct sk_buff *skb, int port, u32 flags);
		int mt76x02u_set_txinfo(struct sk_buff skb, struct mt76_wcid wcid, u8 ep);
		#endif /* __MT76x02_USB_H */

drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c

0 → 100644

+72 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
		*
		* Permission to use, copy, modify, and/or distribute this software for any
		* purpose with or without fee is hereby granted, provided that the above
		* copyright notice and this permission notice appear in all copies.
		*
		* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
		* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
		* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
		* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
		* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
		* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
		* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
		*/

		#include "mt76.h"
		#include "dma.h"

		int mt76x02u_skb_dma_info(struct sk_buff *skb, int port, u32 flags)
		{
		struct sk_buff iter, last = skb;
		u32 info, pad;

		/* Buffer layout:
		* \| 4B \| xfer len \| pad \| 4B \|
		* \| TXINFO \| pkt/cmd \| zero pad to 4B \| zero \|
		*
		* length field of TXINFO should be set to 'xfer len'.
		*/
		info = FIELD_PREP(MT_TXD_INFO_LEN, round_up(skb->len, 4)) \|
		FIELD_PREP(MT_TXD_INFO_DPORT, port) \| flags;
		put_unaligned_le32(info, skb_push(skb, sizeof(info)));

		pad = round_up(skb->len, 4) + 4 - skb->len;
		skb_walk_frags(skb, iter) {
		last = iter;
		if (!iter->next) {
		skb->data_len += pad;
		skb->len += pad;
		break;
		}
		}

		if (unlikely(pad)) {
		if (__skb_pad(last, pad, true))
		return -ENOMEM;
		__skb_put(last, pad);
		}
		return 0;
		}

		int mt76x02u_set_txinfo(struct sk_buff skb, struct mt76_wcid wcid, u8 ep)
		{
		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
		enum mt76_qsel qsel;
		u32 flags;

		if ((info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) \|\|
		ep == MT_EP_OUT_HCCA)
		qsel = MT_QSEL_MGMT;
		else
		qsel = MT_QSEL_EDCA;

		flags = FIELD_PREP(MT_TXD_INFO_QSEL, qsel) \|
		MT_TXD_INFO_80211;
		if (!wcid \|\| wcid->hw_key_idx == 0xff \|\| wcid->sw_iv)
		flags \|= MT_TXD_INFO_WIV;

		return mt76x02u_skb_dma_info(skb, WLAN_PORT, flags);
		}
		EXPORT_SYMBOL_GPL(mt76x02u_set_txinfo);

Admin message