aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/libata.h
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2006-06-28 12:29:30 -0400
committerJeff Garzik <jeff@garzik.org>2006-07-05 21:51:42 -0400
commitb51e9e5db0e36239f786692f1cac6e435ed30c66 (patch)
tree396f2da741820f25174f0ef2d05af957a8dafc22 /include/linux/libata.h
parente6d902a3bfd53da375588e498251f4f4f6cd9650 (diff)
[PATCH] libata: add ap->pflags and move core dynamic flags to it
ap->flags is way too clamped. Separate out core dynamic flags to ap->pflags. ATA_FLAG_DISABLED is a dynamic flag but left alone as it's referenced by a lot of LLDs and it's gonna be removed once all LLDs are converted to new EH. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'include/linux/libata.h')
-rw-r--r--include/linux/libata.h30
1 files changed, 18 insertions, 12 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index f4284bf89758..b5d247d780f8 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -160,22 +160,27 @@ enum {
160 ATA_FLAG_HRST_TO_RESUME = (1 << 11), /* hardreset to resume phy */ 160 ATA_FLAG_HRST_TO_RESUME = (1 << 11), /* hardreset to resume phy */
161 ATA_FLAG_SKIP_D2H_BSY = (1 << 12), /* can't wait for the first D2H 161 ATA_FLAG_SKIP_D2H_BSY = (1 << 12), /* can't wait for the first D2H
162 * Register FIS clearing BSY */ 162 * Register FIS clearing BSY */
163
164 ATA_FLAG_DEBUGMSG = (1 << 13), 163 ATA_FLAG_DEBUGMSG = (1 << 13),
165 ATA_FLAG_FLUSH_PORT_TASK = (1 << 14), /* flush port task */
166 164
167 ATA_FLAG_EH_PENDING = (1 << 15), /* EH pending */ 165 /* The following flag belongs to ap->pflags but is kept in
168 ATA_FLAG_EH_IN_PROGRESS = (1 << 16), /* EH in progress */ 166 * ap->flags because it's referenced in many LLDs and will be
169 ATA_FLAG_FROZEN = (1 << 17), /* port is frozen */ 167 * removed in not-too-distant future.
170 ATA_FLAG_RECOVERED = (1 << 18), /* recovery action performed */ 168 */
171 ATA_FLAG_LOADING = (1 << 19), /* boot/loading probe */ 169 ATA_FLAG_DISABLED = (1 << 23), /* port is disabled, ignore it */
172 ATA_FLAG_UNLOADING = (1 << 20), /* module is unloading */ 170
173 ATA_FLAG_SCSI_HOTPLUG = (1 << 21), /* SCSI hotplug scheduled */ 171 /* bits 24:31 of ap->flags are reserved for LLD specific flags */
174 172
175 ATA_FLAG_DISABLED = (1 << 22), /* port is disabled, ignore it */ 173 /* struct ata_port pflags */
176 ATA_FLAG_SUSPENDED = (1 << 23), /* port is suspended (power) */ 174 ATA_PFLAG_EH_PENDING = (1 << 0), /* EH pending */
175 ATA_PFLAG_EH_IN_PROGRESS = (1 << 1), /* EH in progress */
176 ATA_PFLAG_FROZEN = (1 << 2), /* port is frozen */
177 ATA_PFLAG_RECOVERED = (1 << 3), /* recovery action performed */
178 ATA_PFLAG_LOADING = (1 << 4), /* boot/loading probe */
179 ATA_PFLAG_UNLOADING = (1 << 5), /* module is unloading */
180 ATA_PFLAG_SCSI_HOTPLUG = (1 << 6), /* SCSI hotplug scheduled */
177 181
178 /* bits 24:31 of ap->flags are reserved for LLDD specific flags */ 182 ATA_PFLAG_FLUSH_PORT_TASK = (1 << 16), /* flush port task */
183 ATA_PFLAG_SUSPENDED = (1 << 17), /* port is suspended (power) */
179 184
180 /* struct ata_queued_cmd flags */ 185 /* struct ata_queued_cmd flags */
181 ATA_QCFLAG_ACTIVE = (1 << 0), /* cmd not yet ack'd to scsi lyer */ 186 ATA_QCFLAG_ACTIVE = (1 << 0), /* cmd not yet ack'd to scsi lyer */
@@ -486,6 +491,7 @@ struct ata_port {
486 const struct ata_port_operations *ops; 491 const struct ata_port_operations *ops;
487 spinlock_t *lock; 492 spinlock_t *lock;
488 unsigned long flags; /* ATA_FLAG_xxx */ 493 unsigned long flags; /* ATA_FLAG_xxx */
494 unsigned int pflags; /* ATA_PFLAG_xxx */
489 unsigned int id; /* unique id req'd by scsi midlyr */ 495 unsigned int id; /* unique id req'd by scsi midlyr */
490 unsigned int port_no; /* unique port #; from zero */ 496 unsigned int port_no; /* unique port #; from zero */
491 unsigned int hard_port_no; /* hardware port #; from zero */ 497 unsigned int hard_port_no; /* hardware port #; from zero */