Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: fix ATAPI draining
  libata: update atapi_eh_request_sense() such that lbam/lbah contains buffer size
  libata-acpi: implement _GTF command filtering
  libata-acpi: improve _GTF execution error handling and reporting
  libata-acpi: improve ACPI disabling
  libata-acpi: implement dev->gtf_cache and evaluate _GTF right after _STM during resume
  libata-acpi: implement and use ata_acpi_init_gtm()
  libata-acpi: add new hooks ata_acpi_dissociate() and ata_acpi_on_disable()
  libata: ata_dev_disable() should be called from EH context
  libata: add more opcodes to ata.h
  libata: update ata_*_printk() macros such that level can be a variable
  libata-acpi: adjust constness in ata_acpi_gtm/stm() parameters
  sata_mv: improve warnings about Highpoint RocketRAID 23xx cards
  libata: add ST3160023AS / 3.42 to NCQ blacklist
  libata: clear link->eh_info.serror from ata_std_postreset()
  sata_sil: fix spurious IRQ handling

1 files changed, 15 insertions, 0 deletions

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 5c4e54a2a8d6..72ab80801ef6 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -190,6 +190,8 @@ enum {
         ATA_CMD_READ_LOG_EXT    = 0x2f,
         ATA_CMD_PMP_READ        = 0xE4,
         ATA_CMD_PMP_WRITE       = 0xE8,
+        ATA_CMD_CONF_OVERLAY    = 0xB1,
+        ATA_CMD_SEC_FREEZE_LOCK = 0xF5,
 
         /* READ_LOG_EXT pages */
         ATA_LOG_SATA_NCQ        = 0x10,
@@ -239,6 +241,19 @@ enum {
         SATA_AN                 = 0x05,  /* Asynchronous Notification */
         SATA_DIPM               = 0x03,  /* Device Initiated Power Management */
 
+        /* feature values for SET_MAX */
+        ATA_SET_MAX_ADDR        = 0x00,
+        ATA_SET_MAX_PASSWD      = 0x01,
+        ATA_SET_MAX_LOCK        = 0x02,
+        ATA_SET_MAX_UNLOCK      = 0x03,
+        ATA_SET_MAX_FREEZE_LOCK = 0x04,
+
+        /* feature values for DEVICE CONFIGURATION OVERLAY */
+        ATA_DCO_RESTORE         = 0xC0,
+        ATA_DCO_FREEZE_LOCK     = 0xC1,
+        ATA_DCO_IDENTIFY        = 0xC2,
+        ATA_DCO_SET             = 0xC3,
+
         /* ATAPI stuff */
         ATAPI_PKT_DMA           = (1 << 0),
         ATAPI_DMADIR            = (1 << 2),     /* ATAPI data dir: