Commit 56babfd9 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76x0: pci: move mcu code in pci_mcu.c 



Move pci mcu code in a dedicated source file in order to
improve maintainability and facilitate new device support
development

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

drivers/net/wireless/mediatek/mt76/mt76x0/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ mt76x0-common-y := \ 
	init.o main.o trace.o eeprom.o phy.o \

	init.o main.o trace.o eeprom.o phy.o \

	mac.o debugfs.o tx.o

	mac.o debugfs.o tx.o

mt76x0u-y := usb.o

mt76x0u-y := usb.o

mt76x0e-y := pci.o

mt76x0e-y := pci.o pci_mcu.o





# ccflags-y := -DDEBUG

# ccflags-y := -DDEBUG

CFLAGS_trace.o := -I$(src)
 
CFLAGS_trace.o := -I$(src)

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

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

	MCU_CAL_TX_GROUP_DELAY,

};

};





int mt76x0e_mcu_init(struct mt76x0_dev *dev);

static inline int mt76x0_firmware_running(struct mt76x0_dev *dev)

static inline int mt76x0_firmware_running(struct mt76x0_dev *dev)

{

{

	return mt76_rr(dev, MT_MCU_COM_REG0) == 1;

	return mt76_rr(dev, MT_MCU_COM_REG0) == 1;

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

+1 −112
Original line number Original line Diff line number Diff line
@@ -15,123 +15,12 @@ 
 */

 */





#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/firmware.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/pci.h>





#include "mt76x0.h"

#include "mt76x0.h"

#include "mcu.h"

#include "mcu.h"





#define MT7610E_FIRMWARE	"mediatek/mt7610e.bin"

#define MT7650E_FIRMWARE	"mediatek/mt7650e.bin"



#define MT_MCU_IVB_ADDR		(MT_MCU_ILM_ADDR + 0x54000 - MT_MCU_IVB_SIZE)



static int mt76x0e_load_firmware(struct mt76x0_dev *dev)

{

	bool is_combo_chip = mt76_chip(&dev->mt76) != 0x7610;

	u32 val, ilm_len, dlm_len, offset = 0;

	const struct mt76x02_fw_header *hdr;

	const struct firmware *fw;

	const char *firmware;

	const u8 *fw_payload;

	int len, err;



	if (mt76x0_firmware_running(dev))

		return 0;



	if (is_combo_chip)

		firmware = MT7650E_FIRMWARE;

	else

		firmware = MT7610E_FIRMWARE;



	err = request_firmware(&fw, firmware, dev->mt76.dev);

	if (err)

		return err;



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

		err = -EIO;

		goto out;

	}



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



	len = sizeof(*hdr);

	len += le32_to_cpu(hdr->ilm_len);

	len += le32_to_cpu(hdr->dlm_len);



	if (fw->size != len) {

		err = -EIO;

		goto out;

	}



	fw_payload = fw->data + sizeof(*hdr);



	val = le16_to_cpu(hdr->fw_ver);

	dev_info(dev->mt76.dev, "Firmware Version: %d.%d.%02d\n",

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



	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);



	if (is_combo_chip && !mt76_poll(dev, MT_MCU_SEMAPHORE_00, 1, 1, 600)) {

		dev_err(dev->mt76.dev,

			"Could not get hardware semaphore for loading fw\n");

		err = -ETIMEDOUT;

		goto out;

	}



	/* upload ILM. */

	mt76_wr(dev, MT_MCU_PCIE_REMAP_BASE4, 0);

	ilm_len = le32_to_cpu(hdr->ilm_len);

	if (is_combo_chip) {

		ilm_len -= MT_MCU_IVB_SIZE;

		offset = MT_MCU_IVB_SIZE;

	}

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

	mt76_wr_copy(dev, MT_MCU_ILM_ADDR + offset, fw_payload + offset,

		     ilm_len);



	/* upload IVB. */

	if (is_combo_chip) {

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

			MT_MCU_IVB_SIZE);

		mt76_wr_copy(dev, MT_MCU_IVB_ADDR, fw_payload, MT_MCU_IVB_SIZE);

	}



	/* upload DLM. */

	mt76_wr(dev, MT_MCU_PCIE_REMAP_BASE4, MT_MCU_DLM_OFFSET);

	dlm_len = le32_to_cpu(hdr->dlm_len);

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

	mt76_wr_copy(dev, MT_MCU_ILM_ADDR,

		     fw_payload + le32_to_cpu(hdr->ilm_len), dlm_len);



	/* trigger firmware */

	mt76_wr(dev, MT_MCU_PCIE_REMAP_BASE4, 0);

	if (is_combo_chip)

		mt76_wr(dev, MT_MCU_INT_LEVEL, 0x3);

	else

		mt76_wr(dev, MT_MCU_RESET_CTL, 0x300);



	if (!mt76_poll_msec(dev, MT_MCU_COM_REG0, 1, 1, 1000)) {

		dev_err(dev->mt76.dev, "Firmware failed to start\n");

		err = -ETIMEDOUT;

		goto out;

	}



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



out:

	if (is_combo_chip)

		mt76_wr(dev, MT_MCU_SEMAPHORE_00, 0x1);

	release_firmware(fw);



	return err;

}



