[PATCH] psmouse/usb interaction fix

[PATCH] psmouse/usb interaction fix

[Pokey the Penguin]

[-- Attachment #1: Type: text/plain, Size: 759 bytes --]

This patch fixes the case where certain laptop touchpads (ALPS) 
are disabled if the machine boots with a usb mouse plugged in.

Without it, users have to choose between using either a usb mouse 
or the touchpad. With it, any combination is possible and the usb 
mouse can be attached/removed at runtime without breaking the 
touchpad.

The patch is ported from a SuSE kernel to 2.6.7-rc2. It's been
around for at least two minor releases. The maintainer was
contacted regarding merging but failed to respond.

Patch vital to certain laptop users. Please apply.
-- 
______________________________________________
Check out the latest SMS services @ http://www.linuxmail.org 
This allows you to send and receive SMS through your mailbox.


Powered by Outblaze

[-- Attachment #2: psmouse-usb-fix-2.6.7-rc2.diff --]
[-- Type: application/octet-stream, Size: 2484 bytes --]

--- linux-2.6.7-rc2-base/drivers/pci/quirks.c	2004-05-31 18:08:55.310606000 +0100
+++ linux-2.6.7-rc2/drivers/pci/quirks.c	2004-05-31 18:18:48.648404952 +0100
@@ -875,6 +875,66 @@ static void __devinit quirk_pciehp_msi(s
 	pciehp_msi_quirk = 1;
 }
 
+
+#define UHCI_USBLEGSUP		0xc0		/* legacy support */
+#define UHCI_USBCMD		0		/* command register */
+#define UHCI_USBINTR		4		/* interrupt register */
+#define UHCI_USBLEGSUP_DEFAULT	0x2000		/* only PIRQ enable set */
+#define UHCI_USBCMD_GRESET	0x0004		/* Global reset */
+
+#define OHCI_CONTROL		0x04
+#define OHCI_CMDSTATUS		0x08
+#define OHCI_INTRENABLE		0x10
+#define OHCI_OCR		(1 << 3)	/* ownership change request */
+#define OHCI_CTRL_IR		(1 << 8)	/* interrupt routing */
+#define OHCI_INTR_OC		(1 << 30)	/* ownership change */
+
+static void __init quirk_usb_disable_smm_bios(struct pci_dev *pdev)
+{
+
+	if (pdev->class == ((PCI_CLASS_SERIAL_USB << 8) | 0x00)) { /* UHCI */
+		int i;
+		unsigned long base = 0;;
+
+		for (i = 0; i < PCI_ROM_RESOURCE; i++) 
+			if ((pci_resource_flags(pdev, i) & IORESOURCE_IO)) {
+				base = pci_resource_start(pdev, i);
+				break;
+			}
+
+		if (!base)
+			return;
+
+		outw(0, base + UHCI_USBINTR);
+		outw(UHCI_USBCMD_GRESET, base + UHCI_USBCMD);
+		set_current_state(TASK_UNINTERRUPTIBLE);
+       		schedule_timeout((HZ*50+999) / 1000);
+		outw(0, base + UHCI_USBCMD);
+		set_current_state(TASK_UNINTERRUPTIBLE);
+		schedule_timeout((HZ*10+999) / 1000);
+
+		pci_write_config_word(pdev, UHCI_USBLEGSUP, UHCI_USBLEGSUP_DEFAULT);
+	}
+
+	if (pdev->class == ((PCI_CLASS_SERIAL_USB << 8) | 0x10)) { /* OHCI */
+		char *base = ioremap_nocache(pci_resource_start(pdev, 0),
+							pci_resource_len(pdev, 0));
+		if (base == NULL) return;
+
+		if (readl(base + OHCI_CONTROL) & OHCI_CTRL_IR) {
+			int temp = 500;     /* arbitrary: five seconds */
+			writel(OHCI_INTR_OC, base + OHCI_INTRENABLE);
+			writel(OHCI_OCR, base + OHCI_CMDSTATUS);
+			while (temp && readl(base + OHCI_CONTROL) & OHCI_CTRL_IR) {
+				temp--;
+				set_current_state(TASK_UNINTERRUPTIBLE);
+				schedule_timeout( HZ / 100);
+			}
+		}
+		iounmap(base);
+	}
+}
+
 /*
  *  The main table of quirks.
  *
@@ -1002,6 +1062,8 @@ static struct pci_fixup pci_fixups[] __d
 	  quirk_intel_ide_combined },
 #endif /* CONFIG_SCSI_SATA */
 
+	{ PCI_FIXUP_FINAL,	PCI_ANY_ID,		PCI_ANY_ID,			quirk_usb_disable_smm_bios },
+
 	{ PCI_FIXUP_FINAL,      PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_SMCH,	quirk_pciehp_msi },
 
 	{ 0 }

Re: [PATCH] psmouse/usb interaction fix

[Greg KH]

On Tue, Jun 01, 2004 at 01:40:10AM +0800, Pokey the Penguin wrote:
> This patch fixes the case where certain laptop touchpads (ALPS) 
> are disabled if the machine boots with a usb mouse plugged in.
> 
> Without it, users have to choose between using either a usb mouse 
> or the touchpad. With it, any combination is possible and the usb 
> mouse can be attached/removed at runtime without breaking the 
> touchpad.
> 
> The patch is ported from a SuSE kernel to 2.6.7-rc2. It's been
> around for at least two minor releases. The maintainer was
> contacted regarding merging but failed to respond.
> 
> Patch vital to certain laptop users. Please apply.

But this breaks users who want BIOS usb support instead of native Linux
support, right?  Sure, there are not many people who want that, but I do
know people who rely on this (like installer kernels, and early boot
issues with USB keyboards.)

thanks,

greg k-h

Re: [PATCH] psmouse/usb interaction fix

[Vojtech Pavlik]

On Mon, May 31, 2004 at 11:03:42AM -0700, Greg KH wrote:

> > The patch is ported from a SuSE kernel to 2.6.7-rc2. It's been
> > around for at least two minor releases. The maintainer was
> > contacted regarding merging but failed to respond.
> > 
> > Patch vital to certain laptop users. Please apply.
> 
> But this breaks users who want BIOS usb support instead of native Linux
> support, right?  Sure, there are not many people who want that, but I do
> know people who rely on this (like installer kernels, and early boot
> issues with USB keyboards.)
 
I wrote the patch, SuSE 9.1 is shipping with it - too many BIOSes get
the USB support wrong - don't expect keyboards and mice which don't
honor the SET_IDLE command, etch. In my experience the BIOS USB support
causes much more pain than good, namely preventing the normal PS/2 mice
and keyboards to work properly.

-- 
Vojtech Pavlik
SuSE Labs, SuSE CR

Re: [PATCH] psmouse/usb interaction fix

[Greg KH]

On Mon, May 31, 2004 at 10:01:21PM +0200, Vojtech Pavlik wrote:
> On Mon, May 31, 2004 at 11:03:42AM -0700, Greg KH wrote:
> 
> > > The patch is ported from a SuSE kernel to 2.6.7-rc2. It's been
> > > around for at least two minor releases. The maintainer was
> > > contacted regarding merging but failed to respond.
> > > 
> > > Patch vital to certain laptop users. Please apply.
> > 
> > But this breaks users who want BIOS usb support instead of native Linux
> > support, right?  Sure, there are not many people who want that, but I do
> > know people who rely on this (like installer kernels, and early boot
> > issues with USB keyboards.)
>  
> I wrote the patch, SuSE 9.1 is shipping with it - too many BIOSes get
> the USB support wrong - don't expect keyboards and mice which don't
> honor the SET_IDLE command, etch. In my experience the BIOS USB support
> causes much more pain than good, namely preventing the normal PS/2 mice
> and keyboards to work properly.

I agree that lots of BIOSes get the USB support wrong, but this patch
really scares me.  How about we see how it works out in a few SuSE
releases before adding it to the main kernel tree?

thanks,

greg k-h

Re: [PATCH] psmouse/usb interaction fix

[Vojtech Pavlik]

On Fri, Jun 04, 2004 at 01:30:13PM -0700, Greg KH wrote:

> > I wrote the patch, SuSE 9.1 is shipping with it - too many BIOSes get
> > the USB support wrong - don't expect keyboards and mice which don't
> > honor the SET_IDLE command, etch. In my experience the BIOS USB support
> > causes much more pain than good, namely preventing the normal PS/2 mice
> > and keyboards to work properly.
> 
> I agree that lots of BIOSes get the USB support wrong, but this patch
> really scares me.  How about we see how it works out in a few SuSE
> releases before adding it to the main kernel tree?

Fine with me. That's one reason why I didn't submit it yet.

-- 
Vojtech Pavlik
SuSE Labs, SuSE CR