* [PATCH 1/2] mmc: implement driver stage register handling
2014-07-16 14:19 [PATCH 0/2] mmc: add driver stage register handling Markus Niebel
@ 2014-07-16 14:19 ` Markus Niebel
2014-07-16 14:19 ` [PATCH 2/2] mmc: sdhci-esdhc-imx: implement DSR support Markus Niebel
1 sibling, 0 replies; 3+ messages in thread
From: Markus Niebel @ 2014-07-16 14:19 UTC (permalink / raw)
To: linux-arm-kernel
From: Markus Niebel <Markus.Niebel@tq-group.com>
The eMMC and the SD-Card specifications describe the optional SET_DSR command.
During measurements at our lab we found that some cards implementing this feature
having really strong driver strengts per default. This can lead to voltage peaks
above the specification of the host on signal edges for data sent from a card to
the host.
Since availability of a given card type may be shorter than the time a certain
hardware will be produced it is useful to have support for this command (Alternative
would be changing termination resistors and adapting the driver strength of the
host to the used card.)
As the value of the dsr register is board specific this adds a 'dsr' devicetree
property which is handled in mmc_of_parse.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
---
Documentation/devicetree/bindings/mmc/mmc.txt | 7 +++++++
drivers/mmc/core/host.c | 8 ++++++++
drivers/mmc/core/mmc.c | 8 ++++++++
drivers/mmc/core/mmc_ops.c | 17 +++++++++++++++++
drivers/mmc/core/mmc_ops.h | 1 +
drivers/mmc/core/sd.c | 8 ++++++++
include/linux/mmc/card.h | 3 ++-
include/linux/mmc/host.h | 3 +++
8 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index 3c18001..94da6ec 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc.txt
@@ -40,6 +40,13 @@ Optional properties:
- mmc-hs200-1_2v: eMMC HS200 mode(1.2V I/O) is supported
- mmc-hs400-1_8v: eMMC HS400 mode(1.8V I/O) is supported
- mmc-hs400-1_2v: eMMC HS400 mode(1.2V I/O) is supported
+- dsr: Content of the optional driver stage register (DSR) as described
+ in JEDEC Standard No. 84-A44, 12.4: Programmable card output driver, SDIO
+ simplified specification 2.00 4.10.5: DSR Register and SD Card Physical Layer
+ Specification 2.00 5.5 DSR Register. For SD and MMC cards this is an optional
+ feature. SDIO cards do not have this feature.
+ SD Card Physical Layer Specification 2.00 Table 6-1 defines the DSR register
+ layout.
*NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line
polarity properties, we have to fix the meaning of the "normal" and "inverted"
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 95cceae..52e83f3 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -452,6 +452,14 @@ int mmc_of_parse(struct mmc_host *host)
if (of_find_property(np, "mmc-hs400-1_2v", &len))
host->caps2 |= MMC_CAP2_HS400_1_2V | MMC_CAP2_HS200_1_2V_SDR;
+ if (of_find_property(np, "dsr", &len)) {
+ u32 tmp;
+
+ of_property_read_u32(np, "dsr", &tmp);
+ host->dsr_req = 1;
+ host->dsr = (u16)tmp;
+ }
+
return 0;
out:
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 793c6f7..fdc1ac1 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -162,6 +162,7 @@ static int mmc_decode_csd(struct mmc_card *card)
csd->read_partial = UNSTUFF_BITS(resp, 79, 1);
csd->write_misalign = UNSTUFF_BITS(resp, 78, 1);
csd->read_misalign = UNSTUFF_BITS(resp, 77, 1);
+ csd->dsr_imp = UNSTUFF_BITS(resp, 76, 1);
csd->r2w_factor = UNSTUFF_BITS(resp, 26, 3);
csd->write_blkbits = UNSTUFF_BITS(resp, 22, 4);
csd->write_partial = UNSTUFF_BITS(resp, 21, 1);
@@ -1273,6 +1274,13 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
}
/*
+ * handling only for cards supporting DSR and hosts requesting
+ * DSR configuration
+ */
+ if (card->csd.dsr_imp && host->dsr_req)
+ mmc_set_dsr(host);
+
+ /*
* Select card, as all following commands rely on that.
*/
if (!mmc_host_is_spi(host)) {
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index f51b5ba..f2a06da 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -93,6 +93,23 @@ int mmc_deselect_cards(struct mmc_host *host)
return _mmc_select_card(host, NULL);
}
+int mmc_set_dsr(struct mmc_host *host)
+{
+ int err;
+ struct mmc_command cmd = {0};
+
+ cmd.opcode = MMC_SET_DSR;
+
+ cmd.arg = ((u32)host->dsr << 16) | 0xffff;
+ cmd.flags = MMC_RSP_NONE | MMC_CMD_AC;
+
+ err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES);
+ if (err)
+ return err;
+
+ return 0;
+}
+
int mmc_go_idle(struct mmc_host *host)
{
int err;
diff --git a/drivers/mmc/core/mmc_ops.h b/drivers/mmc/core/mmc_ops.h
index 80ae9f4..390dac6 100644
--- a/drivers/mmc/core/mmc_ops.h
+++ b/drivers/mmc/core/mmc_ops.h
@@ -14,6 +14,7 @@
int mmc_select_card(struct mmc_card *card);
int mmc_deselect_cards(struct mmc_host *host);
+int mmc_set_dsr(struct mmc_host *host);
int mmc_go_idle(struct mmc_host *host);
int mmc_send_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr);
int mmc_all_send_cid(struct mmc_host *host, u32 *cid);
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 0c44510..2591388 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -127,6 +127,7 @@ static int mmc_decode_csd(struct mmc_card *card)
csd->read_partial = UNSTUFF_BITS(resp, 79, 1);
csd->write_misalign = UNSTUFF_BITS(resp, 78, 1);
csd->read_misalign = UNSTUFF_BITS(resp, 77, 1);
+ csd->dsr_imp = UNSTUFF_BITS(resp, 76, 1);
csd->r2w_factor = UNSTUFF_BITS(resp, 26, 3);
csd->write_blkbits = UNSTUFF_BITS(resp, 22, 4);
csd->write_partial = UNSTUFF_BITS(resp, 21, 1);
@@ -954,6 +955,13 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
}
/*
+ * handling only for cards supporting DSR and hosts requesting
+ * DSR configuration
+ */
+ if (card->csd.dsr_imp && host->dsr_req)
+ mmc_set_dsr(host);
+
+ /*
* Select card, as all following commands rely on that.
*/
if (!mmc_host_is_spi(host)) {
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index d424b9d..680a7f0 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -42,7 +42,8 @@ struct mmc_csd {
unsigned int read_partial:1,
read_misalign:1,
write_partial:1,
- write_misalign:1;
+ write_misalign:1,
+ dsr_imp:1;
};
struct mmc_ext_csd {
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 7960424..9e9ad7b 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -319,6 +319,7 @@ struct mmc_host {
#ifdef CONFIG_MMC_DEBUG
unsigned int removed:1; /* host is being removed */
#endif
+ unsigned int dsr_req:1; /* DSR is requested for Host */
int rescan_disable; /* disable card detection */
int rescan_entered; /* used with nonremovable devices */
@@ -365,6 +366,8 @@ struct mmc_host {
unsigned int slotno; /* used for sdio acpi binding */
+ u16 dsr; /* optional driver stage (dsr) value */
+
unsigned long private[0] ____cacheline_aligned;
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] mmc: sdhci-esdhc-imx: implement DSR support
2014-07-16 14:19 [PATCH 0/2] mmc: add driver stage register handling Markus Niebel
2014-07-16 14:19 ` [PATCH 1/2] mmc: implement " Markus Niebel
@ 2014-07-16 14:19 ` Markus Niebel
1 sibling, 0 replies; 3+ messages in thread
From: Markus Niebel @ 2014-07-16 14:19 UTC (permalink / raw)
To: linux-arm-kernel
From: Markus Niebel <Markus.Niebel@tq-group.com>
nor that we have DSR support implement the configuration
side for i.MX SDHCI controller
Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
---
drivers/mmc/host/sdhci-esdhc-imx.c | 15 +++++++++++++++
include/linux/platform_data/mmc-esdhc-imx.h | 4 ++++
2 files changed, 19 insertions(+)
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index ccec0e3..7db39d8 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -942,6 +942,16 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
if (of_property_read_u32(np, "fsl,delay-line", &boarddata->delay_line))
boarddata->delay_line = 0;
+ if (of_find_property(np, "dsr", NULL)) {
+ u32 tmp;
+
+ of_property_read_u32(np, "dsr", &tmp);
+ boarddata->dsr_req = true;
+ boarddata->dsr = (u16)tmp;
+ } else {
+ boarddata->dsr_req = true;
+ }
+
return 0;
}
#else
@@ -1119,6 +1129,11 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;
}
+ if (boarddata->dsr_req) {
+ host->mmc->dsr_req = 1;
+ host->mmc->dsr = boarddata->dsr;
+ }
+
err = sdhci_add_host(host);
if (err)
goto disable_clk;
diff --git a/include/linux/platform_data/mmc-esdhc-imx.h b/include/linux/platform_data/mmc-esdhc-imx.h
index 75f70f6..8b88a40 100644
--- a/include/linux/platform_data/mmc-esdhc-imx.h
+++ b/include/linux/platform_data/mmc-esdhc-imx.h
@@ -35,6 +35,8 @@ enum cd_types {
* @wp_type: type of write_protect method (see wp_types enum above)
* @cd_type: type of card_detect method (see cd_types enum above)
* @support_vsel: indicate it supports 1.8v switching
+ * @dsr_req: indicate DSR is requested
+ * @dsr: requested driver stage setting
*/
struct esdhc_platform_data {
@@ -46,5 +48,7 @@ struct esdhc_platform_data {
unsigned int f_max;
bool support_vsel;
unsigned int delay_line;
+ bool dsr_req;
+ u16 dsr;
};
#endif /* __ASM_ARCH_IMX_ESDHC_H */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread