mmc: mmci: Don't pretend all variants to have MMCIMASK1 register

Two mask registers are used in order to select which events have to
actually generate an interrupt on each IRQ line.

It seems that in the single-IRQ case it's assumed that the IRQs lines
are simply OR-ed, while the two mask registers are still present. The
driver still programs the two mask registers separately.

However the STM32 variant has only one IRQ, and also has only one mask
register.

This patch prepares for STM32 variant support by making the driver using
only one mask register.

This patch also optimize the MMCIMASK1 mask usage by caching it into
host->mask1_reg which avoid to read it into mmci_irq().

Tested only on STM32 variant. RFT for variants other than STM32

Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index e8a1bb1ae694234c8d40cfb86e6a1b7917e8f39c..bc7669d50c38afeabaee4b287f72463b2887b40a 100644 (file)
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -82,6 +82,7 @@ static unsigned int fmax = 515633;
  * @qcom_fifo: enables qcom specific fifo pio read logic.
  * @qcom_dml: enables qcom specific dma glue for dma transfers.
  * @reversed_irq_handling: handle data irq before cmd irq.
  * @qcom_fifo: enables qcom specific fifo pio read logic.
  * @qcom_dml: enables qcom specific dma glue for dma transfers.
  * @reversed_irq_handling: handle data irq before cmd irq.

