1 files changed, 21 insertions, 8 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index ef52a07c43d8..124033cb5e9b 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -119,6 +119,8 @@ enum {
         ATA_DEF_BUSY_WAIT       = 10000,
         ATA_SHORT_PAUSE         = (HZ >> 6) + 1,
 
+        ATAPI_MAX_DRAIN         = 16 << 10,
+
         ATA_SHT_EMULATED        = 1,
         ATA_SHT_CMD_PER_LUN     = 1,
         ATA_SHT_THIS_ID         = -1,
@@ -211,7 +213,7 @@ enum {
 
         ATA_PFLAG_SUSPENDED     = (1 << 17), /* port is suspended (power) */
         ATA_PFLAG_PM_PENDING    = (1 << 18), /* PM operation pending */
-        ATA_PFLAG_GTM_VALID     = (1 << 19), /* acpi_gtm data valid */
+        ATA_PFLAG_INIT_GTM_VALID = (1 << 19), /* initial gtm data valid */
 
         /* struct ata_queued_cmd flags */
         ATA_QCFLAG_ACTIVE       = (1 << 0), /* cmd not yet ack'd to scsi lyer */
@@ -498,6 +500,7 @@ struct ata_device {
         struct scsi_device      *sdev;          /* attached SCSI device */
 #ifdef CONFIG_ATA_ACPI
         acpi_handle             acpi_handle;
+        union acpi_object       *gtf_cache;
 #endif
         /* n_sector is used as CLEAR_OFFSET, read comment above CLEAR_OFFSET */
         u64                     n_sectors;      /* size of device, if ATA */
@@ -653,7 +656,7 @@ struct ata_port {
 
 #ifdef CONFIG_ATA_ACPI
         acpi_handle             acpi_handle;
-        struct ata_acpi_gtm     acpi_gtm;
+        struct ata_acpi_gtm     __acpi_init_gtm; /* use ata_acpi_init_gtm() */
 #endif
         u8                      sector_buf[ATA_SECT_SIZE]; /* owned by EH */
 };
@@ -939,10 +942,20 @@ enum {
 
 /* libata-acpi.c */
 #ifdef CONFIG_ATA_ACPI
+static inline const struct ata_acpi_gtm *ata_acpi_init_gtm(struct ata_port *ap)
+{
+        if (ap->pflags & ATA_PFLAG_INIT_GTM_VALID)
+                return &ap->__acpi_init_gtm;
+        return NULL;
+}
 extern int ata_acpi_cbl_80wire(struct ata_port *ap);
-int ata_acpi_stm(const struct ata_port *ap, struct ata_acpi_gtm *stm);
-int ata_acpi_gtm(const struct ata_port *ap, struct ata_acpi_gtm *stm);
+int ata_acpi_stm(struct ata_port *ap, const struct ata_acpi_gtm *stm);
+int ata_acpi_gtm(struct ata_port *ap, struct ata_acpi_gtm *stm);
 #else
+static inline const struct ata_acpi_gtm *ata_acpi_init_gtm(struct ata_port *ap)
+{
+        return NULL;
+}
 static inline int ata_acpi_cbl_80wire(struct ata_port *ap) { return 0; }
 #endif
 
@@ -1013,18 +1026,18 @@ extern void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset,
  * printk helpers
  */
 #define ata_port_printk(ap, lv, fmt, args...) \
-        printk(lv"ata%u: "fmt, (ap)->print_id , ##args)
+        printk("%sata%u: "fmt, lv, (ap)->print_id , ##args)
 
 #define ata_link_printk(link, lv, fmt, args...) do { \
         if ((link)->ap->nr_pmp_links) \
-                printk(lv"ata%u.%02u: "fmt, (link)->ap->print_id, \
+                printk("%sata%u.%02u: "fmt, lv, (link)->ap->print_id,   \
                        (link)->pmp , ##args); \
         else \
-                printk(lv"ata%u: "fmt, (link)->ap->print_id , ##args); \
+                printk("%sata%u: "fmt, lv, (link)->ap->print_id , ##args); \
         } while(0)
 
 #define ata_dev_printk(dev, lv, fmt, args...) \
-        printk(lv"ata%u.%02u: "fmt, (dev)->link->ap->print_id, \
+        printk("%sata%u.%02u: "fmt, lv, (dev)->link->ap->print_id,      \
                (dev)->link->pmp + (dev)->devno , ##args)
 
 /*