Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[sfrench/cifs-2.6.git] / drivers / ata / libata-acpi.c
index ed4138e24b0c3bdeae22b64c12421725ac13ee85..c059f78ad944dc18a3372f63a49a14b4b0179441 100644 (file)
 #include <acpi/acmacros.h>
 #include <acpi/actypes.h>
 
-#define SATA_ROOT_PORT(x)      (((x) >> 16) & 0xffff)
-#define SATA_PORT_NUMBER(x)    ((x) & 0xffff)  /* or NO_PORT_MULT */
 #define NO_PORT_MULT           0xffff
-#define SATA_ADR_RSVD          0xffffffff
+#define SATA_ADR(root,pmp)     (((root) << 16) | (pmp))
 
 #define REGS_PER_GTF           7
-struct taskfile_array {
-       u8      tfa[REGS_PER_GTF];      /* regs. 0x1f1 - 0x1f7 */
-};
+struct ata_acpi_gtf {
+       u8      tf[REGS_PER_GTF];       /* regs. 0x1f1 - 0x1f7 */
+} __packed;
 
 /*
  *     Helper - belongs in the PCI layer somewhere eventually
@@ -42,237 +40,173 @@ static int is_pci_dev(struct device *dev)
        return (dev->bus == &pci_bus_type);
 }
 
+static void ata_acpi_associate_sata_port(struct ata_port *ap)
+{
+       acpi_integer adr = SATA_ADR(ap->port_no, NO_PORT_MULT);
+
+       ap->device->acpi_handle = acpi_get_child(ap->host->acpi_handle, adr);
+}
+
+static void ata_acpi_associate_ide_port(struct ata_port *ap)
+{
+       int max_devices, i;
+
+       ap->acpi_handle = acpi_get_child(ap->host->acpi_handle, ap->port_no);
+       if (!ap->acpi_handle)
+               return;
+
+       max_devices = 1;
+       if (ap->flags & ATA_FLAG_SLAVE_POSS)
+               max_devices++;
+
+       for (i = 0; i < max_devices; i++) {
+               struct ata_device *dev = &ap->device[i];
+
+               dev->acpi_handle = acpi_get_child(ap->acpi_handle, i);
+       }
+}
+
 /**
- * sata_get_dev_handle - finds acpi_handle and PCI device.function
- * @dev: device to locate
- * @handle: returned acpi_handle for @dev
- * @pcidevfn: return PCI device.func for @dev
+ * ata_acpi_associate - associate ATA host with ACPI objects
+ * @host: target ATA host
+ *
+ * Look up ACPI objects associated with @host and initialize
+ * acpi_handle fields of @host, its ports and devices accordingly.
  *
- * This function is somewhat SATA-specific.  Or at least the
- * PATA & SATA versions of this function are different,
- * so it's not entirely generic code.
+ * LOCKING:
+ * EH context.
  *
- * Returns 0 on success, <0 on error.
+ * RETURNS:
+ * 0 on success, -errno on failure.
  */
-static int sata_get_dev_handle(struct device *dev, acpi_handle *handle,
-                                       acpi_integer *pcidevfn)
+void ata_acpi_associate(struct ata_host *host)
 {
-       struct pci_dev  *pci_dev;
-       acpi_integer    addr;
-
-       if (!is_pci_dev(dev))
-               return -ENODEV;
-
-       pci_dev = to_pci_dev(dev);      /* NOTE: PCI-specific */
-       /* Please refer to the ACPI spec for the syntax of _ADR. */
-       addr = (PCI_SLOT(pci_dev->devfn) << 16) | PCI_FUNC(pci_dev->devfn);
-       *pcidevfn = addr;
-       *handle = acpi_get_child(DEVICE_ACPI_HANDLE(dev->parent), addr);
-       if (!*handle)
-               return -ENODEV;
-       return 0;
+       int i;
+
+       if (!is_pci_dev(host->dev) || libata_noacpi)
+               return;
+
+       host->acpi_handle = DEVICE_ACPI_HANDLE(host->dev);
+       if (!host->acpi_handle)
+               return;
+
+       for (i = 0; i < host->n_ports; i++) {
+               struct ata_port *ap = host->ports[i];
+
+               if (host->ports[0]->flags & ATA_FLAG_ACPI_SATA)
+                       ata_acpi_associate_sata_port(ap);
+               else
+                       ata_acpi_associate_ide_port(ap);
+       }
 }
 
 /**
- * pata_get_dev_handle - finds acpi_handle and PCI device.function
- * @dev: device to locate
- * @handle: returned acpi_handle for @dev
- * @pcidevfn: return PCI device.func for @dev
+ * ata_acpi_gtm - execute _GTM
+ * @ap: target ATA port
+ * @gtm: out parameter for _GTM result
+ *
+ * Evaluate _GTM and store the result in @gtm.
  *
- * The PATA and SATA versions of this function are different.
+ * LOCKING:
+ * EH context.
  *
- * Returns 0 on success, <0 on error.
+ * RETURNS:
+ * 0 on success, -ENOENT if _GTM doesn't exist, -errno on failure.
  */
