Skip to contentSkip to conversation

mmc: sdhci-tegra: Separate Tegra194 and Tegra234 SoC data

PATCH Superseded Prathamesh Shete 4 participants 39 messages Sep 26, 2022 – Oct 18, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/4 mmc: sdhci-tegra: Separate Tegra194 and Tegra234 SoC data

Create new SoC data structure for Tegra234 platforms. Additional features, tap value configurations are added/ updated for Tegra234 platform hence separate Tegra194 and Tegra234 SoC data.

---
 drivers/mmc/host/sdhci-tegra.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
drivers/mmc/host/sdhci-tegra.c +14 -0
index 2d2d8260c681..a6c5bbae77b4 100644
@@ -1556,7 +1556,21 @@ static const struct sdhci_tegra_soc_data soc_data_tegra194 = {
 	.max_tap_delay = 139,
 };
 
+static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
+	.pdata = &sdhci_tegra186_pdata,
+	.dma_mask = DMA_BIT_MASK(39),
+	.nvquirks = NVQUIRK_NEEDS_PAD_CONTROL |
+		    NVQUIRK_HAS_PADCALIB |
+		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
+		    NVQUIRK_ENABLE_SDR50 |
+		    NVQUIRK_ENABLE_SDR104 |
+		    NVQUIRK_HAS_TMCLK,
+	.min_tap_delay = 95,
+	.max_tap_delay = 111,
+};
+
 static const struct of_device_id sdhci_tegra_dt_match[] = {
+	{ .compatible = "nvidia,tegra234-sdhci", .data = &soc_data_tegra234 },
 	{ .compatible = "nvidia,tegra194-sdhci", .data = &soc_data_tegra194 },
 	{ .compatible = "nvidia,tegra186-sdhci", .data = &soc_data_tegra186 },
 	{ .compatible = "nvidia,tegra210-sdhci", .data = &soc_data_tegra210 },
Signature · 1 line
2.17.1
#1 lore raw

PATCH v3 2/4 mmc: sdhci-tegra: Add support to program MC stream ID

SMMU clients are supposed to program stream ID from their respective address spaces instead of MC override. Define NVQUIRK_PROGRAM_STREAMID and use it to program SMMU stream ID from the SDMMC client address space.

---
 drivers/mmc/host/sdhci-tegra.c | 35 ++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
drivers/mmc/host/sdhci-tegra.c +3 -0
index a6c5bbae77b4..4d32b5bfc424 100644
@@ -25,6 +25,7 @@
 #include <linux/mmc/slot-gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/ktime.h>
+#ifdef CONFIG_IOMMU_API
+#include <linux/iommu.h>
+#endif
 

#include <soc/tegra/common.h>

@@ -94,6 +95,8 @@
#define SDHCI_TEGRA_AUTO_CAL_STATUS 0x1ec
#define SDHCI_TEGRA_AUTO_CAL_ACTIVE BIT(31)

+#define SDHCI_TEGRA_CIF2AXI_CTRL_0 0x1fc
+
#define NVQUIRK_FORCE_SDHCI_SPEC_200 BIT(0)
#define NVQUIRK_ENABLE_BLOCK_GAP_DET BIT(1)
#define NVQUIRK_ENABLE_SDHCI_SPEC_300 BIT(2)
@@ -121,6 +124,7 @@
#define NVQUIRK_HAS_TMCLK BIT(10)

#define NVQUIRK_HAS_ANDROID_GPT_SECTOR BIT(11)
+#define NVQUIRK_PROGRAM_STREAMID BIT(12)

/* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */
#define SDHCI_TEGRA_CQE_BASE_ADDR 0xF000
@@ -128,6 +132,8 @@
#define SDHCI_TEGRA_CQE_TRNS_MODE (SDHCI_TRNS_MULTI | \
SDHCI_TRNS_BLK_CNT_EN | \
SDHCI_TRNS_DMA)
+#define SDHCI_TEGRA_STREAMID_MASK 0xff
+#define SDHCI_TEGRA_WRITE_STREAMID_SHIFT 0x8

struct sdhci_tegra_soc_data {
const struct sdhci_pltfm_data *pdata;
@@ -177,6 +183,7 @@ struct sdhci_tegra {
bool enable_hwcq;
unsigned long curr_clk_rate;
u8 tuned_tap_delay;
+#ifdef CONFIG_IOMMU_API
+ u32 streamid;
+#endif
};

static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)
@@ -1564,6 +1571,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
NVQUIRK_DIS_CARD_CLK_CONFIG_TAP | NVQUIRK_ENABLE_SDR50 |
NVQUIRK_ENABLE_SDR104 |
+ NVQUIRK_PROGRAM_STREAMID |
NVQUIRK_HAS_TMCLK,
.min_tap_delay = 95,
.max_tap_delay = 111,
@@ -1636,6 +1644,7 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
struct sdhci_host *host;
struct sdhci_pltfm_host *pltfm_host;
struct sdhci_tegra *tegra_host;
+#ifdef CONFIG_IOMMU_API
+ struct iommu_fwspec *fwspec;
+#endif
struct clk *clk;
int rc;

@@ -1775,6 +1784,23 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
if (rc)
goto err_add_host;

+ /* Program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+ if (soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+ fwspec = dev_iommu_fwspec_get(&pdev->dev);
+ if (fwspec == NULL) {
+ dev_warn(mmc_dev(host->mmc),
+ "iommu fwspec is NULL, continue without stream ID\n");
+ } else {
+ tegra_host->streamid = fwspec->ids[0] & 0xffff;
+ tegra_sdhci_writel(host, (tegra_host->streamid &
+ SDHCI_TEGRA_STREAMID_MASK) |
+ ((tegra_host->streamid <<
+ SDHCI_TEGRA_WRITE_STREAMID_SHIFT)
+ & SDHCI_TEGRA_STREAMID_MASK),
+ SDHCI_TEGRA_CIF2AXI_CTRL_0);
+ }
+ }
+#endif
+
return 0;

err_add_host:
@@ -1861,6 +1887,8 @@ static int sdhci_tegra_suspend(struct device *dev)
static int sdhci_tegra_resume(struct device *dev)
{
struct sdhci_host *host = dev_get_drvdata(dev);
+#ifdef CONFIG_IOMMU_API
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
+#endif
int ret;

ret = mmc_gpio_set_cd_wake(host->mmc, false);
@@ -1871,6 +1899,13 @@ static int sdhci_tegra_resume(struct device *dev)
if (ret)
return ret;

+ /* Re-program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+ if (tegra_host->soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+ tegra_sdhci_writel(host, tegra_host->streamid |
+ (tegra_host->streamid << 8),
+ SDHCI_TEGRA_CIF2AXI_CTRL_0);
+ }
+#endif
+
ret = sdhci_resume_host(host);
if (ret)
goto disable_clk;

Signature · 1 line
2.17.1
#2 lore raw

PATCH v3 3/4 mmc: sdhci-tegra: Issue CMD and DAT resets together

In reply to Prathamesh Shete

In case of error condition to avoid system crash Tegra SDMMC controller requires CMD and DAT resets issued together. SDHCI controller FSM goes into bad state due to rapid SD card hot-plug event. Issuing reset on the CMD FSM before DATA FSM results in kernel panic, hence add support to issue CMD and DAT resets together.
This is applicable to Tegra186 and later chips.

---
 drivers/mmc/host/sdhci-tegra.c |  3 ++-
 drivers/mmc/host/sdhci.c       | 20 +++++++++++++++-----
 drivers/mmc/host/sdhci.h       |  2 ++
 3 files changed, 19 insertions(+), 6 deletions(-)
drivers/mmc/host/sdhci-tegra.c +2 -1
index 4d32b5bfc424..58449e010a9b 100644
@@ -1532,7 +1532,8 @@ static const struct sdhci_pltfm_data sdhci_tegra186_pdata = {
 		  SDHCI_QUIRK_NO_HISPD_BIT |
 		  SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |
 		  SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
-	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+		   SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER,
 	.ops  = &tegra186_sdhci_ops,
 };
 
drivers/mmc/host/sdhci.c +15 -5
index 7689ffec5ad1..2f4a0e84fee8 100644
@@ -3060,12 +3060,22 @@ static bool sdhci_request_done(struct sdhci_host *host)
 			host->ops->set_clock(host, host->clock);
 
 		/*
-		 * Spec says we should do both at the same time, but Ricoh
-		 * controllers do not like that.
+		 * While the specification says we should do both at the
+		 * same time, Ricoh controllers (and potentially others) do not
+		 * like that. On the other hand, some controllers (such as those
+		 * found on Tegra186 and later) rely on both being reset at the
+		 * same time. Use a quirk for the latter category since most
+		 * controllers seem to work fine with DAT and CMD getting reset
+		 * at the same time.
 		 */
-		sdhci_do_reset(host, SDHCI_RESET_CMD);
-		sdhci_do_reset(host, SDHCI_RESET_DATA);
-
+		if (host->quirks2 &
+			SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER) {
+			sdhci_do_reset(host, SDHCI_RESET_CMD |
+					SDHCI_RESET_DATA);
+		} else {
+			sdhci_do_reset(host, SDHCI_RESET_CMD);
+			sdhci_do_reset(host, SDHCI_RESET_DATA);
+		}
 		host->pending_reset = false;
 	}
 
drivers/mmc/host/sdhci.h +2 -0
index 95a08f09df30..8045308f7859 100644
@@ -480,6 +480,8 @@ struct sdhci_host {
  * block count.
  */
 #define SDHCI_QUIRK2_USE_32BIT_BLK_CNT			(1<<18)
+/* Issue CMD and DATA reset together */
+#define SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER      (1<<19)
 
 	int irq;		/* Device IRQ */
 	void __iomem *ioaddr;	/* Mapped address */
Signature · 1 line
2.17.1
maintainer
#3 lore raw

Re: [PATCH v3 3/4] mmc: sdhci-tegra: Issue CMD and DAT resets together

Quoted 50 lines · Prathamesh Shete

In case of error condition to avoid system crash Tegra SDMMC controller requires CMD and DAT resets issued together. SDHCI controller FSM goes into bad state due to rapid SD card hot-plug event. Issuing reset on the CMD FSM before DATA FSM results in kernel panic, hence add support to issue CMD and DAT resets together.
This is applicable to Tegra186 and later chips.

---
 drivers/mmc/host/sdhci-tegra.c |  3 ++-
 drivers/mmc/host/sdhci.c       | 20 +++++++++++++++-----
 drivers/mmc/host/sdhci.h       |  2 ++
 3 files changed, 19 insertions(+), 6 deletions(-)
drivers/mmc/host/sdhci-tegra.c +2 -1
index 4d32b5bfc424..58449e010a9b 100644
@@ -1532,7 +1532,8 @@ static const struct sdhci_pltfm_data sdhci_tegra186_pdata = {
 		  SDHCI_QUIRK_NO_HISPD_BIT |
 		  SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |
 		  SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
-	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+		   SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER,
 	.ops  = &tegra186_sdhci_ops,
 };
 
drivers/mmc/host/sdhci.c +7 -3
index 7689ffec5ad1..2f4a0e84fee8 100644
@@ -3060,12 +3060,22 @@ static bool sdhci_request_done(struct sdhci_host *host)
 			host->ops->set_clock(host, host->clock);
 
 		/*
-		 * Spec says we should do both at the same time, but Ricoh
-		 * controllers do not like that.
+		 * While the specification says we should do both at the
+		 * same time, Ricoh controllers (and potentially others) do not
+		 * like that. On the other hand, some controllers (such as those
+		 * found on Tegra186 and later) rely on both being reset at the
+		 * same time. Use a quirk for the latter category since most
+		 * controllers seem to work fine with DAT and CMD getting reset
+		 * at the same time.
 		 */
-		sdhci_do_reset(host, SDHCI_RESET_CMD);

drivers/mmc/host/sdhci.c static bool sdhci_request_done(struct sdhci_host *host) · line 3078

Quoted 10 lines
drivers/mmc/host/sdhci.c +8 -2
-		sdhci_do_reset(host, SDHCI_RESET_DATA);
-
+		if (host->quirks2 &
+			SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER) {
+			sdhci_do_reset(host, SDHCI_RESET_CMD |
+					SDHCI_RESET_DATA);
+		} else {
+			sdhci_do_reset(host, SDHCI_RESET_CMD);
+			sdhci_do_reset(host, SDHCI_RESET_DATA);
+		}

There is a bit a tidy up of SDHCI resets here:

https://lore.kernel.org/linux-mmc/[email protected]/

Would you mind implementing the quirk on top of that patch set. The quirk should go somewhere in the new sdhci_reset_for_reason() function, which should make it's use more consistent.

#4 lore raw

PATCH v4 1/4 mmc: sdhci-tegra: Separate Tegra194 and Tegra234 SoC data

Create new SoC data structure for Tegra234 platforms. Additional features, tap value configurations are added/ updated for Tegra234 platform hence separate Tegra194 and Tegra234 SoC data.

---
 drivers/mmc/host/sdhci-tegra.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
drivers/mmc/host/sdhci-tegra.c +14 -0
index 2d2d8260c681..a6c5bbae77b4 100644
@@ -1556,7 +1556,21 @@ static const struct sdhci_tegra_soc_data soc_data_tegra194 = {
 	.max_tap_delay = 139,
 };
 
+static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
+	.pdata = &sdhci_tegra186_pdata,
+	.dma_mask = DMA_BIT_MASK(39),
+	.nvquirks = NVQUIRK_NEEDS_PAD_CONTROL |
+		    NVQUIRK_HAS_PADCALIB |
+		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
+		    NVQUIRK_ENABLE_SDR50 |
+		    NVQUIRK_ENABLE_SDR104 |
+		    NVQUIRK_HAS_TMCLK,
+	.min_tap_delay = 95,
+	.max_tap_delay = 111,
+};
+
 static const struct of_device_id sdhci_tegra_dt_match[] = {
+	{ .compatible = "nvidia,tegra234-sdhci", .data = &soc_data_tegra234 },
 	{ .compatible = "nvidia,tegra194-sdhci", .data = &soc_data_tegra194 },
 	{ .compatible = "nvidia,tegra186-sdhci", .data = &soc_data_tegra186 },
 	{ .compatible = "nvidia,tegra210-sdhci", .data = &soc_data_tegra210 },
Signature · 1 line
2.17.1
#5 lore raw

PATCH v4 2/4 mmc: sdhci-tegra: Add support to program MC stream ID

SMMU clients are supposed to program stream ID from their respective address spaces instead of MC override. Define NVQUIRK_PROGRAM_STREAMID and use it to program SMMU stream ID from the SDMMC client address space.

---
 drivers/mmc/host/sdhci-tegra.c | 47 ++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
drivers/mmc/host/sdhci-tegra.c +47 -0
index a6c5bbae77b4..46f37cc26dbb 100644
@@ -25,6 +25,9 @@
 #include <linux/mmc/slot-gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/ktime.h>
+#ifdef CONFIG_IOMMU_API
+#include <linux/iommu.h>
+#endif
 
 #include <soc/tegra/common.h>
 
@@ -94,6 +97,8 @@
 #define SDHCI_TEGRA_AUTO_CAL_STATUS			0x1ec
 #define SDHCI_TEGRA_AUTO_CAL_ACTIVE			BIT(31)
 
+#define SDHCI_TEGRA_CIF2AXI_CTRL_0			0x1fc
+
 #define NVQUIRK_FORCE_SDHCI_SPEC_200			BIT(0)
 #define NVQUIRK_ENABLE_BLOCK_GAP_DET			BIT(1)
 #define NVQUIRK_ENABLE_SDHCI_SPEC_300			BIT(2)
@@ -121,6 +126,7 @@
 #define NVQUIRK_HAS_TMCLK				BIT(10)
 
 #define NVQUIRK_HAS_ANDROID_GPT_SECTOR			BIT(11)
+#define NVQUIRK_PROGRAM_STREAMID			BIT(12)
 
 /* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */
 #define SDHCI_TEGRA_CQE_BASE_ADDR			0xF000
@@ -128,6 +134,8 @@
 #define SDHCI_TEGRA_CQE_TRNS_MODE	(SDHCI_TRNS_MULTI | \
 					 SDHCI_TRNS_BLK_CNT_EN | \
 					 SDHCI_TRNS_DMA)
