[PATCH 00/12] Add SDHCI Xenon driver

[PATCH 00/12] Add SDHCI Xenon driver

[Gregory CLEMENT]

Hello,

This series adds support for the SDHCI Xenon controller which can be
found on the Armada 37xx and the Armada 7K/8K.

This series currently only enables the support on the Armada 37xx SoCs
and boards. More tests are needed to enable it on the A7K/A8K.

Following the new trend for the MMC subsystem, instead of introducing
new quirks for this controller we extend the mmc/sdhci framework by
adding callbacks when needed.

Thanks,

Gregory

Gregory CLEMENT (7):
  mmc: sdhci_f_sdh30: restrict voltage_switch() callback to the 1.8V
    case
  mmc: tegra: restrict the voltage_switch() callback to the 1.8V case
  mmc: core: export the alive operation
  dt-bindings: mmc: Add Xenon description
  arm64: dts: marvell: add eMMC support for Armada 37xx
  arm64: dts: marvell: add SDIO support for Armada 37xx
  arm64: defconfig: Add Xenon sdhci

Marcin Wojtas (1):
  mmc: sdhci: add init_card callback to sdhci

Victor Gu (4):
  mmc: sdhci: call voltage_switch callback also for the 3.3V case
  mmc: sdhci: add a pre voltage switch callback function
  mmc: sdhci: add delay adjust feature including phy reset
  mmc: sdhci-xenon: add initial Xenon eMMC driver

 .../devicetree/bindings/mmc/sdhci-xenon.txt        |   27 +
 arch/arm64/boot/dts/marvell/armada-3720-db.dts     |   12 +
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi       |   17 +
 arch/arm64/configs/defconfig                       |    1 +
 drivers/mmc/core/core.c                            |    7 +
 drivers/mmc/host/Kconfig                           |   10 +
 drivers/mmc/host/Makefile                          |    1 +
 drivers/mmc/host/sdhci-tegra.c                     |    4 +
 drivers/mmc/host/sdhci-xenon.c                     | 1164 ++++++++++++++++++++
 drivers/mmc/host/sdhci.c                           |   20 +
 drivers/mmc/host/sdhci.h                           |    3 +
 drivers/mmc/host/sdhci_f_sdh30.c                   |    4 +
 include/linux/mmc/card.h                           |    1 +
 13 files changed, 1271 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-xenon.txt
 create mode 100644 drivers/mmc/host/sdhci-xenon.c

-- 
2.5.0

[PATCH 01/12] mmc: sdhci: add init_card callback to sdhci

[Gregory CLEMENT]

From: Marcin Wojtas <mw@semihalf.com>

Some sdhci hosts may require handling quirks during card initialization
at the time when its type is already known. Hence a new callback
(init_card) is added in sdhci_ops.

Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 drivers/mmc/host/sdhci.c | 9 +++++++++
 drivers/mmc/host/sdhci.h | 1 +
 2 files changed, 10 insertions(+)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 0e3d7c056cb1..fd4e9a84f739 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2117,6 +2117,14 @@ static void sdhci_card_event(struct mmc_host *mmc)
 	spin_unlock_irqrestore(&host->lock, flags);
 }
 
+static void sdhci_init_card(struct mmc_host *mmc, struct mmc_card *card)
+{
+	struct sdhci_host *host = mmc_priv(mmc);
+
+	if (host->ops->init_card)
+		host->ops->init_card(host, card);
+}
+
 static const struct mmc_host_ops sdhci_ops = {
 	.request	= sdhci_request,
 	.post_req	= sdhci_post_req,
@@ -2132,6 +2140,7 @@ static const struct mmc_host_ops sdhci_ops = {
 	.select_drive_strength		= sdhci_select_drive_strength,
 	.card_event			= sdhci_card_event,
 	.card_busy	= sdhci_card_busy,
+	.init_card	= sdhci_init_card,
 };
 
 /*****************************************************************************\
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 609f87ca536b..49c6c5b0e33b 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -549,6 +549,7 @@ struct sdhci_ops {
 					 struct mmc_card *card,
 					 unsigned int max_dtr, int host_drv,
 					 int card_drv, int *drv_type);
+	void	(*init_card)(struct sdhci_host *host, struct mmc_card *card);
 };
 
 #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
-- 
2.5.0

[PATCH 01/12] mmc: sdhci: add init_card callback to sdhci

[Adrian Hunter]

On 09/06/16 10:10, Gregory CLEMENT wrote:
> From: Marcin Wojtas <mw@semihalf.com>
> 
> Some sdhci hosts may require handling quirks during card initialization
> at the time when its type is already known. Hence a new callback
> (init_card) is added in sdhci_ops.

I plan to remove init_card and other host ops that sdhci doesn't use (like
sdhci_select_drive_strength).  The driver must provide the mmc op instead.
e.g. in sdhci-xenon.c

	host->mmc_host_ops.init_card = sdhci_xenon_init_card

> 
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> ---
>  drivers/mmc/host/sdhci.c | 9 +++++++++
>  drivers/mmc/host/sdhci.h | 1 +
>  2 files changed, 10 insertions(+)
> 
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 0e3d7c056cb1..fd4e9a84f739 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -2117,6 +2117,14 @@ static void sdhci_card_event(struct mmc_host *mmc)
>  	spin_unlock_irqrestore(&host->lock, flags);
>  }
>  
> +static void sdhci_init_card(struct mmc_host *mmc, struct mmc_card *card)
> +{
> +	struct sdhci_host *host = mmc_priv(mmc);
> +
> +	if (host->ops->init_card)
> +		host->ops->init_card(host, card);
> +}
> +
>  static const struct mmc_host_ops sdhci_ops = {
>  	.request	= sdhci_request,
>  	.post_req	= sdhci_post_req,
> @@ -2132,6 +2140,7 @@ static const struct mmc_host_ops sdhci_ops = {
>  	.select_drive_strength		= sdhci_select_drive_strength,
>  	.card_event			= sdhci_card_event,
>  	.card_busy	= sdhci_card_busy,
> +	.init_card	= sdhci_init_card,
>  };
>  
>  /*****************************************************************************\
> diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
> index 609f87ca536b..49c6c5b0e33b 100644
> --- a/drivers/mmc/host/sdhci.h
> +++ b/drivers/mmc/host/sdhci.h
> @@ -549,6 +549,7 @@ struct sdhci_ops {
>  					 struct mmc_card *card,
>  					 unsigned int max_dtr, int host_drv,
>  					 int card_drv, int *drv_type);
> +	void	(*init_card)(struct sdhci_host *host, struct mmc_card *card);
>  };
>  
>  #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
> 

[PATCH 01/12] mmc: sdhci: add init_card callback to sdhci

[Gregory CLEMENT]

Hi Adrian,
 
 On lun., juin 13 2016, Adrian Hunter <adrian.hunter@intel.com> wrote:

> On 09/06/16 10:10, Gregory CLEMENT wrote:
>> From: Marcin Wojtas <mw@semihalf.com>
>> 
>> Some sdhci hosts may require handling quirks during card initialization
>> at the time when its type is already known. Hence a new callback
>> (init_card) is added in sdhci_ops.
>
> I plan to remove init_card and other host ops that sdhci doesn't use (like
> sdhci_select_drive_strength).  The driver must provide the mmc op instead.
> e.g. in sdhci-xenon.c
>
> 	host->mmc_host_ops.init_card = sdhci_xenon_init_card

OK I will do this.

Thanks for your review.

Gregory

>
>> 
>> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
>> ---
>>  drivers/mmc/host/sdhci.c | 9 +++++++++
>>  drivers/mmc/host/sdhci.h | 1 +
>>  2 files changed, 10 insertions(+)
>> 
>> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
>> index 0e3d7c056cb1..fd4e9a84f739 100644
>> --- a/drivers/mmc/host/sdhci.c
>> +++ b/drivers/mmc/host/sdhci.c
>> @@ -2117,6 +2117,14 @@ static void sdhci_card_event(struct mmc_host *mmc)
>>  	spin_unlock_irqrestore(&host->lock, flags);
>>  }
>>  
>> +static void sdhci_init_card(struct mmc_host *mmc, struct mmc_card *card)
>> +{
>> +	struct sdhci_host *host = mmc_priv(mmc);
>> +
>> +	if (host->ops->init_card)
>> +		host->ops->init_card(host, card);
>> +}
>> +
>>  static const struct mmc_host_ops sdhci_ops = {
>>  	.request	= sdhci_request,
>>  	.post_req	= sdhci_post_req,
>> @@ -2132,6 +2140,7 @@ static const struct mmc_host_ops sdhci_ops = {
>>  	.select_drive_strength		= sdhci_select_drive_strength,
>>  	.card_event			= sdhci_card_event,
>>  	.card_busy	= sdhci_card_busy,
>> +	.init_card	= sdhci_init_card,
>>  };
>>  
>>  /*****************************************************************************\
>> diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
>> index 609f87ca536b..49c6c5b0e33b 100644
>> --- a/drivers/mmc/host/sdhci.h
>> +++ b/drivers/mmc/host/sdhci.h
>> @@ -549,6 +549,7 @@ struct sdhci_ops {
>>  					 struct mmc_card *card,
>>  					 unsigned int max_dtr, int host_drv,
>>  					 int card_drv, int *drv_type);
>> +	void	(*init_card)(struct sdhci_host *host, struct mmc_card *card);
>>  };
>>  
>>  #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
>> 
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH 02/12] mmc: sdhci_f_sdh30: restrict voltage_switch() callback to the 1.8V case

[Gregory CLEMENT]

Given its name the voltage_switch() should be called for any
voltage. However currently it is only called for the 1.8V case.

That means that the current implementation of the callback could have
made this assumption. It seems the case for the f_sdh3 driver. In order
to not adding a regression when the voltage_switch() function will be
called for the other voltage targets, this patch ensure that the code of
the current callback won't be executed for the other case than 1.8V.

Cc: Vincent Yang <vincent.yang@tw.fujitsu.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 drivers/mmc/host/sdhci_f_sdh30.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/mmc/host/sdhci_f_sdh30.c b/drivers/mmc/host/sdhci_f_sdh30.c
index 983b8b32ef96..09a341cbd572 100644
--- a/drivers/mmc/host/sdhci_f_sdh30.c
+++ b/drivers/mmc/host/sdhci_f_sdh30.c
@@ -54,6 +54,10 @@ static void sdhci_f_sdh30_soft_voltage_switch(struct sdhci_host *host)
 	struct f_sdhost_priv *priv = sdhci_priv(host);
 	u32 ctrl = 0;
 
+	/* Initially this function was called only for the 1.8V case */
+	if (host->mmc->ios.signal_voltage != MMC_SIGNAL_VOLTAGE_180)
+		return;
+
 	usleep_range(2500, 3000);
 	ctrl = sdhci_readl(host, F_SDH30_IO_CONTROL2);
 	ctrl |= F_SDH30_CRES_O_DN;
-- 
2.5.0

[PATCH 03/12] mmc: tegra: restrict the voltage_switch() callback to the 1.8V case

[Gregory CLEMENT]

Given its name the voltage_switch() should be called for any
voltage. However currently it is only called for the 1.8V case.

That means that the current implementation of the callback could have
made this assumption. In order to not adding a regression when the
voltage_switch() function will be called for the other voltage targets,
this patch ensure that the code of the current callback won't be executed
for the other case than 1.8V.

Cc: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 drivers/mmc/host/sdhci-tegra.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index bcc0de47fe7e..01f58296125e 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -302,6 +302,10 @@ static void tegra_sdhci_voltage_switch(struct sdhci_host *host)
 	struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
 	const struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data;
 
+	/* initially this function was called only for the 1.8V case */
+	if (host->mmc->ios.signal_voltage != MMC_SIGNAL_VOLTAGE_180)
+		return;
+
 	if (soc_data->nvquirks & NVQUIRK_HAS_PADCALIB)
 		tegra_host->pad_calib_required = true;
 }
-- 
2.5.0

[PATCH 03/12] mmc: tegra: restrict the voltage_switch() callback to the 1.8V case

[Lucas Stach]

Am Donnerstag, den 09.06.2016, 09:10 +0200 schrieb Gregory CLEMENT:
> Given its name the voltage_switch() should be called for any
> voltage. However currently it is only called for the 1.8V case.
> 
> That means that the current implementation of the callback could have
> made this assumption. In order to not adding a regression when the
> voltage_switch() function will be called for the other voltage
> targets,
> this patch ensure that the code of the current callback won't be
> executed
> for the other case than 1.8V.
> 
This isn't necessary, it's fine to re-execute the pad calibration for
any voltage switch.

Regards,
Lucas

> Cc: Lucas Stach <dev@lynxeye.de>
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> ---
> ?drivers/mmc/host/sdhci-tegra.c | 4 ++++
> ?1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-
> tegra.c
> index bcc0de47fe7e..01f58296125e 100644
> --- a/drivers/mmc/host/sdhci-tegra.c
> +++ b/drivers/mmc/host/sdhci-tegra.c
> @@ -302,6 +302,10 @@ static void tegra_sdhci_voltage_switch(struct
> sdhci_host *host)
> ?	struct sdhci_tegra *tegra_host =
> sdhci_pltfm_priv(pltfm_host);
> ?	const struct sdhci_tegra_soc_data *soc_data = tegra_host-
> >soc_data;
> ?
> +	/* initially this function was called only for the 1.8V case
> */
> +	if (host->mmc->ios.signal_voltage != MMC_SIGNAL_VOLTAGE_180)
> +		return;
> +
> ?	if (soc_data->nvquirks & NVQUIRK_HAS_PADCALIB)
> ?		tegra_host->pad_calib_required = true;
> ?}

[PATCH 03/12] mmc: tegra: restrict the voltage_switch() callback to the 1.8V case

[Gregory CLEMENT]

Hi Lucas,
 
 On jeu., juin 09 2016, Lucas Stach <dev@lynxeye.de> wrote:

> Am Donnerstag, den 09.06.2016, 09:10 +0200 schrieb Gregory CLEMENT:
>> Given its name the voltage_switch() should be called for any
>> voltage. However currently it is only called for the 1.8V case.
>> 
>> That means that the current implementation of the callback could have
>> made this assumption. In order to not adding a regression when the
>> voltage_switch() function will be called for the other voltage
>> targets,
>> this patch ensure that the code of the current callback won't be
>> executed
>> for the other case than 1.8V.
>> 
> This isn't necessary, it's fine to re-execute the pad calibration for
> any voltage switch.

Thanks for your feedback, so I can remove this patch from the series.

Gregory

>
> Regards,
> Lucas
>
>> Cc: Lucas Stach <dev@lynxeye.de>
>> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
>> ---
>> ?drivers/mmc/host/sdhci-tegra.c | 4 ++++
>> ?1 file changed, 4 insertions(+)
>> 
>> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-
>> tegra.c
>> index bcc0de47fe7e..01f58296125e 100644
>> --- a/drivers/mmc/host/sdhci-tegra.c
>> +++ b/drivers/mmc/host/sdhci-tegra.c
>> @@ -302,6 +302,10 @@ static void tegra_sdhci_voltage_switch(struct
>> sdhci_host *host)
>> ?	struct sdhci_tegra *tegra_host =
>> sdhci_pltfm_priv(pltfm_host);
>> ?	const struct sdhci_tegra_soc_data *soc_data = tegra_host-
>> >soc_data;
>> ?
>> +	/* initially this function was called only for the 1.8V case
>> */
>> +	if (host->mmc->ios.signal_voltage != MMC_SIGNAL_VOLTAGE_180)
>> +		return;
>> +
>> ?	if (soc_data->nvquirks & NVQUIRK_HAS_PADCALIB)
>> ?		tegra_host->pad_calib_required = true;
>> ?}

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH 04/12] mmc: sdhci: call voltage_switch callback also for the 3.3V case

