Re: [PATCH 3/3] mmc: SDHI: DMA slave ID 0 is invalid
Hi Guennadi,
On Mon, Jun 20 2011, Guennadi Liakhovetski wrote:
> Can we please get this patch too in for 3.0? It is a part of a
> patch-series, of which all others havs already been applied. This specific
> patch makes the behaviour of the SDHI driver consistent with other DMA
> users on sh-mobile, namely, that default platform data with no DMA
> information provided immediately switches the driver to the PIO mode. This
> patch fixes this logical error of trying to acquire DMA channels with
> invalid configuration information and avoids ugly error messages in the
> kernel log.
>
> Thanks
> Guennadi
>
> On Tue, 24 May 2011, Guennadi Liakhovetski wrote:
>
>> Don't try to allocate DMA resources, if the platform didn't specify
>> positive DMA slave IDs.
>>
>> Signed-off-by: Guennadi Liakhovetski
>> ---
>> drivers/mmc/host/sh_mobile_sdhi.c |2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/mmc/host/sh_mobile_sdhi.c
>> b/drivers/mmc/host/sh_mobile_sdhi.c
>> index c05d699..e646741 100644
>> --- a/drivers/mmc/host/sh_mobile_sdhi.c
>> +++ b/drivers/mmc/host/sh_mobile_sdhi.c
>> @@ -132,7 +132,7 @@ static int __devinit sh_mobile_sdhi_probe(struct
>> platform_device *pdev)
>> mmc_data->ocr_mask = p->tmio_ocr_mask;
>> mmc_data->capabilities |= p->tmio_caps;
>>
>> -if (p->dma_slave_tx >= 0 && p->dma_slave_rx >= 0) {
>> +if (p->dma_slave_tx > 0 && p->dma_slave_rx > 0) {
>> priv->param_tx.slave_id = p->dma_slave_tx;
>> priv->param_rx.slave_id = p->dma_slave_rx;
>> priv->dma_priv.chan_priv_tx = &priv->param_tx;
>> --
>> 1.7.2.5
Thanks, pushed to mmc-next for 3.0.
- Chris.
--
Chris Ball
Re: [PATCH 3/3] mmc: SDHI: DMA slave ID 0 is invalid
Hi Chris
Can we please get this patch too in for 3.0? It is a part of a
patch-series, of which all others havs already been applied. This specific
patch makes the behaviour of the SDHI driver consistent with other DMA
users on sh-mobile, namely, that default platform data with no DMA
information provided immediately switches the driver to the PIO mode. This
patch fixes this logical error of trying to acquire DMA channels with
invalid configuration information and avoids ugly error messages in the
kernel log.
Thanks
Guennadi
On Tue, 24 May 2011, Guennadi Liakhovetski wrote:
> Don't try to allocate DMA resources, if the platform didn't specify
> positive DMA slave IDs.
>
> Signed-off-by: Guennadi Liakhovetski
> ---
> drivers/mmc/host/sh_mobile_sdhi.c |2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mmc/host/sh_mobile_sdhi.c
> b/drivers/mmc/host/sh_mobile_sdhi.c
> index c05d699..e646741 100644
> --- a/drivers/mmc/host/sh_mobile_sdhi.c
> +++ b/drivers/mmc/host/sh_mobile_sdhi.c
> @@ -132,7 +132,7 @@ static int __devinit sh_mobile_sdhi_probe(struct
> platform_device *pdev)
> mmc_data->ocr_mask = p->tmio_ocr_mask;
> mmc_data->capabilities |= p->tmio_caps;
>
> - if (p->dma_slave_tx >= 0 && p->dma_slave_rx >= 0) {
> + if (p->dma_slave_tx > 0 && p->dma_slave_rx > 0) {
> priv->param_tx.slave_id = p->dma_slave_tx;
> priv->param_rx.slave_id = p->dma_slave_rx;
> priv->dma_priv.chan_priv_tx = &priv->param_tx;
> --
> 1.7.2.5
>
>
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/3] mmc: SDHI: DMA slave ID 0 is invalid
Don't try to allocate DMA resources, if the platform didn't specify
positive DMA slave IDs.
Signed-off-by: Guennadi Liakhovetski
---
drivers/mmc/host/sh_mobile_sdhi.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mmc/host/sh_mobile_sdhi.c
b/drivers/mmc/host/sh_mobile_sdhi.c
index c05d699..e646741 100644
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -132,7 +132,7 @@ static int __devinit sh_mobile_sdhi_probe(struct
platform_device *pdev)
mmc_data->ocr_mask = p->tmio_ocr_mask;
mmc_data->capabilities |= p->tmio_caps;
- if (p->dma_slave_tx >= 0 && p->dma_slave_rx >= 0) {
+ if (p->dma_slave_tx > 0 && p->dma_slave_rx > 0) {
priv->param_tx.slave_id = p->dma_slave_tx;
priv->param_rx.slave_id = p->dma_slave_rx;
priv->dma_priv.chan_priv_tx = &priv->param_tx;
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
