Commit eebb2afb 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:
  ata: fix obviously wrong comment
  ahci: force CAP_NCQ for earlier NV MCPs
  [libata] sata_via: kill uninit'd var warning
parents b534d388 f6005354

drivers/ata/ahci.c

+33 −24
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ enum { 
	board_ahci_sb700	= 5, /* for SB700 and SB800 */

	board_ahci_mcp65	= 6,

	board_ahci_nopmp	= 7,

	board_ahci_yesncq	= 8,



	/* global controller registers */

	HOST_CAP		= 0x00, /* host capabilities */
@@ -469,6 +470,14 @@ static const struct ata_port_info ahci_port_info[] = { 
		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	/* board_ahci_yesncq */

	{

		AHCI_HFLAGS	(AHCI_HFLAG_YES_NCQ),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

};



static const struct pci_device_id ahci_pci_tbl[] = {
@@ -535,30 +544,30 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(NVIDIA, 0x045d), board_ahci_mcp65 },	/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x045e), board_ahci_mcp65 },	/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x045f), board_ahci_mcp65 },	/* MCP65 */

	{ PCI_VDEVICE(NVIDIA, 0x0550), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0551), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0552), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0553), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0554), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0555), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0556), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0557), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0558), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0559), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x055a), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x055b), board_ahci },		/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x07f0), board_ahci },		/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f1), board_ahci },		/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f2), board_ahci },		/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f3), board_ahci },		/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f4), board_ahci },		/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f5), board_ahci },		/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f6), board_ahci },		/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f7), board_ahci },		/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f8), board_ahci },		/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f9), board_ahci },		/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07fa), board_ahci },		/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07fb), board_ahci },		/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x0550), board_ahci_yesncq },	/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0551), board_ahci_yesncq },	/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0552), board_ahci_yesncq },	/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0553), board_ahci_yesncq },	/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0554), board_ahci_yesncq },	/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0555), board_ahci_yesncq },	/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0556), board_ahci_yesncq },	/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0557), board_ahci_yesncq },	/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0558), board_ahci_yesncq },	/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0559), board_ahci_yesncq },	/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x055a), board_ahci_yesncq },	/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x055b), board_ahci_yesncq },	/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x07f0), board_ahci_yesncq },	/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f1), board_ahci_yesncq },	/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f2), board_ahci_yesncq },	/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f3), board_ahci_yesncq },	/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f4), board_ahci_yesncq },	/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f5), board_ahci_yesncq },	/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f6), board_ahci_yesncq },	/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f7), board_ahci_yesncq },	/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f8), board_ahci_yesncq },	/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f9), board_ahci_yesncq },	/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07fa), board_ahci_yesncq },	/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07fb), board_ahci_yesncq },	/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x0ad0), board_ahci },		/* MCP77 */

	{ PCI_VDEVICE(NVIDIA, 0x0ad1), board_ahci },		/* MCP77 */

	{ PCI_VDEVICE(NVIDIA, 0x0ad2), board_ahci },		/* MCP77 */

drivers/ata/libata-core.c

+1 −3
Original line number Diff line number Diff line
@@ -6110,13 +6110,11 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) 
			ata_port_printk(ap, KERN_INFO, "DUMMY\n");

	}



	/* perform each probe synchronously */

	DPRINTK("probe begin\n");

	/* perform each probe asynchronously */

	for (i = 0; i < host->n_ports; i++) {

		struct ata_port *ap = host->ports[i];

		async_schedule(async_port_probe, ap);

	}

	DPRINTK("probe end\n");



	return 0;

}

drivers/ata/sata_via.c

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	static int printed_version;

	unsigned int i;

	int rc;

	struct ata_host *host;

	struct ata_host *host = NULL;

	int board_id = (int) ent->driver_data;

	const unsigned *bar_sizes;