All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] mmc: omap: Initialize dma_slave_config to avoid random data in it's fields
@ 2016-09-14 11:21 ` Peter Ujfalusi
  0 siblings, 0 replies; 4+ messages in thread
From: Peter Ujfalusi @ 2016-09-14 11:21 UTC (permalink / raw)
  To: ulf.hansson, arnd; +Cc: tony, kishon, linux-omap, linux-mmc, linux-kernel

It is wrong to use uninitialized dma_slave_config and configure only
certain fields as the DMAengine driver might look at non initialized
(random data) fields and tries to interpret it.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
Hi,

Changes since v1:
- do the field initialization in one step

would it be possible to send this patch for 4.8? I have omap-dma DMAengine
driver changes pending, but they break the MMC/SD because of the uninitialized
fields in dma_slave_config.

Thanks,
Peter

 drivers/mmc/host/omap.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index f23d65eb070d..be3c49fa7382 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1016,14 +1016,16 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req)

 		/* Only reconfigure if we have a different burst size */
 		if (*bp != burst) {
-			struct dma_slave_config cfg;
-
-			cfg.src_addr = host->phys_base + OMAP_MMC_REG(host, DATA);
-			cfg.dst_addr = host->phys_base + OMAP_MMC_REG(host, DATA);
-			cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
-			cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
-			cfg.src_maxburst = burst;
-			cfg.dst_maxburst = burst;
+			struct dma_slave_config cfg = {
+				.src_addr = host->phys_base +
+					    OMAP_MMC_REG(host, DATA),
+				.dst_addr = host->phys_base +
+					    OMAP_MMC_REG(host, DATA),
+				.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES,
+				.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES,
+				.src_maxburst = burst,
+				.dst_maxburst = burst,
+			};

 			if (dmaengine_slave_config(c, &cfg))
 				goto use_pio;
--
2.10.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH v2] mmc: omap: Initialize dma_slave_config to avoid random data in it's fields
@ 2016-09-14 11:21 ` Peter Ujfalusi
  0 siblings, 0 replies; 4+ messages in thread
From: Peter Ujfalusi @ 2016-09-14 11:21 UTC (permalink / raw)
  To: ulf.hansson, arnd; +Cc: tony, kishon, linux-omap, linux-mmc, linux-kernel

It is wrong to use uninitialized dma_slave_config and configure only
certain fields as the DMAengine driver might look at non initialized
(random data) fields and tries to interpret it.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
Hi,

Changes since v1:
- do the field initialization in one step

would it be possible to send this patch for 4.8? I have omap-dma DMAengine
driver changes pending, but they break the MMC/SD because of the uninitialized
fields in dma_slave_config.

Thanks,
Peter

 drivers/mmc/host/omap.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index f23d65eb070d..be3c49fa7382 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1016,14 +1016,16 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req)

 		/* Only reconfigure if we have a different burst size */
 		if (*bp != burst) {
-			struct dma_slave_config cfg;
-
-			cfg.src_addr = host->phys_base + OMAP_MMC_REG(host, DATA);
-			cfg.dst_addr = host->phys_base + OMAP_MMC_REG(host, DATA);
-			cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
-			cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
-			cfg.src_maxburst = burst;
-			cfg.dst_maxburst = burst;
+			struct dma_slave_config cfg = {
+				.src_addr = host->phys_base +
+					    OMAP_MMC_REG(host, DATA),
+				.dst_addr = host->phys_base +
+					    OMAP_MMC_REG(host, DATA),
+				.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES,
+				.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES,
+				.src_maxburst = burst,
+				.dst_maxburst = burst,
+			};

 			if (dmaengine_slave_config(c, &cfg))
 				goto use_pio;
--
2.10.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH v2] mmc: omap: Initialize dma_slave_config to avoid random data in it's fields
  2016-09-14 11:21 ` Peter Ujfalusi
  (?)
@ 2016-09-14 12:01 ` Ulf Hansson
  -1 siblings, 0 replies; 4+ messages in thread
From: Ulf Hansson @ 2016-09-14 12:01 UTC (permalink / raw)
  To: Peter Ujfalusi
  Cc: Arnd Bergmann, Tony Lindgren, Kishon, linux-omap, linux-mmc,
	linux-kernel

On 14 September 2016 at 13:21, Peter Ujfalusi <peter.ujfalusi@ti.com> wrote:
> It is wrong to use uninitialized dma_slave_config and configure only
> certain fields as the DMAengine driver might look at non initialized
> (random data) fields and tries to interpret it.
>
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