[Gregory CLEMENT]

From: Victor Gu <xigu@marvell.com>

Currently the voltage switch callback function is only called in the 1.8V
case. However, given the name this callback should be called in the 3.3V
case too. It is needed for the Xenon controller.

[gregory.clement at free-electrons.com: split the initial commit and
modify the log]

Signed-off-by: Victor Gu <xigu@marvell.com>
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 drivers/mmc/host/sdhci.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index fd4e9a84f739..b07219426d39 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1749,6 +1749,10 @@ static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc,
 		/* Wait for 5ms */
 		usleep_range(5000, 5500);
 
+		/* Some controller need to do more when switching */
+		if (host->ops->voltage_switch)
+			host->ops->voltage_switch(host);
+
 		/* 3.3V regulator output should be stable within 5 ms */
 		ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2);
 		if (!(ctrl & SDHCI_CTRL_VDD_180))
-- 
2.5.0

[PATCH 05/12] mmc: sdhci: add a pre voltage switch callback function

[Gregory CLEMENT]

From: Victor Gu <xigu@marvell.com>

Some host controller such as Xenon needs additional setting when
switching signal voltage in eMMC mode. They also need to re-enable
internal clock before a voltage switch.

This commit adds a callback routine "voltage_switch_pre" in the struct
sdhci_ops, which is used by some host controllers which need re-enable
the internal clock before a voltage switch.

[gregory.clement at free-electrons.com: split the initial commit and
reformulate the log]

Signed-off-by: Victor Gu <xigu@marvell.com>
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 drivers/mmc/host/sdhci.c | 4 ++++
 drivers/mmc/host/sdhci.h | 1 +
 2 files changed, 5 insertions(+)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index b07219426d39..cad03ffa9d9b 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1729,6 +1729,10 @@ static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc,
 	if (host->version < SDHCI_SPEC_300)
 		return 0;
 
+	/* Some controller need to do more before switching */
+	if (host->ops->voltage_switch_pre)
+		host->ops->voltage_switch_pre(host);
+
 	ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2);
 
 	switch (ios->signal_voltage) {
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 49c6c5b0e33b..6bec1b0368d2 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -550,6 +550,7 @@ struct sdhci_ops {
 					 unsigned int max_dtr, int host_drv,
 					 int card_drv, int *drv_type);
 	void	(*init_card)(struct sdhci_host *host, struct mmc_card *card);
+	void	(*voltage_switch_pre)(struct sdhci_host *host);
 };
 
 #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
-- 
2.5.0

[PATCH 05/12] mmc: sdhci: add a pre voltage switch callback function

[Adrian Hunter]

On 09/06/16 10:10, Gregory CLEMENT wrote:
> From: Victor Gu <xigu@marvell.com>
> 
> Some host controller such as Xenon needs additional setting when
> switching signal voltage in eMMC mode. They also need to re-enable
> internal clock before a voltage switch.
> 
> This commit adds a callback routine "voltage_switch_pre" in the struct
> sdhci_ops, which is used by some host controllers which need re-enable
> the internal clock before a voltage switch.

Don't want to add sdhci host ops for the "do something before a mmc host op"
case.

Instead, export sdhci_start_signal_voltage_switch() and  hook
host->mmc_host_ops.start_signal_voltage_switch. Then in sdhci-xenon.c:

int xenon__start_signal_voltage_switch(struct mmc_host *mmc,
				       struct mmc_ios *ios)
{
	blah blah
	return sdhci_start_signal_voltage_switch(mmc, ios);
}


> 
> [gregory.clement at free-electrons.com: split the initial commit and
> reformulate the log]
> 
> Signed-off-by: Victor Gu <xigu@marvell.com>
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> ---
>  drivers/mmc/host/sdhci.c | 4 ++++
>  drivers/mmc/host/sdhci.h | 1 +
>  2 files changed, 5 insertions(+)
> 
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index b07219426d39..cad03ffa9d9b 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -1729,6 +1729,10 @@ static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc,
>  	if (host->version < SDHCI_SPEC_300)
>  		return 0;
>  
> +	/* Some controller need to do more before switching */
> +	if (host->ops->voltage_switch_pre)
> +		host->ops->voltage_switch_pre(host);
> +
>  	ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2);
>  
>  	switch (ios->signal_voltage) {
> diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
> index 49c6c5b0e33b..6bec1b0368d2 100644
> --- a/drivers/mmc/host/sdhci.h
> +++ b/drivers/mmc/host/sdhci.h
> @@ -550,6 +550,7 @@ struct sdhci_ops {
>  					 unsigned int max_dtr, int host_drv,
>  					 int card_drv, int *drv_type);
>  	void	(*init_card)(struct sdhci_host *host, struct mmc_card *card);
> +	void	(*voltage_switch_pre)(struct sdhci_host *host);
>  };
>  
>  #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
> 

[PATCH 05/12] mmc: sdhci: add a pre voltage switch callback function

[Ziji Hu]

Hi Adrian,

  Thanks a lot for the suggestion. I'm from Marvell Xenon SDHC team.
  Most of sdhci host ops are still used in our driver. We just change or add few ops. Thus, if we create our own mmc_host_ops, many static sdhci host ops will be exported. I would like to know whether such a modification can be accepted or not.

   I notice that community is improving sdhci. Thus all the static sdhci ops called outside the sdhci.c will be exported. Is my understanding correct?
   Thank you.

Best regards,
Hu Ziji

>> ? 2016?6?13??16:52?Adrian Hunter <adrian.hunter@intel.com> ???
>> 
>> On 09/06/16 10:10, Gregory CLEMENT wrote:
>> From: Victor Gu <xigu@marvell.com>
>> 
>> Some host controller such as Xenon needs additional setting when
>> switching signal voltage in eMMC mode. They also need to re-enable
>> internal clock before a voltage switch.
>> 
>> This commit adds a callback routine "voltage_switch_pre" in the struct
>> sdhci_ops, which is used by some host controllers which need re-enable
>> the internal clock before a voltage switch.
> 
> Don't want to add sdhci host ops for the "do something before a mmc host op"
> case.
> 
> Instead, export sdhci_start_signal_voltage_switch() and  hook
> host->mmc_host_ops.start_signal_voltage_switch. Then in sdhci-xenon.c:
> 
> int xenon__start_signal_voltage_switch(struct mmc_host *mmc,
>                      struct mmc_ios *ios)
> {
>   blah blah
>   return sdhci_start_signal_voltage_switch(mmc, ios);
> }
> 
> 
>> 
>> [gregory.clement at free-electrons.com: split the initial commit and
>> reformulate the log]
>> 
>> Signed-off-by: Victor Gu <xigu@marvell.com>
>> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
>> ---
>> drivers/mmc/host/sdhci.c | 4 ++++
>> drivers/mmc/host/sdhci.h | 1 +
>> 2 files changed, 5 insertions(+)
>> 
>> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
>> index b07219426d39..cad03ffa9d9b 100644
>> --- a/drivers/mmc/host/sdhci.c
>> +++ b/drivers/mmc/host/sdhci.c
>> @@ -1729,6 +1729,10 @@ static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc,
>>   if (host->version < SDHCI_SPEC_300)
>>       return 0;
>> 
>> +    /* Some controller need to do more before switching */
>> +    if (host->ops->voltage_switch_pre)
>> +        host->ops->voltage_switch_pre(host);
>> +
>>   ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2);
>> 
>>   switch (ios->signal_voltage) {
>> diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
>> index 49c6c5b0e33b..6bec1b0368d2 100644
>> --- a/drivers/mmc/host/sdhci.h
>> +++ b/drivers/mmc/host/sdhci.h
>> @@ -550,6 +550,7 @@ struct sdhci_ops {
>>                    unsigned int max_dtr, int host_drv,
>>                    int card_drv, int *drv_type);
>>   void    (*init_card)(struct sdhci_host *host, struct mmc_card *card);
>> +    void    (*voltage_switch_pre)(struct sdhci_host *host);
>> };
>> 
>> #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 05/12] mmc: sdhci: add a pre voltage switch callback function

[Adrian Hunter]

On 13/06/16 17:04, Ziji Hu wrote:
> Hi Adrian,
> 
> Thanks a lot for the suggestion. I'm from Marvell Xenon SDHC team. Most
> of sdhci host ops are still used in our driver. We just change or add few
> ops. Thus, if we create our own mmc_host_ops, many static sdhci host ops
> will be exported. I would like to know whether such a modification can be
> accepted or not.
> 
> I notice that community is improving sdhci. Thus all the static sdhci ops
> called outside the sdhci.c will be exported. Is my understanding
> correct? Thank you.

The aim is to make sdhci more like a library and give more control to the
drivers.  That will mean more sdhci functions get exported, particularly mmc
host ops like sdhci_set_ios() or sdhci_start_signal_voltage_switch().

> 
> Best regards, Hu Ziji
> 
>>> ? 2016?6?13??16:52?Adrian Hunter <adrian.hunter@intel.com> ???
>>> 
>>> On 09/06/16 10:10, Gregory CLEMENT wrote: From: Victor Gu
>>> <xigu@marvell.com>
>>> 
>>> Some host controller such as Xenon needs additional setting when 
>>> switching signal voltage in eMMC mode. They also need to re-enable 
>>> internal clock before a voltage switch.
>>> 
>>> This commit adds a callback routine "voltage_switch_pre" in the
>>> struct sdhci_ops, which is used by some host controllers which need
>>> re-enable the internal clock before a voltage switch.
>> 
>> Don't want to add sdhci host ops for the "do something before a mmc
>> host op" case.
>> 
>> Instead, export sdhci_start_signal_voltage_switch() and  hook 
>> host->mmc_host_ops.start_signal_voltage_switch. Then in sdhci-xenon.c:
>> 
>> int xenon__start_signal_voltage_switch(struct mmc_host *mmc, struct
>> mmc_ios *ios) { blah blah return sdhci_start_signal_voltage_switch(mmc,
>> ios); }
>> 
>> 
>>> 
>>> [gregory.clement at free-electrons.com: split the initial commit and 
>>> reformulate the log]
>>> 
>>> Signed-off-by: Victor Gu <xigu@marvell.com> Signed-off-by: Marcin
>>> Wojtas <mw@semihalf.com> Signed-off-by: Gregory CLEMENT
>>> <gregory.clement@free-electrons.com> --- drivers/mmc/host/sdhci.c | 4
>>> ++++ drivers/mmc/host/sdhci.h | 1 + 2 files changed, 5 insertions(+)
>>> 
>>> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c 
>>> index b07219426d39..cad03ffa9d9b 100644 ---
>>> a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1729,6
>>> +1729,10 @@ static int sdhci_start_signal_voltage_switch(struct
>>> mmc_host *mmc, if (host->version < SDHCI_SPEC_300) return 0;
>>> 
>>> +    /* Some controller need to do more before switching */ +    if
>>> (host->ops->voltage_switch_pre) +
>>> host->ops->voltage_switch_pre(host); + ctrl = sdhci_readw(host,
>>> SDHCI_HOST_CONTROL2);
>>> 
>>> switch (ios->signal_voltage) { diff --git a/drivers/mmc/host/sdhci.h
>>> b/drivers/mmc/host/sdhci.h index 49c6c5b0e33b..6bec1b0368d2 100644 
>>> --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@
>>> -550,6 +550,7 @@ struct sdhci_ops { unsigned int max_dtr, int
>>> host_drv, int card_drv, int *drv_type); void    (*init_card)(struct
>>> sdhci_host *host, struct mmc_card *card); +    void
>>> (*voltage_switch_pre)(struct sdhci_host *host); };
>>> 
>>> #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
>> 
>> -- To unsubscribe from this list: send the line "unsubscribe linux-mmc"
>> in the body of a message to majordomo at vger.kernel.org More majordomo
>> info at  http://vger.kernel.org/majordomo-info.html

[PATCH 05/12] mmc: sdhci: add a pre voltage switch callback function

[Gregory CLEMENT]

Hi Adrian,
 
 On lun., juin 13 2016, Adrian Hunter <adrian.hunter@intel.com> wrote:

> On 09/06/16 10:10, Gregory CLEMENT wrote:
>> From: Victor Gu <xigu@marvell.com>
>> 
>> Some host controller such as Xenon needs additional setting when
>> switching signal voltage in eMMC mode. They also need to re-enable
>> internal clock before a voltage switch.
>> 
>> This commit adds a callback routine "voltage_switch_pre" in the struct
>> sdhci_ops, which is used by some host controllers which need re-enable
>> the internal clock before a voltage switch.
>
> Don't want to add sdhci host ops for the "do something before a mmc host op"
> case.
>
> Instead, export sdhci_start_signal_voltage_switch() and  hook
> host->mmc_host_ops.start_signal_voltage_switch. Then in sdhci-xenon.c:
>
> int xenon__start_signal_voltage_switch(struct mmc_host *mmc,
> 				       struct mmc_ios *ios)
> {
> 	blah blah
> 	return sdhci_start_signal_voltage_switch(mmc, ios);
> }

OK I see your point.

Thanks,

Gregory

>
>
>> 
>> [gregory.clement at free-electrons.com: split the initial commit and
>> reformulate the log]
>> 
>> Signed-off-by: Victor Gu <xigu@marvell.com>
>> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
>> ---
>>  drivers/mmc/host/sdhci.c | 4 ++++
>>  drivers/mmc/host/sdhci.h | 1 +
>>  2 files changed, 5 insertions(+)
>> 
>> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
>> index b07219426d39..cad03ffa9d9b 100644
>> --- a/drivers/mmc/host/sdhci.c
>> +++ b/drivers/mmc/host/sdhci.c
>> @@ -1729,6 +1729,10 @@ static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc,
>>  	if (host->version < SDHCI_SPEC_300)
>>  		return 0;
>>  
>> +	/* Some controller need to do more before switching */
>> +	if (host->ops->voltage_switch_pre)
>> +		host->ops->voltage_switch_pre(host);
>> +
>>  	ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2);
>>  
>>  	switch (ios->signal_voltage) {
>> diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
>> index 49c6c5b0e33b..6bec1b0368d2 100644
>> --- a/drivers/mmc/host/sdhci.h
>> +++ b/drivers/mmc/host/sdhci.h
>> @@ -550,6 +550,7 @@ struct sdhci_ops {
>>  					 unsigned int max_dtr, int host_drv,
>>  					 int card_drv, int *drv_type);
>>  	void	(*init_card)(struct sdhci_host *host, struct mmc_card *card);
>> +	void	(*voltage_switch_pre)(struct sdhci_host *host);
>>  };
>>  
>>  #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
>> 
>

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH 06/12] mmc: sdhci: add delay adjust feature including phy reset

[Gregory CLEMENT]

From: Victor Gu <xigu@marvell.com>

Tuning is only available in HS200 mode. However, some host controllers,
such as the Xenon one, need to adjust delay for other modes and even
adjust the delay before tuning.

This commit adds a callback routine "delay_adj" in the struct sdhci_ops.

