[PATCH 1/3] pci, usb: Seperate usb handoff func to another file

[PATCH 1/3] pci, usb: Seperate usb handoff func to another file

[Yinghai Lu]

Make those func can take early, num, slot, func. So later could reuse them
to do usb handoff much early.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>

---
 drivers/usb/host/pci-quirks.c  |  396 ++------------------------------
 drivers/usb/host/usb_handoff.c |  501 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 533 insertions(+), 364 deletions(-)

Index: linux-2.6/drivers/usb/host/pci-quirks.c
===================================================================
--- linux-2.6.orig/drivers/usb/host/pci-quirks.c
+++ linux-2.6/drivers/usb/host/pci-quirks.c
@@ -15,122 +15,42 @@
 #include <linux/delay.h>
 #include <linux/acpi.h>
 #include "pci-quirks.h"
-#include "xhci-ext-caps.h"
 
+static void usb_handoff_udelay(unsigned long usecs)
+{
+	udelay(usecs);
+}
+
+static void usb_handoff_msleep(unsigned long msecs)
+{
+	msleep(msecs);
+}
+
+/* dummy functions to make compiler happy */
+u32 __weak read_pci_config(u8 bus, u8 slot, u8 func, u8 offset)
+{ return 0; }
+u8 __weak read_pci_config_byte(u8 bus, u8 slot, u8 func, u8 offset)
+{ return 0; }
+u16 __weak read_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset)
+{ return 0; }
+void __weak write_pci_config(u8 bus, u8 slot, u8 func, u8 offset, u32 val)
+{ }
+void __weak write_pci_config_byte(u8 bus, u8 slot, u8 func, u8 offset, u8 val)
+{ }
+void __weak write_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset, u16 val)
+{ }
+
+#include "usb_handoff.c"
 
-#define UHCI_USBLEGSUP		0xc0		/* legacy support */
-#define UHCI_USBCMD		0		/* command register */
-#define UHCI_USBINTR		4		/* interrupt register */
-#define UHCI_USBLEGSUP_RWC	0x8f00		/* the R/WC bits */
-#define UHCI_USBLEGSUP_RO	0x5040		/* R/O and reserved bits */
-#define UHCI_USBCMD_RUN		0x0001		/* RUN/STOP bit */
-#define UHCI_USBCMD_HCRESET	0x0002		/* Host Controller reset */
-#define UHCI_USBCMD_EGSM	0x0008		/* Global Suspend Mode */
-#define UHCI_USBCMD_CONFIGURE	0x0040		/* Config Flag */
-#define UHCI_USBINTR_RESUME	0x0002		/* Resume interrupt enable */
-
-#define OHCI_CONTROL		0x04
-#define OHCI_CMDSTATUS		0x08
-#define OHCI_INTRSTATUS		0x0c
-#define OHCI_INTRENABLE		0x10
-#define OHCI_INTRDISABLE	0x14
-#define OHCI_OCR		(1 << 3)	/* ownership change request */
-#define OHCI_CTRL_RWC		(1 << 9)	/* remote wakeup connected */
-#define OHCI_CTRL_IR		(1 << 8)	/* interrupt routing */
-#define OHCI_INTR_OC		(1 << 30)	/* ownership change */
-
-#define EHCI_HCC_PARAMS		0x08		/* extended capabilities */
-#define EHCI_USBCMD		0		/* command register */
-#define EHCI_USBCMD_RUN		(1 << 0)	/* RUN/STOP bit */
-#define EHCI_USBSTS		4		/* status register */
-#define EHCI_USBSTS_HALTED	(1 << 12)	/* HCHalted bit */
-#define EHCI_USBINTR		8		/* interrupt register */
-#define EHCI_CONFIGFLAG		0x40		/* configured flag register */
-#define EHCI_USBLEGSUP		0		/* legacy support register */
-#define EHCI_USBLEGSUP_BIOS	(1 << 16)	/* BIOS semaphore */
-#define EHCI_USBLEGSUP_OS	(1 << 24)	/* OS semaphore */
-#define EHCI_USBLEGCTLSTS	4		/* legacy control/status */
-#define EHCI_USBLEGCTLSTS_SOOE	(1 << 13)	/* SMI on ownership change */
-
-
-/*
- * Make sure the controller is completely inactive, unable to
- * generate interrupts or do DMA.
- */
 void uhci_reset_hc(struct pci_dev *pdev, unsigned long base)
 {
-	/* Turn off PIRQ enable and SMI enable.  (This also turns off the
-	 * BIOS's USB Legacy Support.)  Turn off all the R/WC bits too.
-	 */
-	pci_write_config_word(pdev, UHCI_USBLEGSUP, UHCI_USBLEGSUP_RWC);
-
-	/* Reset the HC - this will force us to get a
-	 * new notification of any already connected
-	 * ports due to the virtual disconnect that it
-	 * implies.
-	 */
-	outw(UHCI_USBCMD_HCRESET, base + UHCI_USBCMD);
-	mb();
-	udelay(5);
-	if (inw(base + UHCI_USBCMD) & UHCI_USBCMD_HCRESET)
-		dev_warn(&pdev->dev, "HCRESET not completed yet!\n");
-
-	/* Just to be safe, disable interrupt requests and
-	 * make sure the controller is stopped.
-	 */
-	outw(0, base + UHCI_USBINTR);
-	outw(0, base + UHCI_USBCMD);
+	__uhci_reset_hc(0, pdev, 0, 0, 0, base);
 }
 EXPORT_SYMBOL_GPL(uhci_reset_hc);
 
-/*
- * Initialize a controller that was newly discovered or has just been
- * resumed.  In either case we can't be sure of its previous state.
- *
- * Returns: 1 if the controller was reset, 0 otherwise.
- */
 int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base)
 {
-	u16 legsup;
-	unsigned int cmd, intr;
-
-	/*
-	 * When restarting a suspended controller, we expect all the
-	 * settings to be the same as we left them:
-	 *
-	 *	PIRQ and SMI disabled, no R/W bits set in USBLEGSUP;
-	 *	Controller is stopped and configured with EGSM set;
-	 *	No interrupts enabled except possibly Resume Detect.
-	 *
-	 * If any of these conditions are violated we do a complete reset.
-	 */
-	pci_read_config_word(pdev, UHCI_USBLEGSUP, &legsup);
-	if (legsup & ~(UHCI_USBLEGSUP_RO | UHCI_USBLEGSUP_RWC)) {
-		dev_dbg(&pdev->dev, "%s: legsup = 0x%04x\n",
-				__func__, legsup);
-		goto reset_needed;
-	}
-
-	cmd = inw(base + UHCI_USBCMD);
-	if ((cmd & UHCI_USBCMD_RUN) || !(cmd & UHCI_USBCMD_CONFIGURE) ||
-			!(cmd & UHCI_USBCMD_EGSM)) {
-		dev_dbg(&pdev->dev, "%s: cmd = 0x%04x\n",
-				__func__, cmd);
-		goto reset_needed;
-	}
-
-	intr = inw(base + UHCI_USBINTR);
-	if (intr & (~UHCI_USBINTR_RESUME)) {
-		dev_dbg(&pdev->dev, "%s: intr = 0x%04x\n",
-				__func__, intr);
-		goto reset_needed;
-	}
-	return 0;
-
-reset_needed:
-	dev_dbg(&pdev->dev, "Performing full reset\n");
-	uhci_reset_hc(pdev, base);
-	return 1;
+	return	__uhci_check_and_reset_hc(0, pdev, 0, 0, 0, base);
 }
 EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
 
@@ -169,7 +89,6 @@ static int __devinit mmio_resource_enabl
 static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev)
 {
 	void __iomem *base;
-	u32 control;
 
 	if (!mmio_resource_enabled(pdev, 0))
 		return;
@@ -178,50 +97,14 @@ static void __devinit quirk_usb_handoff_
 	if (base == NULL)
 		return;
 
-	control = readl(base + OHCI_CONTROL);
-
-/* On PA-RISC, PDC can leave IR set incorrectly; ignore it there. */
-#ifdef __hppa__
-#define	OHCI_CTRL_MASK		(OHCI_CTRL_RWC | OHCI_CTRL_IR)
-#else
-#define	OHCI_CTRL_MASK		OHCI_CTRL_RWC
-
-	if (control & OHCI_CTRL_IR) {
-		int wait_time = 500; /* arbitrary; 5 seconds */
-		writel(OHCI_INTR_OC, base + OHCI_INTRENABLE);
-		writel(OHCI_OCR, base + OHCI_CMDSTATUS);
-		while (wait_time > 0 &&
-				readl(base + OHCI_CONTROL) & OHCI_CTRL_IR) {
-			wait_time -= 10;
-			msleep(10);
-		}
-		if (wait_time <= 0)
-			dev_warn(&pdev->dev, "OHCI: BIOS handoff failed"
-					" (BIOS bug?) %08x\n",
-					readl(base + OHCI_CONTROL));
-	}
-#endif
-
-	/* reset controller, preserving RWC (and possibly IR) */
-	writel(control & OHCI_CTRL_MASK, base + OHCI_CONTROL);
-
-	/*
-	 * disable interrupts
-	 */
-	writel(~(u32)0, base + OHCI_INTRDISABLE);
-	writel(~(u32)0, base + OHCI_INTRSTATUS);
+	__usb_handoff_ohci(0, pdev, 0, 0, 0, base);
 
 	iounmap(base);
 }
 
 static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
 {
-	int wait_time, delta;
-	void __iomem *base, *op_reg_base;
-	u32	hcc_params, val;
-	u8	offset, cap_length;
-	int	count = 256/4;
-	int	tried_handoff = 0;
+	void __iomem *base;
 
 	if (!mmio_resource_enabled(pdev, 0))
 		return;
@@ -230,238 +113,23 @@ static void __devinit quirk_usb_disable_
 	if (base == NULL)
 		return;
 
-	cap_length = readb(base);
-	op_reg_base = base + cap_length;
-
-	/* EHCI 0.96 and later may have "extended capabilities"
-	 * spec section 5.1 explains the bios handoff, e.g. for
-	 * booting from USB disk or using a usb keyboard
-	 */
-	hcc_params = readl(base + EHCI_HCC_PARAMS);
-	offset = (hcc_params >> 8) & 0xff;
-	while (offset && --count) {
-		u32		cap;
-		int		msec;
-
-		pci_read_config_dword(pdev, offset, &cap);
-		switch (cap & 0xff) {
-		case 1:			/* BIOS/SMM/... handoff support */
-			if ((cap & EHCI_USBLEGSUP_BIOS)) {
-				dev_dbg(&pdev->dev, "EHCI: BIOS handoff\n");
-
-#if 0
-/* aleksey_gorelov@phoenix.com reports that some systems need SMI forced on,
- * but that seems dubious in general (the BIOS left it off intentionally)
- * and is known to prevent some systems from booting.  so we won't do this
- * unless maybe we can determine when we're on a system that needs SMI forced.
- */
-				/* BIOS workaround (?): be sure the
-				 * pre-Linux code receives the SMI
-				 */
-				pci_read_config_dword(pdev,
-						offset + EHCI_USBLEGCTLSTS,
-						&val);
-				pci_write_config_dword(pdev,
-						offset + EHCI_USBLEGCTLSTS,
-						val | EHCI_USBLEGCTLSTS_SOOE);
-#endif
-
-				/* some systems get upset if this semaphore is
-				 * set for any other reason than forcing a BIOS
-				 * handoff..
-				 */
-				pci_write_config_byte(pdev, offset + 3, 1);
-			}
-
-			/* if boot firmware now owns EHCI, spin till
-			 * it hands it over.
-			 */
-			msec = 1000;
-			while ((cap & EHCI_USBLEGSUP_BIOS) && (msec > 0)) {
-				tried_handoff = 1;
-				msleep(10);
-				msec -= 10;
-				pci_read_config_dword(pdev, offset, &cap);
-			}
-
-			if (cap & EHCI_USBLEGSUP_BIOS) {
-				/* well, possibly buggy BIOS... try to shut
-				 * it down, and hope nothing goes too wrong
-				 */
-				dev_warn(&pdev->dev, "EHCI: BIOS handoff failed"
-						" (BIOS bug?) %08x\n", cap);
-				pci_write_config_byte(pdev, offset + 2, 0);
-			}
-
-			/* just in case, always disable EHCI SMIs */
-			pci_write_config_dword(pdev,
-					offset + EHCI_USBLEGCTLSTS,
-					0);
-
-			/* If the BIOS ever owned the controller then we
-			 * can't expect any power sessions to remain intact.
-			 */
-			if (tried_handoff)
-				writel(0, op_reg_base + EHCI_CONFIGFLAG);
-			break;
-		case 0:			/* illegal reserved capability */
-			cap = 0;
-			/* FALLTHROUGH */
-		default:
-			dev_warn(&pdev->dev, "EHCI: unrecognized capability "
-					"%02x\n", cap & 0xff);
-			break;
-		}
-		offset = (cap >> 8) & 0xff;
-	}
-	if (!count)
-		dev_printk(KERN_DEBUG, &pdev->dev, "EHCI: capability loop?\n");
-
-	/*
-	 * halt EHCI & disable its interrupts in any case
-	 */
-	val = readl(op_reg_base + EHCI_USBSTS);
-	if ((val & EHCI_USBSTS_HALTED) == 0) {
-		val = readl(op_reg_base + EHCI_USBCMD);
-		val &= ~EHCI_USBCMD_RUN;
-		writel(val, op_reg_base + EHCI_USBCMD);
-
-		wait_time = 2000;
-		delta = 100;
-		do {
-			writel(0x3f, op_reg_base + EHCI_USBSTS);
-			udelay(delta);
-			wait_time -= delta;
-			val = readl(op_reg_base + EHCI_USBSTS);
-			if ((val == ~(u32)0) || (val & EHCI_USBSTS_HALTED)) {
-				break;
-			}
-		} while (wait_time > 0);
-	}
-	writel(0, op_reg_base + EHCI_USBINTR);
-	writel(0x3f, op_reg_base + EHCI_USBSTS);
+	__usb_handoff_ehci(0, pdev, 0, 0, 0, base);
 
 	iounmap(base);
 }
 
