Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cdfb29c authored by Jeff Garzik's avatar Jeff Garzik
Browse files

libata/IDE: remove combined mode quirk 



Both old-IDE and libata should be able handle all controllers and
devices found using normal resource reservation methods.

This eliminates the awful, low-performing split-driver configuration
where old-IDE drove the PATA portion of a PCI device, in PIO-only mode,
and libata drove the SATA portion of the /same/ PCI device, in DMA mode.
Typically vendors would ship SATA hard drive / PATA optical
configuration, which would lend itself to slow (PIO-only) CD-ROM
performance.

For Intel users running in combined mode, it is now wholly dependent on
your driver choice (potentially link order, if you compile both drivers
in) whether old-IDE or libata will drive your hardware.

In either case, you will get full performance from both SATA and PATA
ports now, without having to pass a kernel command line parameter.

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent e424675f

arch/i386/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -692,7 +692,6 @@ CONFIG_SATA_SIL=y 
CONFIG_SATA_VIA=y

# CONFIG_SATA_VITESSE is not set

# CONFIG_SATA_INIC162X is not set

CONFIG_SATA_INTEL_COMBINED=y

CONFIG_SATA_ACPI=y

# CONFIG_PATA_ALI is not set

# CONFIG_PATA_AMD is not set

arch/parisc/configs/c3000_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -435,7 +435,6 @@ CONFIG_SCSI_SATA_SIL=m 
# CONFIG_SCSI_SATA_ULI is not set

CONFIG_SCSI_SATA_VIA=m

# CONFIG_SCSI_SATA_VITESSE is not set

CONFIG_SCSI_SATA_INTEL_COMBINED=y

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_FUTURE_DOMAIN is not set

# CONFIG_SCSI_IPS is not set

arch/x86_64/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -631,7 +631,6 @@ CONFIG_SATA_SIL=y 
CONFIG_SATA_VIA=y

# CONFIG_SATA_VITESSE is not set

# CONFIG_SATA_INIC162X is not set

CONFIG_SATA_INTEL_COMBINED=y

CONFIG_SATA_ACPI=y

# CONFIG_PATA_ALI is not set

# CONFIG_PATA_AMD is not set

drivers/ata/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -156,11 +156,6 @@ config SATA_INIC162X 
	help

	  This option enables support for Initio 162x Serial ATA.



config SATA_INTEL_COMBINED

	bool

	depends on IDE=y && !BLK_DEV_IDE_SATA && (SATA_AHCI || ATA_PIIX)

	default y



config SATA_ACPI

	bool

	depends on ACPI && PCI

drivers/ata/libata-sff.c

+6 −30
Original line number Diff line number Diff line
@@ -779,40 +779,16 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info, 
		/* Deal with combined mode hack. This side of the logic all

		   goes away once the combined mode hack is killed in 2.6.21 */

		if (!devm_request_region(dev, ATA_PRIMARY_CMD, 8, "libata")) {

			struct resource *conflict, res;

			res.start = ATA_PRIMARY_CMD;

			res.end = ATA_PRIMARY_CMD + 8 - 1;

			conflict = ____request_resource(&ioport_resource, &res);

			while (conflict->child)

				conflict = ____request_resource(conflict, &res);

			if (!strcmp(conflict->name, "libata"))

				legacy_mode |= ATA_PORT_PRIMARY;

			else {

			pcim_pin_device(pdev);

				printk(KERN_WARNING "ata: 0x%0X IDE port busy\n" \

						    "ata: conflict with %s\n",

						    ATA_PRIMARY_CMD,

						    conflict->name);

			}

			printk(KERN_WARNING "ata: 0x%0X IDE port busy\n",

					    ATA_PRIMARY_CMD);

		} else

			legacy_mode |= ATA_PORT_PRIMARY;



		if (!devm_request_region(dev, ATA_SECONDARY_CMD, 8, "libata")) {

			struct resource *conflict, res;

			res.start = ATA_SECONDARY_CMD;

			res.end = ATA_SECONDARY_CMD + 8 - 1;

			conflict = ____request_resource(&ioport_resource, &res);

			while (conflict->child)

				conflict = ____request_resource(conflict, &res);

			if (!strcmp(conflict->name, "libata"))

				legacy_mode |= ATA_PORT_SECONDARY;

			else {

			pcim_pin_device(pdev);

				printk(KERN_WARNING "ata: 0x%X IDE port busy\n" \

						    "ata: conflict with %s\n",

						    ATA_SECONDARY_CMD,

						    conflict->name);

			}

			printk(KERN_WARNING "ata: 0x%X IDE port busy\n",

					    ATA_SECONDARY_CMD);

		} else

			legacy_mode |= ATA_PORT_SECONDARY;