fixup! xhci-pci: asmedia: Add a firmware loader for ASM2214a chips

Author: marcan

drivers/usb/host/xhci-pci-asmedia.c

@@ -38,13 +38,27 @@
 /* BAR0 registers */
 #define ASMT_REG_ADDR			0x3000
 
-#define ASMT_REG_DATA			0x3004
+#define ASMT_REG_WDATA			0x3004
+#define ASMT_REG_RDATA			0x3008
 
 #define ASMT_REG_STATUS			0x3009
 #define ASMT_REG_STATUS_BUSY		BIT(7)
 
-#define ASMT_REG_WDATA			0x3010
-#define ASMT_REG_RDATA			0x3018
+#define ASMT_REG_CODE_WDATA		0x3010
+#define ASMT_REG_CODE_RDATA		0x3018
+
+#define ASMT_MMIO_CPU_MISC		0x500e
+#define ASMT_MMIO_CPU_MISC_CODE_RAM_WR	BIT(0)
+
+#define ASMT_MMIO_CPU_MODE_NEXT		0x5040
+#define ASMT_MMIO_CPU_MODE_CUR		0x5041
+
+#define ASMT_MMIO_CPU_MODE_RAM		BIT(0)
+#define ASMT_MMIO_CPU_MODE_HALFSPEED	BIT(1)
+
+#define ASMT_MMIO_CPU_EXEC_CTRL		0x5042
+#define ASMT_MMIO_CPU_EXEC_CTRL_RESET	BIT(0)
+#define ASMT_MMIO_CPU_EXEC_CTRL_HALT	BIT(1)
 
 #define TIMEOUT_USEC			10000
 #define RESET_TIMEOUT_USEC		500000
@@ -178,11 +192,41 @@ static int asmedia_wait_reset(struct pci_dev *pdev)
 	return ret;
 }
 