-/*
- * handshake - spin reading a register until handshake completes
- * @ptr: address of hc register to be read
- * @mask: bits to look at in result of read
- * @done: value of those bits when handshake succeeds
- * @wait_usec: timeout in microseconds
- * @delay_usec: delay in microseconds to wait between polling
- *
- * Polls a register every delay_usec microseconds.
- * Returns 0 when the mask bits have the value done.
- * Returns -ETIMEDOUT if this condition is not true after
- * wait_usec microseconds have passed.
- */
-static int handshake(void __iomem *ptr, u32 mask, u32 done,
-		int wait_usec, int delay_usec)
-{
-	u32	result;
-
-	do {
-		result = readl(ptr);
-		result &= mask;
-		if (result == done)
-			return 0;
-		udelay(delay_usec);
-		wait_usec -= delay_usec;
-	} while (wait_usec > 0);
-	return -ETIMEDOUT;
-}
-
-/**
- * PCI Quirks for xHCI.
- *
- * Takes care of the handoff between the Pre-OS (i.e. BIOS) and the OS.
- * It signals to the BIOS that the OS wants control of the host controller,
- * and then waits 5 seconds for the BIOS to hand over control.
- * If we timeout, assume the BIOS is broken and take control anyway.
- */
 static void __devinit quirk_usb_handoff_xhci(struct pci_dev *pdev)
 {
 	void __iomem *base;
-	int ext_cap_offset;
-	void __iomem *op_reg_base;
-	u32 val;
-	int timeout;
 
 	if (!mmio_resource_enabled(pdev, 0))
 		return;
 
-	base = ioremap_nocache(pci_resource_start(pdev, 0),
-				pci_resource_len(pdev, 0));
+	base = pci_ioremap_bar(pdev, 0);
 	if (base == NULL)
 		return;
 
-	/*
-	 * Find the Legacy Support Capability register -
-	 * this is optional for xHCI host controllers.
-	 */
-	ext_cap_offset = xhci_find_next_cap_offset(base, XHCI_HCC_PARAMS_OFFSET);
-	do {
-		if (!ext_cap_offset)
-			/* We've reached the end of the extended capabilities */
-			goto hc_init;
-		val = readl(base + ext_cap_offset);
-		if (XHCI_EXT_CAPS_ID(val) == XHCI_EXT_CAPS_LEGACY)
-			break;
-		ext_cap_offset = xhci_find_next_cap_offset(base, ext_cap_offset);
-	} while (1);
-
-	/* If the BIOS owns the HC, signal that the OS wants it, and wait */
-	if (val & XHCI_HC_BIOS_OWNED) {
-		writel(val & XHCI_HC_OS_OWNED, base + ext_cap_offset);
-
-		/* Wait for 5 seconds with 10 microsecond polling interval */
-		timeout = handshake(base + ext_cap_offset, XHCI_HC_BIOS_OWNED,
-				0, 5000, 10);
-
-		/* Assume a buggy BIOS and take HC ownership anyway */
-		if (timeout) {
-			dev_warn(&pdev->dev, "xHCI BIOS handoff failed"
-					" (BIOS bug ?) %08x\n", val);
-			writel(val & ~XHCI_HC_BIOS_OWNED, base + ext_cap_offset);
-		}
-	}
-
-	/* Disable any BIOS SMIs */
-	writel(XHCI_LEGACY_DISABLE_SMI,
-			base + ext_cap_offset + XHCI_LEGACY_CONTROL_OFFSET);
-
-hc_init:
-	op_reg_base = base + XHCI_HC_LENGTH(readl(base));
-
-	/* Wait for the host controller to be ready before writing any
-	 * operational or runtime registers.  Wait 5 seconds and no more.
-	 */
-	timeout = handshake(op_reg_base + XHCI_STS_OFFSET, XHCI_STS_CNR, 0,
-			5000, 10);
-	/* Assume a buggy HC and start HC initialization anyway */
-	if (timeout) {
-		val = readl(op_reg_base + XHCI_STS_OFFSET);
-		dev_warn(&pdev->dev,
-				"xHCI HW not ready after 5 sec (HC bug?) "
-				"status = 0x%x\n", val);
-	}
-
-	/* Send the halt and disable interrupts command */
-	val = readl(op_reg_base + XHCI_CMD_OFFSET);
-	val &= ~(XHCI_CMD_RUN | XHCI_IRQS);
-	writel(val, op_reg_base + XHCI_CMD_OFFSET);
-
-	/* Wait for the HC to halt - poll every 125 usec (one microframe). */
-	timeout = handshake(op_reg_base + XHCI_STS_OFFSET, XHCI_STS_HALT, 1,
-			XHCI_MAX_HALT_USEC, 125);
-	if (timeout) {
-		val = readl(op_reg_base + XHCI_STS_OFFSET);
-		dev_warn(&pdev->dev,
-				"xHCI HW did not halt within %d usec "
-				"status = 0x%x\n", XHCI_MAX_HALT_USEC, val);
-	}
+	__usb_handoff_xhci(0, pdev, 0, 0, 0, base);
 
 	iounmap(base);
 }