-static int pata_get_dev_handle(struct device *dev, acpi_handle *handle,
-                               acpi_integer *pcidevfn)
+static int ata_acpi_gtm(const struct ata_port *ap, struct ata_acpi_gtm *gtm)
 {
-       unsigned int bus, devnum, func;
-       acpi_integer addr;
-       acpi_handle dev_handle, parent_handle;
-       struct acpi_buffer buffer = {.length = ACPI_ALLOCATE_BUFFER,
-                                       .pointer = NULL};
+       struct acpi_buffer output = { .length = ACPI_ALLOCATE_BUFFER };
+       union acpi_object *out_obj;
        acpi_status status;
-       struct acpi_device_info *dinfo = NULL;
-       int ret = -ENODEV;
-       struct pci_dev *pdev;
-
-       if (!is_pci_dev(dev))
-               return -ENODEV;
-
-       pdev = to_pci_dev(dev);
-
-       bus = pdev->bus->number;
-       devnum = PCI_SLOT(pdev->devfn);
-       func = PCI_FUNC(pdev->devfn);
-
-       dev_handle = DEVICE_ACPI_HANDLE(dev);
-       parent_handle = DEVICE_ACPI_HANDLE(dev->parent);
-
-       status = acpi_get_object_info(parent_handle, &buffer);
-       if (ACPI_FAILURE(status))
-               goto err;
-
-       dinfo = buffer.pointer;
-       if (dinfo && (dinfo->valid & ACPI_VALID_ADR) &&
-           dinfo->address == bus) {
-               /* ACPI spec for _ADR for PCI bus: */
-               addr = (acpi_integer)(devnum << 16 | func);
-               *pcidevfn = addr;
-               *handle = dev_handle;
-       } else {
-               goto err;
+       int rc = 0;
+
+       status = acpi_evaluate_object(ap->acpi_handle, "_GTM", NULL, &output);
+
+       rc = -ENOENT;
+       if (status == AE_NOT_FOUND)
+               goto out_free;
+
+       rc = -EINVAL;
+       if (ACPI_FAILURE(status)) {
+               ata_port_printk(ap, KERN_ERR,
+                               "ACPI get timing mode failed (AE 0x%x)\n",
+                               status);
+               goto out_free;
        }
 
-       if (!*handle)
-               goto err;
-       ret = 0;
-err:
-       kfree(dinfo);
-       return ret;
-}
+       out_obj = output.pointer;
+       if (out_obj->type != ACPI_TYPE_BUFFER) {
+               ata_port_printk(ap, KERN_WARNING,
+                               "_GTM returned unexpected object type 0x%x\n",
+                               out_obj->type);
 
-struct walk_info {             /* can be trimmed some */
-       struct device   *dev;
-       struct acpi_device *adev;
-       acpi_handle     handle;
-       acpi_integer    pcidevfn;
-       unsigned int    drivenum;
-       acpi_handle     obj_handle;
-       struct ata_port *ataport;
-       struct ata_device *atadev;
-       u32             sata_adr;
-       int             status;
-       char            basepath[ACPI_PATHNAME_MAX];
-       int             basepath_len;
-};
-
-static acpi_status get_devices(acpi_handle handle,
-                               u32 level, void *context, void **return_value)
-{
-       acpi_status             status;
-       struct walk_info        *winfo = context;
-       struct acpi_buffer      namebuf = {ACPI_ALLOCATE_BUFFER, NULL};
-       char                    *pathname;
-       struct acpi_buffer      buffer;
-       struct acpi_device_info *dinfo;
-
-       status = acpi_get_name(handle, ACPI_FULL_PATHNAME, &namebuf);
-       if (status)
-               goto ret;
-       pathname = namebuf.pointer;
-
-       buffer.length = ACPI_ALLOCATE_BUFFER;
-       buffer.pointer = NULL;
-       status = acpi_get_object_info(handle, &buffer);
-       if (ACPI_FAILURE(status))
-               goto out2;
-
-       dinfo = buffer.pointer;
-
-       /* find full device path name for pcidevfn */
-       if (dinfo && (dinfo->valid & ACPI_VALID_ADR) &&
-           dinfo->address == winfo->pcidevfn) {
-               if (ata_msg_probe(winfo->ataport))
-                       ata_dev_printk(winfo->atadev, KERN_DEBUG,
-                               ":%s: matches pcidevfn (0x%llx)\n",
-                               pathname, winfo->pcidevfn);
-               strlcpy(winfo->basepath, pathname,
-                       sizeof(winfo->basepath));
-               winfo->basepath_len = strlen(pathname);
-               goto out;
+               goto out_free;
        }
 
-       /* if basepath is not yet known, ignore this object */
-       if (!winfo->basepath_len)
-               goto out;
-
-       /* if this object is in scope of basepath, maybe use it */
-       if (strncmp(pathname, winfo->basepath,
-           winfo->basepath_len) == 0) {
-               if (!(dinfo->valid & ACPI_VALID_ADR))
-                       goto out;
-               if (ata_msg_probe(winfo->ataport))
-                       ata_dev_printk(winfo->atadev, KERN_DEBUG,
-                               "GOT ONE: (%s) root_port = 0x%llx,"
-                               " port_num = 0x%llx\n", pathname,
-                               SATA_ROOT_PORT(dinfo->address),
-                               SATA_PORT_NUMBER(dinfo->address));
-               /* heuristics: */
-               if (SATA_PORT_NUMBER(dinfo->address) != NO_PORT_MULT)
-                       if (ata_msg_probe(winfo->ataport))
-                               ata_dev_printk(winfo->atadev,
-                                       KERN_DEBUG, "warning: don't"
-                                       " know how to handle SATA port"
-                                       " multiplier\n");
-               if (SATA_ROOT_PORT(dinfo->address) ==
-                       winfo->ataport->port_no &&
-                   SATA_PORT_NUMBER(dinfo->address) == NO_PORT_MULT) {
-                       if (ata_msg_probe(winfo->ataport))
-                               ata_dev_printk(winfo->atadev,
-                                       KERN_DEBUG,
-                                       "THIS ^^^^^ is the requested"
-                                       " SATA drive (handle = 0x%p)\n",
-                                       handle);
-                       winfo->sata_adr = dinfo->address;
-                       winfo->obj_handle = handle;
-               }
+       if (out_obj->buffer.length != sizeof(struct ata_acpi_gtm)) {
+               ata_port_printk(ap, KERN_ERR,
+                               "_GTM returned invalid length %d\n",
+                               out_obj->buffer.length);
+               goto out_free;
        }
-out:
-       kfree(dinfo);
-out2:
-       kfree(pathname);
 
-ret:
-       return status;
+       memcpy(gtm, out_obj->buffer.pointer, sizeof(struct ata_acpi_gtm));
+       rc = 0;
+ out_free:
+       kfree(output.pointer);
+       return rc;
 }
 
-/* Get the SATA drive _ADR object. */
-static int get_sata_adr(struct device *dev, acpi_handle handle,
-                       acpi_integer pcidevfn, unsigned int drive,
-                       struct ata_port *ap,
-                       struct ata_device *atadev, u32 *dev_adr)
+/**
+ * ata_acpi_stm - execute _STM
+ * @ap: target ATA port
+ * @stm: timing parameter to _STM
+ *
+ * Evaluate _STM with timing parameter @stm.
+ *
+ * LOCKING:
+ * EH context.
+ *
+ * RETURNS:
+ * 0 on success, -ENOENT if _STM doesn't exist, -errno on failure.
+ */
+static int ata_acpi_stm(const struct ata_port *ap, struct ata_acpi_gtm *stm)
 {
-       acpi_status     status;
-       struct walk_info *winfo;
-       int             err = -ENOMEM;
-
-       winfo = kzalloc(sizeof(struct walk_info), GFP_KERNEL);
-       if (!winfo)
-               goto out;
-
-       winfo->dev = dev;
-       winfo->atadev = atadev;
-       winfo->ataport = ap;
-       if (acpi_bus_get_device(handle, &winfo->adev) < 0)
-               if (ata_msg_probe(ap))
-                       ata_dev_printk(winfo->atadev, KERN_DEBUG,
-                               "acpi_bus_get_device failed\n");
-       winfo->handle = handle;
-       winfo->pcidevfn = pcidevfn;
-       winfo->drivenum = drive;
+       acpi_status status;
+       struct acpi_object_list         input;
+       union acpi_object               in_params[3];
 
-       status = acpi_get_devices(NULL, get_devices, winfo, NULL);
+       in_params[0].type = ACPI_TYPE_BUFFER;
+       in_params[0].buffer.length = sizeof(struct ata_acpi_gtm);
+       in_params[0].buffer.pointer = (u8 *)stm;
+       /* Buffers for id may need byteswapping ? */
+       in_params[1].type = ACPI_TYPE_BUFFER;
+       in_params[1].buffer.length = 512;
+       in_params[1].buffer.pointer = (u8 *)ap->device[0].id;
+       in_params[2].type = ACPI_TYPE_BUFFER;
+       in_params[2].buffer.length = 512;
+       in_params[2].buffer.pointer = (u8 *)ap->device[1].id;
+
+       input.count = 3;
+       input.pointer = in_params;
+
+       status = acpi_evaluate_object(ap->acpi_handle, "_STM", &input, NULL);
+
+       if (status == AE_NOT_FOUND)
+               return -ENOENT;
        if (ACPI_FAILURE(status)) {
-               if (ata_msg_probe(ap))
-                       ata_dev_printk(winfo->atadev, KERN_DEBUG,
-                               "%s: acpi_get_devices failed\n",
-                               __FUNCTION__);
-               err = -ENODEV;
-       } else {
-               *dev_adr = winfo->sata_adr;
-               atadev->obj_handle = winfo->obj_handle;
-               err = 0;
+               ata_port_printk(ap, KERN_ERR,
+                       "ACPI set timing mode failed (status=0x%x)\n", status);
+               return -EINVAL;
        }
-       kfree(winfo);
-out:
-       return err;
+       return 0;
 }
 
 /**
- * do_drive_get_GTF - get the drive bootup default taskfile settings
+ * ata_dev_get_GTF - get the drive bootup default taskfile settings
  * @dev: target ATA device
- * @gtf_length: number of bytes of _GTF data returned at @gtf_address
- * @gtf_address: buffer containing _GTF taskfile arrays
+ * @gtf: output parameter for buffer containing _GTF taskfile arrays
+ * @ptr_to_free: pointer which should be freed
  *
  * This applies to both PATA and SATA drives.
  *
@@ -282,121 +216,41 @@ out:
  * The <variable number> is not known in advance, so have ACPI-CA
  * allocate the buffer as needed and return it, then free it later.
  *
- * The returned @gtf_length and @gtf_address are only valid if the
- * function return value is 0.
+ * LOCKING:
+ * EH context.
+ *
+ * RETURNS:
+ * Number of taskfiles on success, 0 if _GTF doesn't exist or doesn't
+ * contain valid data.  -errno on other errors.
  */
-static int do_drive_get_GTF(struct ata_device *dev, unsigned int *gtf_length,
-                           unsigned long *gtf_address, unsigned long *obj_loc)
+static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf,
+                          void **ptr_to_free)
 {
        struct ata_port *ap = dev->ap;
        acpi_status status;
-       acpi_handle dev_handle = NULL;
-       acpi_handle chan_handle, drive_handle;
-       acpi_integer pcidevfn = 0;
-       u32 dev_adr;
        struct acpi_buffer output;
        union acpi_object *out_obj;
-       struct device *gdev = ap->host->dev;
-       int err = -ENODEV;
+       int rc = 0;
 
-       *gtf_length = 0;
-       *gtf_address = 0UL;
-       *obj_loc = 0UL;
-
-       if (libata_noacpi)
-               return 0;
+       /* set up output buffer */
+       output.length = ACPI_ALLOCATE_BUFFER;
+       output.pointer = NULL;  /* ACPI-CA sets this; save/free it later */
 
        if (ata_msg_probe(ap))
                ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER: port#: %d\n",
                               __FUNCTION__, ap->port_no);
 
-       if (!ata_dev_enabled(dev) || (ap->flags & ATA_FLAG_DISABLED)) {
-               if (ata_msg_probe(ap))
-                       ata_dev_printk(dev, KERN_DEBUG, "%s: ERR: "
-                               "ata_dev_present: %d, PORT_DISABLED: %lu\n",
-                               __FUNCTION__, ata_dev_enabled(dev),
-                               ap->flags & ATA_FLAG_DISABLED);
-               goto out;
-       }
-
-       /* Don't continue if device has no _ADR method.
-        * _GTF is intended for known motherboard devices. */
-       if (!(ap->cbl == ATA_CBL_SATA)) {
-               err = pata_get_dev_handle(gdev, &dev_handle, &pcidevfn);
-               if (err < 0) {
-                       if (ata_msg_probe(ap))
-                               ata_dev_printk(dev, KERN_DEBUG,
-                                       "%s: pata_get_dev_handle failed (%d)\n",
-                                       __FUNCTION__, err);
-                       goto out;
-               }
-       } else {
-               err = sata_get_dev_handle(gdev, &dev_handle, &pcidevfn);
-               if (err < 0) {
-                       if (ata_msg_probe(ap))
-                               ata_dev_printk(dev, KERN_DEBUG,
-                                       "%s: sata_get_dev_handle failed (%d\n",
-                                       __FUNCTION__, err);
-                       goto out;
-               }
-       }
-
-       /* Get this drive's _ADR info. if not already known. */
-       if (!dev->obj_handle) {
-               if (!(ap->cbl == ATA_CBL_SATA)) {
-                       /* get child objects of dev_handle == channel objects,
-                        * + _their_ children == drive objects */
-                       /* channel is ap->port_no */
-                       chan_handle = acpi_get_child(dev_handle,
-                                               ap->port_no);
-                       if (ata_msg_probe(ap))
-                               ata_dev_printk(dev, KERN_DEBUG,
-                                       "%s: chan adr=%d: chan_handle=0x%p\n",
-                                       __FUNCTION__, ap->port_no,
-                                       chan_handle);
-                       if (!chan_handle) {
-                               err = -ENODEV;
-                               goto out;
-                       }
-                       /* TBD: could also check ACPI object VALID bits */
-                       drive_handle = acpi_get_child(chan_handle, dev->devno);
-                       if (!drive_handle) {
-                               err = -ENODEV;
-                               goto out;
-                       }
-                       dev_adr = dev->devno;
-                       dev->obj_handle = drive_handle;
-               } else {        /* for SATA mode */
-                       dev_adr = SATA_ADR_RSVD;
-                       err = get_sata_adr(gdev, dev_handle, pcidevfn, 0,
-                                       ap, dev, &dev_adr);
-               }
-               if (err < 0 || dev_adr == SATA_ADR_RSVD ||
-                   !dev->obj_handle) {
-                       if (ata_msg_probe(ap))
-                               ata_dev_printk(dev, KERN_DEBUG,
-                                       "%s: get_sata/pata_adr failed: "
-                                       "err=%d, dev_adr=%u, obj_handle=0x%p\n",
-                                       __FUNCTION__, err, dev_adr,
-                                       dev->obj_handle);
-                       goto out;
-               }
-       }
-
-       /* Setting up output buffer */
-       output.length = ACPI_ALLOCATE_BUFFER;
-       output.pointer = NULL;  /* ACPI-CA sets this; save/free it later */
-
        /* _GTF has no input parameters */
-       err = -EIO;
-       status = acpi_evaluate_object(dev->obj_handle, "_GTF",
-                                       NULL, &output);
+       status = acpi_evaluate_object(dev->acpi_handle, "_GTF", NULL, &output);
+
        if (ACPI_FAILURE(status)) {
-               if (ata_msg_probe(ap))
-                       ata_dev_printk(dev, KERN_DEBUG,
-                               "%s: Run _GTF error: status = 0x%x\n",
-                               __FUNCTION__, status);
-               goto out;
+               if (status != AE_NOT_FOUND) {
+                       ata_dev_printk(dev, KERN_WARNING,
+                                      "_GTF evaluation failed (AE 0x%x)\n",
+                                      status);
+                       rc = -EIO;
+               }
+               goto out_free;
        }
 
        if (!output.length || !output.pointer) {
@@ -406,43 +260,39 @@ static int do_drive_get_GTF(struct ata_device *dev, unsigned int *gtf_length,
                                __FUNCTION__,
                                (unsigned long long)output.length,
                                output.pointer);
-               kfree(output.pointer);
-               goto out;
+               goto out_free;
        }
 
        out_obj = output.pointer;
        if (out_obj->type != ACPI_TYPE_BUFFER) {
-               kfree(output.pointer);
-               if (ata_msg_probe(ap))
-                       ata_dev_printk(dev, KERN_DEBUG, "%s: Run _GTF: "
-                               "error: expected object type of "
-                               " ACPI_TYPE_BUFFER, got 0x%x\n",
-                               __FUNCTION__, out_obj->type);
-               err = -ENOENT;
-               goto out;
+               ata_dev_printk(dev, KERN_WARNING,
+                              "_GTF unexpected object type 0x%x\n",
+                              out_obj->type);
+               rc = -EINVAL;
+               goto out_free;
        }
 
-       if (!out_obj->buffer.length || !out_obj->buffer.pointer ||
-           out_obj->buffer.length % REGS_PER_GTF) {
-               if (ata_msg_drv(ap))
-                       ata_dev_printk(dev, KERN_ERR,
-                               "%s: unexpected GTF length (%d) or addr (0x%p)\n",
-                               __FUNCTION__, out_obj->buffer.length,
-                               out_obj->buffer.pointer);
-               err = -ENOENT;
-               goto out;
+       if (out_obj->buffer.length % REGS_PER_GTF) {
+               ata_dev_printk(dev, KERN_WARNING,
+                              "unexpected _GTF length (%d)\n",
+                              out_obj->buffer.length);
+               rc = -EINVAL;
+               goto out_free;
        }
 
-       *gtf_length = out_obj->buffer.length;
-       *gtf_address = (unsigned long)out_obj->buffer.pointer;
-       *obj_loc = (unsigned long)out_obj;
+       *ptr_to_free = out_obj;
+       *gtf = (void *)out_obj->buffer.pointer;
+       rc = out_obj->buffer.length / REGS_PER_GTF;
+
        if (ata_msg_probe(ap))
                ata_dev_printk(dev, KERN_DEBUG, "%s: returning "
-                       "gtf_length=%d, gtf_address=0x%lx, obj_loc=0x%lx\n",
-                       __FUNCTION__, *gtf_length, *gtf_address, *obj_loc);
-       err = 0;
-out:
-       return err;
+                       "gtf=%p, gtf_count=%d, ptr_to_free=%p\n",
+                       __FUNCTION__, *gtf, rc, *ptr_to_free);
+       return rc;
+
+ out_free:
+       kfree(output.pointer);
+       return rc;
 }
 
 /**
@@ -461,154 +311,99 @@ out:
  * function also waits for idle after writing control and before
  * writing the remaining registers.
  *
- * LOCKING: TBD:
- * Inherited from caller.
+ * LOCKING:
+ * EH context.
+ *
+ * RETURNS:
+ * 0 on success, -errno on failure.
  */
-static void taskfile_load_raw(struct ata_device *dev,
-                             const struct taskfile_array *gtf)
+static int taskfile_load_raw(struct ata_device *dev,
+                             const struct ata_acpi_gtf *gtf)
 {
        struct ata_port *ap = dev->ap;
-       struct ata_taskfile tf;
-       unsigned int err;
+       struct ata_taskfile tf, rtf;
+       unsigned int err_mask;
 
-       if (ata_msg_probe(ap))
-               ata_dev_printk(dev, KERN_DEBUG, "%s: (0x1f1-1f7): hex: "
-                       "%02x %02x %02x %02x %02x %02x %02x\n",
-                       __FUNCTION__,
-                       gtf->tfa[0], gtf->tfa[1], gtf->tfa[2],
-                       gtf->tfa[3], gtf->tfa[4], gtf->tfa[5], gtf->tfa[6]);
-
-       if ((gtf->tfa[0] == 0) && (gtf->tfa[1] == 0) && (gtf->tfa[2] == 0)
-           && (gtf->tfa[3] == 0) && (gtf->tfa[4] == 0) && (gtf->tfa[5] == 0)
-           && (gtf->tfa[6] == 0))
-               return;
+       if ((gtf->tf[0] == 0) && (gtf->tf[1] == 0) && (gtf->tf[2] == 0)
+           && (gtf->tf[3] == 0) && (gtf->tf[4] == 0) && (gtf->tf[5] == 0)
+           && (gtf->tf[6] == 0))
+               return 0;
 
        ata_tf_init(dev, &tf);
 
        /* convert gtf to tf */
        tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE; /* TBD */
        tf.protocol = ATA_PROT_NODATA;
-       tf.feature = gtf->tfa[0];       /* 0x1f1 */
-       tf.nsect   = gtf->tfa[1];       /* 0x1f2 */
-       tf.lbal    = gtf->tfa[2];       /* 0x1f3 */
-       tf.lbam    = gtf->tfa[3];       /* 0x1f4 */
-       tf.lbah    = gtf->tfa[4];       /* 0x1f5 */
-       tf.device  = gtf->tfa[5];       /* 0x1f6 */
-       tf.command = gtf->tfa[6];       /* 0x1f7 */
-
-       err = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0);
-       if (err && ata_msg_probe(ap))
-               ata_dev_printk(dev, KERN_ERR,
-                       "%s: ata_exec_internal failed: %u\n",
-                       __FUNCTION__, err);
-}
-
-/**
- * do_drive_set_taskfiles - write the drive taskfile settings from _GTF
- * @dev: target ATA device
- * @gtf_length: total number of bytes of _GTF taskfiles
- * @gtf_address: location of _GTF taskfile arrays
- *
- * This applies to both PATA and SATA drives.
- *
- * Write {gtf_address, length gtf_length} in groups of
- * REGS_PER_GTF bytes.
- */
-static int do_drive_set_taskfiles(struct ata_device *dev,
-                                 unsigned int gtf_length,
-                                 unsigned long gtf_address)
-{
-       struct ata_port *ap = dev->ap;
-       int err = -ENODEV;
-       int gtf_count = gtf_length / REGS_PER_GTF;
-       int ix;
-       struct taskfile_array   *gtf;
+       tf.feature = gtf->tf[0];        /* 0x1f1 */
+       tf.nsect   = gtf->tf[1];        /* 0x1f2 */
+       tf.lbal    = gtf->tf[2];        /* 0x1f3 */
+       tf.lbam    = gtf->tf[3];        /* 0x1f4 */
+       tf.lbah    = gtf->tf[4];        /* 0x1f5 */
+       tf.device  = gtf->tf[5];        /* 0x1f6 */
+       tf.command = gtf->tf[6];        /* 0x1f7 */
 
        if (ata_msg_probe(ap))
-               ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER: port#: %d\n",
-                              __FUNCTION__, ap->port_no);
-
-       if (libata_noacpi || !(ap->cbl == ATA_CBL_SATA))
-               return 0;
-
-       if (!ata_dev_enabled(dev) || (ap->flags & ATA_FLAG_DISABLED))
-               goto out;
-       if (!gtf_count)         /* shouldn't be here */
-               goto out;
-
-       if (gtf_length % REGS_PER_GTF) {
-               if (ata_msg_drv(ap))
-                       ata_dev_printk(dev, KERN_ERR,
-                               "%s: unexpected GTF length (%d)\n",
-                               __FUNCTION__, gtf_length);
-               goto out;
-       }
-
-       for (ix = 0; ix < gtf_count; ix++) {
-               gtf = (struct taskfile_array *)
-                       (gtf_address + ix * REGS_PER_GTF);
-
-               /* send all TaskFile registers (0x1f1-0x1f7) *in*that*order* */
-               taskfile_load_raw(dev, gtf);
+               ata_dev_printk(dev, KERN_DEBUG, "executing ACPI cmd "
+                              "%02x/%02x:%02x:%02x:%02x:%02x:%02x\n",
+                              tf.command, tf.feature, tf.nsect,
+                              tf.lbal, tf.lbam, tf.lbah, tf.device);
+
+       rtf = tf;
+       err_mask = ata_exec_internal(dev, &rtf, NULL, DMA_NONE, NULL, 0);
+       if (err_mask) {
+               ata_dev_printk(dev, KERN_ERR,
+                       "ACPI cmd %02x/%02x:%02x:%02x:%02x:%02x:%02x failed "
+                       "(Emask=0x%x Stat=0x%02x Err=0x%02x)\n",
+                       tf.command, tf.feature, tf.nsect, tf.lbal, tf.lbam,
+                       tf.lbah, tf.device, err_mask, rtf.command, rtf.feature);
+               return -EIO;
        }
 
-       err = 0;
-out:
-       return err;
+       return 0;
 }
 
 /**
  * ata_acpi_exec_tfs - get then write drive taskfile settings
- * @ap: the ata_port for the drive
+ * @dev: target ATA device
  *
- * This applies to both PATA and SATA drives.
+ * Evaluate _GTF and excute returned taskfiles.
+ *
+ * LOCKING:
+ * EH context.
+ *
+ * RETURNS:
+ * Number of executed taskfiles on success, 0 if _GTF doesn't exist or
+ * doesn't contain valid data.  -errno on other errors.
  */
