libata updates
Subsystems (3)
PATCH 1/1 libata updates
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
to receive the following updates:
Documentation/DocBook/libata.tmpl | 47 +++++++++- drivers/scsi/libata-bmdma.c | 26 ++++- drivers/scsi/libata-core.c | 168 ++++++++++++++------------------------ drivers/scsi/sata_mv.c | 42 +++++---- include/linux/libata.h | 10 ++ 5 files changed, 164 insertions(+), 129 deletions(-)
Alan Cox:
libata: BMDMA handling updates
libata: Add ->set_mode hook for odd drivers
libata - ATA is both ATA and CFA
libata: Simplex and other mode filtering logic
libata: Fix interesting use of "extern" and also some bracketing
Albert Lee:
libata: ata_dev_init_params() fixes
Mark Lord:
sata_mv: three bug fixes
Tejun Heo:
libata: kill E.D.D.
libata: cosmetic changes in ata_bus_softreset()
libata: add FIXME above ata_dev_xfermask()
libata: kill trailing whitespace
Documentation/DocBook/libata.tmpl +43 -4
@@ -120,14 +120,27 @@ void (*dev_config) (struct ata_port *, s <programlisting> void (*set_piomode) (struct ata_port *, struct ata_device *); void (*set_dmamode) (struct ata_port *, struct ata_device *); -void (*post_set_mode) (struct ata_port *ap); +void (*post_set_mode) (struct ata_port *); +unsigned int (*mode_filter) (struct ata_port *, struct ata_device *, unsigned int); </programlisting> <para> Hooks called prior to the issue of SET FEATURES - XFER MODE - command. dev->pio_mode is guaranteed to be valid when - ->set_piomode() is called, and dev->dma_mode is guaranteed to be - valid when ->set_dmamode() is called. ->post_set_mode() is + command. The optional ->mode_filter() hook is called when libata + has built a mask of the possible modes. This is passed to the + ->mode_filter() function which should return a mask of valid modes + after filtering those unsuitable due to hardware limits. It is not + valid to use this interface to add modes. + </para> + <para> + dev->pio_mode and dev->dma_mode are guaranteed to be valid when + ->set_piomode() and when ->set_dmamode() is called. The timings for + any other drive sharing the cable will also be valid at this point. + That is the library records the decisions for the modes of each + drive on a channel before it attempts to set any of them. + </para> + <para> + ->post_set_mode() is called unconditionally, after the SET FEATURES - XFER MODE command completes successfully. </para>
@@ -230,6 +243,32 @@ void (*dev_select)(struct ata_port *ap, </sect2> + <sect2><title>Private tuning method</title> + <programlisting> +void (*set_mode) (struct ata_port *ap); + </programlisting> + + <para> + By default libata performs drive and controller tuning in + accordance with the ATA timing rules and also applies blacklists + and cable limits. Some controllers need special handling and have + custom tuning rules, typically raid controllers that use ATA + commands but do not actually do drive timing. + </para> + + <warning> + <para> + This hook should not be used to replace the standard controller + tuning logic when a controller has quirks. Replacing the default + tuning logic in that case would bypass handling for drive and + bridge quirks that may be important to data reliability. If a + controller needs to filter the mode selection it should use the + mode_filter hook instead. + </para> + </warning> + + </sect2> + <sect2><title>Reset ATA bus</title> <programlisting> void (*phy_reset) (struct ata_port *ap);
drivers/scsi/libata-bmdma.c +22 -4
@@ -703,6 +703,7 @@ ata_pci_init_native_mode(struct pci_devstruct ata_probe_ent *probe_ent =ata_probe_ent_alloc (pci_dev_to_dev (pdev), port[0 ]);int p =0 ; +unsigned long bmdma;if (!probe_ent)return NULL ;
@@ -716,7 +717,12 @@ ata_pci_init_native_mode(struct pci_dev probe_ent->port[p].altstatus_addr = probe_ent->port[p].ctl_addr =pci_resource_start (pdev,1 ) |ATA_PCI_CTL_OFS ; - probe_ent->port[p].bmdma_addr =pci_resource_start (pdev,4 ); + bmdma =pci_resource_start (pdev,4 ); +if (bmdma) { +if (inb (bmdma +2 ) &0x80 ) + probe_ent->host_set_flags |=ATA_HOST_SIMPLEX ; + probe_ent->port[p].bmdma_addr = bmdma; + }ata_std_ports (&probe_ent->port[p]); p++; }
@@ -726,7 +732,13 @@ ata_pci_init_native_mode(struct pci_dev probe_ent->port[p].altstatus_addr = probe_ent->port[p].ctl_addr =pci_resource_start (pdev,3 ) |ATA_PCI_CTL_OFS ; - probe_ent->port[p].bmdma_addr =pci_resource_start (pdev,4 ) +8 ; + bmdma =pci_resource_start (pdev,4 ); +if (bmdma) { + bmdma +=8 ; +if (inb (bmdma +2 ) &0x80 ) + probe_ent->host_set_flags |=ATA_HOST_SIMPLEX ; + probe_ent->port[p].bmdma_addr = bmdma; + }ata_std_ports (&probe_ent->port[p]); p++; }
@@ -740,6 +752,7 @@ static struct ata_probe_ent *ata_pci_ini struct ata_port_info *port, int port_num) {struct ata_probe_ent *probe_ent; +unsigned long bmdma; probe_ent =ata_probe_ent_alloc (pci_dev_to_dev (pdev), port);if (!probe_ent)
@@ -766,8 +779,13 @@ static struct ata_probe_ent *ata_pci_inibreak ; } - probe_ent->port[0 ].bmdma_addr = -pci_resource_start (pdev,4 ) +8 * port_num; + bmdma =pci_resource_start (pdev,4 ); +if (bmdma !=0 ) { + bmdma +=8 * port_num; + probe_ent->port[0 ].bmdma_addr = bmdma; +if (inb (bmdma +2 ) &0x80 ) + probe_ent->host_set_flags |=ATA_HOST_SIMPLEX ; + }ata_std_ports (&probe_ent->port[0 ]);return probe_ent;
drivers/scsi/libata-core.c +66 -102
323 lines not on this page · raw message
drivers/scsi/sata_mv.c +24 -18
75 lines not on this page · raw message
include/linux/libata.h +9 -1
@@ -160,8 +160,10 @@ enum {ATA_QCFLAG_DMAMAP =ATA_QCFLAG_SG |ATA_QCFLAG_SINGLE ,ATA_QCFLAG_EH_SCHEDULED = (1 <<5 ),/* EH scheduled */ +/* host set flags */ +ATA_HOST_SIMPLEX = (1 <<0 ),/* Host is simplex, one DMA channel per host_set only */ +/* various lengths of time */ -ATA_TMOUT_EDD =5 *HZ ,/* heuristic */ ATA_TMOUT_PIO =30 *HZ ,ATA_TMOUT_BOOT =30 *HZ ,/* heuristic */ ATA_TMOUT_BOOT_QUICK = 7 * HZ, /* heuristic */
@@ -279,6 +281,7 @@ struct ata_probe_ent {unsigned long irq;unsigned int irq_flags;unsigned long host_flags; +unsigned long host_set_flags;void __iomem *mmio_base;void *private_data; };
@@ -291,6 +294,9 @@ struct ata_host_set {unsigned int n_ports;void *private_data;const struct ata_port_operations *ops; +unsigned long flags; +int simplex_claimed;/* Keep seperate in case we +ever need to do this locked */ struct ata_port * ports[0 ]; };
@@ -420,6 +426,7 @@ struct ata_port_operations {void (*set_piomode) (struct ata_port *,struct ata_device *);void (*set_dmamode) (struct ata_port *,struct ata_device *); +unsigned long (*mode_filter) (const struct ata_port *,struct ata_device *,unsigned long );void (*tf_load) (struct ata_port *ap,const struct ata_taskfile *tf);void (*tf_read) (struct ata_port *ap,struct ata_taskfile *tf);
@@ -430,6 +437,7 @@ struct ata_port_operations {void (*dev_select)(struct ata_port *ap,unsigned int device);void (*phy_reset) (struct ata_port *ap);/* obsolete */ +void (*set_mode) (struct ata_port *ap);int (*probe_reset) (struct ata_port *ap,unsigned int *classes);void (*post_set_mode) (struct ata_port *ap);