static int

static int

mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id)

mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id)

{

{
@@ -161,7 +50,7 @@ mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	dev->mt76.rev = mt76_rr(dev, MT_ASIC_VERSION);

	dev->mt76.rev = mt76_rr(dev, MT_ASIC_VERSION);

	dev_info(dev->mt76.dev, "ASIC revision: %08x\n", dev->mt76.rev);

	dev_info(dev->mt76.dev, "ASIC revision: %08x\n", dev->mt76.rev);





	ret = mt76x0e_load_firmware(dev);

	ret = mt76x0e_mcu_init(dev);

	if (ret < 0)

	if (ret < 0)

		goto error;

		goto error;

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

0 → 100644
+146 −0
Original line number Original line 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 <linux/kernel.h>

#include <linux/firmware.h>



#include "mt76x0.h"

#include "mcu.h"



#define MT7610E_FIRMWARE	"mediatek/mt7610e.bin"

#define MT7650E_FIRMWARE	"mediatek/mt7650e.bin"



#define MT_MCU_IVB_ADDR		(MT_MCU_ILM_ADDR + 0x54000 - MT_MCU_IVB_SIZE)



static int mt76x0e_load_firmware(struct mt76x0_dev *dev)

{

	bool is_combo_chip = mt76_chip(&dev->mt76) != 0x7610;

	u32 val, ilm_len, dlm_len, offset = 0;

	const struct mt76x02_fw_header *hdr;

	const struct firmware *fw;

	const char *firmware;

	const u8 *fw_payload;

	int len, err;



	if (is_combo_chip)

		firmware = MT7650E_FIRMWARE;

	else

		firmware = MT7610E_FIRMWARE;



	err = request_firmware(&fw, firmware, dev->mt76.dev);

	if (err)

		return err;



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

		err = -EIO;

		goto out;

	}



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



	len = sizeof(*hdr);

	len += le32_to_cpu(hdr->ilm_len);

	len += le32_to_cpu(hdr->dlm_len);



	if (fw->size != len) {

		err = -EIO;

		goto out;

	}



	fw_payload = fw->data + sizeof(*hdr);



	val = le16_to_cpu(hdr->fw_ver);

	dev_info(dev->mt76.dev, "Firmware Version: %d.%d.%02d\n",

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



	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);



	if (is_combo_chip && !mt76_poll(dev, MT_MCU_SEMAPHORE_00, 1, 1, 600)) {

		dev_err(dev->mt76.dev,

			"Could not get hardware semaphore for loading fw\n");

		err = -ETIMEDOUT;

		goto out;

	}



	/* upload ILM. */

	mt76_wr(dev, MT_MCU_PCIE_REMAP_BASE4, 0);

	ilm_len = le32_to_cpu(hdr->ilm_len);

	if (is_combo_chip) {

		ilm_len -= MT_MCU_IVB_SIZE;

		offset = MT_MCU_IVB_SIZE;

	}

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

	mt76_wr_copy(dev, MT_MCU_ILM_ADDR + offset, fw_payload + offset,

		     ilm_len);



	/* upload IVB. */

	if (is_combo_chip) {

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

			MT_MCU_IVB_SIZE);

		mt76_wr_copy(dev, MT_MCU_IVB_ADDR, fw_payload, MT_MCU_IVB_SIZE);

	}



	/* upload DLM. */

	mt76_wr(dev, MT_MCU_PCIE_REMAP_BASE4, MT_MCU_DLM_OFFSET);

	dlm_len = le32_to_cpu(hdr->dlm_len);

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

	mt76_wr_copy(dev, MT_MCU_ILM_ADDR,

		     fw_payload + le32_to_cpu(hdr->ilm_len), dlm_len);



	/* trigger firmware */

	mt76_wr(dev, MT_MCU_PCIE_REMAP_BASE4, 0);

	if (is_combo_chip)

		mt76_wr(dev, MT_MCU_INT_LEVEL, 0x3);

	else

		mt76_wr(dev, MT_MCU_RESET_CTL, 0x300);



	if (!mt76_poll_msec(dev, MT_MCU_COM_REG0, 1, 1, 1000)) {

		dev_err(dev->mt76.dev, "Firmware failed to start\n");

		err = -ETIMEDOUT;

		goto out;

	}



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



out:

	if (is_combo_chip)

		mt76_wr(dev, MT_MCU_SEMAPHORE_00, 0x1);

	release_firmware(fw);



	return err;

}



int mt76x0e_mcu_init(struct mt76x0_dev *dev)

{

	static const struct mt76_mcu_ops mt76x0e_mcu_ops = {

		.mcu_msg_alloc = mt76x02_mcu_msg_alloc,

		.mcu_send_msg = mt76x02_mcu_msg_send,

	};

	int err;



	dev->mt76.mcu_ops = &mt76x0e_mcu_ops;



	err = mt76x0e_load_firmware(dev);

	if (err < 0)

		return err;



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



	return 0;

}