-int ata_acpi_exec_tfs(struct ata_port *ap)
+static int ata_acpi_exec_tfs(struct ata_device *dev)
 {
-       int ix;
-       int ret = 0;
-       unsigned int gtf_length;
-       unsigned long gtf_address;
-       unsigned long obj_loc;
-
-       if (libata_noacpi)
-               return 0;
-       /*
-        * TBD - implement PATA support.  For now,
-        * we should not run GTF on PATA devices since some
-        * PATA require execution of GTM/STM before GTF.
-        */
-       if (!(ap->cbl == ATA_CBL_SATA))
-               return 0;
-
-       for (ix = 0; ix < ATA_MAX_DEVICES; ix++) {
-               struct ata_device *dev = &ap->device[ix];
-
-               if (!ata_dev_enabled(dev))
-                       continue;
-
-               ret = do_drive_get_GTF(dev, &gtf_length, &gtf_address,
-                                      &obj_loc);
-               if (ret < 0) {
-                       if (ata_msg_probe(ap))
-                               ata_port_printk(ap, KERN_DEBUG,
-                                       "%s: get_GTF error (%d)\n",
-                                       __FUNCTION__, ret);
-                       break;
-               }
-
-               ret = do_drive_set_taskfiles(dev, gtf_length, gtf_address);
-               kfree((void *)obj_loc);
-               if (ret < 0) {
-                       if (ata_msg_probe(ap))
-                               ata_port_printk(ap, KERN_DEBUG,
-                                       "%s: set_taskfiles error (%d)\n",
-                                       __FUNCTION__, ret);
-                       break;
-               }
+       struct ata_acpi_gtf *gtf = NULL;
+       void *ptr_to_free = NULL;
+       int gtf_count, i, rc;
+
+       /* get taskfiles */
+       rc = ata_dev_get_GTF(dev, &gtf, &ptr_to_free);
+       if (rc < 0)
+               return rc;
+       gtf_count = rc;
+
+       /* execute them */
+       for (i = 0, rc = 0; i < gtf_count; i++) {
+               int tmp;
+
+               /* ACPI errors are eventually ignored.  Run till the
+                * end even after errors.
+                */
+               tmp = taskfile_load_raw(dev, gtf++);
+               if (!rc)
+                       rc = tmp;
        }
 
-       return ret;
+       kfree(ptr_to_free);
+
+       if (rc == 0)
+               return gtf_count;
+       return rc;
 }
 
 /**
@@ -620,62 +415,25 @@ int ata_acpi_exec_tfs(struct ata_port *ap)
  * ATM this function never returns a failure.  It is an optional
  * method and if it fails for whatever reason, we should still
  * just keep going.
+ *
+ * LOCKING:
+ * EH context.
+ *
+ * RETURNS:
+ * 0 on success, -errno on failure.
  */
-int ata_acpi_push_id(struct ata_device *dev)
+static int ata_acpi_push_id(struct ata_device *dev)
 {
        struct ata_port *ap = dev->ap;
-       acpi_handle handle;
-       acpi_integer pcidevfn;
        int err;
-       struct device *gdev = ap->host->dev;
-       u32 dev_adr;
        acpi_status status;
        struct acpi_object_list input;
        union acpi_object in_params[1];
 
-       if (libata_noacpi)
-               return 0;
-
        if (ata_msg_probe(ap))
                ata_dev_printk(dev, KERN_DEBUG, "%s: ix = %d, port#: %d\n",
                               __FUNCTION__, dev->devno, ap->port_no);
 
-       /* Don't continue if not a SATA device. */
-       if (!(ap->cbl == ATA_CBL_SATA)) {
-               if (ata_msg_probe(ap))
-                       ata_dev_printk(dev, KERN_DEBUG,
-                               "%s: Not a SATA device\n", __FUNCTION__);
-               goto out;
-       }
-
-       /* Don't continue if device has no _ADR method.
-        * _SDD is intended for known motherboard devices. */
-       err = sata_get_dev_handle(gdev, &handle, &pcidevfn);
-       if (err < 0) {
-               if (ata_msg_probe(ap))
-                       ata_dev_printk(dev, KERN_DEBUG,
-                               "%s: sata_get_dev_handle failed (%d\n",
-                               __FUNCTION__, err);
-               goto out;
-       }
-
-       /* Get this drive's _ADR info, if not already known */
-       if (!dev->obj_handle) {
-               dev_adr = SATA_ADR_RSVD;
-               err = get_sata_adr(gdev, handle, pcidevfn, dev->devno, ap, dev,
-                                       &dev_adr);
-               if (err < 0 || dev_adr == SATA_ADR_RSVD ||
-                       !dev->obj_handle) {
-                       if (ata_msg_probe(ap))
-                               ata_dev_printk(dev, KERN_DEBUG,
-                                       "%s: get_sata_adr failed: "
-                                       "err=%d, dev_adr=%u, obj_handle=0x%p\n",
-                                       __FUNCTION__, err, dev_adr,
-                                       dev->obj_handle);
-                       goto out;
-               }
-       }
-
        /* Give the drive Identify data to the drive via the _SDD method */
        /* _SDD: set up input parameters */
        input.count = 1;
@@ -687,20 +445,150 @@ int ata_acpi_push_id(struct ata_device *dev)
 
        /* It's OK for _SDD to be missing too. */
        swap_buf_le16(dev->id, ATA_ID_WORDS);
-       status = acpi_evaluate_object(dev->obj_handle, "_SDD", &input, NULL);
+       status = acpi_evaluate_object(dev->acpi_handle, "_SDD", &input, NULL);
        swap_buf_le16(dev->id, ATA_ID_WORDS);
 
        err = ACPI_FAILURE(status) ? -EIO : 0;
-       if (err < 0) {
-               if (ata_msg_probe(ap))
-                       ata_dev_printk(dev, KERN_DEBUG,
-                                      "%s _SDD error: status = 0x%x\n",
-                                      __FUNCTION__, status);
+       if (err < 0)
+               ata_dev_printk(dev, KERN_WARNING,
+                              "ACPI _SDD failed (AE 0x%x)\n", status);
+
+       return err;
+}
+
+/**
+ * ata_acpi_on_suspend - ATA ACPI hook called on suspend
+ * @ap: target ATA port
+ *
+ * This function is called when @ap is about to be suspended.  All
+ * devices are already put to sleep but the port_suspend() callback
+ * hasn't been executed yet.  Error return from this function aborts
+ * suspend.
+ *
+ * LOCKING:
+ * EH context.
+ *
+ * RETURNS:
+ * 0 on success, -errno on failure.
+ */
+int ata_acpi_on_suspend(struct ata_port *ap)
+{
+       unsigned long flags;
+       int rc;
+
+       /* proceed iff per-port acpi_handle is valid */
+       if (!ap->acpi_handle)
+               return 0;
+       BUG_ON(ap->flags & ATA_FLAG_ACPI_SATA);
+
+       /* store timing parameters */
+       rc = ata_acpi_gtm(ap, &ap->acpi_gtm);
+
+       spin_lock_irqsave(ap->lock, flags);
+       if (rc == 0)
+               ap->pflags |= ATA_PFLAG_GTM_VALID;
+       else
+               ap->pflags &= ~ATA_PFLAG_GTM_VALID;
+       spin_unlock_irqrestore(ap->lock, flags);
+
+       if (rc == -ENOENT)
+               rc = 0;
+       return rc;
+}
+
+/**
+ * ata_acpi_on_resume - ATA ACPI hook called on resume
+ * @ap: target ATA port
+ *
+ * This function is called when @ap is resumed - right after port
+ * itself is resumed but before any EH action is taken.
+ *
+ * LOCKING:
+ * EH context.
+ */
+void ata_acpi_on_resume(struct ata_port *ap)
+{
+       int i;
+
+       if (ap->acpi_handle && (ap->pflags & ATA_PFLAG_GTM_VALID)) {
+               BUG_ON(ap->flags & ATA_FLAG_ACPI_SATA);
+
+               /* restore timing parameters */
+               ata_acpi_stm(ap, &ap->acpi_gtm);
        }
 
-       /* always return success */
-out:
-       return 0;
+       /* schedule _GTF */
+       for (i = 0; i < ATA_MAX_DEVICES; i++)
+               ap->device[i].flags |= ATA_DFLAG_ACPI_PENDING;
 }
 
+/**
+ * ata_acpi_on_devcfg - ATA ACPI hook called on device donfiguration
+ * @dev: target ATA device
+ *
+ * This function is called when @dev is about to be configured.
+ * IDENTIFY data might have been modified after this hook is run.
+ *
+ * LOCKING:
+ * EH context.
+ *
+ * RETURNS:
+ * Positive number if IDENTIFY data needs to be refreshed, 0 if not,
+ * -errno on failure.
+ */
+int ata_acpi_on_devcfg(struct ata_device *dev)
+{
+       struct ata_port *ap = dev->ap;
+       struct ata_eh_context *ehc = &ap->eh_context;
+       int acpi_sata = ap->flags & ATA_FLAG_ACPI_SATA;
+       int rc;
+
+       if (!dev->acpi_handle)
+               return 0;
+
+       /* do we need to do _GTF? */
+       if (!(dev->flags & ATA_DFLAG_ACPI_PENDING) &&
+           !(acpi_sata && (ehc->i.flags & ATA_EHI_DID_HARDRESET)))
+               return 0;
+
+       /* do _SDD if SATA */
+       if (acpi_sata) {
+               rc = ata_acpi_push_id(dev);
+               if (rc)
+                       goto acpi_err;
+       }
+
+       /* do _GTF */
+       rc = ata_acpi_exec_tfs(dev);
+       if (rc < 0)
+               goto acpi_err;
+
+       dev->flags &= ~ATA_DFLAG_ACPI_PENDING;
+
+       /* refresh IDENTIFY page if any _GTF command has been executed */
+       if (rc > 0) {
+               rc = ata_dev_reread_id(dev, 0);
+               if (rc < 0) {
+                       ata_dev_printk(dev, KERN_ERR, "failed to IDENTIFY "
+                                      "after ACPI commands\n");
+                       return rc;
+               }
+       }
 
+       return 0;
+
+ acpi_err:
+       /* let EH retry on the first failure, disable ACPI on the second */
+       if (dev->flags & ATA_DFLAG_ACPI_FAILED) {
+               ata_dev_printk(dev, KERN_WARNING, "ACPI on devcfg failed the "
+                              "second time, disabling (errno=%d)\n", rc);
+
+               dev->acpi_handle = NULL;
+
+               /* if port is working, request IDENTIFY reload and continue */
+               if (!(ap->pflags & ATA_PFLAG_FROZEN))
+                       rc = 1;
+       }
+       dev->flags |= ATA_DFLAG_ACPI_FAILED;
+       return rc;
+}