diff options
author | Kristen Carlson Accardi <kristen.c.accardi@intel.com> | 2007-08-15 03:57:11 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-10-12 14:55:33 -0400 |
commit | 9f45cbd3f0fc597530aaf85cad7fe52cd63f1fd8 (patch) | |
tree | 44f9f11250f7629e7091b1532489d7a6539f758a /drivers/ata | |
parent | 05d1efffdc9bf84311bb1a3c2e3db55b544ca119 (diff) |
[libata] check for SATA async notify support
Check to see if an ATAPI device supports Asynchronous Notification.
If so, enable it, if the host controller supports AN.
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/libata-core.c | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index c0f3c78a2be..9f87f7ddd48 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -70,6 +70,7 @@ const unsigned long sata_deb_timing_long[] = { 100, 2000, 5000 }; | |||
70 | static unsigned int ata_dev_init_params(struct ata_device *dev, | 70 | static unsigned int ata_dev_init_params(struct ata_device *dev, |
71 | u16 heads, u16 sectors); | 71 | u16 heads, u16 sectors); |
72 | static unsigned int ata_dev_set_xfermode(struct ata_device *dev); | 72 | static unsigned int ata_dev_set_xfermode(struct ata_device *dev); |
73 | static unsigned int ata_dev_set_AN(struct ata_device *dev, u8 enable); | ||
73 | static void ata_dev_xfermask(struct ata_device *dev); | 74 | static void ata_dev_xfermask(struct ata_device *dev); |
74 | static unsigned long ata_dev_blacklisted(const struct ata_device *dev); | 75 | static unsigned long ata_dev_blacklisted(const struct ata_device *dev); |
75 | 76 | ||
@@ -1987,6 +1988,22 @@ int ata_dev_configure(struct ata_device *dev) | |||
1987 | } | 1988 | } |
1988 | dev->cdb_len = (unsigned int) rc; | 1989 | dev->cdb_len = (unsigned int) rc; |
1989 | 1990 | ||
1991 | /* | ||
1992 | * check to see if this ATAPI device supports | ||
1993 | * Asynchronous Notification | ||
1994 | */ | ||
1995 | if ((ap->flags & ATA_FLAG_AN) && ata_id_has_AN(id)) { | ||
1996 | int err; | ||
1997 | /* issue SET feature command to turn this on */ | ||
1998 | err = ata_dev_set_AN(dev, SETFEATURES_SATA_ENABLE); | ||
1999 | if (err) | ||
2000 | ata_dev_printk(dev, KERN_ERR, | ||
2001 | "unable to set AN, err %x\n", | ||
2002 | err); | ||
2003 | else | ||
2004 | dev->flags |= ATA_DFLAG_AN; | ||
2005 | } | ||
2006 | |||
1990 | if (ata_id_cdb_intr(dev->id)) { | 2007 | if (ata_id_cdb_intr(dev->id)) { |
1991 | dev->flags |= ATA_DFLAG_CDB_INTR; | 2008 | dev->flags |= ATA_DFLAG_CDB_INTR; |
1992 | cdb_intr_string = ", CDB intr"; | 2009 | cdb_intr_string = ", CDB intr"; |
@@ -3975,6 +3992,42 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev) | |||
3975 | } | 3992 | } |
3976 | 3993 | ||
3977 | /** | 3994 | /** |
3995 | * ata_dev_set_AN - Issue SET FEATURES - SATA FEATURES | ||
3996 | * @dev: Device to which command will be sent | ||
3997 | * @enable: Whether to enable or disable the feature | ||
3998 | * | ||
3999 | * Issue SET FEATURES - SATA FEATURES command to device @dev | ||
4000 | * on port @ap with sector count set to indicate Asynchronous | ||
4001 | * Notification feature | ||
4002 | * | ||
4003 | * LOCKING: | ||
4004 | * PCI/etc. bus probe sem. | ||
4005 | * | ||
4006 | * RETURNS: | ||
4007 | * 0 on success, AC_ERR_* mask otherwise. | ||
4008 | */ | ||
4009 | static unsigned int ata_dev_set_AN(struct ata_device *dev, u8 enable) | ||
4010 | { | ||
4011 | struct ata_taskfile tf; | ||
4012 | unsigned int err_mask; | ||
4013 | |||
4014 | /* set up set-features taskfile */ | ||
4015 | DPRINTK("set features - SATA features\n"); | ||
4016 | |||
4017 | ata_tf_init(dev, &tf); | ||
4018 | tf.command = ATA_CMD_SET_FEATURES; | ||
4019 | tf.feature = enable; | ||
4020 | tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE; | ||
4021 | tf.protocol = ATA_PROT_NODATA; | ||
4022 | tf.nsect = SATA_AN; | ||
4023 | |||
4024 | err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0); | ||
4025 | |||
4026 | DPRINTK("EXIT, err_mask=%x\n", err_mask); | ||
4027 | return err_mask; | ||
4028 | } | ||
4029 | |||
4030 | /** | ||
3978 | * ata_dev_init_params - Issue INIT DEV PARAMS command | 4031 | * ata_dev_init_params - Issue INIT DEV PARAMS command |
3979 | * @dev: Device to which command will be sent | 4032 | * @dev: Device to which command will be sent |
3980 | * @heads: Number of heads (taskfile parameter) | 4033 | * @heads: Number of heads (taskfile parameter) |