[gregory.clement at free-electrons.com: split the initial commit and
reformulate the log]

Signed-off-by: Victor Gu <xigu@marvell.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 drivers/mmc/host/sdhci.c | 3 +++
 drivers/mmc/host/sdhci.h | 1 +
 2 files changed, 4 insertions(+)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index cad03ffa9d9b..2acae2b3b2d3 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1606,6 +1606,9 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 
 	mmiowb();
 	spin_unlock_irqrestore(&host->lock, flags);
+
+	if (host->ops->delay_adj)
+		host->ops->delay_adj(host, ios);
 }
 
 static int sdhci_get_cd(struct mmc_host *mmc)
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 6bec1b0368d2..f88f72782a8d 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -551,6 +551,7 @@ struct sdhci_ops {
 					 int card_drv, int *drv_type);
 	void	(*init_card)(struct sdhci_host *host, struct mmc_card *card);
 	void	(*voltage_switch_pre)(struct sdhci_host *host);
+	int	(*delay_adj)(struct sdhci_host *host, struct mmc_ios *ios);
 };
 
 #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
-- 
2.5.0

[PATCH 07/12] mmc: core: export the alive operation

[Gregory CLEMENT]

Depending of the type of card there is a different operation to know
if the  car is alive. However, the access to this operation are private.
This patch introduce a new function allowing to know if the card is alive
by using the appropriate operation.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 drivers/mmc/core/core.c  | 7 +++++++
 include/linux/mmc/card.h | 1 +
 2 files changed, 8 insertions(+)

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 8b4dfd45433b..3dce095c5f89 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2464,6 +2464,13 @@ int mmc_hw_reset(struct mmc_host *host)
 }
 EXPORT_SYMBOL(mmc_hw_reset);
 
+
+int card_alive(struct mmc_card *card)
+{
+	return card->host->bus_ops->alive(card->host);
+}
+EXPORT_SYMBOL(card_alive);
+
 static int mmc_rescan_try_freq(struct mmc_host *host, unsigned freq)
 {
 	host->f_init = freq;
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index eb0151bac50c..287a0b12d8ba 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -526,6 +526,7 @@ struct mmc_driver {
 	void (*shutdown)(struct mmc_card *);
 };
 
+extern int card_alive(struct mmc_card *);
 extern int mmc_register_driver(struct mmc_driver *);
 extern void mmc_unregister_driver(struct mmc_driver *);
 
-- 
2.5.0

[PATCH 08/12] dt-bindings: mmc: Add Xenon description

[Gregory CLEMENT]

This patch documents the Xenon SDHCI controller that we can find in the
Armada 37xx and the Armada 7K and 8K SoCs.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 .../devicetree/bindings/mmc/sdhci-xenon.txt        | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-xenon.txt

diff --git a/Documentation/devicetree/bindings/mmc/sdhci-xenon.txt b/Documentation/devicetree/bindings/mmc/sdhci-xenon.txt
new file mode 100644
index 000000000000..e8d49fda5f12
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/sdhci-xenon.txt
@@ -0,0 +1,27 @@
+* Marvell sdhci-xenon controller
+
+This file documents differences between the core properties in mmc.txt
+and the properties used by the sdhci-xenon drivers.
+
+Required properties:
+- compatible: Should be "marvell,xenon-sdhci".
+- reg:
+  one register area for the SDHCI registers.
+- interrupts-extended: interrupt number and attributes
+- clocks: array of clocks required for SDHCI.
+- bus-width: max bus width in unit of bit, normally should be 1 bit, 4 bits or 8 bits
+
+Optional properties:
+- non-removable: whether card is non-removable.
+- auto-cmd12: whether cmd12 is sent automatically.
+Example:
+
+sdhci0: sdhci at D8000 {
+	compatible = "marvell,xenon-sdhci";
+	reg = <0xD8000 0x300>;
+	interrupts-extended = <&gic GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+	non-removable;
+	bus-width = <8>;
+	auto-cmd12;
+	status = "disabled";
+};
-- 
2.5.0

[PATCH 08/12] dt-bindings: mmc: Add Xenon description

[Rob Herring]

On Thu, Jun 09, 2016 at 09:10:14AM +0200, Gregory CLEMENT wrote:
> This patch documents the Xenon SDHCI controller that we can find in the
> Armada 37xx and the Armada 7K and 8K SoCs.
> 
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> ---
>  .../devicetree/bindings/mmc/sdhci-xenon.txt        | 27 ++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-xenon.txt
> 
> diff --git a/Documentation/devicetree/bindings/mmc/sdhci-xenon.txt b/Documentation/devicetree/bindings/mmc/sdhci-xenon.txt
> new file mode 100644
> index 000000000000..e8d49fda5f12
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mmc/sdhci-xenon.txt
> @@ -0,0 +1,27 @@
> +* Marvell sdhci-xenon controller
> +
> +This file documents differences between the core properties in mmc.txt
> +and the properties used by the sdhci-xenon drivers.

Bindings don't document drivers...

> +
> +Required properties:
> +- compatible: Should be "marvell,xenon-sdhci".

SoC specific compatible strings please. This one can be fallback.

> +- reg:
> +  one register area for the SDHCI registers.
> +- interrupts-extended: interrupt number and attributes

Just use interrupts unless you really have a need for 
interrupts-extended. Really, either is valid for any binding, but I 
prefer to just have bindings documented one way.

> +- clocks: array of clocks required for SDHCI.

Missing from the exmaple, and how many clocks and in what order?

> +- bus-width: max bus width in unit of bit, normally should be 1 bit, 4 bits or 8 bits

Isn't this one standard? Just refer back to the common binding.

> +
> +Optional properties:
> +- non-removable: whether card is non-removable.
> +- auto-cmd12: whether cmd12 is sent automatically.

Seems strange this would be optional for a specific controller. I'd 
expect either the xenon controller needs this or not.

> +Example:
> +
> +sdhci0: sdhci at D8000 {
> +	compatible = "marvell,xenon-sdhci";
> +	reg = <0xD8000 0x300>;
> +	interrupts-extended = <&gic GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
> +	non-removable;
> +	bus-width = <8>;
> +	auto-cmd12;
> +	status = "disabled";
> +};
> -- 
> 2.5.0
> 

[PATCH 08/12] dt-bindings: mmc: Add Xenon description

[Gregory CLEMENT]

Hi Rob,
 
 On ven., juin 10 2016, Rob Herring <robh@kernel.org> wrote:

> On Thu, Jun 09, 2016 at 09:10:14AM +0200, Gregory CLEMENT wrote:
>> This patch documents the Xenon SDHCI controller that we can find in the
>> Armada 37xx and the Armada 7K and 8K SoCs.
>> 
>> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
>> ---
>>  .../devicetree/bindings/mmc/sdhci-xenon.txt        | 27 ++++++++++++++++++++++
>>  1 file changed, 27 insertions(+)
>>  create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-xenon.txt
>> 
>> diff --git a/Documentation/devicetree/bindings/mmc/sdhci-xenon.txt b/Documentation/devicetree/bindings/mmc/sdhci-xenon.txt
>> new file mode 100644
>> index 000000000000..e8d49fda5f12
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/mmc/sdhci-xenon.txt
>> @@ -0,0 +1,27 @@
>> +* Marvell sdhci-xenon controller
>> +
>> +This file documents differences between the core properties in mmc.txt
>> +and the properties used by the sdhci-xenon drivers.
>
> Bindings don't document drivers...

Sure I missed this one.


>
>> +
>> +Required properties:
>> +- compatible: Should be "marvell,xenon-sdhci".
>
> SoC specific compatible strings please. This one can be fallback.

OK

>
>> +- reg:
>> +  one register area for the SDHCI registers.
>> +- interrupts-extended: interrupt number and attributes
>
> Just use interrupts unless you really have a need for 
> interrupts-extended. Really, either is valid for any binding, but I 
> prefer to just have bindings documented one way.

OK

>
>> +- clocks: array of clocks required for SDHCI.
>
> Missing from the exmaple, and how many clocks and in what order?


I need to figure out it.

>
>> +- bus-width: max bus width in unit of bit, normally should be 1 bit, 4 bits or 8 bits
>
> Isn't this one standard? Just refer back to the common binding.

OK it will simplify the binding dcumentation.

>
>> +
>> +Optional properties:
>> +- non-removable: whether card is non-removable.
>> +- auto-cmd12: whether cmd12 is sent automatically.
>
> Seems strange this would be optional for a specific controller. I'd 
> expect either the xenon controller needs this or not.

I have to check it.

Thanks for the review,

Gregory

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH 09/12] mmc: sdhci-xenon: add initial Xenon eMMC driver

[Gregory CLEMENT]

From: Victor Gu <xigu@marvell.com>

This path adds the driver for the Marvell Xenon eMMC host controller
which supports eMMC 5.1, SD 3.0.

However this driver supports only up to eMMC 5.0 since the command queue
feature is not included (yet) in the driver.

[gregory.clement at free-electrons.com:
 - reformulate commit log
 - overload the sdhci_set_uhs_signaling function instead of using a quirk
 - fix a kconfig dependency
 - remove dead code]

Signed-off-by: Victor Gu <xigu@marvell.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 drivers/mmc/host/Kconfig       |   10 +
 drivers/mmc/host/Makefile      |    1 +
 drivers/mmc/host/sdhci-xenon.c | 1164 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 1175 insertions(+)
 create mode 100644 drivers/mmc/host/sdhci-xenon.c

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 0aa484c10c0a..00b6810e4a6f 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -48,6 +48,16 @@ config MMC_SDHCI
 
 	  If unsure, say N.
 
+config MMC_XENON_SDHCI
+	bool "Marvell XENON SD Host Controller"
+	depends on MMC_SDHCI_PLTFM
+	default n
+	help
+	  This selects the Marvell Xenon Host Controller.
+	  Marvell Xenon host controller supports
+	  JEDEC eMMC 5.1, SDIO spec 3.0,
+	  and SD host controller spec 3.0
+
 config MMC_SDHCI_IO_ACCESSORS
 	bool
 	depends on MMC_SDHCI
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index af918d261ff9..387094031ba9 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -76,6 +76,7 @@ obj-$(CONFIG_MMC_SDHCI_IPROC)		+= sdhci-iproc.o
 obj-$(CONFIG_MMC_SDHCI_MSM)		+= sdhci-msm.o
 obj-$(CONFIG_MMC_SDHCI_ST)		+= sdhci-st.o
 obj-$(CONFIG_MMC_SDHCI_MICROCHIP_PIC32)	+= sdhci-pic32.o
+obj-$(CONFIG_MMC_XENON_SDHCI)		+= sdhci-xenon.o
 
 ifeq ($(CONFIG_CB710_DEBUG),y)
 	CFLAGS-cb710-mmc	+= -DDEBUG
diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c
new file mode 100644
index 000000000000..43c06db95872
--- /dev/null
+++ b/drivers/mmc/host/sdhci-xenon.c
@@ -0,0 +1,1164 @@
+/*
+ * SD and eMMC host controller driver for Marvell Xenon SDHC
+ *
+ * Copyright (C) 2016 Victor Gu
+ *
+ * Author: Victor Gu
+ * Email : xigu at marvell.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <asm/setup.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/kernel.h>
+#include <linux/mmc/card.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/slab.h>
+#include "sdhci.h"
+#include "sdhci-pltfm.h"
+
+/* Re-tuning event interrupt signal */
+#define  SDHCI_RETUNE_EVT_INTSIG		0x00001000
+
+/*
+ * Xenon SD Host Controller self-defined registers
+ */
+#define SDHC_SYS_CFG_INFO			0x0104
+#define  SLOT_TYPE_SDIO_SHIFT			24
+#define  SLOT0_TYPE_EMMC_MASK			0x1
+#define  SLOT_TYPE_EMMC_SHIFT			16
+#define  SLOT0_TYPE_SD_SDIO_MMC_MASK		0x1
+#define  SLOT_TYPE_SD_SDIO_MMC_SHIFT		8
+
+#define SDHC_SYS_OP_CTRL			0x0108
+#define  AUTO_CLKGATE_DISABLE_MASK		(0x1 << 20)
+#define  SDCLK_IDLEOFF_ENABLE_SHIFT		8
+#define  SLOT_ENABLE_SHIFT			0
+
+#define SDHC_SYS_EXT_OP_CTRL			0x010c
+
+#define SDHC_SLOT_OP_STATUS_CTRL		0x0128
+#define	 DELAY_90_DEGREE_MASK_EMMC5		(1 << 7)
+#define  DELAY_90_DEGREE_SHIFT_EMMC5		7
+#define  TUNING_PROG_FIXED_DELAY_MASK		0xff
+#define  FORCE_SEL_INVERSE_CLK_SHIFT		11
+
+#define SDHC_SLOT_eMMC_CTRL			0x0130
+#define  ENABLE_DATA_STROBE			(1 << 24)
+#define  SET_EMMC_RSTN				(1 << 16)
+#define  DISABLE_RD_DATA_CRC			(1 << 14)
+#define  DISABLE_CRC_STAT_TOKEN			(1 << 13)
+#define  eMMC_VCCQ_MASK				0x3
+#define   eMMC_VCCQ_1_8V			0x1
+#define   eMMC_VCCQ_1_2V			0x2
+#define	  eMMC_VCCQ_3_3V			0x3
+
+#define SDHC_SLOT_RETUNING_REQ_CTRL		0x0144
+#define  RETUNING_COMPATIBLE			0x1
+
+#define SDHC_SLOT_AUTO_RETUNING_CTRL		0x0148
+#define  ENABLE_AUTO_RETUNING			0x1
+
+#define SDHC_SLOT_DLL_CUR_DLY_VAL		0x0150
+
+#define EMMC_PHY_REG_BASE			0x170
+
+#define EMMC_PHY_TIMING_ADJUST			EMMC_PHY_REG_BASE
+#define  TIMING_ADJUST_SLOW_MODE		(1 << 29)
+#define  TIMING_ADJUST_SDIO_MODE		(1 << 28)
+#define  OUTPUT_QSN_PHASE_SELECT		(1 << 17)
+#define  SAMPL_INV_QSP_PHASE_SELECT		(1 << 18)
+#define  SAMPL_INV_QSP_PHASE_SELECT_SHIFT	18
+#define  PHY_INITIALIZATION			(1 << 31)
+#define  WAIT_CYCLE_BEFORE_USING_MASK		0xf
+#define  WAIT_CYCLE_BEFORE_USING_SHIFT		12
+#define  FC_SYNC_EN_DURATION_MASK		0xf
+#define  FC_SYNC_EN_DURATION_SHIFT		8
+#define	 FC_SYNC_RST_EN_DURATION_MASK		0xf
+#define  FC_SYNC_RST_EN_DURATION_SHIFT		4
+#define  FC_SYNC_RST_DURATION_MASK		0xf
+#define  FC_SYNC_RST_DURATION_SHIFT		0
+
+#define EMMC_PHY_FUNC_CONTROL			(EMMC_PHY_REG_BASE + 0x4)
+#define  ASYNC_DDRMODE_MASK			(1 << 23)
+#define  ASYNC_DDRMODE_SHIFT			23
+#define  CMD_DDR_MODE				(1 << 16)
+#define  DQ_DDR_MODE_SHIFT			8
+#define  DQ_DDR_MODE_MASK			0xff
+#define  DQ_ASYNC_MODE				(1 << 4)
+
+#define EMMC_PHY_PAD_CONTROL			(EMMC_PHY_REG_BASE + 0x8)
+#define  REC_EN_SHIFT				24
+#define  REC_EN_MASK				0xf
+#define  FC_DQ_RECEN				(1 << 24)
+#define  FC_CMD_RECEN				(1 << 25)
+#define  FC_QSP_RECEN				(1 << 26)
+#define  FC_QSN_RECEN				(1 << 27)
+#define  OEN_QSN				(1 << 28)
+#define  AUTO_RECEN_CTRL			(1 << 30)
+#define  FC_ALL_CMOS_RECEIVER			0xf000
+
+#define  EMMC5_FC_QSP_PD			(1 << 18)
+#define  EMMC5_FC_QSP_PU			(1 << 22)
+#define  EMMC5_FC_CMD_PD			(1 << 17)
+#define  EMMC5_FC_CMD_PU			(1 << 21)
+#define  EMMC5_FC_DQ_PD				(1 << 16)
+#define  EMMC5_FC_DQ_PU				(1 << 20)
+
+#define EMMC_PHY_PAD_CONTROL1			(EMMC_PHY_REG_BASE + 0xc)
+#define  EMMC5_1_FC_QSP_PD			(1 << 9)
+#define  EMMC5_1_FC_QSP_PU			(1 << 25)
+#define  EMMC5_1_FC_CMD_PD			(1 << 8)
+#define  EMMC5_1_FC_CMD_PU			(1 << 24)
+#define  EMMC5_1_FC_DQ_PD			0xff
+#define  EMMC5_1_FC_DQ_PU			(0xff << 16)
+
+#define EMMC_PHY_PAD_CONTROL2			(EMMC_PHY_REG_BASE + 0x10)
+#define  ZNR_MASK				(0x1f << 8)
+#define  ZNR_SHIFT				8
+#define  ZPR_MASK				0x1f
+/*
+ * The preferred ZNR and ZPR values vary between different boards.
+ * The specific ZNR and ZPR values should be defined here according to
+ * board actual timing.
+ */
+#define  ZNR_PREF_VALUE				0xf
+#define  ZPR_PREF_VALUE				0xf
+
+#define EMMC_PHY_DLL_CONTROL			(EMMC_PHY_REG_BASE + 0x14)
+#define  DLL_ENABLE				(1 << 31)
+#define  DLL_REFCLK_SEL				(1 << 30)
+#define  DLL_PHSEL1_SHIFT			24
+#define  DLL_PHSEL0_SHIFT			16
+#define  DLL_PHASE_MASK				0x3f
+#define  DLL_PHASE_90_DEGREE			0x1f
+#define  DLL_DELAY_TEST_LOWER_SHIFT		8
+#define  DLL_DELAY_TEST_LOWER_MASK		0xff
+#define  DLL_FAST_LOCK				(1 << 5)
+#define  DLL_GAIN2X				(1 << 3)
+#define  DLL_BYPASS_EN				(1 << 0)
+
+#define EMMC_LOGIC_TIMING_ADJUST		(EMMC_PHY_REG_BASE + 0x18)
+#define EMMC_LOGIC_TIMING_ADJUST_LOW		(EMMC_PHY_REG_BASE + 0x1c)
+
+/*
+ * Hardware team recommends below value for HS400
+ * eMMC logic timing adjust register(0x188), refer to FS to details
+ * bit[3:0] PHY response delay parameter
+ * bit[7:4] PHY write delay parameter
+ * bit[11:8] PHY stop CLK parameter
+ * bit[15:12] PHY interrupt off delay
+ * bit[19:16] PHY init det delay
+ * bit[23:20] PHY read wait delay
+ * bit[31:24] Reserved
+ */
+#define LOGIC_TIMING_VALUE				0x00aa8977
+
+/* Max input clock, 400MHZ, it is also used as Max output clock
+ */
+#define XENON_SDHC_MAX_CLOCK			400000000
+
+/* Invalid XENON MMC timing value, which is used as default value */
+#define XENON_MMC_TIMING_INVALID			0xff
+
+/* Delay step */
+#define COARSE_SAMPL_FIX_DELAY_STEP			100
+#define FINE_SAMPL_FIX_DELAY_STEP			50
+
+#define   SDHCI_CTRL_HS200_ONLY                0x0005 /* Non-standard */
+#define   SDHCI_CTRL_HS400_ONLY                0x0006 /* Non-standard */
+
+/* SDHC private parameters */
+struct sdhci_xenon_priv {
+	/*
+	 * The three fields in below records the current setting of
+	 * Xenon SDHC. The driver will call a Sampling Fixed Delay
+	 * Adjustment if any setting is changed.
+	 */
+	unsigned char	bus_width;
+	unsigned char	timing;
+	unsigned int	clock;
+};
+
+struct card_cntx {
+	/*
+	 * When initializing card, Xenon has to adjust sampling fixed
+	 * delay. However,@that time, the card structure is not linked
+	 * to mmc_host. Thus a card pointer is added here providing
+	 * the delay adjustment function with the card structure of
+	 * the card during initialization
+	 */
+	struct mmc_card *delay_adjust_card;
+};
+
+/* Xenon Specific Initialization Operations */
+
+/* Internal eMMC PHY routines */
+static int sdhci_xenon_phy_init(struct sdhci_host *host)
+{
+	u32 reg;
+	u32 wait;
+	u32 clock;
+
+	reg = sdhci_readl(host, EMMC_PHY_TIMING_ADJUST);
+	reg |= PHY_INITIALIZATION;
+	sdhci_writel(host, reg, EMMC_PHY_TIMING_ADJUST);
+
+	/* Add duration of FC_SYNC_RST */
+	wait = ((reg >> FC_SYNC_RST_DURATION_SHIFT) &
+		FC_SYNC_RST_DURATION_MASK);
+	/* Add interval between FC_SYNC_EN and FC_SYNC_RST */
+	wait += ((reg >> FC_SYNC_RST_EN_DURATION_SHIFT) &
+		FC_SYNC_RST_EN_DURATION_MASK);
+	/* Add duration of asserting FC_SYNC_EN */
+	wait += ((reg >> FC_SYNC_EN_DURATION_SHIFT) &
+		FC_SYNC_EN_DURATION_MASK);
+	/* Add duration of waiting for PHY */
+	wait += ((reg >> WAIT_CYCLE_BEFORE_USING_SHIFT) &
+		WAIT_CYCLE_BEFORE_USING_MASK);
+	/* 4 additional bus clock and 4 AXI bus clock are required */
+	wait += 8;
+	/* left shift 20 bits */
+	wait <<= 20;
+
+	clock = host->mmc->actual_clock;
+	if (clock == 0)
+		/* Use the possibly slowest bus frequency value */
+		clock = 100000;
+
+	/* get the wait time */
+	wait /= clock;
+	wait++;
+
+	/* wait for host eMMC PHY init to complete */
+	udelay(wait);
+
+	reg = sdhci_readl(host, EMMC_PHY_TIMING_ADJUST);
+	reg &= PHY_INITIALIZATION;
+	if (reg) {
+		dev_err(mmc_dev(host->mmc), "%s: eMMC PHY init cannot complete after %d us\n",
+			mmc_hostname(host->mmc), wait);
+		return -EIO;
+	}
+
+	dev_dbg(mmc_dev(host->mmc), "%s: eMMC PHY init complete\n",
+		mmc_hostname(host->mmc));
+
+	return 0;
+}
+
+static void sdhci_xenon_phy_reset(struct sdhci_host *host, unsigned int timing)
+{
+	u32 reg;
+	struct mmc_card *card = host->mmc->card;
+
+	dev_dbg(mmc_dev(host->mmc), "%s: eMMC PHY setting starts\n",
+		mmc_hostname(host->mmc));
+
+	/* Setup pad, set bit[28] and bits[26:24] */
+	reg = sdhci_readl(host, EMMC_PHY_PAD_CONTROL);
+	reg |= (FC_DQ_RECEN | FC_CMD_RECEN | FC_QSP_RECEN | OEN_QSN);
+
+	/*
+	 * According to latest spec, all FC_XX_RECEIVCE should be set
+	 * as CMOS Type
+	 */
+	reg |= FC_ALL_CMOS_RECEIVER;
+	sdhci_writel(host, reg, EMMC_PHY_PAD_CONTROL);
+
+	/* Set CMD and DQ Pull Up */
+	reg = sdhci_readl(host, EMMC_PHY_PAD_CONTROL1);
+	reg |= (EMMC5_1_FC_CMD_PU | EMMC5_1_FC_DQ_PU);
+	reg &= ~(EMMC5_1_FC_CMD_PD | EMMC5_1_FC_DQ_PD);
+	sdhci_writel(host, reg, EMMC_PHY_PAD_CONTROL1);
+
+	/*
+	 * If timing belongs to high speed, set bit[17] of
+	 * EMMC_PHY_TIMING_ADJUST register
+	 */
+	if ((timing == MMC_TIMING_MMC_HS400) ||
+	    (timing == MMC_TIMING_MMC_HS200) ||
+	    (timing == MMC_TIMING_UHS_SDR50) ||
+	    (timing == MMC_TIMING_UHS_SDR104) ||
+	    (timing == MMC_TIMING_UHS_DDR50) ||
+	    (timing == MMC_TIMING_UHS_SDR25) ||
+	    (timing == MMC_TIMING_MMC_DDR52)) {
+		reg = sdhci_readl(host, EMMC_PHY_TIMING_ADJUST);
+		reg &= ~OUTPUT_QSN_PHASE_SELECT;
+		sdhci_writel(host, reg, EMMC_PHY_TIMING_ADJUST);
+	}
+
+	/*
+	 * If SDIO card, set SDIO Mode, otherwise, clear SDIO Mode and
+	 * Slow Mode
+	 */
+	if (card && (card->type & MMC_TYPE_SDIO)) {
+		reg = sdhci_readl(host, EMMC_PHY_TIMING_ADJUST);
+		reg |= TIMING_ADJUST_SDIO_MODE;
+
+		if ((timing == MMC_TIMING_UHS_SDR25) ||
+		    (timing == MMC_TIMING_UHS_SDR12) ||
+		    (timing == MMC_TIMING_SD_HS) ||
+		    (timing == MMC_TIMING_LEGACY))
+			reg |= TIMING_ADJUST_SLOW_MODE;
+
+		sdhci_writel(host, reg, EMMC_PHY_TIMING_ADJUST);
+	} else {
+		reg = sdhci_readl(host, EMMC_PHY_TIMING_ADJUST);
+		reg &= ~(TIMING_ADJUST_SDIO_MODE | TIMING_ADJUST_SLOW_MODE);
+		sdhci_writel(host, reg, EMMC_PHY_TIMING_ADJUST);
+	}
+
+	/*
+	 * Set the preferred ZNR and ZPR value. The ZNR and ZPR value
+	 * vary between different boards.
+	 */
+	reg = sdhci_readl(host, EMMC_PHY_PAD_CONTROL2);
+	reg &= ~(ZNR_MASK | ZPR_MASK);
+	reg |= ((ZNR_PREF_VALUE << ZNR_SHIFT) | ZPR_PREF_VALUE);
+	sdhci_writel(host, reg, EMMC_PHY_PAD_CONTROL2);
+
+	/*
+	 * When setting EMMC_PHY_FUNC_CONTROL register, SD clock
+	 * should be disabled
+	 */
+	reg = sdhci_readl(host, SDHCI_CLOCK_CONTROL);
+	reg &= ~SDHCI_CLOCK_CARD_EN;
+	sdhci_writew(host, reg, SDHCI_CLOCK_CONTROL);
+
+	if ((timing == MMC_TIMING_UHS_DDR50) ||
+	    (timing == MMC_TIMING_MMC_HS400) ||
+	    (timing == MMC_TIMING_MMC_DDR52)) {
+		reg = sdhci_readl(host, EMMC_PHY_FUNC_CONTROL);
+		reg |= (DQ_DDR_MODE_MASK << DQ_DDR_MODE_SHIFT) | CMD_DDR_MODE;
+		sdhci_writel(host, reg, EMMC_PHY_FUNC_CONTROL);
+	}
+
+	if (timing == MMC_TIMING_MMC_HS400) {
+		reg = sdhci_readl(host, EMMC_PHY_FUNC_CONTROL);
+		reg &= ~DQ_ASYNC_MODE;
+		sdhci_writel(host, reg, EMMC_PHY_FUNC_CONTROL);
+	}
+
+	/* Enable bus clock */
+	reg = sdhci_readl(host, SDHCI_CLOCK_CONTROL);
+	reg |= SDHCI_CLOCK_CARD_EN;
+	sdhci_writew(host, reg, SDHCI_CLOCK_CONTROL);
+
+	if (timing == MMC_TIMING_MMC_HS400)
+		sdhci_writel(host, LOGIC_TIMING_VALUE,
+			     EMMC_LOGIC_TIMING_ADJUST);
+
+	sdhci_xenon_phy_init(host);
+
+	dev_dbg(mmc_dev(host->mmc), "%s: eMMC PHY setting completed\n",
+		mmc_hostname(host->mmc));
+}
+
+/* Apply sampling fix delay */
+static int sdhci_xenon_set_fix_delay(struct sdhci_host *host,
+				     unsigned int delay, bool invert,
+				     bool phase)
+{
+	unsigned int reg;
+	int ret = 0;
+	u8 timeout;
+
+	if (invert)
+		invert = 0x1;
+	else
+		invert = 0x0;
+
+	if (phase)
+		phase = 0x1;
+	else
+		phase = 0x0;
+
+	/* Setup sampling fix delay */
+	reg = sdhci_readl(host, SDHC_SLOT_OP_STATUS_CTRL);
+	reg &= ~TUNING_PROG_FIXED_DELAY_MASK;
+	reg |= delay & TUNING_PROG_FIXED_DELAY_MASK;
+	sdhci_writel(host, reg, SDHC_SLOT_OP_STATUS_CTRL);
+
+	/* Disable SDCLK */
+	reg = sdhci_readl(host, SDHCI_CLOCK_CONTROL);
+	reg &= ~(SDHCI_CLOCK_CARD_EN | SDHCI_CLOCK_INT_EN);
+	sdhci_writel(host, reg, SDHCI_CLOCK_CONTROL);
+
+	udelay(200);
+
+	/* If phase = true, set 90 degree phase */
+	reg = sdhci_readl(host, EMMC_PHY_FUNC_CONTROL);
+	reg &= ~ASYNC_DDRMODE_MASK;
+	reg |= (phase << ASYNC_DDRMODE_SHIFT);
+	sdhci_writel(host, reg, EMMC_PHY_FUNC_CONTROL);
+
+	/* Setup inversion of sampling edge */
+	reg = sdhci_readl(host, EMMC_PHY_TIMING_ADJUST);
+	reg &= ~SAMPL_INV_QSP_PHASE_SELECT;
+	reg |= (invert << SAMPL_INV_QSP_PHASE_SELECT_SHIFT);
+	sdhci_writel(host, reg, EMMC_PHY_TIMING_ADJUST);
+
+	/* Enable SD internal clock */
+	reg = sdhci_readl(host, SDHCI_CLOCK_CONTROL);
+	reg |= SDHCI_CLOCK_INT_EN;
+	sdhci_writel(host, reg, SDHCI_CLOCK_CONTROL);
+
+	/* Wait max 20 ms */
+	timeout = 20;
+	while (!((reg = sdhci_readw(host, SDHCI_CLOCK_CONTROL))
+			& SDHCI_CLOCK_INT_STABLE)) {
+		if (timeout == 0) {
+			pr_err("%s: Internal clock never stabilised.\n",
+					mmc_hostname(host->mmc));
+			return -EIO;
+		}
+		timeout--;
+		mdelay(1);
+	}
+
+	/* Enable SDCLK */
+	reg = sdhci_readl(host, SDHCI_CLOCK_CONTROL);
+	reg |= SDHCI_CLOCK_CARD_EN;
+	sdhci_writel(host, reg, SDHCI_CLOCK_CONTROL);
+
+	udelay(200);
+
+	/*
+	 * Have to re-initialize the eMMC PHY here to active the PHY
+	 * because the later get status cmd will be issued.
+	 */
+	ret = sdhci_xenon_phy_init(host);
+
+	return ret;
+}
+
+/* apply strobe delay */
+static void sdhci_xenon_set_strobe_delay(struct sdhci_host *host)
+{
+	u32 reg;
+
+	/* Enable DLL */
+	reg = sdhci_readl(host, EMMC_PHY_DLL_CONTROL);
+	reg |= (DLL_ENABLE | DLL_GAIN2X | DLL_FAST_LOCK);
+
+	/* Set phase as 90 degree */
+	reg &= ~((DLL_PHASE_MASK << DLL_PHSEL0_SHIFT) |
+			(DLL_PHASE_MASK << DLL_PHSEL1_SHIFT));
+	reg |= ((DLL_PHASE_90_DEGREE << DLL_PHSEL0_SHIFT) |
+			(DLL_PHASE_90_DEGREE << DLL_PHSEL1_SHIFT));
+
+	reg |= DLL_REFCLK_SEL;
+	reg &= ~DLL_BYPASS_EN;
+	sdhci_writel(host, reg, EMMC_PHY_DLL_CONTROL);
+
+	/* Set data strobe pull down */
+	reg = sdhci_readl(host, EMMC_PHY_PAD_CONTROL1);
+	reg |= EMMC5_1_FC_QSP_PD;
+	reg &= ~EMMC5_1_FC_QSP_PU;
+	sdhci_writel(host, reg, EMMC_PHY_PAD_CONTROL1);
+}
+
+static int sdhci_xenon_delay_adj_test(struct sdhci_host *host,
+		struct mmc_card *card, unsigned int delay,
+		bool invert, bool phase)
+{
+	int ret;
+	struct mmc_card *oldcard;
+
+	sdhci_xenon_set_fix_delay(host, delay, invert, phase);
+
+	/*
+	 * If the card is not yet associated to the host, we
+	 * temporally do it
+	 */
+	oldcard = card->host->card;
+	if (!oldcard)
+		card->host->card = card;
+	ret =  card_alive(card);
+	card->host->card = oldcard;
+	if (ret) {
+		pr_debug("Xenon failed when sampling fix delay %d, inverted %d, phase %d\n",
+			 delay, invert, phase);
+		return -EIO;
+	}
+
+	pr_debug("Xenon succeeded when sampling fixed delay %d, inverted %d, phase %d\n",
+		 delay, invert, phase);
+	return 0;
+}
+
+/*
+ * Adjust the fix delay
+ *
+ * This routine tries to calculate a proper fix delay. As tuning is
+ * only available in HS200 mode, we need to adjust delay for other
+ * modes, and even adjust the delay before tuning.
+ */
+static int sdhci_xenon_fix_delay_adj(struct sdhci_host *host,
+				     struct mmc_card *card)
+{
+	bool invert, phase;
+	int idx, nr_pair;
+	int ret;
+	unsigned int delay;
+	unsigned int min_delay, max_delay;
+	u32 reg;
+	/*
+	 * Pairs to set the delay edge. The first column is the
+	 * inversion sequence. The second column indicates if delay is
+	 * 90 degree or not.
+	 */
+	bool delay_edge_pair[][2] = {
+			{ true,		false},
+			{ true,		true},
+			{ false,	false},
+			{ false,	true }
+	};
+
+	nr_pair = sizeof(delay_edge_pair) / ARRAY_SIZE(delay_edge_pair);
+
+	for (idx = 0; idx < nr_pair; idx++) {
+		invert = delay_edge_pair[idx][0];
+		phase = delay_edge_pair[idx][1];
+
+		/* Increase delay value to get min fix delay */
+		for (min_delay = 0; min_delay <= TUNING_PROG_FIXED_DELAY_MASK;
+				min_delay += COARSE_SAMPL_FIX_DELAY_STEP) {
+			ret = sdhci_xenon_delay_adj_test(host, card, min_delay,
+							 invert, phase);
+			if (!ret)
+				break;
+		}
+
+		if (ret) {
+			pr_debug("Failed to set sampling fixed delay with inversion %d, phase %d\n",
+				 invert, phase);
+			continue;
+		}
+
+		/* Increase delay value to get max fix delay */
+		for (max_delay = min_delay + 1;
+			max_delay < TUNING_PROG_FIXED_DELAY_MASK;
+			max_delay += FINE_SAMPL_FIX_DELAY_STEP) {
+			ret = sdhci_xenon_delay_adj_test(host, card, max_delay,
+							 invert, phase);
+			if (ret) {
+				max_delay -= FINE_SAMPL_FIX_DELAY_STEP;
+				break;
+			}
+		}
+
+		/*
+		 * Handle the round case in case the max allowed edge
+		 * passed delay adjust testing.
+		 */
+		if (!ret) {
+			ret = sdhci_xenon_delay_adj_test(host, card,
+						   TUNING_PROG_FIXED_DELAY_MASK,
+						   invert, phase);
+			if (!ret)
+				max_delay = TUNING_PROG_FIXED_DELAY_MASK;
+		}
+
+		/*
+		 * For the eMMC PHY, sampling fixed delay line window
+		 * should be large enough, thus the sampling point
+		 * (the middle of the window) can work when
+		 * environment varies. However, there is no clear
+		 * conclusion how large the window should be. We just
+		 * make an assumption that the window should be larger
+		 * than 25% of a SDCLK cycle.  Please note that this
+		 * judgment is only based on experience.
+		 *
+		 * The field delay value of main delay line in the
+		 * register SDHC_SLOT_DLL_CUR represents a half of the
+		 * SDCLK cycle. Thus the window should be larger than
+		 * 1/2 of the field delay value of the main delay line
+		 * value.
+		 */
+		reg = sdhci_readl(host, SDHC_SLOT_DLL_CUR_DLY_VAL);
+		reg &= TUNING_PROG_FIXED_DELAY_MASK;
+		/* get the 1/4 SDCLK cycle */
+		reg >>= 1;
+
+		if ((max_delay - min_delay) < reg) {
+			pr_info("The window size %d when inversion = %d, phase = %d cannot meet timing requiremnt\n",
+				max_delay - min_delay, invert, phase);
+			continue;
+		}
+
+		delay = (min_delay + max_delay) / 2;
+		sdhci_xenon_set_fix_delay(host, delay, invert, phase);
+		pr_debug("Xenon sampling fix delay = %d with inversion = %d, phase = %d\n",
+			 delay, invert, phase);
+		return 0;
+	}
+
+	return -EIO;
+}
+
+/* Adjust the strobe delay for HS400 mode */
+static int sdhci_xenon_strobe_delay_adj(struct sdhci_host *host,
+					struct mmc_card *card)
+{
+	int ret = 0;
+	u32 reg;
+
+	/* Enable SDHC data strobe */
+	reg = sdhci_readl(host, SDHC_SLOT_eMMC_CTRL);
+	reg |= ENABLE_DATA_STROBE;
+	sdhci_writel(host, reg, SDHC_SLOT_eMMC_CTRL);
+
+	/* Enable the DLL to automatically adjust HS400 strobe delay */
+	sdhci_xenon_set_strobe_delay(host);
+	return ret;
+}
+
+/*
+ * sdhci_xenon_delay_adj should not be called inside of an IRQ
+ * context, either an hardware IRQ or a software IRQ.
+ */
+static int sdhci_xenon_delay_adj(struct sdhci_host *host, struct mmc_ios *ios)
+{
+	int ret;
+	struct mmc_host *mmc = host->mmc;
+	struct mmc_card *card = NULL;
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+	struct sdhci_xenon_priv *priv;
+	struct card_cntx *cntx;
+
+	if (!host->clock)
+		return 0;
+
+	priv = (struct sdhci_xenon_priv *)pltfm_host->private;
+	if (ios->timing != priv->timing)
+		sdhci_xenon_phy_reset(host, ios->timing);
+
+	/*
+	 * Legacy mode is a special case. In legacy Mode, usually it
+	 * is not necessary to adjust sampling fixed delay, since the
+	 * SDCLK frequency is quite low.
+	 */
+	if (ios->timing == MMC_TIMING_LEGACY) {
+		priv->timing = ios->timing;
+		return 0;
+	}
+
+	/*
+	 * If the timing, frequency or bus width are changed, it is
+	 * better to set eMMC PHY based on the current setting and to
+	 * adjust Xenon SDHC delay.
+	 */
+	if ((host->clock == priv->clock) &&
+		(ios->bus_width == priv->bus_width) &&
+		(ios->timing == priv->timing))
+		return 0;
+
+	/* Save the values */
+	priv->clock = host->clock;
+	priv->bus_width = ios->bus_width;
+	priv->timing = ios->timing;
+
+	cntx = (struct card_cntx *)mmc->slot.handler_priv;
+	card = cntx->delay_adjust_card;
+	if (unlikely(card == NULL))
+		return -EIO;
+
+	/*
+	 * No need to set any delay for some cases in this stage since
+	 * it will be reset as legacy mode soon. For example, during
+	 * the hardware reset in high speed mode, and the SDCLK is no
+	 * more than 400k (legacy mode).
+	 */
+	if (host->clock <= 4000000)
+		return 0;
+
+	if (mmc_card_hs400(card)) {
+		pr_debug("%s: start HS400 strobe delay adjustment\n",
+			 mmc_hostname(mmc));
+		ret = sdhci_xenon_strobe_delay_adj(host, card);
+		if (ret)
+			pr_err("%s: strobe fixed delay adjustment failed\n",
+			       mmc_hostname(mmc));
+
+		return ret;
+	}
+
+	pr_debug("%s: start sampling fixed delay adjustment\n",
+		 mmc_hostname(mmc));
+	ret = sdhci_xenon_fix_delay_adj(host, card);
+	if (ret)
+		pr_err("%s: sampling fixed delay adjustment failed\n",
+		       mmc_hostname(mmc));
+
+	return ret;
+}
+
+/*
+ * After determining which slot is used for SDIO, some additional
+ * tasks are required. It will save the pointer to current card, and
+ * do other utilities such as enable or disable auto cmd12 according
+ * to the card type, and whether indicate current slot as SDIO slot.
+ */
+static void sdhci_xenon_init_card(struct sdhci_host *host,
+				  struct mmc_card *card)
+{
+	u32 reg;
+	struct card_cntx *cntx;
+	struct mmc_host *mmc = host->mmc;
+
+	cntx = (struct card_cntx *)mmc->slot.handler_priv;
+	cntx->delay_adjust_card = card;
+
+
+	if (!mmc_card_sdio(card)) {
+		/* Re-enable the Auto-CMD12 cap flag. */
+		host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12;
+		host->flags |= SDHCI_AUTO_CMD12;
+
+		/* Clear SDHC system config information register[31:24] */
+		reg = sdhci_readl(host, SDHC_SYS_CFG_INFO);
+		reg &= ~(1 << SLOT_TYPE_SDIO_SHIFT);
+		sdhci_writel(host, reg, SDHC_SYS_CFG_INFO);
+	} else {
+		/*
+		 * Delete the Auto-CMD12 cap flag. Otherwise, when
+		 * sending multi-block CMD53, the driver will set
+		 * transfer mode register to enable Auto
+		 * CMD12. However, as the SDIO device cannot recognize
+		 * this command, SDHC will be timed out for waiting
+		 * for the CMD12 response.
+		 */
+		host->quirks &= ~SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12;
+		host->flags &= ~SDHCI_AUTO_CMD12;
+
+		/*
+		 * Set the SDHC system configuration information
+		 * register[31:24] to inform that the current slot is
+		 * for SDIO.
+		 */
+		reg = sdhci_readl(host, SDHC_SYS_CFG_INFO);
+		reg |= (1 << SLOT_TYPE_SDIO_SHIFT);
+		sdhci_writel(host, reg, SDHC_SYS_CFG_INFO);
+	}
+}
+
+/* Enable/Disable the Auto Clock Gating function */
+static void sdhci_xenon_set_acg(struct sdhci_host *host, bool enable)
+{
+	u32 reg;
+
+	reg = sdhci_readl(host, SDHC_SYS_OP_CTRL);
+	if (enable)
+		reg &= ~AUTO_CLKGATE_DISABLE_MASK;
+	else
+		reg |= AUTO_CLKGATE_DISABLE_MASK;
+	sdhci_writel(host, reg, SDHC_SYS_OP_CTRL);
+}
+
+/* Enable or disable this slot */
+static void sdhci_xenon_set_slot(struct sdhci_host *host, bool enable)
+{
+	u32 reg;
+
+	reg = sdhci_readl(host, SDHC_SYS_OP_CTRL);
+	if (enable)
+		reg |= (0x1 << SLOT_ENABLE_SHIFT);
+	else
+		reg &= ~(0x1 << SLOT_ENABLE_SHIFT);
+	sdhci_writel(host, reg, SDHC_SYS_OP_CTRL);
+
+	/*
+	 * Manually set the flag which all the slots required,
+	 * including SD, eMMC, SDIO
+	 */
+	host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
+}
+
+/* Set SDCLK-off-while-idle */
+static void sdhci_xenon_set_sdclk_off_idle(struct sdhci_host *host, bool enable)
+{
+	u32 reg;
+	u32 mask;
+
+	reg = sdhci_readl(host, SDHC_SYS_OP_CTRL);
+	/* Get the bit shift based on the slot index */
+	mask = (0x1 << SDCLK_IDLEOFF_ENABLE_SHIFT);
+	if (enable)
+		reg |= mask;
+	else
+		reg &= ~mask;
+
+	sdhci_writel(host, reg, SDHC_SYS_OP_CTRL);
+}
+
+/* Enable Parallel Transfer Mode */
+static void sdhci_xenon_enable_parallel_tran(struct sdhci_host *host)
+{
+	u32 reg;
+
+	reg = sdhci_readl(host, SDHC_SYS_EXT_OP_CTRL);
+	reg |= 0x1;
+	sdhci_writel(host, reg, SDHC_SYS_EXT_OP_CTRL);
+}
+
+/* Disable re-tuning request, event and auto-retuning*/
+static void sdhci_xenon_setup_tuning(struct sdhci_host *host)
+{
+	u8 reg;
+
+	/* Disable the Re-Tuning Request functionality */
+	reg = sdhci_readl(host, SDHC_SLOT_RETUNING_REQ_CTRL);
+	reg &= ~RETUNING_COMPATIBLE;
+	sdhci_writel(host, reg, SDHC_SLOT_RETUNING_REQ_CTRL);
+
+	/* Disbale the Re-tuning Event Signal Enable */
+	reg = sdhci_readl(host, SDHCI_SIGNAL_ENABLE);
+	reg &= ~SDHCI_RETUNE_EVT_INTSIG;
+	sdhci_writel(host, reg, SDHCI_SIGNAL_ENABLE);
+
+	/* Disable Auto-retuning */
+	reg = sdhci_readl(host, SDHC_SLOT_AUTO_RETUNING_CTRL);
+	reg &= ~ENABLE_AUTO_RETUNING;
+	sdhci_writel(host, reg, SDHC_SLOT_AUTO_RETUNING_CTRL);
+}
+
+/* Recover the register setting cleared during SOFTWARE_RESET_ALL */
+static void sdhci_xenon_reset_exit(struct sdhci_host *host, u8 mask)
+{
+	/* Only SOFTWARE RESET ALL will clear the register setting */
+	if (!(mask & SDHCI_RESET_ALL))
+		return;
+
+	/* Disable tuning request and auto-retuing again */
+	sdhci_xenon_setup_tuning(host);
+
+	sdhci_xenon_set_acg(host, false);
+
+	sdhci_xenon_set_sdclk_off_idle(host, false);
+}
+
+static void sdhci_xenon_reset(struct sdhci_host *host, u8 mask)
+{
+	sdhci_reset(host, mask);
+
+	sdhci_xenon_reset_exit(host, mask);
+}
+
+static void sdhci_xenon_voltage_switch(struct sdhci_host *host)
+{
+	u32 reg;
+	unsigned char voltage;
+	unsigned char voltage_code;
+
+	voltage = host->mmc->ios.signal_voltage;
+
+	if (voltage == MMC_SIGNAL_VOLTAGE_330) {
+		voltage_code = eMMC_VCCQ_3_3V;
+	} else if (voltage == MMC_SIGNAL_VOLTAGE_180) {
+		voltage_code = eMMC_VCCQ_1_8V;
+	} else {
+		pr_err("%s: Xenon unsupported signal voltage\n",
+		       mmc_hostname(host->mmc));
+		return;
+	}
+
+	/*
+	 * This host is for eMMC, XENON self-defined eMMC slot control
+	 * register should be accessed instead of Host Control 2
+	 */
+	reg = sdhci_readl(host, SDHC_SLOT_eMMC_CTRL);
+	reg &= ~eMMC_VCCQ_MASK;
+	reg |= voltage_code;
+	sdhci_writel(host, reg, SDHC_SLOT_eMMC_CTRL);
+
+	/* There is no standard to determine this waiting period */
+	usleep_range(1000, 2000);
+
+	/* Check whether io voltage switch is done */
+	reg = sdhci_readl(host, SDHC_SLOT_eMMC_CTRL);
+	reg &= eMMC_VCCQ_MASK;
+	/*
+	 * This bit is set only when the regulator feeds back the
+	 * voltage switch result. However, in the actual
+	 * implementation, the regulator might not provide this
+	 * feedback. Thus we shall not rely on this bit status to
+	 * determine if the switch had failed. If the bit is not set,
+	 * we just throws a warning, an error level message is not
+	 * need.
+	 */
+	if (reg != voltage_code)
+		pr_warn("%s: Xenon failed to switch signal voltage\n",
+			mmc_hostname(host->mmc));
+}
+
+static void sdhci_xenon_voltage_switch_pre(struct sdhci_host *host)
+{
+	u32 reg;
+	int timeout;
+
+	/*
+	 * Before the SD/SDIO set the signal voltage, the SD bus clock
+	 * should be disabled.  However, sdhci_set_clock will also
+	 * disable the internal clock. For some host SD controller, if
+	 * the internal clock is disabled, the 3.3V/1.8V bit can not
+	 * be updated. Thus here we manually enable the internal
+	 * clock. After the switch completes, it is unnecessary to
+	 * disable the internal clock, since keeping the internal
+	 * clock active follows the SD spec.
+	 */
+	reg = sdhci_readw(host, SDHCI_CLOCK_CONTROL);
+	if (!(reg & SDHCI_CLOCK_INT_EN)) {
+		reg |= SDHCI_CLOCK_INT_EN;
+		sdhci_writew(host, reg, SDHCI_CLOCK_CONTROL);
+
+		/* Wait max 20 ms */
+		timeout = 20;
+		while (!((reg = sdhci_readw(host, SDHCI_CLOCK_CONTROL))
+				& SDHCI_CLOCK_INT_STABLE)) {
+			if (timeout == 0) {
+				pr_err("%s: Internal clock never stabilised.\n",
+				       mmc_hostname(host->mmc));
+				break;
+			}
+			timeout--;
+			mdelay(1);
+		}
+	}
+}
+
+static const struct of_device_id sdhci_xenon_dt_ids[] = {
+	{ .compatible = "marvell,xenon-sdhci",},
+	{}
+};
+MODULE_DEVICE_TABLE(of, sdhci_xenon_dt_ids);
+
+static void sdhci_xenon_platform_init(struct sdhci_host *host)
+{
+	sdhci_xenon_set_acg(host, false);
+}
+
+unsigned int sdhci_xenon_get_max_clock(struct sdhci_host *host)
+{
+	return XENON_SDHC_MAX_CLOCK;
+}
+
+static void sdhci_xenon_set_uhs_signaling(struct sdhci_host *host,
+					  unsigned int timing)
+{
+	u16 ctrl_2;
+
+	sdhci_set_uhs_signaling(host, timing);
+
+	ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);
+
+	ctrl_2 &= ~SDHCI_CTRL_UHS_MASK;
+	if (timing == MMC_TIMING_MMC_HS200)
+		ctrl_2 |= SDHCI_CTRL_HS200_ONLY;
+	else if (timing == MMC_TIMING_MMC_HS400)
+		ctrl_2 |= SDHCI_CTRL_HS400_ONLY;
+	sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2);
+}
+
+static struct sdhci_ops sdhci_xenon_ops = {
+	.set_clock		= sdhci_set_clock,
+	.set_bus_width		= sdhci_set_bus_width,
+	.reset			= sdhci_xenon_reset,
+	.set_uhs_signaling	= sdhci_xenon_set_uhs_signaling,
+	.platform_init		= sdhci_xenon_platform_init,
+	.get_max_clock		= sdhci_xenon_get_max_clock,
+	.voltage_switch		= sdhci_xenon_voltage_switch,
+	.voltage_switch_pre	= sdhci_xenon_voltage_switch_pre,
+	.delay_adj		= sdhci_xenon_delay_adj,
+	.init_card		= sdhci_xenon_init_card,
+};
+
+static struct sdhci_pltfm_data sdhci_xenon_pdata = {
+	.ops = &sdhci_xenon_ops,
+	.quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC |
+		  SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 |
+		  SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER,
+	/* Add SOC specific quirks in the above .quirks fields. */
+};
+
+static int sdhci_xenon_probe_dt(struct platform_device *pdev)
+{
+	struct sdhci_host *host = platform_get_drvdata(pdev);
+	struct mmc_host *mmc = host->mmc;
+	int err;
+
+	/* Standard MMC property */
+	err = mmc_of_parse(mmc);
+	if (err) {
+		pr_err("%s: Failed to call mmc_of_parse.\n", mmc_hostname(mmc));
+		return err;
+	}
+
+	/* Standard SDHCI property */
+	sdhci_get_of_property(pdev);
+
+	return 0;
+}
+
+static bool sdhci_xenon_slot_type_emmc(struct sdhci_host *host)
+{
+	u32 reg;
+	unsigned int emmc_slot;
+	unsigned int sd_slot;
+
+	/*
+	 * Read the eMMC slot type field from the SYS_CFG_INFO
+	 * register. If a bit is set, this slot supports eMMC
+	 */
+	reg = sdhci_readl(host, SDHC_SYS_CFG_INFO);
+	emmc_slot = reg >> SLOT_TYPE_EMMC_SHIFT;
+	emmc_slot &= SLOT0_TYPE_EMMC_MASK;
+
+	/* This slot doesn't support eMMC */
+	if (!emmc_slot)
+		return false;
+
+	/*
+	 * Read the SD/SDIO/MMC slot type field from the SYS_CFG_INFO
+	 * register if that bit is NOT set, this slot can only support
+	 * eMMC
+	 */
+	sd_slot = reg >> SLOT_TYPE_SD_SDIO_MMC_SHIFT;
+	sd_slot &= SLOT0_TYPE_SD_SDIO_MMC_MASK;
+	emmc_slot &= sd_slot;
+
+	/* ONLY support emmc */
+	if (!emmc_slot)
+		return true;
+
+	return false;
+}
+
+static int sdhci_xenon_slot_probe(struct sdhci_host *host)
+{
+	struct mmc_host *mmc = host->mmc;
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+	struct sdhci_xenon_priv *priv =
+				 (struct sdhci_xenon_priv *)pltfm_host->private;
+	struct card_cntx *cntx;
+
+	cntx = devm_kzalloc(mmc_dev(mmc), sizeof(*cntx), GFP_KERNEL);
+	if (!cntx)
+		return -ENOMEM;
+	mmc->slot.handler_priv = cntx;
+
+	/* Enable slot */
+	sdhci_xenon_set_slot(host, true);
+
+	/* Enable ACG */
+	sdhci_xenon_set_acg(host, true);
+
+	/* Enable Parallel Transfer Mode */
+	sdhci_xenon_enable_parallel_tran(host);
+
+	/* Do eMMC setup if it is an eMMC slot */
+	if (sdhci_xenon_slot_type_emmc(host)) {
+		/*
+		 * Mark the flag which requires Xenon eMMC-specific
+		 * operations, such as the voltage switch
+		 */
+		mmc->caps |= MMC_CAP_BUS_WIDTH_TEST | MMC_CAP_NONREMOVABLE;
+		mmc->caps2 |= MMC_CAP2_HC_ERASE_SZ | MMC_CAP2_PACKED_CMD;
+	}
+
+	/* Set the tuning functionality of this slot */
+	sdhci_xenon_setup_tuning(host);
+
+	/* Set the default timing value */
+	priv->timing = XENON_MMC_TIMING_INVALID;
+
+	return 0;
+}
+
+static int sdhci_xenon_probe(struct platform_device *pdev)
+{
+	struct sdhci_pltfm_host *pltfm_host;
+	struct sdhci_host *host;
+	const struct of_device_id *match;
+	int err;
+
+	match = of_match_device(of_match_ptr(sdhci_xenon_dt_ids), &pdev->dev);
+	if (!match)
+		return -EINVAL;
+
+	host = sdhci_pltfm_init(pdev, &sdhci_xenon_pdata,
+				sizeof(struct sdhci_xenon_priv));
+	if (IS_ERR(host))
+		return PTR_ERR(host);
+
+	pltfm_host = sdhci_priv(host);
+
+	err = sdhci_xenon_probe_dt(pdev);
+	if (err) {
+		pr_err("%s: Failed to probe dt.\n", mmc_hostname(host->mmc));
+		goto free_pltfm;
+	}
+
+	err = sdhci_xenon_slot_probe(host);
+	if (err) {
+		pr_err("%s: Failed to probe slot.\n", mmc_hostname(host->mmc));
+		goto free_pltfm;
+	}
+
+	err = sdhci_add_host(host);
+	if (err) {
+		pr_err("%s: Failed to call add sdhci host\n",
+		       mmc_hostname(host->mmc));
+		goto remove_slot;
+	}
+
+	/* Current driver can only support Tuning Mode 1. */
+	host->tuning_mode = SDHCI_TUNING_MODE_1;
+
+	return 0;
+
+remove_slot:
+	/* Disable slot */
+	sdhci_xenon_set_slot(host, false);
+free_pltfm:
+	sdhci_pltfm_free(pdev);
+	return err;
+}
+
+static int sdhci_xenon_remove(struct platform_device *pdev)
+{
+	struct sdhci_host *host = platform_get_drvdata(pdev);
+	int dead = (readl(host->ioaddr + SDHCI_INT_STATUS) == 0xffffffff);
+
+	/* Disable slot */
+	sdhci_xenon_set_slot(host, false);
+
+	sdhci_remove_host(host, dead);
+	sdhci_pltfm_free(pdev);
+
+	return 0;
+}
+
+static struct platform_driver sdhci_xenon_driver = {
+	.driver		= {
+		.name	= "mv-xenon-sdhci",
+		.of_match_table = sdhci_xenon_dt_ids,
+		.pm = SDHCI_PLTFM_PMOPS,
+	},
+	.probe		= sdhci_xenon_probe,
+	.remove		= sdhci_xenon_remove,
+};
+
+module_platform_driver(sdhci_xenon_driver);
+
+MODULE_DESCRIPTION("SDHCI platform driver for Marvell Xenon SDHC");
+MODULE_AUTHOR("Victor Gu <xigu@marvell.com>");
+MODULE_LICENSE("GPL v2");
-- 
2.5.0

