| Message ID | 201010081857.45919.sshtylyov@ru.mvista.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On Fri, 8 Oct 2010 18:57:45 +0400 Sergei Shtylyov <sshtylyov@ru.mvista.com> wrote: > Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> > > --- > The patch is against the recent Linus' tree. Same question. I know the old code did all this poking around but with neither driver does it appear to be necessary ? -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello. On 08-10-2010 20:35, Alan Cox wrote: >> Signed-off-by: Sergei Shtylyov<sshtylyov@ru.mvista.com> >> --- >> The patch is against the recent Linus' tree. > Same question. Answered under the pata_cmd640 patch. > I know the old code did all this poking around but with > neither driver does it appear to be necessary ? The current IDE driver does this in its test_irq() method (to check for IDE IRQs), though it wasn't ever necessary for the older driver which did this in the dma_test_irq() method (and ignored the result anyway). MBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: linux-2.6/drivers/ata/pata_pdc202xx_old.c =================================================================== --- linux-2.6.orig/drivers/ata/pata_pdc202xx_old.c +++ linux-2.6/drivers/ata/pata_pdc202xx_old.c @@ -44,6 +44,27 @@ static void pdc202xx_exec_command(struct ndelay(400); } +static bool pdc202xx_irq_check(struct ata_port *ap) +{ + struct pci_dev *pdev = to_pci_dev(ap->host->dev); + unsigned long master = pci_resource_start(pdev, 4); + u8 sc1d = inb(master + 0x1d); + + if (ap->port_no) { + /* + * bit 7: error, bit 6: interrupting, + * bit 5: FIFO full, bit 4: FIFO empty + */ + return sc1d & 0x40; + } else { + /* + * bit 3: error, bit 2: interrupting, + * bit 1: FIFO full, bit 0: FIFO empty + */ + return sc1d & 0x04; + } +} + /** * pdc202xx_configure_piomode - set chip PIO timing * @ap: ATA interface @@ -282,6 +303,7 @@ static struct ata_port_operations pdc202 .set_dmamode = pdc202xx_set_dmamode, .sff_exec_command = pdc202xx_exec_command, + .sff_irq_check = pdc202xx_irq_check, }; static struct ata_port_operations pdc2026x_port_ops = { @@ -297,6 +319,7 @@ static struct ata_port_operations pdc202 .port_start = pdc2026x_port_start, .sff_exec_command = pdc202xx_exec_command, + .sff_irq_check = pdc202xx_irq_check, }; static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> --- The patch is against the recent Linus' tree. drivers/ata/pata_pdc202xx_old.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html