Index: linux-2.6/drivers/usb/host/usb_handoff.c
===================================================================
--- /dev/null
+++ linux-2.6/drivers/usb/host/usb_handoff.c
@@ -0,0 +1,501 @@
+/*
+ * This file contains code to reset and initialize USB host controllers.
+ * Some of it includes work-arounds for PCI hardware and BIOS quirks.
+ * It may need to run early during booting -- before USB would normally
+ * initialize -- to ensure that Linux doesn't use any legacy modes.
+ *
+ *  Copyright (c) 1999 Martin Mares <mj@ucw.cz>
+ *  (and others)
+ */
+
+#include "xhci-ext-caps.h"
+
+#define UHCI_USBLEGSUP		0xc0		/* legacy support */
+#define UHCI_USBCMD		0		/* command register */
+#define UHCI_USBINTR		4		/* interrupt register */
+#define UHCI_USBLEGSUP_RWC	0x8f00		/* the R/WC bits */
+#define UHCI_USBLEGSUP_RO	0x5040		/* R/O and reserved bits */
+#define UHCI_USBCMD_RUN		0x0001		/* RUN/STOP bit */
+#define UHCI_USBCMD_HCRESET	0x0002		/* Host Controller reset */
+#define UHCI_USBCMD_EGSM	0x0008		/* Global Suspend Mode */
+#define UHCI_USBCMD_CONFIGURE	0x0040		/* Config Flag */
+#define UHCI_USBINTR_RESUME	0x0002		/* Resume interrupt enable */
+
+#define OHCI_CONTROL		0x04
+#define OHCI_CMDSTATUS		0x08
+#define OHCI_INTRSTATUS		0x0c
+#define OHCI_INTRENABLE		0x10
+#define OHCI_INTRDISABLE	0x14
+#define OHCI_OCR		(1 << 3)	/* ownership change request */
+#define OHCI_CTRL_RWC		(1 << 9)	/* remote wakeup connected */
+#define OHCI_CTRL_IR		(1 << 8)	/* interrupt routing */
+#define OHCI_INTR_OC		(1 << 30)	/* ownership change */
+
+#define EHCI_HCC_PARAMS		0x08		/* extended capabilities */
+#define EHCI_USBCMD		0		/* command register */
+#define EHCI_USBCMD_RUN		(1 << 0)	/* RUN/STOP bit */
+#define EHCI_USBSTS		4		/* status register */
+#define EHCI_USBSTS_HALTED	(1 << 12)	/* HCHalted bit */
+#define EHCI_USBINTR		8		/* interrupt register */
+#define EHCI_CONFIGFLAG		0x40		/* configured flag register */
+#define EHCI_USBLEGSUP		0		/* legacy support register */
+#define EHCI_USBLEGSUP_BIOS	(1 << 16)	/* BIOS semaphore */
+#define EHCI_USBLEGSUP_OS	(1 << 24)	/* OS semaphore */
+#define EHCI_USBLEGCTLSTS	4		/* legacy control/status */
+#define EHCI_USBLEGCTLSTS_SOOE	(1 << 13)	/* SMI on ownership change */
+
+/*
+ * Make sure the controller is completely inactive, unable to
+ * generate interrupts or do DMA.
+ */
+static inline void
+__uhci_reset_hc(int early, struct pci_dev *pdev,
+		int num, int slot, int func, unsigned long base)
+{
+	/* Turn off PIRQ enable and SMI enable.  (This also turns off the
+	 * BIOS's USB Legacy Support.)  Turn off all the R/WC bits too.
+	 */
+	if (!early)
+		pci_write_config_word(pdev, UHCI_USBLEGSUP, UHCI_USBLEGSUP_RWC);
+	else
+		write_pci_config_16(num, slot, func, UHCI_USBLEGSUP,
+					UHCI_USBLEGSUP_RWC);
+
+	/* Reset the HC - this will force us to get a
+	 * new notification of any already connected
+	 * ports due to the virtual disconnect that it
+	 * implies.
+	 */
+	outw(UHCI_USBCMD_HCRESET, base + UHCI_USBCMD);
+	mb();
+	usb_handoff_udelay(5);
+	if (inw(base + UHCI_USBCMD) & UHCI_USBCMD_HCRESET) {
+		if (!early)
+			dev_warn(&pdev->dev, "HCRESET not completed yet!\n");
+		else
+			pr_warn("%02x:%02x.%01x HCRESET not completed yet!\n",
+				num, slot, func);
+	}
+
+	/* Just to be safe, disable interrupt requests and
+	 * make sure the controller is stopped.
+	 */
+	outw(0, base + UHCI_USBINTR);
+	outw(0, base + UHCI_USBCMD);
+}
+
+/*
+ * Initialize a controller that was newly discovered or has just been
+ * resumed.  In either case we can't be sure of its previous state.
+ *
+ * Returns: 1 if the controller was reset, 0 otherwise.
+ */
+static inline int
+__uhci_check_and_reset_hc(int early, struct pci_dev *pdev,
+			int num, int slot, int func, unsigned long base)
+{
+	u16 legsup;
+	unsigned int cmd, intr;
+
+	/*
+	 * When restarting a suspended controller, we expect all the
+	 * settings to be the same as we left them:
+	 *
+	 *	PIRQ and SMI disabled, no R/W bits set in USBLEGSUP;
+	 *	Controller is stopped and configured with EGSM set;
+	 *	No interrupts enabled except possibly Resume Detect.
+	 *
+	 * If any of these conditions are violated we do a complete reset.
+	 */
+	if (!early)
+		pci_read_config_word(pdev, UHCI_USBLEGSUP, &legsup);
+	else
+		legsup = read_pci_config_16(num, slot, func, UHCI_USBLEGSUP);
+	if (legsup & ~(UHCI_USBLEGSUP_RO | UHCI_USBLEGSUP_RWC)) {
+		if (!early)
+			dev_printk(KERN_DEBUG, &pdev->dev,
+				 "%s: legsup = 0x%04x\n", __func__, legsup);
+		else
+			printk(KERN_DEBUG
+				 "%02x:%02x.%01x: legsup = 0x%04x\n",
+					num, slot, func, legsup);
+
+		goto reset_needed;
+	}
+
+	cmd = inw(base + UHCI_USBCMD);
+	if ((cmd & UHCI_USBCMD_RUN) || !(cmd & UHCI_USBCMD_CONFIGURE) ||
+			!(cmd & UHCI_USBCMD_EGSM)) {
+		if (!early)
+			dev_printk(KERN_DEBUG, &pdev->dev,
+					"%s: cmd = 0x%04x\n", __func__, cmd);
+		else
+			printk(KERN_DEBUG "%02x:%02x.%01x: cmd = 0x%04x\n",
+					num, slot, func, cmd);
+
+		goto reset_needed;
+	}
+
+	intr = inw(base + UHCI_USBINTR);
+	if (intr & (~UHCI_USBINTR_RESUME)) {
+		if (!early)
+			dev_printk(KERN_DEBUG, &pdev->dev,
+					"%s: intr = 0x%04x\n", __func__, intr);
+		else
+			printk(KERN_DEBUG "%02x:%02x.%01x: intr = 0x%04x\n",
+					num, slot, func, intr);
+
+		goto reset_needed;
+	}
+	return 0;
+
+reset_needed:
+	if (!early)
+		dev_printk(KERN_DEBUG, &pdev->dev, "Performing full reset\n");
+	else
+		printk(KERN_DEBUG "%02x:%02x.%01x: Performing full reset\n",
+				num, slot, func);
+
+	__uhci_reset_hc(early, pdev, num, slot, func, base);
+
+	return 1;
+}
+
+static inline void
+__usb_handoff_ohci(int early, struct pci_dev *pdev,
+			int num, int slot, int func, void __iomem *base)
+{
+	u32 control;
+
+	control = readl(base + OHCI_CONTROL);
+
+/* On PA-RISC, PDC can leave IR set incorrectly; ignore it there. */
+#ifdef __hppa__
+#define	OHCI_CTRL_MASK		(OHCI_CTRL_RWC | OHCI_CTRL_IR)
+#else
+#define	OHCI_CTRL_MASK		OHCI_CTRL_RWC
+
+	if (control & OHCI_CTRL_IR) {
+		int wait_time = 500; /* arbitrary; 5 seconds */
+		writel(OHCI_INTR_OC, base + OHCI_INTRENABLE);
+		writel(OHCI_OCR, base + OHCI_CMDSTATUS);
+		while (wait_time > 0 &&
+				readl(base + OHCI_CONTROL) & OHCI_CTRL_IR) {
+			wait_time -= 1;
+			usb_handoff_msleep(1);
+		}
+		if (wait_time <= 0) {
+			if (!early)
+				dev_warn(&pdev->dev,
+				 "OHCI: BIOS handoff failed (BIOS bug?) %08x\n",
+						readl(base + OHCI_CONTROL));
+			else
+				pr_warn(" %02x:%02x.%01x OHCI: BIOS handoff failed (BIOS bug?) %08x\n",
+					num, slot, func,
+					readl(base + OHCI_CONTROL));
+		}
+	}
+#endif
+
+	/* reset controller, preserving RWC (and possibly IR) */
+	writel(control & OHCI_CTRL_MASK, base + OHCI_CONTROL);
+
+	/*
+	 * disable interrupts
+	 */
+	writel(~(u32)0, base + OHCI_INTRDISABLE);
+	writel(~(u32)0, base + OHCI_INTRSTATUS);
+}
+
+static inline void
+__usb_handoff_ehci(int early, struct pci_dev *pdev,
+			int num, int slot, int func, void __iomem *base)
+{
+	int wait_time, delta;
+	void *op_reg_base;
+	u32	hcc_params, val;
+	u8	offset, cap_length;
+	int	count = 256/4;
+	int	tried_handoff = 0;
+
+	cap_length = readb(base);
+	op_reg_base = base + cap_length;
+
+	/* EHCI 0.96 and later may have "extended capabilities"
+	 * spec section 5.1 explains the bios handoff, e.g. for
+	 * booting from USB disk or using a usb keyboard
+	 */
+	hcc_params = readl(base + EHCI_HCC_PARAMS);
+	offset = (hcc_params >> 8) & 0xff;
+	while (offset && --count) {
+		u32		cap;
+		int		msec;
+
+		if (!early)
+			pci_read_config_dword(pdev, offset, &cap);
+		else
+			cap = read_pci_config(num, slot, func, offset);
+		switch (cap & 0xff) {
+		case 1:			/* BIOS/SMM/... handoff support */
+			if ((cap & EHCI_USBLEGSUP_BIOS)) {
+				if (!early)
+					dev_printk(KERN_DEBUG, &pdev->dev,
+						"EHCI: BIOS handoff\n");
+				else
+					printk(KERN_DEBUG
+					 "%02x:%02x.%01x: EHCI: BIOS handoff\n",
+						num, slot, func);
+
+#if 0
+/* aleksey_gorelov@phoenix.com reports that some systems need SMI forced on,
+ * but that seems dubious in general (the BIOS left it off intentionally)
+ * and is known to prevent some systems from booting.  so we won't do this
+ * unless maybe we can determine when we're on a system that needs SMI forced.
+ */
+				/* BIOS workaround (?): be sure the
+				 * pre-Linux code receives the SMI
+				 */
+				pci_read_config_dword(pdev,
+						offset + EHCI_USBLEGCTLSTS,
+						&val);
+				pci_write_config_dword(pdev,
+						offset + EHCI_USBLEGCTLSTS,
+						val | EHCI_USBLEGCTLSTS_SOOE);
+#endif
+
+				/* some systems get upset if this semaphore is
+				 * set for any other reason than forcing a BIOS
+				 * handoff..
+				 */
+				if (!early)
+					pci_write_config_byte(pdev,
+								offset + 3, 1);
+				else
+					write_pci_config_byte(num, slot, func,
+								offset + 3, 1);
+			}
+
+			/* if boot firmware now owns EHCI, spin till
+			 * it hands it over.
+			 */
+			msec = 1000;
+			while ((cap & EHCI_USBLEGSUP_BIOS) && (msec > 0)) {
+				tried_handoff = 1;
+				usb_handoff_msleep(1);
+				msec -= 1;
+				if (!early)
+					pci_read_config_dword(pdev, offset,
+								&cap);
+				else
+					cap = read_pci_config(num, slot, func,
+								offset);
+			}
+
+			if (cap & EHCI_USBLEGSUP_BIOS) {
+				/* well, possibly buggy BIOS... try to shut
+				 * it down, and hope nothing goes too wrong
+				 */
+				if (!early) {
+					dev_warn(&pdev->dev,
+				 "EHCI: BIOS handoff failed (BIOS bug?) %08x\n",
+							cap);
+					pci_write_config_byte(pdev, offset + 2,
+								 0);
+				} else {
+					pr_warn("%02x:%02x.%01x: EHCI: BIOS handoff failed (BIOS bug?) %08x\n",
+							num, slot, func, cap);
+					write_pci_config_byte(num, slot, func,
+								 offset + 2, 0);
+				}
+			}
+
+			/* just in case, always disable EHCI SMIs */
+			if (!early)
+				pci_write_config_dword(pdev,
+						offset + EHCI_USBLEGCTLSTS,
+						0);
+			else
+				write_pci_config(num, slot, func,
+						offset + EHCI_USBLEGCTLSTS,
+						0);
+
+
+			/* If the BIOS ever owned the controller then we
+			 * can't expect any power sessions to remain intact.
+			 */
+			if (tried_handoff)
+				writel(0, op_reg_base + EHCI_CONFIGFLAG);
+			break;
+		case 0:			/* illegal reserved capability */
+			cap = 0;
+			/* FALLTHROUGH */
+		default:
+			if (!early)
+				dev_warn(&pdev->dev,
+					 "EHCI: unrecognized capability %02x\n",
+						cap & 0xff);
+			else
+				pr_warn("%02x:%02x.%01x: EHCI: unrecognized capability %02x\n",
+						num, slot, func, cap & 0xff);
+			break;
+		}
+		offset = (cap >> 8) & 0xff;
+	}
+	if (!count) {
+		if (!early)
+			dev_printk(KERN_DEBUG, &pdev->dev,
+					"EHCI: capability loop?\n");
+		else
+			pr_warn("%02x:%02x.%01x: EHCI: capability loop?\n",
+				num, slot, func);
+	}
+
+	/*
+	 * halt EHCI & disable its interrupts in any case
+	 */
+	val = readl(op_reg_base + EHCI_USBSTS);
+	if ((val & EHCI_USBSTS_HALTED) == 0) {
+		val = readl(op_reg_base + EHCI_USBCMD);
+		val &= ~EHCI_USBCMD_RUN;
+		writel(val, op_reg_base + EHCI_USBCMD);
+
+		wait_time = 2000;
+		delta = 10;
+		do {
+			writel(0x3f, op_reg_base + EHCI_USBSTS);
+			usb_handoff_udelay(delta);
+			wait_time -= delta;
+			val = readl(op_reg_base + EHCI_USBSTS);
+			if ((val == ~(u32)0) || (val & EHCI_USBSTS_HALTED))
+				break;
+		} while (wait_time > 0);
+	}
+	writel(0, op_reg_base + EHCI_USBINTR);
+	writel(0x3f, op_reg_base + EHCI_USBSTS);
+}
+
+/*
+ * handshake - spin reading a register until handshake completes
+ * @ptr: address of hc register to be read
+ * @mask: bits to look at in result of read
+ * @done: value of those bits when handshake succeeds
+ * @wait_usec: timeout in microseconds
+ * @delay_usec: delay in microseconds to wait between polling
+ *
+ * Polls a register every delay_usec microseconds.
+ * Returns 0 when the mask bits have the value done.
+ * Returns -ETIMEDOUT if this condition is not true after
+ * wait_usec microseconds have passed.
+ */
+static int handshake(void __iomem *ptr, u32 mask, u32 done,
+		int wait_usec, int delay_usec)
+{
+	u32	result;
+
+	do {
+		result = readl(ptr);
+		result &= mask;
+		if (result == done)
+			return 0;
+		usb_handoff_udelay(delay_usec);
+		wait_usec -= delay_usec;
+	} while (wait_usec > 0);
+	return -ETIMEDOUT;
+}
+
+/**
+ * PCI Quirks for xHCI.
+ *
+ * Takes care of the handoff between the Pre-OS (i.e. BIOS) and the OS.
+ * It signals to the BIOS that the OS wants control of the host controller,
+ * and then waits 5 seconds for the BIOS to hand over control.
+ * If we timeout, assume the BIOS is broken and take control anyway.
+ */
+static inline void
+__usb_handoff_xhci(int early, struct pci_dev *pdev,
+			int num, int slot, int func, void __iomem *base)
+{
+	int ext_cap_offset;
+	void __iomem *op_reg_base;
+	u32 val;
+	int timeout;
+
+	/*
+	 * Find the Legacy Support Capability register -
+	 * this is optional for xHCI host controllers.
+	 */
+	ext_cap_offset = xhci_find_next_cap_offset(base, XHCI_HCC_PARAMS_OFFSET);
+	do {
+		if (!ext_cap_offset)
+			/* We've reached the end of the extended capabilities */
+			goto hc_init;
+		val = readl(base + ext_cap_offset);
+		if (XHCI_EXT_CAPS_ID(val) == XHCI_EXT_CAPS_LEGACY)
+			break;
+		ext_cap_offset = xhci_find_next_cap_offset(base, ext_cap_offset);
+	} while (1);
+
+	/* If the BIOS owns the HC, signal that the OS wants it, and wait */
+	if (val & XHCI_HC_BIOS_OWNED) {
+		writel(val & XHCI_HC_OS_OWNED, base + ext_cap_offset);
+
+		/* Wait for 5 seconds with 10 microsecond polling interval */
+		timeout = handshake(base + ext_cap_offset, XHCI_HC_BIOS_OWNED,
+				0, 5000, 10);
+
+		/* Assume a buggy BIOS and take HC ownership anyway */
+		if (timeout) {
+			if (!early)
+				dev_warn(&pdev->dev,
+				 "xHCI BIOS handoff failed (BIOS bug ?) %08x\n",
+						val);
+			else
+				pr_warn("%02x:%02x.%01x: xHCI BIOS handoff failed (BIOS bug ?) %08x\n",
+					num, slot, func, val);
+			writel(val & ~XHCI_HC_BIOS_OWNED, base + ext_cap_offset);
+		}
+	}
+
+	/* Disable any BIOS SMIs */
+	writel(XHCI_LEGACY_DISABLE_SMI,
+			base + ext_cap_offset + XHCI_LEGACY_CONTROL_OFFSET);
+
+hc_init:
+	op_reg_base = base + XHCI_HC_LENGTH(readl(base));
+
+	/* Wait for the host controller to be ready before writing any
+	 * operational or runtime registers.  Wait 5 seconds and no more.
+	 */
+	timeout = handshake(op_reg_base + XHCI_STS_OFFSET, XHCI_STS_CNR, 0,
+			5000, 10);
+	/* Assume a buggy HC and start HC initialization anyway */
+	if (timeout) {
+		val = readl(op_reg_base + XHCI_STS_OFFSET);
+		if (!early)
+			dev_warn(&pdev->dev,
+				"xHCI HW not ready after 5 sec (HC bug?) status = 0x%x\n",
+					val);
+		else
+			pr_warn("%02x:%02x.%01x: xHCI HW not ready after 5 sec (HC bug?) status = 0x%x\n",
+					num, slot, func, val);
+	}
+
+	/* Send the halt and disable interrupts command */
+	val = readl(op_reg_base + XHCI_CMD_OFFSET);
+	val &= ~(XHCI_CMD_RUN | XHCI_IRQS);
+	writel(val, op_reg_base + XHCI_CMD_OFFSET);
+
+	/* Wait for the HC to halt - poll every 125 usec (one microframe). */
+	timeout = handshake(op_reg_base + XHCI_STS_OFFSET, XHCI_STS_HALT, 1,
+			XHCI_MAX_HALT_USEC, 125);
+	if (timeout) {
+		val = readl(op_reg_base + XHCI_STS_OFFSET);
+		if (!early)
+			dev_warn(&pdev->dev,
+					"xHCI HW did not halt within %d usec status = 0x%x\n",
+					 XHCI_MAX_HALT_USEC, val);
+		else
+			pr_warn("%02x:%02x.%01x: xHCI HW did not halt within %d usec status = 0x%x",
+					num, slot, func, XHCI_MAX_HALT_USEC, val);
+	}
+}

