Merge branch 'master'

diff --combined drivers/scsi/sata_sil.c
index e14ed4ebbeed8632fe6be6ca4157a280d930797e,9face3c6aa2144fccaaea7ef8d5754076201c0a0..91ecf527bb8a3291dbbc00f14d6cfb2bbb707447
--- 1/drivers/scsi/sata_sil.c
--- 2/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@@ -49,11 -49,13 +49,13 @@@
  #define DRV_VERSION   "0.9"
  
  enum {
+       SIL_FLAG_RERR_ON_DMA_ACT = (1 << 29),
        SIL_FLAG_MOD15WRITE     = (1 << 30),
  
        sil_3112                = 0,
        sil_3112_m15w           = 1,
-       sil_3114                = 2,
+       sil_3512                = 2,
+       sil_3114                = 3,
  
        SIL_FIFO_R0             = 0x40,
        SIL_FIFO_W0             = 0x41,
@@@ -90,7 -92,7 +92,7 @@@ static void sil_post_set_mode (struct a
  static const struct pci_device_id sil_pci_tbl[] = {
        { 0x1095, 0x3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
        { 0x1095, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
-       { 0x1095, 0x3512, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },
+       { 0x1095, 0x3512, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3512 },
        { 0x1095, 0x3114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3114 },
        { 0x1002, 0x436e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
        { 0x1002, 0x4379, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
@@@ -135,11 -137,11 +137,11 @@@ static struct scsi_host_template sil_sh
        .name                   = DRV_NAME,
        .ioctl                  = ata_scsi_ioctl,
        .queuecommand           = ata_scsi_queuecmd,
 +      .eh_timed_out           = ata_scsi_timed_out,
        .eh_strategy_handler    = ata_scsi_error,
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = LIBATA_MAX_PRD,
 -      .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = ATA_SHT_USE_CLUSTERING,
@@@ -157,7 -159,7 +159,7 @@@ static const struct ata_port_operation
        .check_status           = ata_check_status,
        .exec_command           = ata_exec_command,
        .dev_select             = ata_std_dev_select,
 -      .phy_reset              = sata_phy_reset,
 +      .probe_reset            = ata_std_probe_reset,
        .post_set_mode          = sil_post_set_mode,
        .bmdma_setup            = ata_bmdma_setup,
        .bmdma_start            = ata_bmdma_start,
@@@ -180,25 -182,40 +182,39 @@@ static const struct ata_port_info sil_p
        {
                .sht            = &sil_sht,
                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
 -                                ATA_FLAG_SRST | ATA_FLAG_MMIO,
 +                                ATA_FLAG_MMIO,
                .pio_mask       = 0x1f,                 /* pio0-4 */
                .mwdma_mask     = 0x07,                 /* mwdma0-2 */
                .udma_mask      = 0x3f,                 /* udma0-5 */
                .port_ops       = &sil_ops,
-       }, /* sil_3112_15w - keep it sync'd w/ sil_3112 */
+       },
+       /* sil_3112_15w - keep it sync'd w/ sil_3112 */
        {
                .sht            = &sil_sht,
                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
 -                                ATA_FLAG_SRST | ATA_FLAG_MMIO |
 -                                SIL_FLAG_MOD15WRITE,
 +                                ATA_FLAG_MMIO | SIL_FLAG_MOD15WRITE,
                .pio_mask       = 0x1f,                 /* pio0-4 */
                .mwdma_mask     = 0x07,                 /* mwdma0-2 */
                .udma_mask      = 0x3f,                 /* udma0-5 */
                .port_ops       = &sil_ops,
-       }, /* sil_3114 */
+       },
+       /* sil_3512 */
        {
                .sht            = &sil_sht,
                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO,
+                                 ATA_FLAG_SRST | ATA_FLAG_MMIO |
+                                 SIL_FLAG_RERR_ON_DMA_ACT,
+               .pio_mask       = 0x1f,                 /* pio0-4 */
+               .mwdma_mask     = 0x07,                 /* mwdma0-2 */
+               .udma_mask      = 0x3f,                 /* udma0-5 */
+               .port_ops       = &sil_ops,
+       },
+       /* sil_3114 */
+       {
+               .sht            = &sil_sht,
+               .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
 -                                ATA_FLAG_SRST | ATA_FLAG_MMIO |
++                                ATA_FLAG_MMIO |
+                                 SIL_FLAG_RERR_ON_DMA_ACT,
                .pio_mask       = 0x1f,                 /* pio0-4 */
                .mwdma_mask     = 0x07,                 /* mwdma0-2 */
                .udma_mask      = 0x3f,                 /* udma0-5 */
@@@ -215,12 -232,13 +231,13 @@@ static const struct 
        unsigned long scr;      /* SATA control register block */
        unsigned long sien;     /* SATA Interrupt Enable register */
        unsigned long xfer_mode;/* data transfer mode register */
+       unsigned long sfis_cfg; /* SATA FIS reception config register */
  } sil_port[] = {
        /* port 0 ... */
-       { 0x80, 0x8A, 0x00, 0x100, 0x148, 0xb4 },
-       { 0xC0, 0xCA, 0x08, 0x180, 0x1c8, 0xf4 },
-       { 0x280, 0x28A, 0x200, 0x300, 0x348, 0x2b4 },
-       { 0x2C0, 0x2CA, 0x208, 0x380, 0x3c8, 0x2f4 },
+       { 0x80, 0x8A, 0x00, 0x100, 0x148, 0xb4, 0x14c },
+       { 0xC0, 0xCA, 0x08, 0x180, 0x1c8, 0xf4, 0x1cc },
+       { 0x280, 0x28A, 0x200, 0x300, 0x348, 0x2b4, 0x34c },
+       { 0x2C0, 0x2CA, 0x208, 0x380, 0x3c8, 0x2f4, 0x3cc },
        /* ... port 3 */
  };
  
@@@ -336,12 -354,22 +353,12 @@@ static void sil_scr_write (struct ata_p
  static void sil_dev_config(struct ata_port *ap, struct ata_device *dev)
  {
        unsigned int n, quirks = 0;
 -      unsigned char model_num[40];
 -      const char *s;
 -      unsigned int len;
 -
 -      ata_dev_id_string(dev->id, model_num, ATA_ID_PROD_OFS,
 -                        sizeof(model_num));
 -      s = &model_num[0];
 -      len = strnlen(s, sizeof(model_num));
 +      unsigned char model_num[41];
  
 -      /* ATAPI specifies that empty space is blank-filled; remove blanks */
 -      while ((len > 0) && (s[len - 1] == ' '))
 -              len--;
 +      ata_id_c_string(dev->id, model_num, ATA_ID_PROD_OFS, sizeof(model_num));
  
        for (n = 0; sil_blacklist[n].product; n++)
 -              if (!memcmp(sil_blacklist[n].product, s,
 -                          strlen(sil_blacklist[n].product))) {
 +              if (!strcmp(sil_blacklist[n].product, model_num)) {
                        quirks = sil_blacklist[n].quirk;
                        break;
                }
@@@ -352,14 -380,16 +369,14 @@@
             (quirks & SIL_QUIRK_MOD15WRITE))) {
                printk(KERN_INFO "ata%u(%u): applying Seagate errata fix (mod15write workaround)\n",
                       ap->id, dev->devno);
 -              ap->host->max_sectors = 15;
 -              ap->host->hostt->max_sectors = 15;
 -              dev->flags |= ATA_DFLAG_LOCK_SECTORS;
 +              dev->max_sectors = 15;
                return;
        }
  
        /* limit to udma5 */
        if (quirks & SIL_QUIRK_UDMA5MAX) {
                printk(KERN_INFO "ata%u(%u): applying Maxtor errata fix %s\n",
 -                     ap->id, dev->devno, s);
 +                     ap->id, dev->devno, model_num);
                ap->udma_mask &= ATA_UDMA5;
                return;
        }
@@@ -458,6 -488,23 +475,23 @@@ static int sil_init_one (struct pci_de
                dev_printk(KERN_WARNING, &pdev->dev,
                         "cache line size not set.  Driver may not function\n");
  
+       /* Apply R_ERR on DMA activate FIS errata workaround */
+       if (probe_ent->host_flags & SIL_FLAG_RERR_ON_DMA_ACT) {
+               int cnt;
+ 
+               for (i = 0, cnt = 0; i < probe_ent->n_ports; i++) {
+                       tmp = readl(mmio_base + sil_port[i].sfis_cfg);
+                       if ((tmp & 0x3) != 0x01)
+                               continue;
+                       if (!cnt)
+                               dev_printk(KERN_INFO, &pdev->dev,
+                                          "Applying R_ERR on DMA activate "
+                                          "FIS errata fix\n");
+                       writel(tmp & ~0x3, mmio_base + sil_port[i].sfis_cfg);
+                       cnt++;
+               }
+       }
+ 
        if (ent->driver_data == sil_3114) {
                irq_mask = SIL_MASK_4PORT;