* [PATCH 1/3] [1/3] mmc: core: expose MMC_CAP2_CQE* to dt
@ 2019-11-01 6:43 Chun-Hung Wu
2019-11-01 6:43 ` [PATCH 2/3] [2/3] mmc: mediatek: command queue support Chun-Hung Wu
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Chun-Hung Wu @ 2019-11-01 6:43 UTC (permalink / raw)
To: Chaotian Jing, Ulf Hansson, Rob Herring, Mark Rutland,
Matthias Brugger, Linus Walleij, Pavel Machek, Kate Stewart,
Greg Kroah-Hartman, Martin Blumenstingl, Pan Bian,
Thomas Gleixner, Stanley Chu, Kuohong Wang
Cc: linux-kernel, linux-mmc, linux-mediatek, devicetree,
wsd_upstream, linux-arm-kernel, Chun-Hung Wu
Expose MMC_CAP2_CQE and MMC_CAP2_CQE_DCMD
to host->caps2 if
1. "supports-cqe" is defined in dt and
2. "disable-cqe-dcmd" is not defined in dt.
Change-Id: I3d172e6bcfac34520c3932a6f8df2e20f2c0d05b
CR-Id:
Feature:
Signed-off-by: Chun-Hung Wu <chun-hung.wu@mediatek.com>
---
drivers/mmc/core/host.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 105b7a7..efb0dbe 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -319,6 +319,14 @@ int mmc_of_parse(struct mmc_host *host)
host->caps2 |= MMC_CAP2_NO_SD;
if (device_property_read_bool(dev, "no-mmc"))
host->caps2 |= MMC_CAP2_NO_MMC;
+ if (device_property_read_bool(dev, "supports-cqe"))
+ host->caps2 |= MMC_CAP2_CQE;
+
+ /* Must be after "supports-cqe" check */
+ if (!device_property_read_bool(dev, "disable-cqe-dcmd")) {
+ if (host->caps2 & MMC_CAP2_CQE)
+ host->caps2 |= MMC_CAP2_CQE_DCMD;
+ }
/* Must be after "non-removable" check */
if (device_property_read_u32(dev, "fixed-emmc-driver-type", &drv_type) == 0) {
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/3] [2/3] mmc: mediatek: command queue support
2019-11-01 6:43 [PATCH 1/3] [1/3] mmc: core: expose MMC_CAP2_CQE* to dt Chun-Hung Wu
@ 2019-11-01 6:43 ` Chun-Hung Wu
2019-11-11 13:37 ` Ulf Hansson
2019-11-01 6:43 ` [PATCH 3/3] [3/3] dt-bindings: mmc: mediatek: Add document for mt6779 Chun-Hung Wu
2019-11-11 13:04 ` [PATCH 1/3] [1/3] mmc: core: expose MMC_CAP2_CQE* to dt Ulf Hansson
2 siblings, 1 reply; 9+ messages in thread
From: Chun-Hung Wu @ 2019-11-01 6:43 UTC (permalink / raw)
To: Chaotian Jing, Ulf Hansson, Rob Herring, Mark Rutland,
Matthias Brugger, Linus Walleij, Pavel Machek, Kate Stewart,
Greg Kroah-Hartman, Martin Blumenstingl, Pan Bian,
Thomas Gleixner, Stanley Chu, Kuohong Wang
Cc: linux-kernel, linux-mmc, linux-mediatek, devicetree,
wsd_upstream, linux-arm-kernel, Chun-Hung Wu
Support command queue for mt6779 platform.
Change-Id: I56b866fa4097a3c0bee77f53486c470e4f1944b9
Feature:
Signed-off-by: Chun-Hung Wu <chun-hung.wu@mediatek.com>
---
drivers/mmc/host/mtk-sd.c | 151 +++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 141 insertions(+), 10 deletions(-)
diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
index 189e426..b132397 100644
--- a/drivers/mmc/host/mtk-sd.c
+++ b/drivers/mmc/host/mtk-sd.c
@@ -31,6 +31,8 @@
#include <linux/mmc/sdio.h>
#include <linux/mmc/slot-gpio.h>
+#include "cqhci.h"
+
#define MAX_BD_NUM 1024
/*--------------------------------------------------------------------------*/
@@ -151,6 +153,7 @@
#define MSDC_INT_DMA_BDCSERR (0x1 << 17) /* W1C */
#define MSDC_INT_DMA_GPDCSERR (0x1 << 18) /* W1C */
#define MSDC_INT_DMA_PROTECT (0x1 << 19) /* W1C */
+#define MSDC_INT_CMDQ (0x1 << 28) /* W1C */
/* MSDC_INTEN mask */
#define MSDC_INTEN_MMCIRQ (0x1 << 0) /* RW */
@@ -181,6 +184,7 @@
/* SDC_CFG mask */
#define SDC_CFG_SDIOINTWKUP (0x1 << 0) /* RW */
#define SDC_CFG_INSWKUP (0x1 << 1) /* RW */
+#define SDC_CFG_WRDTOC (0x1fff << 2) /* RW */
#define SDC_CFG_BUSWIDTH (0x3 << 16) /* RW */
#define SDC_CFG_SDIO (0x1 << 19) /* RW */
#define SDC_CFG_SDIOIDE (0x1 << 20) /* RW */
@@ -228,6 +232,7 @@
#define MSDC_PATCH_BIT_SPCPUSH (0x1 << 29) /* RW */
#define MSDC_PATCH_BIT_DECRCTMO (0x1 << 30) /* RW */
+#define MSDC_PB1_BUSY_CHECK_SEL (0x1 << 7) /* RW */
#define MSDC_PATCH_BIT1_STOP_DLY (0xf << 8) /* RW */
#define MSDC_PATCH_BIT2_CFGRESP (0x1 << 15) /* RW */
@@ -431,6 +436,7 @@ struct msdc_host {
struct msdc_save_para save_para; /* used when gate HCLK */
struct msdc_tune_para def_tune_para; /* default tune setting */
struct msdc_tune_para saved_tune_para; /* tune result of CMD21/CMD19 */
+ struct cqhci_host *cq_host;
};
static const struct mtk_mmc_compatible mt8135_compat = {
@@ -527,6 +533,18 @@ struct msdc_host {
.use_internal_cd = true,
};
+static const struct mtk_mmc_compatible mt6779_compat = {
+ .clk_div_bits = 12,
+ .hs400_tune = false,
+ .pad_tune_reg = MSDC_PAD_TUNE0,
+ .async_fifo = true,
+ .data_tune = true,
+ .busy_check = true,
+ .stop_clk_fix = true,
+ .enhance_rx = true,
+ .support_64g = true,
+};
+
static const struct of_device_id msdc_of_ids[] = {
{ .compatible = "mediatek,mt8135-mmc", .data = &mt8135_compat},
{ .compatible = "mediatek,mt8173-mmc", .data = &mt8173_compat},
@@ -536,6 +554,7 @@ struct msdc_host {
{ .compatible = "mediatek,mt7622-mmc", .data = &mt7622_compat},
{ .compatible = "mediatek,mt8516-mmc", .data = &mt8516_compat},
{ .compatible = "mediatek,mt7620-mmc", .data = &mt7620_compat},
+ { .compatible = "mediatek,mt6779-mmc", .data = &mt6779_compat},
{}
};
MODULE_DEVICE_TABLE(of, msdc_of_ids);
@@ -698,21 +717,21 @@ static void msdc_unprepare_data(struct msdc_host *host, struct mmc_request *mrq)
}
}
-/* clock control primitives */
-static void msdc_set_timeout(struct msdc_host *host, u32 ns, u32 clks)
+static u64 msdc_timeout_cal(struct msdc_host *host, u64 ns, u64 clks)
{
- u32 timeout, clk_ns;
+ u64 timeout, clk_ns;
u32 mode = 0;
- host->timeout_ns = ns;
- host->timeout_clks = clks;
if (host->mmc->actual_clock == 0) {
timeout = 0;
} else {
- clk_ns = 1000000000UL / host->mmc->actual_clock;
- timeout = (ns + clk_ns - 1) / clk_ns + clks;
+ clk_ns = 1000000000ULL;
+ do_div(clk_ns, host->mmc->actual_clock);
+ timeout = ns + clk_ns - 1;
+ do_div(timeout, clk_ns);
+ timeout += clks;
/* in 1048576 sclk cycle unit */
- timeout = (timeout + (0x1 << 20) - 1) >> 20;
+ timeout = DIV_ROUND_UP(timeout, (0x1 << 20));
if (host->dev_comp->clk_div_bits == 8)
sdr_get_field(host->base + MSDC_CFG,
MSDC_CFG_CKMOD, &mode);
@@ -722,9 +741,30 @@ static void msdc_set_timeout(struct msdc_host *host, u32 ns, u32 clks)
/*DDR mode will double the clk cycles for data timeout */
timeout = mode >= 2 ? timeout * 2 : timeout;
timeout = timeout > 1 ? timeout - 1 : 0;
- timeout = timeout > 255 ? 255 : timeout;
}
- sdr_set_field(host->base + SDC_CFG, SDC_CFG_DTOC, timeout);
+ return timeout;
+}
+
+/* clock control primitives */
+static void msdc_set_timeout(struct msdc_host *host, u64 ns, u64 clks)
+{
+ u64 timeout;
+
+ host->timeout_ns = ns;
+ host->timeout_clks = clks;
+
+ timeout = msdc_timeout_cal(host, ns, clks);
+ sdr_set_field(host->base + SDC_CFG, SDC_CFG_DTOC,
+ (u32)(timeout > 255 ? 255 : timeout));
+}
+
+static void msdc_set_busy_timeout(struct msdc_host *host, u64 ns, u64 clks)
+{
+ u64 timeout;
+
+ timeout = msdc_timeout_cal(host, ns, clks);
+ sdr_set_field(host->base + SDC_CFG, SDC_CFG_WRDTOC,
+ (u32)(timeout > 8191 ? 8191 : timeout));
}
static void msdc_gate_clock(struct msdc_host *host)
@@ -1413,6 +1453,36 @@ static void msdc_enable_sdio_irq(struct mmc_host *mmc, int enb)
pm_runtime_put_noidle(host->dev);
}
+#if IS_ENABLED(CONFIG_MMC_CQHCI)
+static irqreturn_t msdc_cmdq_irq(struct msdc_host *host, u32 intsts)
+{
+ int cmd_err = 0, dat_err = 0;
+
+ if (intsts & MSDC_INT_RSPCRCERR) {
+ cmd_err = (unsigned int)-EILSEQ;
+ dev_err(host->dev, "%s: CMD CRC ERR", __func__);
+ } else if (intsts & MSDC_INT_CMDTMO) {
+ cmd_err = (unsigned int)-ETIMEDOUT;
+ dev_err(host->dev, "%s: CMD TIMEOUT ERR", __func__);
+ }
+
+ if (intsts & MSDC_INT_DATCRCERR) {
+ dat_err = (unsigned int)-EILSEQ;
+ dev_err(host->dev, "%s: DATA CRC ERR", __func__);
+ } else if (intsts & MSDC_INT_DATTMO) {
+ dat_err = (unsigned int)-ETIMEDOUT;
+ dev_err(host->dev, "%s: DATA TIMEOUT ERR", __func__);
+ }
+
+ if (cmd_err || dat_err) {
+ dev_err(host->dev, "cmd_err = %d, dat_err =%d, intsts = 0x%x",
+ cmd_err, dat_err, intsts);
+ }
+
+ return cqhci_irq(host->mmc, 0, cmd_err, dat_err);
+}
+#endif
+
static irqreturn_t msdc_irq(int irq, void *dev_id)
{
struct msdc_host *host = (struct msdc_host *) dev_id;
@@ -1449,6 +1519,16 @@ static irqreturn_t msdc_irq(int irq, void *dev_id)
if (!(events & (event_mask & ~MSDC_INT_SDIOIRQ)))
break;
+#if IS_ENABLED(CONFIG_MMC_CQHCI)
+ if ((host->mmc->caps2 & MMC_CAP2_CQE) &&
+ (events & MSDC_INT_CMDQ)) {
+ msdc_cmdq_irq(host, events);
+ /* clear interrupts */
+ writel(events, host->base + MSDC_INT);
+ return IRQ_HANDLED;
+ }
+#endif
+
if (!mrq) {
dev_err(host->dev,
"%s: MRQ=NULL; events=%08X; event_mask=%08X\n",
@@ -2132,6 +2212,36 @@ static int msdc_get_cd(struct mmc_host *mmc)
return !val;
}
+static void msdc_cqe_enable(struct mmc_host *mmc)
+{
+ struct msdc_host *host = mmc_priv(mmc);
+
+ /* enable cmdq irq */
+ writel(MSDC_INT_CMDQ, host->base + MSDC_INTEN);
+ /* enable busy check */
+ sdr_set_bits(host->base + MSDC_PATCH_BIT1, MSDC_PB1_BUSY_CHECK_SEL);
+ /* default write data / busy timeout 20s */
+ msdc_set_busy_timeout(host, 20 * 1000000000ULL, 0);
+ /* default read data timeout 1s */
+ msdc_set_timeout(host, 1000000000ULL, 0);
+}
+
+void msdc_cqe_disable(struct mmc_host *mmc, bool recovery)
+{
+ struct msdc_host *host = mmc_priv(mmc);
+
+ /* disable cmdq irq */
+ sdr_clr_bits(host->base + MSDC_INTEN, MSDC_INT_CMDQ);
+ /* disable busy check */
+ sdr_clr_bits(host->base + MSDC_PATCH_BIT1, MSDC_PB1_BUSY_CHECK_SEL);
+
+ if (recovery) {
+ sdr_set_field(host->base + MSDC_DMA_CTRL,
+ MSDC_DMA_CTRL_STOP, 1);
+ msdc_reset_hw(host);
+ }
+}
+
static const struct mmc_host_ops mt_msdc_ops = {
.post_req = msdc_post_req,
.pre_req = msdc_pre_req,
@@ -2148,6 +2258,11 @@ static int msdc_get_cd(struct mmc_host *mmc)
.hw_reset = msdc_hw_reset,
};
+static const struct cqhci_host_ops msdc_cmdq_ops = {
+ .enable = msdc_cqe_enable,
+ .disable = msdc_cqe_disable,
+};
+
static void msdc_of_property_parse(struct platform_device *pdev,
struct msdc_host *host)
{
@@ -2299,6 +2414,22 @@ static int msdc_drv_probe(struct platform_device *pdev)
host->dma_mask = DMA_BIT_MASK(32);
mmc_dev(mmc)->dma_mask = &host->dma_mask;
+#if IS_ENABLED(CONFIG_MMC_CQHCI)
+ if (mmc->caps2 & MMC_CAP2_CQE) {
+ host->cq_host = devm_kzalloc(host->mmc->parent,
+ sizeof(*host->cq_host),
+ GFP_KERNEL);
+ host->cq_host->caps |= CQHCI_TASK_DESC_SZ_128;
+ host->cq_host->mmio = host->base + 0x800;
+ host->cq_host->ops = &msdc_cmdq_ops;
+ cqhci_init(host->cq_host, mmc, true);
+ mmc->max_segs = 128;
+ /* cqhci 16bit length */
+ /* 0 size, means 65536 so we don't have to -1 here */
+ mmc->max_seg_size = 64 * 1024;
+ }
+#endif
+
host->timeout_clks = 3 * 1048576;
host->dma.gpd = dma_alloc_coherent(&pdev->dev,
2 * sizeof(struct mt_gpdma_desc),
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] [3/3] dt-bindings: mmc: mediatek: Add document for mt6779
2019-11-01 6:43 [PATCH 1/3] [1/3] mmc: core: expose MMC_CAP2_CQE* to dt Chun-Hung Wu
2019-11-01 6:43 ` [PATCH 2/3] [2/3] mmc: mediatek: command queue support Chun-Hung Wu
@ 2019-11-01 6:43 ` Chun-Hung Wu
2019-11-06 4:17 ` Rob Herring
2019-11-11 13:04 ` [PATCH 1/3] [1/3] mmc: core: expose MMC_CAP2_CQE* to dt Ulf Hansson
2 siblings, 1 reply; 9+ messages in thread
From: Chun-Hung Wu @ 2019-11-01 6:43 UTC (permalink / raw)
To: Chaotian Jing, Ulf Hansson, Rob Herring, Mark Rutland,
Matthias Brugger, Linus Walleij, Pavel Machek, Kate Stewart,
Greg Kroah-Hartman, Martin Blumenstingl, Pan Bian,
Thomas Gleixner, Stanley Chu, Kuohong Wang
Cc: linux-kernel, linux-mmc, linux-mediatek, devicetree,
wsd_upstream, linux-arm-kernel, Chun-Hung Wu
Add compatible node for mt6779 mmc
Change-Id: Id36a136a75e892c9360ec95c7f52db06f5b308a4
CR-Id:
Feature:
Signed-off-by: Chun-Hung Wu <chun-hung.wu@mediatek.com>
---
Documentation/devicetree/bindings/mmc/mtk-sd.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/mmc/mtk-sd.txt b/Documentation/devicetree/bindings/mmc/mtk-sd.txt
index 8a532f4..0c9cf6a 100644
--- a/Documentation/devicetree/bindings/mmc/mtk-sd.txt
+++ b/Documentation/devicetree/bindings/mmc/mtk-sd.txt
@@ -12,6 +12,7 @@ Required properties:
"mediatek,mt8173-mmc": for mmc host ip compatible with mt8173
"mediatek,mt8183-mmc": for mmc host ip compatible with mt8183
"mediatek,mt8516-mmc": for mmc host ip compatible with mt8516
+ "mediatek,mt6779-mmc": for mmc host ip compatible with mt6779
"mediatek,mt2701-mmc": for mmc host ip compatible with mt2701
"mediatek,mt2712-mmc": for mmc host ip compatible with mt2712
"mediatek,mt7622-mmc": for MT7622 SoC
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] [3/3] dt-bindings: mmc: mediatek: Add document for mt6779
2019-11-01 6:43 ` [PATCH 3/3] [3/3] dt-bindings: mmc: mediatek: Add document for mt6779 Chun-Hung Wu
@ 2019-11-06 4:17 ` Rob Herring
2019-11-06 8:07 ` Chun-Hung Wu
0 siblings, 1 reply; 9+ messages in thread
From: Rob Herring @ 2019-11-06 4:17 UTC (permalink / raw)
To: Chun-Hung Wu
Cc: Chaotian Jing, Ulf Hansson, Mark Rutland, Matthias Brugger,
Linus Walleij, Pavel Machek, Kate Stewart, Greg Kroah-Hartman,
Martin Blumenstingl, Pan Bian, Thomas Gleixner, Stanley Chu,
Kuohong Wang, linux-kernel, linux-mmc, linux-mediatek,
devicetree, wsd_upstream, linux-arm-kernel
On Fri, Nov 01, 2019 at 02:43:02PM +0800, Chun-Hung Wu wrote:
> Add compatible node for mt6779 mmc
>
> Change-Id: Id36a136a75e892c9360ec95c7f52db06f5b308a4
> CR-Id:
> Feature:
Remove these tags.
> Signed-off-by: Chun-Hung Wu <chun-hung.wu@mediatek.com>
> ---
> Documentation/devicetree/bindings/mmc/mtk-sd.txt | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/devicetree/bindings/mmc/mtk-sd.txt b/Documentation/devicetree/bindings/mmc/mtk-sd.txt
> index 8a532f4..0c9cf6a 100644
> --- a/Documentation/devicetree/bindings/mmc/mtk-sd.txt
> +++ b/Documentation/devicetree/bindings/mmc/mtk-sd.txt
> @@ -12,6 +12,7 @@ Required properties:
> "mediatek,mt8173-mmc": for mmc host ip compatible with mt8173
> "mediatek,mt8183-mmc": for mmc host ip compatible with mt8183
> "mediatek,mt8516-mmc": for mmc host ip compatible with mt8516
> + "mediatek,mt6779-mmc": for mmc host ip compatible with mt6779
> "mediatek,mt2701-mmc": for mmc host ip compatible with mt2701
> "mediatek,mt2712-mmc": for mmc host ip compatible with mt2712
> "mediatek,mt7622-mmc": for MT7622 SoC
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] [3/3] dt-bindings: mmc: mediatek: Add document for mt6779
2019-11-06 4:17 ` Rob Herring
@ 2019-11-06 8:07 ` Chun-Hung Wu
0 siblings, 0 replies; 9+ messages in thread
From: Chun-Hung Wu @ 2019-11-06 8:07 UTC (permalink / raw)
To: Rob Herring
Cc: Chaotian Jing, Ulf Hansson, Mark Rutland, Matthias Brugger,
Linus Walleij, Pavel Machek, Kate Stewart, Greg Kroah-Hartman,
Martin Blumenstingl, Pan Bian, Thomas Gleixner, Stanley Chu,
Kuohong Wang, linux-kernel, linux-mmc, linux-mediatek,
devicetree, wsd_upstream, linux-arm-kernel
Hi Rob,
Thanks for the reply.
We will prepare another patch set to remove these tags.
On Tue, 2019-11-05 at 22:17 -0600, Rob Herring wrote:
> On Fri, Nov 01, 2019 at 02:43:02PM +0800, Chun-Hung Wu wrote:
> > Add compatible node for mt6779 mmc
> >
> > Change-Id: Id36a136a75e892c9360ec95c7f52db06f5b308a4
> > CR-Id:
> > Feature:
>
> Remove these tags.
>
> > Signed-off-by: Chun-Hung Wu <chun-hung.wu@mediatek.com>
> > ---
> > Documentation/devicetree/bindings/mmc/mtk-sd.txt | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/Documentation/devicetree/bindings/mmc/mtk-sd.txt b/Documentation/devicetree/bindings/mmc/mtk-sd.txt
> > index 8a532f4..0c9cf6a 100644
> > --- a/Documentation/devicetree/bindings/mmc/mtk-sd.txt
> > +++ b/Documentation/devicetree/bindings/mmc/mtk-sd.txt
> > @@ -12,6 +12,7 @@ Required properties:
> > "mediatek,mt8173-mmc": for mmc host ip compatible with mt8173
> > "mediatek,mt8183-mmc": for mmc host ip compatible with mt8183
> > "mediatek,mt8516-mmc": for mmc host ip compatible with mt8516
> > + "mediatek,mt6779-mmc": for mmc host ip compatible with mt6779
> > "mediatek,mt2701-mmc": for mmc host ip compatible with mt2701
> > "mediatek,mt2712-mmc": for mmc host ip compatible with mt2712
> > "mediatek,mt7622-mmc": for MT7622 SoC
> > --
> > 1.9.1
> >
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] [1/3] mmc: core: expose MMC_CAP2_CQE* to dt
2019-11-01 6:43 [PATCH 1/3] [1/3] mmc: core: expose MMC_CAP2_CQE* to dt Chun-Hung Wu
2019-11-01 6:43 ` [PATCH 2/3] [2/3] mmc: mediatek: command queue support Chun-Hung Wu
2019-11-01 6:43 ` [PATCH 3/3] [3/3] dt-bindings: mmc: mediatek: Add document for mt6779 Chun-Hung Wu
@ 2019-11-11 13:04 ` Ulf Hansson
2020-02-04 0:44 ` Chun-Hung Wu
2 siblings, 1 reply; 9+ messages in thread
From: Ulf Hansson @ 2019-11-11 13:04 UTC (permalink / raw)
To: Chun-Hung Wu
Cc: Chaotian Jing, Rob Herring, Mark Rutland, Matthias Brugger,
Linus Walleij, Pavel Machek, Kate Stewart, Greg Kroah-Hartman,
Martin Blumenstingl, Pan Bian, Thomas Gleixner, Stanley Chu,
Kuohong Wang, Linux Kernel Mailing List, linux-mmc,
linux-mediatek, DTML, wsd_upstream
On Fri, 1 Nov 2019 at 07:43, Chun-Hung Wu <chun-hung.wu@mediatek.com> wrote:
>
> Expose MMC_CAP2_CQE and MMC_CAP2_CQE_DCMD
> to host->caps2 if
> 1. "supports-cqe" is defined in dt and
> 2. "disable-cqe-dcmd" is not defined in dt.
>
> Change-Id: I3d172e6bcfac34520c3932a6f8df2e20f2c0d05b
> CR-Id:
> Feature:
Remove these tags please.
> Signed-off-by: Chun-Hung Wu <chun-hung.wu@mediatek.com>
> ---
> drivers/mmc/core/host.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
> index 105b7a7..efb0dbe 100644
> --- a/drivers/mmc/core/host.c
> +++ b/drivers/mmc/core/host.c
> @@ -319,6 +319,14 @@ int mmc_of_parse(struct mmc_host *host)
> host->caps2 |= MMC_CAP2_NO_SD;
> if (device_property_read_bool(dev, "no-mmc"))
> host->caps2 |= MMC_CAP2_NO_MMC;
> + if (device_property_read_bool(dev, "supports-cqe"))
> + host->caps2 |= MMC_CAP2_CQE;
> +
> + /* Must be after "supports-cqe" check */
> + if (!device_property_read_bool(dev, "disable-cqe-dcmd")) {
> + if (host->caps2 & MMC_CAP2_CQE)
> + host->caps2 |= MMC_CAP2_CQE_DCMD;
> + }
>
> /* Must be after "non-removable" check */
> if (device_property_read_u32(dev, "fixed-emmc-driver-type", &drv_type) == 0) {
> --
> 1.9.1
>
Otherwise, this looks good to me.
Kind regards
Uffe
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] [2/3] mmc: mediatek: command queue support
2019-11-01 6:43 ` [PATCH 2/3] [2/3] mmc: mediatek: command queue support Chun-Hung Wu
@ 2019-11-11 13:37 ` Ulf Hansson
2020-02-04 1:01 ` Chun-Hung Wu
0 siblings, 1 reply; 9+ messages in thread
From: Ulf Hansson @ 2019-11-11 13:37 UTC (permalink / raw)
To: Chun-Hung Wu
Cc: Chaotian Jing, Matthias Brugger, Pan Bian, Stanley Chu,
Kuohong Wang, Linux Kernel Mailing List, linux-mmc,
linux-mediatek, wsd_upstream, Linux ARM
+ Trimmed cc list (please do that as well for your next submission).
On Fri, 1 Nov 2019 at 07:43, Chun-Hung Wu <chun-hung.wu@mediatek.com> wrote:
>
> Support command queue for mt6779 platform.
A lot of changes summarized on only one line. I would appreciate some
more information here, please.
>
> Change-Id: I56b866fa4097a3c0bee77f53486c470e4f1944b9
> Feature:
Drop these please.
> Signed-off-by: Chun-Hung Wu <chun-hung.wu@mediatek.com>
For the next submission, please add the maintainers for the cqhci
driver. They may have some valuable feedback for you.
Below follows a few review comments, which are more from a patch
formatting point of view, than technical.
> ---
> drivers/mmc/host/mtk-sd.c | 151 +++++++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 141 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
> index 189e426..b132397 100644
> --- a/drivers/mmc/host/mtk-sd.c
> +++ b/drivers/mmc/host/mtk-sd.c
> @@ -31,6 +31,8 @@
> #include <linux/mmc/sdio.h>
> #include <linux/mmc/slot-gpio.h>
>
> +#include "cqhci.h"
> +
> #define MAX_BD_NUM 1024
>
> /*--------------------------------------------------------------------------*/
> @@ -151,6 +153,7 @@
> #define MSDC_INT_DMA_BDCSERR (0x1 << 17) /* W1C */
> #define MSDC_INT_DMA_GPDCSERR (0x1 << 18) /* W1C */
> #define MSDC_INT_DMA_PROTECT (0x1 << 19) /* W1C */
> +#define MSDC_INT_CMDQ (0x1 << 28) /* W1C */
>
> /* MSDC_INTEN mask */
> #define MSDC_INTEN_MMCIRQ (0x1 << 0) /* RW */
> @@ -181,6 +184,7 @@
> /* SDC_CFG mask */
> #define SDC_CFG_SDIOINTWKUP (0x1 << 0) /* RW */
> #define SDC_CFG_INSWKUP (0x1 << 1) /* RW */
> +#define SDC_CFG_WRDTOC (0x1fff << 2) /* RW */
> #define SDC_CFG_BUSWIDTH (0x3 << 16) /* RW */
> #define SDC_CFG_SDIO (0x1 << 19) /* RW */
> #define SDC_CFG_SDIOIDE (0x1 << 20) /* RW */
> @@ -228,6 +232,7 @@
> #define MSDC_PATCH_BIT_SPCPUSH (0x1 << 29) /* RW */
> #define MSDC_PATCH_BIT_DECRCTMO (0x1 << 30) /* RW */
>
> +#define MSDC_PB1_BUSY_CHECK_SEL (0x1 << 7) /* RW */
> #define MSDC_PATCH_BIT1_STOP_DLY (0xf << 8) /* RW */
>
> #define MSDC_PATCH_BIT2_CFGRESP (0x1 << 15) /* RW */
> @@ -431,6 +436,7 @@ struct msdc_host {
> struct msdc_save_para save_para; /* used when gate HCLK */
> struct msdc_tune_para def_tune_para; /* default tune setting */
> struct msdc_tune_para saved_tune_para; /* tune result of CMD21/CMD19 */
> + struct cqhci_host *cq_host;
> };
>
> static const struct mtk_mmc_compatible mt8135_compat = {
> @@ -527,6 +533,18 @@ struct msdc_host {
> .use_internal_cd = true,
> };
>
> +static const struct mtk_mmc_compatible mt6779_compat = {
> + .clk_div_bits = 12,
> + .hs400_tune = false,
> + .pad_tune_reg = MSDC_PAD_TUNE0,
> + .async_fifo = true,
> + .data_tune = true,
> + .busy_check = true,
> + .stop_clk_fix = true,
> + .enhance_rx = true,
> + .support_64g = true,
> +};
> +
> static const struct of_device_id msdc_of_ids[] = {
> { .compatible = "mediatek,mt8135-mmc", .data = &mt8135_compat},
> { .compatible = "mediatek,mt8173-mmc", .data = &mt8173_compat},
> @@ -536,6 +554,7 @@ struct msdc_host {
> { .compatible = "mediatek,mt7622-mmc", .data = &mt7622_compat},
> { .compatible = "mediatek,mt8516-mmc", .data = &mt8516_compat},
> { .compatible = "mediatek,mt7620-mmc", .data = &mt7620_compat},
> + { .compatible = "mediatek,mt6779-mmc", .data = &mt6779_compat},
> {}
> };
> MODULE_DEVICE_TABLE(of, msdc_of_ids);
> @@ -698,21 +717,21 @@ static void msdc_unprepare_data(struct msdc_host *host, struct mmc_request *mrq)
> }
> }
>
> -/* clock control primitives */
> -static void msdc_set_timeout(struct msdc_host *host, u32 ns, u32 clks)
> +static u64 msdc_timeout_cal(struct msdc_host *host, u64 ns, u64 clks)
> {
> - u32 timeout, clk_ns;
> + u64 timeout, clk_ns;
> u32 mode = 0;
>
> - host->timeout_ns = ns;
> - host->timeout_clks = clks;
> if (host->mmc->actual_clock == 0) {
> timeout = 0;
> } else {
> - clk_ns = 1000000000UL / host->mmc->actual_clock;
> - timeout = (ns + clk_ns - 1) / clk_ns + clks;
> + clk_ns = 1000000000ULL;
> + do_div(clk_ns, host->mmc->actual_clock);
> + timeout = ns + clk_ns - 1;
> + do_div(timeout, clk_ns);
> + timeout += clks;
> /* in 1048576 sclk cycle unit */
> - timeout = (timeout + (0x1 << 20) - 1) >> 20;
> + timeout = DIV_ROUND_UP(timeout, (0x1 << 20));
> if (host->dev_comp->clk_div_bits == 8)
> sdr_get_field(host->base + MSDC_CFG,
> MSDC_CFG_CKMOD, &mode);
> @@ -722,9 +741,30 @@ static void msdc_set_timeout(struct msdc_host *host, u32 ns, u32 clks)
> /*DDR mode will double the clk cycles for data timeout */
> timeout = mode >= 2 ? timeout * 2 : timeout;
> timeout = timeout > 1 ? timeout - 1 : 0;
> - timeout = timeout > 255 ? 255 : timeout;
> }
> - sdr_set_field(host->base + SDC_CFG, SDC_CFG_DTOC, timeout);
> + return timeout;
> +}
> +
> +/* clock control primitives */
> +static void msdc_set_timeout(struct msdc_host *host, u64 ns, u64 clks)
> +{
> + u64 timeout;
> +
> + host->timeout_ns = ns;
> + host->timeout_clks = clks;
> +
> + timeout = msdc_timeout_cal(host, ns, clks);
> + sdr_set_field(host->base + SDC_CFG, SDC_CFG_DTOC,
> + (u32)(timeout > 255 ? 255 : timeout));
> +}
Does the above changes make sense to split out in a separate patch?
It looks to me, that these are generic clock updates to the driver
that really doesn't have to be included in $subject patch.
> +
> +static void msdc_set_busy_timeout(struct msdc_host *host, u64 ns, u64 clks)
> +{
> + u64 timeout;
> +
> + timeout = msdc_timeout_cal(host, ns, clks);
> + sdr_set_field(host->base + SDC_CFG, SDC_CFG_WRDTOC,
> + (u32)(timeout > 8191 ? 8191 : timeout));
> }
>
> static void msdc_gate_clock(struct msdc_host *host)
> @@ -1413,6 +1453,36 @@ static void msdc_enable_sdio_irq(struct mmc_host *mmc, int enb)
> pm_runtime_put_noidle(host->dev);
> }
>
> +#if IS_ENABLED(CONFIG_MMC_CQHCI)
Other drivers Kconfig option, uses "select MMC_CQHCI". Would that make
this more simple and allowing to remove the "if IS_ENABLED" thingy?
> +static irqreturn_t msdc_cmdq_irq(struct msdc_host *host, u32 intsts)
> +{
> + int cmd_err = 0, dat_err = 0;
> +
> + if (intsts & MSDC_INT_RSPCRCERR) {
> + cmd_err = (unsigned int)-EILSEQ;
> + dev_err(host->dev, "%s: CMD CRC ERR", __func__);
> + } else if (intsts & MSDC_INT_CMDTMO) {
> + cmd_err = (unsigned int)-ETIMEDOUT;
> + dev_err(host->dev, "%s: CMD TIMEOUT ERR", __func__);
> + }
> +
> + if (intsts & MSDC_INT_DATCRCERR) {
> + dat_err = (unsigned int)-EILSEQ;
> + dev_err(host->dev, "%s: DATA CRC ERR", __func__);
> + } else if (intsts & MSDC_INT_DATTMO) {
> + dat_err = (unsigned int)-ETIMEDOUT;
> + dev_err(host->dev, "%s: DATA TIMEOUT ERR", __func__);
> + }
> +
> + if (cmd_err || dat_err) {
> + dev_err(host->dev, "cmd_err = %d, dat_err =%d, intsts = 0x%x",
> + cmd_err, dat_err, intsts);
> + }
> +
> + return cqhci_irq(host->mmc, 0, cmd_err, dat_err);
> +}
> +#endif
> +
> static irqreturn_t msdc_irq(int irq, void *dev_id)
> {
> struct msdc_host *host = (struct msdc_host *) dev_id;
> @@ -1449,6 +1519,16 @@ static irqreturn_t msdc_irq(int irq, void *dev_id)
> if (!(events & (event_mask & ~MSDC_INT_SDIOIRQ)))
> break;
>
> +#if IS_ENABLED(CONFIG_MMC_CQHCI)
Again, please to avoid these "IS_ENABLED".
> + if ((host->mmc->caps2 & MMC_CAP2_CQE) &&
> + (events & MSDC_INT_CMDQ)) {
> + msdc_cmdq_irq(host, events);
> + /* clear interrupts */
> + writel(events, host->base + MSDC_INT);
> + return IRQ_HANDLED;
> + }
> +#endif
> +
> if (!mrq) {
> dev_err(host->dev,
> "%s: MRQ=NULL; events=%08X; event_mask=%08X\n",
> @@ -2132,6 +2212,36 @@ static int msdc_get_cd(struct mmc_host *mmc)
> return !val;
> }
>
> +static void msdc_cqe_enable(struct mmc_host *mmc)
> +{
> + struct msdc_host *host = mmc_priv(mmc);
> +
> + /* enable cmdq irq */
> + writel(MSDC_INT_CMDQ, host->base + MSDC_INTEN);
> + /* enable busy check */
> + sdr_set_bits(host->base + MSDC_PATCH_BIT1, MSDC_PB1_BUSY_CHECK_SEL);
> + /* default write data / busy timeout 20s */
> + msdc_set_busy_timeout(host, 20 * 1000000000ULL, 0);
> + /* default read data timeout 1s */
> + msdc_set_timeout(host, 1000000000ULL, 0);
Some magic timeout values here. Can you elaborate why these values?
> +}
> +
> +void msdc_cqe_disable(struct mmc_host *mmc, bool recovery)
> +{
> + struct msdc_host *host = mmc_priv(mmc);
> +
> + /* disable cmdq irq */
> + sdr_clr_bits(host->base + MSDC_INTEN, MSDC_INT_CMDQ);
> + /* disable busy check */
> + sdr_clr_bits(host->base + MSDC_PATCH_BIT1, MSDC_PB1_BUSY_CHECK_SEL);
> +
> + if (recovery) {
> + sdr_set_field(host->base + MSDC_DMA_CTRL,
> + MSDC_DMA_CTRL_STOP, 1);
> + msdc_reset_hw(host);
> + }
> +}
> +
> static const struct mmc_host_ops mt_msdc_ops = {
> .post_req = msdc_post_req,
> .pre_req = msdc_pre_req,
> @@ -2148,6 +2258,11 @@ static int msdc_get_cd(struct mmc_host *mmc)
> .hw_reset = msdc_hw_reset,
The hw_reset callback is really for resetting the card, but it seems
like you are using it to reset the controller. No?
I notice there are some other drivers abusing the callback as well,
but I am wondering whether it's time to really look into what's going
on here.
Can you elaborate on why you need this?
> };
>
> +static const struct cqhci_host_ops msdc_cmdq_ops = {
> + .enable = msdc_cqe_enable,
> + .disable = msdc_cqe_disable,
> +};
> +
> static void msdc_of_property_parse(struct platform_device *pdev,
> struct msdc_host *host)
> {
> @@ -2299,6 +2414,22 @@ static int msdc_drv_probe(struct platform_device *pdev)
> host->dma_mask = DMA_BIT_MASK(32);
> mmc_dev(mmc)->dma_mask = &host->dma_mask;
>
> +#if IS_ENABLED(CONFIG_MMC_CQHCI)
> + if (mmc->caps2 & MMC_CAP2_CQE) {
> + host->cq_host = devm_kzalloc(host->mmc->parent,
> + sizeof(*host->cq_host),
> + GFP_KERNEL);
> + host->cq_host->caps |= CQHCI_TASK_DESC_SZ_128;
> + host->cq_host->mmio = host->base + 0x800;
> + host->cq_host->ops = &msdc_cmdq_ops;
> + cqhci_init(host->cq_host, mmc, true);
> + mmc->max_segs = 128;
> + /* cqhci 16bit length */
> + /* 0 size, means 65536 so we don't have to -1 here */
> + mmc->max_seg_size = 64 * 1024;
> + }
> +#endif
> +
> host->timeout_clks = 3 * 1048576;
> host->dma.gpd = dma_alloc_coherent(&pdev->dev,
> 2 * sizeof(struct mt_gpdma_desc),
> --
> 1.9.1
>
Kind regards
Uffe
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] [1/3] mmc: core: expose MMC_CAP2_CQE* to dt
2019-11-11 13:04 ` [PATCH 1/3] [1/3] mmc: core: expose MMC_CAP2_CQE* to dt Ulf Hansson
@ 2020-02-04 0:44 ` Chun-Hung Wu
0 siblings, 0 replies; 9+ messages in thread
From: Chun-Hung Wu @ 2020-02-04 0:44 UTC (permalink / raw)
To: Ulf Hansson
Cc: Chaotian Jing, Rob Herring, Mark Rutland, Matthias Brugger,
Linus Walleij, Pavel Machek, Kate Stewart, Greg Kroah-Hartman,
Martin Blumenstingl, Pan Bian, Thomas Gleixner, Stanley Chu,
Kuohong Wang, Linux Kernel Mailing List, linux-mmc,
linux-mediatek, DTML, wsd_upstream, Linux ARM
Thanks for the review , will remove the tag in v2 driver.
On Mon, 2019-11-11 at 14:04 +0100, Ulf Hansson wrote:
> On Fri, 1 Nov 2019 at 07:43, Chun-Hung Wu <chun-hung.wu@mediatek.com> wrote:
> >
> > Expose MMC_CAP2_CQE and MMC_CAP2_CQE_DCMD
> > to host->caps2 if
> > 1. "supports-cqe" is defined in dt and
> > 2. "disable-cqe-dcmd" is not defined in dt.
> >
> > Change-Id: I3d172e6bcfac34520c3932a6f8df2e20f2c0d05b
> > CR-Id:
> > Feature:
>
> Remove these tags please.
>
> > Signed-off-by: Chun-Hung Wu <chun-hung.wu@mediatek.com>
> > ---
> > drivers/mmc/core/host.c | 8 ++++++++
> > 1 file changed, 8 insertions(+)
> >
> > diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
> > index 105b7a7..efb0dbe 100644
> > --- a/drivers/mmc/core/host.c
> > +++ b/drivers/mmc/core/host.c
> > @@ -319,6 +319,14 @@ int mmc_of_parse(struct mmc_host *host)
> > host->caps2 |= MMC_CAP2_NO_SD;
> > if (device_property_read_bool(dev, "no-mmc"))
> > host->caps2 |= MMC_CAP2_NO_MMC;
> > + if (device_property_read_bool(dev, "supports-cqe"))
> > + host->caps2 |= MMC_CAP2_CQE;
> > +
> > + /* Must be after "supports-cqe" check */
> > + if (!device_property_read_bool(dev, "disable-cqe-dcmd")) {
> > + if (host->caps2 & MMC_CAP2_CQE)
> > + host->caps2 |= MMC_CAP2_CQE_DCMD;
> > + }
> >
> > /* Must be after "non-removable" check */
> > if (device_property_read_u32(dev, "fixed-emmc-driver-type", &drv_type) == 0) {
> > --
> > 1.9.1
> >
>
> Otherwise, this looks good to me.
>
> Kind regards
> Uffe
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] [2/3] mmc: mediatek: command queue support
2019-11-11 13:37 ` Ulf Hansson
@ 2020-02-04 1:01 ` Chun-Hung Wu
0 siblings, 0 replies; 9+ messages in thread
From: Chun-Hung Wu @ 2020-02-04 1:01 UTC (permalink / raw)
To: Ulf Hansson
Cc: Chaotian Jing, Matthias Brugger, Pan Bian, Stanley Chu,
Kuohong Wang, Linux Kernel Mailing List, linux-mmc,
linux-mediatek, wsd_upstream, Linux ARM
Hi Ulf Hansson:
Thanks for your review in details.
I will update v2 patch based on your suggestion by this week.
By the way, I have replied your question below, please take a look and
provide feedback if any.
Regards,
Chun-Hung Wu
On Mon, 2019-11-11 at 14:37 +0100, Ulf Hansson wrote:
+ Trimmed cc list (please do that as well for your next submission).
>
> On Fri, 1 Nov 2019 at 07:43, Chun-Hung Wu <chun-hung.wu@mediatek.com>
wrote:
> >
> > Support command queue for mt6779 platform.
>
> A lot of changes summarized on only one line. I would appreciate some
> more information here, please.
> -> Will provide more information for v2 driver.
> >
> > Change-Id: I56b866fa4097a3c0bee77f53486c470e4f1944b9
> > Feature:
>
> Drop these please.
>
> > Signed-off-by: Chun-Hung Wu <chun-hung.wu@mediatek.com>
>
> For the next submission, please add the maintainers for the cqhci
> driver. They may have some valuable feedback for you.
> -> ok
> Below follows a few review comments, which are more from a patch
> formatting point of view, than technical.
>
> > ---
> > drivers/mmc/host/mtk-sd.c | 151
+++++++++++++++++++++++++++++++++++++++++++---
> > 1 file changed, 141 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
> > index 189e426..b132397 100644
> > --- a/drivers/mmc/host/mtk-sd.c
> > +++ b/drivers/mmc/host/mtk-sd.c
> > @@ -31,6 +31,8 @@
> > #include <linux/mmc/sdio.h>
> > #include <linux/mmc/slot-gpio.h>
> >
> > +#include "cqhci.h"
> > +
> > #define MAX_BD_NUM 1024
> >
>
> /*--------------------------------------------------------------------------*/
> > @@ -151,6 +153,7 @@
> > #define MSDC_INT_DMA_BDCSERR (0x1 << 17) /* W1C */
> > #define MSDC_INT_DMA_GPDCSERR (0x1 << 18) /* W1C */
> > #define MSDC_INT_DMA_PROTECT (0x1 << 19) /* W1C */
> > +#define MSDC_INT_CMDQ (0x1 << 28) /* W1C */
> >
> > /* MSDC_INTEN mask */
> > #define MSDC_INTEN_MMCIRQ (0x1 << 0) /* RW */
> > @@ -181,6 +184,7 @@
> > /* SDC_CFG mask */
> > #define SDC_CFG_SDIOINTWKUP (0x1 << 0) /* RW */
> > #define SDC_CFG_INSWKUP (0x1 << 1) /* RW */
> > +#define SDC_CFG_WRDTOC (0x1fff << 2) /* RW */
> > #define SDC_CFG_BUSWIDTH (0x3 << 16) /* RW */
> > #define SDC_CFG_SDIO (0x1 << 19) /* RW */
> > #define SDC_CFG_SDIOIDE (0x1 << 20) /* RW */
> > @@ -228,6 +232,7 @@
> > #define MSDC_PATCH_BIT_SPCPUSH (0x1 << 29) /* RW */
> > #define MSDC_PATCH_BIT_DECRCTMO (0x1 << 30) /* RW */
> >
> > +#define MSDC_PB1_BUSY_CHECK_SEL (0x1 << 7) /* RW */
> > #define MSDC_PATCH_BIT1_STOP_DLY (0xf << 8) /* RW */
> >
> > #define MSDC_PATCH_BIT2_CFGRESP (0x1 << 15) /* RW */
> > @@ -431,6 +436,7 @@ struct msdc_host {
> > struct msdc_save_para save_para; /* used when gate HCLK */
> > struct msdc_tune_para def_tune_para; /* default tune setting
*/
> > struct msdc_tune_para saved_tune_para; /* tune result of
CMD21/CMD19 */
> > + struct cqhci_host *cq_host;
> > };
> >
> > static const struct mtk_mmc_compatible mt8135_compat = {
> > @@ -527,6 +533,18 @@ struct msdc_host {
> > .use_internal_cd = true,
> > };
> >
> > +static const struct mtk_mmc_compatible mt6779_compat = {
> > + .clk_div_bits = 12,
> > + .hs400_tune = false,
> > + .pad_tune_reg = MSDC_PAD_TUNE0,
> > + .async_fifo = true,
> > + .data_tune = true,
> > + .busy_check = true,
> > + .stop_clk_fix = true,
> > + .enhance_rx = true,
> > + .support_64g = true,
> > +};
> > +
> > static const struct of_device_id msdc_of_ids[] = {
> > { .compatible = "mediatek,mt8135-mmc", .data =
&mt8135_compat},
> > { .compatible = "mediatek,mt8173-mmc", .data =
&mt8173_compat},
> > @@ -536,6 +554,7 @@ struct msdc_host {
> > { .compatible = "mediatek,mt7622-mmc", .data =
&mt7622_compat},
> > { .compatible = "mediatek,mt8516-mmc", .data =
&mt8516_compat},
> > { .compatible = "mediatek,mt7620-mmc", .data =
&mt7620_compat},
> > + { .compatible = "mediatek,mt6779-mmc", .data =
&mt6779_compat},
> > {}
> > };
> > MODULE_DEVICE_TABLE(of, msdc_of_ids);
> > @@ -698,21 +717,21 @@ static void msdc_unprepare_data(struct
msdc_host *host, struct mmc_request *mrq)
> > }
> > }
> >
> > -/* clock control primitives */
> > -static void msdc_set_timeout(struct msdc_host *host, u32 ns, u32
clks)
> > +static u64 msdc_timeout_cal(struct msdc_host *host, u64 ns, u64
clks)
> > {
> > - u32 timeout, clk_ns;
> > + u64 timeout, clk_ns;
> > u32 mode = 0;
> >
> > - host->timeout_ns = ns;
> > - host->timeout_clks = clks;
> > if (host->mmc->actual_clock == 0) {
> > timeout = 0;
> > } else {
> > - clk_ns = 1000000000UL / host->mmc->actual_clock;
> > - timeout = (ns + clk_ns - 1) / clk_ns + clks;
> > + clk_ns = 1000000000ULL;
> > + do_div(clk_ns, host->mmc->actual_clock);
> > + timeout = ns + clk_ns - 1;
> > + do_div(timeout, clk_ns);
> > + timeout += clks;
> > /* in 1048576 sclk cycle unit */
> > - timeout = (timeout + (0x1 << 20) - 1) >> 20;
> > + timeout = DIV_ROUND_UP(timeout, (0x1 << 20));
> > if (host->dev_comp->clk_div_bits == 8)
> > sdr_get_field(host->base + MSDC_CFG,
> > MSDC_CFG_CKMOD, &mode);
> > @@ -722,9 +741,30 @@ static void msdc_set_timeout(struct msdc_host
*host, u32 ns, u32 clks)
> > /*DDR mode will double the clk cycles for data
timeout */
> > timeout = mode >= 2 ? timeout * 2 : timeout;
> > timeout = timeout > 1 ? timeout - 1 : 0;
> > - timeout = timeout > 255 ? 255 : timeout;
> > }
> > - sdr_set_field(host->base + SDC_CFG, SDC_CFG_DTOC, timeout);
> > + return timeout;
> > +}
> > +
> > +/* clock control primitives */
> > +static void msdc_set_timeout(struct msdc_host *host, u64 ns, u64
clks)
> > +{
> > + u64 timeout;
> > +
> > + host->timeout_ns = ns;
> > + host->timeout_clks = clks;
> > +
> > + timeout = msdc_timeout_cal(host, ns, clks);
> > + sdr_set_field(host->base + SDC_CFG, SDC_CFG_DTOC,
> > + (u32)(timeout > 255 ? 255 : timeout));
> > +}
>
> Does the above changes make sense to split out in a separate patch?
>
> It looks to me, that these are generic clock updates to the driver
> that really doesn't have to be included in $subject patch.
>
> -> thanks, it's ok to separate the clock things to another patch
> +
> > +static void msdc_set_busy_timeout(struct msdc_host *host, u64 ns,
u64 clks)
> > +{
> > + u64 timeout;
> > +
> > + timeout = msdc_timeout_cal(host, ns, clks);
> > + sdr_set_field(host->base + SDC_CFG, SDC_CFG_WRDTOC,
> > + (u32)(timeout > 8191 ? 8191 : timeout));
> > }
> >
> > static void msdc_gate_clock(struct msdc_host *host)
> > @@ -1413,6 +1453,36 @@ static void msdc_enable_sdio_irq(struct
mmc_host *mmc, int enb)
> > pm_runtime_put_noidle(host->dev);
> > }
> >
> > +#if IS_ENABLED(CONFIG_MMC_CQHCI)
>
> Other drivers Kconfig option, uses "select MMC_CQHCI". Would that make
> this more simple and allowing to remove the "if IS_ENABLED" thingy?
> ->We support both CQHCI and legacy(non-CQHCI). And function
cqhci_irq() ->induce compile error if CONFIG_MMC_CQHCI not defined. We
need this
->option here.
> > +static irqreturn_t msdc_cmdq_irq(struct msdc_host *host, u32
intsts)
> > +{
> > + int cmd_err = 0, dat_err = 0;
> > +
> > + if (intsts & MSDC_INT_RSPCRCERR) {
> > + cmd_err = (unsigned int)-EILSEQ;
> > + dev_err(host->dev, "%s: CMD CRC ERR", __func__);
> > + } else if (intsts & MSDC_INT_CMDTMO) {
> > + cmd_err = (unsigned int)-ETIMEDOUT;
> > + dev_err(host->dev, "%s: CMD TIMEOUT ERR", __func__);
> > + }
> > +
> > + if (intsts & MSDC_INT_DATCRCERR) {
> > + dat_err = (unsigned int)-EILSEQ;
> > + dev_err(host->dev, "%s: DATA CRC ERR", __func__);
> > + } else if (intsts & MSDC_INT_DATTMO) {
> > + dat_err = (unsigned int)-ETIMEDOUT;
> > + dev_err(host->dev, "%s: DATA TIMEOUT ERR",
__func__);
> > + }
> > +
> > + if (cmd_err || dat_err) {
> > + dev_err(host->dev, "cmd_err = %d, dat_err =%d,
intsts = 0x%x",
> > + cmd_err, dat_err, intsts);
> > + }
> > +
> > + return cqhci_irq(host->mmc, 0, cmd_err, dat_err);
> > +}
> > +#endif
> > +
> > static irqreturn_t msdc_irq(int irq, void *dev_id)
> > {
> > struct msdc_host *host = (struct msdc_host *) dev_id;
> > @@ -1449,6 +1519,16 @@ static irqreturn_t msdc_irq(int irq, void
*dev_id)
> > if (!(events & (event_mask & ~MSDC_INT_SDIOIRQ)))
> > break;
> >
> > +#if IS_ENABLED(CONFIG_MMC_CQHCI)
>
> Again, please to avoid these "IS_ENABLED".
> ->We support both CQHCI and legacy(non-CQHCI). And function
cqhci_irq() ->induce compile error if CONFIG_MMC_CQHCI not defined. We
need this
->option here.
> > + if ((host->mmc->caps2 & MMC_CAP2_CQE) &&
> > + (events & MSDC_INT_CMDQ)) {
> > + msdc_cmdq_irq(host, events);
> > + /* clear interrupts */
> > + writel(events, host->base + MSDC_INT);
> > + return IRQ_HANDLED;
> > + }
> > +#endif
> > +
> > if (!mrq) {
> > dev_err(host->dev,
> > "%s: MRQ=NULL; events=%08X;
event_mask=%08X\n",
> > @@ -2132,6 +2212,36 @@ static int msdc_get_cd(struct mmc_host *mmc)
> > return !val;
> > }
> >
> > +static void msdc_cqe_enable(struct mmc_host *mmc)
> > +{
> > + struct msdc_host *host = mmc_priv(mmc);
> > +
> > + /* enable cmdq irq */
> > + writel(MSDC_INT_CMDQ, host->base + MSDC_INTEN);
> > + /* enable busy check */
> > + sdr_set_bits(host->base + MSDC_PATCH_BIT1,
MSDC_PB1_BUSY_CHECK_SEL);
> > + /* default write data / busy timeout 20s */
> > + msdc_set_busy_timeout(host, 20 * 1000000000ULL, 0);
> > + /* default read data timeout 1s */
> > + msdc_set_timeout(host, 1000000000ULL, 0);
>
> Some magic timeout values here. Can you elaborate why these values?
> ->The value is from current msdc specs and calculate a timeout value
>> ->read/write timeout spec
> > +}
> > +
> > +void msdc_cqe_disable(struct mmc_host *mmc, bool recovery)
> > +{
> > + struct msdc_host *host = mmc_priv(mmc);
> > +
> > + /* disable cmdq irq */
> > + sdr_clr_bits(host->base + MSDC_INTEN, MSDC_INT_CMDQ);
> > + /* disable busy check */
> > + sdr_clr_bits(host->base + MSDC_PATCH_BIT1,
MSDC_PB1_BUSY_CHECK_SEL);
> > +
> > + if (recovery) {
> > + sdr_set_field(host->base + MSDC_DMA_CTRL,
> > + MSDC_DMA_CTRL_STOP, 1);
> > + msdc_reset_hw(host);
> > + }
> > +}
> > +
> > static const struct mmc_host_ops mt_msdc_ops = {
> > .post_req = msdc_post_req,
> > .pre_req = msdc_pre_req,
> > @@ -2148,6 +2258,11 @@ static int msdc_get_cd(struct mmc_host *mmc)
> > .hw_reset = msdc_hw_reset,
>
> The hw_reset callback is really for resetting the card, but it seems
> like you are using it to reset the controller. No?
>
> I notice there are some other drivers abusing the callback as well,
> but I am wondering whether it's time to really look into what's going
> on here.
>
> Can you elaborate on why you need this?
> ->We did reset card in msdc_hw_reset() not controller. The bit we set
in ->the function is to reset card.
> > };
> >
> > +static const struct cqhci_host_ops msdc_cmdq_ops = {
> > + .enable = msdc_cqe_enable,
> > + .disable = msdc_cqe_disable,
> > +};
> > +
> > static void msdc_of_property_parse(struct platform_device *pdev,
> > struct msdc_host *host)
> > {
> > @@ -2299,6 +2414,22 @@ static int msdc_drv_probe(struct
platform_device *pdev)
> > host->dma_mask = DMA_BIT_MASK(32);
> > mmc_dev(mmc)->dma_mask = &host->dma_mask;
> >
> > +#if IS_ENABLED(CONFIG_MMC_CQHCI)
> > + if (mmc->caps2 & MMC_CAP2_CQE) {
> > + host->cq_host = devm_kzalloc(host->mmc->parent,
> > + sizeof(*host->cq_host),
> > + GFP_KERNEL);
> > + host->cq_host->caps |= CQHCI_TASK_DESC_SZ_128;
> > + host->cq_host->mmio = host->base + 0x800;
> > + host->cq_host->ops = &msdc_cmdq_ops;
> > + cqhci_init(host->cq_host, mmc, true);
> > + mmc->max_segs = 128;
> > + /* cqhci 16bit length */
> > + /* 0 size, means 65536 so we don't have to -1 here
*/
> > + mmc->max_seg_size = 64 * 1024;
> > + }
> > +#endif
> > +
> > host->timeout_clks = 3 * 1048576;
> > host->dma.gpd = dma_alloc_coherent(&pdev->dev,
> > 2 * sizeof(struct mt_gpdma_desc),
> > --
> > 1.9.1
> >
>
> Kind regards
> Uffe
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-02-04 1:02 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-01 6:43 [PATCH 1/3] [1/3] mmc: core: expose MMC_CAP2_CQE* to dt Chun-Hung Wu
2019-11-01 6:43 ` [PATCH 2/3] [2/3] mmc: mediatek: command queue support Chun-Hung Wu
2019-11-11 13:37 ` Ulf Hansson
2020-02-04 1:01 ` Chun-Hung Wu
2019-11-01 6:43 ` [PATCH 3/3] [3/3] dt-bindings: mmc: mediatek: Add document for mt6779 Chun-Hung Wu
2019-11-06 4:17 ` Rob Herring
2019-11-06 8:07 ` Chun-Hung Wu
2019-11-11 13:04 ` [PATCH 1/3] [1/3] mmc: core: expose MMC_CAP2_CQE* to dt Ulf Hansson
2020-02-04 0:44 ` Chun-Hung Wu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).