[PATCH 2/3] x86: early_quirk check all dev/func in domain 0

[Yinghai Lu]

go with all buses instead of bus0.
also only check header type on func0.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>

---
 arch/x86/kernel/early-quirks.c |   29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

Index: linux-2.6/arch/x86/kernel/early-quirks.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/early-quirks.c
+++ linux-2.6/arch/x86/kernel/early-quirks.c
@@ -243,7 +243,7 @@ static int __init check_dev_quirk(int nu
 	class = read_pci_config_16(num, slot, func, PCI_CLASS_DEVICE);
 
 	if (class == 0xffff)
-		return -1; /* no class, treat as single function */
+		return 0; /* no class, func gap */
 
 	vendor = read_pci_config_16(num, slot, func, PCI_VENDOR_ID);
 
@@ -263,27 +263,30 @@ static int __init check_dev_quirk(int nu
 			}
 	}
 
-	type = read_pci_config_byte(num, slot, func,
-				    PCI_HEADER_TYPE);
-	if (!(type & 0x80))
-		return -1;
+	if (func == 0) {
+		type = read_pci_config_byte(num, slot, func,
+					    PCI_HEADER_TYPE);
+		if (!(type & 0x80))
+			return -1;
+	}
 
 	return 0;
 }
 
 void __init early_quirks(void)
 {
-	int slot, func;
+	int num, slot, func;
 
 	if (!early_pci_allowed())
 		return;
 
 	/* Poor man's PCI discovery */
-	/* Only scan the root bus */
-	for (slot = 0; slot < 32; slot++)
-		for (func = 0; func < 8; func++) {
-			/* Only probe function 0 on single fn devices */
-			if (check_dev_quirk(0, slot, func))
-				break;
-		}
+	/* Only can scan first domain */
+	for (num = 0; num < 256; num++)
+		for (slot = 0; slot < 32; slot++)
+			for (func = 0; func < 8; func++) {
+				/* Only probe func 0 on single fn devices */
+				if (check_dev_quirk(num, slot, func))
+					break;
+			}
 }

[PATCH 3/3] x86: usb handoff in early_quirk

[Yinghai Lu]

some systems keep getting
  APIC calibration not consistent with PM-Timer: 139ms instead of 100ms
  APIC delta adjusted to PM-Timer: 831249 (1163736)

USB legacy SMI handler is not disabled at that time.

Try to disable USB legacy support early with this patch.
So later APIC Timer calibration don't get messed up by USB legacy support SMI handler.
After this patch, that warning never show up for 100 reboot tests.

reuse code from drivers/usb/host/pci-quirks.c
with changes
1. delay and sleep  ===> io_delay
2. dev_warn etc to pr_warn(num, slot, func...)

Signed-off-by: Yinghai Lu <yinghai@kernel.org>

---
 arch/x86/kernel/early-quirks.c |  170 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 170 insertions(+)

Index: linux-2.6/arch/x86/kernel/early-quirks.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/early-quirks.c
+++ linux-2.6/arch/x86/kernel/early-quirks.c
@@ -19,6 +19,174 @@
 #include <asm/iommu.h>
 #include <asm/gart.h>
 
