Commit e30fdb1e 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:
  [libata] pata_artop: kill gcc warning
  [PATCH] libata: turn off NCQ if queue depth is adjusted to 1
  [PATCH] libata: cosmetic changes to constants
  [libata] DocBook minor updates, fixes
  [libata] PCI ID table cleanup in various drivers
  [libata] Print out Status register, if a BSY-sleep takes too long
  [libata] init probe_ent->private_data in a common location
  [libata] minor PCI IDE probe fixes and cleanups
  [libata] Use new PCI_VDEVICE() macro to dramatically shorten ID lists
  [PATCH] Fix reference of uninitialised memory in ata_device_add()
parents 5b9b5572 15a7c3bb

Documentation/DocBook/libata.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  </authorgroup>



  <copyright>

   <year>2003-2005</year>

   <year>2003-2006</year>

   <holder>Jeff Garzik</holder>

  </copyright>

drivers/ata/ahci.c

+30 −60
Original line number Diff line number Diff line
@@ -299,76 +299,46 @@ static const struct ata_port_info ahci_port_info[] = { 


static const struct pci_device_id ahci_pci_tbl[] = {

	/* Intel */

	{ PCI_VENDOR_ID_INTEL, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH6 */

	{ PCI_VENDOR_ID_INTEL, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH6M */

	{ PCI_VENDOR_ID_INTEL, 0x27c1, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH7 */

	{ PCI_VENDOR_ID_INTEL, 0x27c5, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH7M */

	{ PCI_VENDOR_ID_INTEL, 0x27c3, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH7R */

	{ PCI_VENDOR_ID_AL, 0x5288, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ULi M5288 */

	{ PCI_VENDOR_ID_INTEL, 0x2681, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ESB2 */

	{ PCI_VENDOR_ID_INTEL, 0x2682, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ESB2 */

	{ PCI_VENDOR_ID_INTEL, 0x2683, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ESB2 */

	{ PCI_VENDOR_ID_INTEL, 0x27c6, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH7-M DH */

	{ PCI_VENDOR_ID_INTEL, 0x2821, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH8 */

	{ PCI_VENDOR_ID_INTEL, 0x2822, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH8 */

	{ PCI_VENDOR_ID_INTEL, 0x2824, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH8 */

	{ PCI_VENDOR_ID_INTEL, 0x2829, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH8M */

	{ PCI_VENDOR_ID_INTEL, 0x282a, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ICH8M */

	{ PCI_VDEVICE(INTEL, 0x2652), board_ahci }, /* ICH6 */

	{ PCI_VDEVICE(INTEL, 0x2653), board_ahci }, /* ICH6M */

	{ PCI_VDEVICE(INTEL, 0x27c1), board_ahci }, /* ICH7 */

	{ PCI_VDEVICE(INTEL, 0x27c5), board_ahci }, /* ICH7M */

	{ PCI_VDEVICE(INTEL, 0x27c3), board_ahci }, /* ICH7R */

	{ PCI_VDEVICE(AL, 0x5288), board_ahci }, /* ULi M5288 */

	{ PCI_VDEVICE(INTEL, 0x2681), board_ahci }, /* ESB2 */

	{ PCI_VDEVICE(INTEL, 0x2682), board_ahci }, /* ESB2 */

	{ PCI_VDEVICE(INTEL, 0x2683), board_ahci }, /* ESB2 */

	{ PCI_VDEVICE(INTEL, 0x27c6), board_ahci }, /* ICH7-M DH */

	{ PCI_VDEVICE(INTEL, 0x2821), board_ahci }, /* ICH8 */

	{ PCI_VDEVICE(INTEL, 0x2822), board_ahci }, /* ICH8 */

	{ PCI_VDEVICE(INTEL, 0x2824), board_ahci }, /* ICH8 */

	{ PCI_VDEVICE(INTEL, 0x2829), board_ahci }, /* ICH8M */

	{ PCI_VDEVICE(INTEL, 0x282a), board_ahci }, /* ICH8M */



	/* JMicron */

	{ 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* JMicron JMB360 */

	{ 0x197b, 0x2361, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* JMicron JMB361 */

	{ 0x197b, 0x2363, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* JMicron JMB363 */

	{ 0x197b, 0x2365, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* JMicron JMB365 */

	{ 0x197b, 0x2366, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* JMicron JMB366 */

	{ PCI_VDEVICE(JMICRON, 0x2360), board_ahci }, /* JMicron JMB360 */

	{ PCI_VDEVICE(JMICRON, 0x2361), board_ahci }, /* JMicron JMB361 */

	{ PCI_VDEVICE(JMICRON, 0x2363), board_ahci }, /* JMicron JMB363 */

	{ PCI_VDEVICE(JMICRON, 0x2365), board_ahci }, /* JMicron JMB365 */

	{ PCI_VDEVICE(JMICRON, 0x2366), board_ahci }, /* JMicron JMB366 */



	/* ATI */

	{ PCI_VENDOR_ID_ATI, 0x4380, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ATI SB600 non-raid */

	{ PCI_VENDOR_ID_ATI, 0x4381, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ATI SB600 raid */

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

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



	/* VIA */

	{ PCI_VENDOR_ID_VIA, 0x3349, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci_vt8251 }, /* VIA VT8251 */

	{ PCI_VDEVICE(VIA, 0x3349), board_ahci_vt8251 }, /* VIA VT8251 */



	/* NVIDIA */

	{ PCI_VENDOR_ID_NVIDIA, 0x044c, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci },		/* MCP65 */

	{ PCI_VENDOR_ID_NVIDIA, 0x044d, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci },		/* MCP65 */

	{ PCI_VENDOR_ID_NVIDIA, 0x044e, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci },		/* MCP65 */

	{ PCI_VENDOR_ID_NVIDIA, 0x044f, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci },		/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x044c), board_ahci },		/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x044d), board_ahci },		/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x044e), board_ahci },		/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x044f), board_ahci },		/* MCP65 */



	/* SiS */

	{ PCI_VENDOR_ID_SI, 0x1184, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* SiS 966 */

	{ PCI_VENDOR_ID_SI, 0x1185, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* SiS 966 */

	{ PCI_VENDOR_ID_SI, 0x0186, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* SiS 968 */

	{ PCI_VDEVICE(SI, 0x1184), board_ahci }, /* SiS 966 */

	{ PCI_VDEVICE(SI, 0x1185), board_ahci }, /* SiS 966 */

	{ PCI_VDEVICE(SI, 0x0186), board_ahci }, /* SiS 968 */



	{ }	/* terminate list */

};

drivers/ata/libata-core.c

+7 −5
Original line number Diff line number Diff line
@@ -2340,7 +2340,8 @@ unsigned int ata_busy_sleep (struct ata_port *ap, 


	if (status & ATA_BUSY)

		ata_port_printk(ap, KERN_WARNING,

				"port is slow to respond, please be patient\n");

				"port is slow to respond, please be patient "

				"(Status 0x%x)\n", status);



	timeout = timer_start + tmout;

	while ((status & ATA_BUSY) && (time_before(jiffies, timeout))) {
@@ -2350,7 +2351,8 @@ unsigned int ata_busy_sleep (struct ata_port *ap, 


	if (status & ATA_BUSY) {

		ata_port_printk(ap, KERN_ERR, "port failed to respond "

				"(%lu secs)\n", tmout / HZ);

				"(%lu secs, Status 0x%x)\n",

				tmout / HZ, status);

		return 1;

	}
@@ -5478,11 +5480,10 @@ int ata_device_add(const struct ata_probe_ent *ent) 
		int irq_line = ent->irq;



		ap = ata_port_add(ent, host, i);

		host->ports[i] = ap;

		if (!ap)

			goto err_out;



		host->ports[i] = ap;



		/* dummy? */

		if (ent->dummy_port_mask & (1 << i)) {

			ata_port_printk(ap, KERN_INFO, "DUMMY\n");
@@ -5740,7 +5741,7 @@ void ata_host_remove(struct ata_host *host) 


/**

 *	ata_scsi_release - SCSI layer callback hook for host unload

 *	@host: libata host to be unloaded

 *	@shost: libata host to be unloaded

 *

 *	Performs all duties necessary to shut down a libata port...

 *	Kill port kthread, disable port, and release resources.
@@ -5786,6 +5787,7 @@ ata_probe_ent_alloc(struct device *dev, const struct ata_port_info *port) 
	probe_ent->mwdma_mask = port->mwdma_mask;

	probe_ent->udma_mask = port->udma_mask;

	probe_ent->port_ops = port->port_ops;

	probe_ent->private_data = port->private_data;



	return probe_ent;

}

drivers/ata/libata-scsi.c

+12 −2
Original line number Diff line number Diff line
@@ -889,6 +889,7 @@ int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth) 
{

	struct ata_port *ap = ata_shost_to_port(sdev->host);

	struct ata_device *dev;

	unsigned long flags;

	int max_depth;



	if (queue_depth < 1)
@@ -904,6 +905,14 @@ int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth) 
		queue_depth = max_depth;



	scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, queue_depth);



	spin_lock_irqsave(ap->lock, flags);

	if (queue_depth > 1)

		dev->flags &= ~ATA_DFLAG_NCQ_OFF;

	else

		dev->flags |= ATA_DFLAG_NCQ_OFF;

	spin_unlock_irqrestore(ap->lock, flags);



	return queue_depth;

}
@@ -1293,7 +1302,8 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm 
		 */

		goto nothing_to_do;



	if ((dev->flags & (ATA_DFLAG_PIO | ATA_DFLAG_NCQ)) == ATA_DFLAG_NCQ) {

	if ((dev->flags & (ATA_DFLAG_PIO | ATA_DFLAG_NCQ_OFF |

			   ATA_DFLAG_NCQ)) == ATA_DFLAG_NCQ) {

		/* yay, NCQ */

		if (!lba_48_ok(block, n_block))

			goto out_of_range;
@@ -3174,7 +3184,7 @@ void ata_scsi_dev_rescan(void *data) 


/**

 *	ata_sas_port_alloc - Allocate port for a SAS attached SATA device

 *	@pdev: PCI device that the scsi device is attached to

 *	@host: ATA host container for all SAS ports

 *	@port_info: Information from low-level host driver

 *	@shost: SCSI host that the scsi device is attached to

 *

drivers/ata/libata-sff.c

+22 −22
Original line number Diff line number Diff line
@@ -828,7 +828,6 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int 


	probe_ent->irq = pdev->irq;

	probe_ent->irq_flags = IRQF_SHARED;

	probe_ent->private_data = port[0]->private_data;



	if (ports & ATA_PORT_PRIMARY) {

		probe_ent->port[p].cmd_addr = pci_resource_start(pdev, 0);
@@ -878,7 +877,6 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, 
		return NULL;



	probe_ent->n_ports = 2;

	probe_ent->private_data = port[0]->private_data;



	if (port_mask & ATA_PORT_PRIMARY) {

		probe_ent->irq = ATA_PRIMARY_IRQ;
@@ -908,6 +906,8 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, 
				probe_ent->_host_flags |= ATA_HOST_SIMPLEX;

		}

		ata_std_ports(&probe_ent->port[1]);



		/* FIXME: could be pointing to stack area; must copy */

		probe_ent->pinfo2 = port[1];

	} else

		probe_ent->dummy_port_mask |= ATA_PORT_SECONDARY;
@@ -946,35 +946,21 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info, 
{

	struct ata_probe_ent *probe_ent = NULL;

	struct ata_port_info *port[2];

	u8 tmp8, mask;

	u8 mask;

	unsigned int legacy_mode = 0;

	int disable_dev_on_err = 1;

	int rc;



	DPRINTK("ENTER\n");



	BUG_ON(n_ports < 1 || n_ports > 2);



	port[0] = port_info[0];

	if (n_ports > 1)

		port[1] = port_info[1];

	else

		port[1] = port[0];



	if ((port[0]->flags & ATA_FLAG_NO_LEGACY) == 0

	    && (pdev->class >> 8) == PCI_CLASS_STORAGE_IDE) {

		/* TODO: What if one channel is in native mode ... */

		pci_read_config_byte(pdev, PCI_CLASS_PROG, &tmp8);

		mask = (1 << 2) | (1 << 0);

		if ((tmp8 & mask) != mask)

			legacy_mode = (1 << 3);

	}



	/* FIXME... */

	if ((!legacy_mode) && (n_ports > 2)) {

		printk(KERN_ERR "ata: BUG: native mode, n_ports > 2\n");

		n_ports = 2;

		/* For now */

	}



	/* FIXME: Really for ATA it isn't safe because the device may be

	   multi-purpose and we want to leave it alone if it was already

	   enabled. Secondly for shared use as Arjan says we want refcounting
@@ -987,6 +973,16 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info, 
	if (rc)

		return rc;



	if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE) {

		u8 tmp8;



		/* TODO: What if one channel is in native mode ... */

		pci_read_config_byte(pdev, PCI_CLASS_PROG, &tmp8);

		mask = (1 << 2) | (1 << 0);

		if ((tmp8 & mask) != mask)

			legacy_mode = (1 << 3);

	}



	rc = pci_request_regions(pdev, DRV_NAME);

	if (rc) {

		disable_dev_on_err = 0;
@@ -1039,7 +1035,7 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info, 
		goto err_out_regions;

	}



	/* FIXME: If we get no DMA mask we should fall back to PIO */

	/* TODO: If we get no DMA mask we should fall back to PIO */

	rc = pci_set_dma_mask(pdev, ATA_DMA_MASK);

	if (rc)

		goto err_out_regions;
@@ -1062,13 +1058,17 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info, 


	pci_set_master(pdev);



	/* FIXME: check ata_device_add return */

	ata_device_add(probe_ent);

	if (!ata_device_add(probe_ent)) {

		rc = -ENODEV;

		goto err_out_ent;

	}



	kfree(probe_ent);



	return 0;



err_out_ent:

	kfree(probe_ent);

err_out_regions:

	if (legacy_mode & ATA_PORT_PRIMARY)

		release_region(ATA_PRIMARY_CMD, 8);

CRA Git | Maintained and supported by SUSTech CRA and CCSE