mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
sata_mv cosmetics
More cosmetic cleanups to unclutter the changes needed for PMP support. Signed-off-by: Mark Lord <mlord@pobox.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
parent
0d8be5cbff
commit
17c5aab5b3
1 changed files with 19 additions and 13 deletions
|
@ -224,14 +224,20 @@ enum {
|
|||
SATA_STATUS_OFS = 0x300, /* ctrl, err regs follow status */
|
||||
SATA_ACTIVE_OFS = 0x350,
|
||||
SATA_FIS_IRQ_CAUSE_OFS = 0x364,
|
||||
|
||||
LTMODE_OFS = 0x30c,
|
||||
LTMODE_BIT8 = (1 << 8), /* unknown, but necessary */
|
||||
|
||||
PHY_MODE3 = 0x310,
|
||||
PHY_MODE4 = 0x314,
|
||||
PHY_MODE2 = 0x330,
|
||||
SATA_IFCTL_OFS = 0x344,
|
||||
SATA_IFSTAT_OFS = 0x34c,
|
||||
VENDOR_UNIQUE_FIS_OFS = 0x35c,
|
||||
|
||||
FIS_CFG_OFS = 0x360,
|
||||
FIS_CFG_SINGLE_SYNC = (1 << 16), /* SYNC on DMA activation */
|
||||
|
||||
MV5_PHY_MODE = 0x74,
|
||||
MV5_LT_MODE = 0x30,
|
||||
MV5_PHY_CTL = 0x0C,
|
||||
|
@ -616,10 +622,10 @@ static const struct ata_port_info mv_port_info[] = {
|
|||
.port_ops = &mv_iie_ops,
|
||||
},
|
||||
{ /* chip_soc */
|
||||
.flags = MV_COMMON_FLAGS | MV_FLAG_SOC,
|
||||
.pio_mask = 0x1f, /* pio0-4 */
|
||||
.udma_mask = ATA_UDMA6,
|
||||
.port_ops = &mv_iie_ops,
|
||||
.flags = MV_COMMON_FLAGS | MV_FLAG_SOC,
|
||||
.pio_mask = 0x1f, /* pio0-4 */
|
||||
.udma_mask = ATA_UDMA6,
|
||||
.port_ops = &mv_iie_ops,
|
||||
},
|
||||
};
|
||||
|
||||
|
@ -1377,7 +1383,8 @@ static unsigned int mv_qc_issue(struct ata_queued_cmd *qc)
|
|||
|
||||
if ((qc->tf.protocol != ATA_PROT_DMA) &&
|
||||
(qc->tf.protocol != ATA_PROT_NCQ)) {
|
||||
/* We're about to send a non-EDMA capable command to the
|
||||
/*
|
||||
* We're about to send a non-EDMA capable command to the
|
||||
* port. Turn off EDMA so there won't be problems accessing
|
||||
* shadow block, etc registers.
|
||||
*/
|
||||
|
@ -2293,14 +2300,13 @@ static int mv_hardreset(struct ata_link *link, unsigned int *class,
|
|||
|
||||
/* Workaround for errata FEr SATA#10 (part 2) */
|
||||
do {
|
||||
const unsigned long *timing = sata_ehc_deb_timing(&link->eh_context);
|
||||
const unsigned long *timing =
|
||||
sata_ehc_deb_timing(&link->eh_context);
|
||||
|
||||
rc = sata_link_hardreset(link, timing, deadline + extra, &online, NULL);
|
||||
if (rc) {
|
||||
ata_link_printk(link, KERN_ERR,
|
||||
"COMRESET failed (errno=%d)\n", rc);
|
||||
rc = sata_link_hardreset(link, timing, deadline + extra,
|
||||
&online, NULL);
|
||||
if (rc)
|
||||
return rc;
|
||||
}
|
||||
sata_scr_read(link, SCR_STATUS, &sstatus);
|
||||
if (!IS_GEN_I(hpriv) && ++attempts >= 5 && sstatus == 0x121) {
|
||||
/* Force 1.5gb/s link speed and try again */
|
||||
|
@ -2310,7 +2316,7 @@ static int mv_hardreset(struct ata_link *link, unsigned int *class,
|
|||
}
|
||||
} while (sstatus != 0x0 && sstatus != 0x113 && sstatus != 0x123);
|
||||
|
||||
return online ? -EAGAIN : rc;
|
||||
return rc;
|
||||
}
|
||||
|
||||
static void mv_eh_freeze(struct ata_port *ap)
|
||||
|
@ -2975,7 +2981,7 @@ MODULE_DESCRIPTION("SCSI low-level driver for Marvell SATA controllers");
|
|||
MODULE_LICENSE("GPL");
|
||||
MODULE_DEVICE_TABLE(pci, mv_pci_tbl);
|
||||
MODULE_VERSION(DRV_VERSION);
|
||||
MODULE_ALIAS("platform:sata_mv");
|
||||
MODULE_ALIAS("platform:" DRV_NAME);
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
module_param(msi, int, 0444);
|
||||
|
|
Loading…
Reference in a new issue