+ * @mmcimask1: true if variant have a MMCIMASK1 register.

  */
 struct variant_data {
        unsigned int            clkreg;
  */
 struct variant_data {
        unsigned int            clkreg;


@@ -111,6 +112,7 @@ struct variant_data {
        bool                    qcom_fifo;
        bool                    qcom_dml;
        bool                    reversed_irq_handling;
        bool                    qcom_fifo;
        bool                    qcom_dml;
        bool                    reversed_irq_handling;

+       bool                    mmcimask1;

 };
 
 static struct variant_data variant_arm = {
 };
 
 static struct variant_data variant_arm = {


@@ -120,6 +122,7 @@ static struct variant_data variant_arm = {
        .pwrreg_powerup         = MCI_PWR_UP,
        .f_max                  = 100000000,
        .reversed_irq_handling  = true,
        .pwrreg_powerup         = MCI_PWR_UP,
        .f_max                  = 100000000,
        .reversed_irq_handling  = true,

+       .mmcimask1              = true,

 };
 
 static struct variant_data variant_arm_extended_fifo = {
 };
 
 static struct variant_data variant_arm_extended_fifo = {


@@ -128,6 +131,7 @@ static struct variant_data variant_arm_extended_fifo = {
        .datalength_bits        = 16,
        .pwrreg_powerup         = MCI_PWR_UP,
        .f_max                  = 100000000,
        .datalength_bits        = 16,
        .pwrreg_powerup         = MCI_PWR_UP,
        .f_max                  = 100000000,

+       .mmcimask1              = true,

 };
 
 static struct variant_data variant_arm_extended_fifo_hwfc = {
 };
 
 static struct variant_data variant_arm_extended_fifo_hwfc = {


@@ -137,6 +141,7 @@ static struct variant_data variant_arm_extended_fifo_hwfc = {
        .datalength_bits        = 16,
        .pwrreg_powerup         = MCI_PWR_UP,
        .f_max                  = 100000000,
        .datalength_bits        = 16,
        .pwrreg_powerup         = MCI_PWR_UP,
        .f_max                  = 100000000,

+       .mmcimask1              = true,

 };
 
 static struct variant_data variant_u300 = {
 };
 
 static struct variant_data variant_u300 = {


@@ -152,6 +157,7 @@ static struct variant_data variant_u300 = {
        .signal_direction       = true,
        .pwrreg_clkgate         = true,
        .pwrreg_nopower         = true,
        .signal_direction       = true,
        .pwrreg_clkgate         = true,
        .pwrreg_nopower         = true,

+       .mmcimask1              = true,

 };
 
 static struct variant_data variant_nomadik = {
 };
 
 static struct variant_data variant_nomadik = {


@@ -168,6 +174,7 @@ static struct variant_data variant_nomadik = {
        .signal_direction       = true,
        .pwrreg_clkgate         = true,
        .pwrreg_nopower         = true,
        .signal_direction       = true,
        .pwrreg_clkgate         = true,
        .pwrreg_nopower         = true,

+       .mmcimask1              = true,

 };
 
 static struct variant_data variant_ux500 = {
 };
 
 static struct variant_data variant_ux500 = {


@@ -190,6 +197,7 @@ static struct variant_data variant_ux500 = {
        .busy_detect_flag       = MCI_ST_CARDBUSY,
        .busy_detect_mask       = MCI_ST_BUSYENDMASK,
        .pwrreg_nopower         = true,
        .busy_detect_flag       = MCI_ST_CARDBUSY,
        .busy_detect_mask       = MCI_ST_BUSYENDMASK,
        .pwrreg_nopower         = true,

+       .mmcimask1              = true,

 };
 
 static struct variant_data variant_ux500v2 = {
 };
 
 static struct variant_data variant_ux500v2 = {


@@ -214,6 +222,7 @@ static struct variant_data variant_ux500v2 = {
        .busy_detect_flag       = MCI_ST_CARDBUSY,
        .busy_detect_mask       = MCI_ST_BUSYENDMASK,
        .pwrreg_nopower         = true,
        .busy_detect_flag       = MCI_ST_CARDBUSY,
        .busy_detect_mask       = MCI_ST_BUSYENDMASK,
        .pwrreg_nopower         = true,

+       .mmcimask1              = true,

 };
 
 static struct variant_data variant_qcom = {
 };
 
 static struct variant_data variant_qcom = {


@@ -232,6 +241,7 @@ static struct variant_data variant_qcom = {
        .explicit_mclk_control  = true,
        .qcom_fifo              = true,
        .qcom_dml               = true,
        .explicit_mclk_control  = true,
        .qcom_fifo              = true,
        .qcom_dml               = true,

+       .mmcimask1              = true,

 };
 
 /* Busy detection for the ST Micro variant */
 };
 
 /* Busy detection for the ST Micro variant */


@@ -396,6 +406,7 @@ mmci_request_end(struct mmci_host *host, struct mmc_request *mrq)
 static void mmci_set_mask1(struct mmci_host *host, unsigned int mask)
 {
        void __iomem *base = host->base;
 static void mmci_set_mask1(struct mmci_host *host, unsigned int mask)
 {
        void __iomem *base = host->base;

+       struct variant_data *variant = host->variant;

 
        if (host->singleirq) {
                unsigned int mask0 = readl(base + MMCIMASK0);
 
        if (host->singleirq) {
                unsigned int mask0 = readl(base + MMCIMASK0);


@@ -406,7 +417,10 @@ static void mmci_set_mask1(struct mmci_host *host, unsigned int mask)
                writel(mask0, base + MMCIMASK0);
        }
 
                writel(mask0, base + MMCIMASK0);
        }
 

-       writel(mask, base + MMCIMASK1);
+       if (variant->mmcimask1)
+               writel(mask, base + MMCIMASK1);
+
+       host->mask1_reg = mask;

 }
 
 static void mmci_stop_data(struct mmci_host *host)
 }
 
 static void mmci_stop_data(struct mmci_host *host)


@@ -1286,7 +1300,7 @@ static irqreturn_t mmci_irq(int irq, void *dev_id)
                status = readl(host->base + MMCISTATUS);
 
                if (host->singleirq) {
                status = readl(host->base + MMCISTATUS);
 
                if (host->singleirq) {

-                       if (status & readl(host->base + MMCIMASK1))
+                       if (status & host->mask1_reg)

                                mmci_pio_irq(irq, dev_id);
 
                        status &= ~MCI_IRQ1MASK;
                                mmci_pio_irq(irq, dev_id);
 
                        status &= ~MCI_IRQ1MASK;


@@ -1729,7 +1743,10 @@ static int mmci_probe(struct amba_device *dev,
        spin_lock_init(&host->lock);
 
        writel(0, host->base + MMCIMASK0);
        spin_lock_init(&host->lock);
 
        writel(0, host->base + MMCIMASK0);

-       writel(0, host->base + MMCIMASK1);
+
+       if (variant->mmcimask1)
+               writel(0, host->base + MMCIMASK1);
+

        writel(0xfff, host->base + MMCICLEAR);
 
        /*
        writel(0xfff, host->base + MMCICLEAR);
 
        /*


@@ -1809,6 +1826,7 @@ static int mmci_remove(struct amba_device *dev)
 
        if (mmc) {
                struct mmci_host *host = mmc_priv(mmc);
 
        if (mmc) {
                struct mmci_host *host = mmc_priv(mmc);

+               struct variant_data *variant = host->variant;

 
                /*
                 * Undo pm_runtime_put() in probe.  We use the _sync
 
                /*
                 * Undo pm_runtime_put() in probe.  We use the _sync


@@ -1819,7 +1837,9 @@ static int mmci_remove(struct amba_device *dev)
                mmc_remove_host(mmc);
 
                writel(0, host->base + MMCIMASK0);
                mmc_remove_host(mmc);
 
                writel(0, host->base + MMCIMASK0);

-               writel(0, host->base + MMCIMASK1);
+
+               if (variant->mmcimask1)
+                       writel(0, host->base + MMCIMASK1);

 
                writel(0, host->base + MMCICOMMAND);
                writel(0, host->base + MMCIDATACTRL);
 
                writel(0, host->base + MMCICOMMAND);
                writel(0, host->base + MMCIDATACTRL);

diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index 4a8bef1aac8f7b73b215f42ba962bcbd004ba642..83160a9c4c773d1c9fcd13a194ae2020ff8ae365 100644 (file)
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -223,6 +223,7 @@ struct mmci_host {
        u32                     clk_reg;
        u32                     datactrl_reg;
        u32                     busy_status;
        u32                     clk_reg;
        u32                     datactrl_reg;
        u32                     busy_status;

+       u32                     mask1_reg;

        bool                    vqmmc_enabled;
        struct mmci_platform_data *plat;
        struct variant_data     *variant;
        bool                    vqmmc_enabled;
        struct mmci_platform_data *plat;
        struct variant_data     *variant;