+static inline void early_udelay2(void)
+{
+#ifndef CONFIG_PARVIRT
+	native_io_delay();
+#else
+	pv_cpu_ops.io_delay();
+#endif
+}
+
+static void usb_handoff_udelay(unsigned long usecs)
+{
+	unsigned long count;
+
+	count = usecs >> 1;
+
+	if (!count)
+		count = 1;
+
+	while (count-- > 0)
+		early_udelay2();
+}
+
+static void usb_handoff_msleep(unsigned long msecs)
+{
+	while (msecs-- > 0)
+		usb_handoff_udelay(1000);
+}
+
+#include "../../../drivers/usb/host/usb_handoff.c"
+
+static inline int io_type_enabled(int num, int slot, int func, unsigned int mask)
+{
+	return read_pci_config_16(num, slot, func, PCI_COMMAND) & mask;
+}
+
+#define pio_enabled(num, slot, func) io_type_enabled(num, slot, func, PCI_COMMAND_IO)
+#define mmio_enabled(num, slot, func) io_type_enabled(num, slot, func, PCI_COMMAND_MEMORY)
+
+static __init u32 get_usb_io_port(int num, int slot, int func)
+{
+	int i;
+
+	if (!pio_enabled(num, slot, func))
+		return 0;
+
+	for (i = 0; i < PCI_ROM_RESOURCE; i++) {
+		u32 addr = read_pci_config(num, slot, func, 0x10+(i<<2));
+
+		if (!addr)
+			continue;
+		if ((addr & PCI_BASE_ADDRESS_SPACE) != PCI_BASE_ADDRESS_SPACE_IO)
+			continue;
+
+		addr &= PCI_BASE_ADDRESS_IO_MASK;
+		if (addr)
+			return addr;
+	}
+
+	return 0;
+}
+
+static void __init quirk_usb_handoff_uhci(int num, int slot, int func)
+{
+	unsigned long base;
+
+	base = get_usb_io_port(num, slot, func);
+	if (!base)
+		return;
+
+	printk(KERN_DEBUG "%02x:%02x.%01x: uhci ioport = 0x%04lx\n",
+					num, slot, func, base);
+	__uhci_check_and_reset_hc(1, NULL, num, slot, func, base);
+}
+
+static __init u32 get_usb_mmio_addr(int num, int slot, int func)
+{
+	u32 addr;
+
+	if (!mmio_enabled(num, slot, func))
+		return 0;
+
+	addr = read_pci_config(num, slot, func, 0x10);
+	if (!addr)
+		return 0;
+	if ((addr & PCI_BASE_ADDRESS_SPACE) != PCI_BASE_ADDRESS_SPACE_MEMORY)
+		return 0;
+
+	addr &= PCI_BASE_ADDRESS_MEM_MASK;
+
+	return addr;
+}
+
+static __init void quirk_usb_handoff_ohci(int num, int slot, int func)
+{
+	void __iomem *base;
+	u32 addr;
+
+	addr = get_usb_mmio_addr(num, slot, func);
+	if (!addr)
+		return;
+
+	printk(KERN_DEBUG "%02x:%02x.%01x: ohci mmio = 0x%08x\n", num, slot, func, addr);
+	base = early_ioremap(addr, 0x1000);
+	if (!base)
+		return;
+
+	__usb_handoff_ohci(1, NULL, num, slot, func, base);
+
+	early_iounmap(base, 0x1000);
+}
+
+static __init void quirk_usb_handoff_ehci(int num, int slot, int func)
+{
+	void __iomem *base;
+	u32 addr;
+
+	addr = get_usb_mmio_addr(num, slot, func);
+	if (!addr)
+		return;
+
+	printk(KERN_DEBUG "%02x:%02x.%01x: ehci mmio = 0x%08x\n",
+				 num, slot, func, addr);
+	base = early_ioremap(addr, 0x1000);
+	if (!base)
+		return;
+
+	__usb_handoff_ehci(1, NULL, num, slot, func, base);
+
+	early_iounmap(base, 0x1000);
+}
+
+static __init void quirk_usb_handoff_xhci(int num, int slot, int func)
+{
+	void __iomem *base;
+	u32 addr;
+
+	addr = get_usb_mmio_addr(num, slot, func);
+	if (!addr)
+		return;
+
+	printk(KERN_DEBUG "%02x:%02x.%01x: xhci mmio = 0x%08x\n",
+				num, slot, func, addr);
+	base = early_ioremap(addr, 0x1000);
+	if (!base)
+		return;
+
+	__usb_handoff_xhci(1, NULL, num, slot, func, base);
+
+	early_iounmap(base, 0x1000);
+}
+
+static __init void quirk_usb_handoff(int num, int slot, int func)
+{
+	u32 class;
+
+	class = read_pci_config(num, slot, func, PCI_CLASS_REVISION);
+	class >>= 8;
+
+	if (class == PCI_CLASS_SERIAL_USB_UHCI)
+		quirk_usb_handoff_uhci(num, slot, func);
+	else if (class == PCI_CLASS_SERIAL_USB_OHCI)
+		quirk_usb_handoff_ohci(num, slot, func);
+	else if (class == PCI_CLASS_SERIAL_USB_EHCI)
+		quirk_usb_handoff_ehci(num, slot, func);
+	else if (class == PCI_CLASS_SERIAL_USB_XHCI)
+		quirk_usb_handoff_xhci(num, slot, func);
+}
+
 static void __init fix_hypertransport_config(int num, int slot, int func)
 {
 	u32 htcfg;
@@ -208,6 +376,8 @@ struct chipset {
  * only matching on bus 0.
  */
 static struct chipset early_qrk[] __initdata = {
+	{ PCI_ANY_ID, PCI_ANY_ID,
+	  PCI_CLASS_SERIAL_USB, PCI_ANY_ID, 0, quirk_usb_handoff },
 	{ PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
 	  PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, nvidia_bugs },
 	{ PCI_VENDOR_ID_VIA, PCI_ANY_ID,

Re: [PATCH 1/3] pci, usb: Seperate usb handoff func to another file

[Benjamin Herrenschmidt]

On Sun, 2011-01-09 at 11:59 -0800, Yinghai Lu wrote:
> Make those func can take early, num, slot, func. So later could reuse them
> to do usb handoff much early.
> 
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>

That is gross...

> +
> +/* dummy functions to make compiler happy */
> +u32 __weak read_pci_config(u8 bus, u8 slot, u8 func, u8 offset)
> +{ return 0; }
> +u8 __weak read_pci_config_byte(u8 bus, u8 slot, u8 func, u8 offset)
> +{ return 0; }
> +u16 __weak read_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset)
> +{ return 0; }
> +void __weak write_pci_config(u8 bus, u8 slot, u8 func, u8 offset, u32 val)
> +{ }
> +void __weak write_pci_config_byte(u8 bus, u8 slot, u8 func, u8 offset, u8 val)
> +{ }
> +void __weak write_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset, u16 val)
> +{ }

Also bogus. No domain numbering for example, which is a minimum if
you're going to try to expose such "early config space" accesses (which
we do have in some form on powerpc for our own internal initialization
stuff).

But even with a domain number, that would somewhat suck. Different
architectures setup their PCI at different times and may not be capable
of dealing with domain numbers that early.

In addition, the pile of

	if (early)
		write_pci_*
	else
		pci_write_*

Are you -seriously- considering that such code is even remotely
acceptable ?

I think if you want to make the handoff happen -that- early, you have
basically two options. One is to move it all to arch code, and the other
one is to create early-boot "fake" struct pci_dev & bus that have the
config callbacks implemented pointing to the early stuff. You can do
that entirely within your arch code, and avoids most of the grossness
above in the generic places.

It would avoid that turd too:

> +#include "usb_handoff.c"

Cheers,
Ben.

 
> -#define UHCI_USBLEGSUP		0xc0		/* legacy support */
> -#define UHCI_USBCMD		0		/* command register */
> -#define UHCI_USBINTR		4		/* interrupt register */
> -#define UHCI_USBLEGSUP_RWC	0x8f00		/* the R/WC bits */
> -#define UHCI_USBLEGSUP_RO	0x5040		/* R/O and reserved bits */
> -#define UHCI_USBCMD_RUN		0x0001		/* RUN/STOP bit */
> -#define UHCI_USBCMD_HCRESET	0x0002		/* Host Controller reset */
> -#define UHCI_USBCMD_EGSM	0x0008		/* Global Suspend Mode */
> -#define UHCI_USBCMD_CONFIGURE	0x0040		/* Config Flag */
> -#define UHCI_USBINTR_RESUME	0x0002		/* Resume interrupt enable */
> -
> -#define OHCI_CONTROL		0x04
> -#define OHCI_CMDSTATUS		0x08
> -#define OHCI_INTRSTATUS		0x0c
> -#define OHCI_INTRENABLE		0x10
> -#define OHCI_INTRDISABLE	0x14
> -#define OHCI_OCR		(1 << 3)	/* ownership change request */
> -#define OHCI_CTRL_RWC		(1 << 9)	/* remote wakeup connected */
> -#define OHCI_CTRL_IR		(1 << 8)	/* interrupt routing */
> -#define OHCI_INTR_OC		(1 << 30)	/* ownership change */
> -
> -#define EHCI_HCC_PARAMS		0x08		/* extended capabilities */
> -#define EHCI_USBCMD		0		/* command register */
> -#define EHCI_USBCMD_RUN		(1 << 0)	/* RUN/STOP bit */
> -#define EHCI_USBSTS		4		/* status register */
> -#define EHCI_USBSTS_HALTED	(1 << 12)	/* HCHalted bit */
> -#define EHCI_USBINTR		8		/* interrupt register */
> -#define EHCI_CONFIGFLAG		0x40		/* configured flag register */
> -#define EHCI_USBLEGSUP		0		/* legacy support register */
> -#define EHCI_USBLEGSUP_BIOS	(1 << 16)	/* BIOS semaphore */
> -#define EHCI_USBLEGSUP_OS	(1 << 24)	/* OS semaphore */
> -#define EHCI_USBLEGCTLSTS	4		/* legacy control/status */
> -#define EHCI_USBLEGCTLSTS_SOOE	(1 << 13)	/* SMI on ownership change */
> -
> -
> -/*
> - * Make sure the controller is completely inactive, unable to
> - * generate interrupts or do DMA.
> - */
>  void uhci_reset_hc(struct pci_dev *pdev, unsigned long base)
>  {
> -	/* Turn off PIRQ enable and SMI enable.  (This also turns off the
> -	 * BIOS's USB Legacy Support.)  Turn off all the R/WC bits too.
> -	 */
> -	pci_write_config_word(pdev, UHCI_USBLEGSUP, UHCI_USBLEGSUP_RWC);
> -
> -	/* Reset the HC - this will force us to get a
> -	 * new notification of any already connected
> -	 * ports due to the virtual disconnect that it
> -	 * implies.
> -	 */
> -	outw(UHCI_USBCMD_HCRESET, base + UHCI_USBCMD);
> -	mb();
> -	udelay(5);
> -	if (inw(base + UHCI_USBCMD) & UHCI_USBCMD_HCRESET)
> -		dev_warn(&pdev->dev, "HCRESET not completed yet!\n");
> -
> -	/* Just to be safe, disable interrupt requests and
> -	 * make sure the controller is stopped.
> -	 */
> -	outw(0, base + UHCI_USBINTR);
> -	outw(0, base + UHCI_USBCMD);
> +	__uhci_reset_hc(0, pdev, 0, 0, 0, base);
>  }
>  EXPORT_SYMBOL_GPL(uhci_reset_hc);
>  
> -/*
> - * Initialize a controller that was newly discovered or has just been
> - * resumed.  In either case we can't be sure of its previous state.
> - *
> - * Returns: 1 if the controller was reset, 0 otherwise.
> - */
>  int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base)
>  {
> -	u16 legsup;
> -	unsigned int cmd, intr;
> -
> -	/*
> -	 * When restarting a suspended controller, we expect all the
> -	 * settings to be the same as we left them:
> -	 *
> -	 *	PIRQ and SMI disabled, no R/W bits set in USBLEGSUP;
> -	 *	Controller is stopped and configured with EGSM set;
> -	 *	No interrupts enabled except possibly Resume Detect.
> -	 *
> -	 * If any of these conditions are violated we do a complete reset.
> -	 */
> -	pci_read_config_word(pdev, UHCI_USBLEGSUP, &legsup);
> -	if (legsup & ~(UHCI_USBLEGSUP_RO | UHCI_USBLEGSUP_RWC)) {
> -		dev_dbg(&pdev->dev, "%s: legsup = 0x%04x\n",
> -				__func__, legsup);
> -		goto reset_needed;
> -	}
> -
> -	cmd = inw(base + UHCI_USBCMD);
> -	if ((cmd & UHCI_USBCMD_RUN) || !(cmd & UHCI_USBCMD_CONFIGURE) ||
> -			!(cmd & UHCI_USBCMD_EGSM)) {
> -		dev_dbg(&pdev->dev, "%s: cmd = 0x%04x\n",
> -				__func__, cmd);
> -		goto reset_needed;
> -	}
> -
> -	intr = inw(base + UHCI_USBINTR);
> -	if (intr & (~UHCI_USBINTR_RESUME)) {
> -		dev_dbg(&pdev->dev, "%s: intr = 0x%04x\n",
> -				__func__, intr);
> -		goto reset_needed;
> -	}
> -	return 0;
> -
> -reset_needed:
> -	dev_dbg(&pdev->dev, "Performing full reset\n");
> -	uhci_reset_hc(pdev, base);
> -	return 1;
> +	return	__uhci_check_and_reset_hc(0, pdev, 0, 0, 0, base);
>  }
>  EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
>  
> @@ -169,7 +89,6 @@ static int __devinit mmio_resource_enabl
>  static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev)
>  {
>  	void __iomem *base;
> -	u32 control;
>  
>  	if (!mmio_resource_enabled(pdev, 0))
>  		return;
> @@ -178,50 +97,14 @@ static void __devinit quirk_usb_handoff_
>  	if (base == NULL)
>  		return;
>  
> -	control = readl(base + OHCI_CONTROL);
> -
> -/* On PA-RISC, PDC can leave IR set incorrectly; ignore it there. */
> -#ifdef __hppa__
> -#define	OHCI_CTRL_MASK		(OHCI_CTRL_RWC | OHCI_CTRL_IR)
> -#else
> -#define	OHCI_CTRL_MASK		OHCI_CTRL_RWC
> -
> -	if (control & OHCI_CTRL_IR) {
> -		int wait_time = 500; /* arbitrary; 5 seconds */
> -		writel(OHCI_INTR_OC, base + OHCI_INTRENABLE);
> -		writel(OHCI_OCR, base + OHCI_CMDSTATUS);
> -		while (wait_time > 0 &&
> -				readl(base + OHCI_CONTROL) & OHCI_CTRL_IR) {
> -			wait_time -= 10;
> -			msleep(10);
> -		}
> -		if (wait_time <= 0)
> -			dev_warn(&pdev->dev, "OHCI: BIOS handoff failed"
> -					" (BIOS bug?) %08x\n",
> -					readl(base + OHCI_CONTROL));
> -	}
> -#endif
> -
> -	/* reset controller, preserving RWC (and possibly IR) */
> -	writel(control & OHCI_CTRL_MASK, base + OHCI_CONTROL);
> -
> -	/*
> -	 * disable interrupts
> -	 */
> -	writel(~(u32)0, base + OHCI_INTRDISABLE);
> -	writel(~(u32)0, base + OHCI_INTRSTATUS);
> +	__usb_handoff_ohci(0, pdev, 0, 0, 0, base);
>  
>  	iounmap(base);
>  }
>  
>  static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
>  {
> -	int wait_time, delta;
> -	void __iomem *base, *op_reg_base;
> -	u32	hcc_params, val;
> -	u8	offset, cap_length;
> -	int	count = 256/4;
> -	int	tried_handoff = 0;
> +	void __iomem *base;
>  
>  	if (!mmio_resource_enabled(pdev, 0))
>  		return;
> @@ -230,238 +113,23 @@ static void __devinit quirk_usb_disable_
>  	if (base == NULL)
>  		return;
>  
> -	cap_length = readb(base);
> -	op_reg_base = base + cap_length;
> -
> -	/* EHCI 0.96 and later may have "extended capabilities"
> -	 * spec section 5.1 explains the bios handoff, e.g. for
> -	 * booting from USB disk or using a usb keyboard
> -	 */
> -	hcc_params = readl(base + EHCI_HCC_PARAMS);
> -	offset = (hcc_params >> 8) & 0xff;
> -	while (offset && --count) {
> -		u32		cap;
> -		int		msec;
> -
> -		pci_read_config_dword(pdev, offset, &cap);
> -		switch (cap & 0xff) {
> -		case 1:			/* BIOS/SMM/... handoff support */
> -			if ((cap & EHCI_USBLEGSUP_BIOS)) {
> -				dev_dbg(&pdev->dev, "EHCI: BIOS handoff\n");
> -
> -#if 0
> -/* aleksey_gorelov@phoenix.com reports that some systems need SMI forced on,
> - * but that seems dubious in general (the BIOS left it off intentionally)
> - * and is known to prevent some systems from booting.  so we won't do this
> - * unless maybe we can determine when we're on a system that needs SMI forced.
> - */
> -				/* BIOS workaround (?): be sure the
> -				 * pre-Linux code receives the SMI
> -				 */
> -				pci_read_config_dword(pdev,
> -						offset + EHCI_USBLEGCTLSTS,
> -						&val);
> -				pci_write_config_dword(pdev,
> -						offset + EHCI_USBLEGCTLSTS,
> -						val | EHCI_USBLEGCTLSTS_SOOE);
> -#endif
> -
> -				/* some systems get upset if this semaphore is
> -				 * set for any other reason than forcing a BIOS
> -				 * handoff..
> -				 */
> -				pci_write_config_byte(pdev, offset + 3, 1);
> -			}
> -
> -			/* if boot firmware now owns EHCI, spin till
> -			 * it hands it over.
> -			 */
> -			msec = 1000;
> -			while ((cap & EHCI_USBLEGSUP_BIOS) && (msec > 0)) {
> -				tried_handoff = 1;
> -				msleep(10);
> -				msec -= 10;
> -				pci_read_config_dword(pdev, offset, &cap);
> -			}
> -
> -			if (cap & EHCI_USBLEGSUP_BIOS) {
> -				/* well, possibly buggy BIOS... try to shut
> -				 * it down, and hope nothing goes too wrong
> -				 */
> -				dev_warn(&pdev->dev, "EHCI: BIOS handoff failed"
> -						" (BIOS bug?) %08x\n", cap);
> -				pci_write_config_byte(pdev, offset + 2, 0);
> -			}
> -
> -			/* just in case, always disable EHCI SMIs */
> -			pci_write_config_dword(pdev,
> -					offset + EHCI_USBLEGCTLSTS,
> -					0);
> -
> -			/* If the BIOS ever owned the controller then we
> -			 * can't expect any power sessions to remain intact.
> -			 */
> -			if (tried_handoff)
> -				writel(0, op_reg_base + EHCI_CONFIGFLAG);
> -			break;
> -		case 0:			/* illegal reserved capability */
> -			cap = 0;
> -			/* FALLTHROUGH */
> -		default:
> -			dev_warn(&pdev->dev, "EHCI: unrecognized capability "
> -					"%02x\n", cap & 0xff);
> -			break;
> -		}
> -		offset = (cap >> 8) & 0xff;
> -	}
> -	if (!count)
> -		dev_printk(KERN_DEBUG, &pdev->dev, "EHCI: capability loop?\n");
> -
> -	/*
> -	 * halt EHCI & disable its interrupts in any case
> -	 */
> -	val = readl(op_reg_base + EHCI_USBSTS);
> -	if ((val & EHCI_USBSTS_HALTED) == 0) {
> -		val = readl(op_reg_base + EHCI_USBCMD);
> -		val &= ~EHCI_USBCMD_RUN;
> -		writel(val, op_reg_base + EHCI_USBCMD);
> -
> -		wait_time = 2000;
> -		delta = 100;
> -		do {
> -			writel(0x3f, op_reg_base + EHCI_USBSTS);
> -			udelay(delta);
> -			wait_time -= delta;
> -			val = readl(op_reg_base + EHCI_USBSTS);
> -			if ((val == ~(u32)0) || (val & EHCI_USBSTS_HALTED)) {
> -				break;
> -			}
> -		} while (wait_time > 0);
> -	}
> -	writel(0, op_reg_base + EHCI_USBINTR);
> -	writel(0x3f, op_reg_base + EHCI_USBSTS);
> +	__usb_handoff_ehci(0, pdev, 0, 0, 0, base);
>  
>  	iounmap(base);
>  }
>  
> -/*
> - * handshake - spin reading a register until handshake completes
> - * @ptr: address of hc register to be read
> - * @mask: bits to look at in result of read
> - * @done: value of those bits when handshake succeeds
> - * @wait_usec: timeout in microseconds
> - * @delay_usec: delay in microseconds to wait between polling
> - *
> - * Polls a register every delay_usec microseconds.
> - * Returns 0 when the mask bits have the value done.
> - * Returns -ETIMEDOUT if this condition is not true after
> - * wait_usec microseconds have passed.
> - */
> -static int handshake(void __iomem *ptr, u32 mask, u32 done,
> -		int wait_usec, int delay_usec)
> -{
> -	u32	result;
> -
> -	do {
> -		result = readl(ptr);
> -		result &= mask;
> -		if (result == done)
> -			return 0;
> -		udelay(delay_usec);
> -		wait_usec -= delay_usec;
> -	} while (wait_usec > 0);
> -	return -ETIMEDOUT;
> -}
> -
> -/**
> - * PCI Quirks for xHCI.
> - *
> - * Takes care of the handoff between the Pre-OS (i.e. BIOS) and the OS.
> - * It signals to the BIOS that the OS wants control of the host controller,
> - * and then waits 5 seconds for the BIOS to hand over control.
> - * If we timeout, assume the BIOS is broken and take control anyway.
> - */
>  static void __devinit quirk_usb_handoff_xhci(struct pci_dev *pdev)
>  {
>  	void __iomem *base;
> -	int ext_cap_offset;
> -	void __iomem *op_reg_base;
> -	u32 val;
> -	int timeout;
>  
>  	if (!mmio_resource_enabled(pdev, 0))
>  		return;
>  
> -	base = ioremap_nocache(pci_resource_start(pdev, 0),
> -				pci_resource_len(pdev, 0));
> +	base = pci_ioremap_bar(pdev, 0);
>  	if (base == NULL)
>  		return;
>  
> -	/*
> -	 * Find the Legacy Support Capability register -
> -	 * this is optional for xHCI host controllers.
> -	 */
> -	ext_cap_offset = xhci_find_next_cap_offset(base, XHCI_HCC_PARAMS_OFFSET);
> -	do {
> -		if (!ext_cap_offset)
> -			/* We've reached the end of the extended capabilities */
> -			goto hc_init;
> -		val = readl(base + ext_cap_offset);
> -		if (XHCI_EXT_CAPS_ID(val) == XHCI_EXT_CAPS_LEGACY)
> -			break;
> -		ext_cap_offset = xhci_find_next_cap_offset(base, ext_cap_offset);
> -	} while (1);
> -
> -	/* If the BIOS owns the HC, signal that the OS wants it, and wait */
> -	if (val & XHCI_HC_BIOS_OWNED) {
> -		writel(val & XHCI_HC_OS_OWNED, base + ext_cap_offset);
> -
> -		/* Wait for 5 seconds with 10 microsecond polling interval */
> -		timeout = handshake(base + ext_cap_offset, XHCI_HC_BIOS_OWNED,
> -				0, 5000, 10);
> -
> -		/* Assume a buggy BIOS and take HC ownership anyway */
> -		if (timeout) {
> -			dev_warn(&pdev->dev, "xHCI BIOS handoff failed"
> -					" (BIOS bug ?) %08x\n", val);
> -			writel(val & ~XHCI_HC_BIOS_OWNED, base + ext_cap_offset);
> -		}
> -	}
> -
> -	/* Disable any BIOS SMIs */
> -	writel(XHCI_LEGACY_DISABLE_SMI,
> -			base + ext_cap_offset + XHCI_LEGACY_CONTROL_OFFSET);
> -
> -hc_init:
> -	op_reg_base = base + XHCI_HC_LENGTH(readl(base));
> -
> -	/* Wait for the host controller to be ready before writing any
> -	 * operational or runtime registers.  Wait 5 seconds and no more.
> -	 */
> -	timeout = handshake(op_reg_base + XHCI_STS_OFFSET, XHCI_STS_CNR, 0,
> -			5000, 10);
> -	/* Assume a buggy HC and start HC initialization anyway */
> -	if (timeout) {
> -		val = readl(op_reg_base + XHCI_STS_OFFSET);
> -		dev_warn(&pdev->dev,
> -				"xHCI HW not ready after 5 sec (HC bug?) "
> -				"status = 0x%x\n", val);
> -	}
> -
> -	/* Send the halt and disable interrupts command */
> -	val = readl(op_reg_base + XHCI_CMD_OFFSET);
> -	val &= ~(XHCI_CMD_RUN | XHCI_IRQS);
> -	writel(val, op_reg_base + XHCI_CMD_OFFSET);
> -
> -	/* Wait for the HC to halt - poll every 125 usec (one microframe). */
> -	timeout = handshake(op_reg_base + XHCI_STS_OFFSET, XHCI_STS_HALT, 1,
> -			XHCI_MAX_HALT_USEC, 125);
> -	if (timeout) {
> -		val = readl(op_reg_base + XHCI_STS_OFFSET);
> -		dev_warn(&pdev->dev,
> -				"xHCI HW did not halt within %d usec "
> -				"status = 0x%x\n", XHCI_MAX_HALT_USEC, val);
> -	}
> +	__usb_handoff_xhci(0, pdev, 0, 0, 0, base);
>  
>  	iounmap(base);
>  }
> Index: linux-2.6/drivers/usb/host/usb_handoff.c
> ===================================================================
> --- /dev/null
> +++ linux-2.6/drivers/usb/host/usb_handoff.c
> @@ -0,0 +1,501 @@
> +/*
> + * This file contains code to reset and initialize USB host controllers.
> + * Some of it includes work-arounds for PCI hardware and BIOS quirks.
> + * It may need to run early during booting -- before USB would normally
> + * initialize -- to ensure that Linux doesn't use any legacy modes.
> + *
> + *  Copyright (c) 1999 Martin Mares <mj@ucw.cz>
> + *  (and others)
> + */
> +
> +#include "xhci-ext-caps.h"
> +
> +#define UHCI_USBLEGSUP		0xc0		/* legacy support */
> +#define UHCI_USBCMD		0		/* command register */
> +#define UHCI_USBINTR		4		/* interrupt register */
> +#define UHCI_USBLEGSUP_RWC	0x8f00		/* the R/WC bits */
> +#define UHCI_USBLEGSUP_RO	0x5040		/* R/O and reserved bits */
> +#define UHCI_USBCMD_RUN		0x0001		/* RUN/STOP bit */
> +#define UHCI_USBCMD_HCRESET	0x0002		/* Host Controller reset */
> +#define UHCI_USBCMD_EGSM	0x0008		/* Global Suspend Mode */
> +#define UHCI_USBCMD_CONFIGURE	0x0040		/* Config Flag */
> +#define UHCI_USBINTR_RESUME	0x0002		/* Resume interrupt enable */
> +
> +#define OHCI_CONTROL		0x04
> +#define OHCI_CMDSTATUS		0x08
> +#define OHCI_INTRSTATUS		0x0c
> +#define OHCI_INTRENABLE		0x10
> +#define OHCI_INTRDISABLE	0x14
> +#define OHCI_OCR		(1 << 3)	/* ownership change request */
> +#define OHCI_CTRL_RWC		(1 << 9)	/* remote wakeup connected */
> +#define OHCI_CTRL_IR		(1 << 8)	/* interrupt routing */
> +#define OHCI_INTR_OC		(1 << 30)	/* ownership change */
> +
> +#define EHCI_HCC_PARAMS		0x08		/* extended capabilities */
> +#define EHCI_USBCMD		0		/* command register */
> +#define EHCI_USBCMD_RUN		(1 << 0)	/* RUN/STOP bit */
> +#define EHCI_USBSTS		4		/* status register */
> +#define EHCI_USBSTS_HALTED	(1 << 12)	/* HCHalted bit */
> +#define EHCI_USBINTR		8		/* interrupt register */
> +#define EHCI_CONFIGFLAG		0x40		/* configured flag register */
> +#define EHCI_USBLEGSUP		0		/* legacy support register */
> +#define EHCI_USBLEGSUP_BIOS	(1 << 16)	/* BIOS semaphore */
> +#define EHCI_USBLEGSUP_OS	(1 << 24)	/* OS semaphore */
> +#define EHCI_USBLEGCTLSTS	4		/* legacy control/status */
> +#define EHCI_USBLEGCTLSTS_SOOE	(1 << 13)	/* SMI on ownership change */
> +
> +/*
> + * Make sure the controller is completely inactive, unable to
> + * generate interrupts or do DMA.
> + */
> +static inline void
> +__uhci_reset_hc(int early, struct pci_dev *pdev,
> +		int num, int slot, int func, unsigned long base)
> +{
> +	/* Turn off PIRQ enable and SMI enable.  (This also turns off the
> +	 * BIOS's USB Legacy Support.)  Turn off all the R/WC bits too.
> +	 */
> +	if (!early)
> +		pci_write_config_word(pdev, UHCI_USBLEGSUP, UHCI_USBLEGSUP_RWC);
> +	else
> +		write_pci_config_16(num, slot, func, UHCI_USBLEGSUP,
> +					UHCI_USBLEGSUP_RWC);
> +
> +	/* Reset the HC - this will force us to get a
> +	 * new notification of any already connected
> +	 * ports due to the virtual disconnect that it
> +	 * implies.
> +	 */
> +	outw(UHCI_USBCMD_HCRESET, base + UHCI_USBCMD);
> +	mb();
> +	usb_handoff_udelay(5);
> +	if (inw(base + UHCI_USBCMD) & UHCI_USBCMD_HCRESET) {
> +		if (!early)
> +			dev_warn(&pdev->dev, "HCRESET not completed yet!\n");
> +		else
> +			pr_warn("%02x:%02x.%01x HCRESET not completed yet!\n",
> +				num, slot, func);
> +	}
> +
> +	/* Just to be safe, disable interrupt requests and
> +	 * make sure the controller is stopped.
> +	 */
> +	outw(0, base + UHCI_USBINTR);
> +	outw(0, base + UHCI_USBCMD);
> +}
> +
> +/*
> + * Initialize a controller that was newly discovered or has just been
> + * resumed.  In either case we can't be sure of its previous state.
> + *
> + * Returns: 1 if the controller was reset, 0 otherwise.
> + */
> +static inline int
> +__uhci_check_and_reset_hc(int early, struct pci_dev *pdev,
> +			int num, int slot, int func, unsigned long base)
> +{
> +	u16 legsup;
> +	unsigned int cmd, intr;
> +
> +	/*
> +	 * When restarting a suspended controller, we expect all the
> +	 * settings to be the same as we left them:
> +	 *
> +	 *	PIRQ and SMI disabled, no R/W bits set in USBLEGSUP;
> +	 *	Controller is stopped and configured with EGSM set;
> +	 *	No interrupts enabled except possibly Resume Detect.
> +	 *
> +	 * If any of these conditions are violated we do a complete reset.
> +	 */
> +	if (!early)
> +		pci_read_config_word(pdev, UHCI_USBLEGSUP, &legsup);
> +	else
> +		legsup = read_pci_config_16(num, slot, func, UHCI_USBLEGSUP);
> +	if (legsup & ~(UHCI_USBLEGSUP_RO | UHCI_USBLEGSUP_RWC)) {
> +		if (!early)
> +			dev_printk(KERN_DEBUG, &pdev->dev,
> +				 "%s: legsup = 0x%04x\n", __func__, legsup);
> +		else
> +			printk(KERN_DEBUG
> +				 "%02x:%02x.%01x: legsup = 0x%04x\n",
> +					num, slot, func, legsup);
> +
> +		goto reset_needed;
> +	}
> +
> +	cmd = inw(base + UHCI_USBCMD);
> +	if ((cmd & UHCI_USBCMD_RUN) || !(cmd & UHCI_USBCMD_CONFIGURE) ||
> +			!(cmd & UHCI_USBCMD_EGSM)) {
> +		if (!early)
> +			dev_printk(KERN_DEBUG, &pdev->dev,
> +					"%s: cmd = 0x%04x\n", __func__, cmd);
> +		else
> +			printk(KERN_DEBUG "%02x:%02x.%01x: cmd = 0x%04x\n",
> +					num, slot, func, cmd);
> +
> +		goto reset_needed;
> +	}
> +
> +	intr = inw(base + UHCI_USBINTR);
> +	if (intr & (~UHCI_USBINTR_RESUME)) {
> +		if (!early)
> +			dev_printk(KERN_DEBUG, &pdev->dev,
> +					"%s: intr = 0x%04x\n", __func__, intr);
> +		else
> +			printk(KERN_DEBUG "%02x:%02x.%01x: intr = 0x%04x\n",
> +					num, slot, func, intr);
> +
> +		goto reset_needed;
> +	}
> +	return 0;
> +
> +reset_needed:
> +	if (!early)
> +		dev_printk(KERN_DEBUG, &pdev->dev, "Performing full reset\n");
> +	else
> +		printk(KERN_DEBUG "%02x:%02x.%01x: Performing full reset\n",
> +				num, slot, func);
> +
> +	__uhci_reset_hc(early, pdev, num, slot, func, base);
> +
> +	return 1;
> +}
> +
> +static inline void
> +__usb_handoff_ohci(int early, struct pci_dev *pdev,
> +			int num, int slot, int func, void __iomem *base)
> +{
> +	u32 control;
> +
> +	control = readl(base + OHCI_CONTROL);
> +
> +/* On PA-RISC, PDC can leave IR set incorrectly; ignore it there. */
> +#ifdef __hppa__
> +#define	OHCI_CTRL_MASK		(OHCI_CTRL_RWC | OHCI_CTRL_IR)
> +#else
> +#define	OHCI_CTRL_MASK		OHCI_CTRL_RWC
> +
> +	if (control & OHCI_CTRL_IR) {
> +		int wait_time = 500; /* arbitrary; 5 seconds */
> +		writel(OHCI_INTR_OC, base + OHCI_INTRENABLE);
> +		writel(OHCI_OCR, base + OHCI_CMDSTATUS);
> +		while (wait_time > 0 &&
> +				readl(base + OHCI_CONTROL) & OHCI_CTRL_IR) {
> +			wait_time -= 1;
> +			usb_handoff_msleep(1);
> +		}
> +		if (wait_time <= 0) {
> +			if (!early)
> +				dev_warn(&pdev->dev,
> +				 "OHCI: BIOS handoff failed (BIOS bug?) %08x\n",
> +						readl(base + OHCI_CONTROL));
> +			else
> +				pr_warn(" %02x:%02x.%01x OHCI: BIOS handoff failed (BIOS bug?) %08x\n",
> +					num, slot, func,
> +					readl(base + OHCI_CONTROL));
> +		}
> +	}
> +#endif
> +
> +	/* reset controller, preserving RWC (and possibly IR) */
> +	writel(control & OHCI_CTRL_MASK, base + OHCI_CONTROL);
> +
> +	/*
> +	 * disable interrupts
> +	 */
> +	writel(~(u32)0, base + OHCI_INTRDISABLE);
> +	writel(~(u32)0, base + OHCI_INTRSTATUS);
> +}
> +
> +static inline void
> +__usb_handoff_ehci(int early, struct pci_dev *pdev,
> +			int num, int slot, int func, void __iomem *base)
> +{
> +	int wait_time, delta;
> +	void *op_reg_base;
> +	u32	hcc_params, val;
> +	u8	offset, cap_length;
> +	int	count = 256/4;
> +	int	tried_handoff = 0;
> +
> +	cap_length = readb(base);
> +	op_reg_base = base + cap_length;
> +
> +	/* EHCI 0.96 and later may have "extended capabilities"
> +	 * spec section 5.1 explains the bios handoff, e.g. for
> +	 * booting from USB disk or using a usb keyboard
> +	 */
> +	hcc_params = readl(base + EHCI_HCC_PARAMS);
> +	offset = (hcc_params >> 8) & 0xff;
> +	while (offset && --count) {
> +		u32		cap;
> +		int		msec;
> +
> +		if (!early)
> +			pci_read_config_dword(pdev, offset, &cap);
> +		else
> +			cap = read_pci_config(num, slot, func, offset);
> +		switch (cap & 0xff) {
> +		case 1:			/* BIOS/SMM/... handoff support */
> +			if ((cap & EHCI_USBLEGSUP_BIOS)) {
> +				if (!early)
> +					dev_printk(KERN_DEBUG, &pdev->dev,
> +						"EHCI: BIOS handoff\n");
> +				else
> +					printk(KERN_DEBUG
> +					 "%02x:%02x.%01x: EHCI: BIOS handoff\n",
> +						num, slot, func);
> +
> +#if 0
> +/* aleksey_gorelov@phoenix.com reports that some systems need SMI forced on,
> + * but that seems dubious in general (the BIOS left it off intentionally)
> + * and is known to prevent some systems from booting.  so we won't do this
> + * unless maybe we can determine when we're on a system that needs SMI forced.
> + */
> +				/* BIOS workaround (?): be sure the
> +				 * pre-Linux code receives the SMI
> +				 */
> +				pci_read_config_dword(pdev,
> +						offset + EHCI_USBLEGCTLSTS,
> +						&val);
> +				pci_write_config_dword(pdev,
> +						offset + EHCI_USBLEGCTLSTS,
> +						val | EHCI_USBLEGCTLSTS_SOOE);
> +#endif
> +
> +				/* some systems get upset if this semaphore is
> +				 * set for any other reason than forcing a BIOS
> +				 * handoff..
> +				 */
> +				if (!early)
> +					pci_write_config_byte(pdev,
> +								offset + 3, 1);
> +				else
> +					write_pci_config_byte(num, slot, func,
> +								offset + 3, 1);
> +			}
> +
> +			/* if boot firmware now owns EHCI, spin till
> +			 * it hands it over.
> +			 */
> +			msec = 1000;
> +			while ((cap & EHCI_USBLEGSUP_BIOS) && (msec > 0)) {
> +				tried_handoff = 1;
> +				usb_handoff_msleep(1);
> +				msec -= 1;
> +				if (!early)
> +					pci_read_config_dword(pdev, offset,
> +								&cap);
> +				else
> +					cap = read_pci_config(num, slot, func,
> +								offset);
> +			}
> +
> +			if (cap & EHCI_USBLEGSUP_BIOS) {
> +				/* well, possibly buggy BIOS... try to shut
> +				 * it down, and hope nothing goes too wrong
> +				 */
> +				if (!early) {
> +					dev_warn(&pdev->dev,
> +				 "EHCI: BIOS handoff failed (BIOS bug?) %08x\n",
> +							cap);
> +					pci_write_config_byte(pdev, offset + 2,
> +								 0);
> +				} else {
> +					pr_warn("%02x:%02x.%01x: EHCI: BIOS handoff failed (BIOS bug?) %08x\n",
> +							num, slot, func, cap);
> +					write_pci_config_byte(num, slot, func,
> +								 offset + 2, 0);
> +				}
> +			}
> +
> +			/* just in case, always disable EHCI SMIs */
> +			if (!early)
> +				pci_write_config_dword(pdev,
> +						offset + EHCI_USBLEGCTLSTS,
> +						0);
> +			else
> +				write_pci_config(num, slot, func,
> +						offset + EHCI_USBLEGCTLSTS,
> +						0);
> +
> +
> +			/* If the BIOS ever owned the controller then we
> +			 * can't expect any power sessions to remain intact.
> +			 */
> +			if (tried_handoff)
> +				writel(0, op_reg_base + EHCI_CONFIGFLAG);
> +			break;
> +		case 0:			/* illegal reserved capability */
> +			cap = 0;
> +			/* FALLTHROUGH */
> +		default:
> +			if (!early)
> +				dev_warn(&pdev->dev,
> +					 "EHCI: unrecognized capability %02x\n",
> +						cap & 0xff);
> +			else
> +				pr_warn("%02x:%02x.%01x: EHCI: unrecognized capability %02x\n",
> +						num, slot, func, cap & 0xff);
> +			break;
> +		}
> +		offset = (cap >> 8) & 0xff;
> +	}
> +	if (!count) {
> +		if (!early)
> +			dev_printk(KERN_DEBUG, &pdev->dev,
> +					"EHCI: capability loop?\n");
> +		else
> +			pr_warn("%02x:%02x.%01x: EHCI: capability loop?\n",
> +				num, slot, func);
> +	}
> +
> +	/*
> +	 * halt EHCI & disable its interrupts in any case
> +	 */
> +	val = readl(op_reg_base + EHCI_USBSTS);
> +	if ((val & EHCI_USBSTS_HALTED) == 0) {
> +		val = readl(op_reg_base + EHCI_USBCMD);
> +		val &= ~EHCI_USBCMD_RUN;
> +		writel(val, op_reg_base + EHCI_USBCMD);
> +
> +		wait_time = 2000;
> +		delta = 10;
> +		do {
> +			writel(0x3f, op_reg_base + EHCI_USBSTS);
> +			usb_handoff_udelay(delta);
> +			wait_time -= delta;
> +			val = readl(op_reg_base + EHCI_USBSTS);
> +			if ((val == ~(u32)0) || (val & EHCI_USBSTS_HALTED))
> +				break;
> +		} while (wait_time > 0);
> +	}
> +	writel(0, op_reg_base + EHCI_USBINTR);
> +	writel(0x3f, op_reg_base + EHCI_USBSTS);
> +}
> +
> +/*
> + * handshake - spin reading a register until handshake completes
> + * @ptr: address of hc register to be read
> + * @mask: bits to look at in result of read
> + * @done: value of those bits when handshake succeeds
> + * @wait_usec: timeout in microseconds
> + * @delay_usec: delay in microseconds to wait between polling
> + *
> + * Polls a register every delay_usec microseconds.
> + * Returns 0 when the mask bits have the value done.
> + * Returns -ETIMEDOUT if this condition is not true after
> + * wait_usec microseconds have passed.
> + */
> +static int handshake(void __iomem *ptr, u32 mask, u32 done,
> +		int wait_usec, int delay_usec)
> +{
> +	u32	result;
> +
> +	do {
> +		result = readl(ptr);
> +		result &= mask;
> +		if (result == done)
> +			return 0;
> +		usb_handoff_udelay(delay_usec);
> +		wait_usec -= delay_usec;
> +	} while (wait_usec > 0);
> +	return -ETIMEDOUT;
> +}
> +
> +/**
> + * PCI Quirks for xHCI.
> + *
> + * Takes care of the handoff between the Pre-OS (i.e. BIOS) and the OS.
> + * It signals to the BIOS that the OS wants control of the host controller,
> + * and then waits 5 seconds for the BIOS to hand over control.
> + * If we timeout, assume the BIOS is broken and take control anyway.
> + */
> +static inline void
> +__usb_handoff_xhci(int early, struct pci_dev *pdev,
> +			int num, int slot, int func, void __iomem *base)
> +{
> +	int ext_cap_offset;
> +	void __iomem *op_reg_base;
> +	u32 val;
> +	int timeout;
> +
> +	/*
> +	 * Find the Legacy Support Capability register -
> +	 * this is optional for xHCI host controllers.
> +	 */
> +	ext_cap_offset = xhci_find_next_cap_offset(base, XHCI_HCC_PARAMS_OFFSET);
> +	do {
> +		if (!ext_cap_offset)
> +			/* We've reached the end of the extended capabilities */
> +			goto hc_init;
> +		val = readl(base + ext_cap_offset);
> +		if (XHCI_EXT_CAPS_ID(val) == XHCI_EXT_CAPS_LEGACY)
> +			break;
> +		ext_cap_offset = xhci_find_next_cap_offset(base, ext_cap_offset);
> +	} while (1);
> +
> +	/* If the BIOS owns the HC, signal that the OS wants it, and wait */
> +	if (val & XHCI_HC_BIOS_OWNED) {
> +		writel(val & XHCI_HC_OS_OWNED, base + ext_cap_offset);
> +
> +		/* Wait for 5 seconds with 10 microsecond polling interval */
> +		timeout = handshake(base + ext_cap_offset, XHCI_HC_BIOS_OWNED,
> +				0, 5000, 10);
> +
> +		/* Assume a buggy BIOS and take HC ownership anyway */
> +		if (timeout) {
> +			if (!early)
> +				dev_warn(&pdev->dev,
> +				 "xHCI BIOS handoff failed (BIOS bug ?) %08x\n",
> +						val);
> +			else
> +				pr_warn("%02x:%02x.%01x: xHCI BIOS handoff failed (BIOS bug ?) %08x\n",
> +					num, slot, func, val);
> +			writel(val & ~XHCI_HC_BIOS_OWNED, base + ext_cap_offset);
> +		}
> +	}
> +
> +	/* Disable any BIOS SMIs */
> +	writel(XHCI_LEGACY_DISABLE_SMI,
> +			base + ext_cap_offset + XHCI_LEGACY_CONTROL_OFFSET);
> +
> +hc_init:
> +	op_reg_base = base + XHCI_HC_LENGTH(readl(base));
> +
> +	/* Wait for the host controller to be ready before writing any
> +	 * operational or runtime registers.  Wait 5 seconds and no more.
> +	 */
> +	timeout = handshake(op_reg_base + XHCI_STS_OFFSET, XHCI_STS_CNR, 0,
> +			5000, 10);
> +	/* Assume a buggy HC and start HC initialization anyway */
> +	if (timeout) {
> +		val = readl(op_reg_base + XHCI_STS_OFFSET);
> +		if (!early)
> +			dev_warn(&pdev->dev,
> +				"xHCI HW not ready after 5 sec (HC bug?) status = 0x%x\n",
> +					val);
> +		else
> +			pr_warn("%02x:%02x.%01x: xHCI HW not ready after 5 sec (HC bug?) status = 0x%x\n",
> +					num, slot, func, val);
> +	}
> +
> +	/* Send the halt and disable interrupts command */
> +	val = readl(op_reg_base + XHCI_CMD_OFFSET);
> +	val &= ~(XHCI_CMD_RUN | XHCI_IRQS);
> +	writel(val, op_reg_base + XHCI_CMD_OFFSET);
> +
> +	/* Wait for the HC to halt - poll every 125 usec (one microframe). */
> +	timeout = handshake(op_reg_base + XHCI_STS_OFFSET, XHCI_STS_HALT, 1,
> +			XHCI_MAX_HALT_USEC, 125);
> +	if (timeout) {
> +		val = readl(op_reg_base + XHCI_STS_OFFSET);
> +		if (!early)
> +			dev_warn(&pdev->dev,
> +					"xHCI HW did not halt within %d usec status = 0x%x\n",
> +					 XHCI_MAX_HALT_USEC, val);
> +		else
> +			pr_warn("%02x:%02x.%01x: xHCI HW did not halt within %d usec status = 0x%x",
> +					num, slot, func, XHCI_MAX_HALT_USEC, val);
> +	}
> +}
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/3] pci, usb: Seperate usb handoff func to another file

