* [PATCH 0/3] mmc: meson-gx: add ddr-access-quirk support
@ 2019-05-13 9:15 Neil Armstrong
2019-05-13 9:15 ` [PATCH 1/3] dt-bindings: mmc: meson-gx: add ddr-access-quirk property Neil Armstrong
` (4 more replies)
0 siblings, 5 replies; 19+ messages in thread
From: Neil Armstrong @ 2019-05-13 9:15 UTC (permalink / raw)
To: ulf.hansson, khilman
Cc: Neil Armstrong, baylibre-upstreaming, linux-mmc, linux-kernel,
linux-amlogic, linux-arm-kernel
On the Amlogic G12A SoC family, (only) the SDIO controller fails to access
the data from DDR, leading to a broken controller.
Add the amlogic,ddr-access-quirk property so signal this particular
controller has this bug and needs a quirk to work properly.
But each MMC controller has 1,5KiB of SRAM after the registers, that can
be used as bounce buffer to avoid direct DDR access from the integrated
DMAs (this SRAM may be used by the boot ROM when DDR is not yet initialized).
The quirk is to disable the chained descriptor for this controller, and
use this SRAM memory zone as buffer for the bounce buffer fallback mode.
The performance hit hasn't been evaluated, but the fix has been tested
using a WiFi AP6398S SDIO module, and the iperf3 Bandwidth measurement gave
55.2 Mbits/sec over a 63 Hours long test, with the SDIO ios set as High-Speed
at 50MHz clock. It gave around 170 Mbits/sec as SDR104 and 200MHz clock.
Neil Armstrong (3):
dt-bindings: mmc: meson-gx: add ddr-access-quirk property
mmc: meson-gx: add ddr-access-quirk
arm64: dts: meson-g12a: add ddr-access-quirk property to SDIO
controller
.../bindings/mmc/amlogic,meson-gx.txt | 4 ++
arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 1 +
drivers/mmc/host/meson-gx-mmc.c | 65 +++++++++++++++----
3 files changed, 57 insertions(+), 13 deletions(-)
--
2.21.0
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 1/3] dt-bindings: mmc: meson-gx: add ddr-access-quirk property 2019-05-13 9:15 [PATCH 0/3] mmc: meson-gx: add ddr-access-quirk support Neil Armstrong @ 2019-05-13 9:15 ` Neil Armstrong 2019-05-14 17:50 ` Martin Blumenstingl 2019-05-15 11:37 ` Ulf Hansson 2019-05-13 9:15 ` [PATCH 2/3] mmc: meson-gx: add ddr-access-quirk Neil Armstrong ` (3 subsequent siblings) 4 siblings, 2 replies; 19+ messages in thread From: Neil Armstrong @ 2019-05-13 9:15 UTC (permalink / raw) To: ulf.hansson, khilman, devicetree Cc: Neil Armstrong, baylibre-upstreaming, linux-mmc, linux-kernel, linux-amlogic, linux-arm-kernel On the Amlogic G12A SoC family, (only) the SDIO controller has a bug which makes any DDR access from the MMC controller fail. Add the amlogic,ddr-access-quirk property so signal this particular controller has this bug and needs a quirk to work properly. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt index 13e70409e8ac..f8914dab06c6 100644 --- a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt @@ -22,6 +22,10 @@ Required properties: clock rate requested by the MMC core. - resets : phandle of the internal reset line +Optional properties: +- amlogic,ddr-access-quirk: set when HW cannot access the DDR memory, like on + the G12A SDIO controller. + Example: sd_emmc_a: mmc@70000 { -- 2.21.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 1/3] dt-bindings: mmc: meson-gx: add ddr-access-quirk property 2019-05-13 9:15 ` [PATCH 1/3] dt-bindings: mmc: meson-gx: add ddr-access-quirk property Neil Armstrong @ 2019-05-14 17:50 ` Martin Blumenstingl 2019-05-15 12:43 ` Neil Armstrong 2019-05-15 11:37 ` Ulf Hansson 1 sibling, 1 reply; 19+ messages in thread From: Martin Blumenstingl @ 2019-05-14 17:50 UTC (permalink / raw) To: Neil Armstrong Cc: devicetree, ulf.hansson, baylibre-upstreaming, khilman, linux-mmc, linux-kernel, linux-amlogic, linux-arm-kernel Hi Neil, On Mon, May 13, 2019 at 11:16 AM Neil Armstrong <narmstrong@baylibre.com> wrote: > > On the Amlogic G12A SoC family, (only) the SDIO controller has a bug which > makes any DDR access from the MMC controller fail. > > Add the amlogic,ddr-access-quirk property so signal this particular > controller has this bug and needs a quirk to work properly. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > --- > Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt > index 13e70409e8ac..f8914dab06c6 100644 > --- a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt > +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt > @@ -22,6 +22,10 @@ Required properties: > clock rate requested by the MMC core. > - resets : phandle of the internal reset line > > +Optional properties: > +- amlogic,ddr-access-quirk: set when HW cannot access the DDR memory, like on > + the G12A SDIO controller. (I believe we cannot use a standard property like "dma-ranges" to disable DMA access) personally I prefer "amlogic,no-direct-memory-access" or "amlogic,no-ddr-access", but if Rob is happy with the current naming then I'm happy as well Regards Martin _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/3] dt-bindings: mmc: meson-gx: add ddr-access-quirk property 2019-05-14 17:50 ` Martin Blumenstingl @ 2019-05-15 12:43 ` Neil Armstrong 0 siblings, 0 replies; 19+ messages in thread From: Neil Armstrong @ 2019-05-15 12:43 UTC (permalink / raw) To: Martin Blumenstingl Cc: devicetree, ulf.hansson, baylibre-upstreaming, khilman, linux-mmc, linux-kernel, linux-amlogic, linux-arm-kernel On 14/05/2019 19:50, Martin Blumenstingl wrote: > Hi Neil, > > On Mon, May 13, 2019 at 11:16 AM Neil Armstrong <narmstrong@baylibre.com> wrote: >> >> On the Amlogic G12A SoC family, (only) the SDIO controller has a bug which >> makes any DDR access from the MMC controller fail. >> >> Add the amlogic,ddr-access-quirk property so signal this particular >> controller has this bug and needs a quirk to work properly. >> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > >> --- >> Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt >> index 13e70409e8ac..f8914dab06c6 100644 >> --- a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt >> +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt >> @@ -22,6 +22,10 @@ Required properties: >> clock rate requested by the MMC core. >> - resets : phandle of the internal reset line >> >> +Optional properties: >> +- amlogic,ddr-access-quirk: set when HW cannot access the DDR memory, like on >> + the G12A SDIO controller. > (I believe we cannot use a standard property like "dma-ranges" to > disable DMA access) > personally I prefer "amlogic,no-direct-memory-access" or > "amlogic,no-ddr-access", but if Rob is happy with the current naming > then I'm happy as well I have no preference, I can change it easily, Neil > > > Regards > Martin > _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/3] dt-bindings: mmc: meson-gx: add ddr-access-quirk property 2019-05-13 9:15 ` [PATCH 1/3] dt-bindings: mmc: meson-gx: add ddr-access-quirk property Neil Armstrong 2019-05-14 17:50 ` Martin Blumenstingl @ 2019-05-15 11:37 ` Ulf Hansson 2019-05-15 12:43 ` Neil Armstrong 1 sibling, 1 reply; 19+ messages in thread From: Ulf Hansson @ 2019-05-15 11:37 UTC (permalink / raw) To: Neil Armstrong Cc: DTML, baylibre-upstreaming, Kevin Hilman, linux-mmc, Linux Kernel Mailing List, open list:ARM/Amlogic Meson..., Linux ARM On Mon, 13 May 2019 at 11:16, Neil Armstrong <narmstrong@baylibre.com> wrote: > > On the Amlogic G12A SoC family, (only) the SDIO controller has a bug which > makes any DDR access from the MMC controller fail. > > Add the amlogic,ddr-access-quirk property so signal this particular > controller has this bug and needs a quirk to work properly. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt > index 13e70409e8ac..f8914dab06c6 100644 > --- a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt > +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt > @@ -22,6 +22,10 @@ Required properties: > clock rate requested by the MMC core. > - resets : phandle of the internal reset line > > +Optional properties: > +- amlogic,ddr-access-quirk: set when HW cannot access the DDR memory, like on > + the G12A SDIO controller. As stated on the other patch, may I suggest to use DRAM instead of DDR. Moreover, please mention that this is about the internal DMA support of the controller. > + > Example: > > sd_emmc_a: mmc@70000 { > -- > 2.21.0 > Kind regards Uffe _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/3] dt-bindings: mmc: meson-gx: add ddr-access-quirk property 2019-05-15 11:37 ` Ulf Hansson @ 2019-05-15 12:43 ` Neil Armstrong 0 siblings, 0 replies; 19+ messages in thread From: Neil Armstrong @ 2019-05-15 12:43 UTC (permalink / raw) To: Ulf Hansson Cc: DTML, baylibre-upstreaming, Kevin Hilman, linux-mmc, Linux Kernel Mailing List, open list:ARM/Amlogic Meson..., Linux ARM On 15/05/2019 13:37, Ulf Hansson wrote: > On Mon, 13 May 2019 at 11:16, Neil Armstrong <narmstrong@baylibre.com> wrote: >> >> On the Amlogic G12A SoC family, (only) the SDIO controller has a bug which >> makes any DDR access from the MMC controller fail. >> >> Add the amlogic,ddr-access-quirk property so signal this particular >> controller has this bug and needs a quirk to work properly. >> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >> --- >> Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt >> index 13e70409e8ac..f8914dab06c6 100644 >> --- a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt >> +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt >> @@ -22,6 +22,10 @@ Required properties: >> clock rate requested by the MMC core. >> - resets : phandle of the internal reset line >> >> +Optional properties: >> +- amlogic,ddr-access-quirk: set when HW cannot access the DDR memory, like on >> + the G12A SDIO controller. > > As stated on the other patch, may I suggest to use DRAM instead of DDR. Indeed, may be more accurate. > > Moreover, please mention that this is about the internal DMA support > of the controller. Ok > >> + >> Example: >> >> sd_emmc_a: mmc@70000 { >> -- >> 2.21.0 >> > > Kind regards > Uffe > _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 2/3] mmc: meson-gx: add ddr-access-quirk 2019-05-13 9:15 [PATCH 0/3] mmc: meson-gx: add ddr-access-quirk support Neil Armstrong 2019-05-13 9:15 ` [PATCH 1/3] dt-bindings: mmc: meson-gx: add ddr-access-quirk property Neil Armstrong @ 2019-05-13 9:15 ` Neil Armstrong 2019-05-13 17:47 ` Kevin Hilman ` (2 more replies) 2019-05-13 9:15 ` [PATCH 3/3] arm64: dts: meson-g12a: add ddr-access-quirk property to SDIO controller Neil Armstrong ` (2 subsequent siblings) 4 siblings, 3 replies; 19+ messages in thread From: Neil Armstrong @ 2019-05-13 9:15 UTC (permalink / raw) To: ulf.hansson, khilman Cc: Neil Armstrong, baylibre-upstreaming, linux-mmc, linux-kernel, linux-amlogic, linux-arm-kernel On the Amlogic G12A SoC family, (only) the SDIO controller fails to access the data from DDR, leading to a broken controller. But each MMC controller has 1,5KiB of SRAM after the registers, that can be used as bounce buffer to avoid direct DDR access from the integrated DMAs (this SRAM may be used by the boot ROM when DDR is not yet initialized). The quirk is to disable the chained descriptor for this controller, and use this SRAM memory zone as buffer for the bounce buffer fallback mode. The performance hit hasn't been evaluated, but the fix has been tested using a WiFi AP6398S SDIO module, and the iperf3 Bandwidth measurement gave 55.2 Mbits/sec over a 63 Hours long test, with the SDIO ios set as High-Speed at 50MHz clock. It gave 170 Mbits/sec as SDR104 and 200MHz clock. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/mmc/host/meson-gx-mmc.c | 65 ++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 13 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index c5a8af4ca76b..6ef465304052 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -129,6 +129,9 @@ #define SD_EMMC_TXD 0x94 #define SD_EMMC_LAST_REG SD_EMMC_TXD +#define SD_EMMC_SRAM_DATA_BUF_LEN 1536 +#define SD_EMMC_SRAM_DATA_BUF_OFF 0x200 + #define SD_EMMC_CFG_BLK_SIZE 512 /* internal buffer max: 512 bytes */ #define SD_EMMC_CFG_RESP_TIMEOUT 256 /* in clock cycles */ #define SD_EMMC_CMD_TIMEOUT 1024 /* in ms */ @@ -168,6 +171,8 @@ struct meson_host { unsigned long req_rate; bool ddr; + bool ddr_access_quirk; + struct pinctrl *pinctrl; struct pinctrl_state *pins_default; struct pinctrl_state *pins_clk_gate; @@ -232,11 +237,20 @@ static struct mmc_command *meson_mmc_get_next_command(struct mmc_command *cmd) static void meson_mmc_get_transfer_mode(struct mmc_host *mmc, struct mmc_request *mrq) { + struct meson_host *host = mmc_priv(mmc); struct mmc_data *data = mrq->data; struct scatterlist *sg; int i; bool use_desc_chain_mode = true; + /* + * When Controller DMA cannot directly access DDR memory, disable + * support for Chain Mode to directly use the internal SRAM using + * the bounce buffer mode. + */ + if (host->ddr_access_quirk) + return; + /* * Broken SDIO with AP6255-based WiFi on Khadas VIM Pro has been * reported. For some strange reason this occurs in descriptor @@ -1049,6 +1063,10 @@ static int meson_mmc_probe(struct platform_device *pdev) host->dev = &pdev->dev; dev_set_drvdata(&pdev->dev, host); + /* The G12A SDIO Controller needs an SRAM bounce buffer */ + host->ddr_access_quirk = device_property_read_bool(&pdev->dev, + "amlogic,ddr-access-quirk"); + /* Get regulators and the supported OCR mask */ host->vqmmc_enabled = false; ret = mmc_regulator_get_supply(mmc); @@ -1146,9 +1164,16 @@ static int meson_mmc_probe(struct platform_device *pdev) goto err_init_clk; mmc->caps |= MMC_CAP_CMD23; - mmc->max_blk_count = CMD_CFG_LENGTH_MASK; + if (host->ddr_access_quirk) { + /* Limit to the available sram memory */ + mmc->max_segs = SD_EMMC_SRAM_DATA_BUF_LEN / mmc->max_blk_size; + mmc->max_blk_count = mmc->max_segs; + } else { + mmc->max_blk_count = CMD_CFG_LENGTH_MASK; + mmc->max_segs = SD_EMMC_DESC_BUF_LEN / + sizeof(struct sd_emmc_desc); + } mmc->max_req_size = mmc->max_blk_count * mmc->max_blk_size; - mmc->max_segs = SD_EMMC_DESC_BUF_LEN / sizeof(struct sd_emmc_desc); mmc->max_seg_size = mmc->max_req_size; /* @@ -1158,15 +1183,27 @@ static int meson_mmc_probe(struct platform_device *pdev) */ mmc->caps2 &= ~MMC_CAP2_HS400; - /* data bounce buffer */ - host->bounce_buf_size = mmc->max_req_size; - host->bounce_buf = - dma_alloc_coherent(host->dev, host->bounce_buf_size, - &host->bounce_dma_addr, GFP_KERNEL); - if (host->bounce_buf == NULL) { - dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n"); - ret = -ENOMEM; - goto err_free_irq; + if (host->ddr_access_quirk) { + /* + * The MMC Controller embeds 1,5KiB of internal SRAM + * that can be used to be used as bounce buffer. + * In the case of the G12A SDIO controller, use these + * instead of the DDR memory + */ + host->bounce_buf_size = SD_EMMC_SRAM_DATA_BUF_LEN; + host->bounce_buf = host->regs + SD_EMMC_SRAM_DATA_BUF_OFF; + host->bounce_dma_addr = res->start + SD_EMMC_SRAM_DATA_BUF_OFF; + } else { + /* data bounce buffer */ + host->bounce_buf_size = mmc->max_req_size; + host->bounce_buf = + dma_alloc_coherent(host->dev, host->bounce_buf_size, + &host->bounce_dma_addr, GFP_KERNEL); + if (host->bounce_buf == NULL) { + dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n"); + ret = -ENOMEM; + goto err_free_irq; + } } host->descs = dma_alloc_coherent(host->dev, SD_EMMC_DESC_BUF_LEN, @@ -1208,8 +1245,10 @@ static int meson_mmc_remove(struct platform_device *pdev) dma_free_coherent(host->dev, SD_EMMC_DESC_BUF_LEN, host->descs, host->descs_dma_addr); - dma_free_coherent(host->dev, host->bounce_buf_size, - host->bounce_buf, host->bounce_dma_addr); + + if (!host->ddr_access_quirk) + dma_free_coherent(host->dev, host->bounce_buf_size, + host->bounce_buf, host->bounce_dma_addr); clk_disable_unprepare(host->mmc_clk); clk_disable_unprepare(host->core_clk); -- 2.21.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 2/3] mmc: meson-gx: add ddr-access-quirk 2019-05-13 9:15 ` [PATCH 2/3] mmc: meson-gx: add ddr-access-quirk Neil Armstrong @ 2019-05-13 17:47 ` Kevin Hilman 2019-05-14 17:58 ` Martin Blumenstingl 2019-05-15 11:34 ` Ulf Hansson 2 siblings, 0 replies; 19+ messages in thread From: Kevin Hilman @ 2019-05-13 17:47 UTC (permalink / raw) To: Neil Armstrong, ulf.hansson Cc: Neil Armstrong, baylibre-upstreaming, linux-mmc, linux-kernel, linux-amlogic, linux-arm-kernel Neil Armstrong <narmstrong@baylibre.com> writes: > On the Amlogic G12A SoC family, (only) the SDIO controller fails to access > the data from DDR, leading to a broken controller. > > But each MMC controller has 1,5KiB of SRAM after the registers, that can > be used as bounce buffer to avoid direct DDR access from the integrated > DMAs (this SRAM may be used by the boot ROM when DDR is not yet initialized). > > The quirk is to disable the chained descriptor for this controller, and > use this SRAM memory zone as buffer for the bounce buffer fallback mode. > > The performance hit hasn't been evaluated, but the fix has been tested > using a WiFi AP6398S SDIO module, and the iperf3 Bandwidth measurement gave > 55.2 Mbits/sec over a 63 Hours long test, with the SDIO ios set as High-Speed > at 50MHz clock. It gave 170 Mbits/sec as SDR104 and 200MHz clock. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Reviewed-by: Kevin Hilman <khilman@baylibre.com> _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/3] mmc: meson-gx: add ddr-access-quirk 2019-05-13 9:15 ` [PATCH 2/3] mmc: meson-gx: add ddr-access-quirk Neil Armstrong 2019-05-13 17:47 ` Kevin Hilman @ 2019-05-14 17:58 ` Martin Blumenstingl 2019-05-15 12:45 ` Neil Armstrong 2019-05-15 11:34 ` Ulf Hansson 2 siblings, 1 reply; 19+ messages in thread From: Martin Blumenstingl @ 2019-05-14 17:58 UTC (permalink / raw) To: Neil Armstrong Cc: ulf.hansson, baylibre-upstreaming, khilman, linux-mmc, linux-kernel, linux-amlogic, linux-arm-kernel Hi Neil, On Mon, May 13, 2019 at 11:16 AM Neil Armstrong <narmstrong@baylibre.com> wrote: [...] > @@ -1158,15 +1183,27 @@ static int meson_mmc_probe(struct platform_device *pdev) > */ > mmc->caps2 &= ~MMC_CAP2_HS400; > > - /* data bounce buffer */ > - host->bounce_buf_size = mmc->max_req_size; > - host->bounce_buf = > - dma_alloc_coherent(host->dev, host->bounce_buf_size, > - &host->bounce_dma_addr, GFP_KERNEL); > - if (host->bounce_buf == NULL) { > - dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n"); > - ret = -ENOMEM; > - goto err_free_irq; > + if (host->ddr_access_quirk) { > + /* > + * The MMC Controller embeds 1,5KiB of internal SRAM > + * that can be used to be used as bounce buffer. > + * In the case of the G12A SDIO controller, use these > + * instead of the DDR memory > + */ > + host->bounce_buf_size = SD_EMMC_SRAM_DATA_BUF_LEN; > + host->bounce_buf = host->regs + SD_EMMC_SRAM_DATA_BUF_OFF; > + host->bounce_dma_addr = res->start + SD_EMMC_SRAM_DATA_BUF_OFF; I'm curious: why do you need to set bounce_dma_addr in this case? > + } else { > + /* data bounce buffer */ > + host->bounce_buf_size = mmc->max_req_size; > + host->bounce_buf = > + dma_alloc_coherent(host->dev, host->bounce_buf_size, > + &host->bounce_dma_addr, GFP_KERNEL); > + if (host->bounce_buf == NULL) { > + dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n"); > + ret = -ENOMEM; > + goto err_free_irq; > + } > } > > host->descs = dma_alloc_coherent(host->dev, SD_EMMC_DESC_BUF_LEN, if host->descs cannot be allocated then you need to conditionally skip dma_free_coherent for the bounce buffer in the goto err_bounce_buf case a few lines below (just like you did in meson_mmc_remove) Martin _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/3] mmc: meson-gx: add ddr-access-quirk 2019-05-14 17:58 ` Martin Blumenstingl @ 2019-05-15 12:45 ` Neil Armstrong 2019-05-15 21:18 ` Martin Blumenstingl 0 siblings, 1 reply; 19+ messages in thread From: Neil Armstrong @ 2019-05-15 12:45 UTC (permalink / raw) To: Martin Blumenstingl Cc: ulf.hansson, baylibre-upstreaming, khilman, linux-mmc, linux-kernel, linux-amlogic, linux-arm-kernel On 14/05/2019 19:58, Martin Blumenstingl wrote: > Hi Neil, > > On Mon, May 13, 2019 at 11:16 AM Neil Armstrong <narmstrong@baylibre.com> wrote: > [...] >> @@ -1158,15 +1183,27 @@ static int meson_mmc_probe(struct platform_device *pdev) >> */ >> mmc->caps2 &= ~MMC_CAP2_HS400; >> >> - /* data bounce buffer */ >> - host->bounce_buf_size = mmc->max_req_size; >> - host->bounce_buf = >> - dma_alloc_coherent(host->dev, host->bounce_buf_size, >> - &host->bounce_dma_addr, GFP_KERNEL); >> - if (host->bounce_buf == NULL) { >> - dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n"); >> - ret = -ENOMEM; >> - goto err_free_irq; >> + if (host->ddr_access_quirk) { >> + /* >> + * The MMC Controller embeds 1,5KiB of internal SRAM >> + * that can be used to be used as bounce buffer. >> + * In the case of the G12A SDIO controller, use these >> + * instead of the DDR memory >> + */ >> + host->bounce_buf_size = SD_EMMC_SRAM_DATA_BUF_LEN; >> + host->bounce_buf = host->regs + SD_EMMC_SRAM_DATA_BUF_OFF; >> + host->bounce_dma_addr = res->start + SD_EMMC_SRAM_DATA_BUF_OFF; > I'm curious: why do you need to set bounce_dma_addr in this case? We still need the physical bounce buffer address since we write in the registers, and we need the logical address to memcpy() in the buffer. > >> + } else { >> + /* data bounce buffer */ >> + host->bounce_buf_size = mmc->max_req_size; >> + host->bounce_buf = >> + dma_alloc_coherent(host->dev, host->bounce_buf_size, >> + &host->bounce_dma_addr, GFP_KERNEL); >> + if (host->bounce_buf == NULL) { >> + dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n"); >> + ret = -ENOMEM; >> + goto err_free_irq; >> + } >> } >> >> host->descs = dma_alloc_coherent(host->dev, SD_EMMC_DESC_BUF_LEN, > if host->descs cannot be allocated then you need to conditionally skip > dma_free_coherent for the bounce buffer in the goto err_bounce_buf > case a few lines below (just like you did in meson_mmc_remove) It can be allocated, it's only useless. I can skip it but I don't want to break any logic in the driver. > > > Martin > _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/3] mmc: meson-gx: add ddr-access-quirk 2019-05-15 12:45 ` Neil Armstrong @ 2019-05-15 21:18 ` Martin Blumenstingl 2019-05-16 9:09 ` Neil Armstrong 0 siblings, 1 reply; 19+ messages in thread From: Martin Blumenstingl @ 2019-05-15 21:18 UTC (permalink / raw) To: Neil Armstrong Cc: ulf.hansson, baylibre-upstreaming, khilman, linux-mmc, linux-kernel, linux-amlogic, linux-arm-kernel Hi Neil, On Wed, May 15, 2019 at 2:45 PM Neil Armstrong <narmstrong@baylibre.com> wrote: > > On 14/05/2019 19:58, Martin Blumenstingl wrote: > > Hi Neil, > > > > On Mon, May 13, 2019 at 11:16 AM Neil Armstrong <narmstrong@baylibre.com> wrote: > > [...] > >> @@ -1158,15 +1183,27 @@ static int meson_mmc_probe(struct platform_device *pdev) > >> */ > >> mmc->caps2 &= ~MMC_CAP2_HS400; > >> > >> - /* data bounce buffer */ > >> - host->bounce_buf_size = mmc->max_req_size; > >> - host->bounce_buf = > >> - dma_alloc_coherent(host->dev, host->bounce_buf_size, > >> - &host->bounce_dma_addr, GFP_KERNEL); > >> - if (host->bounce_buf == NULL) { > >> - dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n"); > >> - ret = -ENOMEM; > >> - goto err_free_irq; > >> + if (host->ddr_access_quirk) { > >> + /* > >> + * The MMC Controller embeds 1,5KiB of internal SRAM > >> + * that can be used to be used as bounce buffer. > >> + * In the case of the G12A SDIO controller, use these > >> + * instead of the DDR memory > >> + */ > >> + host->bounce_buf_size = SD_EMMC_SRAM_DATA_BUF_LEN; > >> + host->bounce_buf = host->regs + SD_EMMC_SRAM_DATA_BUF_OFF; > >> + host->bounce_dma_addr = res->start + SD_EMMC_SRAM_DATA_BUF_OFF; > > I'm curious: why do you need to set bounce_dma_addr in this case? > > We still need the physical bounce buffer address since we write in the registers, so writing bounce_dma_addr to SD_EMMC_CMD_DAT is needed to make it work? > and we need the logical address to memcpy() in the buffer. as far as I understand that is what we use the "bounce_buf" member for, but I don't see why we need "bounce_dma_addr" > > > >> + } else { > >> + /* data bounce buffer */ > >> + host->bounce_buf_size = mmc->max_req_size; > >> + host->bounce_buf = > >> + dma_alloc_coherent(host->dev, host->bounce_buf_size, > >> + &host->bounce_dma_addr, GFP_KERNEL); > >> + if (host->bounce_buf == NULL) { > >> + dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n"); > >> + ret = -ENOMEM; > >> + goto err_free_irq; > >> + } > >> } > >> > >> host->descs = dma_alloc_coherent(host->dev, SD_EMMC_DESC_BUF_LEN, > > if host->descs cannot be allocated then you need to conditionally skip > > dma_free_coherent for the bounce buffer in the goto err_bounce_buf > > case a few lines below (just like you did in meson_mmc_remove) > > It can be allocated, it's only useless. I can skip it but I don't want > to break any logic in the driver. I wasn't clear in my last email, I meant this error case: err_bounce_buf: dma_free_coherent(host->dev, host->bounce_buf_size, ... when host->ddr_access_quirk is true then you skip the dma_alloc_coherent call for bounce_buf Martin _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/3] mmc: meson-gx: add ddr-access-quirk 2019-05-15 21:18 ` Martin Blumenstingl @ 2019-05-16 9:09 ` Neil Armstrong 0 siblings, 0 replies; 19+ messages in thread From: Neil Armstrong @ 2019-05-16 9:09 UTC (permalink / raw) To: Martin Blumenstingl Cc: ulf.hansson, baylibre-upstreaming, khilman, linux-mmc, linux-kernel, linux-amlogic, linux-arm-kernel On 15/05/2019 23:18, Martin Blumenstingl wrote: > Hi Neil, > > On Wed, May 15, 2019 at 2:45 PM Neil Armstrong <narmstrong@baylibre.com> wrote: >> >> On 14/05/2019 19:58, Martin Blumenstingl wrote: >>> Hi Neil, >>> >>> On Mon, May 13, 2019 at 11:16 AM Neil Armstrong <narmstrong@baylibre.com> wrote: >>> [...] >>>> @@ -1158,15 +1183,27 @@ static int meson_mmc_probe(struct platform_device *pdev) >>>> */ >>>> mmc->caps2 &= ~MMC_CAP2_HS400; >>>> >>>> - /* data bounce buffer */ >>>> - host->bounce_buf_size = mmc->max_req_size; >>>> - host->bounce_buf = >>>> - dma_alloc_coherent(host->dev, host->bounce_buf_size, >>>> - &host->bounce_dma_addr, GFP_KERNEL); >>>> - if (host->bounce_buf == NULL) { >>>> - dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n"); >>>> - ret = -ENOMEM; >>>> - goto err_free_irq; >>>> + if (host->ddr_access_quirk) { >>>> + /* >>>> + * The MMC Controller embeds 1,5KiB of internal SRAM >>>> + * that can be used to be used as bounce buffer. >>>> + * In the case of the G12A SDIO controller, use these >>>> + * instead of the DDR memory >>>> + */ >>>> + host->bounce_buf_size = SD_EMMC_SRAM_DATA_BUF_LEN; >>>> + host->bounce_buf = host->regs + SD_EMMC_SRAM_DATA_BUF_OFF; >>>> + host->bounce_dma_addr = res->start + SD_EMMC_SRAM_DATA_BUF_OFF; >>> I'm curious: why do you need to set bounce_dma_addr in this case? >> >> We still need the physical bounce buffer address since we write in the registers, > so writing bounce_dma_addr to SD_EMMC_CMD_DAT is needed to make it work? > >> and we need the logical address to memcpy() in the buffer. > as far as I understand that is what we use the "bounce_buf" member > for, but I don't see why we need "bounce_dma_addr" Sorry I don't understand these questions, I haven't changed the bounce buffer behavior here, I only make it use a local SRAM buffer instead of an dma_alloc_coherent() allocated buffer. Having bounce_buf_size/bounce_buf/bounce_dma_addr is still necessary like an allocated buffer. > >>> >>>> + } else { >>>> + /* data bounce buffer */ >>>> + host->bounce_buf_size = mmc->max_req_size; >>>> + host->bounce_buf = >>>> + dma_alloc_coherent(host->dev, host->bounce_buf_size, >>>> + &host->bounce_dma_addr, GFP_KERNEL); >>>> + if (host->bounce_buf == NULL) { >>>> + dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n"); >>>> + ret = -ENOMEM; >>>> + goto err_free_irq; >>>> + } >>>> } >>>> >>>> host->descs = dma_alloc_coherent(host->dev, SD_EMMC_DESC_BUF_LEN, >>> if host->descs cannot be allocated then you need to conditionally skip >>> dma_free_coherent for the bounce buffer in the goto err_bounce_buf >>> case a few lines below (just like you did in meson_mmc_remove) >> >> It can be allocated, it's only useless. I can skip it but I don't want >> to break any logic in the driver. > I wasn't clear in my last email, I meant this error case: > err_bounce_buf: > dma_free_coherent(host->dev, host->bounce_buf_size, ... > when host->ddr_access_quirk is true then you skip the > dma_alloc_coherent call for bounce_buf Oh, ok, yes, I'll add it. Neil > > > Martin > _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/3] mmc: meson-gx: add ddr-access-quirk 2019-05-13 9:15 ` [PATCH 2/3] mmc: meson-gx: add ddr-access-quirk Neil Armstrong 2019-05-13 17:47 ` Kevin Hilman 2019-05-14 17:58 ` Martin Blumenstingl @ 2019-05-15 11:34 ` Ulf Hansson 2019-05-15 12:51 ` Neil Armstrong 2 siblings, 1 reply; 19+ messages in thread From: Ulf Hansson @ 2019-05-15 11:34 UTC (permalink / raw) To: Neil Armstrong Cc: baylibre-upstreaming, Kevin Hilman, linux-mmc, Linux Kernel Mailing List, open list:ARM/Amlogic Meson..., Linux ARM On Mon, 13 May 2019 at 11:16, Neil Armstrong <narmstrong@baylibre.com> wrote: > > On the Amlogic G12A SoC family, (only) the SDIO controller fails to access > the data from DDR, leading to a broken controller. Could you possibly make it more clear that this is about the internal DMA support in the controller that is broken? Did you consider to use the controller without using the DMA mode? Is that possible? > > But each MMC controller has 1,5KiB of SRAM after the registers, that can > be used as bounce buffer to avoid direct DDR access from the integrated > DMAs (this SRAM may be used by the boot ROM when DDR is not yet initialized). I think "DDR" is a confusing terminology, that goes for the DT binding as well. What about using "DRAM" instead? In any case, using the SRAM seems like it could work. However, just so I get this right, it solely dedicated to the SDIO controller or may someone else also try to use it? > > The quirk is to disable the chained descriptor for this controller, and > use this SRAM memory zone as buffer for the bounce buffer fallback mode. > > The performance hit hasn't been evaluated, but the fix has been tested > using a WiFi AP6398S SDIO module, and the iperf3 Bandwidth measurement gave > 55.2 Mbits/sec over a 63 Hours long test, with the SDIO ios set as High-Speed > at 50MHz clock. It gave 170 Mbits/sec as SDR104 and 200MHz clock. If possible to not use DMA, it would be interesting to compare numbers. :-) > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > drivers/mmc/host/meson-gx-mmc.c | 65 ++++++++++++++++++++++++++------- > 1 file changed, 52 insertions(+), 13 deletions(-) > > diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c > index c5a8af4ca76b..6ef465304052 100644 > --- a/drivers/mmc/host/meson-gx-mmc.c > +++ b/drivers/mmc/host/meson-gx-mmc.c > @@ -129,6 +129,9 @@ > #define SD_EMMC_TXD 0x94 > #define SD_EMMC_LAST_REG SD_EMMC_TXD > > +#define SD_EMMC_SRAM_DATA_BUF_LEN 1536 > +#define SD_EMMC_SRAM_DATA_BUF_OFF 0x200 > + > #define SD_EMMC_CFG_BLK_SIZE 512 /* internal buffer max: 512 bytes */ > #define SD_EMMC_CFG_RESP_TIMEOUT 256 /* in clock cycles */ > #define SD_EMMC_CMD_TIMEOUT 1024 /* in ms */ > @@ -168,6 +171,8 @@ struct meson_host { > unsigned long req_rate; > bool ddr; > > + bool ddr_access_quirk; > + > struct pinctrl *pinctrl; > struct pinctrl_state *pins_default; > struct pinctrl_state *pins_clk_gate; > @@ -232,11 +237,20 @@ static struct mmc_command *meson_mmc_get_next_command(struct mmc_command *cmd) > static void meson_mmc_get_transfer_mode(struct mmc_host *mmc, > struct mmc_request *mrq) > { > + struct meson_host *host = mmc_priv(mmc); > struct mmc_data *data = mrq->data; > struct scatterlist *sg; > int i; > bool use_desc_chain_mode = true; > > + /* > + * When Controller DMA cannot directly access DDR memory, disable > + * support for Chain Mode to directly use the internal SRAM using > + * the bounce buffer mode. > + */ > + if (host->ddr_access_quirk) > + return; > + > /* > * Broken SDIO with AP6255-based WiFi on Khadas VIM Pro has been > * reported. For some strange reason this occurs in descriptor > @@ -1049,6 +1063,10 @@ static int meson_mmc_probe(struct platform_device *pdev) > host->dev = &pdev->dev; > dev_set_drvdata(&pdev->dev, host); > > + /* The G12A SDIO Controller needs an SRAM bounce buffer */ > + host->ddr_access_quirk = device_property_read_bool(&pdev->dev, > + "amlogic,ddr-access-quirk"); > + > /* Get regulators and the supported OCR mask */ > host->vqmmc_enabled = false; > ret = mmc_regulator_get_supply(mmc); > @@ -1146,9 +1164,16 @@ static int meson_mmc_probe(struct platform_device *pdev) > goto err_init_clk; > > mmc->caps |= MMC_CAP_CMD23; > - mmc->max_blk_count = CMD_CFG_LENGTH_MASK; > + if (host->ddr_access_quirk) { > + /* Limit to the available sram memory */ > + mmc->max_segs = SD_EMMC_SRAM_DATA_BUF_LEN / mmc->max_blk_size; > + mmc->max_blk_count = mmc->max_segs; > + } else { > + mmc->max_blk_count = CMD_CFG_LENGTH_MASK; > + mmc->max_segs = SD_EMMC_DESC_BUF_LEN / > + sizeof(struct sd_emmc_desc); > + } > mmc->max_req_size = mmc->max_blk_count * mmc->max_blk_size; > - mmc->max_segs = SD_EMMC_DESC_BUF_LEN / sizeof(struct sd_emmc_desc); > mmc->max_seg_size = mmc->max_req_size; > > /* > @@ -1158,15 +1183,27 @@ static int meson_mmc_probe(struct platform_device *pdev) > */ > mmc->caps2 &= ~MMC_CAP2_HS400; > > - /* data bounce buffer */ > - host->bounce_buf_size = mmc->max_req_size; > - host->bounce_buf = > - dma_alloc_coherent(host->dev, host->bounce_buf_size, > - &host->bounce_dma_addr, GFP_KERNEL); > - if (host->bounce_buf == NULL) { > - dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n"); > - ret = -ENOMEM; > - goto err_free_irq; > + if (host->ddr_access_quirk) { > + /* > + * The MMC Controller embeds 1,5KiB of internal SRAM > + * that can be used to be used as bounce buffer. > + * In the case of the G12A SDIO controller, use these > + * instead of the DDR memory > + */ > + host->bounce_buf_size = SD_EMMC_SRAM_DATA_BUF_LEN; > + host->bounce_buf = host->regs + SD_EMMC_SRAM_DATA_BUF_OFF; > + host->bounce_dma_addr = res->start + SD_EMMC_SRAM_DATA_BUF_OFF; > + } else { > + /* data bounce buffer */ > + host->bounce_buf_size = mmc->max_req_size; > + host->bounce_buf = > + dma_alloc_coherent(host->dev, host->bounce_buf_size, > + &host->bounce_dma_addr, GFP_KERNEL); > + if (host->bounce_buf == NULL) { > + dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n"); > + ret = -ENOMEM; > + goto err_free_irq; > + } > } > > host->descs = dma_alloc_coherent(host->dev, SD_EMMC_DESC_BUF_LEN, > @@ -1208,8 +1245,10 @@ static int meson_mmc_remove(struct platform_device *pdev) > > dma_free_coherent(host->dev, SD_EMMC_DESC_BUF_LEN, > host->descs, host->descs_dma_addr); > - dma_free_coherent(host->dev, host->bounce_buf_size, > - host->bounce_buf, host->bounce_dma_addr); > + > + if (!host->ddr_access_quirk) > + dma_free_coherent(host->dev, host->bounce_buf_size, > + host->bounce_buf, host->bounce_dma_addr); > > clk_disable_unprepare(host->mmc_clk); > clk_disable_unprepare(host->core_clk); > -- > 2.21.0 > Kind regards Uffe _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/3] mmc: meson-gx: add ddr-access-quirk 2019-05-15 11:34 ` Ulf Hansson @ 2019-05-15 12:51 ` Neil Armstrong 0 siblings, 0 replies; 19+ messages in thread From: Neil Armstrong @ 2019-05-15 12:51 UTC (permalink / raw) To: Ulf Hansson Cc: baylibre-upstreaming, Kevin Hilman, linux-mmc, Linux Kernel Mailing List, open list:ARM/Amlogic Meson..., Linux ARM On 15/05/2019 13:34, Ulf Hansson wrote: > On Mon, 13 May 2019 at 11:16, Neil Armstrong <narmstrong@baylibre.com> wrote: >> >> On the Amlogic G12A SoC family, (only) the SDIO controller fails to access >> the data from DDR, leading to a broken controller. > > Could you possibly make it more clear that this is about the internal > DMA support in the controller that is broken? > > Did you consider to use the controller without using the DMA mode? Is > that possible? No we can only use the DMA, in block mode (using our bounce buffer mode) or in descriptor mode. > >> >> But each MMC controller has 1,5KiB of SRAM after the registers, that can >> be used as bounce buffer to avoid direct DDR access from the integrated >> DMAs (this SRAM may be used by the boot ROM when DDR is not yet initialized). > > I think "DDR" is a confusing terminology, that goes for the DT binding > as well. What about using "DRAM" instead? Seems better, I'll wait on Rob's feedback on this a few more days. > > In any case, using the SRAM seems like it could work. However, just so > I get this right, it solely dedicated to the SDIO controller or may > someone else also try to use it? This SRAM is dedicated to *each* MMC controller. Not sure if other masters could access it, but it would be unfortunate. I'll add these details in the commit log. > >> >> The quirk is to disable the chained descriptor for this controller, and >> use this SRAM memory zone as buffer for the bounce buffer fallback mode. >> >> The performance hit hasn't been evaluated, but the fix has been tested >> using a WiFi AP6398S SDIO module, and the iperf3 Bandwidth measurement gave >> 55.2 Mbits/sec over a 63 Hours long test, with the SDIO ios set as High-Speed >> at 50MHz clock. It gave 170 Mbits/sec as SDR104 and 200MHz clock. > > If possible to not use DMA, it would be interesting to compare numbers. :-) I could activate this quirk on a MMC or SDcard dedicated controller and compare, but SDIO and MMC/SDcard transactions are really different. We compared it on the AXG platform with the same MMC controller revision, CPU freq, DRAM technology, kernel revision and the peak WiFi "speed" was equivalent, but with a slighly superior CPU usage. > >> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >> --- >> drivers/mmc/host/meson-gx-mmc.c | 65 ++++++++++++++++++++++++++------- >> 1 file changed, 52 insertions(+), 13 deletions(-) >> >> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c >> index c5a8af4ca76b..6ef465304052 100644 >> --- a/drivers/mmc/host/meson-gx-mmc.c >> +++ b/drivers/mmc/host/meson-gx-mmc.c >> @@ -129,6 +129,9 @@ >> #define SD_EMMC_TXD 0x94 >> #define SD_EMMC_LAST_REG SD_EMMC_TXD >> >> +#define SD_EMMC_SRAM_DATA_BUF_LEN 1536 >> +#define SD_EMMC_SRAM_DATA_BUF_OFF 0x200 >> + >> #define SD_EMMC_CFG_BLK_SIZE 512 /* internal buffer max: 512 bytes */ >> #define SD_EMMC_CFG_RESP_TIMEOUT 256 /* in clock cycles */ >> #define SD_EMMC_CMD_TIMEOUT 1024 /* in ms */ >> @@ -168,6 +171,8 @@ struct meson_host { >> unsigned long req_rate; >> bool ddr; >> >> + bool ddr_access_quirk; >> + >> struct pinctrl *pinctrl; >> struct pinctrl_state *pins_default; >> struct pinctrl_state *pins_clk_gate; >> @@ -232,11 +237,20 @@ static struct mmc_command *meson_mmc_get_next_command(struct mmc_command *cmd) >> static void meson_mmc_get_transfer_mode(struct mmc_host *mmc, >> struct mmc_request *mrq) >> { >> + struct meson_host *host = mmc_priv(mmc); >> struct mmc_data *data = mrq->data; >> struct scatterlist *sg; >> int i; >> bool use_desc_chain_mode = true; >> >> + /* >> + * When Controller DMA cannot directly access DDR memory, disable >> + * support for Chain Mode to directly use the internal SRAM using >> + * the bounce buffer mode. >> + */ >> + if (host->ddr_access_quirk) >> + return; >> + >> /* >> * Broken SDIO with AP6255-based WiFi on Khadas VIM Pro has been >> * reported. For some strange reason this occurs in descriptor >> @@ -1049,6 +1063,10 @@ static int meson_mmc_probe(struct platform_device *pdev) >> host->dev = &pdev->dev; >> dev_set_drvdata(&pdev->dev, host); >> >> + /* The G12A SDIO Controller needs an SRAM bounce buffer */ >> + host->ddr_access_quirk = device_property_read_bool(&pdev->dev, >> + "amlogic,ddr-access-quirk"); >> + >> /* Get regulators and the supported OCR mask */ >> host->vqmmc_enabled = false; >> ret = mmc_regulator_get_supply(mmc); >> @@ -1146,9 +1164,16 @@ static int meson_mmc_probe(struct platform_device *pdev) >> goto err_init_clk; >> >> mmc->caps |= MMC_CAP_CMD23; >> - mmc->max_blk_count = CMD_CFG_LENGTH_MASK; >> + if (host->ddr_access_quirk) { >> + /* Limit to the available sram memory */ >> + mmc->max_segs = SD_EMMC_SRAM_DATA_BUF_LEN / mmc->max_blk_size; >> + mmc->max_blk_count = mmc->max_segs; >> + } else { >> + mmc->max_blk_count = CMD_CFG_LENGTH_MASK; >> + mmc->max_segs = SD_EMMC_DESC_BUF_LEN / >> + sizeof(struct sd_emmc_desc); >> + } >> mmc->max_req_size = mmc->max_blk_count * mmc->max_blk_size; >> - mmc->max_segs = SD_EMMC_DESC_BUF_LEN / sizeof(struct sd_emmc_desc); >> mmc->max_seg_size = mmc->max_req_size; >> >> /* >> @@ -1158,15 +1183,27 @@ static int meson_mmc_probe(struct platform_device *pdev) >> */ >> mmc->caps2 &= ~MMC_CAP2_HS400; >> >> - /* data bounce buffer */ >> - host->bounce_buf_size = mmc->max_req_size; >> - host->bounce_buf = >> - dma_alloc_coherent(host->dev, host->bounce_buf_size, >> - &host->bounce_dma_addr, GFP_KERNEL); >> - if (host->bounce_buf == NULL) { >> - dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n"); >> - ret = -ENOMEM; >> - goto err_free_irq; >> + if (host->ddr_access_quirk) { >> + /* >> + * The MMC Controller embeds 1,5KiB of internal SRAM >> + * that can be used to be used as bounce buffer. >> + * In the case of the G12A SDIO controller, use these >> + * instead of the DDR memory >> + */ >> + host->bounce_buf_size = SD_EMMC_SRAM_DATA_BUF_LEN; >> + host->bounce_buf = host->regs + SD_EMMC_SRAM_DATA_BUF_OFF; >> + host->bounce_dma_addr = res->start + SD_EMMC_SRAM_DATA_BUF_OFF; >> + } else { >> + /* data bounce buffer */ >> + host->bounce_buf_size = mmc->max_req_size; >> + host->bounce_buf = >> + dma_alloc_coherent(host->dev, host->bounce_buf_size, >> + &host->bounce_dma_addr, GFP_KERNEL); >> + if (host->bounce_buf == NULL) { >> + dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n"); >> + ret = -ENOMEM; >> + goto err_free_irq; >> + } >> } >> >> host->descs = dma_alloc_coherent(host->dev, SD_EMMC_DESC_BUF_LEN, >> @@ -1208,8 +1245,10 @@ static int meson_mmc_remove(struct platform_device *pdev) >> >> dma_free_coherent(host->dev, SD_EMMC_DESC_BUF_LEN, >> host->descs, host->descs_dma_addr); >> - dma_free_coherent(host->dev, host->bounce_buf_size, >> - host->bounce_buf, host->bounce_dma_addr); >> + >> + if (!host->ddr_access_quirk) >> + dma_free_coherent(host->dev, host->bounce_buf_size, >> + host->bounce_buf, host->bounce_dma_addr); >> >> clk_disable_unprepare(host->mmc_clk); >> clk_disable_unprepare(host->core_clk); >> -- >> 2.21.0 >> Thanks for reviewing, > > Kind regards > Uffe > _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 3/3] arm64: dts: meson-g12a: add ddr-access-quirk property to SDIO controller 2019-05-13 9:15 [PATCH 0/3] mmc: meson-gx: add ddr-access-quirk support Neil Armstrong 2019-05-13 9:15 ` [PATCH 1/3] dt-bindings: mmc: meson-gx: add ddr-access-quirk property Neil Armstrong 2019-05-13 9:15 ` [PATCH 2/3] mmc: meson-gx: add ddr-access-quirk Neil Armstrong @ 2019-05-13 9:15 ` Neil Armstrong 2019-05-14 17:51 ` Martin Blumenstingl 2019-05-13 9:58 ` [PATCH 0/3] mmc: meson-gx: add ddr-access-quirk support Jerome Brunet 2019-05-14 9:14 ` [baylibre-upstreaming] " guillaume La Roque 4 siblings, 1 reply; 19+ messages in thread From: Neil Armstrong @ 2019-05-13 9:15 UTC (permalink / raw) To: ulf.hansson, khilman Cc: Neil Armstrong, baylibre-upstreaming, linux-mmc, linux-kernel, linux-amlogic, linux-arm-kernel The Amlogic G12A SDIO Controller has a bug preventing direct DDR access, mark this specific controller with the amlogic,ddr-access-quirk property. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 1 + 1 file changed, 1 insertion(+) Kevin, the MMC node hasn't been sent yet, when the quirk bindings is accepted, we will directly send the MMC modes with this property. Nei diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi index 5cbfca00f5cf..d8b3441f0c45 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -1061,6 +1061,7 @@ <&clkc CLKID_FCLK_DIV2>; clock-names = "core", "clkin0", "clkin1"; resets = <&reset RESET_SD_EMMC_A>; + amlogic,ddr-access-quirk; }; sd_emmc_b: sd@ffe05000 { -- 2.21.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] arm64: dts: meson-g12a: add ddr-access-quirk property to SDIO controller 2019-05-13 9:15 ` [PATCH 3/3] arm64: dts: meson-g12a: add ddr-access-quirk property to SDIO controller Neil Armstrong @ 2019-05-14 17:51 ` Martin Blumenstingl 0 siblings, 0 replies; 19+ messages in thread From: Martin Blumenstingl @ 2019-05-14 17:51 UTC (permalink / raw) To: Neil Armstrong Cc: ulf.hansson, baylibre-upstreaming, khilman, linux-mmc, linux-kernel, linux-amlogic, linux-arm-kernel On Mon, May 13, 2019 at 11:17 AM Neil Armstrong <narmstrong@baylibre.com> wrote: > > The Amlogic G12A SDIO Controller has a bug preventing direct DDR access, > mark this specific controller with the amlogic,ddr-access-quirk property. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/3] mmc: meson-gx: add ddr-access-quirk support 2019-05-13 9:15 [PATCH 0/3] mmc: meson-gx: add ddr-access-quirk support Neil Armstrong ` (2 preceding siblings ...) 2019-05-13 9:15 ` [PATCH 3/3] arm64: dts: meson-g12a: add ddr-access-quirk property to SDIO controller Neil Armstrong @ 2019-05-13 9:58 ` Jerome Brunet 2019-05-13 11:28 ` Jerome Brunet 2019-05-14 9:14 ` [baylibre-upstreaming] " guillaume La Roque 4 siblings, 1 reply; 19+ messages in thread From: Jerome Brunet @ 2019-05-13 9:58 UTC (permalink / raw) To: Neil Armstrong, ulf.hansson, khilman Cc: baylibre-upstreaming, linux-amlogic, linux-mmc, linux-kernel, linux-arm-kernel On Mon, 2019-05-13 at 11:15 +0200, Neil Armstrong wrote: > On the Amlogic G12A SoC family, (only) the SDIO controller fails to access > the data from DDR, leading to a broken controller. > > Add the amlogic,ddr-access-quirk property so signal this particular > controller has this bug and needs a quirk to work properly. > > But each MMC controller has 1,5KiB of SRAM after the registers, that can > be used as bounce buffer to avoid direct DDR access from the integrated > DMAs (this SRAM may be used by the boot ROM when DDR is not yet initialized). > > The quirk is to disable the chained descriptor for this controller, and > use this SRAM memory zone as buffer for the bounce buffer fallback mode. > > The performance hit hasn't been evaluated, but the fix has been tested > using a WiFi AP6398S SDIO module, and the iperf3 Bandwidth measurement gave > 55.2 Mbits/sec over a 63 Hours long test, with the SDIO ios set as High-Speed > at 50MHz clock. It gave around 170 Mbits/sec as SDR104 and 200MHz clock. These numbers looks to be limited by the MMC bandwidth of the related modes. So, if the SRAM quirk introduce a penalty for the controller, it does not appear to be a limiting factor, AFAICT. > > Neil Armstrong (3): > dt-bindings: mmc: meson-gx: add ddr-access-quirk property > mmc: meson-gx: add ddr-access-quirk > arm64: dts: meson-g12a: add ddr-access-quirk property to SDIO > controller > > .../bindings/mmc/amlogic,meson-gx.txt | 4 ++ > arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 1 + > drivers/mmc/host/meson-gx-mmc.c | 65 +++++++++++++++---- > 3 files changed, 57 insertions(+), 13 deletions(-) > _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/3] mmc: meson-gx: add ddr-access-quirk support 2019-05-13 9:58 ` [PATCH 0/3] mmc: meson-gx: add ddr-access-quirk support Jerome Brunet @ 2019-05-13 11:28 ` Jerome Brunet 0 siblings, 0 replies; 19+ messages in thread From: Jerome Brunet @ 2019-05-13 11:28 UTC (permalink / raw) To: Neil Armstrong, ulf.hansson, khilman Cc: baylibre-upstreaming, linux-amlogic, linux-mmc, linux-kernel, linux-arm-kernel On Mon, 2019-05-13 at 11:58 +0200, Jerome Brunet wrote: > > The performance hit hasn't been evaluated, but the fix has been tested > > using a WiFi AP6398S SDIO module, and the iperf3 Bandwidth measurement gave > > 55.2 Mbits/sec over a 63 Hours long test, with the SDIO ios set as High-Speed > > at 50MHz clock. It gave around 170 Mbits/sec as SDR104 and 200MHz clock. > > These numbers looks to be limited by the MMC bandwidth of the related modes. > So, if the SRAM quirk introduce a penalty for the controller, it does not appear > to be a limiting factor, AFAICT. Got confused. This comment is completely wrong, please ignore _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [baylibre-upstreaming] [PATCH 0/3] mmc: meson-gx: add ddr-access-quirk support 2019-05-13 9:15 [PATCH 0/3] mmc: meson-gx: add ddr-access-quirk support Neil Armstrong ` (3 preceding siblings ...) 2019-05-13 9:58 ` [PATCH 0/3] mmc: meson-gx: add ddr-access-quirk support Jerome Brunet @ 2019-05-14 9:14 ` guillaume La Roque 4 siblings, 0 replies; 19+ messages in thread From: guillaume La Roque @ 2019-05-14 9:14 UTC (permalink / raw) To: baylibre-upstreaming, narmstrong, ulf.hansson, khilman Cc: linux-amlogic, linux-mmc, linux-kernel, linux-arm-kernel On 5/13/19 11:15 AM, Neil Armstrong wrote: > On the Amlogic G12A SoC family, (only) the SDIO controller fails to access > the data from DDR, leading to a broken controller. > > Add the amlogic,ddr-access-quirk property so signal this particular > controller has this bug and needs a quirk to work properly. > > But each MMC controller has 1,5KiB of SRAM after the registers, that can > be used as bounce buffer to avoid direct DDR access from the integrated > DMAs (this SRAM may be used by the boot ROM when DDR is not yet initialized). > > The quirk is to disable the chained descriptor for this controller, and > use this SRAM memory zone as buffer for the bounce buffer fallback mode. > > The performance hit hasn't been evaluated, but the fix has been tested > using a WiFi AP6398S SDIO module, and the iperf3 Bandwidth measurement gave > 55.2 Mbits/sec over a 63 Hours long test, with the SDIO ios set as High-Speed > at 50MHz clock. It gave around 170 Mbits/sec as SDR104 and 200MHz clock. > > Neil Armstrong (3): > dt-bindings: mmc: meson-gx: add ddr-access-quirk property > mmc: meson-gx: add ddr-access-quirk > arm64: dts: meson-g12a: add ddr-access-quirk property to SDIO > controller > > .../bindings/mmc/amlogic,meson-gx.txt | 4 ++ > arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 1 + > drivers/mmc/host/meson-gx-mmc.c | 65 +++++++++++++++---- > 3 files changed, 57 insertions(+), 13 deletions(-) > Test with SEI510 board no problem or regression seen Tested-by: Guillaume La Roque <glaroque@baylibre.com> _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2019-05-16 9:10 UTC | newest] Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-05-13 9:15 [PATCH 0/3] mmc: meson-gx: add ddr-access-quirk support Neil Armstrong 2019-05-13 9:15 ` [PATCH 1/3] dt-bindings: mmc: meson-gx: add ddr-access-quirk property Neil Armstrong 2019-05-14 17:50 ` Martin Blumenstingl 2019-05-15 12:43 ` Neil Armstrong 2019-05-15 11:37 ` Ulf Hansson 2019-05-15 12:43 ` Neil Armstrong 2019-05-13 9:15 ` [PATCH 2/3] mmc: meson-gx: add ddr-access-quirk Neil Armstrong 2019-05-13 17:47 ` Kevin Hilman 2019-05-14 17:58 ` Martin Blumenstingl 2019-05-15 12:45 ` Neil Armstrong 2019-05-15 21:18 ` Martin Blumenstingl 2019-05-16 9:09 ` Neil Armstrong 2019-05-15 11:34 ` Ulf Hansson 2019-05-15 12:51 ` Neil Armstrong 2019-05-13 9:15 ` [PATCH 3/3] arm64: dts: meson-g12a: add ddr-access-quirk property to SDIO controller Neil Armstrong 2019-05-14 17:51 ` Martin Blumenstingl 2019-05-13 9:58 ` [PATCH 0/3] mmc: meson-gx: add ddr-access-quirk support Jerome Brunet 2019-05-13 11:28 ` Jerome Brunet 2019-05-14 9:14 ` [baylibre-upstreaming] " guillaume La Roque
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).