[02/14] mmc: mmci: Don't pretend all variants to have MCI_STARBITERR flag

Message ID 1515759368-16946-3-git-send-email-patrice.chotard@st.com
State New
Headers show
Series
  • Add MMCI support for STM32F SoCs family
Related show

Commit Message

Patrice CHOTARD Jan. 12, 2018, 12:15 p.m.
From: Patrice Chotard <patrice.chotard@st.com>

This patch prepares for supporting the STM32 variant that
has no such bit in the status register.

Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
---
 drivers/mmc/host/mmci.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

Comments

Linus Walleij Jan. 15, 2018, 1:03 a.m. | #1
On Fri, Jan 12, 2018 at 1:15 PM,  <patrice.chotard@st.com> wrote:

> From: Patrice Chotard <patrice.chotard@st.com>
>
> This patch prepares for supporting the STM32 variant that
> has no such bit in the status register.
>
> 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>

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ulf Hansson Jan. 15, 2018, 12:32 p.m. | #2
On 12 January 2018 at 13:15,  <patrice.chotard@st.com> wrote:
> From: Patrice Chotard <patrice.chotard@st.com>
>
> This patch prepares for supporting the STM32 variant that
> has no such bit in the status register.
>
> Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
> Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
> ---
>  drivers/mmc/host/mmci.c | 16 ++++++++++++++--
>  1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
> index 3125dc0..7e56f85 100644
> --- a/drivers/mmc/host/mmci.c
> +++ b/drivers/mmc/host/mmci.c
> @@ -83,6 +83,8 @@
>   * @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.
> + * @start_err: true is the variant has STARTBITERR bit inside MMCISTATUS
> + *            register.
>   */
>  struct variant_data {
>         unsigned int            clkreg;
> @@ -113,6 +115,7 @@ struct variant_data {
>         bool                    qcom_dml;
>         bool                    reversed_irq_handling;
>         bool                    mmcimask1;
> +       bool                    start_err;

To be consistent with how we implement support for similar variant
variations, I would prefer to have this being a u32. Something along
the lines of how the "busy_detect_flag" is being used.

Otherwise this looks good to me.

[...]

Kind regards
Uffe
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Patrice CHOTARD Jan. 15, 2018, 5:27 p.m. | #3
Hi Ulf

On 01/15/2018 01:32 PM, Ulf Hansson wrote:
> On 12 January 2018 at 13:15,  <patrice.chotard@st.com> wrote:

>> From: Patrice Chotard <patrice.chotard@st.com>

>>

>> This patch prepares for supporting the STM32 variant that

>> has no such bit in the status register.

>>

>> Signed-off-by: Andrea Merello <andrea.merello@gmail.com>

>> Signed-off-by: Patrice Chotard <patrice.chotard@st.com>

>> ---

>>   drivers/mmc/host/mmci.c | 16 ++++++++++++++--

>>   1 file changed, 14 insertions(+), 2 deletions(-)

>>

>> diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c

>> index 3125dc0..7e56f85 100644

>> --- a/drivers/mmc/host/mmci.c

>> +++ b/drivers/mmc/host/mmci.c

>> @@ -83,6 +83,8 @@

>>    * @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.

>> + * @start_err: true is the variant has STARTBITERR bit inside MMCISTATUS

>> + *            register.

>>    */

>>   struct variant_data {

>>          unsigned int            clkreg;

>> @@ -113,6 +115,7 @@ struct variant_data {

>>          bool                    qcom_dml;

>>          bool                    reversed_irq_handling;

>>          bool                    mmcimask1;

>> +       bool                    start_err;

> 

> To be consistent with how we implement support for similar variant

> variations, I would prefer to have this being a u32. Something along

> the lines of how the "busy_detect_flag" is being used.


OK i will update this in v2

Thanks

Patrice

> 

> Otherwise this looks good to me.

> 

> [...]

> 

> Kind regards

> Uffe

>

Patch

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 3125dc0..7e56f85 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -83,6 +83,8 @@ 
  * @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.
+ * @start_err: true is the variant has STARTBITERR bit inside MMCISTATUS
+ *	       register.
  */
 struct variant_data {
 	unsigned int		clkreg;
@@ -113,6 +115,7 @@  struct variant_data {
 	bool			qcom_dml;
 	bool			reversed_irq_handling;
 	bool			mmcimask1;
+	bool			start_err;
 };
 
 static struct variant_data variant_arm = {
@@ -123,6 +126,7 @@  struct variant_data {
 	.f_max			= 100000000,
 	.reversed_irq_handling	= true,
 	.mmcimask1		= true,
+	.start_err		= true,
 };
 
 static struct variant_data variant_arm_extended_fifo = {
@@ -132,6 +136,7 @@  struct variant_data {
 	.pwrreg_powerup		= MCI_PWR_UP,
 	.f_max			= 100000000,
 	.mmcimask1		= true,
+	.start_err		= true,
 };
 
 static struct variant_data variant_arm_extended_fifo_hwfc = {
@@ -142,6 +147,7 @@  struct variant_data {
 	.pwrreg_powerup		= MCI_PWR_UP,
 	.f_max			= 100000000,
 	.mmcimask1		= true,
+	.start_err		= true,
 };
 
 static struct variant_data variant_u300 = {
@@ -158,6 +164,7 @@  struct variant_data {
 	.pwrreg_clkgate		= true,
 	.pwrreg_nopower		= true,
 	.mmcimask1		= true,
+	.start_err		= true,
 };
 
 static struct variant_data variant_nomadik = {
@@ -175,6 +182,7 @@  struct variant_data {
 	.pwrreg_clkgate		= true,
 	.pwrreg_nopower		= true,
 	.mmcimask1		= true,
+	.start_err		= true,
 };
 
 static struct variant_data variant_ux500 = {
@@ -198,6 +206,7 @@  struct variant_data {
 	.busy_detect_mask	= MCI_ST_BUSYENDMASK,
 	.pwrreg_nopower		= true,
 	.mmcimask1		= true,
+	.start_err		= true,
 };
 
 static struct variant_data variant_ux500v2 = {
@@ -223,6 +232,7 @@  struct variant_data {
 	.busy_detect_mask	= MCI_ST_BUSYENDMASK,
 	.pwrreg_nopower		= true,
 	.mmcimask1		= true,
+	.start_err		= true,
 };
 
 static struct variant_data variant_qcom = {
@@ -242,6 +252,7 @@  struct variant_data {
 	.qcom_fifo		= true,
 	.qcom_dml		= true,
 	.mmcimask1		= true,
+	.start_err		= true,
 };
 
 /* Busy detection for the ST Micro variant */
@@ -935,8 +946,9 @@  static void mmci_start_data(struct mmci_host *host, struct mmc_data *data)
 		return;
 
 	/* First check for errors */
-	if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_STARTBITERR|
-		      MCI_TXUNDERRUN|MCI_RXOVERRUN)) {
+	if (status & (MCI_DATACRCFAIL | MCI_DATATIMEOUT |
+		      (host->variant->start_err ? MCI_STARTBITERR : 0) |
+		      MCI_TXUNDERRUN | MCI_RXOVERRUN)) {
 		u32 remain, success;
 
 		/* Terminate the DMA transfer */