[Yinghai Lu]

On 01/09/2011 01:09 PM, Benjamin Herrenschmidt wrote:
> acceptable ?
> 
> I think if you want to make the handoff happen -that- early, you have
> basically two options. One is to move it all to arch code, and the other
> one is to create early-boot "fake" struct pci_dev & bus that have the
> config callbacks implemented pointing to the early stuff. You can do
> that entirely within your arch code, and avoids most of the grossness
> above in the generic places.

good idea, will make one get_early_pci_dev() for x86 as dummy device.

> 
> It would avoid that turd too:
> 
>> +#include "usb_handoff.c"

may still need that to avoid some MMIO bar finding and remapping etc.

Thanks

Yinghai

Re: [PATCH 1/3] pci, usb: Seperate usb handoff func to another file

[Benjamin Herrenschmidt]

On Sun, 2011-01-09 at 23:01 -0800, Yinghai Lu wrote:
> On 01/09/2011 01:09 PM, Benjamin Herrenschmidt wrote:
> > acceptable ?
> > 
> > I think if you want to make the handoff happen -that- early, you have
> > basically two options. One is to move it all to arch code, and the other
> > one is to create early-boot "fake" struct pci_dev & bus that have the
> > config callbacks implemented pointing to the early stuff. You can do
> > that entirely within your arch code, and avoids most of the grossness
> > above in the generic places.
> 
> good idea, will make one get_early_pci_dev() for x86 as dummy device.
> 
> > 
> > It would avoid that turd too:
> > 
> >> +#include "usb_handoff.c"
> 
> may still need that to avoid some MMIO bar finding and remapping etc.