+#define SDHCI_TEGRA_STREAMID_MASK			0xff
+#define SDHCI_TEGRA_WRITE_STREAMID_SHIFT		0x8
 
 struct sdhci_tegra_soc_data {
 	const struct sdhci_pltfm_data *pdata;
@@ -177,6 +185,9 @@ struct sdhci_tegra {
 	bool enable_hwcq;
 	unsigned long curr_clk_rate;
 	u8 tuned_tap_delay;
+#ifdef CONFIG_IOMMU_API
+	u32 streamid;
+#endif
 };
 
 static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)
@@ -1564,6 +1575,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
 		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
 		    NVQUIRK_ENABLE_SDR50 |
 		    NVQUIRK_ENABLE_SDR104 |
+		    NVQUIRK_PROGRAM_STREAMID |
 		    NVQUIRK_HAS_TMCLK,
 	.min_tap_delay = 95,
 	.max_tap_delay = 111,
@@ -1636,6 +1648,9 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
 	struct sdhci_host *host;
 	struct sdhci_pltfm_host *pltfm_host;
 	struct sdhci_tegra *tegra_host;
+#ifdef CONFIG_IOMMU_API
+	struct iommu_fwspec *fwspec;
+#endif
 	struct clk *clk;
 	int rc;
 
@@ -1775,6 +1790,25 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
 	if (rc)
 		goto err_add_host;
 
+	/* Program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+	if (soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+		fwspec = dev_iommu_fwspec_get(&pdev->dev);
+		if (fwspec == NULL) {
+			dev_warn(mmc_dev(host->mmc),
+				"iommu fwspec is NULL, continue without stream ID\n");
+		} else {
+			tegra_host->streamid = fwspec->ids[0] & 0xffff;
+			tegra_sdhci_writel(host, (tegra_host->streamid &
+						SDHCI_TEGRA_STREAMID_MASK) |
+						((tegra_host->streamid <<
+						SDHCI_TEGRA_WRITE_STREAMID_SHIFT)
+						& SDHCI_TEGRA_STREAMID_MASK),
+						SDHCI_TEGRA_CIF2AXI_CTRL_0);
+		}
+	}
+#endif
+
 	return 0;
 
 err_add_host:
@@ -1861,6 +1895,10 @@ static int sdhci_tegra_suspend(struct device *dev)
 static int sdhci_tegra_resume(struct device *dev)
 {
 	struct sdhci_host *host = dev_get_drvdata(dev);
+#ifdef CONFIG_IOMMU_API
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+	struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
+#endif
 	int ret;
 
 	ret = mmc_gpio_set_cd_wake(host->mmc, false);
@@ -1871,6 +1909,15 @@ static int sdhci_tegra_resume(struct device *dev)
 	if (ret)
 		return ret;
 
+	/* Re-program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+	if (tegra_host->soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+		tegra_sdhci_writel(host, tegra_host->streamid |
+					(tegra_host->streamid << 8),
+					SDHCI_TEGRA_CIF2AXI_CTRL_0);
+	}
+#endif
+
 	ret = sdhci_resume_host(host);
 	if (ret)
 		goto disable_clk;
Signature · 1 line
2.17.1
#6 lore raw

PATCH v4 3/4 mmc: sdhci-tegra: Issue CMD and DAT resets together

In reply to Prathamesh Shete

In case of error condition to avoid system crash Tegra SDMMC controller requires CMD and DAT resets issued together. SDHCI controller FSM goes into bad state due to rapid SD card hot-plug event. Issuing reset on the CMD FSM before DATA FSM results in kernel panic, hence add support to issue CMD and DAT resets together.
This is applicable to Tegra186 and later chips.

---
 drivers/mmc/host/sdhci-tegra.c | 3 ++-
 drivers/mmc/host/sdhci.c       | 8 +++++++-
 drivers/mmc/host/sdhci.h       | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-tegra.c +2 -1
index 46f37cc26dbb..61dc5ee0726d 100644
@@ -1536,7 +1536,8 @@ static const struct sdhci_pltfm_data sdhci_tegra186_pdata = {
 		  SDHCI_QUIRK_NO_HISPD_BIT |
 		  SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |
 		  SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
-	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+		   SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER,
 	.ops  = &tegra186_sdhci_ops,
 };
 
drivers/mmc/host/sdhci.c +7 -1
index 2b5dda521b0e..5123ec3fc74a 100644
@@ -266,12 +266,14 @@ enum sdhci_reset_reason {
 	SDHCI_RESET_FOR_TUNING_ABORT,
 	SDHCI_RESET_FOR_CARD_REMOVED,
 	SDHCI_RESET_FOR_CQE_RECOVERY,
+	SDHCI_RESET_FOR_CMD_DAT_TOGETHER,
 };
 
 static void sdhci_reset_for_reason(struct sdhci_host *host, enum sdhci_reset_reason reason)
 {
 	switch (reason) {
 	case SDHCI_RESET_FOR_INIT:
+	case SDHCI_RESET_FOR_CMD_DAT_TOGETHER:
 		sdhci_do_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
 		break;
 	case SDHCI_RESET_FOR_REQUEST_ERROR:
@@ -3084,7 +3086,11 @@ static bool sdhci_request_done(struct sdhci_host *host)
 			/* This is to force an update */
 			host->ops->set_clock(host, host->clock);
 
-		sdhci_reset_for(host, REQUEST_ERROR);
+		if (host->quirks2 &
+			SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER)
+			sdhci_reset_for(host, CMD_DAT_TOGETHER);
+		else
+			sdhci_reset_for(host, REQUEST_ERROR);
 
 		host->pending_reset = false;
 	}
