2 files changed, 21 insertions, 0 deletions

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 312a2c0c64e6..a7c41f3df8f4 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -97,6 +97,9 @@ enum {
         ATA_DRQ                 = (1 << 3),     /* data request i/o */
         ATA_ERR                 = (1 << 0),     /* have an error */
         ATA_SRST                = (1 << 2),     /* software reset */
+        ATA_ICRC                = (1 << 7),     /* interface CRC error */
+        ATA_UNC                 = (1 << 6),     /* uncorrectable media error */
+        ATA_IDNF                = (1 << 4),     /* ID not found */
         ATA_ABORTED             = (1 << 2),     /* command aborted */
 
         /* ATA command block registers */
@@ -192,6 +195,16 @@ enum {
         SCR_ACTIVE              = 3,
         SCR_NOTIFICATION        = 4,
 
+        /* SError bits */
+        SERR_DATA_RECOVERED     = (1 << 0), /* recovered data error */
+        SERR_COMM_RECOVERED     = (1 << 1), /* recovered comm failure */
+        SERR_DATA               = (1 << 8), /* unrecovered data error */
+        SERR_PERSISTENT         = (1 << 9), /* persistent data/comm error */
+        SERR_PROTOCOL           = (1 << 10), /* protocol violation */
+        SERR_INTERNAL           = (1 << 11), /* host internal error */
+        SERR_PHYRDY_CHG         = (1 << 16), /* PHY RDY changed */
+        SERR_DEV_XCHG           = (1 << 26), /* device exchanged */
+
         /* struct ata_taskfile flags */
         ATA_TFLAG_LBA48         = (1 << 0), /* enable 48-bit LBA and "HOB" */
         ATA_TFLAG_ISADDR        = (1 << 1), /* enable r/w to nsect/lba regs */
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 5ad50163c8ef..6fe5ed8eabf5 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -155,6 +155,7 @@ enum {
 
         ATA_FLAG_EH_PENDING     = (1 << 16), /* EH pending */
         ATA_FLAG_FROZEN         = (1 << 17), /* port is frozen */
+        ATA_FLAG_RECOVERED      = (1 << 18), /* recovery action performed */
 
         ATA_FLAG_DISABLED       = (1 << 22), /* port is disabled, ignore it */
         ATA_FLAG_SUSPENDED      = (1 << 23), /* port is suspended (power) */
@@ -225,6 +226,13 @@ enum {
         ATA_PORT_PRIMARY        = (1 << 0),
         ATA_PORT_SECONDARY      = (1 << 1),
 
+        /* reset / recovery action types */
+        ATA_EH_REVALIDATE       = (1 << 0),
+        ATA_EH_SOFTRESET        = (1 << 1),
+        ATA_EH_HARDRESET        = (1 << 2),
+
+        ATA_EH_RESET_MASK       = ATA_EH_SOFTRESET | ATA_EH_HARDRESET,
+
         /* max repeat if error condition is still set after ->error_handler */
         ATA_EH_MAX_REPEAT       = 5,