mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 

Pull libata changes from Tejun Heo:
 "Nothing too interesting.  PCI ID additions, some sata_rcar fixes and a
  fringe bug fix for DMADIR handling which shouldn't affect any device
  remotely modern."

* 'for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  sata_rcar: fix interrupt handling
  ahci: add an observed PCI ID for Marvell 88se9172 SATA controller
  sata_rcar: clear STOP bit in bmdma_start() method
  libata: make ata_exec_internal_sg honor DMADIR
  ata_piix: add PCI IDs for Intel BayTail
  libata: update "Maintained by:" tags
This commit is contained in:
Linus Torvalds 2013-06-03 17:55:09 +09:00
parent d683b96b07 52a2a1087b
commit 338e33acd8
15 changed files with 49 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ata/acard-ahci.c
View File

@ -2,7 +2,7 @@
/* /*
* acard-ahci.c - ACard AHCI SATA support * acard-ahci.c - ACard AHCI SATA support
* *
* Maintained by: Jeff Garzik <jgarzik@pobox.com> * Maintained by: Tejun Heo <tj@kernel.org>
* Please ALWAYS copy linux-ide@vger.kernel.org * Please ALWAYS copy linux-ide@vger.kernel.org
* on emails. * on emails.
* *

4
drivers/ata/ahci.c
View File

@ -1,7 +1,7 @@
/* /*
* ahci.c - AHCI SATA support * ahci.c - AHCI SATA support
* *
* Maintained by: Jeff Garzik <jgarzik@pobox.com> * Maintained by: Tejun Heo <tj@kernel.org>
* Please ALWAYS copy linux-ide@vger.kernel.org * Please ALWAYS copy linux-ide@vger.kernel.org
* on emails. * on emails.
* *
@ -423,6 +423,8 @@ static const struct pci_device_id ahci_pci_tbl[] = {
.driver_data = board_ahci_yes_fbs }, /* 88se9125 */ .driver_data = board_ahci_yes_fbs }, /* 88se9125 */
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x917a), { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x917a),
.driver_data = board_ahci_yes_fbs }, /* 88se9172 */ .driver_data = board_ahci_yes_fbs }, /* 88se9172 */
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9172),
.driver_data = board_ahci_yes_fbs }, /* 88se9172 */
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9192), { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9192),
.driver_data = board_ahci_yes_fbs }, /* 88se9172 on some Gigabyte */ .driver_data = board_ahci_yes_fbs }, /* 88se9172 on some Gigabyte */
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a3), { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a3),

2
drivers/ata/ahci.h
View File

