ata_piix Internals

diff -urN linux-2.4.30-pre2-20050304/Documentation/DocBook/Makefile linux-2.4.30-pre2-20050304-libata-fix/Documentation/DocBook/Makefile --- linux-2.4.30-pre2-20050304/Documentation/DocBook/Makefile Sun May 9 15:33:49 2004 +++ linux-2.4.30-pre2-20050304-libata-fix/Documentation/DocBook/Makefile Sun Mar 6 12:03:10 2005 @@ -82,10 +82,12 @@ libata.sgml: libata.tmpl $(TOPDIR)/drivers/scsi/libata-core.c \ $(TOPDIR)/drivers/scsi/libata-scsi.c \ $(TOPDIR)/drivers/scsi/sata_sil.c \ + $(TOPDIR)/drivers/scsi/ata_piix.c \ $(TOPDIR)/drivers/scsi/sata_via.c $(TOPDIR)/scripts/docgen $(TOPDIR)/drivers/scsi/libata-core.c \ $(TOPDIR)/drivers/scsi/libata-scsi.c \ $(TOPDIR)/drivers/scsi/sata_sil.c \ + $(TOPDIR)/drivers/scsi/ata_piix.c \ $(TOPDIR)/drivers/scsi/sata_via.c \ < libata.tmpl > libata.sgml diff -urN linux-2.4.30-pre2-20050304/Documentation/DocBook/libata.tmpl linux-2.4.30-pre2-20050304-libata-fix/Documentation/DocBook/libata.tmpl --- linux-2.4.30-pre2-20050304/Documentation/DocBook/libata.tmpl Sun Dec 19 21:18:23 2004 +++ linux-2.4.30-pre2-20050304-libata-fix/Documentation/DocBook/libata.tmpl Sun Mar 6 12:03:10 2005 @@ -267,6 +267,11 @@ !Idrivers/scsi/libata-scsi.c + + ata_piix Internals +!Idrivers/scsi/ata_piix.c + + sata_sil Internals !Idrivers/scsi/sata_sil.c diff -urN linux-2.4.30-pre2-20050304/drivers/pci/quirks.c linux-2.4.30-pre2-20050304-libata-fix/drivers/pci/quirks.c --- linux-2.4.30-pre2-20050304/drivers/pci/quirks.c Sat Mar 5 22:47:01 2005 +++ linux-2.4.30-pre2-20050304-libata-fix/drivers/pci/quirks.c Sun Mar 6 12:03:10 2005 @@ -702,6 +702,83 @@ } } +#ifdef CONFIG_SCSI_SATA +static void __init quirk_intel_ide_combined(struct pci_dev *pdev) +{ + u8 prog, comb, tmp; + int ich = 0; + + /* + * Narrow down to Intel SATA PCI devices. + */ + switch (pdev->device) { + /* PCI ids taken from drivers/scsi/ata_piix.c */ + case 0x24d1: + case 0x24df: + case 0x25a3: + case 0x25b0: + ich = 5; + break; + case 0x2651: + case 0x2652: + case 0x2653: + ich = 6; + break; + case 0x27c0: + case 0x27c4: + ich = 7; + break; + default: + /* we do not handle this PCI device */ + return; + } + + /* + * Read combined mode register. + */ + pci_read_config_byte(pdev, 0x90, &tmp); /* combined mode reg */ + + if (ich == 5) { + tmp &= 0x6; /* interesting bits 2:1, PATA primary/secondary */ + if (tmp == 0x4) /* bits 10x */ + comb = (1 << 0); /* SATA port 0, PATA port 1 */ + else if (tmp == 0x6) /* bits 11x */ + comb = (1 << 2); /* PATA port 0, SATA port 1 */ + else + return; /* not in combined mode */ + } else { + WARN_ON((ich != 6) && (ich != 7)); + tmp &= 0x3; /* interesting bits 1:0 */ + if (tmp & (1 << 0)) + comb = (1 << 2); /* PATA port 0, SATA port 1 */ + else if (tmp & (1 << 1)) + comb = (1 << 0); /* SATA port 0, PATA port 1 */ + else + return; /* not in combined mode */ + } + + /* + * Read programming interface register. + * (Tells us if it's legacy or native mode) + */ + pci_read_config_byte(pdev, PCI_CLASS_PROG, &prog); + + /* if SATA port is in native mode, we're ok. */ + if (prog & comb) + return; + + /* SATA port is in legacy mode. Reserve port so that + * IDE driver does not attempt to use it. If request_region + * fails, it will be obvious at boot time, so we don't bother + * checking return values. + */ + if (comb == (1 << 0)) + request_region(0x1f0, 8, "libata"); /* port 0 */ + else + request_region(0x170, 8, "libata"); /* port 1 */ +} +#endif /* CONFIG_SCSI_SATA */ + /* * The main table of quirks. */ @@ -787,6 +864,14 @@ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_7205_0, asus_hides_smbus_hostbridge }, { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0, asus_hides_smbus_lpc }, { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0, asus_hides_smbus_lpc }, + +#ifdef CONFIG_SCSI_SATA + /* Fixup BIOSes that configure Parallel ATA (PATA / IDE) and + * Serial ATA (SATA) into the same PCI ID. + */ + { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_ANY_ID, + quirk_intel_ide_combined }, +#endif /* CONFIG_SCSI_SATA */ { 0 } }; diff -urN linux-2.4.30-pre2-20050304/drivers/scsi/ata_piix.c linux-2.4.30-pre2-20050304-libata-fix/drivers/scsi/ata_piix.c --- linux-2.4.30-pre2-20050304/drivers/scsi/ata_piix.c Sat Mar 5 22:47:19 2005 +++ linux-2.4.30-pre2-20050304-libata-fix/drivers/scsi/ata_piix.c Sun Mar 6 12:03:10 2005 @@ -643,8 +643,7 @@ port_info[pata_chan] = &piix_port_info[ich5_pata]; n_ports++; - printk(KERN_ERR DRV_NAME ": combined mode not supported\n"); - return -ENODEV; + printk(KERN_ERR DRV_NAME ": combined mode detected\n"); } return ata_pci_init_one(pdev, port_info, n_ports); diff -urN linux-2.4.30-pre2-20050304/drivers/scsi/libata-core.c linux-2.4.30-pre2-20050304-libata-fix/drivers/scsi/libata-core.c --- linux-2.4.30-pre2-20050304/drivers/scsi/libata-core.c Sat Mar 5 22:47:19 2005 +++ linux-2.4.30-pre2-20050304-libata-fix/drivers/scsi/libata-core.c Sun Mar 6 12:09:16 2005 @@ -3787,14 +3787,30 @@ if (legacy_mode) { if (!request_region(0x1f0, 8, "libata")) { - disable_dev_on_err = 0; - printk(KERN_WARNING "ata: 0x1f0 IDE port busy\n"); + struct resource *conflict, res; + res.start = 0x1f0; + res.end = 0x1f0 + 8 - 1; + conflict = ____request_resource(&ioport_resource, &res); + if (!strcmp(conflict->name, "libata")) + legacy_mode |= (1 << 0); + else { + disable_dev_on_err = 0; + printk(KERN_WARNING "ata: 0x1f0 IDE port busy\n"); + } } else legacy_mode |= (1 << 0); if (!request_region(0x170, 8, "libata")) { - disable_dev_on_err = 0; - printk(KERN_WARNING "ata: 0x170 IDE port busy\n"); + struct resource *conflict, res; + res.start = 0x170; + res.end = 0x170 + 8 - 1; + conflict = ____request_resource(&ioport_resource, &res); + if (!strcmp(conflict->name, "libata")) + legacy_mode |= (1 << 1); + else { + disable_dev_on_err = 0; + printk(KERN_WARNING "ata: 0x170 IDE port busy\n"); + } } else legacy_mode |= (1 << 1); } diff -urN linux-2.4.30-pre2-20050304/include/linux/ioport.h linux-2.4.30-pre2-20050304-libata-fix/include/linux/ioport.h --- linux-2.4.30-pre2-20050304/include/linux/ioport.h Sat Dec 6 08:14:51 2003 +++ linux-2.4.30-pre2-20050304-libata-fix/include/linux/ioport.h Sun Mar 6 12:03:10 2005 @@ -85,6 +85,7 @@ extern int check_resource(struct resource *root, unsigned long, unsigned long); extern int request_resource(struct resource *root, struct resource *new); +extern struct resource * ____request_resource(struct resource *root, struct resource *new); extern int release_resource(struct resource *new); extern int allocate_resource(struct resource *root, struct resource *new, unsigned long size, diff -urN linux-2.4.30-pre2-20050304/kernel/ksyms.c linux-2.4.30-pre2-20050304-libata-fix/kernel/ksyms.c --- linux-2.4.30-pre2-20050304/kernel/ksyms.c Fri Feb 20 07:38:35 2004 +++ linux-2.4.30-pre2-20050304-libata-fix/kernel/ksyms.c Sun Mar 6 12:03:10 2005 @@ -448,6 +448,7 @@ #endif /* resource handling */ +EXPORT_SYMBOL_GPL(____request_resource); /* may disappear in a few months */ EXPORT_SYMBOL(request_resource); EXPORT_SYMBOL(release_resource); EXPORT_SYMBOL(allocate_resource); diff -urN linux-2.4.30-pre2-20050304/kernel/resource.c linux-2.4.30-pre2-20050304-libata-fix/kernel/resource.c --- linux-2.4.30-pre2-20050304/kernel/resource.c Sat Dec 6 08:14:51 2003 +++ linux-2.4.30-pre2-20050304-libata-fix/kernel/resource.c Sun Mar 6 12:03:10 2005 @@ -166,6 +166,16 @@ return conflict ? -EBUSY : 0; } +struct resource *____request_resource(struct resource *root, struct resource *new) +{ + struct resource *conflict; + + write_lock(&resource_lock); + conflict = __request_resource(root, new); + write_unlock(&resource_lock); + return conflict; +} + int release_resource(struct resource *old) { int retval;