(Resubmit for 2.4.9-ac16) Parport driver PnP BIOS interface fix
PATCH 1/1 (Resubmit for 2.4.9-ac16) Parport driver PnP BIOS interface fix
Here's my parport_pc driver patch, now against 2.4.9-ac16
The patch does:
- Modify init_pnp040x() so that it checks for the IORESOURCE_UNSET bit which the PnP BIOS driver uses to indicate that a given "struct resource" is vacuous.
- Permit PnP BIOS driver to tell parport_pc to use DMA0
--
Thomas Hood
drivers/parport/parport_pc.c renamed from drivers/parport/parport_pc.c_ORIG +48 -8
@@ -2797,26 +2797,66 @@return count; }#if defined (CONFIG_PNPBIOS ) || defined (CONFIG_PNPBIOS_MODULE ) +#define UNSET (res) ((res).flags & IORESOURCE_UNSET) +int init_pnp040x (struct pci_dev *dev) -{int io,iohi,irq,dma; +{ +int io,iohi,irq,dma; + +printk (KERN_INFO +"parport: PnP BIOS reports device %s %s (node number 0x%x) is " , + dev->name, dev->slot_name, dev->devfn + ); + +if (UNSET (dev->resource[0 ]) ) { +printk ("not configured.\n" ); +return 0 ; + } + io = dev->resource[0 ].start; +printk ("configured to use io 0x%04x" ,io); +if (UNSET (dev->resource[1 ]) ) { + iohi =0 ; + }else { + iohi = dev->resource[1 ].start; +printk (", io 0x%04x" ,iohi); + } - io=dev->resource[0 ].start; - iohi=dev->resource[1 ].start; - irq=dev->irq_resource[0 ].start; - dma=dev->dma_resource[0 ].start; +if (UNSET (dev->irq_resource[0 ]) ) { + irq =PARPORT_IRQ_NONE ; + }else { +if ( dev->irq_resource[0 ].start ==-1 ) { + irq =PARPORT_IRQ_NONE ; +printk (", irq disabled" ); + }else { + irq = dev->irq_resource[0 ].start; +printk (", irq %d" ,irq); + } + } -if (dma==0 ) dma=-1 ; +if (UNSET (dev->dma_resource[0 ]) ) { + dma =PARPORT_DMA_NONE ; + }else { +if ( dev->dma_resource[0 ].start ==-1 ) { + dma =PARPORT_DMA_NONE ; +printk (", dma disabled" ); + }else { + dma = dev->dma_resource[0 ].start; +printk (", dma %d" ,irq); + } + } + +printk ("\n" ); -printk (KERN_INFO "PnPBIOS: Parport found %s %s at io=%04x,%04x irq=%d dma=%d\n" , - dev->name,dev->slot_name,io,iohi,irq,dma);if (parport_pc_probe_port (io,iohi,irq,dma,NULL ))return 1 ; +return 0 ; } +#undef UNSET#endif /* This function is called by parport_pc_init if the user didn't * specify any ports to probe. Its job is to find some ports. Order