[PATCH 09/12] mmc: sdhci-xenon: add initial Xenon eMMC driver

[kbuild test robot]

Hi,

[auto build test ERROR on ulf.hansson-mmc/next]
[also build test ERROR on v4.7-rc2 next-20160609]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Gregory-CLEMENT/Add-SDHCI-Xenon-driver/20160609-151403
base:   https://git.linaro.org/people/ulf.hansson/mmc next
config: ia64-allyesconfig (attached as .config)
compiler: ia64-linux-gcc (GCC) 4.9.0
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=ia64 

All errors (new ones prefixed by >>):

   In file included from drivers/mmc/host/sdhci-xenon.c:14:0:
>> arch/ia64/include/uapi/asm/setup.h:7:2: error: unknown type name '__u64'
     __u64 command_line;  /* physical address of command line arguments */
     ^
   arch/ia64/include/uapi/asm/setup.h:8:2: error: unknown type name '__u64'
     __u64 efi_systab;  /* physical address of EFI system table */
     ^
   arch/ia64/include/uapi/asm/setup.h:9:2: error: unknown type name '__u64'
     __u64 efi_memmap;  /* physical address of EFI memory map */
     ^
   arch/ia64/include/uapi/asm/setup.h:10:2: error: unknown type name '__u64'
     __u64 efi_memmap_size;  /* size of EFI memory map */
     ^
   arch/ia64/include/uapi/asm/setup.h:11:2: error: unknown type name '__u64'
     __u64 efi_memdesc_size;  /* size of an EFI memory map descriptor */
     ^
