Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 576ecf65 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Felix Fietkau
Browse files

mt76x0: usb: move firmware loading to usb.c 



Firmware loading is usb specific, move it to usb.c file.

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

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

+0 −9
Original line number Diff line number Diff line
@@ -396,15 +396,6 @@ int mt76x0_init_hardware(struct mt76x0_dev *dev) 


	dev->beacon_offsets = beacon_offsets;



	mt76x0_chip_onoff(dev, true, true);



	if (!mt76x02_wait_for_mac(&dev->mt76))

		return -ETIMEDOUT;



	ret = mt76x0_mcu_init(dev);

	if (ret)

		return ret;



	if (!mt76_poll_msec(dev, MT_WPDMA_GLO_CFG,

			    MT_WPDMA_GLO_CFG_TX_DMA_BUSY |

			    MT_WPDMA_GLO_CFG_RX_DMA_BUSY, 0, 100))

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

+0 −167
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



#include <linux/kernel.h>

#include <linux/firmware.h>

#include <linux/delay.h>

#include <linux/usb.h>

#include <linux/skbuff.h>
@@ -27,172 +26,6 @@ 
#include "trace.h"

#include "../mt76x02_usb.h"



#define MCU_FW_URB_MAX_PAYLOAD		0x38f8

#define MCU_FW_URB_SIZE			(MCU_FW_URB_MAX_PAYLOAD + 12)

#define MCU_RESP_URB_SIZE		1024



static inline int firmware_running(struct mt76x0_dev *dev)

{

	return mt76_rr(dev, MT_MCU_COM_REG0) == 1;

}



static inline void skb_put_le32(struct sk_buff *skb, u32 val)

{

	put_unaligned_le32(val, skb_put(skb, 4));

}



struct mt76_fw {

	struct mt76x02_fw_header hdr;

	u8 ivb[MT_MCU_IVB_SIZE];

	u8 ilm[];

};



static int

mt76x0_upload_firmware(struct mt76x0_dev *dev, const struct mt76_fw *fw)

{

	void *ivb;

	u32 ilm_len, dlm_len;

	int i, ret;



	ivb = kmemdup(fw->ivb, sizeof(fw->ivb), GFP_KERNEL);

	if (!ivb)

		return -ENOMEM;



	ilm_len = le32_to_cpu(fw->hdr.ilm_len) - sizeof(fw->ivb);

	dev_dbg(dev->mt76.dev, "loading FW - ILM %u + IVB %zu\n",

		ilm_len, sizeof(fw->ivb));

	ret = mt76x02u_mcu_fw_send_data(&dev->mt76, fw->ilm, ilm_len,

					MCU_FW_URB_MAX_PAYLOAD,

					sizeof(fw->ivb));

	if (ret)

		goto error;



	dlm_len = le32_to_cpu(fw->hdr.dlm_len);

	dev_dbg(dev->mt76.dev, "loading FW - DLM %u\n", dlm_len);

	ret = mt76x02u_mcu_fw_send_data(&dev->mt76, fw->ilm + ilm_len,

					dlm_len, MCU_FW_URB_MAX_PAYLOAD,

					MT_MCU_DLM_OFFSET);

	if (ret)

		goto error;



	ret = mt76u_vendor_request(&dev->mt76, MT_VEND_DEV_MODE,

				   USB_DIR_OUT | USB_TYPE_VENDOR,

				   0x12, 0, ivb, sizeof(fw->ivb));

	if (ret < 0)

		goto error;

	ret = 0;



	for (i = 100; i && !firmware_running(dev); i--)

		msleep(10);

	if (!i) {

		ret = -ETIMEDOUT;

		goto error;

	}



	dev_dbg(dev->mt76.dev, "Firmware running!\n");

error:

	kfree(ivb);



	return ret;

}



static int mt76x0_load_firmware(struct mt76x0_dev *dev)