@ -1,7 +1,7 @@
/* /*
* ahci.h - Common AHCI SATA definitions and declarations * ahci.h - Common AHCI SATA definitions and declarations
* *
* Maintained by: Jeff Garzik <jgarzik@pobox.com> * Maintained by: Tejun Heo <tj@kernel.org>
* Please ALWAYS copy linux-ide@vger.kernel.org * Please ALWAYS copy linux-ide@vger.kernel.org
* on emails. * on emails.
* *

17
drivers/ata/ata_piix.c
View File

@ -1,7 +1,7 @@
/* /*
* ata_piix.c - Intel PATA/SATA controllers * ata_piix.c - Intel PATA/SATA controllers
* *
* Maintained by: Jeff Garzik <jgarzik@pobox.com> * Maintained by: Tejun Heo <tj@kernel.org>
* Please ALWAYS copy linux-ide@vger.kernel.org * Please ALWAYS copy linux-ide@vger.kernel.org
* on emails. * on emails.
* *
@ -151,6 +151,7 @@ enum piix_controller_ids {
piix_pata_vmw, /* PIIX4 for VMware, spurious DMA_ERR */ piix_pata_vmw, /* PIIX4 for VMware, spurious DMA_ERR */
ich8_sata_snb, ich8_sata_snb,
ich8_2port_sata_snb, ich8_2port_sata_snb,
ich8_2port_sata_byt,
}; };
struct piix_map_db { struct piix_map_db {
@ -334,6 +335,9 @@ static const struct pci_device_id piix_pci_tbl[] = {
{ 0x8086, 0x8d60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, { 0x8086, 0x8d60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
/* SATA Controller IDE (Wellsburg) */ /* SATA Controller IDE (Wellsburg) */
{ 0x8086, 0x8d68, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, { 0x8086, 0x8d68, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (BayTrail) */
{ 0x8086, 0x0F20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_byt },
{ 0x8086, 0x0F21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_byt },
{ } /* terminate list */ { } /* terminate list */
}; };
@ -441,6 +445,7 @@ static const struct piix_map_db *piix_map_db_table[] = {
[tolapai_sata] = &tolapai_map_db, [tolapai_sata] = &tolapai_map_db,
[ich8_sata_snb] = &ich8_map_db, [ich8_sata_snb] = &ich8_map_db,
[ich8_2port_sata_snb] = &ich8_2port_map_db, [ich8_2port_sata_snb] = &ich8_2port_map_db,
[ich8_2port_sata_byt] = &ich8_2port_map_db,
}; };
static struct pci_bits piix_enable_bits[] = { static struct pci_bits piix_enable_bits[] = {
@ -1254,6 +1259,16 @@ static struct ata_port_info piix_port_info[] = {
.udma_mask = ATA_UDMA6, .udma_mask = ATA_UDMA6,
.port_ops = &piix_sata_ops, .port_ops = &piix_sata_ops,
}, },
[ich8_2port_sata_byt] =
{
.flags = PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR | PIIX_FLAG_PIO16,
.pio_mask = ATA_PIO4,
.mwdma_mask = ATA_MWDMA2,
.udma_mask = ATA_UDMA6,
.port_ops = &piix_sata_ops,
},
}; };
#define AHCI_PCI_BAR 5 #define AHCI_PCI_BAR 5

2
drivers/ata/libahci.c
View File

@ -1,7 +1,7 @@
/* /*
* libahci.c - Common AHCI SATA low-level routines * libahci.c - Common AHCI SATA low-level routines
* *
* Maintained by: Jeff Garzik <jgarzik@pobox.com> * Maintained by: Tejun Heo <tj@kernel.org>
* Please ALWAYS copy linux-ide@vger.kernel.org * Please ALWAYS copy linux-ide@vger.kernel.org
* on emails. * on emails.
* *

8
drivers/ata/libata-core.c
View File

@ -1,7 +1,7 @@
/* /*
* libata-core.c - helper library for ATA * libata-core.c - helper library for ATA
* *
* Maintained by: Jeff Garzik <jgarzik@pobox.com> * Maintained by: Tejun Heo <tj@kernel.org>
* Please ALWAYS copy linux-ide@vger.kernel.org * Please ALWAYS copy linux-ide@vger.kernel.org
* on emails. * on emails.
* *
@ -1602,6 +1602,12 @@ unsigned ata_exec_internal_sg(struct ata_device *dev,
qc->tf = *tf; qc->tf = *tf;
if (cdb) if (cdb)
memcpy(qc->cdb, cdb, ATAPI_CDB_LEN); memcpy(qc->cdb, cdb, ATAPI_CDB_LEN);
/* some SATA bridges need us to indicate data xfer direction */
if (tf->protocol == ATAPI_PROT_DMA && (dev->flags & ATA_DFLAG_DMADIR) &&
dma_dir == DMA_FROM_DEVICE)
qc->tf.feature |= ATAPI_DMADIR;
qc->flags |= ATA_QCFLAG_RESULT_TF; qc->flags |= ATA_QCFLAG_RESULT_TF;
qc->dma_dir = dma_dir; qc->dma_dir = dma_dir;
if (dma_dir != DMA_NONE) { if (dma_dir != DMA_NONE) {

2
drivers/ata/libata-eh.c
View File

@ -1,7 +1,7 @@
/* /*
* libata-eh.c - libata error handling * libata-eh.c - libata error handling
* *
* Maintained by: Jeff Garzik <jgarzik@pobox.com> * Maintained by: Tejun Heo <tj@kernel.org>
* Please ALWAYS copy linux-ide@vger.kernel.org * Please ALWAYS copy linux-ide@vger.kernel.org
* on emails. * on emails.
* *

2
drivers/ata/libata-scsi.c
View File

@ -1,7 +1,7 @@
/* /*
* libata-scsi.c - helper library for ATA * libata-scsi.c - helper library for ATA
* *
* Maintained by: Jeff Garzik <jgarzik@pobox.com> * Maintained by: Tejun Heo <tj@kernel.org>
* Please ALWAYS copy linux-ide@vger.kernel.org * Please ALWAYS copy linux-ide@vger.kernel.org
* on emails. * on emails.
* *

2
drivers/ata/libata-sff.c
View File

@ -1,7 +1,7 @@
/* /*
* libata-sff.c - helper library for PCI IDE BMDMA * libata-sff.c - helper library for PCI IDE BMDMA
* *
* Maintained by: Jeff Garzik <jgarzik@pobox.com> * Maintained by: Tejun Heo <tj@kernel.org>
* Please ALWAYS copy linux-ide@vger.kernel.org * Please ALWAYS copy linux-ide@vger.kernel.org
* on emails. * on emails.
* *

2
drivers/ata/pdc_adma.c
View File

@ -1,7 +1,7 @@
/* /*
* pdc_adma.c - Pacific Digital Corporation ADMA * pdc_adma.c - Pacific Digital Corporation ADMA
* *
* Maintained by: Mark Lord <mlord@pobox.com> * Maintained by: Tejun Heo <tj@kernel.org>
* *
* Copyright 2005 Mark Lord * Copyright 2005 Mark Lord
* *

2
drivers/ata/sata_promise.c
View File

@ -1,7 +1,7 @@
/* /*
* sata_promise.c - Promise SATA * sata_promise.c - Promise SATA
* *
* Maintained by: Jeff Garzik <jgarzik@pobox.com> * Maintained by: Tejun Heo <tj@kernel.org>
* Mikael Pettersson <mikpe@it.uu.se> * Mikael Pettersson <mikpe@it.uu.se>
* Please ALWAYS copy linux-ide@vger.kernel.org * Please ALWAYS copy linux-ide@vger.kernel.org
* on emails. * on emails.

24
drivers/ata/sata_rcar.c
View File

@ -549,6 +549,7 @@ static void sata_rcar_bmdma_start(struct ata_queued_cmd *qc)
/* start host DMA transaction */ /* start host DMA transaction */
dmactl = ioread32(priv->base + ATAPI_CONTROL1_REG); dmactl = ioread32(priv->base + ATAPI_CONTROL1_REG);
dmactl &= ~ATAPI_CONTROL1_STOP;
dmactl |= ATAPI_CONTROL1_START; dmactl |= ATAPI_CONTROL1_START;
iowrite32(dmactl, priv->base + ATAPI_CONTROL1_REG); iowrite32(dmactl, priv->base + ATAPI_CONTROL1_REG);
} }
@ -618,17 +619,16 @@ static struct ata_port_operations sata_rcar_port_ops = {
.bmdma_status = sata_rcar_bmdma_status, .bmdma_status = sata_rcar_bmdma_status,
}; };
static int sata_rcar_serr_interrupt(struct ata_port *ap) static void sata_rcar_serr_interrupt(struct ata_port *ap)
{ {
struct sata_rcar_priv *priv = ap->host->private_data; struct sata_rcar_priv *priv = ap->host->private_data;
struct ata_eh_info *ehi = &ap->link.eh_info; struct ata_eh_info *ehi = &ap->link.eh_info;
int freeze = 0; int freeze = 0;
int handled = 0;
u32 serror; u32 serror;
serror = ioread32(priv->base + SCRSERR_REG); serror = ioread32(priv->base + SCRSERR_REG);
if (!serror) if (!serror)
return 0; return;
DPRINTK("SError @host_intr: 0x%x\n", serror); DPRINTK("SError @host_intr: 0x%x\n", serror);
@ -641,7 +641,6 @@ static int sata_rcar_serr_interrupt(struct ata_port *ap)
ata_ehi_push_desc(ehi, "%s", "hotplug"); ata_ehi_push_desc(ehi, "%s", "hotplug");
freeze = serror & SERR_COMM_WAKE ? 0 : 1; freeze = serror & SERR_COMM_WAKE ? 0 : 1;
handled = 1;
} }
/* freeze or abort */ /* freeze or abort */
@ -649,11 +648,9 @@ static int sata_rcar_serr_interrupt(struct ata_port *ap)
ata_port_freeze(ap); ata_port_freeze(ap);
else else
ata_port_abort(ap); ata_port_abort(ap);
return handled;
} }
static int sata_rcar_ata_interrupt(struct ata_port *ap) static void sata_rcar_ata_interrupt(struct ata_port *ap)
{ {
struct ata_queued_cmd *qc; struct ata_queued_cmd *qc;
int handled = 0; int handled = 0;
@ -662,7 +659,9 @@ static int sata_rcar_ata_interrupt(struct ata_port *ap)
if (qc) if (qc)
handled |= ata_bmdma_port_intr(ap, qc); handled |= ata_bmdma_port_intr(ap, qc);
return handled; /* be sure to clear ATA interrupt */
if (!handled)
sata_rcar_check_status(ap);
} }
static irqreturn_t sata_rcar_interrupt(int irq, void *dev_instance) static irqreturn_t sata_rcar_interrupt(int irq, void *dev_instance)
@ -677,20 +676,21 @@ static irqreturn_t sata_rcar_interrupt(int irq, void *dev_instance)
spin_lock_irqsave(&host->lock, flags); spin_lock_irqsave(&host->lock, flags);
sataintstat = ioread32(priv->base + SATAINTSTAT_REG); sataintstat = ioread32(priv->base + SATAINTSTAT_REG);
sataintstat &= SATA_RCAR_INT_MASK;
if (!sataintstat) if (!sataintstat)
goto done; goto done;
/* ack */ /* ack */
iowrite32(sataintstat & ~SATA_RCAR_INT_MASK, iowrite32(~sataintstat & 0x7ff, priv->base + SATAINTSTAT_REG);
priv->base + SATAINTSTAT_REG);
ap = host->ports[0]; ap = host->ports[0];
if (sataintstat & SATAINTSTAT_ATA) if (sataintstat & SATAINTSTAT_ATA)
handled |= sata_rcar_ata_interrupt(ap); sata_rcar_ata_interrupt(ap);
if (sataintstat & SATAINTSTAT_SERR) if (sataintstat & SATAINTSTAT_SERR)
handled |= sata_rcar_serr_interrupt(ap); sata_rcar_serr_interrupt(ap);
handled = 1;
done: done:
spin_unlock_irqrestore(&host->lock, flags); spin_unlock_irqrestore(&host->lock, flags);

