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 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:
sata_mv HighPoint 2310 support (88SX7042)
libata: fix handling of port actions in per-dev action mask
libata: initialize qc->dma_dir to DMA_NONE
sata_via: add PCI ID 0x5337
libata doc: "error : unterminated entity reference exceptions"

Linus Torvalds ab112782 365bbe0d

+10 -3
unified split
+1 -1
Documentation/DocBook/libata.tmpl
··· 883 </chapter> 884 885 <chapter id="ataExceptions"> 886 - <title>ATA errors &amp; exceptions</title> 887 888 <para> 889 This chapter tries to identify what error/exception conditions exist
··· 883 </chapter> 884 885 <chapter id="ataExceptions"> 886 + <title>ATA errors and exceptions</title> 887 888 <para> 889 This chapter tries to identify what error/exception conditions exist
+4
drivers/ata/libata-eh.c
··· 1979 1980 ehc->tries[dev->devno] = ATA_EH_DEV_TRIES; 1981 1982 /* process hotplug request */ 1983 if (dev->flags & ATA_DFLAG_DETACH) 1984 ata_eh_detach_dev(dev);
··· 1979 1980 ehc->tries[dev->devno] = ATA_EH_DEV_TRIES; 1981 1982 + /* collect port action mask recorded in dev actions */ 1983 + ehc->i.action |= ehc->i.dev_action[i] & ~ATA_EH_PERDEV_MASK; 1984 + ehc->i.dev_action[i] &= ATA_EH_PERDEV_MASK; 1985 + 1986 /* process hotplug request */ 1987 if (dev->flags & ATA_DFLAG_DETACH) 1988 ata_eh_detach_dev(dev);
+3 -2
drivers/ata/sata_mv.c
··· 523 }, 524 { /* chip_7042 */ 525 .sht = &mv_sht, 526 - .flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS | 527 - MV_FLAG_DUAL_HC), 528 .pio_mask = 0x1f, /* pio0-4 */ 529 .udma_mask = 0x7f, /* udma0-6 */ 530 .port_ops = &mv_iie_ops, ··· 543 { PCI_VDEVICE(MARVELL, 0x6081), chip_608x }, 544 545 { PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x }, 546 547 { } /* terminate list */ 548 };
··· 523 }, 524 { /* chip_7042 */ 525 .sht = &mv_sht, 526 + .flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS), 527 .pio_mask = 0x1f, /* pio0-4 */ 528 .udma_mask = 0x7f, /* udma0-6 */ 529 .port_ops = &mv_iie_ops, ··· 544 { PCI_VDEVICE(MARVELL, 0x6081), chip_608x }, 545 546 { PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x }, 547 + 548 + { PCI_VDEVICE(TTI, 0x2310), chip_7042 }, 549 550 { } /* terminate list */ 551 };
+1
drivers/ata/sata_via.c
··· 77 static void vt6420_error_handler(struct ata_port *ap); 78 79 static const struct pci_device_id svia_pci_tbl[] = { 80 { PCI_VDEVICE(VIA, 0x0591), vt6420 }, 81 { PCI_VDEVICE(VIA, 0x3149), vt6420 }, 82 { PCI_VDEVICE(VIA, 0x3249), vt6421 },
··· 77 static void vt6420_error_handler(struct ata_port *ap); 78 79 static const struct pci_device_id svia_pci_tbl[] = { 80 + { PCI_VDEVICE(VIA, 0x5337), vt6420 }, 81 { PCI_VDEVICE(VIA, 0x0591), vt6420 }, 82 { PCI_VDEVICE(VIA, 0x3149), vt6420 }, 83 { PCI_VDEVICE(VIA, 0x3249), vt6421 },
+1
include/linux/libata.h
··· 1143 1144 static inline void ata_qc_reinit(struct ata_queued_cmd *qc) 1145 { 1146 qc->__sg = NULL; 1147 qc->flags = 0; 1148 qc->cursect = qc->cursg = qc->cursg_ofs = 0;
··· 1143 1144 static inline void ata_qc_reinit(struct ata_queued_cmd *qc) 1145 { 1146 + qc->dma_dir = DMA_NONE; 1147 qc->__sg = NULL; 1148 qc->flags = 0; 1149 qc->cursect = qc->cursg = qc->cursg_ofs = 0;