Might be better to test for system state... a bit ugly too but less than
#include'ing the C file.

Cheers,
Ben.

Re: [PATCH 1/3] pci, usb: Seperate usb handoff func to another file

[Greg KH]

On Sun, Jan 09, 2011 at 11:59:22AM -0800, Yinghai Lu wrote:
> 
> Make those func can take early, num, slot, func. So later could reuse them
> to do usb handoff much early.

As Ben pointed out, this isn't ok at all, sorry.

thanks,

greg k-h

Re: [PATCH 3/3] x86: usb handoff in early_quirk

[Greg KH]

On Sun, Jan 09, 2011 at 11:59:56AM -0800, Yinghai Lu wrote:
> 
> some systems keep getting
>   APIC calibration not consistent with PM-Timer: 139ms instead of 100ms
>   APIC delta adjusted to PM-Timer: 831249 (1163736)
> 
> USB legacy SMI handler is not disabled at that time.
> 
> Try to disable USB legacy support early with this patch.
> So later APIC Timer calibration don't get messed up by USB legacy support SMI handler.
> After this patch, that warning never show up for 100 reboot tests.

But is that warning a real issue?  Does it cause problems for the user
(becides annoying them of course)?

> reuse code from drivers/usb/host/pci-quirks.c
> with changes
> 1. delay and sleep  ===> io_delay
> 2. dev_warn etc to pr_warn(num, slot, func...)

