Merge branch 'perf/core' into perf/uprobes

Merge in latest upstream (and the latest perf development tree),
to prepare for tooling changes, and also to pick up v3.4 MM
changes that the uprobes code needs to take care of.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

10 files changed, 49 insertions, 60 deletions

diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 19a41d1737af..01beae78f079 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -10,6 +10,7 @@
 #ifndef LINUX_MMC_CARD_H
 #define LINUX_MMC_CARD_H
 
+#include <linux/device.h>
 #include <linux/mmc/core.h>
 #include <linux/mod_devicetable.h>
 
@@ -71,6 +72,8 @@ struct mmc_ext_csd {
         bool                    hpi_en;                 /* HPI enablebit */
         bool                    hpi;                    /* HPI support bit */
         unsigned int            hpi_cmd;                /* cmd used as HPI */
+        unsigned int            data_sector_size;       /* 512 bytes or 4KB */
+        unsigned int            data_tag_unit_size;     /* DATA TAG UNIT size */
         unsigned int            boot_ro_lock;           /* ro lock support */
         bool                    boot_ro_lockable;
         u8                      raw_partition_support;  /* 160 */
diff --git a/include/linux/mmc/cd-gpio.h b/include/linux/mmc/cd-gpio.h
index a8e469783318..cefaba038ccb 100644
--- a/include/linux/mmc/cd-gpio.h
+++ b/include/linux/mmc/cd-gpio.h
@@ -12,8 +12,7 @@
 #define MMC_CD_GPIO_H
 
 struct mmc_host;
-int mmc_cd_gpio_request(struct mmc_host *host, unsigned int gpio,
-                        unsigned int irq, unsigned long flags);
+int mmc_cd_gpio_request(struct mmc_host *host, unsigned int gpio);
 void mmc_cd_gpio_free(struct mmc_host *host);
 
 #endif
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 87a976cc5654..1b431c728b9a 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -9,7 +9,7 @@
 #define LINUX_MMC_CORE_H
 
 #include <linux/interrupt.h>
-#include <linux/device.h>
+#include <linux/completion.h>
 
 struct request;
 struct mmc_data;
@@ -175,7 +175,6 @@ extern unsigned int mmc_align_data_size(struct mmc_card *, unsigned int);
 
 extern int __mmc_claim_host(struct mmc_host *host, atomic_t *abort);
 extern void mmc_release_host(struct mmc_host *host);
-extern void mmc_do_release_host(struct mmc_host *host);
 extern int mmc_try_claim_host(struct mmc_host *host);
 
 extern int mmc_flush_cache(struct mmc_card *);
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
index aae5d1f1bb39..8f66e28f5a0f 100644
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
@@ -76,7 +76,7 @@ struct mmc_data;
  * @num_slots: Number of slots available.
  * @verid: Denote Version ID.
  * @data_offset: Set the offset of DATA register according to VERID.
- * @pdev: Platform device associated with the MMC controller.
+ * @dev: Device associated with the MMC controller.
  * @pdata: Platform data associated with the MMC controller.
  * @slot: Slots sharing this MMC controller.
  * @fifo_depth: depth of FIFO.
@@ -87,6 +87,8 @@ struct mmc_data;
  * @push_data: Pointer to FIFO push function.
  * @pull_data: Pointer to FIFO pull function.
  * @quirks: Set of quirks that apply to specific versions of the IP.
+ * @irq_flags: The flags to be passed to request_irq.
+ * @irq: The irq value to be passed to request_irq.
  *
  * Locking
  * =======
@@ -153,7 +155,7 @@ struct dw_mci {
         u32                     fifoth_val;
         u16                     verid;
         u16                     data_offset;
-        struct platform_device  *pdev;
+        struct device           dev;
         struct dw_mci_board     *pdata;
         struct dw_mci_slot      *slot[MAX_MCI_SLOTS];
 
@@ -174,6 +176,8 @@ struct dw_mci {
         u32                     quirks;
 
         struct regulator        *vmmc;  /* Power regulator */
+        unsigned long           irq_flags; /* IRQ flags */
+        unsigned int            irq;
 };
 
 /* DMA ops for Internal/External DMAC interface */
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index ee2b0363c040..cbde4b7e675e 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/device.h>
 #include <linux/fault-inject.h>
 
 #include <linux/mmc/core.h>
@@ -80,34 +81,11 @@ struct mmc_ios {
 
 struct mmc_host_ops {
         /*
-         * Hosts that support power saving can use the 'enable' and 'disable'
-         * methods to exit and enter power saving states. 'enable' is called
-         * when the host is claimed and 'disable' is called (or scheduled with
-         * a delay) when the host is released. The 'disable' is scheduled if
-         * the disable delay set by 'mmc_set_disable_delay()' is non-zero,
-         * otherwise 'disable' is called immediately. 'disable' may be
-         * scheduled repeatedly, to permit ever greater power saving at the
-         * expense of ever greater latency to re-enable. Rescheduling is
-         * determined by the return value of the 'disable' method. A positive
-         * value gives the delay in milliseconds.
-         *
-         * In the case where a host function (like set_ios) may be called
-         * with or without the host claimed, enabling and disabling can be
-         * done directly and will nest correctly. Call 'mmc_host_enable()' and
-         * 'mmc_host_lazy_disable()' for this purpose, but note that these
-         * functions must be paired.
-         *
-         * Alternatively, 'mmc_host_enable()' may be paired with
-         * 'mmc_host_disable()' which calls 'disable' immediately.  In this
-         * case the 'disable' method will be called with 'lazy' set to 0.
-         * This is mainly useful for error paths.
-         *
-         * Because lazy disable may be called from a work queue, the 'disable'
-         * method must claim the host when 'lazy' != 0, which will work
-         * correctly because recursion is detected and handled.
+         * 'enable' is called when the host is claimed and 'disable' is called
+         * when the host is released. 'enable' and 'disable' are deprecated.
          */
         int (*enable)(struct mmc_host *host);
-        int (*disable)(struct mmc_host *host, int lazy);
+        int (*disable)(struct mmc_host *host);
         /*
          * It is optional for the host to implement pre_req and post_req in
          * order to support double buffering of requests (prepare one
@@ -218,7 +196,7 @@ struct mmc_host {
 #define MMC_CAP_SPI             (1 << 4)        /* Talks only SPI protocols */
 #define MMC_CAP_NEEDS_POLL      (1 << 5)        /* Needs polling for card-detection */
 #define MMC_CAP_8_BIT_DATA      (1 << 6)        /* Can the host do 8 bit transfers */
-#define MMC_CAP_DISABLE         (1 << 7)        /* Can the host be disabled */
+
 #define MMC_CAP_NONREMOVABLE    (1 << 8)        /* Nonremovable e.g. eMMC */
 #define MMC_CAP_WAIT_WHILE_BUSY (1 << 9)        /* Waits while card is busy */
 #define MMC_CAP_ERASE           (1 << 10)       /* Allow erase/trim commands */
@@ -258,6 +236,8 @@ struct mmc_host {
 #define MMC_CAP2_HS200          (MMC_CAP2_HS200_1_8V_SDR | \
                                  MMC_CAP2_HS200_1_2V_SDR)
 #define MMC_CAP2_BROKEN_VOLTAGE (1 << 7)        /* Use the broken voltage */
+#define MMC_CAP2_DETECT_ON_ERR  (1 << 8)        /* On I/O err check card removal */
+#define MMC_CAP2_HC_ERASE_SZ    (1 << 9)        /* High-capacity erase size */
 
         mmc_pm_flag_t           pm_caps;        /* supported pm features */
         unsigned int        power_notify_type;
@@ -300,13 +280,7 @@ struct mmc_host {
         unsigned int            removed:1;      /* host is being removed */
 #endif
 
-        /* Only used with MMC_CAP_DISABLE */
-        int                     enabled;        /* host is enabled */
         int                     rescan_disable; /* disable card detection */
-        int                     nesting_cnt;    /* "enable" nesting count */
-        int                     en_dis_recurs;  /* detect recursion */
-        unsigned int            disable_delay;  /* disable delay in msecs */
-        struct delayed_work     disable;        /* disabling work */
 
         struct mmc_card         *card;          /* device attached to this host */
 
@@ -406,17 +380,8 @@ int mmc_card_awake(struct mmc_host *host);
 int mmc_card_sleep(struct mmc_host *host);
 int mmc_card_can_sleep(struct mmc_host *host);
 
-int mmc_host_enable(struct mmc_host *host);
-int mmc_host_disable(struct mmc_host *host);
-int mmc_host_lazy_disable(struct mmc_host *host);
 int mmc_pm_notify(struct notifier_block *notify_block, unsigned long, void *);
 
-static inline void mmc_set_disable_delay(struct mmc_host *host,
-                                         unsigned int disable_delay)
-{
-        host->disable_delay = disable_delay;
-}
-
 /* Module parameter */
 extern bool mmc_assume_removable;
 
diff --git a/include/linux/mmc/ioctl.h b/include/linux/mmc/ioctl.h
index 8fa5bc5f8059..1f5e68923929 100644
--- a/include/linux/mmc/ioctl.h
+++ b/include/linux/mmc/ioctl.h
@@ -1,5 +1,8 @@
 #ifndef LINUX_MMC_IOCTL_H
 #define LINUX_MMC_IOCTL_H
+
+#include <linux/types.h>
+
 struct mmc_ioc_cmd {
         /* Implies direction of data.  true = write, false = read */
         int write_flag;
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index fb9f6e116e1c..b822a2cb6008 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -274,6 +274,7 @@ struct _mmc_csd {
 #define EXT_CSD_FLUSH_CACHE             32      /* W */
 #define EXT_CSD_CACHE_CTRL              33      /* R/W */
 #define EXT_CSD_POWER_OFF_NOTIFICATION  34      /* R/W */
+#define EXT_CSD_DATA_SECTOR_SIZE        61      /* R */
 #define EXT_CSD_GP_SIZE_MULT            143     /* R/W */
 #define EXT_CSD_PARTITION_ATTRIBUTE     156     /* R/W */
 #define EXT_CSD_PARTITION_SUPPORT       160     /* RO */
@@ -315,6 +316,8 @@ struct _mmc_csd {
 #define EXT_CSD_POWER_OFF_LONG_TIME     247     /* RO */
 #define EXT_CSD_GENERIC_CMD6_TIME       248     /* RO */
 #define EXT_CSD_CACHE_SIZE              249     /* RO, 4 bytes */
+#define EXT_CSD_TAG_UNIT_SIZE           498     /* RO */
+#define EXT_CSD_DATA_TAG_SUPPORT        499     /* RO */
 #define EXT_CSD_HPI_FEATURES            503     /* RO */
 
 /*
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index c750f85177d9..e9051e1cb1ce 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -90,6 +90,8 @@ struct sdhci_host {
 
         unsigned int quirks2;   /* More deviations from spec. */
 
+#define SDHCI_QUIRK2_HOST_OFF_CARD_ON                   (1<<0)
+
         int irq;                /* Device IRQ */
         void __iomem *ioaddr;   /* Mapped address */
 
diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h
index 04ff452bf5c3..05f0e3db1c12 100644
--- a/include/linux/mmc/sh_mmcif.h
+++ b/include/linux/mmc/sh_mmcif.h
@@ -77,18 +77,15 @@ struct sh_mmcif_plat_data {
 
 /* CE_CLK_CTRL */
 #define CLK_ENABLE              (1 << 24) /* 1: output mmc clock */
-#define CLK_CLEAR               ((1 << 19) | (1 << 18) | (1 << 17) | (1 << 16))
-#define CLK_SUP_PCLK            ((1 << 19) | (1 << 18) | (1 << 17) | (1 << 16))
-#define CLKDIV_4                (1<<16) /* mmc clock frequency.
-                                         * n: bus clock/(2^(n+1)) */
-#define CLKDIV_256              (7<<16) /* mmc clock frequency. (see above) */
-#define SRSPTO_256              ((1 << 13) | (0 << 12)) /* resp timeout */
-#define SRBSYTO_29              ((1 << 11) | (1 << 10) |        \
-                                 (1 << 9) | (1 << 8)) /* resp busy timeout */
-#define SRWDTO_29               ((1 << 7) | (1 << 6) |          \
-                                 (1 << 5) | (1 << 4)) /* read/write timeout */
-#define SCCSTO_29               ((1 << 3) | (1 << 2) |          \
-                                 (1 << 1) | (1 << 0)) /* ccs timeout */
+#define CLK_CLEAR               (0xf << 16)
+#define CLK_SUP_PCLK            (0xf << 16)
+#define CLKDIV_4                (1 << 16) /* mmc clock frequency.
+                                           * n: bus clock/(2^(n+1)) */
+#define CLKDIV_256              (7 << 16) /* mmc clock frequency. (see above) */
+#define SRSPTO_256              (2 << 12) /* resp timeout */
+#define SRBSYTO_29              (0xf << 8) /* resp busy timeout */
+#define SRWDTO_29               (0xf << 4) /* read/write timeout */
+#define SCCSTO_29               (0xf << 0) /* ccs timeout */
 
 /* CE_VERSION */
 #define SOFT_RST_ON             (1 << 31)
diff --git a/include/linux/mmc/sh_mobile_sdhi.h b/include/linux/mmc/sh_mobile_sdhi.h
index 71b805451bd8..e94e620aeddc 100644
--- a/include/linux/mmc/sh_mobile_sdhi.h
+++ b/include/linux/mmc/sh_mobile_sdhi.h
@@ -10,15 +10,29 @@ struct tmio_mmc_data;
 #define SH_MOBILE_SDHI_IRQ_SDCARD       "sdcard"
 #define SH_MOBILE_SDHI_IRQ_SDIO         "sdio"
 
+/**
+ * struct sh_mobile_sdhi_ops - SDHI driver callbacks
+ * @cd_wakeup:          trigger a card-detection run
+ */
+struct sh_mobile_sdhi_ops {
+        void (*cd_wakeup)(const struct platform_device *pdev);
+};
+
 struct sh_mobile_sdhi_info {
         int dma_slave_tx;
         int dma_slave_rx;
         unsigned long tmio_flags;
         unsigned long tmio_caps;
         u32 tmio_ocr_mask;      /* available MMC voltages */
+        unsigned int cd_gpio;
         struct tmio_mmc_data *pdata;
         void (*set_pwr)(struct platform_device *pdev, int state);
         int (*get_cd)(struct platform_device *pdev);
+
+        /* callbacks for board specific setup code */
+        int (*init)(struct platform_device *pdev,
+                    const struct sh_mobile_sdhi_ops *ops);
+        void (*cleanup)(struct platform_device *pdev);
 };
 
 #endif /* LINUX_MMC_SH_MOBILE_SDHI_H */