UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

libata-link: linkify PHY-related functions 

Make the following PHY-related functions to deal with ata_link instead
of ata_port.

* sata_print_link_status()
* sata_down_spd_limit()
* ata_set_sata_spd_limit() and friends
* sata_link_debounce/resume()
* sata_scr_valid/read/write/write_flush()
* ata_link_on/offline()

This patch introduces no behavior change.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Tejun Heo 2007-08-06 18:36:23 +09:00 committed by Jeff Garzik
parent f58229f806
commit 936fd73286
11 changed files with 177 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ata/ahci.c
View File

@ -1052,7 +1052,7 @@ static int ahci_do_softreset(struct ata_port *ap, unsigned int *class,
DPRINTK("ENTER\n"); DPRINTK("ENTER\n");
if (ata_port_offline(ap)) { if (ata_link_offline(&ap->link)) {
DPRINTK("PHY reports no device\n"); DPRINTK("PHY reports no device\n");
*class = ATA_DEV_NONE; *class = ATA_DEV_NONE;
return 0; return 0;
@ -1140,7 +1140,7 @@ static int ahci_hardreset(struct ata_port *ap, unsigned int *class,
ahci_start_engine(ap); ahci_start_engine(ap);
if (rc == 0 && ata_port_online(ap)) if (rc == 0 && ata_link_online(&ap->link))
*class = ahci_dev_classify(ap); *class = ahci_dev_classify(ap);
if (*class == ATA_DEV_UNKNOWN) if (*class == ATA_DEV_UNKNOWN)
*class = ATA_DEV_NONE; *class = ATA_DEV_NONE;

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

@ -2201,7 +2201,7 @@ int ata_bus_probe(struct ata_port *ap)
/* This is the last chance, better to slow /* This is the last chance, better to slow
* down than lose it. * down than lose it.
*/ */
sata_down_spd_limit(ap); sata_down_spd_limit(&ap->link);
ata_down_xfermask_limit(dev, ATA_DNXFER_PIO); ata_down_xfermask_limit(dev, ATA_DNXFER_PIO);
} }
} }
@ -2230,28 +2230,28 @@ void ata_port_probe(struct ata_port *ap)
/** /**
* sata_print_link_status - Print SATA link status * sata_print_link_status - Print SATA link status
* @ap: SATA port to printk link status about * @link: SATA link to printk link status about
* *
* This function prints link speed and status of a SATA link. * This function prints link speed and status of a SATA link.
* *
* LOCKING: * LOCKING:
* None. * None.
*/ */
void sata_print_link_status(struct ata_port *ap) void sata_print_link_status(struct ata_link *link)
{ {
u32 sstatus, scontrol, tmp; u32 sstatus, scontrol, tmp;
if (sata_scr_read(ap, SCR_STATUS, &sstatus)) if (sata_scr_read(link, SCR_STATUS, &sstatus))
return; return;
sata_scr_read(ap, SCR_CONTROL, &scontrol); sata_scr_read(link, SCR_CONTROL, &scontrol);
if (ata_port_online(ap)) { if (ata_link_online(link)) {
tmp = (sstatus >> 4) & 0xf; tmp = (sstatus >> 4) & 0xf;
ata_port_printk(ap, KERN_INFO, ata_link_printk(link, KERN_INFO,
"SATA link up %s (SStatus %X SControl %X)\n", "SATA link up %s (SStatus %X SControl %X)\n",
sata_spd_string(tmp), sstatus, scontrol); sata_spd_string(tmp), sstatus, scontrol);
} else { } else {
ata_port_printk(ap, KERN_INFO, ata_link_printk(link, KERN_INFO,
"SATA link down (SStatus %X SControl %X)\n", "SATA link down (SStatus %X SControl %X)\n",
sstatus, scontrol); sstatus, scontrol);
} }
@ -2271,32 +2271,33 @@ void sata_print_link_status(struct ata_port *ap)
*/ */
void __sata_phy_reset(struct ata_port *ap) void __sata_phy_reset(struct ata_port *ap)
{ {
u32 sstatus; struct ata_link *link = &ap->link;
unsigned long timeout = jiffies + (HZ * 5); unsigned long timeout = jiffies + (HZ * 5);
u32 sstatus;
if (ap->flags & ATA_FLAG_SATA_RESET) { if (ap->flags & ATA_FLAG_SATA_RESET) {
/* issue phy wake/reset */ /* issue phy wake/reset */
sata_scr_write_flush(ap, SCR_CONTROL, 0x301); sata_scr_write_flush(link, SCR_CONTROL, 0x301);
/* Couldn't find anything in SATA I/II specs, but /* Couldn't find anything in SATA I/II specs, but
* AHCI-1.1 10.4.2 says at least 1 ms. */ * AHCI-1.1 10.4.2 says at least 1 ms. */
mdelay(1); mdelay(1);
} }
/* phy wake/clear reset */ /* phy wake/clear reset */
sata_scr_write_flush(ap, SCR_CONTROL, 0x300); sata_scr_write_flush(link, SCR_CONTROL, 0x300);
/* wait for phy to become ready, if necessary */ /* wait for phy to become ready, if necessary */
do { do {
msleep(200); msleep(200);
sata_scr_read(ap, SCR_STATUS, &sstatus); sata_scr_read(link, SCR_STATUS, &sstatus);
if ((sstatus & 0xf) != 1) if ((sstatus & 0xf) != 1)
break; break;
} while (time_before(jiffies, timeout)); } while (time_before(jiffies, timeout));
/* print link status */ /* print link status */
sata_print_link_status(ap); sata_print_link_status(link);
/* TODO: phy layer with polling, timeouts, etc. */ /* TODO: phy layer with polling, timeouts, etc. */
if (!ata_port_offline(ap)) if (!ata_link_offline(link))
ata_port_probe(ap); ata_port_probe(ap);
else else
ata_port_disable(ap); ata_port_disable(ap);
@ -2370,9 +2371,9 @@ void ata_port_disable(struct ata_port *ap)
/** /**
* sata_down_spd_limit - adjust SATA spd limit downward * sata_down_spd_limit - adjust SATA spd limit downward
* @ap: Port to adjust SATA spd limit for * @link: Link to adjust SATA spd limit for
* *
* Adjust SATA spd limit of @ap downward. Note that this * Adjust SATA spd limit of @link downward. Note that this
* function only adjusts the limit. The change must be applied * function only adjusts the limit. The change must be applied
* using sata_set_spd(). * using sata_set_spd().
* *
@ -2382,24 +2383,24 @@ void ata_port_disable(struct ata_port *ap)
* RETURNS: * RETURNS:
* 0 on success, negative errno on failure * 0 on success, negative errno on failure
*/ */
int sata_down_spd_limit(struct ata_port *ap) int sata_down_spd_limit(struct ata_link *link)
{ {
u32 sstatus, spd, mask; u32 sstatus, spd, mask;
int rc, highbit; int rc, highbit;
if (!sata_scr_valid(ap)) if (!sata_scr_valid(link))
return -EOPNOTSUPP; return -EOPNOTSUPP;
/* If SCR can be read, use it to determine the current SPD. /* If SCR can be read, use it to determine the current SPD.
* If not, use cached value in ap->sata_spd. * If not, use cached value in link->sata_spd.
*/ */
rc = sata_scr_read(ap, SCR_STATUS, &sstatus); rc = sata_scr_read(link, SCR_STATUS, &sstatus);
if (rc == 0) if (rc == 0)
spd = (sstatus >> 4) & 0xf; spd = (sstatus >> 4) & 0xf;
else else
spd = ap->link.sata_spd; spd = link->sata_spd;
mask = ap->link.sata_spd_limit; mask = link->sata_spd_limit;
if (mask <= 1) if (mask <= 1)
return -EINVAL; return -EINVAL;
@ -2419,22 +2420,22 @@ int sata_down_spd_limit(struct ata_port *ap)
if (!mask) if (!mask)
return -EINVAL; return -EINVAL;
ap->link.sata_spd_limit = mask; link->sata_spd_limit = mask;
ata_port_printk(ap, KERN_WARNING, "limiting SATA link speed to %s\n", ata_link_printk(link, KERN_WARNING, "limiting SATA link speed to %s\n",
sata_spd_string(fls(mask))); sata_spd_string(fls(mask)));
return 0; return 0;
} }
static int __sata_set_spd_needed(struct ata_port *ap, u32 *scontrol) static int __sata_set_spd_needed(struct ata_link *link, u32 *scontrol)
{ {
u32 spd, limit; u32 spd, limit;
if (ap->link.sata_spd_limit == UINT_MAX) if (link->sata_spd_limit == UINT_MAX)
limit = 0; limit = 0;
else else
limit = fls(ap->link.sata_spd_limit); limit = fls(link->sata_spd_limit);
spd = (*scontrol >> 4) & 0xf; spd = (*scontrol >> 4) & 0xf;
*scontrol = (*scontrol & ~0xf0) | ((limit & 0xf) << 4); *scontrol = (*scontrol & ~0xf0) | ((limit & 0xf) << 4);
@ -2444,10 +2445,10 @@ static int __sata_set_spd_needed(struct ata_port *ap, u32 *scontrol)
/** /**
* sata_set_spd_needed - is SATA spd configuration needed * sata_set_spd_needed - is SATA spd configuration needed
* @ap: Port in question * @link: Link in question
* *
* Test whether the spd limit in SControl matches * Test whether the spd limit in SControl matches
* @ap->link.sata_spd_limit. This function is used to determine * @link->sata_spd_limit. This function is used to determine
* whether hardreset is necessary to apply SATA spd * whether hardreset is necessary to apply SATA spd
* configuration. * configuration.
* *
@ -2457,21 +2458,21 @@ static int __sata_set_spd_needed(struct ata_port *ap, u32 *scontrol)
* RETURNS: * RETURNS:
* 1 if SATA spd configuration is needed, 0 otherwise. * 1 if SATA spd configuration is needed, 0 otherwise.
*/ */
int sata_set_spd_needed(struct ata_port *ap) int sata_set_spd_needed(struct ata_link *link)
{ {
u32 scontrol; u32 scontrol;
if (sata_scr_read(ap, SCR_CONTROL, &scontrol)) if (sata_scr_read(link, SCR_CONTROL, &scontrol))
return 0; return 0;
return __sata_set_spd_needed(ap, &scontrol); return __sata_set_spd_needed(link, &scontrol);
} }
/** /**
* sata_set_spd - set SATA spd according to spd limit * sata_set_spd - set SATA spd according to spd limit
* @ap: Port to set SATA spd for * @link: Link to set SATA spd for
* *
* Set SATA spd of @ap according to sata_spd_limit. * Set SATA spd of @link according to sata_spd_limit.
* *
* LOCKING: * LOCKING:
* Inherited from caller. * Inherited from caller.
@ -2480,18 +2481,18 @@ int sata_set_spd_needed(struct ata_port *ap)
* 0 if spd doesn't need to be changed, 1 if spd has been * 0 if spd doesn't need to be changed, 1 if spd has been
* changed. Negative errno if SCR registers are inaccessible. * changed. Negative errno if SCR registers are inaccessible.
*/ */
int sata_set_spd(struct ata_port *ap) int sata_set_spd(struct ata_link *link)
{ {
u32 scontrol; u32 scontrol;
int rc; int rc;
if ((rc = sata_scr_read(ap, SCR_CONTROL, &scontrol))) if ((rc = sata_scr_read(link, SCR_CONTROL, &scontrol)))
return rc; return rc;
if (!__sata_set_spd_needed(ap, &scontrol)) if (!__sata_set_spd_needed(link, &scontrol))
return 0; return 0;
if ((rc = sata_scr_write(ap, SCR_CONTROL, scontrol))) if ((rc = sata_scr_write(link, SCR_CONTROL, scontrol)))
return rc; return rc;
return 1; return 1;
@ -2997,7 +2998,7 @@ int ata_wait_ready(struct ata_port *ap, unsigned long deadline)
if (!(status & ATA_BUSY)) if (!(status & ATA_BUSY))
return 0; return 0;
if (!ata_port_online(ap) && status == 0xff) if (!ata_link_online(&ap->link) && status == 0xff)
return -ENODEV; return -ENODEV;
if (time_after(now, deadline)) if (time_after(now, deadline))
return -EBUSY; return -EBUSY;
@ -3199,12 +3200,12 @@ err_out:
} }
/** /**
* sata_phy_debounce - debounce SATA phy status * sata_link_debounce - debounce SATA phy status
* @ap: ATA port to debounce SATA phy status for * @link: ATA link to debounce SATA phy status for
* @params: timing parameters { interval, duratinon, timeout } in msec * @params: timing parameters { interval, duratinon, timeout } in msec
* @deadline: deadline jiffies for the operation * @deadline: deadline jiffies for the operation
* *
* Make sure SStatus of @ap reaches stable state, determined by * Make sure SStatus of @link reaches stable state, determined by
* holding the same value where DET is not 1 for @duration polled * holding the same value where DET is not 1 for @duration polled
* every @interval, before @timeout. Timeout constraints the * every @interval, before @timeout. Timeout constraints the
* beginning of the stable state. Because DET gets stuck at 1 on * beginning of the stable state. Because DET gets stuck at 1 on
@ -3220,7 +3221,7 @@ err_out:
* RETURNS: * RETURNS:
* 0 on success, -errno on failure. * 0 on success, -errno on failure.
*/ */
int sata_phy_debounce(struct ata_port *ap, const unsigned long *params, int sata_link_debounce(struct ata_link *link, const unsigned long *params,
unsigned long deadline) unsigned long deadline)
{ {
unsigned long interval_msec = params[0]; unsigned long interval_msec = params[0];
@ -3233,7 +3234,7 @@ int sata_phy_debounce(struct ata_port *ap, const unsigned long *params,
if (time_before(t, deadline)) if (time_before(t, deadline))
deadline = t; deadline = t;
if ((rc = sata_scr_read(ap, SCR_STATUS, &cur))) if ((rc = sata_scr_read(link, SCR_STATUS, &cur)))
return rc; return rc;
cur &= 0xf; cur &= 0xf;
@ -3242,7 +3243,7 @@ int sata_phy_debounce(struct ata_port *ap, const unsigned long *params,
while (1) { while (1) {
msleep(interval_msec); msleep(interval_msec);
if ((rc = sata_scr_read(ap, SCR_STATUS, &cur))) if ((rc = sata_scr_read(link, SCR_STATUS, &cur)))
return rc; return rc;
cur &= 0xf; cur &= 0xf;
@ -3268,12 +3269,12 @@ int sata_phy_debounce(struct ata_port *ap, const unsigned long *params,
} }
/** /**
* sata_phy_resume - resume SATA phy * sata_link_resume - resume SATA link
* @ap: ATA port to resume SATA phy for * @link: ATA link to resume SATA
* @params: timing parameters { interval, duratinon, timeout } in msec * @params: timing parameters { interval, duratinon, timeout } in msec
* @deadline: deadline jiffies for the operation * @deadline: deadline jiffies for the operation
* *
* Resume SATA phy of @ap and debounce it. * Resume SATA phy @link and debounce it.
* *
* LOCKING: * LOCKING:
* Kernel thread context (may sleep) * Kernel thread context (may sleep)
@ -3281,18 +3282,18 @@ int sata_phy_debounce(struct ata_port *ap, const unsigned long *params,
* RETURNS: * RETURNS:
* 0 on success, -errno on failure. * 0 on success, -errno on failure.
*/ */
int sata_phy_resume(struct ata_port *ap, const unsigned long *params, int sata_link_resume(struct ata_link *link, const unsigned long *params,
unsigned long deadline) unsigned long deadline)
{ {
u32 scontrol; u32 scontrol;
int rc; int rc;
if ((rc = sata_scr_read(ap, SCR_CONTROL, &scontrol))) if ((rc = sata_scr_read(link, SCR_CONTROL, &scontrol)))
return rc; return rc;
scontrol = (scontrol & 0x0f0) | 0x300; scontrol = (scontrol & 0x0f0) | 0x300;
if ((rc = sata_scr_write(ap, SCR_CONTROL, scontrol))) if ((rc = sata_scr_write(link, SCR_CONTROL, scontrol)))
return rc; return rc;
/* Some PHYs react badly if SStatus is pounded immediately /* Some PHYs react badly if SStatus is pounded immediately
@ -3300,7 +3301,7 @@ int sata_phy_resume(struct ata_port *ap, const unsigned long *params,
*/ */
msleep(200); msleep(200);
return sata_phy_debounce(ap, params, deadline); return sata_link_debounce(link, params, deadline);
} }
/** /**
@ -3322,7 +3323,8 @@ int sata_phy_resume(struct ata_port *ap, const unsigned long *params,
*/ */
int ata_std_prereset(struct ata_port *ap, unsigned long deadline) int ata_std_prereset(struct ata_port *ap, unsigned long deadline)
{ {
struct ata_eh_context *ehc = &ap->link.eh_context; struct ata_link *link = &ap->link;
struct ata_eh_context *ehc = &link->eh_context;
const unsigned long *timing = sata_ehc_deb_timing(ehc); const unsigned long *timing = sata_ehc_deb_timing(ehc);
int rc; int rc;
@ -3335,9 +3337,9 @@ int ata_std_prereset(struct ata_port *ap, unsigned long deadline)
if (ehc->i.action & ATA_EH_HARDRESET) if (ehc->i.action & ATA_EH_HARDRESET)
return 0; return 0;
/* if SATA, resume phy */ /* if SATA, resume link */
if (ap->flags & ATA_FLAG_SATA) { if (ap->flags & ATA_FLAG_SATA) {
rc = sata_phy_resume(ap, timing, deadline); rc = sata_link_resume(link, timing, deadline);
/* whine about phy resume failure but proceed */ /* whine about phy resume failure but proceed */
if (rc && rc != -EOPNOTSUPP) if (rc && rc != -EOPNOTSUPP)
ata_port_printk(ap, KERN_WARNING, "failed to resume " ata_port_printk(ap, KERN_WARNING, "failed to resume "
@ -3347,7 +3349,7 @@ int ata_std_prereset(struct ata_port *ap, unsigned long deadline)
/* Wait for !BSY if the controller can wait for the first D2H /* Wait for !BSY if the controller can wait for the first D2H
* Reg FIS and we don't know that no device is attached. * Reg FIS and we don't know that no device is attached.
*/ */
if (!(ap->flags & ATA_FLAG_SKIP_D2H_BSY) && !ata_port_offline(ap)) { if (!(ap->flags & ATA_FLAG_SKIP_D2H_BSY) && !ata_link_offline(link)) {
rc = ata_wait_ready(ap, deadline); rc = ata_wait_ready(ap, deadline);
if (rc && rc != -ENODEV) { if (rc && rc != -ENODEV) {
ata_port_printk(ap, KERN_WARNING, "device not ready " ata_port_printk(ap, KERN_WARNING, "device not ready "
@ -3376,6 +3378,7 @@ int ata_std_prereset(struct ata_port *ap, unsigned long deadline)
int ata_std_softreset(struct ata_port *ap, unsigned int *classes, int ata_std_softreset(struct ata_port *ap, unsigned int *classes,
unsigned long deadline) unsigned long deadline)
{ {
struct ata_link *link = &ap->link;
unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS; unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS;
unsigned int devmask = 0; unsigned int devmask = 0;
int rc; int rc;
@ -3383,7 +3386,7 @@ int ata_std_softreset(struct ata_port *ap, unsigned int *classes,
DPRINTK("ENTER\n"); DPRINTK("ENTER\n");
if (ata_port_offline(ap)) { if (ata_link_offline(link)) {
classes[0] = ATA_DEV_NONE; classes[0] = ATA_DEV_NONE;
goto out; goto out;
} }
@ -3401,7 +3404,7 @@ int ata_std_softreset(struct ata_port *ap, unsigned int *classes,
DPRINTK("about to softreset, devmask=%x\n", devmask); DPRINTK("about to softreset, devmask=%x\n", devmask);
rc = ata_bus_softreset(ap, devmask, deadline); rc = ata_bus_softreset(ap, devmask, deadline);
/* if link is occupied, -ENODEV too is an error */ /* if link is occupied, -ENODEV too is an error */
if (rc && (rc != -ENODEV || sata_scr_valid(ap))) { if (rc && (rc != -ENODEV || sata_scr_valid(link))) {
ata_port_printk(ap, KERN_ERR, "SRST failed (errno=%d)\n", rc); ata_port_printk(ap, KERN_ERR, "SRST failed (errno=%d)\n", rc);
return rc; return rc;
} }
@ -3433,35 +3436,36 @@ int ata_std_softreset(struct ata_port *ap, unsigned int *classes,
int sata_port_hardreset(struct ata_port *ap, const unsigned long *timing, int sata_port_hardreset(struct ata_port *ap, const unsigned long *timing,
unsigned long deadline) unsigned long deadline)
{ {
struct ata_link *link = &ap->link;
u32 scontrol; u32 scontrol;
int rc; int rc;
DPRINTK("ENTER\n"); DPRINTK("ENTER\n");
if (sata_set_spd_needed(ap)) { if (sata_set_spd_needed(link)) {
/* SATA spec says nothing about how to reconfigure /* SATA spec says nothing about how to reconfigure
* spd. To be on the safe side, turn off phy during * spd. To be on the safe side, turn off phy during
* reconfiguration. This works for at least ICH7 AHCI * reconfiguration. This works for at least ICH7 AHCI
* and Sil3124. * and Sil3124.
*/ */
if ((rc = sata_scr_read(ap, SCR_CONTROL, &scontrol))) if ((rc = sata_scr_read(link, SCR_CONTROL, &scontrol)))
goto out; goto out;
scontrol = (scontrol & 0x0f0) | 0x304; scontrol = (scontrol & 0x0f0) | 0x304;
if ((rc = sata_scr_write(ap, SCR_CONTROL, scontrol))) if ((rc = sata_scr_write(link, SCR_CONTROL, scontrol)))
goto out; goto out;
sata_set_spd(ap); sata_set_spd(link);
} }
/* issue phy wake/reset */ /* issue phy wake/reset */
if ((rc = sata_scr_read(ap, SCR_CONTROL, &scontrol))) if ((rc = sata_scr_read(link, SCR_CONTROL, &scontrol)))
goto out; goto out;
scontrol = (scontrol & 0x0f0) | 0x301; scontrol = (scontrol & 0x0f0) | 0x301;
if ((rc = sata_scr_write_flush(ap, SCR_CONTROL, scontrol))) if ((rc = sata_scr_write_flush(link, SCR_CONTROL, scontrol)))
goto out; goto out;
/* Couldn't find anything in SATA I/II specs, but AHCI-1.1 /* Couldn't find anything in SATA I/II specs, but AHCI-1.1
@ -3469,8 +3473,8 @@ int sata_port_hardreset(struct ata_port *ap, const unsigned long *timing,
*/ */
msleep(1); msleep(1);
/* bring phy back */ /* bring link back */
rc = sata_phy_resume(ap, timing, deadline); rc = sata_link_resume(link, timing, deadline);
out: out:
DPRINTK("EXIT, rc=%d\n", rc); DPRINTK("EXIT, rc=%d\n", rc);
return rc; return rc;
@ -3494,7 +3498,8 @@ int sata_port_hardreset(struct ata_port *ap, const unsigned long *timing,
int sata_std_hardreset(struct ata_port *ap, unsigned int *class, int sata_std_hardreset(struct ata_port *ap, unsigned int *class,
unsigned long deadline) unsigned long deadline)
{ {
const unsigned long *timing = sata_ehc_deb_timing(&ap->link.eh_context); struct ata_link *link = &ap->link;
const unsigned long *timing = sata_ehc_deb_timing(&link->eh_context);
int rc; int rc;
DPRINTK("ENTER\n"); DPRINTK("ENTER\n");
@ -3508,7 +3513,7 @@ int sata_std_hardreset(struct ata_port *ap, unsigned int *class,
} }
/* TODO: phy layer with polling, timeouts, etc. */ /* TODO: phy layer with polling, timeouts, etc. */
if (ata_port_offline(ap)) { if (ata_link_offline(link)) {
*class = ATA_DEV_NONE; *class = ATA_DEV_NONE;
DPRINTK("EXIT, link offline\n"); DPRINTK("EXIT, link offline\n");
return 0; return 0;
@ -3547,16 +3552,17 @@ int sata_std_hardreset(struct ata_port *ap, unsigned int *class,
*/ */
void ata_std_postreset(struct ata_port *ap, unsigned int *classes) void ata_std_postreset(struct ata_port *ap, unsigned int *classes)
{ {
struct ata_link *link = &ap->link;
u32 serror; u32 serror;
DPRINTK("ENTER\n"); DPRINTK("ENTER\n");
/* print link status */ /* print link status */
sata_print_link_status(ap); sata_print_link_status(link);
/* clear SError */ /* clear SError */
if (sata_scr_read(ap, SCR_ERROR, &serror) == 0) if (sata_scr_read(link, SCR_ERROR, &serror) == 0)
sata_scr_write(ap, SCR_ERROR, serror); sata_scr_write(link, SCR_ERROR, serror);
/* is double-select really necessary? */ /* is double-select really necessary? */
if (classes[0] != ATA_DEV_NONE) if (classes[0] != ATA_DEV_NONE)
@ -5729,9 +5735,9 @@ irqreturn_t ata_interrupt (int irq, void *dev_instance)
/** /**
* sata_scr_valid - test whether SCRs are accessible * sata_scr_valid - test whether SCRs are accessible
* @ap: ATA port to test SCR accessibility for * @link: ATA link to test SCR accessibility for
* *
* Test whether SCRs are accessible for @ap. * Test whether SCRs are accessible for @link.
* *
* LOCKING: * LOCKING:
* None. * None.
@ -5739,18 +5745,20 @@ irqreturn_t ata_interrupt (int irq, void *dev_instance)
* RETURNS: * RETURNS:
* 1 if SCRs are accessible, 0 otherwise. * 1 if SCRs are accessible, 0 otherwise.
*/ */
int sata_scr_valid(struct ata_port *ap) int sata_scr_valid(struct ata_link *link)
{ {
struct ata_port *ap = link->ap;
return (ap->flags & ATA_FLAG_SATA) && ap->ops->scr_read; return (ap->flags & ATA_FLAG_SATA) && ap->ops->scr_read;
} }
/** /**
* sata_scr_read - read SCR register of the specified port * sata_scr_read - read SCR register of the specified port
* @ap: ATA port to read SCR for * @link: ATA link to read SCR for
* @reg: SCR to read * @reg: SCR to read
* @val: Place to store read value * @val: Place to store read value
* *
* Read SCR register @reg of @ap into *@val. This function is * Read SCR register @reg of @link into *@val. This function is
* guaranteed to succeed if the cable type of the port is SATA * guaranteed to succeed if the cable type of the port is SATA
* and the port implements ->scr_read. * and the port implements ->scr_read.
* *
@ -5760,20 +5768,22 @@ int sata_scr_valid(struct ata_port *ap)
* RETURNS: * RETURNS:
* 0 on success, negative errno on failure. * 0 on success, negative errno on failure.
*/ */
int sata_scr_read(struct ata_port *ap, int reg, u32 *val) int sata_scr_read(struct ata_link *link, int reg, u32 *val)
{ {
if (sata_scr_valid(ap)) struct ata_port *ap = link->ap;
if (sata_scr_valid(link))
return ap->ops->scr_read(ap, reg, val); return ap->ops->scr_read(ap, reg, val);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
/** /**
* sata_scr_write - write SCR register of the specified port * sata_scr_write - write SCR register of the specified port
* @ap: ATA port to write SCR for * @link: ATA link to write SCR for
* @reg: SCR to write * @reg: SCR to write
* @val: value to write * @val: value to write
* *
* Write @val to SCR register @reg of @ap. This function is * Write @val to SCR register @reg of @link. This function is
* guaranteed to succeed if the cable type of the port is SATA * guaranteed to succeed if the cable type of the port is SATA
* and the port implements ->scr_read. * and the port implements ->scr_read.
* *
@ -5783,16 +5793,18 @@ int sata_scr_read(struct ata_port *ap, int reg, u32 *val)
* RETURNS: * RETURNS:
* 0 on success, negative errno on failure. * 0 on success, negative errno on failure.
*/ */
int sata_scr_write(struct ata_port *ap, int reg, u32 val) int sata_scr_write(struct ata_link *link, int reg, u32 val)
{ {
if (sata_scr_valid(ap)) struct ata_port *ap = link->ap;
if (sata_scr_valid(link))
return ap->ops->scr_write(ap, reg, val); return ap->ops->scr_write(ap, reg, val);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
/** /**
* sata_scr_write_flush - write SCR register of the specified port and flush * sata_scr_write_flush - write SCR register of the specified port and flush
* @ap: ATA port to write SCR for * @link: ATA link to write SCR for
* @reg: SCR to write * @reg: SCR to write
* @val: value to write * @val: value to write
* *
@ -5805,11 +5817,12 @@ int sata_scr_write(struct ata_port *ap, int reg, u32 val)
* RETURNS: * RETURNS:
* 0 on success, negative errno on failure. * 0 on success, negative errno on failure.
*/ */
int sata_scr_write_flush(struct ata_port *ap, int reg, u32 val) int sata_scr_write_flush(struct ata_link *link, int reg, u32 val)
{ {
struct ata_port *ap = link->ap;
int rc; int rc;
if (sata_scr_valid(ap)) { if (sata_scr_valid(link)) {
rc = ap->ops->scr_write(ap, reg, val); rc = ap->ops->scr_write(ap, reg, val);
if (rc == 0) if (rc == 0)
rc = ap->ops->scr_read(ap, reg, &val); rc = ap->ops->scr_read(ap, reg, &val);
@ -5819,12 +5832,12 @@ int sata_scr_write_flush(struct ata_port *ap, int reg, u32 val)
} }
/** /**
* ata_port_online - test whether the given port is online * ata_link_online - test whether the given link is online
* @ap: ATA port to test * @link: ATA link to test
* *
* Test whether @ap is online. Note that this function returns 0 * Test whether @link is online. Note that this function returns
* if online status of @ap cannot be obtained, so * 0 if online status of @link cannot be obtained, so
* ata_port_online(ap) != !ata_port_offline(ap). * ata_link_online(link) != !ata_link_offline(link).
* *
* LOCKING: * LOCKING:
* None. * None.
@ -5832,22 +5845,23 @@ int sata_scr_write_flush(struct ata_port *ap, int reg, u32 val)
* RETURNS: * RETURNS:
* 1 if the port online status is available and online. * 1 if the port online status is available and online.
*/ */
int ata_port_online(struct ata_port *ap) int ata_link_online(struct ata_link *link)
{ {
u32 sstatus; u32 sstatus;
if (!sata_scr_read(ap, SCR_STATUS, &sstatus) && (sstatus & 0xf) == 0x3) if (sata_scr_read(link, SCR_STATUS, &sstatus) == 0 &&
(sstatus & 0xf) == 0x3)
return 1; return 1;
return 0; return 0;
} }
/** /**
* ata_port_offline - test whether the given port is offline * ata_link_offline - test whether the given link is offline
* @ap: ATA port to test * @link: ATA link to test
* *
* Test whether @ap is offline. Note that this function returns * Test whether @link is offline. Note that this function
* 0 if offline status of @ap cannot be obtained, so * returns 0 if offline status of @link cannot be obtained, so
* ata_port_online(ap) != !ata_port_offline(ap). * ata_link_online(link) != !ata_link_offline(link).
* *
* LOCKING: * LOCKING:
* None. * None.
@ -5855,11 +5869,12 @@ int ata_port_online(struct ata_port *ap)
* RETURNS: * RETURNS:
* 1 if the port offline status is available and offline. * 1 if the port offline status is available and offline.
*/ */
int ata_port_offline(struct ata_port *ap) int ata_link_offline(struct ata_link *link)
{ {
u32 sstatus; u32 sstatus;
if (!sata_scr_read(ap, SCR_STATUS, &sstatus) && (sstatus & 0xf) != 0x3) if (sata_scr_read(link, SCR_STATUS, &sstatus) == 0 &&
(sstatus & 0xf) != 0x3)
return 1; return 1;
return 0; return 0;
} }
@ -6397,7 +6412,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
ap->cbl = ATA_CBL_SATA; ap->cbl = ATA_CBL_SATA;
/* init sata_spd_limit to the current value */ /* init sata_spd_limit to the current value */
if (sata_scr_read(ap, SCR_CONTROL, &scontrol) == 0) { if (sata_scr_read(&ap->link, SCR_CONTROL, &scontrol) == 0) {
int spd = (scontrol >> 4) & 0xf; int spd = (scontrol >> 4) & 0xf;
if (spd) if (spd)
ap->link.hw_sata_spd_limit &= (1 << spd) - 1; ap->link.hw_sata_spd_limit &= (1 << spd) - 1;
@ -6924,8 +6939,8 @@ EXPORT_SYMBOL_GPL(ata_bmdma_post_internal_cmd);
EXPORT_SYMBOL_GPL(ata_port_probe); EXPORT_SYMBOL_GPL(ata_port_probe);
EXPORT_SYMBOL_GPL(ata_dev_disable); EXPORT_SYMBOL_GPL(ata_dev_disable);
EXPORT_SYMBOL_GPL(sata_set_spd); EXPORT_SYMBOL_GPL(sata_set_spd);
EXPORT_SYMBOL_GPL(sata_phy_debounce); EXPORT_SYMBOL_GPL(sata_link_debounce);
EXPORT_SYMBOL_GPL(sata_phy_resume); EXPORT_SYMBOL_GPL(sata_link_resume);
EXPORT_SYMBOL_GPL(sata_phy_reset); EXPORT_SYMBOL_GPL(sata_phy_reset);
EXPORT_SYMBOL_GPL(__sata_phy_reset); EXPORT_SYMBOL_GPL(__sata_phy_reset);
EXPORT_SYMBOL_GPL(ata_bus_reset); EXPORT_SYMBOL_GPL(ata_bus_reset);
@ -6952,8 +6967,8 @@ EXPORT_SYMBOL_GPL(sata_scr_valid);
EXPORT_SYMBOL_GPL(sata_scr_read); EXPORT_SYMBOL_GPL(sata_scr_read);
EXPORT_SYMBOL_GPL(sata_scr_write); EXPORT_SYMBOL_GPL(sata_scr_write);
EXPORT_SYMBOL_GPL(sata_scr_write_flush); EXPORT_SYMBOL_GPL(sata_scr_write_flush);
EXPORT_SYMBOL_GPL(ata_port_online); EXPORT_SYMBOL_GPL(ata_link_online);
EXPORT_SYMBOL_GPL(ata_port_offline); EXPORT_SYMBOL_GPL(ata_link_offline);
#ifdef CONFIG_PM #ifdef CONFIG_PM
EXPORT_SYMBOL_GPL(ata_host_suspend); EXPORT_SYMBOL_GPL(ata_host_suspend);
EXPORT_SYMBOL_GPL(ata_host_resume); EXPORT_SYMBOL_GPL(ata_host_resume);

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

@ -1501,7 +1501,7 @@ static unsigned int ata_eh_speed_down(struct ata_device *dev, int is_io,
/* speed down? */ /* speed down? */
if (verdict & ATA_EH_SPDN_SPEED_DOWN) { if (verdict & ATA_EH_SPDN_SPEED_DOWN) {
/* speed down SATA link speed if possible */ /* speed down SATA link speed if possible */
if (sata_down_spd_limit(dev->link->ap) == 0) { if (sata_down_spd_limit(dev->link) == 0) {
action |= ATA_EH_HARDRESET; action |= ATA_EH_HARDRESET;
goto done; goto done;
} }
@ -1561,7 +1561,8 @@ static unsigned int ata_eh_speed_down(struct ata_device *dev, int is_io,
*/ */
static void ata_eh_autopsy(struct ata_port *ap) static void ata_eh_autopsy(struct ata_port *ap)
{ {
struct ata_eh_context *ehc = &ap->link.eh_context; struct ata_link *link = &ap->link;
struct ata_eh_context *ehc = &link->eh_context;
unsigned int all_err_mask = 0; unsigned int all_err_mask = 0;
int tag, is_io = 0; int tag, is_io = 0;
u32 serror; u32 serror;
@ -1573,7 +1574,7 @@ static void ata_eh_autopsy(struct ata_port *ap)
return; return;
/* obtain and analyze SError */ /* obtain and analyze SError */
rc = sata_scr_read(ap, SCR_ERROR, &serror); rc = sata_scr_read(link, SCR_ERROR, &serror);
if (rc == 0) { if (rc == 0) {
ehc->i.serror |= serror; ehc->i.serror |= serror;
ata_eh_analyze_serror(ap); ata_eh_analyze_serror(ap);
@ -1782,7 +1783,8 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
ata_prereset_fn_t prereset, ata_reset_fn_t softreset, ata_prereset_fn_t prereset, ata_reset_fn_t softreset,
ata_reset_fn_t hardreset, ata_postreset_fn_t postreset) ata_reset_fn_t hardreset, ata_postreset_fn_t postreset)
{ {
struct ata_eh_context *ehc = &ap->link.eh_context; struct ata_link *link = &ap->link;
struct ata_eh_context *ehc = &link->eh_context;
unsigned int *classes = ehc->classes; unsigned int *classes = ehc->classes;
int verbose = !(ehc->i.flags & ATA_EHI_QUIET); int verbose = !(ehc->i.flags & ATA_EHI_QUIET);
int try = 0; int try = 0;
@ -1800,7 +1802,7 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
*/ */
action = ehc->i.action; action = ehc->i.action;
ehc->i.action &= ~ATA_EH_RESET_MASK; ehc->i.action &= ~ATA_EH_RESET_MASK;
if (softreset && (!hardreset || (!sata_set_spd_needed(ap) && if (softreset && (!hardreset || (!sata_set_spd_needed(link) &&
!(action & ATA_EH_HARDRESET)))) !(action & ATA_EH_HARDRESET))))
ehc->i.action |= ATA_EH_SOFTRESET; ehc->i.action |= ATA_EH_SOFTRESET;
else else
@ -1814,7 +1816,7 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
"port disabled. ignoring.\n"); "port disabled. ignoring.\n");
ehc->i.action &= ~ATA_EH_RESET_MASK; ehc->i.action &= ~ATA_EH_RESET_MASK;
ata_link_for_each_dev(dev, &ap->link) ata_link_for_each_dev(dev, link)
classes[dev->devno] = ATA_DEV_NONE; classes[dev->devno] = ATA_DEV_NONE;
rc = 0; rc = 0;
@ -1832,7 +1834,7 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
reset = softreset; reset = softreset;
else { else {
/* prereset told us not to reset, bang classes and return */ /* prereset told us not to reset, bang classes and return */
ata_link_for_each_dev(dev, &ap->link) ata_link_for_each_dev(dev, link)
classes[dev->devno] = ATA_DEV_NONE; classes[dev->devno] = ATA_DEV_NONE;
rc = 0; rc = 0;
goto out; goto out;
@ -1902,7 +1904,7 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
if (rc == -EPIPE || if (rc == -EPIPE ||
try == ARRAY_SIZE(ata_eh_reset_timeouts) - 1) try == ARRAY_SIZE(ata_eh_reset_timeouts) - 1)
sata_down_spd_limit(ap); sata_down_spd_limit(link);
if (hardreset) if (hardreset)
reset = hardreset; reset = hardreset;
goto retry; goto retry;
@ -1914,12 +1916,12 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
/* After the reset, the device state is PIO 0 and the /* After the reset, the device state is PIO 0 and the
* controller state is undefined. Record the mode. * controller state is undefined. Record the mode.
*/ */
ata_link_for_each_dev(dev, &ap->link) ata_link_for_each_dev(dev, link)
dev->pio_mode = XFER_PIO_0; dev->pio_mode = XFER_PIO_0;
/* record current link speed */ /* record current link speed */
if (sata_scr_read(ap, SCR_STATUS, &sstatus) == 0) if (sata_scr_read(link, SCR_STATUS, &sstatus) == 0)
ap->link.sata_spd = (sstatus >> 4) & 0xf; link->sata_spd = (sstatus >> 4) & 0xf;
if (postreset) if (postreset)
postreset(ap, classes); postreset(ap, classes);
@ -1957,7 +1959,7 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap,
readid_flags |= ATA_READID_POSTRESET; readid_flags |= ATA_READID_POSTRESET;
if ((action & ATA_EH_REVALIDATE) && ata_dev_enabled(dev)) { if ((action & ATA_EH_REVALIDATE) && ata_dev_enabled(dev)) {
if (ata_port_offline(ap)) { if (ata_link_offline(&ap->link)) {
rc = -EIO; rc = -EIO;
goto err; goto err;
} }
@ -2079,7 +2081,6 @@ static int ata_eh_skip_recovery(struct ata_port *ap)
static void ata_eh_handle_dev_fail(struct ata_device *dev, int err) static void ata_eh_handle_dev_fail(struct ata_device *dev, int err)
{ {
struct ata_port *ap = dev->link->ap;
struct ata_eh_context *ehc = &dev->link->eh_context; struct ata_eh_context *ehc = &dev->link->eh_context;
ehc->tries[dev->devno]--; ehc->tries[dev->devno]--;
@ -2096,7 +2097,7 @@ static void ata_eh_handle_dev_fail(struct ata_device *dev, int err)
/* This is the last chance, better to slow /* This is the last chance, better to slow
* down than lose it. * down than lose it.
*/ */
sata_down_spd_limit(ap); sata_down_spd_limit(dev->link);
ata_down_xfermask_limit(dev, ATA_DNXFER_PIO); ata_down_xfermask_limit(dev, ATA_DNXFER_PIO);
} }
} }
@ -2106,7 +2107,7 @@ static void ata_eh_handle_dev_fail(struct ata_device *dev, int err)
ata_dev_disable(dev); ata_dev_disable(dev);
/* detach if offline */ /* detach if offline */
if (ata_port_offline(ap)) if (ata_link_offline(dev->link))
ata_eh_detach_dev(dev); ata_eh_detach_dev(dev);
/* probe if requested */ /* probe if requested */

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

@ -500,7 +500,7 @@ void ata_bmdma_error_handler(struct ata_port *ap)
ata_reset_fn_t hardreset; ata_reset_fn_t hardreset;
hardreset = NULL; hardreset = NULL;
if (sata_scr_valid(ap)) if (sata_scr_valid(&ap->link))
hardreset = sata_std_hardreset; hardreset = sata_std_hardreset;
ata_bmdma_drive_eh(ap, ata_std_prereset, ata_std_softreset, hardreset, ata_bmdma_drive_eh(ap, ata_std_prereset, ata_std_softreset, hardreset,

4
drivers/ata/libata.h
View File

@ -78,8 +78,8 @@ extern int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,
extern int ata_dev_reread_id(struct ata_device *dev, unsigned int readid_flags); extern int ata_dev_reread_id(struct ata_device *dev, unsigned int readid_flags);
extern int ata_dev_revalidate(struct ata_device *dev, unsigned int readid_flags); extern int ata_dev_revalidate(struct ata_device *dev, unsigned int readid_flags);
extern int ata_dev_configure(struct ata_device *dev); extern int ata_dev_configure(struct ata_device *dev);
extern int sata_down_spd_limit(struct ata_port *ap); extern int sata_down_spd_limit(struct ata_link *link);
extern int sata_set_spd_needed(struct ata_port *ap); extern int sata_set_spd_needed(struct ata_link *link);
extern int ata_down_xfermask_limit(struct ata_device *dev, unsigned int sel); extern int ata_down_xfermask_limit(struct ata_device *dev, unsigned int sel);
extern int ata_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev); extern int ata_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev);
extern void ata_sg_clean(struct ata_queued_cmd *qc); extern void ata_sg_clean(struct ata_queued_cmd *qc);

2
drivers/ata/pata_scc.c
View File

@ -612,7 +612,7 @@ static int scc_std_softreset (struct ata_port *ap, unsigned int *classes,
DPRINTK("ENTER\n"); DPRINTK("ENTER\n");
if (ata_port_offline(ap)) { if (ata_link_offline(&ap->link)) {
classes[0] = ATA_DEV_NONE; classes[0] = ATA_DEV_NONE;
goto out; goto out;
} }

4
drivers/ata/sata_inic162x.c
View File

@ -435,7 +435,7 @@ static int inic_hardreset(struct ata_port *ap, unsigned int *class,
msleep(1); msleep(1);
writew(val & ~IDMA_CTL_RST_ATA, idma_ctl); writew(val & ~IDMA_CTL_RST_ATA, idma_ctl);
rc = sata_phy_resume(ap, timing, deadline); rc = sata_link_resume(&ap->link, timing, deadline);
if (rc) { if (rc) {
ata_port_printk(ap, KERN_WARNING, "failed to resume " ata_port_printk(ap, KERN_WARNING, "failed to resume "
"link after reset (errno=%d)\n", rc); "link after reset (errno=%d)\n", rc);
@ -443,7 +443,7 @@ static int inic_hardreset(struct ata_port *ap, unsigned int *class,
} }
*class = ATA_DEV_NONE; *class = ATA_DEV_NONE;
if (ata_port_online(ap)) { if (ata_link_online(&ap->link)) {
struct ata_taskfile tf; struct ata_taskfile tf;
/* wait a while before checking status */ /* wait a while before checking status */

26
drivers/ata/sata_mv.c
View File

@ -1423,8 +1423,8 @@ static void mv_err_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
/* just a guess: do we need to do this? should we /* just a guess: do we need to do this? should we
* expand this, and do it in all cases? * expand this, and do it in all cases?
*/ */
sata_scr_read(ap, SCR_ERROR, &serr); sata_scr_read(&ap->link, SCR_ERROR, &serr);
sata_scr_write_flush(ap, SCR_ERROR, serr); sata_scr_write_flush(&ap->link, SCR_ERROR, serr);
} }
edma_err_cause = readl(port_mmio + EDMA_ERR_IRQ_CAUSE_OFS); edma_err_cause = readl(port_mmio + EDMA_ERR_IRQ_CAUSE_OFS);
@ -1468,8 +1468,8 @@ static void mv_err_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
} }
if (edma_err_cause & EDMA_ERR_SERR) { if (edma_err_cause & EDMA_ERR_SERR) {
sata_scr_read(ap, SCR_ERROR, &serr); sata_scr_read(&ap->link, SCR_ERROR, &serr);
sata_scr_write_flush(ap, SCR_ERROR, serr); sata_scr_write_flush(&ap->link, SCR_ERROR, serr);
err_mask = AC_ERR_ATA_BUS; err_mask = AC_ERR_ATA_BUS;
action |= ATA_EH_HARDRESET; action |= ATA_EH_HARDRESET;
} }
@ -1687,7 +1687,7 @@ static void mv_pci_error(struct ata_host *host, void __iomem *mmio)
for (i = 0; i < host->n_ports; i++) { for (i = 0; i < host->n_ports; i++) {
ap = host->ports[i]; ap = host->ports[i];
if (!ata_port_offline(ap)) { if (!ata_link_offline(&ap->link)) {
ehi = &ap->link.eh_info; ehi = &ap->link.eh_info;
ata_ehi_clear_desc(ehi); ata_ehi_clear_desc(ehi);
if (!printed++) if (!printed++)
@ -2198,14 +2198,14 @@ static void mv_phy_reset(struct ata_port *ap, unsigned int *class,
/* Issue COMRESET via SControl */ /* Issue COMRESET via SControl */
comreset_retry: comreset_retry:
sata_scr_write_flush(ap, SCR_CONTROL, 0x301); sata_scr_write_flush(&ap->link, SCR_CONTROL, 0x301);
msleep(1); msleep(1);
sata_scr_write_flush(ap, SCR_CONTROL, 0x300); sata_scr_write_flush(&ap->link, SCR_CONTROL, 0x300);
msleep(20); msleep(20);
do { do {
sata_scr_read(ap, SCR_STATUS, &sstatus); sata_scr_read(&ap->link, SCR_STATUS, &sstatus);
if (((sstatus & 0x3) == 3) || ((sstatus & 0x3) == 0)) if (((sstatus & 0x3) == 3) || ((sstatus & 0x3) == 0))
break; break;
@ -2230,7 +2230,7 @@ comreset_retry:
} }
#endif #endif
if (ata_port_offline(ap)) { if (ata_link_offline(&ap->link)) {
*class = ATA_DEV_NONE; *class = ATA_DEV_NONE;
return; return;
} }
@ -2285,7 +2285,7 @@ static int mv_prereset(struct ata_port *ap, unsigned long deadline)
if (ehc->i.action & ATA_EH_HARDRESET) if (ehc->i.action & ATA_EH_HARDRESET)
return 0; return 0;
if (ata_port_online(ap)) if (ata_link_online(&ap->link))
rc = ata_wait_ready(ap, deadline); rc = ata_wait_ready(ap, deadline);
else else
rc = -ENODEV; rc = -ENODEV;
@ -2313,11 +2313,11 @@ static void mv_postreset(struct ata_port *ap, unsigned int *classes)
u32 serr; u32 serr;
/* print link status */ /* print link status */
sata_print_link_status(ap); sata_print_link_status(&ap->link);
/* clear SError */ /* clear SError */
sata_scr_read(ap, SCR_ERROR, &serr); sata_scr_read(&ap->link, SCR_ERROR, &serr);
sata_scr_write_flush(ap, SCR_ERROR, serr); sata_scr_write_flush(&ap->link, SCR_ERROR, serr);
/* bail out if no device is present */ /* bail out if no device is present */
if (classes[0] == ATA_DEV_NONE && classes[1] == ATA_DEV_NONE) { if (classes[0] == ATA_DEV_NONE && classes[1] == ATA_DEV_NONE) {

4
drivers/ata/sata_promise.c
View File

@ -475,7 +475,7 @@ static void pdc_atapi_pkt(struct ata_queued_cmd *qc)
buf32[2] = 0; /* no next-packet */ buf32[2] = 0; /* no next-packet */
/* select drive */ /* select drive */
if (sata_scr_valid(ap)) { if (sata_scr_valid(&ap->link)) {
dev_sel = PDC_DEVICE_SATA; dev_sel = PDC_DEVICE_SATA;
} else { } else {
dev_sel = ATA_DEVICE_OBS; dev_sel = ATA_DEVICE_OBS;
@ -643,7 +643,7 @@ static void pdc_error_intr(struct ata_port *ap, struct ata_queued_cmd *qc,
| PDC_PCI_SYS_ERR | PDC1_PCI_PARITY_ERR)) | PDC_PCI_SYS_ERR | PDC1_PCI_PARITY_ERR))
ac_err_mask |= AC_ERR_HOST_BUS; ac_err_mask |= AC_ERR_HOST_BUS;
if (sata_scr_valid(ap)) { if (sata_scr_valid(&ap->link)) {
u32 serror; u32 serror;
pdc_sata_scr_read(ap, SCR_ERROR, &serror); pdc_sata_scr_read(ap, SCR_ERROR, &serror);

10
drivers/ata/sata_sil24.c
View File

@ -593,7 +593,7 @@ static int sil24_do_softreset(struct ata_port *ap, unsigned int *class,
DPRINTK("ENTER\n"); DPRINTK("ENTER\n");
if (ata_port_offline(ap)) { if (ata_link_offline(&ap->link)) {
DPRINTK("PHY reports no device\n"); DPRINTK("PHY reports no device\n");
*class = ATA_DEV_NONE; *class = ATA_DEV_NONE;
goto out; goto out;
@ -650,10 +650,10 @@ static int sil24_hardreset(struct ata_port *ap, unsigned int *class,
u32 tmp; u32 tmp;
/* sil24 does the right thing(tm) without any protection */ /* sil24 does the right thing(tm) without any protection */
sata_set_spd(ap); sata_set_spd(&ap->link);
tout_msec = 100; tout_msec = 100;
if (ata_port_online(ap)) if (ata_link_online(&ap->link))
tout_msec = 5000; tout_msec = 5000;
writel(PORT_CS_DEV_RST, port + PORT_CTRL_STAT); writel(PORT_CS_DEV_RST, port + PORT_CTRL_STAT);
@ -663,14 +663,14 @@ static int sil24_hardreset(struct ata_port *ap, unsigned int *class,
/* SStatus oscillates between zero and valid status after /* SStatus oscillates between zero and valid status after
* DEV_RST, debounce it. * DEV_RST, debounce it.
*/ */
rc = sata_phy_debounce(ap, sata_deb_timing_long, deadline); rc = sata_link_debounce(&ap->link, sata_deb_timing_long, deadline);
if (rc) { if (rc) {
reason = "PHY debouncing failed"; reason = "PHY debouncing failed";
goto err; goto err;
} }
if (tmp & PORT_CS_DEV_RST) { if (tmp & PORT_CS_DEV_RST) {
if (ata_port_offline(ap)) if (ata_link_offline(&ap->link))
return 0; return 0;
reason = "link not ready"; reason = "link not ready";
goto err; goto err;

22
include/linux/libata.h
View File

@ -696,15 +696,15 @@ static inline int ata_port_is_dummy(struct ata_port *ap)
return ap->ops == &ata_dummy_port_ops; return ap->ops == &ata_dummy_port_ops;
} }
extern void sata_print_link_status(struct ata_port *ap); extern void sata_print_link_status(struct ata_link *link);
extern void ata_port_probe(struct ata_port *); extern void ata_port_probe(struct ata_port *);
extern void __sata_phy_reset(struct ata_port *ap); extern void __sata_phy_reset(struct ata_port *ap);
extern void sata_phy_reset(struct ata_port *ap); extern void sata_phy_reset(struct ata_port *ap);
extern void ata_bus_reset(struct ata_port *ap); extern void ata_bus_reset(struct ata_port *ap);
extern int sata_set_spd(struct ata_port *ap); extern int sata_set_spd(struct ata_link *link);
extern int sata_phy_debounce(struct ata_port *ap, const unsigned long *param, extern int sata_link_debounce(struct ata_link *link,
unsigned long deadline); const unsigned long *params, unsigned long deadline);
extern int sata_phy_resume(struct ata_port *ap, const unsigned long *param, extern int sata_link_resume(struct ata_link *link, const unsigned long *params,
unsigned long deadline); unsigned long deadline);
extern int ata_std_prereset(struct ata_port *ap, unsigned long deadline); extern int ata_std_prereset(struct ata_port *ap, unsigned long deadline);
extern int ata_std_softreset(struct ata_port *ap, unsigned int *classes, extern int ata_std_softreset(struct ata_port *ap, unsigned int *classes,
@ -753,12 +753,12 @@ extern int ata_sas_slave_configure(struct scsi_device *, struct ata_port *);
extern int ata_sas_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *), extern int ata_sas_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *),
struct ata_port *ap); struct ata_port *ap);
extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc); extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
extern int sata_scr_valid(struct ata_port *ap); extern int sata_scr_valid(struct ata_link *link);
extern int sata_scr_read(struct ata_port *ap, int reg, u32 *val); extern int sata_scr_read(struct ata_link *link, int reg, u32 *val);
extern int sata_scr_write(struct ata_port *ap, int reg, u32 val); extern int sata_scr_write(struct ata_link *link, int reg, u32 val);
extern int sata_scr_write_flush(struct ata_port *ap, int reg, u32 val); extern int sata_scr_write_flush(struct ata_link *link, int reg, u32 val);
extern int ata_port_online(struct ata_port *ap); extern int ata_link_online(struct ata_link *link);
extern int ata_port_offline(struct ata_port *ap); extern int ata_link_offline(struct ata_link *link);
#ifdef CONFIG_PM #ifdef CONFIG_PM
extern int ata_host_suspend(struct ata_host *host, pm_message_t mesg); extern int ata_host_suspend(struct ata_host *host, pm_message_t mesg);
extern void ata_host_resume(struct ata_host *host); extern void ata_host_resume(struct ata_host *host);