mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00
Code Issues Releases Activity

Use a common function to map the bogus intlines.

Browse Source 
Don't require pin be non-zero before we map bogus intlines, always do it.
This fixes a number of problems on HP Omnibook computers.

Tested/Reviewed by: Brooks Davis
This commit is contained in:
Warner Losh 2002-06-01 05:14:11 +00:00
parent 181b15f9f8
commit 8ce1ab3a24
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=97694
3 changed files with 51 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/amd64/pci/pci_cfgreg.c
View File

@ -76,6 +76,21 @@ static int pcireg_cfgopen(void);
static struct PIR_table *pci_route_table;
static int pci_route_count;
/*
* Some BIOS writers seem to want to ignore the spec and put
* 0 in the intline rather than 255 to indicate none. Some use
* numbers in the range 128-254 to indicate something strange and
* apparently undocumented anywhere. Assume these are completely bogus
* and map them to 255, which means "none".
*/
static __inline__ int
pci_i386_map_intline(int line)
{
if (line == 0 || line >= 128)
return (255);
return (line);
}
int
pci_pcibios_active(void)
{
@ -226,8 +241,7 @@ pci_cfgregread(int bus, int slot, int func, int reg, int bytes)
if (reg == PCIR_INTLINE && bytes == 1) {
line = pci_do_cfgregread(bus, slot, func, PCIR_INTLINE, 1);
pin = pci_do_cfgregread(bus, slot, func, PCIR_INTPIN, 1);
if (pin != 0 && (line == 0 || line >= 128))
return (255);
return pci_i386_map_intline(line);
}
#endif /* APIC_IO */
return(pci_do_cfgregread(bus, slot, func, reg, bytes));
@ -407,15 +421,7 @@ pci_cfgintr_search(struct PIR_entry *pe, int bus, int device, int matchpin, int
if ((pci_get_bus(*childp) == bus) &&
(pci_get_slot(*childp) == device) &&
(pci_get_intpin(*childp) == matchpin)) {
irq = pci_get_irq(*childp);
/*
* Some BIOS writers seem to want to ignore the spec and put
* 0 in the intline rather than 255 to indicate none. Once
* we've found one that matches, we break because there can
* be no others (which is why test looks a little odd).
*/
if (irq == 0)
irq = 255;
irq = pci_i386_map_intline(pci_get_irq(*childp));
if (irq != 255)
PRVERB(("pci_cfgintr_search: linked (%x) to configured irq %d at %d:%d:%d\n",
pe->pe_intpin[pin - 1].link, irq,

28
sys/i386/pci/pci_cfgreg.c
View File

@ -76,6 +76,21 @@ static int pcireg_cfgopen(void);
static struct PIR_table *pci_route_table;
static int pci_route_count;
/*
* Some BIOS writers seem to want to ignore the spec and put
* 0 in the intline rather than 255 to indicate none. Some use
* numbers in the range 128-254 to indicate something strange and
* apparently undocumented anywhere. Assume these are completely bogus
* and map them to 255, which means "none".
*/
static __inline__ int
pci_i386_map_intline(int line)
{
if (line == 0 || line >= 128)
return (255);
return (line);
}
int
pci_pcibios_active(void)
{
@ -226,8 +241,7 @@ pci_cfgregread(int bus, int slot, int func, int reg, int bytes)
if (reg == PCIR_INTLINE && bytes == 1) {
line = pci_do_cfgregread(bus, slot, func, PCIR_INTLINE, 1);
pin = pci_do_cfgregread(bus, slot, func, PCIR_INTPIN, 1);
if (pin != 0 && (line == 0 || line >= 128))
return (255);
return pci_i386_map_intline(line);
}
#endif /* APIC_IO */
return(pci_do_cfgregread(bus, slot, func, reg, bytes));
@ -407,15 +421,7 @@ pci_cfgintr_search(struct PIR_entry *pe, int bus, int device, int matchpin, int
if ((pci_get_bus(*childp) == bus) &&
(pci_get_slot(*childp) == device) &&
(pci_get_intpin(*childp) == matchpin)) {
irq = pci_get_irq(*childp);
/*
* Some BIOS writers seem to want to ignore the spec and put
* 0 in the intline rather than 255 to indicate none. Once
* we've found one that matches, we break because there can
* be no others (which is why test looks a little odd).
*/
if (irq == 0)
irq = 255;
irq = pci_i386_map_intline(pci_get_irq(*childp));
if (irq != 255)
PRVERB(("pci_cfgintr_search: linked (%x) to configured irq %d at %d:%d:%d\n",
pe->pe_intpin[pin - 1].link, irq,

28
sys/i386/pci/pci_pir.c
View File

@ -76,6 +76,21 @@ static int pcireg_cfgopen(void);
static struct PIR_table *pci_route_table;
static int pci_route_count;
/*
* Some BIOS writers seem to want to ignore the spec and put
* 0 in the intline rather than 255 to indicate none. Some use
* numbers in the range 128-254 to indicate something strange and
* apparently undocumented anywhere. Assume these are completely bogus
* and map them to 255, which means "none".
*/
static __inline__ int
pci_i386_map_intline(int line)
{
if (line == 0 || line >= 128)
return (255);
return (line);
}
int
pci_pcibios_active(void)
{
@ -226,8 +241,7 @@ pci_cfgregread(int bus, int slot, int func, int reg, int bytes)
if (reg == PCIR_INTLINE && bytes == 1) {
line = pci_do_cfgregread(bus, slot, func, PCIR_INTLINE, 1);
pin = pci_do_cfgregread(bus, slot, func, PCIR_INTPIN, 1);
if (pin != 0 && (line == 0 || line >= 128))
return (255);
return pci_i386_map_intline(line);
}
#endif /* APIC_IO */
return(pci_do_cfgregread(bus, slot, func, reg, bytes));
@ -407,15 +421,7 @@ pci_cfgintr_search(struct PIR_entry *pe, int bus, int device, int matchpin, int
if ((pci_get_bus(*childp) == bus) &&
(pci_get_slot(*childp) == device) &&
(pci_get_intpin(*childp) == matchpin)) {
irq = pci_get_irq(*childp);
/*
* Some BIOS writers seem to want to ignore the spec and put
* 0 in the intline rather than 255 to indicate none. Once
* we've found one that matches, we break because there can
* be no others (which is why test looks a little odd).
*/
if (irq == 0)
irq = 255;
irq = pci_i386_map_intline(pci_get_irq(*childp));
if (irq != 255)
PRVERB(("pci_cfgintr_search: linked (%x) to configured irq %d at %d:%d:%d\n",
pe->pe_intpin[pin - 1].link, irq,