usbdebug: Move under drivers/usb

Also relocate and split header files, there is some interest
for EHCI debug support without PCI.

Change-Id: Ibe91730eb72dfe0634fb38bdd184043495e2fb08
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5129
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>

2 files changed, 0 insertions, 1045 deletions

diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 18b30efefa..b1b4748960 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -49,7 +49,6 @@ romstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250.c
 romstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c
 romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c
 romstage-$(CONFIG_SPKMODEM) += spkmodem.c
-romstage-$(CONFIG_USBDEBUG_IN_ROMSTAGE) += usbdebug.c
 
 ifeq ($(CONFIG_EARLY_CBMEM_INIT),y)
 romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
@@ -92,7 +91,6 @@ romstage-y += clog2.c
 ramstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250.c
 ramstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c
 ramstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
-ramstage-$(CONFIG_USBDEBUG) += usbdebug.c
 ramstage-$(CONFIG_SPKMODEM) += spkmodem.c
 ramstage-$(CONFIG_BOOTSPLASH) += jpeg.c
 ramstage-$(CONFIG_TRACE) += trace.c
diff --git a/src/lib/usbdebug.c b/src/lib/usbdebug.c
deleted file mode 100644
index 885599b1a6..0000000000
--- a/src/lib/usbdebug.c
+++ /dev/null
@@ -1,1043 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2006 Eric Biederman (ebiederm@xmission.com)
- * Copyright (C) 2007 AMD
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
- */
-
-#include <stddef.h>
-#include <console/console.h>
-#include <arch/io.h>
-#include <device/pci.h>
-#include <device/pci_def.h>
-#include <arch/byteorder.h>
-#include <arch/early_variables.h>
-#include <string.h>
-#include <cbmem.h>
-
-#include <usb_ch9.h>
-#include <ehci.h>
-#include <usbdebug.h>
-
-
-#define DBGP_EP_VALID		(1<<0)
-#define DBGP_EP_ENABLED		(1<<1)
-#define DBGP_EP_BUSY		(1<<2)
-#define DBGP_EP_STATMASK	(DBGP_EP_VALID | DBGP_EP_ENABLED)
-
-struct dbgp_pipe
-{
-	u8 devnum;
-	u8 endpoint;
-	u8 pid;
-	u8 status;
-	int timeout;
-
-	u8 bufidx;
-	char buf[8];
-};
-
-#define DBGP_MAX_ENDPOINTS	4
-#define DBGP_SETUP_EP0		0	/* Compulsory endpoint 0. */
-#define DBGP_CONSOLE_EPOUT	1
-#define DBGP_CONSOLE_EPIN	2
-
-struct ehci_debug_info {
-	void *ehci_caps;
-	void *ehci_regs;
-	void *ehci_debug;
-
-	struct dbgp_pipe ep_pipe[DBGP_MAX_ENDPOINTS];
-};
-
-#if CONFIG_DEBUG_USBDEBUG
-static void dbgp_print_data(struct ehci_dbg_port *ehci_debug);
-static int dbgp_enabled(void);
-# define dprintk(LEVEL, args...) \
-	do { if (!dbgp_enabled()) printk(LEVEL, ##args); } while (0)
-#else
-# define dbgp_print_data(x)	do {} while(0)
-# define dprintk(LEVEL, args...)   do {} while(0)
-#endif
-
-#define USB_DEBUG_DEVNUM 127
-
-#define DBGP_LEN_UPDATE(x, len) (((x) & ~0x0f) | ((len) & 0x0f))
-/*
- * USB Packet IDs (PIDs)
- */
-
-/* token */
-#define USB_PID_OUT		0xe1
-#define USB_PID_IN		0x69
-#define USB_PID_SOF		0xa5
-#define USB_PID_SETUP		0x2d
-/* handshake */
-#define USB_PID_ACK		0xd2
-#define USB_PID_NAK		0x5a
-#define USB_PID_STALL		0x1e
-#define USB_PID_NYET		0x96
-/* data */
-#define USB_PID_DATA0		0xc3
-#define USB_PID_DATA1		0x4b
-#define USB_PID_DATA2		0x87
-#define USB_PID_MDATA		0x0f
-/* Special */
-#define USB_PID_PREAMBLE	0x3c
-#define USB_PID_ERR		0x3c
-#define USB_PID_SPLIT		0x78
-#define USB_PID_PING		0xb4
-#define USB_PID_UNDEF_0		0xf0
-
-#define USB_PID_DATA_TOGGLE	0x88
-#define DBGP_CLAIM (DBGP_OWNER | DBGP_ENABLED | DBGP_INUSE)
-
-#define PCI_CAP_ID_EHCI_DEBUG	0xa
-
-#define HUB_ROOT_RESET_TIME	50	/* times are in msec */
-#define HUB_SHORT_RESET_TIME	10
-#define HUB_LONG_RESET_TIME	200
-#define HUB_RESET_TIMEOUT	500
-
-#define DBGP_MICROFRAME_TIMEOUT_LOOPS	1000
-#define DBGP_MICROFRAME_RETRIES		10
-#define DBGP_MAX_PACKET		8
-
-static struct ehci_debug_info glob_dbg_info CAR_GLOBAL;
-#if !defined(__PRE_RAM__) && !defined(__SMM__)
-static struct device_operations *ehci_drv_ops;
-static struct device_operations ehci_dbg_ops;
-#endif
-
-static inline struct ehci_debug_info *dbgp_ehci_info(void)
-{
-	return car_get_var_ptr(&glob_dbg_info);
-}
-
-static int dbgp_wait_until_complete(struct ehci_dbg_port *ehci_debug)
-{
-	u32 ctrl;
-	int loop = 0;
-
-	do {
-		ctrl = read32((unsigned long)&ehci_debug->control);
-		/* Stop when the transaction is finished */
-		if (ctrl & DBGP_DONE)
-			break;
-	} while (++loop < DBGP_MICROFRAME_TIMEOUT_LOOPS);
-
-	if (! (ctrl & DBGP_DONE)) {
-		dprintk(BIOS_ERR, "dbgp_wait_until_complete: retry timeout.\n");
-		return -DBGP_ERR_SIGNAL;
-	}
-
-	/* Now that we have observed the completed transaction,
-	 * clear the done bit.
-	 */
-	write32((unsigned long)&ehci_debug->control, ctrl | DBGP_DONE);
-	return (ctrl & DBGP_ERROR) ? -DBGP_ERRCODE(ctrl) : DBGP_LEN(ctrl);
-}
-
-static void dbgp_breath(void)
-{
-	/* Sleep to give the debug port a chance to breathe */
-}
-
-static int dbgp_wait_until_done(struct ehci_dbg_port *ehci_debug, struct dbgp_pipe *pipe,
-	unsigned ctrl, const int timeout)
-{
-	u32 rd_ctrl, rd_pids;
-	u32 ctrl_prev = 0, pids_prev = 0;
-	u8 lpid;
-	int ret, host_retries;
-	int loop;
-
-	loop = 0;
-device_retry:
-	host_retries = 0;
-	if (loop++ >= timeout)
-		return -DBGP_ERR_BAD;
-
-host_retry:
-	if (host_retries++ >= DBGP_MICROFRAME_RETRIES)
-		return -DBGP_ERR_BAD;
-	if (loop == 1 || host_retries > 1)
-		dprintk(BIOS_SPEW, "dbgp:  start (@ %3d,%d) ctrl=%08x\n",
-			loop, host_retries, ctrl | DBGP_GO);
-	write32((unsigned long)&ehci_debug->control, ctrl | DBGP_GO);
-	ret = dbgp_wait_until_complete(ehci_debug);
-	rd_ctrl = read32((unsigned long)&ehci_debug->control);
-	rd_pids = read32((unsigned long)&ehci_debug->pids);
-
-	if (rd_ctrl != ctrl_prev || rd_pids != pids_prev || (ret<0)) {
-		ctrl_prev = rd_ctrl;
-		pids_prev = rd_pids;
-		dprintk(BIOS_SPEW, "dbgp: status (@ %3d,%d) ctrl=%08x pids=%08x ret=%d\n",
-			loop, host_retries, rd_ctrl, rd_pids, ret);
-	}
-
-	/* Controller hardware failure. */
-	if (ret == -DBGP_ERR_SIGNAL) {
-		return ret;
-
-	/* Bus failure (corrupted microframe). */
-	} else if (ret == -DBGP_ERR_BAD) {
-		goto host_retry;
-	}
-
-	lpid = DBGP_PID_GET(rd_pids);
-
-	/* If I get an ACK or in-sync DATA PID, we are done. */
-	if ((lpid == USB_PID_ACK) || (lpid == pipe->pid)) {
-		if (DBGP_LEN(rd_ctrl))
-			pipe->pid ^= USB_PID_DATA_TOGGLE;
-	}
-
-	/* If the port is getting full or it has dropped data
-	 * start pacing ourselves, not necessary but it's friendly.
-	 */
-	else if (lpid == USB_PID_NYET) {
-		dbgp_breath();
-		goto device_retry;
-	}
-
-	/* If I get a NACK or out-of-sync DATA PID, reissue the transmission. */
-	else if ((lpid == USB_PID_NAK) || (lpid == (pipe->pid ^ USB_PID_DATA_TOGGLE))) {
-		goto device_retry;
-	}
-
-	/* Abort on STALL handshake for endpoint 0.*/
-	else if ((lpid == USB_PID_STALL) && (pipe->endpoint == 0x0)) {
-		ret = -DBGP_ERR_BAD;
-	}
-
-	dbgp_print_data(ehci_debug);
-
-	return ret;
-}
-
-static void dbgp_set_data(struct ehci_dbg_port *ehci_debug, const void *buf, int size)
-{
-	const unsigned char *bytes = buf;
-	u32 lo, hi;
-	int i;
-
-	lo = hi = 0;
-	for (i = 0; i < 4 && i < size; i++)
-		lo |= bytes[i] << (8*i);
-	for (; i < 8 && i < size; i++)
-		hi |= bytes[i] << (8*(i - 4));
-	write32((unsigned long)&ehci_debug->data03, lo);
-	write32((unsigned long)&ehci_debug->data47, hi);
-}
-
-static void dbgp_get_data(struct ehci_dbg_port *ehci_debug, void *buf, int size)
-{
-	unsigned char *bytes = buf;
-	u32 lo, hi;
-	int i;
-
-	lo = read32((unsigned long)&ehci_debug->data03);
-	hi = read32((unsigned long)&ehci_debug->data47);
-	for (i = 0; i < 4 && i < size; i++)
-		bytes[i] = (lo >> (8*i)) & 0xff;
-	for (; i < 8 && i < size; i++)
-		bytes[i] = (hi >> (8*(i - 4))) & 0xff;
-}
-
-#if CONFIG_DEBUG_USBDEBUG
-static void dbgp_print_data(struct ehci_dbg_port *ehci_debug)
-{
-	u32 ctrl = read32((unsigned long)&ehci_debug->control);
-	u32	lo = read32((unsigned long)&ehci_debug->data03);
-	u32	hi = read32((unsigned long)&ehci_debug->data47);
-	int len = DBGP_LEN(ctrl);
-	if (len) {
-		int i;
-		dprintk(BIOS_SPEW, "dbgp:    buf:");
-		for (i = 0; i < 4 && i < len; i++)
-			dprintk(BIOS_SPEW, " %02x", (lo >> (8*i)) & 0xff);
-		for (; i < 8 && i < len; i++)
-			dprintk(BIOS_SPEW, " %02x", (hi >> (8*(i - 4))) & 0xff);
-		dprintk(BIOS_SPEW, "\n");
-	}
-}
-#endif
-
-static int dbgp_bulk_write(struct ehci_dbg_port *ehci_debug, struct dbgp_pipe *pipe,
-	const char *bytes, int size)
-{
-	u32 pids, addr, ctrl;
-	int ret;
-
-	if (size > DBGP_MAX_PACKET)
-		return -1;
-
-	addr = DBGP_EPADDR(pipe->devnum, pipe->endpoint);
-	pids = DBGP_PID_SET(pipe->pid, USB_PID_OUT);
-
-	ctrl = read32((unsigned long)&ehci_debug->control);
-	ctrl = DBGP_LEN_UPDATE(ctrl, size);
-	ctrl |= DBGP_OUT;
-
-	dbgp_set_data(ehci_debug, bytes, size);
-	write32((unsigned long)&ehci_debug->address, addr);
-	write32((unsigned long)&ehci_debug->pids, pids);
-
-	ret = dbgp_wait_until_done(ehci_debug, pipe, ctrl, pipe->timeout);
-
-	return ret;
-}
-
-int dbgp_bulk_write_x(struct dbgp_pipe *pipe, const char *bytes, int size)
-{
-	struct ehci_debug_info *dbg_info = dbgp_ehci_info();
-	return dbgp_bulk_write(dbg_info->ehci_debug, pipe, bytes, size);
-}
-
-static int dbgp_bulk_read(struct ehci_dbg_port *ehci_debug, struct dbgp_pipe *pipe,
-	void *data, int size)
-{
-	u32 pids, addr, ctrl;
-	int ret;
-
-	if (size > DBGP_MAX_PACKET)
-		return -1;
-
-	addr = DBGP_EPADDR(pipe->devnum, pipe->endpoint);
-	pids = DBGP_PID_SET(pipe->pid, USB_PID_IN);
-
-	ctrl = read32((unsigned long)&ehci_debug->control);
-	ctrl = DBGP_LEN_UPDATE(ctrl, size);
-	ctrl &= ~DBGP_OUT;
-
-	write32((unsigned long)&ehci_debug->address, addr);
-	write32((unsigned long)&ehci_debug->pids, pids);
-	ret = dbgp_wait_until_done(ehci_debug, pipe, ctrl, pipe->timeout);
-	if (ret < 0)
-		return ret;
-
-	if (size > ret)
-		size = ret;
-	dbgp_get_data(ehci_debug, data, size);
-	return ret;
-}
-
-int dbgp_bulk_read_x(struct dbgp_pipe *pipe, void *data, int size)
-{
-	struct ehci_debug_info *dbg_info = dbgp_ehci_info();
-	return dbgp_bulk_read(dbg_info->ehci_debug, pipe, data, size);
-}
-
-static void dbgp_mdelay(int ms)
-{
-	int i;
-
-	while (ms--) {
-		for (i = 0; i < 1000; i++)
-			inb(0x80);
-	}
-}
-
-static int dbgp_control_msg(struct ehci_dbg_port *ehci_debug, unsigned devnum, int requesttype,
-		int request, int value, int index, void *data, int size)
-{
-	struct ehci_debug_info *info = dbgp_ehci_info();
-	struct dbgp_pipe *pipe = &info->ep_pipe[DBGP_SETUP_EP0];
-	u32 pids, addr, ctrl;
-	struct usb_ctrlrequest req;
-	int read;
-	int ret, ret2;
-
-	read = (requesttype & USB_DIR_IN) != 0;
-	if (size > DBGP_MAX_PACKET)
-		return -1;
-
-	/* Compute the control message */
-	req.bRequestType = requesttype;
-	req.bRequest = request;
-	req.wValue = cpu_to_le16(value);
-	req.wIndex = cpu_to_le16(index);
-	req.wLength = cpu_to_le16(size);
-
-	pipe->devnum = devnum;
-	pipe->endpoint = 0;
-	pipe->pid = USB_PID_DATA0;
-	pipe->timeout = 1000;
-	addr = DBGP_EPADDR(pipe->devnum, pipe->endpoint);
-	pids = DBGP_PID_SET(pipe->pid, USB_PID_SETUP);
-
-	ctrl = read32((unsigned long)&ehci_debug->control);
-	ctrl = DBGP_LEN_UPDATE(ctrl, sizeof(req));
-	ctrl |= DBGP_OUT;
-
-	/* Setup stage */
-	dbgp_set_data(ehci_debug, &req, sizeof(req));
-	write32((unsigned long)&ehci_debug->address, addr);
-	write32((unsigned long)&ehci_debug->pids, pids);
-	ret = dbgp_wait_until_done(ehci_debug, pipe, ctrl, 1);
-	if (ret < 0)
-		return ret;
-
-	/* Data stage (optional) */
-	if (read && size)
-		ret = dbgp_bulk_read(ehci_debug, pipe, data, size);
-	else if (!read && size)
-		ret = dbgp_bulk_write(ehci_debug, pipe, data, size);
-
-	/* Status stage in opposite direction */
-	pipe->pid = USB_PID_DATA1;
-	ctrl = read32((unsigned long)&ehci_debug->control);
-	ctrl = DBGP_LEN_UPDATE(ctrl, 0);
-	if (read) {
-		pids = DBGP_PID_SET(pipe->pid, USB_PID_OUT);
-		ctrl |= DBGP_OUT;
-	} else {
-		pids = DBGP_PID_SET(pipe->pid, USB_PID_IN);
-		ctrl &= ~DBGP_OUT;
-	}
-
-	write32((unsigned long)&ehci_debug->pids, pids);
-	ret2 = dbgp_wait_until_done(ehci_debug, pipe, ctrl, pipe->timeout);
-	if (ret2 < 0)
-		return ret2;
-
-	return ret;
-}
-
-static int ehci_reset_port(struct ehci_regs *ehci_regs, int port)
-{
-	u32 portsc;
-	u32 delay_time, delay_ms;
-	int loop;
-
-	/* Reset the usb debug port */
-	portsc = read32((unsigned long)&ehci_regs->port_status[port - 1]);
-	portsc &= ~PORT_PE;
-	portsc |= PORT_RESET;
-	write32((unsigned long)&ehci_regs->port_status[port - 1], portsc);
-
-	delay_ms = HUB_ROOT_RESET_TIME;
-	for (delay_time = 0; delay_time < HUB_RESET_TIMEOUT;
-	     delay_time += delay_ms) {
-		dbgp_mdelay(delay_ms);
-
-		portsc = read32((unsigned long)&ehci_regs->port_status[port - 1]);
-		if (portsc & PORT_RESET) {
-			/* force reset to complete */
-			loop = 2;
-			write32((unsigned long)&ehci_regs->port_status[port - 1],
-					portsc & ~(PORT_RWC_BITS | PORT_RESET));
-			do {
-				dbgp_mdelay(delay_ms);
-				portsc = read32((unsigned long)&ehci_regs->port_status[port - 1]);
-				delay_time += delay_ms;
-			} while ((portsc & PORT_RESET) && (--loop > 0));
-			if (!loop) {
-				printk(BIOS_DEBUG, "ehci_reset_port forced done");
-			}
-		}
-
-		/* Device went away? */
-		if (!(portsc & PORT_CONNECT))
-			return -1; //-ENOTCONN;
-
-		/* bomb out completely if something weird happened */
-		if ((portsc & PORT_CSC))
-			return -2; //-EINVAL;
-
-		/* If we've finished resetting, then break out of the loop */
-		if (!(portsc & PORT_RESET) && (portsc & PORT_PE))
-			return 0;
-	}
-	return -3; //-EBUSY;
-}
-
-static int ehci_wait_for_port(struct ehci_regs *ehci_regs, int port)
-{
-	u32 status;
-	int ret, reps;
-
-	for (reps = 0; reps < 3; reps++) {
-		dbgp_mdelay(100);
-		status = read32((unsigned long)&ehci_regs->status);
-		if (status & STS_PCD) {
-			ret = ehci_reset_port(ehci_regs, port);
-			if (ret == 0)
-				return 0;
-		}
-	}
-	return -1; //-ENOTCONN;
-}
-
-#define USB_HUB_PORT_CONNECTION		0
-#define USB_HUB_PORT_ENABLED		1
-#define USB_HUB_PORT_RESET			4
-#define USB_HUB_PORT_POWER			8
-#define USB_HUB_C_PORT_CONNECTION	16
-#define USB_HUB_C_PORT_RESET		20
-
-#if CONFIG_USBDEBUG_OPTIONAL_HUB_PORT
-
-static int hub_port_status(const char * buf, int feature)
-{
-	return !!(buf[feature>>3] & (1<<(feature&0x7)));
-}
-
-static int dbgp_hub_enable(struct ehci_dbg_port *ehci_debug, unsigned int port)
-{
-	const u8 hub_addr = USB_DEBUG_DEVNUM-1;
-	char status[8];
-	int ret, loop;
-
-	/* Move hub to address 126. */
-	ret = dbgp_control_msg(ehci_debug, 0,
-		USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
-		USB_REQ_SET_ADDRESS, hub_addr, 0, NULL, 0);
-	if (ret < 0)
-		goto err;
-
-	/* Enter configured state on hub. */
-	ret = dbgp_control_msg(ehci_debug, hub_addr,
-		USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
-		USB_REQ_SET_CONFIGURATION, 1, 0, NULL, 0);
-	if (ret < 0)
-		goto err;
-
-	/* Set PORT_POWER, poll for PORT_CONNECTION. */
-	ret = dbgp_control_msg(ehci_debug, hub_addr,
-		USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_OTHER,
-		USB_REQ_SET_FEATURE, USB_HUB_PORT_POWER, port, NULL, 0);
-	if (ret < 0)
-		goto err;
-
-	loop = 100;
-	do {
-		dbgp_mdelay(10);
-		ret = dbgp_control_msg(ehci_debug, hub_addr,
-			USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_OTHER,
-			USB_REQ_GET_STATUS, 0, port, status, 4);
-		if (ret < 0)
-			goto err;
-		if (hub_port_status(status, USB_HUB_PORT_CONNECTION))
-			break;
-	} while (--loop);
-	if (! loop)
-		goto err;
-
-	ret = dbgp_control_msg(ehci_debug, hub_addr,
-		USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_OTHER,
-		USB_REQ_CLEAR_FEATURE, USB_HUB_C_PORT_CONNECTION, port, NULL, 0);
-	if (ret < 0)
-		goto err;
-
-
-	/* Set PORT_RESET, poll for C_PORT_RESET. */
-	ret = dbgp_control_msg(ehci_debug, hub_addr,
-		USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_OTHER,
-		USB_REQ_SET_FEATURE, USB_HUB_PORT_RESET, port, NULL, 0);
-	if (ret < 0)
-		goto err;
-
-	loop = 100;
-	do {
-		dbgp_mdelay(10);
-		ret = dbgp_control_msg(ehci_debug, hub_addr,
-			USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_OTHER,
-			USB_REQ_GET_STATUS, 0, port, status, 4);
-		if (ret < 0)
-			goto err;
-		if (hub_port_status(status, USB_HUB_C_PORT_RESET))
-			break;
-	} while (--loop);
-	if (! loop)
-		goto err;
-
-	ret = dbgp_control_msg(ehci_debug, hub_addr,
-		USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_OTHER,
-		USB_REQ_CLEAR_FEATURE, USB_HUB_C_PORT_RESET, port, NULL, 0);
-	if (ret < 0)
-		goto err;
-
-	if (hub_port_status(status, USB_HUB_PORT_ENABLED))
-		return 0;
-err:
-	return -1;
-}
-#endif /* CONFIG_USBDEBUG_OPTIONAL_HUB_PORT */
-
-static void enable_usbdebug(void)
-{
-#if defined(__PRE_RAM__) || !CONFIG_USBDEBUG_IN_ROMSTAGE
-	pci_devfn_t dbg_dev = pci_ehci_dbg_dev(CONFIG_USBDEBUG_HCD_INDEX);
-	pci_ehci_dbg_enable(dbg_dev, CONFIG_EHCI_BAR);
-#endif
-}
-
-static void set_debug_port(unsigned int port)
-{
-	pci_devfn_t dbg_dev = pci_ehci_dbg_dev(CONFIG_USBDEBUG_HCD_INDEX);
-	pci_ehci_dbg_set_port(dbg_dev, port);
-}
-
-static int usbdebug_init_(unsigned ehci_bar, unsigned offset, struct ehci_debug_info *info)
-{
-	struct ehci_caps *ehci_caps;
-	struct ehci_regs *ehci_regs;
-	struct ehci_dbg_port *ehci_debug;
-
-	struct usb_debug_descriptor dbgp_desc;
-	u32 cmd, ctrl, status, portsc, hcs_params;
-	u32 debug_port, new_debug_port = 0, n_ports;
-	u32 devnum;
-	int ret, i, configured;
-	int loop;
-	int port_map_tried;
-	int playtimes = 3;
-
-	ehci_caps  = (struct ehci_caps *)ehci_bar;
-	ehci_regs  = (struct ehci_regs *)(ehci_bar +
-			HC_LENGTH(read32((unsigned long)&ehci_caps->hc_capbase)));
-	ehci_debug = (struct ehci_dbg_port *)(ehci_bar + offset);
-	info->ehci_debug = (void *)0;
-	memset(&info->ep_pipe, 0, sizeof (info->ep_pipe));
-
-	if (CONFIG_USBDEBUG_DEFAULT_PORT > 0)
-		set_debug_port(CONFIG_USBDEBUG_DEFAULT_PORT);
-	else
-		set_debug_port(1);
-
-try_next_time:
-	port_map_tried = 0;
-
-try_next_port:
-	hcs_params = read32((unsigned long)&ehci_caps->hcs_params);
-	debug_port = HCS_DEBUG_PORT(hcs_params);
-	n_ports    = HCS_N_PORTS(hcs_params);
-
-	dprintk(BIOS_INFO, "ehci_bar: 0x%x\n", ehci_bar);
-	dprintk(BIOS_INFO, "debug_port: %d\n", debug_port);
-	dprintk(BIOS_INFO, "n_ports:    %d\n", n_ports);
-
-        for (i = 1; i <= n_ports; i++) {
-                portsc = read32((unsigned long)&ehci_regs->port_status[i-1]);
-                dprintk(BIOS_INFO, "PORTSC #%d: %08x\n", i, portsc);
-        }
-
-	if(port_map_tried && (new_debug_port != debug_port)) {
-		if(--playtimes) {
-			set_debug_port(debug_port);
-			goto try_next_time;
-		}
-		return -1;
-	}
-
-	/* Wait until the controller is halted */
-	status = read32((unsigned long)&ehci_regs->status);
-	if (!(status & STS_HALT)) {
-		cmd = read32((unsigned long)&ehci_regs->command);
-		cmd &= ~CMD_RUN;
-		write32((unsigned long)&ehci_regs->command, cmd);
-		loop = 100;
-		do {
-			dbgp_mdelay(10);
-			status = read32((unsigned long)&ehci_regs->status);
-		} while (!(status & STS_HALT) && (--loop > 0));
-		if (status & STS_HALT)
-			dprintk(BIOS_INFO, "EHCI controller halted successfully.\n");
-		else
-			dprintk(BIOS_INFO, "EHCI controller is not halted. Reset may fail.\n");
-	}
-
-	loop = 100;
-	/* Reset the EHCI controller */
-	cmd = read32((unsigned long)&ehci_regs->command);
-	cmd |= CMD_RESET;
-	write32((unsigned long)&ehci_regs->command, cmd);
-	do {
-		dbgp_mdelay(10);
-		cmd = read32((unsigned long)&ehci_regs->command);
-	} while ((cmd & CMD_RESET) && (--loop > 0));
-
-	if(!loop) {
-		dprintk(BIOS_INFO, "Could not reset EHCI controller.\n");
-		// on some systems it works without succeeding here.
-		// return -2;
-	} else {
-		dprintk(BIOS_INFO, "EHCI controller reset successfully.\n");
-	}
-
-	/* Claim ownership, but do not enable yet */
-	ctrl = read32((unsigned long)&ehci_debug->control);
-	ctrl |= DBGP_OWNER;
-	ctrl &= ~(DBGP_ENABLED | DBGP_INUSE);
-	write32((unsigned long)&ehci_debug->control, ctrl);
-
-	/* Start EHCI controller */
-	cmd = read32((unsigned long)&ehci_regs->command);
-	cmd &= ~(CMD_LRESET | CMD_IAAD | CMD_PSE | CMD_ASE | CMD_RESET);
-	cmd |= CMD_RUN;
-	write32((unsigned long)&ehci_regs->command, cmd);
-
-	/* Ensure everything is routed to the EHCI */
-	write32((unsigned long)&ehci_regs->configured_flag, FLAG_CF);
-
-	/* Wait until the controller is no longer halted */
-	loop = 10;
-	do {
-		dbgp_mdelay(10);
-		status = read32((unsigned long)&ehci_regs->status);
-	} while ((status & STS_HALT) && (--loop > 0));
-
-	if(!loop) {
-		dprintk(BIOS_INFO, "EHCI could not be started.\n");
-		return -3;
-	}
-	dprintk(BIOS_INFO, "EHCI started.\n");
-
-	/* Wait for a device to show up in the debug port */
-	ret = ehci_wait_for_port(ehci_regs, debug_port);
-	if (ret < 0) {
-		dprintk(BIOS_INFO, "No device found in debug port %d\n", debug_port);
-		goto next_debug_port;
-	}
-	dprintk(BIOS_INFO, "EHCI done waiting for port.\n");
-
-	/* Enable the debug port */
-	ctrl = read32((unsigned long)&ehci_debug->control);
-	ctrl |= DBGP_CLAIM;
-	write32((unsigned long)&ehci_debug->control, ctrl);
-	ctrl = read32((unsigned long)&ehci_debug->control);
-	if ((ctrl & DBGP_CLAIM) != DBGP_CLAIM) {
-		dprintk(BIOS_INFO, "No device in EHCI debug port.\n");
-		write32((unsigned long)&ehci_debug->control, ctrl & ~DBGP_CLAIM);
-		ret = -4;
-		goto err;
-	}
-	dprintk(BIOS_INFO, "EHCI debug port enabled.\n");
-
-	/* Completely transfer the debug device to the debug controller */
-	portsc = read32((unsigned long)&ehci_regs->port_status[debug_port - 1]);
-	portsc &= ~PORT_PE;
-	write32((unsigned long)&ehci_regs->port_status[debug_port - 1], portsc);
-
-	dbgp_mdelay(100);
-
-#if CONFIG_USBDEBUG_OPTIONAL_HUB_PORT
-	ret = dbgp_hub_enable(ehci_debug, CONFIG_USBDEBUG_OPTIONAL_HUB_PORT);
-	if (ret < 0) {
-		dprintk(BIOS_INFO, "Could not enable USB hub on debug port.\n");
-		ret = -6;
-		goto err;
-	}
-#endif
-
-	/* Find the debug device and make it device number 127 */
-	devnum = 0;
-debug_dev_retry:
-	memset(&dbgp_desc, 0, sizeof(dbgp_desc));
-	ret = dbgp_control_msg(ehci_debug, devnum,
-		USB_DIR_IN | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
-		USB_REQ_GET_DESCRIPTOR, (USB_DT_DEBUG << 8), 0,
-		&dbgp_desc, sizeof(dbgp_desc));
-	if (ret == sizeof(dbgp_desc)) {
-		if (dbgp_desc.bLength == sizeof(dbgp_desc) && dbgp_desc.bDescriptorType==USB_DT_DEBUG)
-			goto debug_dev_found;
-		else
-			dprintk(BIOS_INFO, "Invalid debug device descriptor.\n");
-	}
-	if (devnum == 0) {
-		devnum = USB_DEBUG_DEVNUM;
-		goto debug_dev_retry;
-	} else {
-		dprintk(BIOS_INFO, "Could not find attached debug device.\n");
-		ret = -5;
-		goto err;
-	}
-debug_dev_found:
-
-	/* Move the device to 127 if it isn't already there */
-	if (devnum != USB_DEBUG_DEVNUM) {
-		ret = dbgp_control_msg(ehci_debug, devnum,
-			USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
-			USB_REQ_SET_ADDRESS, USB_DEBUG_DEVNUM, 0, NULL, 0);
-		if (ret < 0) {
-			dprintk(BIOS_INFO, "Could not move attached device to %d.\n",
-				USB_DEBUG_DEVNUM);
-			ret = -7;
-			goto err;
-		}
-		devnum = USB_DEBUG_DEVNUM;
-		dprintk(BIOS_INFO, "EHCI debug device renamed to 127.\n");
-	}
-
-	/* Enable the debug interface */
-	ret = dbgp_control_msg(ehci_debug, USB_DEBUG_DEVNUM,
-		USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
-		USB_REQ_SET_FEATURE, USB_DEVICE_DEBUG_MODE, 0, NULL, 0);
-	if (ret < 0) {
-		dprintk(BIOS_INFO, "Could not enable EHCI debug device.\n");
-		ret = -8;
-		goto err;
-	}
-	dprintk(BIOS_INFO, "EHCI debug interface enabled.\n");
-
-	/* Prepare endpoint pipes. */
-	for (i=1; i<DBGP_MAX_ENDPOINTS; i++) {
-		info->ep_pipe[i].devnum = USB_DEBUG_DEVNUM;
-		info->ep_pipe[i].pid = USB_PID_DATA0;
-		info->ep_pipe[i].timeout = 1000;
-	}
-	info->ep_pipe[DBGP_CONSOLE_EPOUT].endpoint = dbgp_desc.bDebugOutEndpoint;
-	info->ep_pipe[DBGP_CONSOLE_EPIN].endpoint = dbgp_desc.bDebugInEndpoint;
-
-	/* Perform a small write. */
-	configured = 0;
-small_write:
-	ret = dbgp_bulk_write(ehci_debug, &info->ep_pipe[DBGP_CONSOLE_EPOUT], "USB\r\n",5);
-	if (ret < 0) {
-		dprintk(BIOS_INFO, "dbgp_bulk_write failed: %d\n", ret);
-		if (!configured) {
-			/* Send Set Configure request to device. This is required for FX2
-			   (CY7C68013) to transfer from USB state Addressed to Configured,
-			   only then endpoints other than 0 are enabled. */
-			if (dbgp_control_msg(ehci_debug, USB_DEBUG_DEVNUM,
-				USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
-				USB_REQ_SET_CONFIGURATION, 1, 0, NULL, 0) >= 0) {
-				configured = 1;
-				goto small_write;
-			}
-		}
-		ret = -9;
-		goto err;
-	}
-	dprintk(BIOS_INFO, "Test write done\n");
-
-	info->ehci_caps = ehci_caps;
-	info->ehci_regs = ehci_regs;
-	info->ehci_debug = ehci_debug;
-
-	info->ep_pipe[DBGP_SETUP_EP0].status |= DBGP_EP_ENABLED | DBGP_EP_VALID;
-	info->ep_pipe[DBGP_CONSOLE_EPOUT].status |= DBGP_EP_ENABLED | DBGP_EP_VALID;
-	info->ep_pipe[DBGP_CONSOLE_EPIN].status |= DBGP_EP_ENABLED | DBGP_EP_VALID;
-	return 0;
-err:
-	/* Things didn't work so remove my claim */
-	ctrl = read32((unsigned long)&ehci_debug->control);
-	ctrl &= ~(DBGP_CLAIM | DBGP_OUT);
-	write32((unsigned long)(unsigned long)&ehci_debug->control, ctrl);
-	//return ret;
-
-next_debug_port:
-#if CONFIG_USBDEBUG_DEFAULT_PORT==0
-	port_map_tried |= (1 << (debug_port - 1));
-	new_debug_port = ((debug_port-1 + 1) % n_ports) + 1;
-	if (port_map_tried != ((1 << n_ports) - 1)) {
-		set_debug_port(new_debug_port);
-		goto try_next_port;
-	}
-	if (--playtimes) {
-		set_debug_port(new_debug_port);
-		goto try_next_time;
-	}
-#else
-	if (0)
-		goto try_next_port;
-	if (--playtimes)
-		goto try_next_time;
-#endif
-
-	return -10;
-}
-
-#if CONFIG_DEBUG_USBDEBUG
-static int dbgp_enabled(void)
-{
-	struct dbgp_pipe *globals = &dbgp_ehci_info()->ep_pipe[DBGP_SETUP_EP0];
-	return (globals->status & DBGP_EP_ENABLED);
-}
-#endif
-
-static int dbgp_try_get(struct dbgp_pipe *pipe)
-{
-	struct dbgp_pipe *globals = &dbgp_ehci_info()->ep_pipe[DBGP_SETUP_EP0];
-	if (!dbgp_ep_is_active(pipe) || (globals->status & DBGP_EP_BUSY))
-		return 0;
-	globals->status |= DBGP_EP_BUSY;
-	pipe->status |= DBGP_EP_BUSY;
-	return 1;
-}
-
-static void dbgp_put(struct dbgp_pipe *pipe)
-{
-	struct dbgp_pipe *globals = &dbgp_ehci_info()->ep_pipe[DBGP_SETUP_EP0];
-	globals->status &= ~DBGP_EP_BUSY;
-	pipe->status &= ~DBGP_EP_BUSY;
-}
-
-void usbdebug_tx_byte(struct dbgp_pipe *pipe, unsigned char data)
-{
-	if (!dbgp_try_get(pipe))
-		return;
-	pipe->buf[pipe->bufidx++] = data;
-	if (pipe->bufidx >= 8) {
-		dbgp_bulk_write_x(pipe, pipe->buf, pipe->bufidx);
-		pipe->bufidx = 0;
-	}
-	dbgp_put(pipe);
-}
-
-void usbdebug_tx_flush(struct dbgp_pipe *pipe)
-{
-	if (!dbgp_try_get(pipe))
-		return;
-	if (pipe->bufidx > 0) {
-		dbgp_bulk_write_x(pipe, pipe->buf, pipe->bufidx);
-		pipe->bufidx = 0;
-	}
-	dbgp_put(pipe);
-}
-
-#if !defined(__PRE_RAM__) && !defined(__SMM__)
-static void usbdebug_re_enable(unsigned ehci_base)
-{
-	struct ehci_debug_info *dbg_info = dbgp_ehci_info();
-	unsigned diff;
-	int i;
-
-	if (!dbg_info->ehci_debug)
-		return;
-
-	diff = (unsigned)dbg_info->ehci_caps - ehci_base;
-	dbg_info->ehci_regs -= diff;
-	dbg_info->ehci_debug -= diff;
-	dbg_info->ehci_caps = (void*)ehci_base;
-
-	for (i=0; i<DBGP_MAX_ENDPOINTS; i++)
-		dbg_info->ep_pipe[i].status |= DBGP_EP_ENABLED;
-}
-
-static void usbdebug_disable(void)
-{
-	struct ehci_debug_info *dbg_info = dbgp_ehci_info();
-	int i;
-	for (i=0; i<DBGP_MAX_ENDPOINTS; i++)
-		dbg_info->ep_pipe[i].status &= ~DBGP_EP_ENABLED;
-}
-
-static void pci_ehci_set_resources(struct device *dev)
-{
-	struct resource *res;
-
-	printk(BIOS_DEBUG, "%s EHCI Debug Port hook triggered\n", dev_path(dev));
-	usbdebug_disable();
-
-	if (ehci_drv_ops->set_resources)
-		ehci_drv_ops->set_resources(dev);
-	res = find_resource(dev, EHCI_BAR_INDEX);
-	if (!res)
-		return;
-
-	usbdebug_re_enable((u32)res->base);
-	report_resource_stored(dev, res, "");
-	printk(BIOS_DEBUG, "%s EHCI Debug Port relocated\n", dev_path(dev));
-}
-
-void pci_ehci_read_resources(struct device *dev)
-{
-	pci_devfn_t dbg_dev = pci_ehci_dbg_dev(CONFIG_USBDEBUG_HCD_INDEX);
-
-	if (!ehci_drv_ops && pci_match_simple_dev(dev, dbg_dev)) {
-		memcpy(&ehci_dbg_ops, dev->ops, sizeof(ehci_dbg_ops));
-		ehci_drv_ops = dev->ops;
-		ehci_dbg_ops.set_resources = pci_ehci_set_resources;
-		dev->ops = &ehci_dbg_ops;
-		printk(BIOS_DEBUG, "%s EHCI BAR hook registered\n", dev_path(dev));
-	} else {
-		printk(BIOS_DEBUG, "More than one caller of %s from %s\n", __func__, dev_path(dev));
-	}
-
-	pci_dev_read_resources(dev);
-}
-#endif
-
-#if !defined(__PRE_RAM__) && !defined(__SMM__)
-static int get_usbdebug_from_cbmem(struct ehci_debug_info *info)
-{
-	struct ehci_debug_info *dbg_info_cbmem;
-
-	dbg_info_cbmem = cbmem_find(CBMEM_ID_EHCI_DEBUG);
-	if (dbg_info_cbmem == NULL)
-		return -1;
-
-	memcpy(info, dbg_info_cbmem, sizeof (*info));
-	printk(BIOS_DEBUG, "EHCI debug port found in CBMEM.\n");
-
-	return 0;
-}
-
-#elif defined(__PRE_RAM__)
-static void migrate_ehci_debug(void)
-{
-	struct ehci_debug_info *dbg_info = dbgp_ehci_info();
-	struct ehci_debug_info *dbg_info_cbmem;
-
-	dbg_info_cbmem = cbmem_add(CBMEM_ID_EHCI_DEBUG, sizeof(*dbg_info));
-	if (dbg_info_cbmem == NULL)
-		return;
-
-	memcpy(dbg_info_cbmem, dbg_info, sizeof(*dbg_info));
-}
-CAR_MIGRATE(migrate_ehci_debug);
-#endif
-
-unsigned long pci_ehci_base_regs(pci_devfn_t sdev)
-{
-#ifdef __SIMPLE_DEVICE__
-	unsigned long base = pci_read_config32(sdev, EHCI_BAR_INDEX) & ~0x0f;
-#else
-	device_t dev = dev_find_slot(PCI_DEV2SEGBUS(sdev), PCI_DEV2DEVFN(sdev));
-	unsigned long base = pci_read_config32(dev, EHCI_BAR_INDEX) & ~0x0f;
-#endif
-	return base + HC_LENGTH(read32(base));
-}
-
-int dbgp_ep_is_active(struct dbgp_pipe *pipe)
-{
-	return (pipe->status & DBGP_EP_STATMASK) == (DBGP_EP_VALID | DBGP_EP_ENABLED);
-}
-
-struct dbgp_pipe *dbgp_console_output(void)
-{
-	return &dbgp_ehci_info()->ep_pipe[DBGP_CONSOLE_EPOUT];
-}
-
-struct dbgp_pipe *dbgp_console_input(void)
-{
-	return &dbgp_ehci_info()->ep_pipe[DBGP_CONSOLE_EPIN];
-}
-
-int usbdebug_init(void)
-{
-	struct ehci_debug_info *dbg_info = dbgp_ehci_info();
-
-#if !defined(__PRE_RAM__) && !defined(__SMM__)
-	if (!get_usbdebug_from_cbmem(dbg_info))
-		return 0;
-#endif
-	enable_usbdebug();
-	return usbdebug_init_(CONFIG_EHCI_BAR, CONFIG_EHCI_DEBUG_OFFSET, dbg_info);
-}