{

	const struct firmware *fw;

	const struct mt76x02_fw_header *hdr;

	int len, ret;

	u32 val;



	mt76_wr(dev, MT_USB_DMA_CFG, (MT_USB_DMA_CFG_RX_BULK_EN |

					 MT_USB_DMA_CFG_TX_BULK_EN));



	if (firmware_running(dev))

		return 0;



	ret = request_firmware(&fw, MT7610_FIRMWARE, dev->mt76.dev);

	if (ret)

		return ret;



	if (!fw || !fw->data || fw->size < sizeof(*hdr))

		goto err_inv_fw;



	hdr = (const struct mt76x02_fw_header *)fw->data;



	if (le32_to_cpu(hdr->ilm_len) <= MT_MCU_IVB_SIZE)

		goto err_inv_fw;



	len = sizeof(*hdr);

	len += le32_to_cpu(hdr->ilm_len);

	len += le32_to_cpu(hdr->dlm_len);



	if (fw->size != len)

		goto err_inv_fw;



	val = le16_to_cpu(hdr->fw_ver);

	dev_dbg(dev->mt76.dev,

		 "Firmware Version: %d.%d.%02d Build: %x Build time: %.16s\n",

		 (val >> 12) & 0xf, (val >> 8) & 0xf, val & 0xf,

		 le16_to_cpu(hdr->build_ver), hdr->build_time);



	len = le32_to_cpu(hdr->ilm_len);



	mt76_wr(dev, 0x1004, 0x2c);



	mt76_set(dev, MT_USB_DMA_CFG, (MT_USB_DMA_CFG_RX_BULK_EN |

				       MT_USB_DMA_CFG_TX_BULK_EN) |

				       FIELD_PREP(MT_USB_DMA_CFG_RX_BULK_AGG_TOUT, 0x20));

	mt76x02u_mcu_fw_reset(&dev->mt76);

	msleep(5);

/*

	mt76x0_rmw(dev, MT_PBF_CFG, 0, (MT_PBF_CFG_TX0Q_EN |

					 MT_PBF_CFG_TX1Q_EN |

					 MT_PBF_CFG_TX2Q_EN |

					 MT_PBF_CFG_TX3Q_EN));

*/



	mt76_wr(dev, MT_FCE_PSE_CTRL, 1);



	/* FCE tx_fs_base_ptr */

	mt76_wr(dev, MT_TX_CPU_FROM_FCE_BASE_PTR, 0x400230);

	/* FCE tx_fs_max_cnt */

	mt76_wr(dev, MT_TX_CPU_FROM_FCE_MAX_COUNT, 1);

	/* FCE pdma enable */

	mt76_wr(dev, MT_FCE_PDMA_GLOBAL_CONF, 0x44);

	/* FCE skip_fs_en */

	mt76_wr(dev, MT_FCE_SKIP_FS, 3);



	val = mt76_rr(dev, MT_USB_DMA_CFG);

	val |= MT_USB_DMA_CFG_UDMA_TX_WL_DROP;

	mt76_wr(dev, MT_USB_DMA_CFG, val);

	val &= ~MT_USB_DMA_CFG_UDMA_TX_WL_DROP;

	mt76_wr(dev, MT_USB_DMA_CFG, val);



	ret = mt76x0_upload_firmware(dev, (const struct mt76_fw *)fw->data);

	release_firmware(fw);



	mt76_wr(dev, MT_FCE_PSE_CTRL, 1);



	return ret;



err_inv_fw:

	dev_err(dev->mt76.dev, "Invalid firmware image\n");

	release_firmware(fw);

	return -ENOENT;

}



int mt76x0_mcu_init(struct mt76x0_dev *dev)

{

	int ret;



	ret = mt76x0_load_firmware(dev);

	if (ret)

		return ret;



	set_bit(MT76_STATE_MCU_RUNNING, &dev->mt76.state);



	return 0;

}



int mt76x0_mcu_cmd_init(struct mt76x0_dev *dev)