drivers/mmc/host/sdhci.h +2 -0
index d750c464bd1e..6a5766774b05 100644
@@ -478,6 +478,8 @@ struct sdhci_host {
  * block count.
  */
 #define SDHCI_QUIRK2_USE_32BIT_BLK_CNT			(1<<18)
+/* Issue CMD and DATA reset together */
+#define SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER	(1<<19)
 
 	int irq;		/* Device IRQ */
 	void __iomem *ioaddr;	/* Mapped address */
Signature · 1 line
2.17.1
maintainer
#7 lore raw

Re: [PATCH v4 3/4] mmc: sdhci-tegra: Issue CMD and DAT resets together

Quoted 51 lines · Prathamesh Shete

In case of error condition to avoid system crash Tegra SDMMC controller requires CMD and DAT resets issued together. SDHCI controller FSM goes into bad state due to rapid SD card hot-plug event. Issuing reset on the CMD FSM before DATA FSM results in kernel panic, hence add support to issue CMD and DAT resets together.
This is applicable to Tegra186 and later chips.

---
 drivers/mmc/host/sdhci-tegra.c | 3 ++-
 drivers/mmc/host/sdhci.c       | 8 +++++++-
 drivers/mmc/host/sdhci.h       | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-tegra.c +2 -1
index 46f37cc26dbb..61dc5ee0726d 100644
@@ -1536,7 +1536,8 @@ static const struct sdhci_pltfm_data sdhci_tegra186_pdata = {
 		  SDHCI_QUIRK_NO_HISPD_BIT |
 		  SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |
 		  SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
-	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+		   SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER,
 	.ops  = &tegra186_sdhci_ops,
 };
 
drivers/mmc/host/sdhci.c +2 -0
index 2b5dda521b0e..5123ec3fc74a 100644
@@ -266,12 +266,14 @@ enum sdhci_reset_reason {
 	SDHCI_RESET_FOR_TUNING_ABORT,
 	SDHCI_RESET_FOR_CARD_REMOVED,
 	SDHCI_RESET_FOR_CQE_RECOVERY,
+	SDHCI_RESET_FOR_CMD_DAT_TOGETHER,
 };
 
 static void sdhci_reset_for_reason(struct sdhci_host *host, enum sdhci_reset_reason reason)
 {
 	switch (reason) {
 	case SDHCI_RESET_FOR_INIT:
+	case SDHCI_RESET_FOR_CMD_DAT_TOGETHER:
 		sdhci_do_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
 		break;
 	case SDHCI_RESET_FOR_REQUEST_ERROR:

drivers/mmc/host/sdhci.c static bool sdhci_request_done(struct sdhci_host *host) · line 3093

Quoted 9 lines
drivers/mmc/host/sdhci.c +5 -1
@@ -3084,7 +3086,11 @@ static bool sdhci_request_done(struct sdhci_host *host)
 			/* This is to force an update */
 			host->ops->set_clock(host, host->clock);
 
-		sdhci_reset_for(host, REQUEST_ERROR);
+		if (host->quirks2 &
+			SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER)
+			sdhci_reset_for(host, CMD_DAT_TOGETHER);
+		else
+			sdhci_reset_for(host, REQUEST_ERROR);

This is what I am trying to avoid because it is inconsistent. Consider:
- why is the quirk needed for some REQUEST_ERRORs but not others?
- or why is the quirk not needed for all CMD / DAT resets?

So, I was expecting the quirk to be applied in sdhci_reset_for_reason() not here.

Quoted 16 lines
drivers/mmc/host/sdhci.c +0 -0
 		host->pending_reset = false;
 	}
drivers/mmc/host/sdhci.h +2 -0
index d750c464bd1e..6a5766774b05 100644
@@ -478,6 +478,8 @@ struct sdhci_host {
  * block count.
  */
 #define SDHCI_QUIRK2_USE_32BIT_BLK_CNT			(1<<18)
+/* Issue CMD and DATA reset together */
+#define SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER	(1<<19)
 
 	int irq;		/* Device IRQ */
 	void __iomem *ioaddr;	/* Mapped address */
#8 lore raw

PATCH v5 1/3 mmc: sdhci-tegra: Separate Tegra194 and Tegra234 SoC data

Create new SoC data structure for Tegra234 platforms. Additional features, tap value configurations are added/ updated for Tegra234 platform hence separate Tegra194 and Tegra234 SoC data.

---
 drivers/mmc/host/sdhci-tegra.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
drivers/mmc/host/sdhci-tegra.c +14 -0
index 2d2d8260c681..a6c5bbae77b4 100644
@@ -1556,7 +1556,21 @@ static const struct sdhci_tegra_soc_data soc_data_tegra194 = {
 	.max_tap_delay = 139,
 };
 
+static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
+	.pdata = &sdhci_tegra186_pdata,
+	.dma_mask = DMA_BIT_MASK(39),
+	.nvquirks = NVQUIRK_NEEDS_PAD_CONTROL |
+		    NVQUIRK_HAS_PADCALIB |
+		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
+		    NVQUIRK_ENABLE_SDR50 |
+		    NVQUIRK_ENABLE_SDR104 |
+		    NVQUIRK_HAS_TMCLK,
+	.min_tap_delay = 95,
+	.max_tap_delay = 111,
+};
+
 static const struct of_device_id sdhci_tegra_dt_match[] = {
+	{ .compatible = "nvidia,tegra234-sdhci", .data = &soc_data_tegra234 },
 	{ .compatible = "nvidia,tegra194-sdhci", .data = &soc_data_tegra194 },
 	{ .compatible = "nvidia,tegra186-sdhci", .data = &soc_data_tegra186 },
 	{ .compatible = "nvidia,tegra210-sdhci", .data = &soc_data_tegra210 },
Signature · 1 line
2.17.1
#9 lore raw

PATCH v5 2/3 mmc: sdhci-tegra: Add support to program MC stream ID

SMMU clients are supposed to program stream ID from their respective address spaces instead of MC override. Define NVQUIRK_PROGRAM_STREAMID and use it to program SMMU stream ID from the SDMMC client address space.

---
 drivers/mmc/host/sdhci-tegra.c | 47 ++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
drivers/mmc/host/sdhci-tegra.c +47 -0
index a6c5bbae77b4..46f37cc26dbb 100644
@@ -25,6 +25,9 @@
 #include <linux/mmc/slot-gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/ktime.h>
+#ifdef CONFIG_IOMMU_API
+#include <linux/iommu.h>
+#endif
 
 #include <soc/tegra/common.h>
 
@@ -94,6 +97,8 @@
 #define SDHCI_TEGRA_AUTO_CAL_STATUS			0x1ec
 #define SDHCI_TEGRA_AUTO_CAL_ACTIVE			BIT(31)
 
+#define SDHCI_TEGRA_CIF2AXI_CTRL_0			0x1fc
+
 #define NVQUIRK_FORCE_SDHCI_SPEC_200			BIT(0)
 #define NVQUIRK_ENABLE_BLOCK_GAP_DET			BIT(1)
 #define NVQUIRK_ENABLE_SDHCI_SPEC_300			BIT(2)
@@ -121,6 +126,7 @@
 #define NVQUIRK_HAS_TMCLK				BIT(10)
 
 #define NVQUIRK_HAS_ANDROID_GPT_SECTOR			BIT(11)
+#define NVQUIRK_PROGRAM_STREAMID			BIT(12)
 
 /* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */
 #define SDHCI_TEGRA_CQE_BASE_ADDR			0xF000
@@ -128,6 +134,8 @@
 #define SDHCI_TEGRA_CQE_TRNS_MODE	(SDHCI_TRNS_MULTI | \
 					 SDHCI_TRNS_BLK_CNT_EN | \
 					 SDHCI_TRNS_DMA)
+#define SDHCI_TEGRA_STREAMID_MASK			0xff
+#define SDHCI_TEGRA_WRITE_STREAMID_SHIFT		0x8
 
 struct sdhci_tegra_soc_data {
 	const struct sdhci_pltfm_data *pdata;
@@ -177,6 +185,9 @@ struct sdhci_tegra {
 	bool enable_hwcq;
 	unsigned long curr_clk_rate;
 	u8 tuned_tap_delay;
+#ifdef CONFIG_IOMMU_API
+	u32 streamid;
+#endif
 };
 
 static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)
@@ -1564,6 +1575,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
 		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
 		    NVQUIRK_ENABLE_SDR50 |
 		    NVQUIRK_ENABLE_SDR104 |
+		    NVQUIRK_PROGRAM_STREAMID |
 		    NVQUIRK_HAS_TMCLK,
 	.min_tap_delay = 95,
 	.max_tap_delay = 111,
@@ -1636,6 +1648,9 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
 	struct sdhci_host *host;
 	struct sdhci_pltfm_host *pltfm_host;
 	struct sdhci_tegra *tegra_host;
+#ifdef CONFIG_IOMMU_API
+	struct iommu_fwspec *fwspec;
+#endif
 	struct clk *clk;
 	int rc;
 
@@ -1775,6 +1790,25 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
 	if (rc)
 		goto err_add_host;
 
+	/* Program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+	if (soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+		fwspec = dev_iommu_fwspec_get(&pdev->dev);
+		if (fwspec == NULL) {
+			dev_warn(mmc_dev(host->mmc),
+				"iommu fwspec is NULL, continue without stream ID\n");
+		} else {
+			tegra_host->streamid = fwspec->ids[0] & 0xffff;
+			tegra_sdhci_writel(host, (tegra_host->streamid &
+						SDHCI_TEGRA_STREAMID_MASK) |
+						((tegra_host->streamid <<
+						SDHCI_TEGRA_WRITE_STREAMID_SHIFT)
+						& SDHCI_TEGRA_STREAMID_MASK),
+						SDHCI_TEGRA_CIF2AXI_CTRL_0);
+		}
+	}
+#endif
+
 	return 0;
 
 err_add_host:
@@ -1861,6 +1895,10 @@ static int sdhci_tegra_suspend(struct device *dev)
 static int sdhci_tegra_resume(struct device *dev)
 {
 	struct sdhci_host *host = dev_get_drvdata(dev);
+#ifdef CONFIG_IOMMU_API
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+	struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
+#endif
 	int ret;
 
 	ret = mmc_gpio_set_cd_wake(host->mmc, false);
@@ -1871,6 +1909,15 @@ static int sdhci_tegra_resume(struct device *dev)
 	if (ret)
 		return ret;
 
+	/* Re-program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+	if (tegra_host->soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+		tegra_sdhci_writel(host, tegra_host->streamid |
+					(tegra_host->streamid << 8),
+					SDHCI_TEGRA_CIF2AXI_CTRL_0);
+	}
+#endif
+
 	ret = sdhci_resume_host(host);
 	if (ret)
 		goto disable_clk;
Signature · 1 line
2.17.1
maintainer
#10 lore raw

Re: [PATCH v5 2/3] mmc: sdhci-tegra: Add support to program MC stream ID

Quoted 70 lines · Prathamesh Shete

SMMU clients are supposed to program stream ID from their respective address spaces instead of MC override. Define NVQUIRK_PROGRAM_STREAMID and use it to program SMMU stream ID from the SDMMC client address space.

---
 drivers/mmc/host/sdhci-tegra.c | 47 ++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
drivers/mmc/host/sdhci-tegra.c +12 -0
index a6c5bbae77b4..46f37cc26dbb 100644
@@ -25,6 +25,9 @@
 #include <linux/mmc/slot-gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/ktime.h>
+#ifdef CONFIG_IOMMU_API
+#include <linux/iommu.h>
+#endif
 
 #include <soc/tegra/common.h>
 
@@ -94,6 +97,8 @@
 #define SDHCI_TEGRA_AUTO_CAL_STATUS			0x1ec
 #define SDHCI_TEGRA_AUTO_CAL_ACTIVE			BIT(31)
 
+#define SDHCI_TEGRA_CIF2AXI_CTRL_0			0x1fc
+
 #define NVQUIRK_FORCE_SDHCI_SPEC_200			BIT(0)
 #define NVQUIRK_ENABLE_BLOCK_GAP_DET			BIT(1)
 #define NVQUIRK_ENABLE_SDHCI_SPEC_300			BIT(2)
@@ -121,6 +126,7 @@
 #define NVQUIRK_HAS_TMCLK				BIT(10)
 
 #define NVQUIRK_HAS_ANDROID_GPT_SECTOR			BIT(11)
+#define NVQUIRK_PROGRAM_STREAMID			BIT(12)
 
 /* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */
 #define SDHCI_TEGRA_CQE_BASE_ADDR			0xF000
@@ -128,6 +134,8 @@
 #define SDHCI_TEGRA_CQE_TRNS_MODE	(SDHCI_TRNS_MULTI | \
 					 SDHCI_TRNS_BLK_CNT_EN | \
 					 SDHCI_TRNS_DMA)
+#define SDHCI_TEGRA_STREAMID_MASK			0xff
+#define SDHCI_TEGRA_WRITE_STREAMID_SHIFT		0x8
 
 struct sdhci_tegra_soc_data {
 	const struct sdhci_pltfm_data *pdata;
@@ -177,6 +185,9 @@ struct sdhci_tegra {
 	bool enable_hwcq;
 	unsigned long curr_clk_rate;
 	u8 tuned_tap_delay;
+#ifdef CONFIG_IOMMU_API
+	u32 streamid;
+#endif
 };
 
 static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)
@@ -1564,6 +1575,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
 		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
 		    NVQUIRK_ENABLE_SDR50 |
 		    NVQUIRK_ENABLE_SDR104 |
+		    NVQUIRK_PROGRAM_STREAMID |
 		    NVQUIRK_HAS_TMCLK,
 	.min_tap_delay = 95,
 	.max_tap_delay = 111,

drivers/mmc/host/sdhci-tegra.c static int sdhci_tegra_probe(struct platform_device *pdev) · line 1653

Quoted 6 lines
drivers/mmc/host/sdhci-tegra.c +3 -0
@@ -1636,6 +1648,9 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
 	struct sdhci_host *host;
 	struct sdhci_pltfm_host *pltfm_host;
 	struct sdhci_tegra *tegra_host;
+#ifdef CONFIG_IOMMU_API
+	struct iommu_fwspec *fwspec;
+#endif

Move this below

drivers/mmc/host/sdhci-tegra.c static int sdhci_tegra_probe(struct platform_device *pdev) · line 1795

Quoted 10 lines
drivers/mmc/host/sdhci-tegra.c +3 -0
 	struct clk *clk;
 	int rc;
 
@@ -1775,6 +1790,25 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
 	if (rc)
 		goto err_add_host;
 
+	/* Program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+	if (soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {

Can put it here

		struct iommu_fwspec *fwspec;

drivers/mmc/host/sdhci-tegra.c static int sdhci_tegra_probe(struct platform_device *pdev) · line 1807

Quoted 12 lines
drivers/mmc/host/sdhci-tegra.c +12 -0
+		fwspec = dev_iommu_fwspec_get(&pdev->dev);
+		if (fwspec == NULL) {
+			dev_warn(mmc_dev(host->mmc),
+				"iommu fwspec is NULL, continue without stream ID\n");
+		} else {
+			tegra_host->streamid = fwspec->ids[0] & 0xffff;
+			tegra_sdhci_writel(host, (tegra_host->streamid &
+						SDHCI_TEGRA_STREAMID_MASK) |
+						((tegra_host->streamid <<
+						SDHCI_TEGRA_WRITE_STREAMID_SHIFT)
+						& SDHCI_TEGRA_STREAMID_MASK),
+						SDHCI_TEGRA_CIF2AXI_CTRL_0);

This is hard to read. Maybe use GENMASK and FIELD_PREP, or if the bytes need swapping, one of the byte swapping macros.

Also, isn't this always zero ?

	((tegra_host->streamid << SDHCI_TEGRA_WRITE_STREAMID_SHIFT) & SDHCI_TEGRA_STREAMID_MASK),
Quoted 19 lines
drivers/mmc/host/sdhci-tegra.c +8 -0
+		}
+	}
+#endif
+
 	return 0;
 
 err_add_host:
@@ -1861,6 +1895,10 @@ static int sdhci_tegra_suspend(struct device *dev)
 static int sdhci_tegra_resume(struct device *dev)
 {
 	struct sdhci_host *host = dev_get_drvdata(dev);
+#ifdef CONFIG_IOMMU_API
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+	struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
+#endif
 	int ret;
 
 	ret = mmc_gpio_set_cd_wake(host->mmc, false);

drivers/mmc/host/sdhci-tegra.c static int sdhci_tegra_resume(struct device *dev) · line 1916

Quoted 8 lines
drivers/mmc/host/sdhci-tegra.c +5 -0
@@ -1871,6 +1909,15 @@ static int sdhci_tegra_resume(struct device *dev)
 	if (ret)
 		return ret;
 
+	/* Re-program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+	if (tegra_host->soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+		tegra_sdhci_writel(host, tegra_host->streamid |
+					(tegra_host->streamid << 8),

This looks like it ought to be the same calculation as above ?

Quoted 7 lines
drivers/mmc/host/sdhci-tegra.c +4 -0
+					SDHCI_TEGRA_CIF2AXI_CTRL_0);
+	}
+#endif
+
 	ret = sdhci_resume_host(host);
 	if (ret)
 		goto disable_clk;
#11 lore raw

PATCH v6 1/4 mmc: sdhci-tegra: Separate Tegra194 and Tegra234 SoC data

Create new SoC data structure for Tegra234 platforms. Additional features, tap value configurations are added/ updated for Tegra234 platform hence separate Tegra194 and Tegra234 SoC data.

---
 drivers/mmc/host/sdhci-tegra.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
drivers/mmc/host/sdhci-tegra.c +14 -0
index 2d2d8260c681..a6c5bbae77b4 100644
@@ -1556,7 +1556,21 @@ static const struct sdhci_tegra_soc_data soc_data_tegra194 = {
 	.max_tap_delay = 139,
 };
 
+static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
+	.pdata = &sdhci_tegra186_pdata,
+	.dma_mask = DMA_BIT_MASK(39),
+	.nvquirks = NVQUIRK_NEEDS_PAD_CONTROL |
+		    NVQUIRK_HAS_PADCALIB |
+		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
+		    NVQUIRK_ENABLE_SDR50 |
+		    NVQUIRK_ENABLE_SDR104 |
+		    NVQUIRK_HAS_TMCLK,
+	.min_tap_delay = 95,
+	.max_tap_delay = 111,
+};
+
 static const struct of_device_id sdhci_tegra_dt_match[] = {
+	{ .compatible = "nvidia,tegra234-sdhci", .data = &soc_data_tegra234 },
 	{ .compatible = "nvidia,tegra194-sdhci", .data = &soc_data_tegra194 },
 	{ .compatible = "nvidia,tegra186-sdhci", .data = &soc_data_tegra186 },
 	{ .compatible = "nvidia,tegra210-sdhci", .data = &soc_data_tegra210 },
Signature · 1 line
2.17.1
#12 lore raw

PATCH v6 2/4 mmc: sdhci-tegra: Add support to program MC stream ID

SMMU clients are supposed to program stream ID from their respective address spaces instead of MC override. Define NVQUIRK_PROGRAM_STREAMID and use it to program SMMU stream ID from the SDMMC client address space.

---
 drivers/mmc/host/sdhci-tegra.c | 44 ++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
drivers/mmc/host/sdhci-tegra.c +44 -0
index a6c5bbae77b4..60ce3e80f248 100644
@@ -25,6 +25,10 @@
 #include <linux/mmc/slot-gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/ktime.h>
+#ifdef CONFIG_IOMMU_API
+#include <linux/iommu.h>
+#include <linux/bitops.h>
+#endif
 
 #include <soc/tegra/common.h>
 
@@ -94,6 +98,8 @@
 #define SDHCI_TEGRA_AUTO_CAL_STATUS			0x1ec
 #define SDHCI_TEGRA_AUTO_CAL_ACTIVE			BIT(31)
 
+#define SDHCI_TEGRA_CIF2AXI_CTRL_0			0x1fc
+
 #define NVQUIRK_FORCE_SDHCI_SPEC_200			BIT(0)
 #define NVQUIRK_ENABLE_BLOCK_GAP_DET			BIT(1)
 #define NVQUIRK_ENABLE_SDHCI_SPEC_300			BIT(2)
@@ -121,6 +127,7 @@
 #define NVQUIRK_HAS_TMCLK				BIT(10)
 
 #define NVQUIRK_HAS_ANDROID_GPT_SECTOR			BIT(11)
+#define NVQUIRK_PROGRAM_STREAMID			BIT(12)
 
 /* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */
 #define SDHCI_TEGRA_CQE_BASE_ADDR			0xF000
@@ -177,6 +184,9 @@ struct sdhci_tegra {
 	bool enable_hwcq;
 	unsigned long curr_clk_rate;
 	u8 tuned_tap_delay;
+#ifdef CONFIG_IOMMU_API
+	u32 streamid;
+#endif
 };
 
 static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)
@@ -1564,6 +1574,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
 		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
 		    NVQUIRK_ENABLE_SDR50 |
 		    NVQUIRK_ENABLE_SDR104 |
+		    NVQUIRK_PROGRAM_STREAMID |
 		    NVQUIRK_HAS_TMCLK,
 	.min_tap_delay = 95,
 	.max_tap_delay = 111,
@@ -1775,6 +1786,25 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
 	if (rc)
 		goto err_add_host;
 
