tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds eebb2afb b534d388

+35 -28
unified split
+33 -24
drivers/ata/ahci.c
··· 114 114 board_ahci_sb700 = 5, /* for SB700 and SB800 */ 115 115 board_ahci_mcp65 = 6, 116 116 board_ahci_nopmp = 7, 117 + board_ahci_yesncq = 8, 117 118 118 119 /* global controller registers */ 119 120 HOST_CAP = 0x00, /* host capabilities */ ··· 470 469 .udma_mask = ATA_UDMA6, 471 470 .port_ops = &ahci_ops, 472 471 }, 472 + /* board_ahci_yesncq */ 473 + { 474 + AHCI_HFLAGS (AHCI_HFLAG_YES_NCQ), 475 + .flags = AHCI_FLAG_COMMON, 476 + .pio_mask = ATA_PIO4, 477 + .udma_mask = ATA_UDMA6, 478 + .port_ops = &ahci_ops, 479 + }, 473 480 }; 474 481 475 482 static const struct pci_device_id ahci_pci_tbl[] = { ··· 544 535 { PCI_VDEVICE(NVIDIA, 0x045d), board_ahci_mcp65 }, /* MCP65 */ 545 536 { PCI_VDEVICE(NVIDIA, 0x045e), board_ahci_mcp65 }, /* MCP65 */ 546 537 { PCI_VDEVICE(NVIDIA, 0x045f), board_ahci_mcp65 }, /* MCP65 */ 547 - { PCI_VDEVICE(NVIDIA, 0x0550), board_ahci }, /* MCP67 */ 548 - { PCI_VDEVICE(NVIDIA, 0x0551), board_ahci }, /* MCP67 */ 549 - { PCI_VDEVICE(NVIDIA, 0x0552), board_ahci }, /* MCP67 */ 550 - { PCI_VDEVICE(NVIDIA, 0x0553), board_ahci }, /* MCP67 */ 551 - { PCI_VDEVICE(NVIDIA, 0x0554), board_ahci }, /* MCP67 */ 552 - { PCI_VDEVICE(NVIDIA, 0x0555), board_ahci }, /* MCP67 */ 553 - { PCI_VDEVICE(NVIDIA, 0x0556), board_ahci }, /* MCP67 */ 554 - { PCI_VDEVICE(NVIDIA, 0x0557), board_ahci }, /* MCP67 */ 555 - { PCI_VDEVICE(NVIDIA, 0x0558), board_ahci }, /* MCP67 */ 556 - { PCI_VDEVICE(NVIDIA, 0x0559), board_ahci }, /* MCP67 */ 557 - { PCI_VDEVICE(NVIDIA, 0x055a), board_ahci }, /* MCP67 */ 558 - { PCI_VDEVICE(NVIDIA, 0x055b), board_ahci }, /* MCP67 */ 559 - { PCI_VDEVICE(NVIDIA, 0x07f0), board_ahci }, /* MCP73 */ 560 - { PCI_VDEVICE(NVIDIA, 0x07f1), board_ahci }, /* MCP73 */ 561 - { PCI_VDEVICE(NVIDIA, 0x07f2), board_ahci }, /* MCP73 */ 562 - { PCI_VDEVICE(NVIDIA, 0x07f3), board_ahci }, /* MCP73 */ 563 - { PCI_VDEVICE(NVIDIA, 0x07f4), board_ahci }, /* MCP73 */ 564 - { PCI_VDEVICE(NVIDIA, 0x07f5), board_ahci }, /* MCP73 */ 565 - { PCI_VDEVICE(NVIDIA, 0x07f6), board_ahci }, /* MCP73 */ 566 - { PCI_VDEVICE(NVIDIA, 0x07f7), board_ahci }, /* MCP73 */ 567 - { PCI_VDEVICE(NVIDIA, 0x07f8), board_ahci }, /* MCP73 */ 568 - { PCI_VDEVICE(NVIDIA, 0x07f9), board_ahci }, /* MCP73 */ 569 - { PCI_VDEVICE(NVIDIA, 0x07fa), board_ahci }, /* MCP73 */ 570 - { PCI_VDEVICE(NVIDIA, 0x07fb), board_ahci }, /* MCP73 */ 538 + { PCI_VDEVICE(NVIDIA, 0x0550), board_ahci_yesncq }, /* MCP67 */ 539 + { PCI_VDEVICE(NVIDIA, 0x0551), board_ahci_yesncq }, /* MCP67 */ 540 + { PCI_VDEVICE(NVIDIA, 0x0552), board_ahci_yesncq }, /* MCP67 */ 541 + { PCI_VDEVICE(NVIDIA, 0x0553), board_ahci_yesncq }, /* MCP67 */ 542 + { PCI_VDEVICE(NVIDIA, 0x0554), board_ahci_yesncq }, /* MCP67 */ 543 + { PCI_VDEVICE(NVIDIA, 0x0555), board_ahci_yesncq }, /* MCP67 */ 544 + { PCI_VDEVICE(NVIDIA, 0x0556), board_ahci_yesncq }, /* MCP67 */ 545 + { PCI_VDEVICE(NVIDIA, 0x0557), board_ahci_yesncq }, /* MCP67 */ 546 + { PCI_VDEVICE(NVIDIA, 0x0558), board_ahci_yesncq }, /* MCP67 */ 547 + { PCI_VDEVICE(NVIDIA, 0x0559), board_ahci_yesncq }, /* MCP67 */ 548 + { PCI_VDEVICE(NVIDIA, 0x055a), board_ahci_yesncq }, /* MCP67 */ 549 + { PCI_VDEVICE(NVIDIA, 0x055b), board_ahci_yesncq }, /* MCP67 */ 550 + { PCI_VDEVICE(NVIDIA, 0x07f0), board_ahci_yesncq }, /* MCP73 */ 551 + { PCI_VDEVICE(NVIDIA, 0x07f1), board_ahci_yesncq }, /* MCP73 */ 552 + { PCI_VDEVICE(NVIDIA, 0x07f2), board_ahci_yesncq }, /* MCP73 */ 553 + { PCI_VDEVICE(NVIDIA, 0x07f3), board_ahci_yesncq }, /* MCP73 */ 554 + { PCI_VDEVICE(NVIDIA, 0x07f4), board_ahci_yesncq }, /* MCP73 */ 555 + { PCI_VDEVICE(NVIDIA, 0x07f5), board_ahci_yesncq }, /* MCP73 */ 556 + { PCI_VDEVICE(NVIDIA, 0x07f6), board_ahci_yesncq }, /* MCP73 */ 557 + { PCI_VDEVICE(NVIDIA, 0x07f7), board_ahci_yesncq }, /* MCP73 */ 558 + { PCI_VDEVICE(NVIDIA, 0x07f8), board_ahci_yesncq }, /* MCP73 */ 559 + { PCI_VDEVICE(NVIDIA, 0x07f9), board_ahci_yesncq }, /* MCP73 */ 560 + { PCI_VDEVICE(NVIDIA, 0x07fa), board_ahci_yesncq }, /* MCP73 */ 561 + { PCI_VDEVICE(NVIDIA, 0x07fb), board_ahci_yesncq }, /* MCP73 */ 571 562 { PCI_VDEVICE(NVIDIA, 0x0ad0), board_ahci }, /* MCP77 */ 572 563 { PCI_VDEVICE(NVIDIA, 0x0ad1), board_ahci }, /* MCP77 */ 573 564 { PCI_VDEVICE(NVIDIA, 0x0ad2), board_ahci }, /* MCP77 */
+1 -3
drivers/ata/libata-core.c
··· 6110 6110 ata_port_printk(ap, KERN_INFO, "DUMMY\n"); 6111 6111 } 6112 6112 6113 - /* perform each probe synchronously */ 6114 - DPRINTK("probe begin\n"); 6113 + /* perform each probe asynchronously */ 6115 6114 for (i = 0; i < host->n_ports; i++) { 6116 6115 struct ata_port *ap = host->ports[i]; 6117 6116 async_schedule(async_port_probe, ap); 6118 6117 } 6119 - DPRINTK("probe end\n"); 6120 6118 6121 6119 return 0; 6122 6120 }
+1 -1
drivers/ata/sata_via.c
··· 566 566 static int printed_version; 567 567 unsigned int i; 568 568 int rc; 569 - struct ata_host *host; 569 + struct ata_host *host = NULL; 570 570 int board_id = (int) ent->driver_data; 571 571 const unsigned *bar_sizes; 572 572