1 files changed, 29 insertions, 0 deletions

diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 1d09562ccf73..a3ac9c48e5de 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -12,6 +12,7 @@
 
 #include <linux/leds.h>
 #include <linux/sched.h>
+#include <linux/fault-inject.h>
 
 #include <linux/mmc/core.h>
 #include <linux/mmc/pm.h>
@@ -108,6 +109,9 @@ struct mmc_host_ops {
          * It is optional for the host to implement pre_req and post_req in
          * order to support double buffering of requests (prepare one
          * request while another request is active).
+         * pre_req() must always be followed by a post_req().
+         * To undo a call made to pre_req(), call post_req() with
+         * a nonzero err condition.
          */
         void    (*post_req)(struct mmc_host *host, struct mmc_request *req,
                             int err);
@@ -147,6 +151,7 @@ struct mmc_host_ops {
         int     (*execute_tuning)(struct mmc_host *host);
         void    (*enable_preset_value)(struct mmc_host *host, bool enable);
         int     (*select_drive_strength)(unsigned int max_dtr, int host_drv, int card_drv);
+        void    (*hw_reset)(struct mmc_host *host);
 };
 
 struct mmc_card;
@@ -229,8 +234,20 @@ struct mmc_host {
 #define MMC_CAP_MAX_CURRENT_600 (1 << 28)       /* Host max current limit is 600mA */
 #define MMC_CAP_MAX_CURRENT_800 (1 << 29)       /* Host max current limit is 800mA */
 #define MMC_CAP_CMD23           (1 << 30)       /* CMD23 supported. */
+#define MMC_CAP_HW_RESET        (1 << 31)       /* Hardware reset */
+
+        unsigned int            caps2;          /* More host capabilities */
+
+#define MMC_CAP2_BOOTPART_NOACC (1 << 0)        /* Boot partition no access */
+#define MMC_CAP2_CACHE_CTRL     (1 << 1)        /* Allow cache control */
+#define MMC_CAP2_POWEROFF_NOTIFY (1 << 2)       /* Notify poweroff supported */
+#define MMC_CAP2_NO_MULTI_READ  (1 << 3)        /* Multiblock reads don't work */
 
         mmc_pm_flag_t           pm_caps;        /* supported pm features */
+        unsigned int        power_notify_type;
+#define MMC_HOST_PW_NOTIFY_NONE         0
+#define MMC_HOST_PW_NOTIFY_SHORT        1
+#define MMC_HOST_PW_NOTIFY_LONG         2
 
 #ifdef CONFIG_MMC_CLKGATE
         int                     clk_requests;   /* internal reference counter */
@@ -302,6 +319,10 @@ struct mmc_host {
 
         struct mmc_async_req    *areq;          /* active async req */
 
+#ifdef CONFIG_FAIL_MMC_REQUEST
+        struct fault_attr       fail_mmc_request;
+#endif
+
         unsigned long           private[0] ____cacheline_aligned;
 };
 
@@ -330,6 +351,8 @@ extern int mmc_power_restore_host(struct mmc_host *host);
 extern void mmc_detect_change(struct mmc_host *, unsigned long delay);
 extern void mmc_request_done(struct mmc_host *, struct mmc_request *);
 
+extern int mmc_cache_ctrl(struct mmc_host *, u8);
+
 static inline void mmc_signal_sdio_irq(struct mmc_host *host)
 {
         host->ops->enable_sdio_irq(host, 0);
@@ -394,4 +417,10 @@ static inline int mmc_host_cmd23(struct mmc_host *host)
 {
         return host->caps & MMC_CAP_CMD23;
 }
+
+static inline int mmc_boot_partition_access(struct mmc_host *host)
+{
+        return !(host->caps2 & MMC_CAP2_BOOTPART_NOACC);
+}
+
 #endif /* LINUX_MMC_HOST_H */