+	/* Program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+	if (soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+		struct iommu_fwspec *fwspec;
+
+		fwspec = dev_iommu_fwspec_get(&pdev->dev);
+		if (fwspec == NULL) {
+			dev_warn(mmc_dev(host->mmc),
+				"iommu fwspec is NULL, continue without stream ID\n");
+		} else {
+			tegra_host->streamid = fwspec->ids[0] & 0xff;
+			tegra_sdhci_writel(host, tegra_host->streamid |
+						FIELD_PREP(GENMASK(15, 8),
+						tegra_host->streamid),
+						SDHCI_TEGRA_CIF2AXI_CTRL_0);
+		}
+	}
+#endif
+
 	return 0;
 
 err_add_host:
@@ -1861,6 +1891,10 @@ static int sdhci_tegra_suspend(struct device *dev)
 static int sdhci_tegra_resume(struct device *dev)
 {
 	struct sdhci_host *host = dev_get_drvdata(dev);
+#ifdef CONFIG_IOMMU_API
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+	struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
+#endif
 	int ret;
 
 	ret = mmc_gpio_set_cd_wake(host->mmc, false);
@@ -1871,6 +1905,16 @@ static int sdhci_tegra_resume(struct device *dev)
 	if (ret)
 		return ret;
 
+	/* Re-program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+	if (tegra_host->soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+		tegra_sdhci_writel(host, tegra_host->streamid |
+					FIELD_PREP(GENMASK(15, 8),
+					tegra_host->streamid),
+					SDHCI_TEGRA_CIF2AXI_CTRL_0);
+	}
+#endif
+
 	ret = sdhci_resume_host(host);
 	if (ret)
 		goto disable_clk;
Signature · 1 line
2.17.1
maintainer Acked-by on v6 2/4
#13 lore raw

Re: [PATCH v6 2/4] mmc: sdhci-tegra: Add support to program MC stream ID

Quoted 7 lines · Prathamesh Shete

SMMU clients are supposed to program stream ID from their respective address spaces instead of MC override. Define NVQUIRK_PROGRAM_STREAMID and use it to program SMMU stream ID from the SDMMC client address space.

One observation below.

Nevertheless:

Quoted 57 lines
---
 drivers/mmc/host/sdhci-tegra.c | 44 ++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
drivers/mmc/host/sdhci-tegra.c +11 -0
index a6c5bbae77b4..60ce3e80f248 100644
@@ -25,6 +25,10 @@
 #include <linux/mmc/slot-gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/ktime.h>
+#ifdef CONFIG_IOMMU_API
+#include <linux/iommu.h>
+#include <linux/bitops.h>
+#endif
 
 #include <soc/tegra/common.h>
 
@@ -94,6 +98,8 @@
 #define SDHCI_TEGRA_AUTO_CAL_STATUS			0x1ec
 #define SDHCI_TEGRA_AUTO_CAL_ACTIVE			BIT(31)
 
+#define SDHCI_TEGRA_CIF2AXI_CTRL_0			0x1fc
+
 #define NVQUIRK_FORCE_SDHCI_SPEC_200			BIT(0)
 #define NVQUIRK_ENABLE_BLOCK_GAP_DET			BIT(1)
 #define NVQUIRK_ENABLE_SDHCI_SPEC_300			BIT(2)
@@ -121,6 +127,7 @@
 #define NVQUIRK_HAS_TMCLK				BIT(10)
 
 #define NVQUIRK_HAS_ANDROID_GPT_SECTOR			BIT(11)
+#define NVQUIRK_PROGRAM_STREAMID			BIT(12)
 
 /* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */
 #define SDHCI_TEGRA_CQE_BASE_ADDR			0xF000
@@ -177,6 +184,9 @@ struct sdhci_tegra {
 	bool enable_hwcq;
 	unsigned long curr_clk_rate;
 	u8 tuned_tap_delay;
+#ifdef CONFIG_IOMMU_API
+	u32 streamid;
+#endif
 };
 
 static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)
@@ -1564,6 +1574,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
 		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
 		    NVQUIRK_ENABLE_SDR50 |
 		    NVQUIRK_ENABLE_SDR104 |
+		    NVQUIRK_PROGRAM_STREAMID |
 		    NVQUIRK_HAS_TMCLK,
 	.min_tap_delay = 95,
 	.max_tap_delay = 111,
@@ -1775,6 +1786,25 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
 	if (rc)
 		goto err_add_host;

drivers/mmc/host/sdhci-tegra.c static int sdhci_tegra_probe(struct platform_device *pdev) · line 1797

Quoted 10 lines
drivers/mmc/host/sdhci-tegra.c +9 -0
 
+	/* Program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+	if (soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+		struct iommu_fwspec *fwspec;
+
+		fwspec = dev_iommu_fwspec_get(&pdev->dev);
+		if (fwspec == NULL) {
+			dev_warn(mmc_dev(host->mmc),
+				"iommu fwspec is NULL, continue without stream ID\n");

It will still program a zero streamid upon resume.

Quoted 41 lines
drivers/mmc/host/sdhci-tegra.c +24 -0
+		} else {
+			tegra_host->streamid = fwspec->ids[0] & 0xff;
+			tegra_sdhci_writel(host, tegra_host->streamid |
+						FIELD_PREP(GENMASK(15, 8),
+						tegra_host->streamid),
+						SDHCI_TEGRA_CIF2AXI_CTRL_0);
+		}
+	}
+#endif
+
 	return 0;
 
 err_add_host:
@@ -1861,6 +1891,10 @@ static int sdhci_tegra_suspend(struct device *dev)
 static int sdhci_tegra_resume(struct device *dev)
 {
 	struct sdhci_host *host = dev_get_drvdata(dev);
+#ifdef CONFIG_IOMMU_API
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+	struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
+#endif
 	int ret;
 
 	ret = mmc_gpio_set_cd_wake(host->mmc, false);
@@ -1871,6 +1905,16 @@ static int sdhci_tegra_resume(struct device *dev)
 	if (ret)
 		return ret;
 
+	/* Re-program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+	if (tegra_host->soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+		tegra_sdhci_writel(host, tegra_host->streamid |
+					FIELD_PREP(GENMASK(15, 8),
+					tegra_host->streamid),
+					SDHCI_TEGRA_CIF2AXI_CTRL_0);
+	}
+#endif
+
 	ret = sdhci_resume_host(host);
 	if (ret)
 		goto disable_clk;
#14 lore raw

Re: [PATCH v6 2/4] mmc: sdhci-tegra: Add support to program MC stream ID

Quoted 73 lines · Adrian Hunter
Quoted 7 lines · Prathamesh Shete

SMMU clients are supposed to program stream ID from their respective address spaces instead of MC override. Define NVQUIRK_PROGRAM_STREAMID and use it to program SMMU stream ID from the SDMMC client address space.

One observation below.

Nevertheless:

Quoted 58 lines
---
 drivers/mmc/host/sdhci-tegra.c | 44 ++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
drivers/mmc/host/sdhci-tegra.c +11 -0
index a6c5bbae77b4..60ce3e80f248 100644
@@ -25,6 +25,10 @@
 #include <linux/mmc/slot-gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/ktime.h>
+#ifdef CONFIG_IOMMU_API
+#include <linux/iommu.h>
+#include <linux/bitops.h>
+#endif
 
 #include <soc/tegra/common.h>
 
@@ -94,6 +98,8 @@
 #define SDHCI_TEGRA_AUTO_CAL_STATUS			0x1ec
 #define SDHCI_TEGRA_AUTO_CAL_ACTIVE			BIT(31)
 
+#define SDHCI_TEGRA_CIF2AXI_CTRL_0			0x1fc
+
 #define NVQUIRK_FORCE_SDHCI_SPEC_200			BIT(0)
 #define NVQUIRK_ENABLE_BLOCK_GAP_DET			BIT(1)
 #define NVQUIRK_ENABLE_SDHCI_SPEC_300			BIT(2)
@@ -121,6 +127,7 @@
 #define NVQUIRK_HAS_TMCLK				BIT(10)
 
 #define NVQUIRK_HAS_ANDROID_GPT_SECTOR			BIT(11)
+#define NVQUIRK_PROGRAM_STREAMID			BIT(12)
 
 /* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */
 #define SDHCI_TEGRA_CQE_BASE_ADDR			0xF000
@@ -177,6 +184,9 @@ struct sdhci_tegra {
 	bool enable_hwcq;
 	unsigned long curr_clk_rate;
 	u8 tuned_tap_delay;
+#ifdef CONFIG_IOMMU_API
+	u32 streamid;
+#endif
 };
 
 static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)
@@ -1564,6 +1574,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
 		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
 		    NVQUIRK_ENABLE_SDR50 |
 		    NVQUIRK_ENABLE_SDR104 |
+		    NVQUIRK_PROGRAM_STREAMID |
 		    NVQUIRK_HAS_TMCLK,
 	.min_tap_delay = 95,
 	.max_tap_delay = 111,
@@ -1775,6 +1786,25 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
 	if (rc)
 		goto err_add_host;
 
Quoted 11 lines

drivers/mmc/host/sdhci-tegra.c static int sdhci_tegra_probe(struct platform_device *pdev) · line 1797

Quoted 9 lines
drivers/mmc/host/sdhci-tegra.c +9 -0
+	/* Program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+	if (soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+		struct iommu_fwspec *fwspec;
+
+		fwspec = dev_iommu_fwspec_get(&pdev->dev);
+		if (fwspec == NULL) {
+			dev_warn(mmc_dev(host->mmc),
+				"iommu fwspec is NULL, continue without stream ID\n");

It will still program a zero streamid upon resume.

This was confusing to me, but I think what you mean is that the check for fwspec == NULL should also be done in sdhci_tegra_resume().

Quoted 29 lines
Quoted 29 lines
drivers/mmc/host/sdhci-tegra.c +14 -0
+		} else {
+			tegra_host->streamid = fwspec->ids[0] & 0xff;
+			tegra_sdhci_writel(host, tegra_host->streamid |
+						FIELD_PREP(GENMASK(15, 8),
+						tegra_host->streamid),
+						SDHCI_TEGRA_CIF2AXI_CTRL_0);
+		}
+	}
+#endif
+
 	return 0;
 
 err_add_host:
@@ -1861,6 +1891,10 @@ static int sdhci_tegra_suspend(struct device *dev)
 static int sdhci_tegra_resume(struct device *dev)
 {
 	struct sdhci_host *host = dev_get_drvdata(dev);
+#ifdef CONFIG_IOMMU_API
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+	struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
+#endif
 	int ret;
 
 	ret = mmc_gpio_set_cd_wake(host->mmc, false);
@@ -1871,6 +1905,16 @@ static int sdhci_tegra_resume(struct device *dev)
 	if (ret)
 		return ret;
 
Quoted 9 lines

drivers/mmc/host/sdhci-tegra.c static int sdhci_tegra_resume(struct device *dev) · line 1916

Quoted 9 lines
drivers/mmc/host/sdhci-tegra.c +9 -0
+	/* Re-program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+	if (tegra_host->soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+		tegra_sdhci_writel(host, tegra_host->streamid |
+					FIELD_PREP(GENMASK(15, 8),
+					tegra_host->streamid),
+					SDHCI_TEGRA_CIF2AXI_CTRL_0);
+	}
+#endif

So this here should be exactly the same as in sdhci_tegra_probe(). Which would be an argument for putting this into a separate function.

That said, I'm not sure if this matters at all. If fwspec == NULL, that implies that device tree didn't have an "iommus" property, which also implies that SMMU translations for this device will not be enabled at all, if I recall correctly, so whether this CIF2AXI_CTRL register is programmed or not in that case should be irrelevant.

Still, might be good to keep this the same in both sdhci_tegra_probe() and sdhci_tegra_resume() for consistency.

With that fixed, the series:

#15 lore raw

PATCH v7 1/4 mmc: sdhci-tegra: Separate Tegra194 and Tegra234 SoC data

Create new SoC data structure for Tegra234 platforms. Additional features, tap value configurations are added/ updated for Tegra234 platform hence separate Tegra194 and Tegra234 SoC data.

---
 drivers/mmc/host/sdhci-tegra.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
drivers/mmc/host/sdhci-tegra.c +14 -0
index 2d2d8260c681..a6c5bbae77b4 100644
@@ -1556,7 +1556,21 @@ static const struct sdhci_tegra_soc_data soc_data_tegra194 = {
 	.max_tap_delay = 139,
 };
 
+static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
+	.pdata = &sdhci_tegra186_pdata,
+	.dma_mask = DMA_BIT_MASK(39),
+	.nvquirks = NVQUIRK_NEEDS_PAD_CONTROL |
+		    NVQUIRK_HAS_PADCALIB |
+		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
+		    NVQUIRK_ENABLE_SDR50 |
+		    NVQUIRK_ENABLE_SDR104 |
+		    NVQUIRK_HAS_TMCLK,
+	.min_tap_delay = 95,
+	.max_tap_delay = 111,
+};
+
 static const struct of_device_id sdhci_tegra_dt_match[] = {
+	{ .compatible = "nvidia,tegra234-sdhci", .data = &soc_data_tegra234 },
 	{ .compatible = "nvidia,tegra194-sdhci", .data = &soc_data_tegra194 },
 	{ .compatible = "nvidia,tegra186-sdhci", .data = &soc_data_tegra186 },
 	{ .compatible = "nvidia,tegra210-sdhci", .data = &soc_data_tegra210 },
Signature · 1 line
2.17.1
#16 lore raw

PATCH v7 2/4 mmc: sdhci-tegra: Add support to program MC stream ID

SMMU clients are supposed to program stream ID from their respective address spaces instead of MC override. Define NVQUIRK_PROGRAM_STREAMID and use it to program SMMU stream ID from the SDMMC client address space.

---
 drivers/mmc/host/sdhci-tegra.c | 53 ++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
drivers/mmc/host/sdhci-tegra.c +53 -0
index a6c5bbae77b4..e88294a6912d 100644
@@ -25,6 +25,10 @@
 #include <linux/mmc/slot-gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/ktime.h>
+#ifdef CONFIG_IOMMU_API
+#include <linux/iommu.h>
+#include <linux/bitops.h>
+#endif
 
 #include <soc/tegra/common.h>
 
@@ -94,6 +98,8 @@
 #define SDHCI_TEGRA_AUTO_CAL_STATUS			0x1ec
 #define SDHCI_TEGRA_AUTO_CAL_ACTIVE			BIT(31)
 
+#define SDHCI_TEGRA_CIF2AXI_CTRL_0			0x1fc
+
 #define NVQUIRK_FORCE_SDHCI_SPEC_200			BIT(0)
 #define NVQUIRK_ENABLE_BLOCK_GAP_DET			BIT(1)
 #define NVQUIRK_ENABLE_SDHCI_SPEC_300			BIT(2)
@@ -121,6 +127,7 @@
 #define NVQUIRK_HAS_TMCLK				BIT(10)
 
 #define NVQUIRK_HAS_ANDROID_GPT_SECTOR			BIT(11)
+#define NVQUIRK_PROGRAM_STREAMID			BIT(12)
 
 /* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */
 #define SDHCI_TEGRA_CQE_BASE_ADDR			0xF000
@@ -177,6 +184,9 @@ struct sdhci_tegra {
 	bool enable_hwcq;
 	unsigned long curr_clk_rate;
 	u8 tuned_tap_delay;
+#ifdef CONFIG_IOMMU_API
+	u32 streamid;
+#endif
 };
 
 static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)
@@ -1564,6 +1574,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
 		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
 		    NVQUIRK_ENABLE_SDR50 |
 		    NVQUIRK_ENABLE_SDR104 |
+		    NVQUIRK_PROGRAM_STREAMID |
 		    NVQUIRK_HAS_TMCLK,
 	.min_tap_delay = 95,
 	.max_tap_delay = 111,
@@ -1775,6 +1786,25 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
 	if (rc)
 		goto err_add_host;
 
+	/* Program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+	if (soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+		struct iommu_fwspec *fwspec;
+
+		fwspec = dev_iommu_fwspec_get(&pdev->dev);
+		if (fwspec == NULL) {
+			dev_warn(mmc_dev(host->mmc),
+				"iommu fwspec is NULL, continue without stream ID\n");
+		} else {
+			tegra_host->streamid = fwspec->ids[0] & 0xff;
+			tegra_sdhci_writel(host, tegra_host->streamid |
+						FIELD_PREP(GENMASK(15, 8),
+						tegra_host->streamid),
+						SDHCI_TEGRA_CIF2AXI_CTRL_0);
+		}
+	}
+#endif
+
 	return 0;
 
 err_add_host:
@@ -1861,6 +1891,10 @@ static int sdhci_tegra_suspend(struct device *dev)
 static int sdhci_tegra_resume(struct device *dev)
 {
 	struct sdhci_host *host = dev_get_drvdata(dev);
+#ifdef CONFIG_IOMMU_API
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+	struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
+#endif
 	int ret;
 
 	ret = mmc_gpio_set_cd_wake(host->mmc, false);
@@ -1871,6 +1905,25 @@ static int sdhci_tegra_resume(struct device *dev)
 	if (ret)
 		return ret;
 
+	/* Re-program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+	if (tegra_host->soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+		struct iommu_fwspec *fwspec;
+
+		fwspec = dev_iommu_fwspec_get(dev);
+		if (fwspec == NULL) {
+			dev_warn(mmc_dev(host->mmc),
+				"iommu fwspec is NULL, continue without stream ID\n");
+		} else {
+			tegra_host->streamid = fwspec->ids[0] & 0xff;
+			tegra_sdhci_writel(host, tegra_host->streamid |
+						FIELD_PREP(GENMASK(15, 8),
+						tegra_host->streamid),
+						SDHCI_TEGRA_CIF2AXI_CTRL_0);
+		}
+	}
+#endif
+
 	ret = sdhci_resume_host(host);
 	if (ret)
 		goto disable_clk;
Signature · 1 line
2.17.1
#17 lore raw

Re: [PATCH v7 2/4] mmc: sdhci-tegra: Add support to program MC stream ID

Quoted 47 lines · Prathamesh Shete

SMMU clients are supposed to program stream ID from their respective address spaces instead of MC override. Define NVQUIRK_PROGRAM_STREAMID and use it to program SMMU stream ID from the SDMMC client address space.

---
 drivers/mmc/host/sdhci-tegra.c | 53 ++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
drivers/mmc/host/sdhci-tegra.c +7 -0
index a6c5bbae77b4..e88294a6912d 100644
@@ -25,6 +25,10 @@
 #include <linux/mmc/slot-gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/ktime.h>
+#ifdef CONFIG_IOMMU_API
+#include <linux/iommu.h>
+#include <linux/bitops.h>
+#endif
 
 #include <soc/tegra/common.h>
 
@@ -94,6 +98,8 @@
 #define SDHCI_TEGRA_AUTO_CAL_STATUS                    0x1ec
 #define SDHCI_TEGRA_AUTO_CAL_ACTIVE                    BIT(31)
 
+#define SDHCI_TEGRA_CIF2AXI_CTRL_0                     0x1fc
+
 #define NVQUIRK_FORCE_SDHCI_SPEC_200                   BIT(0)
 #define NVQUIRK_ENABLE_BLOCK_GAP_DET                   BIT(1)
 #define NVQUIRK_ENABLE_SDHCI_SPEC_300                  BIT(2)
@@ -121,6 +127,7 @@
 #define NVQUIRK_HAS_TMCLK                              BIT(10)
 
 #define NVQUIRK_HAS_ANDROID_GPT_SECTOR                 BIT(11)
+#define NVQUIRK_PROGRAM_STREAMID                       BIT(12)
 
 /* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */
 #define SDHCI_TEGRA_CQE_BASE_ADDR                      0xF000

drivers/mmc/host/sdhci-tegra.c struct sdhci_tegra { · line 187

Quoted 4 lines
drivers/mmc/host/sdhci-tegra.c +1 -0
@@ -177,6 +184,9 @@ struct sdhci_tegra {
        bool enable_hwcq;
        unsigned long curr_clk_rate;
        u8 tuned_tap_delay;
+#ifdef CONFIG_IOMMU_API

I would rather avoid these kinds of "#ifdef" micro optimizations. Please just add the streamid without the #ifdef.

Quoted 14 lines
drivers/mmc/host/sdhci-tegra.c +3 -0
+       u32 streamid;
+#endif
 };
 
 static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)
@@ -1564,6 +1574,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
                    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
                    NVQUIRK_ENABLE_SDR50 |
                    NVQUIRK_ENABLE_SDR104 |
+                   NVQUIRK_PROGRAM_STREAMID |
                    NVQUIRK_HAS_TMCLK,
        .min_tap_delay = 95,
        .max_tap_delay = 111,

drivers/mmc/host/sdhci-tegra.c static int sdhci_tegra_probe(struct platform_device *pdev) · line 1790

Quoted 5 lines
drivers/mmc/host/sdhci-tegra.c +2 -0
@@ -1775,6 +1786,25 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
        if (rc)
                goto err_add_host;
 
+       /* Program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API

Again, please drop the #ifdefs here.

We already have stub functions for dev_iommu_fwspec_get() in case CONFIG_IOMMU_API is unset.

Quoted 21 lines
drivers/mmc/host/sdhci-tegra.c +17 -0
+       if (soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+               struct iommu_fwspec *fwspec;
+
+               fwspec = dev_iommu_fwspec_get(&pdev->dev);
+               if (fwspec == NULL) {
+                       dev_warn(mmc_dev(host->mmc),
+                               "iommu fwspec is NULL, continue without stream ID\n");
+               } else {
+                       tegra_host->streamid = fwspec->ids[0] & 0xff;
+                       tegra_sdhci_writel(host, tegra_host->streamid |
+                                               FIELD_PREP(GENMASK(15, 8),
+                                               tegra_host->streamid),
+                                               SDHCI_TEGRA_CIF2AXI_CTRL_0);
+               }
+       }
+#endif
+
        return 0;
 
 err_add_host:

drivers/mmc/host/sdhci-tegra.c static int sdhci_tegra_suspend(struct device *dev) · line 1894

Quoted 4 lines
drivers/mmc/host/sdhci-tegra.c +1 -0
@@ -1861,6 +1891,10 @@ static int sdhci_tegra_suspend(struct device *dev)
 static int sdhci_tegra_resume(struct device *dev)
 {
        struct sdhci_host *host = dev_get_drvdata(dev);
+#ifdef CONFIG_IOMMU_API

Ditto.

drivers/mmc/host/sdhci-tegra.c static int sdhci_tegra_resume(struct device *dev) · line 1909

Quoted 12 lines
drivers/mmc/host/sdhci-tegra.c +5 -0
+       struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+       struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
+#endif
        int ret;
 
        ret = mmc_gpio_set_cd_wake(host->mmc, false);
@@ -1871,6 +1905,25 @@ static int sdhci_tegra_resume(struct device *dev)
        if (ret)
                return ret;
 
+       /* Re-program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API

Ditto.

Quoted 21 lines
drivers/mmc/host/sdhci-tegra.c +17 -1
+       if (tegra_host->soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+               struct iommu_fwspec *fwspec;
+
+               fwspec = dev_iommu_fwspec_get(dev);
+               if (fwspec == NULL) {
+                       dev_warn(mmc_dev(host->mmc),
+                               "iommu fwspec is NULL, continue without stream ID\n");
+               } else {
+                       tegra_host->streamid = fwspec->ids[0] & 0xff;
+                       tegra_sdhci_writel(host, tegra_host->streamid |
+                                               FIELD_PREP(GENMASK(15, 8),
+                                               tegra_host->streamid),
+                                               SDHCI_TEGRA_CIF2AXI_CTRL_0);
+               }
+       }
+#endif
+
        ret = sdhci_resume_host(host);
        if (ret)
                goto disable_clk;
--
Quoted 2 lines

2.17.1

Kind regards
Uffe

#18 lore raw

RE: [PATCH v7 2/4] mmc: sdhci-tegra: Add support to program MC stream ID

Hi Ulf

The initial patches were without the #ifdef. #ifdef is being added as per review comments and kernel robot errors. Following error was detected by kernel robot

Quoted 1 line
Quoted 1 line

All errors (new ones prefixed by >>):

drivers/mmc/host/sdhci-tegra.c: In function 'sdhci_tegra_probe':

Quoted 1 line
Quoted 1 line

drivers/mmc/host/sdhci-tegra.c:1794:54: error: 'struct iommu_fwspec' has no member named 'ids'

    1794 |                         tegra_host->streamid = fwspec->ids[0] & 0xffff;
         |                                                      ^~

vim +1794 drivers/mmc/host/sdhci-tegra.c

Quoted 1 line
Quoted 1 line

Adrian also pointed out this issue so to address these issues #ifdef was added

Thanks
Prathamesh

Quoted 170 lines

-----Original Message-----
From: Ulf Hansson <[email protected]>
Sent: Tuesday, October 11, 2022 3:29 PM
To: Prathamesh Shete <[email protected]>
Cc: [email protected]; [email protected]; Jonathan Hunter <[email protected]>; [email protected]; linux- [email protected]; [email protected]; linux- [email protected]; Aniruddha Tvs Rao <[email protected]>; Suresh Mangipudi <[email protected]>; Krishna Yarlagadda <[email protected]>
Subject: Re: [PATCH v7 2/4] mmc: sdhci-tegra: Add support to program MC stream ID

External email: Use caution opening links or attachments

Quoted 4 lines · Prathamesh Shete

SMMU clients are supposed to program stream ID from their respective address spaces instead of MC override.
Define NVQUIRK_PROGRAM_STREAMID and use it to program SMMU stream

ID

Quoted 45 lines

from the SDMMC client address space.

---
 drivers/mmc/host/sdhci-tegra.c | 53
++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
(quoted diff) +0 -0

b/drivers/mmc/host/sdhci-tegra.c index a6c5bbae77b4..e88294a6912d 100644

drivers/mmc/host/sdhci-tegra.c +7 -0
@@ -25,6 +25,10 @@
 #include <linux/mmc/slot-gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/ktime.h>
+#ifdef CONFIG_IOMMU_API
+#include <linux/iommu.h>
+#include <linux/bitops.h>
+#endif
 
 #include <soc/tegra/common.h>
 
@@ -94,6 +98,8 @@
 #define SDHCI_TEGRA_AUTO_CAL_STATUS                    0x1ec
 #define SDHCI_TEGRA_AUTO_CAL_ACTIVE                    BIT(31)
 
+#define SDHCI_TEGRA_CIF2AXI_CTRL_0                     0x1fc
+
 #define NVQUIRK_FORCE_SDHCI_SPEC_200                   BIT(0)
 #define NVQUIRK_ENABLE_BLOCK_GAP_DET                   BIT(1)
 #define NVQUIRK_ENABLE_SDHCI_SPEC_300                  BIT(2)
@@ -121,6 +127,7 @@
 #define NVQUIRK_HAS_TMCLK                              BIT(10)
 
 #define NVQUIRK_HAS_ANDROID_GPT_SECTOR                 BIT(11)
+#define NVQUIRK_PROGRAM_STREAMID                       BIT(12)
 
 /* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */
 #define SDHCI_TEGRA_CQE_BASE_ADDR                      0xF000

