d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable the generation of SMIs (System Management Interrupts). Always set

Browse Source 
the PIRQD bit.

This fixes the problem of uhub0 hanging forever during boot when USB
keyboard support is switched on in the BIOS on motherboards with Intel
chipsets (UHCI).

Approved by:	The Sheep
This commit is contained in:
n_hibma 2000-02-06 14:52:27 +00:00
parent 0a7605926e
commit adad9ac78e
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/usb/uhci_pci.c
View File

@ -158,7 +158,6 @@ uhci_pci_attach(device_t self)
void *ih;
struct resource *io_res, *irq_res;
int intr;
int legsup;
int err;
rid = PCI_UHCI_BASE_REG;
@ -239,16 +238,17 @@ uhci_pci_attach(device_t self)
goto bad3;
}
/* Verify that the PIRQD enable bit is set, some BIOS's don't do that */
legsup = pci_read_config(self, PCI_LEGSUP, 4);
if ( !(legsup & PCI_LEGSUP_USBPIRQDEN) ) {
#ifndef USB_DEBUG
if (bootverbose)
/* Set the PIRQD enable bit and switch off all the others. We don't
* want legacy support to interfere with us
* XXX Does this also mean that the BIOS won't touch the keyboard
* anymore if it is connected to the ports of the root hub?
*/
#ifdef UHCI_DEBUG
if (pci_read_config(self, PCI_LEGSUP, 4) != PCI_LEGSUP_USBPIRQDEN)
device_printf(self, "LegSup = 0x%08x\n",
pci_read_config(self, PCI_LEGSUP, 4));
#endif
device_printf(self, "PIRQD enable not set\n");
legsup |= PCI_LEGSUP_USBPIRQDEN;
pci_write_config(self, PCI_LEGSUP, legsup, 4);
}
pci_write_config(self, PCI_LEGSUP, PCI_LEGSUP_USBPIRQDEN, 4);
err = uhci_init(sc);
if (!err)

20
sys/pci/uhci_pci.c
View File

@ -158,7 +158,6 @@ uhci_pci_attach(device_t self)
void *ih;
struct resource *io_res, *irq_res;
int intr;
int legsup;
int err;
rid = PCI_UHCI_BASE_REG;
@ -239,16 +238,17 @@ uhci_pci_attach(device_t self)
goto bad3;
}
/* Verify that the PIRQD enable bit is set, some BIOS's don't do that */
legsup = pci_read_config(self, PCI_LEGSUP, 4);
if ( !(legsup & PCI_LEGSUP_USBPIRQDEN) ) {
#ifndef USB_DEBUG
if (bootverbose)
/* Set the PIRQD enable bit and switch off all the others. We don't
* want legacy support to interfere with us
* XXX Does this also mean that the BIOS won't touch the keyboard
* anymore if it is connected to the ports of the root hub?
*/
#ifdef UHCI_DEBUG
if (pci_read_config(self, PCI_LEGSUP, 4) != PCI_LEGSUP_USBPIRQDEN)
device_printf(self, "LegSup = 0x%08x\n",
pci_read_config(self, PCI_LEGSUP, 4));
#endif
device_printf(self, "PIRQD enable not set\n");
legsup |= PCI_LEGSUP_USBPIRQDEN;
pci_write_config(self, PCI_LEGSUP, legsup, 4);
}
pci_write_config(self, PCI_LEGSUP, PCI_LEGSUP_USBPIRQDEN, 4);
err = uhci_init(sc);
if (!err)