From: Tejun Heo <htejun@gmail.com>
To: jgarzik@pobox.com, mlord@pobox.com, albertcc@tw.ibm.com,
alan@lxorguk.ukuu.org.uk, axboe@suse.de, forrest.zhao@intel.com,
linux-ide@vger.kernel.org
Cc: Tejun Heo <htejun@gmail.com>
Subject: [PATCH 06/12] libata-hp-prep: implement ap->hw_sata_spd_limit
Date: Wed, 31 May 2006 20:05:41 +0900 [thread overview]
Message-ID: <11490735413749-git-send-email-htejun@gmail.com> (raw)
In-Reply-To: <1149073540186-git-send-email-htejun@gmail.com>
Add ap->hw_sata_spd_limit and initialize it once during the boot
initialization (or driver load initialization). ap->sata_spd_limit is
reset to ap->hw_sata_spd_limit on hotplug. This prevents spd limits
introduced by earlier devices from affecting new devices.
Signed-off-by: Tejun Heo <htejun@gmail.com>
---
drivers/scsi/libata-core.c | 21 ++++++++++++---------
include/linux/libata.h | 1 +
2 files changed, 13 insertions(+), 9 deletions(-)
5a04bf4befa8bffa012eedc3a0903c158b9131a9
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index a07ab77..b1a02fd 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -2466,17 +2466,9 @@ static int sata_phy_resume(struct ata_po
*/
void ata_std_probeinit(struct ata_port *ap)
{
- u32 scontrol;
-
/* resume link */
sata_phy_resume(ap);
- /* init sata_spd_limit to the current value */
- if (sata_scr_read(ap, SCR_CONTROL, &scontrol) == 0) {
- int spd = (scontrol >> 4) & 0xf;
- ap->sata_spd_limit &= (1 << spd) - 1;
- }
-
/* wait for device */
if (ata_port_online(ap))
ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
@@ -5155,6 +5147,9 @@ void ata_dev_init(struct ata_device *dev
struct ata_port *ap = dev->ap;
unsigned long flags;
+ /* SATA spd limit is bound to the first device */
+ ap->sata_spd_limit = ap->hw_sata_spd_limit;
+
/* High bits of dev->flags are used to record warm plug
* requests which occur asynchronously. Synchronize using
* host_set lock.
@@ -5210,7 +5205,7 @@ static void ata_host_init(struct ata_por
ap->udma_mask = ent->udma_mask;
ap->flags |= ent->host_flags;
ap->ops = ent->port_ops;
- ap->sata_spd_limit = UINT_MAX;
+ ap->hw_sata_spd_limit = UINT_MAX;
ap->active_tag = ATA_TAG_POISON;
ap->last_ctl = 0xFF;
ap->msg_enable = ATA_MSG_DRV;
@@ -5375,10 +5370,18 @@ int ata_device_add(const struct ata_prob
DPRINTK("probe begin\n");
for (i = 0; i < count; i++) {
struct ata_port *ap;
+ u32 scontrol;
int rc;
ap = host_set->ports[i];
+ /* init sata_spd_limit to the current value */
+ if (sata_scr_read(ap, SCR_CONTROL, &scontrol) == 0) {
+ int spd = (scontrol >> 4) & 0xf;
+ ap->hw_sata_spd_limit &= (1 << spd) - 1;
+ }
+ ap->sata_spd_limit = ap->hw_sata_spd_limit;
+
DPRINTK("ata%u: bus probe begin\n", ap->id);
rc = ata_bus_probe(ap);
DPRINTK("ata%u: bus probe end\n", ap->id);
diff --git a/include/linux/libata.h b/include/linux/libata.h
index aa14eda..10dc235 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -489,6 +489,7 @@ struct ata_port {
unsigned int mwdma_mask;
unsigned int udma_mask;
unsigned int cbl; /* cable type; ATA_CBL_xxx */
+ unsigned int hw_sata_spd_limit;
unsigned int sata_spd_limit; /* SATA PHY speed limit */
/* record runtime error info, protected by host_set lock */
--
1.3.2
next prev parent reply other threads:[~2006-05-31 11:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-31 11:05 [PATCHSET 01/03] prep for hotplug support, take 5 Tejun Heo
2006-05-31 11:05 ` [PATCH 01/12] libata-hp-prep: add flags and eh_info/context fields for hotplug Tejun Heo
2006-05-31 11:05 ` [PATCH 02/12] libata-hp-prep: implement ata_dev_init() Tejun Heo
2006-05-31 11:05 ` [PATCH 05/12] libata-hp-prep: use __ata_scsi_find_dev() Tejun Heo
2006-05-31 11:05 ` [PATCH 03/12] libata-hp-prep: make some ata_device fields persistent Tejun Heo
2006-05-31 11:05 ` Tejun Heo [this message]
2006-05-31 11:05 ` [PATCH 04/12] libata-hp-prep: update ata_scsi_find_dev() and friends Tejun Heo
2006-05-31 11:05 ` [PATCH 09/12] libata-hp-prep: make probing related functions global Tejun Heo
2006-05-31 11:05 ` [PATCH 08/12] libata-hp-prep: add ata_aux_wq Tejun Heo
2006-05-31 11:05 ` [PATCH 12/12] libata-hp-prep: implement followup softreset handling Tejun Heo
2006-05-31 11:05 ` [PATCH 07/12] libata-hp-prep: store attached SCSI device Tejun Heo
2006-05-31 11:05 ` [PATCH 11/12] libata-hp-prep: add prereset() method and implement ata_std_prereset() Tejun Heo
2006-05-31 11:05 ` [PATCH 10/12] libata-hp-prep: implement sata_phy_debounce() Tejun Heo
2006-05-31 11:08 ` [PATCHSET 01/03] prep for hotplug support, take 5 Tejun Heo
2006-06-08 20:52 ` Jeff Garzik
-- strict thread matches above, loose matches on Subject: below --
2006-05-29 6:25 [PATCHSET 01/03] prep for hotplug support, take 4 Tejun Heo
2006-05-29 6:25 ` [PATCH 06/12] libata-hp-prep: implement ap->hw_sata_spd_limit Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11490735413749-git-send-email-htejun@gmail.com \
--to=htejun@gmail.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=albertcc@tw.ibm.com \
--cc=axboe@suse.de \
--cc=forrest.zhao@intel.com \
--cc=jgarzik@pobox.com \
--cc=linux-ide@vger.kernel.org \
--cc=mlord@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).