drivers/mmc/host/sdhci-tegra.c struct sdhci_tegra { · line 187

Quoted 4 lines
drivers/mmc/host/sdhci-tegra.c +1 -0
@@ -177,6 +184,9 @@ struct sdhci_tegra {
        bool enable_hwcq;
        unsigned long curr_clk_rate;
        u8 tuned_tap_delay;
+#ifdef CONFIG_IOMMU_API

I would rather avoid these kinds of "#ifdef" micro optimizations. Please just add the streamid without the #ifdef.

drivers/mmc/host/sdhci-tegra.c struct sdhci_tegra {

Quoted 6 lines
drivers/mmc/host/sdhci-tegra.c +2 -1
+       u32 streamid;
+#endif
 };
 
 static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg) @@
-1564,6 +1574,7 @@ static const struct sdhci_tegra_soc_data

soc_data_tegra234 = {

drivers/mmc/host/sdhci-tegra.c static int sdhci_tegra_probe(struct

Quoted 8 lines
                    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
                    NVQUIRK_ENABLE_SDR50 |
                    NVQUIRK_ENABLE_SDR104 |
drivers/mmc/host/sdhci-tegra.c +1 -0
+                   NVQUIRK_PROGRAM_STREAMID |
                    NVQUIRK_HAS_TMCLK,
        .min_tap_delay = 95,
        .max_tap_delay = 111,
@@ -1775,6 +1786,25 @@ static int sdhci_tegra_probe(struct

platform_device *pdev)

drivers/mmc/host/sdhci-tegra.c static int sdhci_tegra_probe(struct platform_device *pdev)

Quoted 5 lines
drivers/mmc/host/sdhci-tegra.c +2 -0
        if (rc)
                goto err_add_host;
 
+       /* Program MC streamID for DMA transfers */ #ifdef
+CONFIG_IOMMU_API

Again, please drop the #ifdefs here.

We already have stub functions for dev_iommu_fwspec_get() in case CONFIG_IOMMU_API is unset.

Quoted 21 lines
drivers/mmc/host/sdhci-tegra.c +17 -0
+       if (soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+               struct iommu_fwspec *fwspec;
+
+               fwspec = dev_iommu_fwspec_get(&pdev->dev);
+               if (fwspec == NULL) {
+                       dev_warn(mmc_dev(host->mmc),
+                               "iommu fwspec is NULL, continue without stream ID\n");
+               } else {
+                       tegra_host->streamid = fwspec->ids[0] & 0xff;
+                       tegra_sdhci_writel(host, tegra_host->streamid |
+                                               FIELD_PREP(GENMASK(15, 8),
+                                               tegra_host->streamid),
+                                               SDHCI_TEGRA_CIF2AXI_CTRL_0);
+               }
+       }
+#endif
+
        return 0;
 
 err_add_host:

drivers/mmc/host/sdhci-tegra.c static int sdhci_tegra_suspend(struct device · line 1893

Quoted 3 lines
drivers/mmc/host/sdhci-tegra.c +1 -0
@@ -1861,6 +1891,10 @@ static int sdhci_tegra_suspend(struct device
 *dev)  static int sdhci_tegra_resume(struct device *dev)  {
        struct sdhci_host *host = dev_get_drvdata(dev);
+#ifdef CONFIG_IOMMU_API

Ditto.

drivers/mmc/host/sdhci-tegra.c static int sdhci_tegra_resume(struct device *dev) · line 1909

Quoted 12 lines
drivers/mmc/host/sdhci-tegra.c +5 -0
+       struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+       struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
+#endif
        int ret;
 
        ret = mmc_gpio_set_cd_wake(host->mmc, false);
@@ -1871,6 +1905,25 @@ static int sdhci_tegra_resume(struct device *dev)
        if (ret)
                return ret;
 
+       /* Re-program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API

Ditto.

Quoted 21 lines
drivers/mmc/host/sdhci-tegra.c +17 -1
+       if (tegra_host->soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+               struct iommu_fwspec *fwspec;
+
+               fwspec = dev_iommu_fwspec_get(dev);
+               if (fwspec == NULL) {
+                       dev_warn(mmc_dev(host->mmc),
+                               "iommu fwspec is NULL, continue without stream ID\n");
+               } else {
+                       tegra_host->streamid = fwspec->ids[0] & 0xff;
+                       tegra_sdhci_writel(host, tegra_host->streamid |
+                                               FIELD_PREP(GENMASK(15, 8),
+                                               tegra_host->streamid),
+                                               SDHCI_TEGRA_CIF2AXI_CTRL_0);
+               }
+       }
+#endif
+
        ret = sdhci_resume_host(host);
        if (ret)
                goto disable_clk;
--
Quoted 2 lines

2.17.1

Kind regards
Uffe

#19 lore raw

Re: [PATCH v7 2/4] mmc: sdhci-tegra: Add support to program MC stream ID

Quoted 9 lines · Prathamesh Shete

Hi Ulf

The initial patches were without the #ifdef. #ifdef is being added as per review comments and kernel robot errors. Following error was detected by kernel robot

Quoted 1 line
Quoted 1 line

All errors (new ones prefixed by >>):

drivers/mmc/host/sdhci-tegra.c: In function 'sdhci_tegra_probe':

Quoted 8 lines
Quoted 1 line
Quoted 1 line

drivers/mmc/host/sdhci-tegra.c:1794:54: error: 'struct iommu_fwspec' has no member named 'ids'

    1794 |                         tegra_host->streamid = fwspec->ids[0] & 0xffff;
         |                                                      ^~

vim +1794 drivers/mmc/host/sdhci-tegra.c

Quoted 1 line
Quoted 1 line

Adrian also pointed out this issue so to address these issues #ifdef was added

I see!

In that case, perhaps we can add a "depends on IOMMU_API" in the Kconfig instead? Or is the tegra driver used on platforms where IOMMU_API could be unset?

[...]

Kind regards
Uffe

#20 lore raw

RE: [PATCH v7 2/4] mmc: sdhci-tegra: Add support to program MC stream ID

Hi Ulf,

Quoted 3 lines
Quoted 3 lines

In that case, perhaps we can add a "depends on IOMMU_API" in the Kconfig instead? Or is the tegra driver used on platforms where IOMMU_API could be unset?

Yes it can/will work with IOMMU disabled so its not recommended to add a "depends on" condition in Kconfig.

Thanks
Prathamesh

Quoted 48 lines

-----Original Message-----
From: Ulf Hansson <[email protected]>
Sent: Tuesday, October 11, 2022 6:04 PM
To: Prathamesh Shete <[email protected]>
Cc: [email protected]; [email protected]; Jonathan Hunter <[email protected]>; [email protected]; linux- [email protected]; [email protected]; linux- [email protected]; Aniruddha Tvs Rao <[email protected]>; Suresh Mangipudi <[email protected]>; Krishna Yarlagadda <[email protected]>
Subject: Re: [PATCH v7 2/4] mmc: sdhci-tegra: Add support to program MC stream ID

External email: Use caution opening links or attachments

Quoted 4 lines · Prathamesh Shete

Hi Ulf

The initial patches were without the #ifdef. #ifdef is being added as per review

comments and kernel robot errors.

Quoted 6 lines

Following error was detected by kernel robot

Quoted 1 line
Quoted 1 line

All errors (new ones prefixed by >>):

drivers/mmc/host/sdhci-tegra.c: In function 'sdhci_tegra_probe':

Quoted 1 line
Quoted 1 line

drivers/mmc/host/sdhci-tegra.c:1794:54: error: 'struct iommu_fwspec' has

no member named 'ids'

Quoted 8 lines
    1794 |                         tegra_host->streamid = fwspec->ids[0] & 0xffff;
         |                                                      ^~

vim +1794 drivers/mmc/host/sdhci-tegra.c

Quoted 1 line
Quoted 1 line

Adrian also pointed out this issue so to address these issues #ifdef was added

I see!

In that case, perhaps we can add a "depends on IOMMU_API" in the Kconfig instead? Or is the tegra driver used on platforms where IOMMU_API could be unset?

[...]

Kind regards
Uffe

#21 lore raw

Re: [PATCH v7 2/4] mmc: sdhci-tegra: Add support to program MC stream ID

Quoted 7 lines · Prathamesh Shete

Hi Ulf,

Quoted 3 lines
Quoted 3 lines

In that case, perhaps we can add a "depends on IOMMU_API" in the Kconfig instead? Or is the tegra driver used on platforms where IOMMU_API could be unset?

Yes it can/will work with IOMMU disabled so its not recommended to add a "depends on" condition in Kconfig.

Alright, in that case it looks to me that there are two other options to move forward.

1) Add proper definitions of the struct iommu_fwspec in include/linux/iommu.h even when CONFIG_IOMMU_API is unset. In a way it seems a bit silly to me, to have the iommu stubs around, unless those can be used for cases like this, right!?

2) Move the code within the "ifdef CONFIG_IOMMU_API" sections into separate functions - and add stubs for these functions too. In this way the functions can be called, independently of whether CONFIG_IOMMU_API is set/unse, which would make the code in drivers/mmc/host/sdhci-tegra.c cleaner and thus easier to maintain.

Quoted 49 lines

Thanks
Prathamesh

Quoted 45 lines

-----Original Message-----
From: Ulf Hansson <[email protected]>
Sent: Tuesday, October 11, 2022 6:04 PM
To: Prathamesh Shete <[email protected]>
Cc: [email protected]; [email protected]; Jonathan Hunter <[email protected]>; [email protected]; linux- [email protected]; [email protected]; linux- [email protected]; Aniruddha Tvs Rao <[email protected]>; Suresh Mangipudi <[email protected]>; Krishna Yarlagadda <[email protected]>
Subject: Re: [PATCH v7 2/4] mmc: sdhci-tegra: Add support to program MC stream ID

External email: Use caution opening links or attachments

Quoted 4 lines · Prathamesh Shete

Hi Ulf

The initial patches were without the #ifdef. #ifdef is being added as per review

comments and kernel robot errors.

Quoted 6 lines

Following error was detected by kernel robot

Quoted 1 line
Quoted 1 line

All errors (new ones prefixed by >>):

drivers/mmc/host/sdhci-tegra.c: In function 'sdhci_tegra_probe':

Quoted 1 line
Quoted 1 line

drivers/mmc/host/sdhci-tegra.c:1794:54: error: 'struct iommu_fwspec' has

no member named 'ids'

Quoted 8 lines
    1794 |                         tegra_host->streamid = fwspec->ids[0] & 0xffff;
         |                                                      ^~

vim +1794 drivers/mmc/host/sdhci-tegra.c

Quoted 1 line
Quoted 1 line

Adrian also pointed out this issue so to address these issues #ifdef was added

I see!

In that case, perhaps we can add a "depends on IOMMU_API" in the Kconfig instead? Or is the tegra driver used on platforms where IOMMU_API could be unset?

[...]

Kind regards
Uffe

#22 lore raw

PATCH v8 1/3 mmc: sdhci-tegra: Separate Tegra194 and Tegra234 SoC data

Create new SoC data structure for Tegra234 platforms. Additional features, tap value configurations are added/ updated for Tegra234 platform hence separate Tegra194 and Tegra234 SoC data.

---
 drivers/mmc/host/sdhci-tegra.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
drivers/mmc/host/sdhci-tegra.c +14 -0
index 2d2d8260c681..a6c5bbae77b4 100644
@@ -1556,7 +1556,21 @@ static const struct sdhci_tegra_soc_data soc_data_tegra194 = {
 	.max_tap_delay = 139,
 };
 
+static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
+	.pdata = &sdhci_tegra186_pdata,
+	.dma_mask = DMA_BIT_MASK(39),
+	.nvquirks = NVQUIRK_NEEDS_PAD_CONTROL |
+		    NVQUIRK_HAS_PADCALIB |
+		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
+		    NVQUIRK_ENABLE_SDR50 |
+		    NVQUIRK_ENABLE_SDR104 |
+		    NVQUIRK_HAS_TMCLK,
+	.min_tap_delay = 95,
+	.max_tap_delay = 111,
+};
+
 static const struct of_device_id sdhci_tegra_dt_match[] = {
+	{ .compatible = "nvidia,tegra234-sdhci", .data = &soc_data_tegra234 },
 	{ .compatible = "nvidia,tegra194-sdhci", .data = &soc_data_tegra194 },
 	{ .compatible = "nvidia,tegra186-sdhci", .data = &soc_data_tegra186 },
 	{ .compatible = "nvidia,tegra210-sdhci", .data = &soc_data_tegra210 },
Signature · 1 line
2.17.1
#23 lore raw

PATCH v8 2/3 mmc: sdhci-tegra: Add support to program MC stream ID

SMMU clients are supposed to program stream ID from their respective address spaces instead of MC override. Define NVQUIRK_PROGRAM_STREAMID and use it to program SMMU stream ID from the SDMMC client address space.

---
 drivers/mmc/host/sdhci-tegra.c | 42 ++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
drivers/mmc/host/sdhci-tegra.c +42 -0
index a6c5bbae77b4..0cd7c3f7e6f4 100644
@@ -25,6 +25,10 @@
 #include <linux/mmc/slot-gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/ktime.h>
+#ifdef CONFIG_IOMMU_API
+#include <linux/iommu.h>
+#include <linux/bitops.h>
+#endif
 
 #include <soc/tegra/common.h>
 
@@ -94,6 +98,8 @@
 #define SDHCI_TEGRA_AUTO_CAL_STATUS			0x1ec
 #define SDHCI_TEGRA_AUTO_CAL_ACTIVE			BIT(31)
 
+#define SDHCI_TEGRA_CIF2AXI_CTRL_0			0x1fc
+
 #define NVQUIRK_FORCE_SDHCI_SPEC_200			BIT(0)
 #define NVQUIRK_ENABLE_BLOCK_GAP_DET			BIT(1)
 #define NVQUIRK_ENABLE_SDHCI_SPEC_300			BIT(2)
@@ -121,6 +127,7 @@
 #define NVQUIRK_HAS_TMCLK				BIT(10)
 
 #define NVQUIRK_HAS_ANDROID_GPT_SECTOR			BIT(11)
+#define NVQUIRK_PROGRAM_STREAMID			BIT(12)
 
 /* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */
 #define SDHCI_TEGRA_CQE_BASE_ADDR			0xF000
@@ -177,6 +184,9 @@ struct sdhci_tegra {
 	bool enable_hwcq;
 	unsigned long curr_clk_rate;
 	u8 tuned_tap_delay;
+#ifdef CONFIG_IOMMU_API
+	u32 streamid;
+#endif
 };
 
 static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)
@@ -1564,6 +1574,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
 		    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
 		    NVQUIRK_ENABLE_SDR50 |
 		    NVQUIRK_ENABLE_SDR104 |
+		    NVQUIRK_PROGRAM_STREAMID |
 		    NVQUIRK_HAS_TMCLK,
 	.min_tap_delay = 95,
 	.max_tap_delay = 111,
@@ -1630,6 +1641,33 @@ static int sdhci_tegra_add_host(struct sdhci_host *host)
 	return ret;
 }
 
+/* Program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+static void program_stream_id(struct device *dev)
+{
+	struct sdhci_host *host = dev_get_drvdata(dev);
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+	struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
+	struct iommu_fwspec *fwspec;
+
+	if (tegra_host->soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+		fwspec = dev_iommu_fwspec_get(dev);
+		if (!fwspec) {
+			dev_warn(mmc_dev(host->mmc),
+				"iommu fwspec is NULL, continue without stream ID\n");
+		} else {
+			tegra_host->streamid = fwspec->ids[0] & 0xff;
+			tegra_sdhci_writel(host, tegra_host->streamid |
+						FIELD_PREP(GENMASK(15, 8),
+						tegra_host->streamid),
+						SDHCI_TEGRA_CIF2AXI_CTRL_0);
+		}
+	}
+}
+#else
+static void program_stream_id(struct device *dev) { }
+#endif
+
 static int sdhci_tegra_probe(struct platform_device *pdev)
 {
 	const struct sdhci_tegra_soc_data *soc_data;
@@ -1775,6 +1813,8 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
 	if (rc)
 		goto err_add_host;
 
+	program_stream_id(&pdev->dev);
+
 	return 0;
 
 err_add_host:
@@ -1871,6 +1911,8 @@ static int sdhci_tegra_resume(struct device *dev)
 	if (ret)
 		return ret;
 
+	program_stream_id(dev);
+
 	ret = sdhci_resume_host(host);
 	if (ret)
 		goto disable_clk;
Signature · 1 line
2.17.1
#24 lore raw

Re: [PATCH v8 2/3] mmc: sdhci-tegra: Add support to program MC stream ID

Quoted 19 lines · Prathamesh Shete

SMMU clients are supposed to program stream ID from their respective address spaces instead of MC override. Define NVQUIRK_PROGRAM_STREAMID and use it to program SMMU stream ID from the SDMMC client address space.

---
 drivers/mmc/host/sdhci-tegra.c | 42 ++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
drivers/mmc/host/sdhci-tegra.c +0 -0
index a6c5bbae77b4..0cd7c3f7e6f4 100644

drivers/mmc/host/sdhci-tegra.c line 28

Quoted 4 lines
drivers/mmc/host/sdhci-tegra.c +1 -0
@@ -25,6 +25,10 @@
 #include <linux/mmc/slot-gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/ktime.h>
+#ifdef CONFIG_IOMMU_API

This ifdef can be removed, the compiler should sort this out for us.

Quoted 94 lines
drivers/mmc/host/sdhci-tegra.c +41 -1
+#include <linux/iommu.h>
+#include <linux/bitops.h>
+#endif
 
 #include <soc/tegra/common.h>
 
@@ -94,6 +98,8 @@
 #define SDHCI_TEGRA_AUTO_CAL_STATUS                    0x1ec
 #define SDHCI_TEGRA_AUTO_CAL_ACTIVE                    BIT(31)
 
+#define SDHCI_TEGRA_CIF2AXI_CTRL_0                     0x1fc
+
 #define NVQUIRK_FORCE_SDHCI_SPEC_200                   BIT(0)
 #define NVQUIRK_ENABLE_BLOCK_GAP_DET                   BIT(1)
 #define NVQUIRK_ENABLE_SDHCI_SPEC_300                  BIT(2)
@@ -121,6 +127,7 @@
 #define NVQUIRK_HAS_TMCLK                              BIT(10)
 
 #define NVQUIRK_HAS_ANDROID_GPT_SECTOR                 BIT(11)
+#define NVQUIRK_PROGRAM_STREAMID                       BIT(12)
 
 /* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */
 #define SDHCI_TEGRA_CQE_BASE_ADDR                      0xF000
@@ -177,6 +184,9 @@ struct sdhci_tegra {
        bool enable_hwcq;
        unsigned long curr_clk_rate;
        u8 tuned_tap_delay;
+#ifdef CONFIG_IOMMU_API
+       u32 streamid;
+#endif
 };
 
 static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)
@@ -1564,6 +1574,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra234 = {
                    NVQUIRK_DIS_CARD_CLK_CONFIG_TAP |
                    NVQUIRK_ENABLE_SDR50 |
                    NVQUIRK_ENABLE_SDR104 |
+                   NVQUIRK_PROGRAM_STREAMID |
                    NVQUIRK_HAS_TMCLK,
        .min_tap_delay = 95,
        .max_tap_delay = 111,
@@ -1630,6 +1641,33 @@ static int sdhci_tegra_add_host(struct sdhci_host *host)
        return ret;
 }
 
+/* Program MC streamID for DMA transfers */
+#ifdef CONFIG_IOMMU_API
+static void program_stream_id(struct device *dev)
+{
+       struct sdhci_host *host = dev_get_drvdata(dev);
+       struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+       struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
+       struct iommu_fwspec *fwspec;
+
+       if (tegra_host->soc_data->nvquirks & NVQUIRK_PROGRAM_STREAMID) {
+               fwspec = dev_iommu_fwspec_get(dev);
+               if (!fwspec) {
+                       dev_warn(mmc_dev(host->mmc),
+                               "iommu fwspec is NULL, continue without stream ID\n");
+               } else {
+                       tegra_host->streamid = fwspec->ids[0] & 0xff;
+                       tegra_sdhci_writel(host, tegra_host->streamid |
+                                               FIELD_PREP(GENMASK(15, 8),
+                                               tegra_host->streamid),
+                                               SDHCI_TEGRA_CIF2AXI_CTRL_0);
+               }
+       }
+}
+#else
+static void program_stream_id(struct device *dev) { }
+#endif
+
 static int sdhci_tegra_probe(struct platform_device *pdev)
 {
        const struct sdhci_tegra_soc_data *soc_data;
@@ -1775,6 +1813,8 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
        if (rc)
                goto err_add_host;
 
+       program_stream_id(&pdev->dev);
+
        return 0;
 
 err_add_host:
@@ -1871,6 +1911,8 @@ static int sdhci_tegra_resume(struct device *dev)
        if (ret)
                return ret;
 
+       program_stream_id(dev);
+
        ret = sdhci_resume_host(host);
        if (ret)
                goto disable_clk;
--
Quoted 2 lines

2.17.1

Other than the minor nitpick, this looks good to me!

Kind regards
Uffe

#25 lore raw

PATCH v8 3/3 mmc: sdhci-tegra: Issue CMD and DAT resets together

In reply to Prathamesh Shete

In case of error condition to avoid system crash Tegra SDMMC controller requires CMD and DAT resets issued together. SDHCI controller FSM goes into bad state due to rapid SD card hot-plug event. Issuing reset on the CMD FSM before DATA FSM results in kernel panic, hence add support to issue CMD and DAT resets together.
This is applicable to Tegra186 and later chips.

---
 drivers/mmc/host/sdhci-tegra.c | 3 ++-
 drivers/mmc/host/sdhci.c       | 5 +++++
 drivers/mmc/host/sdhci.h       | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-tegra.c +2 -1
index 0cd7c3f7e6f4..9fbea5bbfa4a 100644
@@ -1535,7 +1535,8 @@ static const struct sdhci_pltfm_data sdhci_tegra186_pdata = {
 		  SDHCI_QUIRK_NO_HISPD_BIT |
 		  SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |
 		  SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
-	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+		   SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER,
 	.ops  = &tegra186_sdhci_ops,
 };
 
drivers/mmc/host/sdhci.c +5 -0
index 2b5dda521b0e..8512a69f1aae 100644
@@ -270,6 +270,11 @@ enum sdhci_reset_reason {
 
 static void sdhci_reset_for_reason(struct sdhci_host *host, enum sdhci_reset_reason reason)
 {
+	if (host->quirks2 &
+		SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER) {
+		sdhci_do_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
+		return;
+	}
 	switch (reason) {
 	case SDHCI_RESET_FOR_INIT:
 		sdhci_do_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
drivers/mmc/host/sdhci.h +2 -0
index d750c464bd1e..6a5766774b05 100644
@@ -478,6 +478,8 @@ struct sdhci_host {
  * block count.
  */
 #define SDHCI_QUIRK2_USE_32BIT_BLK_CNT			(1<<18)
+/* Issue CMD and DATA reset together */
+#define SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER	(1<<19)
 
 	int irq;		/* Device IRQ */
 	void __iomem *ioaddr;	/* Mapped address */
Signature · 1 line
2.17.1
#26 lore raw

RE: [PATCH v8 3/3] mmc: sdhci-tegra: Issue CMD and DAT resets together

Dropping 4th(following) patch in this series from previous versions as that fix is applied. [PATCH v7 4/4] mmc: sdhci-tegra: Use actual clock rate for SW tuning correction

Quoted 77 lines

-----Original Message-----
From: Prathamesh Shete <[email protected]>
Sent: Friday, October 14, 2022 12:55 PM
To: [email protected]; [email protected]; [email protected]; Jonathan Hunter <[email protected]>; [email protected]; [email protected]; linux- [email protected]; [email protected]
Cc: Aniruddha Tvs Rao <[email protected]>; Suresh Mangipudi <[email protected]>; Prathamesh Shete <[email protected]>; Krishna Yarlagadda <[email protected]>
Subject: [PATCH v8 3/3] mmc: sdhci-tegra: Issue CMD and DAT resets together

In case of error condition to avoid system crash Tegra SDMMC controller requires CMD and DAT resets issued together. SDHCI controller FSM goes into bad state due to rapid SD card hot-plug event.
Issuing reset on the CMD FSM before DATA FSM results in kernel panic, hence add support to issue CMD and DAT resets together.
This is applicable to Tegra186 and later chips.

---
 drivers/mmc/host/sdhci-tegra.c | 3 ++-
 drivers/mmc/host/sdhci.c       | 5 +++++
 drivers/mmc/host/sdhci.h       | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-tegra.c +2 -1
index 0cd7c3f7e6f4..9fbea5bbfa4a 100644
@@ -1535,7 +1535,8 @@ static const struct sdhci_pltfm_data
 sdhci_tegra186_pdata = {
 		  SDHCI_QUIRK_NO_HISPD_BIT |
 		  SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |
 		  SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
-	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+		   SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER,
 	.ops  = &tegra186_sdhci_ops,
 };
drivers/mmc/host/sdhci.c index renamed from drivers/mmc/host/sdhci.c +0 -0

2b5dda521b0e..8512a69f1aae 100644

drivers/mmc/host/sdhci.c +5 -0
@@ -270,6 +270,11 @@ enum sdhci_reset_reason {
 
 static void sdhci_reset_for_reason(struct sdhci_host *host, enum
 sdhci_reset_reason reason)  {
+	if (host->quirks2 &
+		SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER) {
+		sdhci_do_reset(host, SDHCI_RESET_CMD |
 SDHCI_RESET_DATA);
+		return;
+	}
 	switch (reason) {
 	case SDHCI_RESET_FOR_INIT:

sdhci_do_reset(host, SDHCI_RESET_CMD |
SDHCI_RESET_DATA); diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index d750c464bd1e..6a5766774b05 100644

drivers/mmc/host/sdhci.h +2 -1
@@ -478,6 +478,8 @@ struct sdhci_host {
  * block count.
  */
 #define SDHCI_QUIRK2_USE_32BIT_BLK_CNT			(1<<18)
+/* Issue CMD and DATA reset together */
+#define SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER	(1<<19)
 
 	int irq;		/* Device IRQ */
 	void __iomem *ioaddr;	/* Mapped address */
--

2.17.1

#27 lore raw

Re: [PATCH v7 2/4] mmc: sdhci-tegra: Add support to program MC stream ID

In reply to Ulf Hansson
Quoted 9 lines · Ulf Hansson
Quoted 7 lines · Prathamesh Shete

Hi Ulf,

Quoted 3 lines
Quoted 3 lines

In that case, perhaps we can add a "depends on IOMMU_API" in the Kconfig instead? Or is the tegra driver used on platforms where IOMMU_API could be unset?

Yes it can/will work with IOMMU disabled so its not recommended to add a "depends on" condition in Kconfig.

Quoted 7 lines

Alright, in that case it looks to me that there are two other options to move forward.

1) Add proper definitions of the struct iommu_fwspec in include/linux/iommu.h even when CONFIG_IOMMU_API is unset. In a way it seems a bit silly to me, to have the iommu stubs around, unless those can be used for cases like this, right!?

I recall that I had proposed a patch for this a long time ago:

	https://lore.kernel.org/all/[email protected]/

Given that Joerg had acked it at the time, I think the only reason why it never ended up getting merged is because the rest of the series did not get enough traction. I wonder if I should peel it out of the series and propose it separately.

I agree it doesn't make any sense to have the stubs to allow compilation and then break compilation because users of the stubs will end up wanting to dereference the structure.

Thierry

#28 lore raw

Re: [PATCH v7 2/4] mmc: sdhci-tegra: Add support to program MC stream ID

Quoted 14 lines · Thierry Reding
Quoted 12 lines · Ulf Hansson
Quoted 7 lines · Prathamesh Shete

Hi Ulf,

Quoted 3 lines
Quoted 3 lines

In that case, perhaps we can add a "depends on IOMMU_API" in the Kconfig instead? Or is the tegra driver used on platforms where IOMMU_API could be unset?

Yes it can/will work with IOMMU disabled so its not recommended to add a "depends on" condition in Kconfig.

Alright, in that case it looks to me that there are two other options to move forward.

Quoted 8 lines
Quoted 4 lines

1) Add proper definitions of the struct iommu_fwspec in include/linux/iommu.h even when CONFIG_IOMMU_API is unset. In a way it seems a bit silly to me, to have the iommu stubs around, unless those can be used for cases like this, right!?

I recall that I had proposed a patch for this a long time ago:

        https://lore.kernel.org/all/[email protected]/

That looks exactly what we would need!

Quoted 5 lines

Given that Joerg had acked it at the time, I think the only reason why it never ended up getting merged is because the rest of the series did not get enough traction. I wonder if I should peel it out of the series and propose it separately.

Yes, please.

Quoted 4 lines

I agree it doesn't make any sense to have the stubs to allow compilation and then break compilation because users of the stubs will end up wanting to dereference the structure.

Thanks for sharing your thoughts around this!

If you submit a new version of the old patch, I would certainly give it my blessing.

Kind regards
Uffe

#29 lore raw

PATCH v7 3/4 mmc: sdhci-tegra: Issue CMD and DAT resets together

In reply to Prathamesh Shete

In case of error condition to avoid system crash Tegra SDMMC controller requires CMD and DAT resets issued together. SDHCI controller FSM goes into bad state due to rapid SD card hot-plug event. Issuing reset on the CMD FSM before DATA FSM results in kernel panic, hence add support to issue CMD and DAT resets together.
This is applicable to Tegra186 and later chips.

---
 drivers/mmc/host/sdhci-tegra.c | 3 ++-
 drivers/mmc/host/sdhci.c       | 5 +++++
 drivers/mmc/host/sdhci.h       | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-tegra.c +2 -1
index e88294a6912d..3663c5d0efe0 100644
@@ -1535,7 +1535,8 @@ static const struct sdhci_pltfm_data sdhci_tegra186_pdata = {
 		  SDHCI_QUIRK_NO_HISPD_BIT |
 		  SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |
 		  SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
-	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+		   SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER,
 	.ops  = &tegra186_sdhci_ops,
 };
 
drivers/mmc/host/sdhci.c +5 -0
index 2b5dda521b0e..8512a69f1aae 100644
@@ -270,6 +270,11 @@ enum sdhci_reset_reason {
 
 static void sdhci_reset_for_reason(struct sdhci_host *host, enum sdhci_reset_reason reason)
 {
+	if (host->quirks2 &
+		SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER) {
+		sdhci_do_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
+		return;
+	}
 	switch (reason) {
 	case SDHCI_RESET_FOR_INIT:
 		sdhci_do_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
drivers/mmc/host/sdhci.h +2 -0
index d750c464bd1e..6a5766774b05 100644
@@ -478,6 +478,8 @@ struct sdhci_host {
  * block count.
  */
 #define SDHCI_QUIRK2_USE_32BIT_BLK_CNT			(1<<18)
+/* Issue CMD and DATA reset together */
+#define SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER	(1<<19)
 
 	int irq;		/* Device IRQ */
 	void __iomem *ioaddr;	/* Mapped address */
Signature · 1 line
2.17.1
#30 lore raw

PATCH v7 4/4 mmc: sdhci-tegra: Use actual clock rate for SW tuning correction

In reply to Prathamesh Shete

Ensure tegra_host member "curr_clk_rate" holds the actual clock rate instead of requested clock rate for proper use during tuning correction algorithm. Actual clk rate may not be the same as the requested clk frequency depending on the parent clock source set. Tuning correction algorithm depends on certain parameters which are sensitive to current clk rate. If the host clk is selected instead of the actual clock rate, tuning correction algorithm may end up applying invalid correction, which could result in errors

Fixes ea8fc5953e8b ("mmc: tegra: update hw tuning process")
---
 drivers/mmc/host/sdhci-tegra.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/sdhci-tegra.c +1 -1
index 3663c5d0efe0..ccbb26a66284 100644
@@ -783,7 +783,7 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
 		dev_err(dev, "failed to set clk rate to %luHz: %d\n",
 			host_clk, err);
 
-	tegra_host->curr_clk_rate = host_clk;
+	tegra_host->curr_clk_rate = clk_get_rate(pltfm_host->clk);
 	if (tegra_host->ddr_signaling)
 		host->max_clk = host_clk;
 	else
Signature · 1 line
2.17.1
#31 lore raw

Re: [PATCH v7 4/4] mmc: sdhci-tegra: Use actual clock rate for SW tuning correction

Quoted 10 lines · Prathamesh Shete

Ensure tegra_host member "curr_clk_rate" holds the actual clock rate instead of requested clock rate for proper use during tuning correction algorithm. Actual clk rate may not be the same as the requested clk frequency depending on the parent clock source set. Tuning correction algorithm depends on certain parameters which are sensitive to current clk rate. If the host clk is selected instead of the actual clock rate, tuning correction algorithm may end up applying invalid correction, which could result in errors

Quoted 6 lines
Fixes ea8fc5953e8b ("mmc: tegra: update hw tuning process")

Applied for fixes and by adding a stable tag, thanks!

Kind regards
Uffe

Quoted 20 lines
---
 drivers/mmc/host/sdhci-tegra.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/sdhci-tegra.c +1 -2
index 3663c5d0efe0..ccbb26a66284 100644
@@ -783,7 +783,7 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
                dev_err(dev, "failed to set clk rate to %luHz: %d\n",
                        host_clk, err);
 
-       tegra_host->curr_clk_rate = host_clk;
+       tegra_host->curr_clk_rate = clk_get_rate(pltfm_host->clk);
        if (tegra_host->ddr_signaling)
                host->max_clk = host_clk;
        else
--

2.17.1

#32 lore raw

PATCH v6 3/4 mmc: sdhci-tegra: Issue CMD and DAT resets together

In reply to Prathamesh Shete

In case of error condition to avoid system crash Tegra SDMMC controller requires CMD and DAT resets issued together. SDHCI controller FSM goes into bad state due to rapid SD card hot-plug event. Issuing reset on the CMD FSM before DATA FSM results in kernel panic, hence add support to issue CMD and DAT resets together.
This is applicable to Tegra186 and later chips.

---
 drivers/mmc/host/sdhci-tegra.c | 3 ++-
 drivers/mmc/host/sdhci.c       | 5 +++++
 drivers/mmc/host/sdhci.h       | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-tegra.c +2 -1
index 60ce3e80f248..283f702b4993 100644
@@ -1535,7 +1535,8 @@ static const struct sdhci_pltfm_data sdhci_tegra186_pdata = {
 		  SDHCI_QUIRK_NO_HISPD_BIT |
 		  SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |
 		  SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
-	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+		   SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER,
 	.ops  = &tegra186_sdhci_ops,
 };
 
drivers/mmc/host/sdhci.c +5 -0
index 2b5dda521b0e..8512a69f1aae 100644
@@ -270,6 +270,11 @@ enum sdhci_reset_reason {
 
 static void sdhci_reset_for_reason(struct sdhci_host *host, enum sdhci_reset_reason reason)
 {
+	if (host->quirks2 &
+		SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER) {
+		sdhci_do_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
+		return;
+	}
 	switch (reason) {
 	case SDHCI_RESET_FOR_INIT:
 		sdhci_do_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
drivers/mmc/host/sdhci.h +2 -0
index d750c464bd1e..6a5766774b05 100644
@@ -478,6 +478,8 @@ struct sdhci_host {
  * block count.
  */
 #define SDHCI_QUIRK2_USE_32BIT_BLK_CNT			(1<<18)
+/* Issue CMD and DATA reset together */
+#define SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER	(1<<19)
 
 	int irq;		/* Device IRQ */
 	void __iomem *ioaddr;	/* Mapped address */
Signature · 1 line
2.17.1
#33 lore raw

PATCH v6 4/4 mmc: sdhci-tegra: Use actual clock rate for SW tuning correction

In reply to Prathamesh Shete

Ensure tegra_host member "curr_clk_rate" holds the actual clock rate instead of requested clock rate for proper use during tuning correction algorithm. Actual clk rate may not be the same as the requested clk frequency depending on the parent clock source set. Tuning correction algorithm depends on certain parameters which are sensitive to current clk rate. If the host clk is selected instead of the actual clock rate, tuning correction algorithm may end up applying invalid correction, which could result in errors

Fixes ea8fc5953e8b ("mmc: tegra: update hw tuning process")
---
 drivers/mmc/host/sdhci-tegra.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/sdhci-tegra.c +1 -1
index 283f702b4993..8739cd6a702c 100644
@@ -783,7 +783,7 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
 		dev_err(dev, "failed to set clk rate to %luHz: %d\n",
 			host_clk, err);
 
-	tegra_host->curr_clk_rate = host_clk;
+	tegra_host->curr_clk_rate = clk_get_rate(pltfm_host->clk);
 	if (tegra_host->ddr_signaling)
 		host->max_clk = host_clk;
 	else
Signature · 1 line
2.17.1
#34 lore raw

PATCH v5 3/3 mmc: sdhci-tegra: Issue CMD and DAT resets together

In reply to Prathamesh Shete

In case of error condition to avoid system crash Tegra SDMMC controller requires CMD and DAT resets issued together. SDHCI controller FSM goes into bad state due to rapid SD card hot-plug event. Issuing reset on the CMD FSM before DATA FSM results in kernel panic, hence add support to issue CMD and DAT resets together.
This is applicable to Tegra186 and later chips.

---
 drivers/mmc/host/sdhci-tegra.c | 3 ++-
 drivers/mmc/host/sdhci.c       | 5 +++++
 drivers/mmc/host/sdhci.h       | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-tegra.c +2 -1
index 46f37cc26dbb..61dc5ee0726d 100644
@@ -1536,7 +1536,8 @@ static const struct sdhci_pltfm_data sdhci_tegra186_pdata = {
 		  SDHCI_QUIRK_NO_HISPD_BIT |
 		  SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |
 		  SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
-	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+		   SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER,
 	.ops  = &tegra186_sdhci_ops,
 };
 
drivers/mmc/host/sdhci.c +5 -0
index 2b5dda521b0e..8512a69f1aae 100644
@@ -270,6 +270,11 @@ enum sdhci_reset_reason {
 
 static void sdhci_reset_for_reason(struct sdhci_host *host, enum sdhci_reset_reason reason)
 {
+	if (host->quirks2 &
+		SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER) {
+		sdhci_do_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
+		return;
+	}
 	switch (reason) {
 	case SDHCI_RESET_FOR_INIT:
 		sdhci_do_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
drivers/mmc/host/sdhci.h +2 -0
index d750c464bd1e..6a5766774b05 100644
@@ -478,6 +478,8 @@ struct sdhci_host {
  * block count.
  */
 #define SDHCI_QUIRK2_USE_32BIT_BLK_CNT			(1<<18)
+/* Issue CMD and DATA reset together */
+#define SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER	(1<<19)
 
 	int irq;		/* Device IRQ */
 	void __iomem *ioaddr;	/* Mapped address */
Signature · 1 line
2.17.1
maintainer Acked-by on v5 3/3
#35 lore raw

Re: [PATCH v5 3/3] mmc: sdhci-tegra: Issue CMD and DAT resets together

Quoted 11 lines · Prathamesh Shete

In case of error condition to avoid system crash Tegra SDMMC controller requires CMD and DAT resets issued together. SDHCI controller FSM goes into bad state due to rapid SD card hot-plug event. Issuing reset on the CMD FSM before DATA FSM results in kernel panic, hence add support to issue CMD and DAT resets together.
This is applicable to Tegra186 and later chips.

Quoted 49 lines
---
 drivers/mmc/host/sdhci-tegra.c | 3 ++-
 drivers/mmc/host/sdhci.c       | 5 +++++
 drivers/mmc/host/sdhci.h       | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-tegra.c +2 -1
index 46f37cc26dbb..61dc5ee0726d 100644
@@ -1536,7 +1536,8 @@ static const struct sdhci_pltfm_data sdhci_tegra186_pdata = {
 		  SDHCI_QUIRK_NO_HISPD_BIT |
 		  SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |
 		  SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
-	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
+		   SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER,
 	.ops  = &tegra186_sdhci_ops,
 };
 
drivers/mmc/host/sdhci.c +5 -0
index 2b5dda521b0e..8512a69f1aae 100644
@@ -270,6 +270,11 @@ enum sdhci_reset_reason {
 
 static void sdhci_reset_for_reason(struct sdhci_host *host, enum sdhci_reset_reason reason)
 {
+	if (host->quirks2 &
+		SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER) {
+		sdhci_do_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
+		return;
+	}
 	switch (reason) {
 	case SDHCI_RESET_FOR_INIT:
 		sdhci_do_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
drivers/mmc/host/sdhci.h +2 -0
index d750c464bd1e..6a5766774b05 100644
@@ -478,6 +478,8 @@ struct sdhci_host {
  * block count.
  */
 #define SDHCI_QUIRK2_USE_32BIT_BLK_CNT			(1<<18)
+/* Issue CMD and DATA reset together */
+#define SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER	(1<<19)
 
 	int irq;		/* Device IRQ */
 	void __iomem *ioaddr;	/* Mapped address */
#36 lore raw

PATCH v5 4/4 mmc: sdhci-tegra: Use actual clock rate for SW tuning correction

In reply to Prathamesh Shete

Ensure tegra_host member "curr_clk_rate" holds the actual clock rate instead of requested clock rate for proper use during tuning correction algorithm. Actual clk rate may not be the same as the requested clk frequency depending on the parent clock source set. Tuning correction algorithm depends on certain parameters which are sensitive to current clk rate. If the host clk is selected instead of the actual clock rate, tuning correction algorithm may end up applying invalid correction, which could result in errors

Fixes ea8fc5953e8b ("mmc: tegra: update hw tuning process")
---
 drivers/mmc/host/sdhci-tegra.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/sdhci-tegra.c +1 -1
index 61dc5ee0726d..8285b979391d 100644
@@ -784,7 +784,7 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
 		dev_err(dev, "failed to set clk rate to %luHz: %d\n",
 			host_clk, err);
 
-	tegra_host->curr_clk_rate = host_clk;
+	tegra_host->curr_clk_rate = clk_get_rate(pltfm_host->clk);
 	if (tegra_host->ddr_signaling)
 		host->max_clk = host_clk;
 	else
Signature · 1 line
2.17.1
#37 lore raw

PATCH v4 4/4 mmc: sdhci-tegra: Use actual clock rate for SW tuning correction

In reply to Prathamesh Shete

Ensure tegra_host member "curr_clk_rate" holds the actual clock rate instead of requested clock rate for proper use during tuning correction algorithm. Actual clk rate may not be the same as the requested clk frequency depending on the parent clock source set. Tuning correction algorithm depends on certain parameters which are sensitive to current clk rate. If the host clk is selected instead of the actual clock rate, tuning correction algorithm may end up applying invalid correction, which could result in errors

Fixes ea8fc5953e8b ("mmc: tegra: update hw tuning process")
---
 drivers/mmc/host/sdhci-tegra.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/sdhci-tegra.c +1 -1
index 61dc5ee0726d..8285b979391d 100644
@@ -784,7 +784,7 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
 		dev_err(dev, "failed to set clk rate to %luHz: %d\n",
 			host_clk, err);
 
-	tegra_host->curr_clk_rate = host_clk;
+	tegra_host->curr_clk_rate = clk_get_rate(pltfm_host->clk);
 	if (tegra_host->ddr_signaling)
 		host->max_clk = host_clk;
 	else
Signature · 1 line
2.17.1
#38 lore raw

PATCH v3 4/4 mmc: sdhci-tegra: Use actual clock rate for SW tuning correction

In reply to Prathamesh Shete

Ensure tegra_host member "curr_clk_rate" holds the actual clock rate instead of requested clock rate for proper use during tuning correction algorithm. Actual clk rate may not be the same as the requested clk frequency depending on the parent clock source set. Tuning correction algorithm depends on certain parameters which are sensitive to current clk rate. If the host clk is selected instead of the actual clock rate, tuning correction algorithm may end up applying invalid correction, which could result in errors

Fixes ea8fc5953e8b ("mmc: tegra: update hw tuning process")
---
 drivers/mmc/host/sdhci-tegra.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/sdhci-tegra.c +1 -1
index 58449e010a9b..10f6df070456 100644
@@ -780,7 +780,7 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
 		dev_err(dev, "failed to set clk rate to %luHz: %d\n",
 			host_clk, err);
 
-	tegra_host->curr_clk_rate = host_clk;
+	tegra_host->curr_clk_rate = clk_get_rate(pltfm_host->clk);
 	if (tegra_host->ddr_signaling)
 		host->max_clk = host_clk;
 	else
Signature · 1 line
2.17.1