Messages in this thread Patch in this message | | | Date | Thu, 03 Jul 2003 19:52:10 -0400 | From | Jeff Garzik <> | Subject | [PATCH] Re: VIA PCI IRQ router bug fix |
| |
Aleksey Gorelov wrote: > Hi. > > I found & fixed a problem with #PIRQD line setup for VIA PCI IRQ > router. Kernel was not able to receive any interrupts from network card, > which PCI slot IRQ pin A was routed to PIRQ line D of VIA PCI IRQ > router. According to VIA specs, PIRQ D routing is out of standard > 'nibble' scheme. > I tested patch with 2.4.20 kernel, it can be applied to 2.4.22-pre2 as > well. > Thanks to my employer (Phoenix Technologies) who kindly allowed me to > make this patch public.
Thanks much! Please continue to encourage your employer to contribute to open source. Posting patches like this means that all Linux via users have a more stable system to use.
> --- linux-2.4.20/arch/i386/kernel/pci-irq_old.c 2002-11-28 15:53:09.000000000 -0800 > +++ linux-2.4.20/arch/i386/kernel/pci-irq.c 2003-05-21 17:27:40.000000000 -0700 > @@ -198,12 +198,27 @@ > */ > static int pirq_via_get(struct pci_dev *router, struct pci_dev *dev, int pirq) > { > - return read_config_nybble(router, 0x55, pirq); > + u8 x; > + > + if ( pirq == 4 ) { > + pci_read_config_byte(router, 0x57, &x); > + return (x >> 4); > + } else { > + return read_config_nybble(router, 0x55, pirq); > + } > }
If you don't mind, I would prefer the attached patch, which is a little bit less verbose.
I will make sure this fix is merged into 2.4 and 2.5, if noone beats me to it.
Jeff
===== arch/i386/pci/irq.c 1.25 vs edited ===== --- 1.25/arch/i386/pci/irq.c Thu Jun 19 17:58:11 2003 +++ edited/arch/i386/pci/irq.c Thu Jul 3 19:49:14 2003 @@ -196,15 +196,16 @@ /* * The VIA pirq rules are nibble-based, like ALI, * but without the ugly irq number munging. + * However, PIRQD is in the upper instead of lower 4 bits. */ static int pirq_via_get(struct pci_dev *router, struct pci_dev *dev, int pirq) { - return read_config_nybble(router, 0x55, pirq); + return read_config_nybble(router, 0x55, pirq == 4 ? 5 : pirq); } static int pirq_via_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq) { - write_config_nybble(router, 0x55, pirq, irq); + write_config_nybble(router, 0x55, pirq == 4 ? 5 : pirq, irq); return 1; } | |