{

	return mt76x02_mcu_function_select(&dev->mt76, Q_SELECT, 1, false);

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

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ enum mcu_calibrate { 
	MCU_CAL_TX_GROUP_DELAY,

};



int mt76x0_mcu_init(struct mt76x0_dev *dev);

int mt76x0_mcu_cmd_init(struct mt76x0_dev *dev);



#endif

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

+171 −0
Original line number Diff line number Diff line
@@ -13,10 +13,12 @@ 


#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/firmware.h>

#include <linux/usb.h>



#include "mt76x0.h"

#include "usb.h"

#include "mcu.h"

#include "trace.h"

#include "../mt76x02_util.h"

#include "../mt76x02_usb.h"
@@ -48,6 +50,166 @@ static struct usb_device_id mt76x0_device_table[] = { 
	{ 0, }

};



struct mt76_fw {

	struct mt76x02_fw_header hdr;

	u8 ivb[MT_MCU_IVB_SIZE];

	u8 ilm[];

};



#define MCU_FW_URB_MAX_PAYLOAD		0x38f8

#define MCU_FW_URB_SIZE			(MCU_FW_URB_MAX_PAYLOAD + 12)



static inline int mt76x0_firmware_running(struct mt76x0_dev *dev)

{

	return mt76_rr(dev, MT_MCU_COM_REG0) == 1;

}



static int

mt76x0u_upload_firmware(struct mt76x0_dev *dev, const struct mt76_fw *fw)

{

	void *ivb;

	u32 ilm_len, dlm_len;

	int i, ret;



	ivb = kmemdup(fw->ivb, sizeof(fw->ivb), GFP_KERNEL);

	if (!ivb)

		return -ENOMEM;



	ilm_len = le32_to_cpu(fw->hdr.ilm_len) - sizeof(fw->ivb);

	dev_dbg(dev->mt76.dev, "loading FW - ILM %u + IVB %zu\n",

		ilm_len, sizeof(fw->ivb));

	ret = mt76x02u_mcu_fw_send_data(&dev->mt76, fw->ilm, ilm_len,

					MCU_FW_URB_MAX_PAYLOAD,

					sizeof(fw->ivb));

	if (ret)

		goto error;



	dlm_len = le32_to_cpu(fw->hdr.dlm_len);

	dev_dbg(dev->mt76.dev, "loading FW - DLM %u\n", dlm_len);

	ret = mt76x02u_mcu_fw_send_data(&dev->mt76, fw->ilm + ilm_len,

					dlm_len, MCU_FW_URB_MAX_PAYLOAD,

					MT_MCU_DLM_OFFSET);

	if (ret)

		goto error;



	ret = mt76u_vendor_request(&dev->mt76, MT_VEND_DEV_MODE,

				   USB_DIR_OUT | USB_TYPE_VENDOR,

				   0x12, 0, ivb, sizeof(fw->ivb));

	if (ret < 0)

		goto error;

	ret = 0;



	for (i = 100; i && !mt76x0_firmware_running(dev); i--)

		msleep(10);

	if (!i) {

		ret = -ETIMEDOUT;

		goto error;

	}



	dev_dbg(dev->mt76.dev, "Firmware running!\n");

error:

	kfree(ivb);



	return ret;

}



static int mt76x0u_load_firmware(struct mt76x0_dev *dev)

{

	const struct firmware *fw;

	const struct mt76x02_fw_header *hdr;

	int len, ret;

	u32 val;



	mt76_wr(dev, MT_USB_DMA_CFG, (MT_USB_DMA_CFG_RX_BULK_EN |

				      MT_USB_DMA_CFG_TX_BULK_EN));



	if (mt76x0_firmware_running(dev))

		return 0;



	ret = request_firmware(&fw, MT7610_FIRMWARE, dev->mt76.dev);

	if (ret)

		return ret;



	if (!fw || !fw->data || fw->size < sizeof(*hdr))

		goto err_inv_fw;



	hdr = (const struct mt76x02_fw_header *)fw->data;



	if (le32_to_cpu(hdr->ilm_len) <= MT_MCU_IVB_SIZE)

		goto err_inv_fw;



	len = sizeof(*hdr);

	len += le32_to_cpu(hdr->ilm_len);

	len += le32_to_cpu(hdr->dlm_len);



	if (fw->size != len)

		goto err_inv_fw;



	val = le16_to_cpu(hdr->fw_ver);

	dev_dbg(dev->mt76.dev,

		"Firmware Version: %d.%d.%02d Build: %x Build time: %.16s\n",

		(val >> 12) & 0xf, (val >> 8) & 0xf, val & 0xf,

		le16_to_cpu(hdr->build_ver), hdr->build_time);



	len = le32_to_cpu(hdr->ilm_len);



	mt76_wr(dev, 0x1004, 0x2c);



	mt76_set(dev, MT_USB_DMA_CFG, (MT_USB_DMA_CFG_RX_BULK_EN |

				       MT_USB_DMA_CFG_TX_BULK_EN) |

				       FIELD_PREP(MT_USB_DMA_CFG_RX_BULK_AGG_TOUT, 0x20));

	mt76x02u_mcu_fw_reset(&dev->mt76);

	msleep(5);

/*

	mt76x0_rmw(dev, MT_PBF_CFG, 0, (MT_PBF_CFG_TX0Q_EN |

					 MT_PBF_CFG_TX1Q_EN |

					 MT_PBF_CFG_TX2Q_EN |

					 MT_PBF_CFG_TX3Q_EN));

*/



	mt76_wr(dev, MT_FCE_PSE_CTRL, 1);



	/* FCE tx_fs_base_ptr */

	mt76_wr(dev, MT_TX_CPU_FROM_FCE_BASE_PTR, 0x400230);

	/* FCE tx_fs_max_cnt */

	mt76_wr(dev, MT_TX_CPU_FROM_FCE_MAX_COUNT, 1);

	/* FCE pdma enable */

	mt76_wr(dev, MT_FCE_PDMA_GLOBAL_CONF, 0x44);

	/* FCE skip_fs_en */

	mt76_wr(dev, MT_FCE_SKIP_FS, 3);



	val = mt76_rr(dev, MT_USB_DMA_CFG);

	val |= MT_USB_DMA_CFG_UDMA_TX_WL_DROP;

	mt76_wr(dev, MT_USB_DMA_CFG, val);

	val &= ~MT_USB_DMA_CFG_UDMA_TX_WL_DROP;

	mt76_wr(dev, MT_USB_DMA_CFG, val);



	ret = mt76x0u_upload_firmware(dev, (const struct mt76_fw *)fw->data);

	release_firmware(fw);



	mt76_wr(dev, MT_FCE_PSE_CTRL, 1);



	return ret;



err_inv_fw:

	dev_err(dev->mt76.dev, "Invalid firmware image\n");

	release_firmware(fw);

	return -ENOENT;

}



static int mt76x0u_mcu_init(struct mt76x0_dev *dev)

{

	int ret;



	ret = mt76x0u_load_firmware(dev);

	if (ret)

		return ret;



	set_bit(MT76_STATE_MCU_RUNNING, &dev->mt76.state);



	return 0;

}



static int mt76x0u_probe(struct usb_interface *usb_intf,

			 const struct usb_device_id *id)

{
@@ -101,6 +263,15 @@ static int mt76x0u_probe(struct usb_interface *usb_intf, 
	if (ret < 0)

		goto err;



	mt76x0_chip_onoff(dev, true, true);



	if (!mt76x02_wait_for_mac(&dev->mt76))

		return -ETIMEDOUT;



	ret = mt76x0u_mcu_init(dev);

	if (ret)

		goto err_hw;



	ret = mt76x0_register_device(dev);

	if (ret)

		goto err_hw;