>> arch/ia64/include/uapi/asm/setup.h:12:2: error: unknown type name '__u32'
     __u32 efi_memdesc_version; /* memory descriptor version */
     ^
>> arch/ia64/include/uapi/asm/setup.h:14:3: error: unknown type name '__u16'
      __u16 num_cols; /* number of columns on console output device */
      ^
   arch/ia64/include/uapi/asm/setup.h:15:3: error: unknown type name '__u16'
      __u16 num_rows; /* number of rows on console output device */
      ^
   arch/ia64/include/uapi/asm/setup.h:16:3: error: unknown type name '__u16'
      __u16 orig_x; /* cursor's x position */
      ^
   arch/ia64/include/uapi/asm/setup.h:17:3: error: unknown type name '__u16'
      __u16 orig_y; /* cursor's y position */
      ^
   arch/ia64/include/uapi/asm/setup.h:19:2: error: unknown type name '__u64'
     __u64 fpswa;  /* physical address of the fpswa interface */
     ^
   arch/ia64/include/uapi/asm/setup.h:20:2: error: unknown type name '__u64'
     __u64 initrd_start;
     ^
   arch/ia64/include/uapi/asm/setup.h:21:2: error: unknown type name '__u64'
     __u64 initrd_size;
     ^

vim +/__u64 +7 arch/ia64/include/uapi/asm/setup.h