Thanks, applied for fixes!

Kind regards
Uffe

> ---
> Hi,
>
> Changes since v1:
> - do the field initialization in one step
>
> would it be possible to send this patch for 4.8? I have omap-dma DMAengine
> driver changes pending, but they break the MMC/SD because of the uninitialized
> fields in dma_slave_config.
>
> Thanks,
> Peter
>
>  drivers/mmc/host/omap.c | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
> index f23d65eb070d..be3c49fa7382 100644
> --- a/drivers/mmc/host/omap.c
> +++ b/drivers/mmc/host/omap.c
> @@ -1016,14 +1016,16 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req)
>
>                 /* Only reconfigure if we have a different burst size */
>                 if (*bp != burst) {
> -                       struct dma_slave_config cfg;
> -
> -                       cfg.src_addr = host->phys_base + OMAP_MMC_REG(host, DATA);
> -                       cfg.dst_addr = host->phys_base + OMAP_MMC_REG(host, DATA);
> -                       cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
> -                       cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
> -                       cfg.src_maxburst = burst;
> -                       cfg.dst_maxburst = burst;
> +                       struct dma_slave_config cfg = {
> +                               .src_addr = host->phys_base +
> +                                           OMAP_MMC_REG(host, DATA),
> +                               .dst_addr = host->phys_base +
> +                                           OMAP_MMC_REG(host, DATA),
> +                               .src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES,
> +                               .dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES,
> +                               .src_maxburst = burst,
> +                               .dst_maxburst = burst,
> +                       };
>
>                         if (dmaengine_slave_config(c, &cfg))
>                                 goto use_pio;
> --
> 2.10.0
>

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH v2] mmc: omap: Initialize dma_slave_config to avoid random data in it's fields
  2016-09-14 11:21 ` Peter Ujfalusi
  (?)
  (?)
@ 2016-09-14 12:01 ` Ulf Hansson
  -1 siblings, 0 replies; 4+ messages in thread
From: Ulf Hansson @ 2016-09-14 12:01 UTC (permalink / raw)
  To: Peter Ujfalusi
  Cc: Arnd Bergmann, Tony Lindgren, Kishon, linux-omap, linux-mmc,
	linux-kernel

On 14 September 2016 at 13:21, Peter Ujfalusi <peter.ujfalusi@ti.com> wrote:
> It is wrong to use uninitialized dma_slave_config and configure only
> certain fields as the DMAengine driver might look at non initialized
> (random data) fields and tries to interpret it.
>
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

Thanks, applied for fixes!

Kind regards
Uffe


> ---
> Hi,
>
> Changes since v1:
> - do the field initialization in one step
>
> would it be possible to send this patch for 4.8? I have omap-dma DMAengine
> driver changes pending, but they break the MMC/SD because of the uninitialized
> fields in dma_slave_config.
>
> Thanks,
> Peter
>
>  drivers/mmc/host/omap.c | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
> index f23d65eb070d..be3c49fa7382 100644
> --- a/drivers/mmc/host/omap.c
> +++ b/drivers/mmc/host/omap.c
> @@ -1016,14 +1016,16 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req)
>
>                 /* Only reconfigure if we have a different burst size */
>                 if (*bp != burst) {
> -                       struct dma_slave_config cfg;
> -
> -                       cfg.src_addr = host->phys_base + OMAP_MMC_REG(host, DATA);
> -                       cfg.dst_addr = host->phys_base + OMAP_MMC_REG(host, DATA);
> -                       cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
> -                       cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
> -                       cfg.src_maxburst = burst;
> -                       cfg.dst_maxburst = burst;
> +                       struct dma_slave_config cfg = {
> +                               .src_addr = host->phys_base +
> +                                           OMAP_MMC_REG(host, DATA),
> +                               .dst_addr = host->phys_base +
> +                                           OMAP_MMC_REG(host, DATA),
> +                               .src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES,
> +                               .dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES,
> +                               .src_maxburst = burst,
> +                               .dst_maxburst = burst,
> +                       };
>
>                         if (dmaengine_slave_config(c, &cfg))
>                                 goto use_pio;
> --
> 2.10.0
>

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-14 12:02 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-14 11:21 [PATCH v2] mmc: omap: Initialize dma_slave_config to avoid random data in it's fields Peter Ujfalusi
2016-09-14 11:21 ` Peter Ujfalusi
2016-09-14 12:01 ` Ulf Hansson
2016-09-14 12:01 ` Ulf Hansson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.