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

Commit 2ba302c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  ata: NCQ is broken on Maxtor 6L250S0
  pata_pdc202xx_old: LBA48 bug
  libata: IDENTIFY backwards for drive side cable detection
  ahci.c: walkaround for SB600 SATA internal error issue
  [libata] Disable ACPI by default; fix namespace problems
parents 4db43e67 7acfaf30

drivers/ata/ahci.c

+19 −2
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ enum { 
	board_ahci_pi		= 1,

	board_ahci_vt8251	= 2,

	board_ahci_ign_iferr	= 3,

	board_ahci_sb600	= 4,



	/* global controller registers */

	HOST_CAP		= 0x00, /* host capabilities */
@@ -168,6 +169,7 @@ enum { 
	AHCI_FLAG_NO_NCQ		= (1 << 24),

	AHCI_FLAG_IGN_IRQ_IF_ERR	= (1 << 25), /* ignore IRQ_IF_ERR */

	AHCI_FLAG_HONOR_PI		= (1 << 26), /* honor PORTS_IMPL */

	AHCI_FLAG_IGN_SERR_INTERNAL	= (1 << 27), /* ignore SERR_INTERNAL */

};



struct ahci_cmd_hdr {
@@ -362,6 +364,18 @@ static const struct ata_port_info ahci_port_info[] = { 
		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.port_ops	= &ahci_ops,

	},

	/* board_ahci_sb600 */

	{

		.sht		= &ahci_sht,

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

				  ATA_FLAG_SKIP_D2H_BSY |

				  AHCI_FLAG_IGN_SERR_INTERNAL,

		.pio_mask	= 0x1f, /* pio0-4 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.port_ops	= &ahci_ops,

	},



};



static const struct pci_device_id ahci_pci_tbl[] = {
@@ -399,7 +413,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	  PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci_ign_iferr },



	/* ATI */

	{ PCI_VDEVICE(ATI, 0x4380), board_ahci }, /* ATI SB600 non-raid */

	{ PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600 }, /* ATI SB600 non-raid */

	{ PCI_VDEVICE(ATI, 0x4381), board_ahci }, /* ATI SB600 raid */



	/* VIA */
@@ -1067,8 +1081,11 @@ static void ahci_error_intr(struct ata_port *ap, u32 irq_stat) 
	if (ap->flags & AHCI_FLAG_IGN_IRQ_IF_ERR)

		irq_stat &= ~PORT_IRQ_IF_ERR;



	if (irq_stat & PORT_IRQ_TF_ERR)

	if (irq_stat & PORT_IRQ_TF_ERR) {

		err_mask |= AC_ERR_DEV;

		if (ap->flags & AHCI_FLAG_IGN_SERR_INTERNAL)

			serror &= ~SERR_INTERNAL;

	}



	if (irq_stat & (PORT_IRQ_HBUS_ERR | PORT_IRQ_HBUS_DATA_ERR)) {

		err_mask |= AC_ERR_HOST_BUS;

drivers/ata/libata-acpi.c

+4 −4
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static int do_drive_get_GTF(struct ata_port *ap, int ix, 
	*gtf_address = 0UL;

	*obj_loc = 0UL;



	if (noacpi)

	if (libata_noacpi)

		return 0;



	if (ata_msg_probe(ap))
@@ -531,7 +531,7 @@ static int do_drive_set_taskfiles(struct ata_port *ap, 
		ata_dev_printk(atadev, KERN_DEBUG, "%s: ENTER: port#: %d\n",

			       __FUNCTION__, ap->port_no);



	if (noacpi || !(ap->cbl == ATA_CBL_SATA))

	if (libata_noacpi || !(ap->cbl == ATA_CBL_SATA))

		return 0;



	if (!ata_dev_enabled(atadev) || (ap->flags & ATA_FLAG_DISABLED))
@@ -574,7 +574,7 @@ int ata_acpi_exec_tfs(struct ata_port *ap) 
	unsigned long	gtf_address;

	unsigned long	obj_loc;



	if (noacpi)

	if (libata_noacpi)

		return 0;

	/*

	 * TBD - implement PATA support.  For now,
@@ -636,7 +636,7 @@ int ata_acpi_push_id(struct ata_port *ap, unsigned int ix) 
	struct acpi_object_list         input;

	union acpi_object               in_params[1];



	if (noacpi)

	if (libata_noacpi)

		return 0;



	if (ata_msg_probe(ap))

drivers/ata/libata-core.c

+4 −2
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ static int ata_probe_timeout = ATA_TMOUT_INTERNAL / HZ; 
module_param(ata_probe_timeout, int, 0444);

MODULE_PARM_DESC(ata_probe_timeout, "Set ATA probing timeout (seconds)");



int noacpi;

module_param(noacpi, int, 0444);

int libata_noacpi = 1;

module_param_named(noacpi, libata_noacpi, int, 0444);

MODULE_PARM_DESC(noacpi, "Disables the use of ACPI in suspend/resume when set");



MODULE_AUTHOR("Jeff Garzik");
@@ -3359,6 +3359,8 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
        { "WDC WD740ADFD-00",   NULL,		ATA_HORKAGE_NONCQ },

	/* http://thread.gmane.org/gmane.linux.ide/14907 */

	{ "FUJITSU MHT2060BH",	NULL,		ATA_HORKAGE_NONCQ },

	/* NCQ is broken */

	{ "Maxtor 6L250S0",     "BANC1G10",     ATA_HORKAGE_NONCQ },



	/* Devices with NCQ limits */

drivers/ata/libata-eh.c

+42 −24
Original line number Diff line number Diff line
@@ -1743,12 +1743,17 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap, 
{

	struct ata_eh_context *ehc = &ap->eh_context;

	struct ata_device *dev;

	unsigned int new_mask = 0;

	unsigned long flags;

	int i, rc = 0;



	DPRINTK("ENTER\n");



	for (i = 0; i < ATA_MAX_DEVICES; i++) {

	/* For PATA drive side cable detection to work, IDENTIFY must

	 * be done backwards such that PDIAG- is released by the slave

	 * device before the master device is identified.

	 */

	for (i = ATA_MAX_DEVICES - 1; i >= 0; i--) {

		unsigned int action, readid_flags = 0;



		dev = &ap->device[i];
@@ -1760,13 +1765,13 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap, 
		if (action & ATA_EH_REVALIDATE && ata_dev_ready(dev)) {

			if (ata_port_offline(ap)) {

				rc = -EIO;

				break;

				goto err;

			}



			ata_eh_about_to_do(ap, dev, ATA_EH_REVALIDATE);

			rc = ata_dev_revalidate(dev, readid_flags);

			if (rc)

				break;

				goto err;



			ata_eh_done(ap, dev, ATA_EH_REVALIDATE);
@@ -1784,26 +1789,40 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap, 


			rc = ata_dev_read_id(dev, &dev->class, readid_flags,

					     dev->id);

			if (rc == 0) {

				ehc->i.flags |= ATA_EHI_PRINTINFO;

				rc = ata_dev_configure(dev);

				ehc->i.flags &= ~ATA_EHI_PRINTINFO;

			} else if (rc == -ENOENT) {

			switch (rc) {

			case 0:

				new_mask |= 1 << i;

				break;

			case -ENOENT:

				/* IDENTIFY was issued to non-existent

				 * device.  No need to reset.  Just

				 * thaw and kill the device.

				 */

				ata_eh_thaw_port(ap);

				dev->class = ATA_DEV_UNKNOWN;

				rc = 0;

			}



			if (rc) {

				dev->class = ATA_DEV_UNKNOWN;

				break;

			default:

				dev->class = ATA_DEV_UNKNOWN;

				goto err;

			}

		}

	}



			if (ata_dev_enabled(dev)) {

	/* Configure new devices forward such that user doesn't see

	 * device detection messages backwards.

	 */

	for (i = 0; i < ATA_MAX_DEVICES; i++) {

		dev = &ap->device[i];



		if (!(new_mask & (1 << i)))

			continue;



		ehc->i.flags |= ATA_EHI_PRINTINFO;

		rc = ata_dev_configure(dev);

		ehc->i.flags &= ~ATA_EHI_PRINTINFO;

		if (rc)

			goto err;



		spin_lock_irqsave(ap->lock, flags);

		ap->pflags |= ATA_PFLAG_SCSI_HOTPLUG;

		spin_unlock_irqrestore(ap->lock, flags);
@@ -1811,13 +1830,12 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap, 
		/* new device discovered, configure xfermode */

		ehc->i.flags |= ATA_EHI_SETMODE;

	}

		}

	}



	if (rc)

		*r_failed_dev = dev;

	return 0;



	DPRINTK("EXIT\n");

 err:

	*r_failed_dev = dev;

	DPRINTK("EXIT rc=%d\n", rc);

	return rc;

}

drivers/ata/libata.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ extern struct workqueue_struct *ata_aux_wq; 
extern int atapi_enabled;

extern int atapi_dmadir;

extern int libata_fua;

extern int noacpi;

extern int libata_noacpi;

extern struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev);

extern int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev,

			   u64 block, u32 n_block, unsigned int tf_flags,