mt76x0: use mt76u_mcu_fw_send_data for fw uploading (a0b65ca6) · Commits · 戴 / test

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

+6 −82

Original line number	Diff line number	Diff line
		@@ -239,83 +239,9 @@ struct mt76_fw {
		u8 ilm[];
		};

		static int __mt76x0_dma_fw(struct mt76x0_dev *dev,
		const struct mt76x0_dma_buf *dma_buf,
		const void *data, u32 len, u32 dst_addr)
		{
		DECLARE_COMPLETION_ONSTACK(cmpl);
		struct mt76x0_dma_buf buf = dma_buf; / we need to fake length */
		__le32 reg;
		u32 val;
		int ret;

		reg = cpu_to_le32(FIELD_PREP(MT_TXD_INFO_TYPE, DMA_COMMAND) \|
		FIELD_PREP(MT_TXD_INFO_D_PORT, CPU_TX_PORT) \|
		FIELD_PREP(MT_TXD_INFO_LEN, len));
		memcpy(buf.buf, &reg, sizeof(reg));
		memcpy(buf.buf + sizeof(reg), data, len);
		memset(buf.buf + sizeof(reg) + len, 0, 8);

		mt76u_single_wr(&dev->mt76, MT_VEND_WRITE_FCE, MT_FCE_DMA_ADDR,
		dst_addr);

		len = roundup(len, 4);
		mt76u_single_wr(&dev->mt76, MT_VEND_WRITE_FCE, MT_FCE_DMA_LEN,
		len << 16);

		buf.len = MT_DMA_HDR_LEN + len + 4;
		ret = mt76x0_usb_submit_buf(dev, USB_DIR_OUT, MT_EP_OUT_INBAND_CMD,
		&buf, GFP_KERNEL,
		mt76u_mcu_complete_urb, &cmpl);
		if (ret)
		return ret;

		if (!wait_for_completion_timeout(&cmpl, msecs_to_jiffies(1000))) {
		dev_err(dev->mt76.dev, "Error: firmware upload timed out\n");
		usb_kill_urb(buf.urb);
		return -ETIMEDOUT;
		}
		if (mt76x0_urb_has_error(buf.urb)) {
		dev_err(dev->mt76.dev, "Error: firmware upload urb failed:%d\n",
		buf.urb->status);
		return buf.urb->status;
		}

		val = mt76_rr(dev, MT_TX_CPU_FROM_FCE_CPU_DESC_IDX);
		val++;
		mt76_wr(dev, MT_TX_CPU_FROM_FCE_CPU_DESC_IDX, val);

		msleep(5);

		return 0;
		}

		static int
		mt76x0_dma_fw(struct mt76x0_dev dev, struct mt76x0_dma_buf dma_buf,
		const void *data, int len, u32 dst_addr)
		{
		int n, ret;

		if (len == 0)
		return 0;

		n = min(MCU_FW_URB_MAX_PAYLOAD, len);
		ret = __mt76x0_dma_fw(dev, dma_buf, data, n, dst_addr);
		if (ret)
		return ret;

		#if 0
		if (!mt76_poll_msec(dev, MT_MCU_COM_REG1, BIT(31), BIT(31), 500))
		return -ETIMEDOUT;
		#endif

		return mt76x0_dma_fw(dev, dma_buf, data + n, len - n, dst_addr + n);
		}

		static int
		mt76x0_upload_firmware(struct mt76x0_dev dev, const struct mt76_fw fw)
		{
		struct mt76x0_dma_buf dma_buf;
		void *ivb;
		u32 ilm_len, dlm_len;
		int i, ret;
		@@ -323,22 +249,21 @@ mt76x0_upload_firmware(struct mt76x0_dev dev, const struct mt76_fw fw)
		ivb = kmemdup(fw->ivb, sizeof(fw->ivb), GFP_KERNEL);
		if (!ivb)
		return -ENOMEM;
		if (mt76x0_usb_alloc_buf(dev, MCU_FW_URB_SIZE, &dma_buf)) {
		ret = -ENOMEM;
		goto error;
		}

		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 = mt76x0_dma_fw(dev, &dma_buf, fw->ilm, ilm_len, sizeof(fw->ivb));
		ret = mt76u_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 = mt76x0_dma_fw(dev, &dma_buf, fw->ilm + ilm_len,
		dlm_len, MT_MCU_DLM_OFFSET);
		ret = mt76u_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;

		@@ -359,7 +284,6 @@ mt76x0_upload_firmware(struct mt76x0_dev dev, const struct mt76_fw fw)
		dev_dbg(dev->mt76.dev, "Firmware running!\n");
		error:
		kfree(ivb);
		mt76x0_usb_free_buf(dev, &dma_buf);

		return ret;
		}

Admin message