libata updates
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:
drivers/scsi/ata_piix.c | 6 drivers/scsi/libata-bmdma.c | 238 ++++++++++++++++++++++ drivers/scsi/libata-core.c | 469 +++++++++++++++----------------------------- drivers/scsi/libata-scsi.c | 79 +++---- drivers/scsi/sata_nv.c | 181 +++++----------- drivers/scsi/sata_sil.c | 2 drivers/scsi/sata_sil24.c | 25 +- drivers/scsi/sata_uli.c | 37 ++- drivers/scsi/sata_vsc.c | 4 drivers/scsi/scsi_sysfs.c | 2 include/linux/libata.h | 12 - include/scsi/scsi_host.h | 2 12 files changed, 551 insertions(+), 506 deletions(-)
Alan Cox:
libata: add ata_dev_pair helper
Brian King:
libata: ata_scsi_queuecmd cleanup
libata: ata_scsi_ioctl cleanup
libata: Remove dependence on host_set->dev for SAS
Jeff Garzik:
[libata sata_sil24] cleanups: use pci_iomap(), kzalloc() [libata sata_nv] cleanups: convert #defines to enums; remove in-file history [libata sata_nv] eliminate duplicate codepaths with iomap [libata sata_uli] kill scr_addr abuse
[libata] Move some bmdma-specific code to libata-bmdma.c [libata] export ata_dev_pair; trim trailing whitespace
Nigel Cunningham:
Make libata not powerdown drivers on PM_EVENT_FREEZE.
Tejun Heo:
libata: implement ata_unpack_xfermask()
libata: add per-dev pio/mwdma/udma_mask
libata: make per-dev transfer mode limits per-dev
libata: check if port is disabled after internal command
libata: implement ata_dev_disable()
libata: use ata_dev_disable() in ata_bus_probe()
libata: make ata_set_mode() responsible for failure handling
drivers/scsi/ata_piix.c +3 -3
@@ -742,7 +742,7 @@ static int piix_disable_ahci(struct pci_/** * piix_check_450nx_errata - Check for problem 450NX setup * @ata_dev: the PCI device to check -* +* * Check for the present of 450NX errata #19 and errata #25. If * they are found return an error code so we can turn off DMA */
@@ -753,7 +753,7 @@ static int __devinit piix_check_450nx_eru16 cfg;u8 rev;int no_piix_dma =0 ; - +while ((pdev =pci_get_device (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82454NX , pdev)) !=NULL ) {/* Look for 450NX PXB. Check for problem configurations
@@ -772,7 +772,7 @@ static int __devinit piix_check_450nx_erif (no_piix_dma ==2 )dev_printk (KERN_WARNING , &ata_dev->dev,"A BIOS update may resolve this.\n" );return no_piix_dma; -} +}static void __devinit piix_init_sata_map (struct pci_dev *pdev,struct ata_port_info *pinfo)
drivers/scsi/libata-bmdma.c +236 -2
256 lines not on this page · raw message
drivers/scsi/libata-core.c +162 -307
748 lines not on this page · raw message
drivers/scsi/libata-scsi.c +35 -44
176 lines not on this page · raw message
drivers/scsi/sata_nv.c +62 -119
246 lines not on this page · raw message
drivers/scsi/sata_sil.c +1 -1
@@ -371,7 +371,7 @@ static void sil_dev_config(struct ata_poif (quirks &SIL_QUIRK_UDMA5MAX ) {printk (KERN_INFO "ata%u(%u): applying Maxtor errata fix %s\n" , ap->id, dev->devno, model_num); - ap->udma_mask &=ATA_UDMA5 ; + dev->udma_mask &=ATA_UDMA5 ;return ; } }
drivers/scsi/sata_sil24.c +11 -14
@@ -342,7 +342,7 @@ static struct ata_port_info sil24_port_i .udma_mask = 0x3f, /* udma0-5 */ .port_ops = &sil24_ops, }, -/* sil_3132 */ +/* sil_3132 */ { .sht = &sil24_sht, .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
@@ -842,9 +842,10 @@ static void sil24_port_stop(struct ata_pstatic void sil24_host_stop (struct ata_host_set *host_set) {struct sil24_host_priv *hpriv = host_set->private_data; +struct pci_dev *pdev =to_pci_dev (host_set->dev); -iounmap (hpriv->host_base); -iounmap (hpriv->port_base); +pci_iounmap (pdev, hpriv->host_base); +pci_iounmap (pdev, hpriv->port_base);kfree (hpriv); }
@@ -871,26 +872,23 @@ static int sil24_init_one(struct pci_dev goto out_disable; rc = -ENOMEM ; -/* ioremap mmio registers */ - host_base =ioremap (pci_resource_start (pdev,0 ), -pci_resource_len (pdev,0 )); +/* map mmio registers */ + host_base =pci_iomap (pdev,0 ,0 );if (!host_base) goto out_free; - port_base =ioremap (pci_resource_start (pdev,2 ), -pci_resource_len (pdev,2 )); + port_base =pci_iomap (pdev,2 ,0 );if (!port_base) goto out_free;/* allocate & init probe_ent and hpriv */ - probe_ent =kmalloc (sizeof (*probe_ent),GFP_KERNEL ); + probe_ent =kzalloc (sizeof (*probe_ent),GFP_KERNEL );if (!probe_ent) goto out_free; - hpriv =kmalloc (sizeof (*hpriv),GFP_KERNEL ); + hpriv =kzalloc (sizeof (*hpriv),GFP_KERNEL );if (!hpriv) goto out_free; -memset (probe_ent,0 ,sizeof (*probe_ent)); probe_ent->dev =pci_dev_to_dev (pdev);INIT_LIST_HEAD (&probe_ent->node);
@@ -907,7 +905,6 @@ static int sil24_init_one(struct pci_dev probe_ent->mmio_base = port_base; probe_ent->private_data = hpriv; -memset (hpriv,0 ,sizeof (*hpriv)); hpriv->host_base = host_base; hpriv->port_base = port_base;
@@ -1011,9 +1008,9 @@ static int sil24_init_one(struct pci_dev out_free:if (host_base) -iounmap (host_base); +pci_iounmap (pdev, host_base);if (port_base) -iounmap (port_base); +pci_iounmap (pdev, port_base);kfree (probe_ent);kfree (hpriv);pci_release_regions (pdev);
drivers/scsi/sata_uli.c +27 -10
@@ -44,6 +44,8 @@ enum { uli_5287 =1 , uli_5281 =2 , + uli_max_ports =4 , +/* PCI configuration registers */ ULI5287_BASE =0x90 ,/* sata0 phy SCR registers */ ULI5287_OFFS = 0x10, /* offset from sata0->sata1 phy regs */
@@ -51,6 +53,10 @@ enum { ULI5281_OFFS = 0x60, /* offset from sata0->sata1 phy regs */ }; +struct uli_priv { +unsigned int scr_cfg_addr[uli_max_ports]; +}; +static int uli_init_one (struct pci_dev *pdev,const struct pci_device_id *ent);static u32 uli_scr_read (struct ata_port *ap,unsigned int sc_reg);static void uli_scr_write (struct ata_port *ap,unsigned int sc_reg,u32 val);
@@ -137,7 +143,8 @@ MODULE_VERSION(DRV_VERSION);static unsigned int get_scr_cfg_addr (struct ata_port *ap,unsigned int sc_reg) { -return ap->ioaddr.scr_addr + (4 * sc_reg); +struct uli_priv *hpriv = ap->host_set->private_data; +return hpriv->scr_cfg_addr[ap->port_no] + (4 * sc_reg); }static u32 uli_scr_cfg_read (struct ata_port *ap,unsigned int sc_reg)
@@ -182,6 +189,7 @@ static int uli_init_one (struct pci_devint rc;unsigned int board_idx = (unsigned int ) ent->driver_data;int pci_dev_busy =0 ; +struct uli_priv *hpriv;if (!printed_version++)dev_printk (KERN_INFO , &pdev->dev,"version " DRV_VERSION "\n" );
@@ -210,10 +218,18 @@ static int uli_init_one (struct pci_dev goto err_out_regions; } + hpriv =kzalloc (sizeof (*hpriv),GFP_KERNEL ); +if (!hpriv) { + rc = -ENOMEM ; + goto err_out_probe_ent; + } + + probe_ent->private_data = hpriv; +switch (board_idx) {case uli_5287: - probe_ent->port[0 ].scr_addr =ULI5287_BASE ; - probe_ent->port[1 ].scr_addr =ULI5287_BASE +ULI5287_OFFS ; + hpriv->scr_cfg_addr[0 ] =ULI5287_BASE ; + hpriv->scr_cfg_addr[1 ] =ULI5287_BASE +ULI5287_OFFS ; probe_ent->n_ports =4 ; probe_ent->port[2 ].cmd_addr =pci_resource_start (pdev,0 ) +8 ;
@@ -221,27 +237,27 @@ static int uli_init_one (struct pci_dev probe_ent->port[2 ].ctl_addr = (pci_resource_start (pdev,1 ) |ATA_PCI_CTL_OFS ) +4 ; probe_ent->port[2 ].bmdma_addr =pci_resource_start (pdev,4 ) +16 ; - probe_ent->port[2 ].scr_addr =ULI5287_BASE +ULI5287_OFFS *4 ; + hpriv->scr_cfg_addr[2 ] =ULI5287_BASE +ULI5287_OFFS *4 ; probe_ent->port[3 ].cmd_addr =pci_resource_start (pdev,2 ) +8 ; probe_ent->port[3 ].altstatus_addr = probe_ent->port[3 ].ctl_addr = (pci_resource_start (pdev,3 ) |ATA_PCI_CTL_OFS ) +4 ; probe_ent->port[3 ].bmdma_addr =pci_resource_start (pdev,4 ) +24 ; - probe_ent->port[3 ].scr_addr =ULI5287_BASE +ULI5287_OFFS *5 ; + hpriv->scr_cfg_addr[3 ] =ULI5287_BASE +ULI5287_OFFS *5 ;ata_std_ports (&probe_ent->port[2 ]);ata_std_ports (&probe_ent->port[3 ]);break ;case uli_5289: - probe_ent->port[0 ].scr_addr =ULI5287_BASE ; - probe_ent->port[1 ].scr_addr =ULI5287_BASE +ULI5287_OFFS ; + hpriv->scr_cfg_addr[0 ] =ULI5287_BASE ; + hpriv->scr_cfg_addr[1 ] =ULI5287_BASE +ULI5287_OFFS ;break ;case uli_5281: - probe_ent->port[0 ].scr_addr =ULI5281_BASE ; - probe_ent->port[1 ].scr_addr =ULI5281_BASE +ULI5281_OFFS ; + hpriv->scr_cfg_addr[0 ] =ULI5281_BASE ; + hpriv->scr_cfg_addr[1 ] =ULI5281_BASE +ULI5281_OFFS ;break ;default :
@@ -258,9 +274,10 @@ static int uli_init_one (struct pci_devreturn 0 ; +err_out_probe_ent: +kfree (probe_ent); err_out_regions:pci_release_regions (pdev); - err_out:if (!pci_dev_busy)pci_disable_device (pdev);
drivers/scsi/sata_vsc.c +2 -2
@@ -230,11 +230,11 @@ static irqreturn_t vsc_sata_interrupt (i handled +=ata_host_intr (ap, qc); }else if (is_vsc_sata_int_err (i, int_status)) {/* -* On some chips (i.e. Intel 31244), an error +* On some chips (i.e. Intel 31244), an error * interrupt will sneak in at initialization * time (phy state changes). Clearing the SCR * error register is not required, but it prevents -* the phy state change interrupts from recurring +* the phy state change interrupts from recurring * later. */ u32 err_status;
drivers/scsi/scsi_sysfs.c +1 -1
@@ -286,7 +286,7 @@ static int scsi_bus_suspend(struct devicreturn err;if (sht->suspend) - err = sht->suspend (sdev); + err = sht->suspend (sdev, state);return err; }
include/linux/libata.h +10 -2
@@ -358,6 +358,11 @@ struct ata_device {unsigned int max_sectors;/* per-device max sectors */ unsigned int cdb_len; +/* per-dev xfer mask */ +unsigned int pio_mask; +unsigned int mwdma_mask; +unsigned int udma_mask; +/* for CHS addressing */ u16 cylinders;/* Number of cylinders */ u16 heads;/* Number of heads */
@@ -395,6 +400,7 @@ struct ata_port {struct ata_host_stats stats;struct ata_host_set *host_set; +struct device *dev;struct work_struct port_task;
@@ -515,9 +521,9 @@ extern void ata_eh_qc_retry(struct ata_qextern int ata_scsi_release (struct Scsi_Host *host);extern unsigned int ata_host_intr (struct ata_port *ap,struct ata_queued_cmd *qc);extern int ata_scsi_device_resume (struct scsi_device *); -extern int ata_scsi_device_suspend (struct scsi_device *); +extern int ata_scsi_device_suspend (struct scsi_device *,pm_message_t state);extern int ata_device_resume (struct ata_port *,struct ata_device *); -extern int ata_device_suspend (struct ata_port *,struct ata_device *); +extern int ata_device_suspend (struct ata_port *,struct ata_device *,pm_message_t state);extern int ata_ratelimit (void ); extern unsigned int ata_busy_sleep(struct ata_port *ap, unsigned long timeout_pat,
@@ -568,6 +574,8 @@ extern int ata_std_bios_param(struct scsstruct block_device *bdev, sector_t capacity, int geom[]);extern int ata_scsi_slave_config (struct scsi_device *sdev); +extern struct ata_device *ata_dev_pair (struct ata_port *ap, +struct ata_device *adev);/* * Timing helpers
include/scsi/scsi_host.h +1 -1
@@ -286,7 +286,7 @@ struct scsi_host_template {* suspend support */ int (*resume)(struct scsi_device *); -int (*suspend)(struct scsi_device *); +int (*suspend)(struct scsi_device *,pm_message_t state);/* * Name of proc directory