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

Commit 3a4b7886 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_it821x: Driver updates and reworking
  libata.h: replace __FUNCTION__ with __func__
  ata_piix: subsys 106b:00a3 is apple ich8m too
  libata-core: make sure that ata_force_tbl is freed in case of an error
  libata: update atapi disable handling
  pata_via: add VX800 flag; add function for fixing h/w bugs
  pata_ali: misplaced pci_dev_put()
parents b8a327be 963e4975

drivers/ata/ata_piix.c

+1 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ static const struct pci_device_id piix_pci_tbl[] = { 
	/* Mobile SATA Controller IDE (ICH8M), Apple */

	{ 0x8086, 0x2828, 0x106b, 0x00a0, 0, 0, ich8m_apple_sata },

	{ 0x8086, 0x2828, 0x106b, 0x00a1, 0, 0, ich8m_apple_sata },

	{ 0x8086, 0x2828, 0x106b, 0x00a3, 0, 0, ich8m_apple_sata },

	/* Mobile SATA Controller IDE (ICH8M) */

	{ 0x8086, 0x2828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },

	/* SATA Controller IDE (ICH9) */

drivers/ata/libata-core.c

+46 −11
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static char ata_force_param_buf[PAGE_SIZE] __initdata; 
module_param_string(force, ata_force_param_buf, sizeof(ata_force_param_buf), 0);

MODULE_PARM_DESC(force, "Force ATA configurations including cable type, link speed and transfer mode (see Documentation/kernel-parameters.txt for details)");



int atapi_enabled = 1;

static int atapi_enabled = 1;

module_param(atapi_enabled, int, 0444);

MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)");
@@ -1132,6 +1132,8 @@ void ata_id_string(const u16 *id, unsigned char *s, 
{

	unsigned int c;



	BUG_ON(len & 1);



	while (len > 0) {

		c = id[ofs] >> 8;

		*s = c;
@@ -1165,8 +1167,6 @@ void ata_id_c_string(const u16 *id, unsigned char *s, 
{

	unsigned char *p;



	WARN_ON(!(len & 1));



	ata_id_string(id, s, ofs, len - 1);



	p = s + strnlen(s, len - 1);
@@ -1885,6 +1885,23 @@ static u32 ata_pio_mask_no_iordy(const struct ata_device *adev) 
	return 3 << ATA_SHIFT_PIO;

}



/**

 *	ata_do_dev_read_id		-	default ID read method

 *	@dev: device

 *	@tf: proposed taskfile

 *	@id: data buffer

 *

 *	Issue the identify taskfile and hand back the buffer containing

 *	identify data. For some RAID controllers and for pre ATA devices

 *	this function is wrapped or replaced by the driver

 */

unsigned int ata_do_dev_read_id(struct ata_device *dev,

					struct ata_taskfile *tf, u16 *id)

{

	return ata_exec_internal(dev, tf, NULL, DMA_FROM_DEVICE,

				     id, sizeof(id[0]) * ATA_ID_WORDS, 0);

}



/**

 *	ata_dev_read_id - Read ID data from the specified device

 *	@dev: target device
@@ -1948,8 +1965,11 @@ int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class, 
	 */

	tf.flags |= ATA_TFLAG_POLLING;



	err_mask = ata_exec_internal(dev, &tf, NULL, DMA_FROM_DEVICE,

				     id, sizeof(id[0]) * ATA_ID_WORDS, 0);

	if (ap->ops->read_id)

		err_mask = ap->ops->read_id(dev, &tf, id);

	else

		err_mask = ata_do_dev_read_id(dev, &tf, id);



	if (err_mask) {

		if (err_mask & AC_ERR_NODEV_HINT) {

			ata_dev_printk(dev, KERN_DEBUG,
@@ -2142,6 +2162,16 @@ int ata_dev_configure(struct ata_device *dev) 
		return 0;

	}



	if ((!atapi_enabled || (ap->flags & ATA_FLAG_NO_ATAPI)) &&

	    dev->class == ATA_DEV_ATAPI) {

		ata_dev_printk(dev, KERN_WARNING,

			"WARNING: ATAPI is %s, device ignored.\n",

			atapi_enabled ? "not supported with this driver"

				      : "disabled");

		ata_dev_disable(dev);

		return 0;

	}



	/* let ACPI work its magic */

	rc = ata_acpi_on_devcfg(dev);

	if (rc)
@@ -6088,16 +6118,20 @@ static int __init ata_init(void) 


	ata_wq = create_workqueue("ata");

	if (!ata_wq)

		return -ENOMEM;

		goto free_force_tbl;



	ata_aux_wq = create_singlethread_workqueue("ata_aux");

	if (!ata_aux_wq) {

		destroy_workqueue(ata_wq);

		return -ENOMEM;

	}

	if (!ata_aux_wq)

		goto free_wq;



	printk(KERN_DEBUG "libata version " DRV_VERSION " loaded.\n");

	return 0;



free_wq:

	destroy_workqueue(ata_wq);

free_force_tbl:

	kfree(ata_force_tbl);

	return -ENOMEM;

}



static void __exit ata_exit(void)
@@ -6269,6 +6303,7 @@ EXPORT_SYMBOL_GPL(ata_host_resume); 
#endif /* CONFIG_PM */

EXPORT_SYMBOL_GPL(ata_id_string);

EXPORT_SYMBOL_GPL(ata_id_c_string);

EXPORT_SYMBOL_GPL(ata_do_dev_read_id);

EXPORT_SYMBOL_GPL(ata_scsi_simulate);



EXPORT_SYMBOL_GPL(ata_pio_need_iordy);

drivers/ata/libata-scsi.c

+2 −32
Original line number Diff line number Diff line
@@ -2550,36 +2550,6 @@ static struct ata_device *__ata_scsi_find_dev(struct ata_port *ap, 
	return ata_find_dev(ap, devno);

}



/**

 *	ata_scsi_dev_enabled - determine if device is enabled

 *	@dev: ATA device

 *

 *	Determine if commands should be sent to the specified device.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host lock)

 *

 *	RETURNS:

 *	0 if commands are not allowed / 1 if commands are allowed

 */



static int ata_scsi_dev_enabled(struct ata_device *dev)

{

	if (unlikely(!ata_dev_enabled(dev)))

		return 0;



	if (!atapi_enabled || (dev->link->ap->flags & ATA_FLAG_NO_ATAPI)) {

		if (unlikely(dev->class == ATA_DEV_ATAPI)) {

			ata_dev_printk(dev, KERN_WARNING,

				       "WARNING: ATAPI is %s, device ignored.\n",

				       atapi_enabled ? "not supported with this driver" : "disabled");

			return 0;

		}

	}



	return 1;

}



/**

 *	ata_scsi_find_dev - lookup ata_device from scsi_cmnd

 *	@ap: ATA port to which the device is attached
@@ -2601,7 +2571,7 @@ ata_scsi_find_dev(struct ata_port *ap, const struct scsi_device *scsidev) 
{

	struct ata_device *dev = __ata_scsi_find_dev(ap, scsidev);



	if (unlikely(!dev || !ata_scsi_dev_enabled(dev)))

	if (unlikely(!dev || !ata_dev_enabled(dev)))

		return NULL;



	return dev;
@@ -3622,7 +3592,7 @@ int ata_sas_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *), 


	ata_scsi_dump_cdb(ap, cmd);



	if (likely(ata_scsi_dev_enabled(ap->link.device)))

	if (likely(ata_dev_enabled(ap->link.device)))

		rc = __ata_scsi_queuecmd(cmd, done, ap->link.device);

	else {

		cmd->result = (DID_BAD_TARGET << 16);

drivers/ata/libata.h

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ enum { 


extern unsigned int ata_print_id;

extern struct workqueue_struct *ata_aux_wq;

extern int atapi_enabled;

extern int atapi_passthru16;

extern int libata_fua;

extern int libata_noacpi;

drivers/ata/pata_ali.c

+2 −1
Original line number Diff line number Diff line
@@ -550,8 +550,9 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		pci_read_config_byte(isa_bridge, 0x5E, &tmp);

		if ((tmp & 0x1E) == 0x12)

	        	ppi[0] = &info_20_udma;

		pci_dev_put(isa_bridge);

	}

	pci_dev_put(isa_bridge);



	return ata_pci_sff_init_one(pdev, ppi, &ali_sht, NULL);

}