2
drivers/ata/sata_sil.c
View File

@ -1,7 +1,7 @@
/* /*
* sata_sil.c - Silicon Image SATA * sata_sil.c - Silicon Image SATA
* *
* Maintained by: Jeff Garzik <jgarzik@pobox.com> * Maintained by: Tejun Heo <tj@kernel.org>
* Please ALWAYS copy linux-ide@vger.kernel.org * Please ALWAYS copy linux-ide@vger.kernel.org
* on emails. * on emails.
* *

2
drivers/ata/sata_sx4.c
View File

@ -1,7 +1,7 @@
/* /*
* sata_sx4.c - Promise SATA * sata_sx4.c - Promise SATA
* *
* Maintained by: Jeff Garzik <jgarzik@pobox.com> * Maintained by: Tejun Heo <tj@kernel.org>
* Please ALWAYS copy linux-ide@vger.kernel.org * Please ALWAYS copy linux-ide@vger.kernel.org
* on emails. * on emails.
* *

2
drivers/ata/sata_via.c
View File

@ -1,7 +1,7 @@
/* /*
* sata_via.c - VIA Serial ATA controllers * sata_via.c - VIA Serial ATA controllers
* *
* Maintained by: Jeff Garzik <jgarzik@pobox.com> * Maintained by: Tejun Heo <tj@kernel.org>
* Please ALWAYS copy linux-ide@vger.kernel.org * Please ALWAYS copy linux-ide@vger.kernel.org
* on emails. * on emails.
* *