lkml.org 
[lkml]   [2011]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [PATCH 2/4] pch_dma: fix dma direction issue for ML7213 IOH video-in
From
Date
On Tue, 2011-04-26 at 19:05 +0900, Tomoya MORINAGA wrote:
> Currently, even-channel number is set as tx direction and odd is set as rx.
> However, though video-in uses ch6, the direction is not tx but rx.
> This patch sets video-in's DMA direction correctly.
>
> Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
> ---
> drivers/dma/pch_dma.c | 23 ++++++++++++++---------
> 1 files changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
> index 9421ed5..cd7bf83 100644
> --- a/drivers/dma/pch_dma.c
> +++ b/drivers/dma/pch_dma.c
> @@ -59,6 +59,14 @@
> #define DMA_DESC_FOLLOW_WITHOUT_IRQ 0x2
> #define DMA_DESC_FOLLOW_WITH_IRQ 0x3
>
> +/* PCI Device ID of DMA device */
> +#define PCI_VENDOR_ID_ROHM 0x10DB
> +#define PCI_DEVICE_ID_EG20T_PCH_DMA_8CH 0x8810
> +#define PCI_DEVICE_ID_EG20T_PCH_DMA_4CH 0x8815
> +#define PCI_DEVICE_ID_ML7213_DMA1_8CH 0x8026
> +#define PCI_DEVICE_ID_ML7213_DMA2_8CH 0x802B
> +#define PCI_DEVICE_ID_ML7213_DMA3_4CH 0x8034
> +
> #define MAX_CHAN_NR 8
These additions does seem to match the patch description, Can you split
them appropriately...
>
> static unsigned int init_nr_desc_per_channel = 64;
> @@ -853,7 +861,12 @@ static int __devinit pch_dma_probe(struct pci_dev *pdev,
>
> pd_chan->membase = &regs->desc[i];
>
> - pd_chan->dir = (i % 2) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;
> + /* D10:F0 DMA ch6 "video input" is rx direction */
> + if ((id->device == PCI_DEVICE_ID_ML7213_DMA1_8CH) && (i == 6))
> + pd_chan->dir = DMA_FROM_DEVICE;
This kind of initialization is wrong....
Will you change again if video channel assignments change...
You should use the direction field in prep_xxx calls for setting this
> + else
> + pd_chan->dir = (i % 2) ? DMA_FROM_DEVICE : \
> + DMA_TO_DEVICE;
>
> spin_lock_init(&pd_chan->lock);
>
> @@ -925,14 +938,6 @@ static void __devexit pch_dma_remove(struct pci_dev *pdev)
> }
> }
>
> -/* PCI Device ID of DMA device */
> -#define PCI_VENDOR_ID_ROHM 0x10DB
> -#define PCI_DEVICE_ID_EG20T_PCH_DMA_8CH 0x8810
> -#define PCI_DEVICE_ID_EG20T_PCH_DMA_4CH 0x8815
> -#define PCI_DEVICE_ID_ML7213_DMA1_8CH 0x8026
> -#define PCI_DEVICE_ID_ML7213_DMA2_8CH 0x802B
> -#define PCI_DEVICE_ID_ML7213_DMA3_4CH 0x8034
????

> -
> static const struct pci_device_id pch_dma_id_table[] = {
> { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_EG20T_PCH_DMA_8CH), 8 },
> { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_EG20T_PCH_DMA_4CH), 4 },


--
~Vinod



\
 
 \ /
  Last update: 2011-05-02 08:51    [W:0.037 / U:0.556 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site