Commit 9df0fab9 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: move mt76_mcu_msg_alloc in mt76-core 



Move mt76_mcu_msg_alloc in mt76-core module and remove duplicated code.
mt76_mcu_msg_alloc will be reused adding support for mt7603 driver

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent b29e46b7

drivers/net/wireless/mediatek/mt76/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ obj-$(CONFIG_MT76x02_LIB) += mt76x02-lib.o 
obj-$(CONFIG_MT76x02_USB) += mt76x02-usb.o



mt76-y := \

	mmio.o util.o trace.o dma.o mac80211.o debugfs.o eeprom.o tx.o agg-rx.o

	mmio.o util.o trace.o dma.o mac80211.o debugfs.o eeprom.o \

	tx.o agg-rx.o mcu.o



mt76-usb-y := usb.o usb_trace.o usb_mcu.o

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

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 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"



struct sk_buff *

mt76_mcu_msg_alloc(const void *data, int head_len,

		   int data_len, int tail_len)

{

	struct sk_buff *skb;



	skb = alloc_skb(head_len + data_len + tail_len,

			GFP_KERNEL);

	if (!skb)

		return NULL;



	skb_reserve(skb, head_len);

	if (data && data_len)

		skb_put_data(skb, data, data_len);



	return skb;

}

EXPORT_SYMBOL_GPL(mt76_mcu_msg_alloc);

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

+4 −0
Original line number Diff line number Diff line
@@ -751,6 +751,10 @@ 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);



struct sk_buff *

mt76_mcu_msg_alloc(const void *data, int head_len,

		   int data_len, int tail_len);



void mt76u_mcu_complete_urb(struct urb *urb);

int mt76u_mcu_init_rx(struct mt76_dev *dev);

void mt76u_mcu_deinit(struct mt76_dev *dev);

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

+0 −12
Original line number Diff line number Diff line
@@ -21,18 +21,6 @@ 


#include "mt76x02_mcu.h"



static struct sk_buff *mt76x02_mcu_msg_alloc(const void *data, int len)

{

	struct sk_buff *skb;



	skb = alloc_skb(len, GFP_KERNEL);

	if (!skb)

		return NULL;

	memcpy(skb_put(skb, len), data, len);



	return skb;

}



static struct sk_buff *

mt76x02_mcu_get_response(struct mt76x02_dev *dev, unsigned long expires)

{

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

+6 −0
Original line number Diff line number Diff line
@@ -96,6 +96,12 @@ struct mt76x02_patch_header { 
	u8 pad[2];

};



static inline struct sk_buff *

mt76x02_mcu_msg_alloc(const void *data, int len)

{

	return mt76_mcu_msg_alloc(data, 0, len, 0);

}



int mt76x02_mcu_cleanup(struct mt76x02_dev *dev);

int mt76x02_mcu_calibrate(struct mt76x02_dev *dev, int type, u32 param);

int mt76x02_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data,