-static void asmedia_write_reg(struct usb_hcd *hcd, u16 addr, u8 data) {
+static u8 asmedia_read_reg(struct usb_hcd *hcd, u16 addr) {
 	void __iomem *regs = hcd->regs;
 	u8 status;
 	int ret;
 
+	ret = readb_poll_timeout(regs + ASMT_REG_STATUS,
+				 status, !(status & ASMT_REG_STATUS_BUSY),
+				 1000, TIMEOUT_USEC);
+
+	if (ret) {
+		dev_err(hcd->self.controller,
+			"Read reg wait timed out ([%04x])\n", addr);
+		return ~0;
+	}
+
+	writew_relaxed(addr, regs + ASMT_REG_ADDR);
+
+	ret = readb_poll_timeout(regs + ASMT_REG_STATUS,
+				 status, !(status & ASMT_REG_STATUS_BUSY),
+				 1000, TIMEOUT_USEC);
+
+	if (ret) {
+		dev_err(hcd->self.controller,
+			"Read reg addr timed out ([%04x])\n", addr);
+		return ~0;
+	}
+
+	return readb_relaxed(regs + ASMT_REG_RDATA);
+}
+
+static void asmedia_write_reg(struct usb_hcd *hcd, u16 addr, u8 data, bool wait) {
+	void __iomem *regs = hcd->regs;
+	u8 status;
+	int ret, i;
+
 	writew_relaxed(addr, regs + ASMT_REG_ADDR);
 
 	ret = readb_poll_timeout(regs + ASMT_REG_STATUS,
@@ -191,44 +235,66 @@ static void asmedia_write_reg(struct usb_hcd *hcd, u16 addr, u8 data) {
 
 	if (ret)
 		dev_err(hcd->self.controller,
-			"Write addr timed out ([%04x] = %02x)\n",
+			"Write reg addr timed out ([%04x] = %02x)\n",
 			addr, data);
 
-	writeb_relaxed(data, regs + ASMT_REG_DATA);
+	writeb_relaxed(data, regs + ASMT_REG_WDATA);
 
 	ret = readb_poll_timeout(regs + ASMT_REG_STATUS,
 				 status, !(status & ASMT_REG_STATUS_BUSY),
 				 1000, TIMEOUT_USEC);
 
 	if (ret)
 		dev_err(hcd->self.controller,
-			"Write data timed out ([%04x] = %02x)\n",
+			"Write reg data timed out ([%04x] = %02x)\n",
+			addr, data);
+
+	if (!wait)
+		return;
+
+	for (i = 0; i < TIMEOUT_USEC; i++) {
+		if (asmedia_read_reg(hcd, addr) == data)
+			break;
+	}
+
+	if (i >= TIMEOUT_USEC) {
+		dev_err(hcd->self.controller,
+			"Verify register timed out ([%04x] = %02x)\n",
 			addr, data);
+	}
 }
 
 static int asmedia_load_fw(struct pci_dev *pdev, const struct firmware *fw)
 {
 	struct usb_hcd *hcd;
 	void __iomem *regs;
 	const u16 *fw_data = (const u16 *)fw->data;
+	u16 raddr;
 	u32 data;
 	size_t index = 0, addr = 0;
 	size_t words = fw->size >> 1;
-	int ret;
+	int ret, i;
 
 	hcd = dev_get_drvdata(&pdev->dev);
 	regs = hcd->regs;
 
-	asmedia_write_reg(hcd, 0x5040, 2);
-	asmedia_write_reg(hcd, 0x5042, 1);
+	asmedia_write_reg(hcd, ASMT_MMIO_CPU_MODE_NEXT,
+			  ASMT_MMIO_CPU_MODE_HALFSPEED, false);
+
+	asmedia_write_reg(hcd, ASMT_MMIO_CPU_EXEC_CTRL,
+			  ASMT_MMIO_CPU_EXEC_CTRL_RESET, false);
 
 	ret = asmedia_wait_reset(pdev);
 	if (ret) {
 		dev_err(hcd->self.controller, "Failed pre-upload reset\n");
 		return ret;
 	}
 
-	asmedia_write_reg(hcd, 0x500e, 1);
+	asmedia_write_reg(hcd, ASMT_MMIO_CPU_EXEC_CTRL,
+			  ASMT_MMIO_CPU_EXEC_CTRL_HALT, false);
+
+	asmedia_write_reg(hcd, ASMT_MMIO_CPU_MISC,
+			  ASMT_MMIO_CPU_MISC_CODE_RAM_WR, true);
 
 	pci_write_config_byte(pdev, ASMT_CFG_SRAM_ACCESS,
 			      ASMT_CFG_SRAM_ACCESS_ENABLE);
@@ -243,18 +309,34 @@ static int asmedia_load_fw(struct pci_dev *pdev, const struct firmware *fw)
 		pci_write_config_word(pdev, ASMT_CFG_SRAM_ADDR,
 				      addr);
 
-		writel_relaxed(data, regs + ASMT_REG_WDATA);
+		writel_relaxed(data, regs + ASMT_REG_CODE_WDATA);
+
+		for (i = 0; i < TIMEOUT_USEC; i++) {
+			pci_read_config_word(pdev, ASMT_CFG_SRAM_ADDR, &raddr);
+			if (raddr != addr)
+				break;
+			udelay(1);
+		}
+
+		if (raddr == addr) {
+			dev_err(hcd->self.controller, "Word write timed out\n");
+			return -ETIMEDOUT;
+		}
 
 		if (++index & 0x4000)
 			index += 0x4000;
 		addr += 2;
 	}
 
-	asmedia_write_reg(hcd, 0x5040, 3);
-
 	pci_write_config_byte(pdev, ASMT_CFG_SRAM_ACCESS, 0);
 
-	asmedia_write_reg(hcd, 0x500e, 0);
+	asmedia_write_reg(hcd, ASMT_MMIO_CPU_MISC, 0, true);
+
+	asmedia_write_reg(hcd, ASMT_MMIO_CPU_MODE_NEXT,
+			  ASMT_MMIO_CPU_MODE_RAM |
+			  ASMT_MMIO_CPU_MODE_HALFSPEED, false);
+
+	asmedia_write_reg(hcd, ASMT_MMIO_CPU_EXEC_CTRL, 0, false);
 
 	ret = asmedia_wait_reset(pdev);
 	if (ret) {