Why change this function?  What's wrong with dev_warn()?  It's much more
descriptive of the device that is being referred to.

thanks,

greg k-h

Re: [PATCH 2/3] x86: early_quirk check all dev/func in domain 0

[Greg KH]

On Sun, Jan 09, 2011 at 11:59:38AM -0800, Yinghai Lu wrote:
> 
> go with all buses instead of bus0.

Why?  Why limit yourself here?

What's to say I will not have a USB controller on the second domain?  If
you are going to change this, might as well be "correct", right?

Or, if it really doesn't matter, stick with what we have today.

thanks,

greg k-h

Re: [PATCH 2/3] x86: early_quirk check all dev/func in domain 0

[Yinghai Lu]

On 01/10/2011 08:01 AM, Greg KH wrote:
> On Sun, Jan 09, 2011 at 11:59:38AM -0800, Yinghai Lu wrote:
>>
>> go with all buses instead of bus0.
> 
> Why?  Why limit yourself here?

early stage pci access is via cf8, and we can not use domain there. aka domain is 0.

> 
> What's to say I will not have a USB controller on the second domain?  If
> you are going to change this, might as well be "correct", right?

later pci-quirks is still there. for the domain 0's will do it early. later pci-quirks will check it again.

> 
> Or, if it really doesn't matter, stick with what we have today.

we can avoid to adjust apic timer delta with pm-timer.

Thanks

Yinghai