^1da177e include/asm-ia64/setup.h      Linus Torvalds 2005-04-16   1  #ifndef __IA64_SETUP_H
^1da177e include/asm-ia64/setup.h      Linus Torvalds 2005-04-16   2  #define __IA64_SETUP_H
^1da177e include/asm-ia64/setup.h      Linus Torvalds 2005-04-16   3  
cca97de1 include/asm-ia64/setup.h      Alon Bar-Lev   2007-02-12   4  #define COMMAND_LINE_SIZE	2048
^1da177e include/asm-ia64/setup.h      Linus Torvalds 2005-04-16   5  
c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28   6  extern struct ia64_boot_param {
c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28  @7  	__u64 command_line;		/* physical address of command line arguments */
c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28   8  	__u64 efi_systab;		/* physical address of EFI system table */
c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28  @9  	__u64 efi_memmap;		/* physical address of EFI memory map */
c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28 @10  	__u64 efi_memmap_size;		/* size of EFI memory map */
c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28  11  	__u64 efi_memdesc_size;		/* size of an EFI memory map descriptor */
c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28 @12  	__u32 efi_memdesc_version;	/* memory descriptor version */
c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28  13  	struct {
c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28 @14  		__u16 num_cols;	/* number of columns on console output device */
c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28  15  		__u16 num_rows;	/* number of rows on console output device */
c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28  16  		__u16 orig_x;	/* cursor's x position */
c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28  17  		__u16 orig_y;	/* cursor's y position */

:::::: The code at line 7 was first introduced by commit
:::::: c140d87995b68b428f70635c2e4071e4e8b3256e Disintegrate asm/system.h for IA64

:::::: TO: David Howells <dhowells@redhat.com>
:::::: CC: David Howells <dhowells@redhat.com>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
-------------- next part --------------
A non-text attachment was scrubbed...
Name: .config.gz
Type: application/octet-stream
Size: 46356 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160609/5a5f3830/attachment-0001.obj>

[PATCH 09/12] mmc: sdhci-xenon: add initial Xenon eMMC driver

[Gregory CLEMENT]

Hi ,
 
 On jeu., juin 09 2016, kbuild test robot <lkp@intel.com> wrote:

> Hi,
>
> [auto build test ERROR on ulf.hansson-mmc/next]
> [also build test ERROR on v4.7-rc2 next-20160609]
> [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
>
> url:    https://github.com/0day-ci/linux/commits/Gregory-CLEMENT/Add-SDHCI-Xenon-driver/20160609-151403
> base:   https://git.linaro.org/people/ulf.hansson/mmc next
> config: ia64-allyesconfig (attached as .config)
> compiler: ia64-linux-gcc (GCC) 4.9.0
> reproduce:
>         wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
>         chmod +x ~/bin/make.cross
>         # save the attached .config to linux build tree
>         make.cross ARCH=ia64 
>
> All errors (new ones prefixed by >>):
>
>    In file included from drivers/mmc/host/sdhci-xenon.c:14:0:
>>> arch/ia64/include/uapi/asm/setup.h:7:2: error: unknown type name '__u64'
>      __u64 command_line;  /* physical address of command line arguments */
>      ^
>    arch/ia64/include/uapi/asm/setup.h:8:2: error: unknown type name '__u64'
>      __u64 efi_systab;  /* physical address of EFI system table */
>      ^
>    arch/ia64/include/uapi/asm/setup.h:9:2: error: unknown type name '__u64'
>      __u64 efi_memmap;  /* physical address of EFI memory map */
>      ^
>    arch/ia64/include/uapi/asm/setup.h:10:2: error: unknown type name '__u64'
>      __u64 efi_memmap_size;  /* size of EFI memory map */
>      ^
>    arch/ia64/include/uapi/asm/setup.h:11:2: error: unknown type name '__u64'
>      __u64 efi_memdesc_size;  /* size of an EFI memory map descriptor */
>      ^
>>> arch/ia64/include/uapi/asm/setup.h:12:2: error: unknown type name '__u32'
>      __u32 efi_memdesc_version; /* memory descriptor version */
>      ^
>>> arch/ia64/include/uapi/asm/setup.h:14:3: error: unknown type name '__u16'
>       __u16 num_cols; /* number of columns on console output device */
>       ^
>    arch/ia64/include/uapi/asm/setup.h:15:3: error: unknown type name '__u16'
>       __u16 num_rows; /* number of rows on console output device */
>       ^
>    arch/ia64/include/uapi/asm/setup.h:16:3: error: unknown type name '__u16'
>       __u16 orig_x; /* cursor's x position */
>       ^
>    arch/ia64/include/uapi/asm/setup.h:17:3: error: unknown type name '__u16'
>       __u16 orig_y; /* cursor's y position */
>       ^
>    arch/ia64/include/uapi/asm/setup.h:19:2: error: unknown type name '__u64'
>      __u64 fpswa;  /* physical address of the fpswa interface */
>      ^
>    arch/ia64/include/uapi/asm/setup.h:20:2: error: unknown type name '__u64'
>      __u64 initrd_start;
>      ^
>    arch/ia64/include/uapi/asm/setup.h:21:2: error: unknown type name '__u64'
>      __u64 initrd_size;
>      ^
>
> vim +/__u64 +7 arch/ia64/include/uapi/asm/setup.h

it seems that including asm/setup.h was a left over and was not needed,
so I remove it.

Gregory

>
> ^1da177e include/asm-ia64/setup.h      Linus Torvalds 2005-04-16   1  #ifndef __IA64_SETUP_H
> ^1da177e include/asm-ia64/setup.h      Linus Torvalds 2005-04-16   2  #define __IA64_SETUP_H
> ^1da177e include/asm-ia64/setup.h      Linus Torvalds 2005-04-16   3  
> cca97de1 include/asm-ia64/setup.h      Alon Bar-Lev   2007-02-12   4  #define COMMAND_LINE_SIZE	2048
> ^1da177e include/asm-ia64/setup.h      Linus Torvalds 2005-04-16   5  
> c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28   6  extern struct ia64_boot_param {
> c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28  @7  	__u64 command_line;		/* physical address of command line arguments */
> c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28   8  	__u64 efi_systab;		/* physical address of EFI system table */
> c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28  @9  	__u64 efi_memmap;		/* physical address of EFI memory map */
> c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28 @10  	__u64 efi_memmap_size;		/* size of EFI memory map */
> c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28  11  	__u64 efi_memdesc_size;		/* size of an EFI memory map descriptor */
> c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28 @12  	__u32 efi_memdesc_version;	/* memory descriptor version */
> c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28  13  	struct {
> c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28 @14  		__u16 num_cols;	/* number of columns on console output device */
> c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28  15  		__u16 num_rows;	/* number of rows on console output device */
> c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28  16  		__u16 orig_x;	/* cursor's x position */
> c140d879 arch/ia64/include/asm/setup.h David Howells  2012-03-28  17  		__u16 orig_y;	/* cursor's y position */
>
> :::::: The code at line 7 was first introduced by commit
> :::::: c140d87995b68b428f70635c2e4071e4e8b3256e Disintegrate asm/system.h for IA64
>
> :::::: TO: David Howells <dhowells@redhat.com>
> :::::: CC: David Howells <dhowells@redhat.com>
>
> ---
> 0-DAY kernel test infrastructure                Open Source Technology Center
> https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
>

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH 09/12] mmc: sdhci-xenon: add initial Xenon eMMC driver

[kbuild test robot]

Hi,

[auto build test ERROR on ulf.hansson-mmc/next]
[also build test ERROR on v4.7-rc2 next-20160609]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Gregory-CLEMENT/Add-SDHCI-Xenon-driver/20160609-151403
base:   https://git.linaro.org/people/ulf.hansson/mmc next
config: x86_64-allmodconfig (attached as .config)
compiler: gcc-6 (Debian 6.1.1-1) 6.1.1 20160430
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All errors (new ones prefixed by >>):

   drivers/built-in.o: In function `sdhci_xenon_remove':
>> sdhci-xenon.c:(.text+0x311234): undefined reference to `sdhci_remove_host'
>> sdhci-xenon.c:(.text+0x31123c): undefined reference to `sdhci_pltfm_free'
   drivers/built-in.o: In function `sdhci_xenon_delay_adj_test':
>> sdhci-xenon.c:(.text+0x31213b): undefined reference to `card_alive'
   drivers/built-in.o: In function `sdhci_xenon_set_uhs_signaling':
>> sdhci-xenon.c:(.text+0x312456): undefined reference to `sdhci_set_uhs_signaling'
   drivers/built-in.o: In function `sdhci_xenon_probe':
>> sdhci-xenon.c:(.text+0x31258c): undefined reference to `sdhci_pltfm_init'
>> sdhci-xenon.c:(.text+0x3125d3): undefined reference to `mmc_of_parse'
>> sdhci-xenon.c:(.text+0x312651): undefined reference to `sdhci_get_of_property'
>> sdhci-xenon.c:(.text+0x312840): undefined reference to `sdhci_add_host'
   sdhci-xenon.c:(.text+0x312904): undefined reference to `sdhci_pltfm_free'
   drivers/built-in.o: In function `sdhci_xenon_reset':
>> sdhci-xenon.c:(.text+0x313c11): undefined reference to `sdhci_reset'
>> drivers/built-in.o:(.data+0x1d7df0): undefined reference to `sdhci_pltfm_pmops'
>> drivers/built-in.o:(.data+0x1d7eb0): undefined reference to `sdhci_set_clock'
>> drivers/built-in.o:(.data+0x1d7ef0): undefined reference to `sdhci_set_bus_width'

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
-------------- next part --------------
A non-text attachment was scrubbed...
Name: .config.gz
Type: application/octet-stream
Size: 54760 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160609/31c0af2c/attachment-0001.obj>

[PATCH 09/12] mmc: sdhci-xenon: add initial Xenon eMMC driver

[Gregory CLEMENT]

Hi,

I added Arnd because he seems to have a good knoweldge of the Kconfig
stuff.

 On jeu., juin 09 2016, kbuild test robot <lkp@intel.com> wrote:

> Hi,
>
> [auto build test ERROR on ulf.hansson-mmc/next]
> [also build test ERROR on v4.7-rc2 next-20160609]
> [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
>
> url:    https://github.com/0day-ci/linux/commits/Gregory-CLEMENT/Add-SDHCI-Xenon-driver/20160609-151403
> base:   https://git.linaro.org/people/ulf.hansson/mmc next
> config: x86_64-allmodconfig (attached as .config)
> compiler: gcc-6 (Debian 6.1.1-1) 6.1.1 20160430
> reproduce:
>         # save the attached .config to linux build tree
>         make ARCH=x86_64 
>
> All errors (new ones prefixed by >>):
>
>    drivers/built-in.o: In function `sdhci_xenon_remove':
>>> sdhci-xenon.c:(.text+0x311234): undefined reference to `sdhci_remove_host'
>>> sdhci-xenon.c:(.text+0x31123c): undefined reference to `sdhci_pltfm_free'
>    drivers/built-in.o: In function `sdhci_xenon_delay_adj_test':
>>> sdhci-xenon.c:(.text+0x31213b): undefined reference to `card_alive'
>    drivers/built-in.o: In function `sdhci_xenon_set_uhs_signaling':
>>> sdhci-xenon.c:(.text+0x312456): undefined reference to `sdhci_set_uhs_signaling'
>    drivers/built-in.o: In function `sdhci_xenon_probe':
>>> sdhci-xenon.c:(.text+0x31258c): undefined reference to `sdhci_pltfm_init'
>>> sdhci-xenon.c:(.text+0x3125d3): undefined reference to `mmc_of_parse'
>>> sdhci-xenon.c:(.text+0x312651): undefined reference to `sdhci_get_of_property'
>>> sdhci-xenon.c:(.text+0x312840): undefined reference to `sdhci_add_host'
>    sdhci-xenon.c:(.text+0x312904): undefined reference to `sdhci_pltfm_free'
>    drivers/built-in.o: In function `sdhci_xenon_reset':
>>> sdhci-xenon.c:(.text+0x313c11): undefined reference to `sdhci_reset'
>>> drivers/built-in.o:(.data+0x1d7df0): undefined reference to `sdhci_pltfm_pmops'
>>> drivers/built-in.o:(.data+0x1d7eb0): undefined reference to `sdhci_set_clock'
>>> drivers/built-in.o:(.data+0x1d7ef0): undefined reference to `sdhci_set_bus_width'

These symbols are part of the drivers/mmc/host/sdhci.c which is build
when CONFIG_MMC_SDHCI is enabled. However CONFIG_MMC_XENON_SDHCI depends
on CONFIG_MMC_SDHCI_PLTFM which depends on CONFIG_MMC_SDHCI.

So I wonder how we can have a sition with sdhci-xenon.c built but not
sdhci.c.

Any idea?

Thanks,

Gregory

>
> ---
> 0-DAY kernel test infrastructure                Open Source Technology Center
> https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
>

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH 09/12] mmc: sdhci-xenon: add initial Xenon eMMC driver

[Arnd Bergmann]

On Thursday, June 9, 2016 4:54:54 PM CEST Gregory CLEMENT wrote:
> >
> >    drivers/built-in.o: In function `sdhci_xenon_remove':
> >>> sdhci-xenon.c:(.text+0x311234): undefined reference to `sdhci_remove_host'
> >>> sdhci-xenon.c:(.text+0x31123c): undefined reference to `sdhci_pltfm_free'
> >    drivers/built-in.o: In function `sdhci_xenon_delay_adj_test':
> >>> sdhci-xenon.c:(.text+0x31213b): undefined reference to `card_alive'
> >    drivers/built-in.o: In function `sdhci_xenon_set_uhs_signaling':
> >>> sdhci-xenon.c:(.text+0x312456): undefined reference to `sdhci_set_uhs_signaling'
> >    drivers/built-in.o: In function `sdhci_xenon_probe':
> >>> sdhci-xenon.c:(.text+0x31258c): undefined reference to `sdhci_pltfm_init'
> >>> sdhci-xenon.c:(.text+0x3125d3): undefined reference to `mmc_of_parse'
> >>> sdhci-xenon.c:(.text+0x312651): undefined reference to `sdhci_get_of_property'
> >>> sdhci-xenon.c:(.text+0x312840): undefined reference to `sdhci_add_host'
> >    sdhci-xenon.c:(.text+0x312904): undefined reference to `sdhci_pltfm_free'
> >    drivers/built-in.o: In function `sdhci_xenon_reset':
> >>> sdhci-xenon.c:(.text+0x313c11): undefined reference to `sdhci_reset'
> >>> drivers/built-in.o:(.data+0x1d7df0): undefined reference to `sdhci_pltfm_pmops'
> >>> drivers/built-in.o:(.data+0x1d7eb0): undefined reference to `sdhci_set_clock'
> >>> drivers/built-in.o:(.data+0x1d7ef0): undefined reference to `sdhci_set_bus_width'
> 
> These symbols are part of the drivers/mmc/host/sdhci.c which is build
> when CONFIG_MMC_SDHCI is enabled. However CONFIG_MMC_XENON_SDHCI depends
> on CONFIG_MMC_SDHCI_PLTFM which depends on CONFIG_MMC_SDHCI.
> 
> So I wonder how we can have a sition with sdhci-xenon.c built but not
> sdhci.c.
> 
> Any idea?
> 

CONFIG_MMC_SDHCI is built as a module, but CONFIG_MMC_XENON_SDHCI is
a "bool" option, so it can only be built-in.

It should work if you make it a 'tristate' instead, so that Kconfig
can handle the dependency correctly.

	Arnd

[PATCH 09/12] mmc: sdhci-xenon: add initial Xenon eMMC driver

[Adrian Hunter]

On 09/06/16 10:10, Gregory CLEMENT wrote:
> From: Victor Gu <xigu@marvell.com>
> 
> This path adds the driver for the Marvell Xenon eMMC host controller
> which supports eMMC 5.1, SD 3.0.
> 
> However this driver supports only up to eMMC 5.0 since the command queue
> feature is not included (yet) in the driver.
> 
> [gregory.clement at free-electrons.com:
>  - reformulate commit log
>  - overload the sdhci_set_uhs_signaling function instead of using a quirk
>  - fix a kconfig dependency
>  - remove dead code]
> 
> Signed-off-by: Victor Gu <xigu@marvell.com>
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> ---
>  drivers/mmc/host/Kconfig       |   10 +
>  drivers/mmc/host/Makefile      |    1 +
>  drivers/mmc/host/sdhci-xenon.c | 1164 ++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 1175 insertions(+)
>  create mode 100644 drivers/mmc/host/sdhci-xenon.c
> 

<SNIP>

> diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c
> new file mode 100644
> index 000000000000..43c06db95872
> --- /dev/null
> +++ b/drivers/mmc/host/sdhci-xenon.c

<SNIP>

> +static int sdhci_xenon_delay_adj_test(struct sdhci_host *host,
> +		struct mmc_card *card, unsigned int delay,
> +		bool invert, bool phase)
> +{
> +	int ret;
> +	struct mmc_card *oldcard;
> +
> +	sdhci_xenon_set_fix_delay(host, delay, invert, phase);
> +
> +	/*
> +	 * If the card is not yet associated to the host, we
> +	 * temporally do it
> +	 */
> +	oldcard = card->host->card;
> +	if (!oldcard)
> +		card->host->card = card;
> +	ret =  card_alive(card);

This looks like an abuse of bus_ops->alive().  You will need to get
agreement with Ulf how to handle this.  I will wait for Ulf's comments
before reviewing this patch set further.


> +	card->host->card = oldcard;
> +	if (ret) {
> +		pr_debug("Xenon failed when sampling fix delay %d, inverted %d, phase %d\n",
> +			 delay, invert, phase);
> +		return -EIO;
> +	}
> +
> +	pr_debug("Xenon succeeded when sampling fixed delay %d, inverted %d, phase %d\n",
> +		 delay, invert, phase);
> +	return 0;
> +}

[PATCH 09/12] mmc: sdhci-xenon: add initial Xenon eMMC driver

[Gregory CLEMENT]

Hi Adrian,
 
 On mar., juin 14 2016, Adrian Hunter <adrian.hunter@intel.com> wrote:

> On 09/06/16 10:10, Gregory CLEMENT wrote:
>> From: Victor Gu <xigu@marvell.com>
>> 
>> This path adds the driver for the Marvell Xenon eMMC host controller
>> which supports eMMC 5.1, SD 3.0.
>> 
>> However this driver supports only up to eMMC 5.0 since the command queue
>> feature is not included (yet) in the driver.
>> 
>> [gregory.clement at free-electrons.com:
>>  - reformulate commit log
>>  - overload the sdhci_set_uhs_signaling function instead of using a quirk
>>  - fix a kconfig dependency
>>  - remove dead code]
>> 
>> Signed-off-by: Victor Gu <xigu@marvell.com>
>> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
>> ---
>>  drivers/mmc/host/Kconfig       |   10 +
>>  drivers/mmc/host/Makefile      |    1 +
>>  drivers/mmc/host/sdhci-xenon.c | 1164 ++++++++++++++++++++++++++++++++++++++++
>>  3 files changed, 1175 insertions(+)
>>  create mode 100644 drivers/mmc/host/sdhci-xenon.c
>> 
>
> <SNIP>
>
>> diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c
>> new file mode 100644
>> index 000000000000..43c06db95872
>> --- /dev/null
>> +++ b/drivers/mmc/host/sdhci-xenon.c
>
> <SNIP>
>
>> +static int sdhci_xenon_delay_adj_test(struct sdhci_host *host,
>> +		struct mmc_card *card, unsigned int delay,
>> +		bool invert, bool phase)
>> +{
>> +	int ret;
>> +	struct mmc_card *oldcard;
>> +
>> +	sdhci_xenon_set_fix_delay(host, delay, invert, phase);
>> +
>> +	/*
>> +	 * If the card is not yet associated to the host, we
>> +	 * temporally do it
>> +	 */
>> +	oldcard = card->host->card;
>> +	if (!oldcard)
>> +		card->host->card = card;
>> +	ret =  card_alive(card);
>
> This looks like an abuse of bus_ops->alive().  You will need to get
> agreement with Ulf how to handle this.  I will wait for Ulf's comments
> before reviewing this patch set further.

Actually I modified this part of the driver to use
bus_ops->alive(). Initially, the alive() code was more or less copied
and paste from the mmc core with ugly include from mmc_ops.h and
sdio_ops.h to make it work. I find it cleaner to directly access the
alive() function.

Could you explain why it is an abuse of  bus_ops->alive()?

Thanks,

Gregory


>> +	card->host->card = oldcard;
>> +	if (ret) {
>> +		pr_debug("Xenon failed when sampling fix delay %d, inverted %d, phase %d\n",
>> +			 delay, invert, phase);
>> +		return -EIO;
>> +	}
>> +
>> +	pr_debug("Xenon succeeded when sampling fixed delay %d, inverted %d, phase %d\n",
>> +		 delay, invert, phase);
>> +	return 0;
>> +}
>
>

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH 09/12] mmc: sdhci-xenon: add initial Xenon eMMC driver

[Adrian Hunter]

On 14/06/16 11:19, Gregory CLEMENT wrote:
> Hi Adrian,
>  
>  On mar., juin 14 2016, Adrian Hunter <adrian.hunter@intel.com> wrote:
> 
>> On 09/06/16 10:10, Gregory CLEMENT wrote:
>>> From: Victor Gu <xigu@marvell.com>
>>>
>>> This path adds the driver for the Marvell Xenon eMMC host controller
>>> which supports eMMC 5.1, SD 3.0.
>>>
>>> However this driver supports only up to eMMC 5.0 since the command queue
>>> feature is not included (yet) in the driver.
>>>
>>> [gregory.clement at free-electrons.com:
>>>  - reformulate commit log
>>>  - overload the sdhci_set_uhs_signaling function instead of using a quirk
>>>  - fix a kconfig dependency
>>>  - remove dead code]
>>>
>>> Signed-off-by: Victor Gu <xigu@marvell.com>
>>> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
>>> ---
>>>  drivers/mmc/host/Kconfig       |   10 +
>>>  drivers/mmc/host/Makefile      |    1 +
>>>  drivers/mmc/host/sdhci-xenon.c | 1164 ++++++++++++++++++++++++++++++++++++++++
>>>  3 files changed, 1175 insertions(+)
>>>  create mode 100644 drivers/mmc/host/sdhci-xenon.c
>>>
>>
>> <SNIP>
>>
>>> diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c
>>> new file mode 100644
>>> index 000000000000..43c06db95872
>>> --- /dev/null
>>> +++ b/drivers/mmc/host/sdhci-xenon.c
>>
>> <SNIP>
>>
>>> +static int sdhci_xenon_delay_adj_test(struct sdhci_host *host,
>>> +		struct mmc_card *card, unsigned int delay,
>>> +		bool invert, bool phase)
>>> +{
>>> +	int ret;
>>> +	struct mmc_card *oldcard;
>>> +
>>> +	sdhci_xenon_set_fix_delay(host, delay, invert, phase);
>>> +
>>> +	/*
>>> +	 * If the card is not yet associated to the host, we
>>> +	 * temporally do it
>>> +	 */
>>> +	oldcard = card->host->card;
>>> +	if (!oldcard)
>>> +		card->host->card = card;
>>> +	ret =  card_alive(card);
>>
>> This looks like an abuse of bus_ops->alive().  You will need to get
>> agreement with Ulf how to handle this.  I will wait for Ulf's comments
>> before reviewing this patch set further.
> 
> Actually I modified this part of the driver to use
> bus_ops->alive(). Initially, the alive() code was more or less copied
> and paste from the mmc core with ugly include from mmc_ops.h and
> sdio_ops.h to make it work. I find it cleaner to directly access the
> alive() function.
> 
> Could you explain why it is an abuse of  bus_ops->alive()?

bus_ops->alive() is used to determine if the card is present and able to
respond.  You seem to be using it for a different purpose.  I will wait for
Ulf's comments.

[PATCH 09/12] mmc: sdhci-xenon: add initial Xenon eMMC driver

[Ulf Hansson]

On 14 June 2016 at 10:36, Adrian Hunter <adrian.hunter@intel.com> wrote:
> On 14/06/16 11:19, Gregory CLEMENT wrote:
>> Hi Adrian,
>>
>>  On mar., juin 14 2016, Adrian Hunter <adrian.hunter@intel.com> wrote:
>>
>>> On 09/06/16 10:10, Gregory CLEMENT wrote:
>>>> From: Victor Gu <xigu@marvell.com>
>>>>
>>>> This path adds the driver for the Marvell Xenon eMMC host controller
>>>> which supports eMMC 5.1, SD 3.0.
>>>>
>>>> However this driver supports only up to eMMC 5.0 since the command queue
>>>> feature is not included (yet) in the driver.
>>>>
>>>> [gregory.clement at free-electrons.com:
>>>>  - reformulate commit log
>>>>  - overload the sdhci_set_uhs_signaling function instead of using a quirk
>>>>  - fix a kconfig dependency
>>>>  - remove dead code]
>>>>
>>>> Signed-off-by: Victor Gu <xigu@marvell.com>
>>>> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
>>>> ---
>>>>  drivers/mmc/host/Kconfig       |   10 +
>>>>  drivers/mmc/host/Makefile      |    1 +
>>>>  drivers/mmc/host/sdhci-xenon.c | 1164 ++++++++++++++++++++++++++++++++++++++++
>>>>  3 files changed, 1175 insertions(+)
>>>>  create mode 100644 drivers/mmc/host/sdhci-xenon.c
>>>>
>>>
>>> <SNIP>
>>>
>>>> diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c
>>>> new file mode 100644
>>>> index 000000000000..43c06db95872
>>>> --- /dev/null
>>>> +++ b/drivers/mmc/host/sdhci-xenon.c
>>>
>>> <SNIP>
>>>
>>>> +static int sdhci_xenon_delay_adj_test(struct sdhci_host *host,
>>>> +           struct mmc_card *card, unsigned int delay,
>>>> +           bool invert, bool phase)
>>>> +{
>>>> +   int ret;
>>>> +   struct mmc_card *oldcard;
>>>> +
>>>> +   sdhci_xenon_set_fix_delay(host, delay, invert, phase);
>>>> +
>>>> +   /*
>>>> +    * If the card is not yet associated to the host, we
>>>> +    * temporally do it
>>>> +    */
>>>> +   oldcard = card->host->card;
>>>> +   if (!oldcard)
>>>> +           card->host->card = card;
>>>> +   ret =  card_alive(card);
>>>
>>> This looks like an abuse of bus_ops->alive().  You will need to get
>>> agreement with Ulf how to handle this.  I will wait for Ulf's comments
>>> before reviewing this patch set further.
>>
>> Actually I modified this part of the driver to use
>> bus_ops->alive(). Initially, the alive() code was more or less copied
>> and paste from the mmc core with ugly include from mmc_ops.h and
>> sdio_ops.h to make it work. I find it cleaner to directly access the
>> alive() function.
>>
>> Could you explain why it is an abuse of  bus_ops->alive()?

Because it's an internal callback to be used only by the mmc core.

>
> bus_ops->alive() is used to determine if the card is present and able to
> respond.  You seem to be using it for a different purpose.  I will wait for
> Ulf's comments.
>

I looked briefly at your code, which uses the ->alive() ops. Indeed
it's a workaround which I cannot accept.

Could you elaborate why you need to send a CMD13 from your host driver?

It's the responsibility of the mmc core to know/implement the
(e)MMC/SD/SDIO protocols. Is there something missing in core to be
able to support your host driver?

Kind regards
Uffe

[PATCH 10/12] arm64: dts: marvell: add eMMC support for Armada 37xx

[Gregory CLEMENT]

Add the eMMC support for Armada 37xx SoC and enable it in the Armada 3720
DB board.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 arch/arm64/boot/dts/marvell/armada-3720-db.dts | 6 ++++++
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi   | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
index 86110a6ae330..569756924e3e 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
@@ -72,6 +72,12 @@
 	status = "okay";
 };
 
+&sdhci0 {
+	non-removable;
+	bus-width = <8>;
+	status = "okay";
+};
+
 /* CON31 */
 &usb3 {
 	status = "okay";
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index 9e2efb882983..5cc8b3f5ef51 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -126,6 +126,15 @@
 				};
 			};
 
+			sdhci0: sdhci at d8000 {
+				compatible = "marvell,xenon-sdhci";
+				reg = <0xd8000 0x300>;
+				interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+
+				auto-cmd12;
+				status = "disabled";
+			};
+
 			sata: sata at e0000 {
 				compatible = "marvell,armada-3700-ahci";
 				reg = <0xe0000 0x2000>;
-- 
2.5.0

[PATCH 11/12] arm64: dts: marvell: add SDIO support for Armada 37xx

[Gregory CLEMENT]

Add the SDIO support for Armada 37xx SoC and enable it in the Armada 3720
DB board.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 arch/arm64/boot/dts/marvell/armada-3720-db.dts | 6 ++++++
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi   | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
index 569756924e3e..5352d101562d 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
@@ -78,6 +78,12 @@
 	status = "okay";
 };
 
+&sdhci1 {
+	broken-cd;
+	bus-width = <4>;
+	status = "okay";
+};
+
 /* CON31 */
 &usb3 {
 	status = "okay";
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index 5cc8b3f5ef51..7803ca135d37 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -126,6 +126,14 @@
 				};
 			};
 
+			sdhci1: sdhci at d0000 {
+				compatible = "marvell,xenon-sdhci";
+				reg = <0xd0000 0x300>;
+				interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+				auto-cmd12;
+				status = "disabled";
+			};
+
 			sdhci0: sdhci at d8000 {
 				compatible = "marvell,xenon-sdhci";
 				reg = <0xd8000 0x300>;
-- 
2.5.0

[PATCH 12/12] arm64: defconfig: Add Xenon sdhci

[Gregory CLEMENT]

Enable Xenon sdhci found on Armada 37xx and Armada 7K/8K SoCs

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index fd2d74d0491e..2fe02461be55 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -245,6 +245,7 @@ CONFIG_MMC=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_SDHCI=y
+CONFIG_MMC_XENON_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_OF_ESDHC=y
 CONFIG_MMC_SDHCI_TEGRA=y
-- 
2.5.0