From: Jassi Brar <jassisinghbrar@gmail.com> To: Boojin Kim <boojin.kim@samsung.com> Cc: Kukjin Kim <kgene.kim@samsung.com>, Russell King <linux@arm.linux.org.uk>, Vinod Koul <vinod.koul@intel.com>, Mark Brown <broonie@opensource.wolfsonmicro.com>, Grant Likely <grant.likely@secretlab.ca>, linux-samsung-soc@vger.kernel.org, Dan Williams <dan.j.williams@intel.com>, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 12/15] spi/s3c64xx: Add support DMA engine API Date: Mon, 8 Aug 2011 23:17:58 +0530 [thread overview] Message-ID: <CABb+yY3-d0xTO+s0cCPXPW8qGpTH5G2U+bp-0z4Se47eVvJ__w@mail.gmail.com> (raw) In-Reply-To: <1311744697-10264-13-git-send-email-boojin.kim@samsung.com> On Wed, Jul 27, 2011 at 11:01 AM, Boojin Kim <boojin.kim@samsung.com> wrote: > This patch adds to support DMA generic API to transfer raw > SPI data. Basiclly the spi driver uses DMA generic API if > architecture supports it. Otherwise, uses Samsung specific > S3C-PL330 APIs. > > Signed-off-by: Boojin Kim <boojin.kim@samsung.com> > Acked-by: Grant Likely <grant.likely@secretlab.ca> > Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> > --- > drivers/spi/spi_s3c64xx.c | 141 ++++++++++++++++++++++----------------------- > 1 files changed, 69 insertions(+), 72 deletions(-) > > diff --git a/drivers/spi/spi_s3c64xx.c b/drivers/spi/spi_s3c64xx.c > index 8945e20..a4cf76a 100644 > --- a/drivers/spi/spi_s3c64xx.c > +++ b/drivers/spi/spi_s3c64xx.c > @@ -172,6 +172,9 @@ struct s3c64xx_spi_driver_data { > unsigned state; > unsigned cur_mode, cur_bpw; > unsigned cur_speed; > + unsigned rx_ch; > + unsigned tx_ch; > + struct samsung_dma_ops *ops; > }; > > static struct s3c2410_dma_client s3c64xx_spi_dma_client = { > @@ -227,6 +230,38 @@ static void flush_fifo(struct s3c64xx_spi_driver_data *sdd) > writel(val, regs + S3C64XX_SPI_CH_CFG); > } > > +static void s3c64xx_spi_dma_rxcb(void *data) > +{ > + struct s3c64xx_spi_driver_data *sdd > + = (struct s3c64xx_spi_driver_data *)data; void* doesn't need typecasting (same for all such occurances) IIRC someone already pointed it out? > + unsigned long flags; > + > + spin_lock_irqsave(&sdd->lock, flags); > + > + sdd->state &= ~RXBUSY; > + /* If the other done */ > + if (!(sdd->state & TXBUSY)) > + complete(&sdd->xfer_completion); > + > + spin_unlock_irqrestore(&sdd->lock, flags); > +} > + > +static void s3c64xx_spi_dma_txcb(void *data) > +{ > + struct s3c64xx_spi_driver_data *sdd > + = (struct s3c64xx_spi_driver_data *)data; > + unsigned long flags; > + > + spin_lock_irqsave(&sdd->lock, flags); > + > + sdd->state &= ~TXBUSY; > + /* If the other done */ > + if (!(sdd->state & RXBUSY)) > + complete(&sdd->xfer_completion); > + > + spin_unlock_irqrestore(&sdd->lock, flags); > +} > + > static void enable_datapath(struct s3c64xx_spi_driver_data *sdd, > struct spi_device *spi, > struct spi_transfer *xfer, int dma_mode) > @@ -234,6 +269,7 @@ static void enable_datapath(struct s3c64xx_spi_driver_data *sdd, > struct s3c64xx_spi_info *sci = sdd->cntrlr_info; > void __iomem *regs = sdd->regs; > u32 modecfg, chcfg; > + struct samsung_dma_prep_info info; > > modecfg = readl(regs + S3C64XX_SPI_MODE_CFG); > modecfg &= ~(S3C64XX_SPI_MODE_TXDMA_ON | S3C64XX_SPI_MODE_RXDMA_ON); > @@ -259,10 +295,14 @@ static void enable_datapath(struct s3c64xx_spi_driver_data *sdd, > chcfg |= S3C64XX_SPI_CH_TXCH_ON; > if (dma_mode) { > modecfg |= S3C64XX_SPI_MODE_TXDMA_ON; > - s3c2410_dma_config(sdd->tx_dmach, sdd->cur_bpw / 8); > - s3c2410_dma_enqueue(sdd->tx_dmach, (void *)sdd, > - xfer->tx_dma, xfer->len); > - s3c2410_dma_ctrl(sdd->tx_dmach, S3C2410_DMAOP_START); > + info.cap = DMA_SLAVE; > + info.direction = DMA_TO_DEVICE; > + info.buf = xfer->tx_dma; > + info.len = xfer->len; > + info.fp = s3c64xx_spi_dma_txcb; > + info.fp_param = sdd; > + sdd->ops->prepare(sdd->tx_ch, &info); > + sdd->ops->trigger(sdd->tx_ch); > } else { > switch (sdd->cur_bpw) { > case 32: > @@ -294,10 +334,14 @@ static void enable_datapath(struct s3c64xx_spi_driver_data *sdd, > writel(((xfer->len * 8 / sdd->cur_bpw) & 0xffff) > | S3C64XX_SPI_PACKET_CNT_EN, > regs + S3C64XX_SPI_PACKET_CNT); > - s3c2410_dma_config(sdd->rx_dmach, sdd->cur_bpw / 8); > - s3c2410_dma_enqueue(sdd->rx_dmach, (void *)sdd, > - xfer->rx_dma, xfer->len); > - s3c2410_dma_ctrl(sdd->rx_dmach, S3C2410_DMAOP_START); > + info.cap = DMA_SLAVE; > + info.direction = DMA_FROM_DEVICE; > + info.buf = xfer->rx_dma; > + info.len = xfer->len; > + info.fp = s3c64xx_spi_dma_rxcb; > + info.fp_param = sdd; > + sdd->ops->prepare(sdd->rx_ch, &info); > + sdd->ops->trigger(sdd->rx_ch); > } > } > > @@ -483,46 +527,6 @@ static void s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd) > } > } > > -static void s3c64xx_spi_dma_rxcb(struct s3c2410_dma_chan *chan, void *buf_id, > - int size, enum s3c2410_dma_buffresult res) > -{ > - struct s3c64xx_spi_driver_data *sdd = buf_id; > - unsigned long flags; > - > - spin_lock_irqsave(&sdd->lock, flags); > - > - if (res == S3C2410_RES_OK) > - sdd->state &= ~RXBUSY; > - else > - dev_err(&sdd->pdev->dev, "DmaAbrtRx-%d\n", size); > - > - /* If the other done */ > - if (!(sdd->state & TXBUSY)) > - complete(&sdd->xfer_completion); > - > - spin_unlock_irqrestore(&sdd->lock, flags); > -} > - > -static void s3c64xx_spi_dma_txcb(struct s3c2410_dma_chan *chan, void *buf_id, > - int size, enum s3c2410_dma_buffresult res) > -{ > - struct s3c64xx_spi_driver_data *sdd = buf_id; > - unsigned long flags; > - > - spin_lock_irqsave(&sdd->lock, flags); > - > - if (res == S3C2410_RES_OK) > - sdd->state &= ~TXBUSY; > - else > - dev_err(&sdd->pdev->dev, "DmaAbrtTx-%d \n", size); > - > - /* If the other done */ > - if (!(sdd->state & RXBUSY)) > - complete(&sdd->xfer_completion); > - > - spin_unlock_irqrestore(&sdd->lock, flags); > -} > - > #define XFER_DMAADDR_INVALID DMA_BIT_MASK(32) > > static int s3c64xx_spi_map_mssg(struct s3c64xx_spi_driver_data *sdd, > @@ -697,12 +701,10 @@ static void handle_msg(struct s3c64xx_spi_driver_data *sdd, > if (use_dma) { > if (xfer->tx_buf != NULL > && (sdd->state & TXBUSY)) > - s3c2410_dma_ctrl(sdd->tx_dmach, > - S3C2410_DMAOP_FLUSH); > + sdd->ops->stop(sdd->tx_ch); > if (xfer->rx_buf != NULL > && (sdd->state & RXBUSY)) > - s3c2410_dma_ctrl(sdd->rx_dmach, > - S3C2410_DMAOP_FLUSH); > + sdd->ops->stop(sdd->rx_ch); > } > > goto out; > @@ -742,24 +744,19 @@ out: > > static int acquire_dma(struct s3c64xx_spi_driver_data *sdd) > { > - if (s3c2410_dma_request(sdd->rx_dmach, > - &s3c64xx_spi_dma_client, NULL) < 0) { > - dev_err(&sdd->pdev->dev, "cannot get RxDMA\n"); > - return 0; > - } > - s3c2410_dma_set_buffdone_fn(sdd->rx_dmach, s3c64xx_spi_dma_rxcb); > - s3c2410_dma_devconfig(sdd->rx_dmach, S3C2410_DMASRC_HW, > - sdd->sfr_start + S3C64XX_SPI_RX_DATA); > - > - if (s3c2410_dma_request(sdd->tx_dmach, > - &s3c64xx_spi_dma_client, NULL) < 0) { > - dev_err(&sdd->pdev->dev, "cannot get TxDMA\n"); > - s3c2410_dma_free(sdd->rx_dmach, &s3c64xx_spi_dma_client); > - return 0; > - } > - s3c2410_dma_set_buffdone_fn(sdd->tx_dmach, s3c64xx_spi_dma_txcb); > - s3c2410_dma_devconfig(sdd->tx_dmach, S3C2410_DMASRC_MEM, > - sdd->sfr_start + S3C64XX_SPI_TX_DATA); > + > + struct samsung_dma_info info; > + sdd->ops = samsung_dma_get_ops(); > + > + info.cap = DMA_SLAVE; > + info.client = &s3c64xx_spi_dma_client; > + info.direction = DMA_FROM_DEVICE; > + info.fifo = sdd->sfr_start + S3C64XX_SPI_RX_DATA; > + info.width = sdd->cur_bpw / 8; > + sdd->rx_ch = sdd->ops->request(sdd->rx_dmach, &info); > + info.direction = DMA_TO_DEVICE; > + info.fifo = sdd->sfr_start + S3C64XX_SPI_TX_DATA; > + sdd->tx_ch = sdd->ops->request(sdd->tx_dmach, &info); > > return 1; > } > @@ -800,8 +797,8 @@ static void s3c64xx_spi_work(struct work_struct *work) > spin_unlock_irqrestore(&sdd->lock, flags); > > /* Free DMA channels */ > - s3c2410_dma_free(sdd->tx_dmach, &s3c64xx_spi_dma_client); > - s3c2410_dma_free(sdd->rx_dmach, &s3c64xx_spi_dma_client); > + sdd->ops->release(sdd->rx_ch, &s3c64xx_spi_dma_client); > + sdd->ops->release(sdd->tx_ch, &s3c64xx_spi_dma_client); > } Btw, this spi driver is for S3C64xx(with pl080) and S5P(with pl330) series, both of which have DMAENGINE drivers. May be it could be directly switched to using those, rather than via Samsung's wrapper driver. Or am I overlooking something ? _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: jassisinghbrar@gmail.com (Jassi Brar) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 12/15] spi/s3c64xx: Add support DMA engine API Date: Mon, 8 Aug 2011 23:17:58 +0530 [thread overview] Message-ID: <CABb+yY3-d0xTO+s0cCPXPW8qGpTH5G2U+bp-0z4Se47eVvJ__w@mail.gmail.com> (raw) In-Reply-To: <1311744697-10264-13-git-send-email-boojin.kim@samsung.com> On Wed, Jul 27, 2011 at 11:01 AM, Boojin Kim <boojin.kim@samsung.com> wrote: > This patch adds to support DMA generic API to transfer raw > SPI data. Basiclly the spi driver uses DMA generic API if > architecture supports it. Otherwise, uses Samsung specific > S3C-PL330 APIs. > > Signed-off-by: Boojin Kim <boojin.kim@samsung.com> > Acked-by: Grant Likely <grant.likely@secretlab.ca> > Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> > --- > ?drivers/spi/spi_s3c64xx.c | ?141 ++++++++++++++++++++++----------------------- > ?1 files changed, 69 insertions(+), 72 deletions(-) > > diff --git a/drivers/spi/spi_s3c64xx.c b/drivers/spi/spi_s3c64xx.c > index 8945e20..a4cf76a 100644 > --- a/drivers/spi/spi_s3c64xx.c > +++ b/drivers/spi/spi_s3c64xx.c > @@ -172,6 +172,9 @@ struct s3c64xx_spi_driver_data { > ? ? ? ?unsigned ? ? ? ? ? ? ? ? ? ? ? ?state; > ? ? ? ?unsigned ? ? ? ? ? ? ? ? ? ? ? ?cur_mode, cur_bpw; > ? ? ? ?unsigned ? ? ? ? ? ? ? ? ? ? ? ?cur_speed; > + ? ? ? unsigned ? ? ? ? ? ? ? ? ? ? ? ?rx_ch; > + ? ? ? unsigned ? ? ? ? ? ? ? ? ? ? ? ?tx_ch; > + ? ? ? struct samsung_dma_ops ? ? ? ? ?*ops; > ?}; > > ?static struct s3c2410_dma_client s3c64xx_spi_dma_client = { > @@ -227,6 +230,38 @@ static void flush_fifo(struct s3c64xx_spi_driver_data *sdd) > ? ? ? ?writel(val, regs + S3C64XX_SPI_CH_CFG); > ?} > > +static void s3c64xx_spi_dma_rxcb(void *data) > +{ > + ? ? ? struct s3c64xx_spi_driver_data *sdd > + ? ? ? ? ? ? ? = (struct s3c64xx_spi_driver_data *)data; void* doesn't need typecasting (same for all such occurances) IIRC someone already pointed it out? > + ? ? ? unsigned long flags; > + > + ? ? ? spin_lock_irqsave(&sdd->lock, flags); > + > + ? ? ? sdd->state &= ~RXBUSY; > + ? ? ? /* If the other done */ > + ? ? ? if (!(sdd->state & TXBUSY)) > + ? ? ? ? ? ? ? complete(&sdd->xfer_completion); > + > + ? ? ? spin_unlock_irqrestore(&sdd->lock, flags); > +} > + > +static void s3c64xx_spi_dma_txcb(void *data) > +{ > + ? ? ? struct s3c64xx_spi_driver_data *sdd > + ? ? ? ? ? ? ? = (struct s3c64xx_spi_driver_data *)data; > + ? ? ? unsigned long flags; > + > + ? ? ? spin_lock_irqsave(&sdd->lock, flags); > + > + ? ? ? sdd->state &= ~TXBUSY; > + ? ? ? /* If the other done */ > + ? ? ? if (!(sdd->state & RXBUSY)) > + ? ? ? ? ? ? ? complete(&sdd->xfer_completion); > + > + ? ? ? spin_unlock_irqrestore(&sdd->lock, flags); > +} > + > ?static void enable_datapath(struct s3c64xx_spi_driver_data *sdd, > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?struct spi_device *spi, > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?struct spi_transfer *xfer, int dma_mode) > @@ -234,6 +269,7 @@ static void enable_datapath(struct s3c64xx_spi_driver_data *sdd, > ? ? ? ?struct s3c64xx_spi_info *sci = sdd->cntrlr_info; > ? ? ? ?void __iomem *regs = sdd->regs; > ? ? ? ?u32 modecfg, chcfg; > + ? ? ? struct samsung_dma_prep_info info; > > ? ? ? ?modecfg = readl(regs + S3C64XX_SPI_MODE_CFG); > ? ? ? ?modecfg &= ~(S3C64XX_SPI_MODE_TXDMA_ON | S3C64XX_SPI_MODE_RXDMA_ON); > @@ -259,10 +295,14 @@ static void enable_datapath(struct s3c64xx_spi_driver_data *sdd, > ? ? ? ? ? ? ? ?chcfg |= S3C64XX_SPI_CH_TXCH_ON; > ? ? ? ? ? ? ? ?if (dma_mode) { > ? ? ? ? ? ? ? ? ? ? ? ?modecfg |= S3C64XX_SPI_MODE_TXDMA_ON; > - ? ? ? ? ? ? ? ? ? ? ? s3c2410_dma_config(sdd->tx_dmach, sdd->cur_bpw / 8); > - ? ? ? ? ? ? ? ? ? ? ? s3c2410_dma_enqueue(sdd->tx_dmach, (void *)sdd, > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? xfer->tx_dma, xfer->len); > - ? ? ? ? ? ? ? ? ? ? ? s3c2410_dma_ctrl(sdd->tx_dmach, S3C2410_DMAOP_START); > + ? ? ? ? ? ? ? ? ? ? ? info.cap = DMA_SLAVE; > + ? ? ? ? ? ? ? ? ? ? ? info.direction = DMA_TO_DEVICE; > + ? ? ? ? ? ? ? ? ? ? ? info.buf = xfer->tx_dma; > + ? ? ? ? ? ? ? ? ? ? ? info.len = xfer->len; > + ? ? ? ? ? ? ? ? ? ? ? info.fp = s3c64xx_spi_dma_txcb; > + ? ? ? ? ? ? ? ? ? ? ? info.fp_param = sdd; > + ? ? ? ? ? ? ? ? ? ? ? sdd->ops->prepare(sdd->tx_ch, &info); > + ? ? ? ? ? ? ? ? ? ? ? sdd->ops->trigger(sdd->tx_ch); > ? ? ? ? ? ? ? ?} else { > ? ? ? ? ? ? ? ? ? ? ? ?switch (sdd->cur_bpw) { > ? ? ? ? ? ? ? ? ? ? ? ?case 32: > @@ -294,10 +334,14 @@ static void enable_datapath(struct s3c64xx_spi_driver_data *sdd, > ? ? ? ? ? ? ? ? ? ? ? ?writel(((xfer->len * 8 / sdd->cur_bpw) & 0xffff) > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| S3C64XX_SPI_PACKET_CNT_EN, > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?regs + S3C64XX_SPI_PACKET_CNT); > - ? ? ? ? ? ? ? ? ? ? ? s3c2410_dma_config(sdd->rx_dmach, sdd->cur_bpw / 8); > - ? ? ? ? ? ? ? ? ? ? ? s3c2410_dma_enqueue(sdd->rx_dmach, (void *)sdd, > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? xfer->rx_dma, xfer->len); > - ? ? ? ? ? ? ? ? ? ? ? s3c2410_dma_ctrl(sdd->rx_dmach, S3C2410_DMAOP_START); > + ? ? ? ? ? ? ? ? ? ? ? info.cap = DMA_SLAVE; > + ? ? ? ? ? ? ? ? ? ? ? info.direction = DMA_FROM_DEVICE; > + ? ? ? ? ? ? ? ? ? ? ? info.buf = xfer->rx_dma; > + ? ? ? ? ? ? ? ? ? ? ? info.len = xfer->len; > + ? ? ? ? ? ? ? ? ? ? ? info.fp = s3c64xx_spi_dma_rxcb; > + ? ? ? ? ? ? ? ? ? ? ? info.fp_param = sdd; > + ? ? ? ? ? ? ? ? ? ? ? sdd->ops->prepare(sdd->rx_ch, &info); > + ? ? ? ? ? ? ? ? ? ? ? sdd->ops->trigger(sdd->rx_ch); > ? ? ? ? ? ? ? ?} > ? ? ? ?} > > @@ -483,46 +527,6 @@ static void s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd) > ? ? ? ?} > ?} > > -static void s3c64xx_spi_dma_rxcb(struct s3c2410_dma_chan *chan, void *buf_id, > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?int size, enum s3c2410_dma_buffresult res) > -{ > - ? ? ? struct s3c64xx_spi_driver_data *sdd = buf_id; > - ? ? ? unsigned long flags; > - > - ? ? ? spin_lock_irqsave(&sdd->lock, flags); > - > - ? ? ? if (res == S3C2410_RES_OK) > - ? ? ? ? ? ? ? sdd->state &= ~RXBUSY; > - ? ? ? else > - ? ? ? ? ? ? ? dev_err(&sdd->pdev->dev, "DmaAbrtRx-%d\n", size); > - > - ? ? ? /* If the other done */ > - ? ? ? if (!(sdd->state & TXBUSY)) > - ? ? ? ? ? ? ? complete(&sdd->xfer_completion); > - > - ? ? ? spin_unlock_irqrestore(&sdd->lock, flags); > -} > - > -static void s3c64xx_spi_dma_txcb(struct s3c2410_dma_chan *chan, void *buf_id, > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?int size, enum s3c2410_dma_buffresult res) > -{ > - ? ? ? struct s3c64xx_spi_driver_data *sdd = buf_id; > - ? ? ? unsigned long flags; > - > - ? ? ? spin_lock_irqsave(&sdd->lock, flags); > - > - ? ? ? if (res == S3C2410_RES_OK) > - ? ? ? ? ? ? ? sdd->state &= ~TXBUSY; > - ? ? ? else > - ? ? ? ? ? ? ? dev_err(&sdd->pdev->dev, "DmaAbrtTx-%d \n", size); > - > - ? ? ? /* If the other done */ > - ? ? ? if (!(sdd->state & RXBUSY)) > - ? ? ? ? ? ? ? complete(&sdd->xfer_completion); > - > - ? ? ? spin_unlock_irqrestore(&sdd->lock, flags); > -} > - > ?#define XFER_DMAADDR_INVALID DMA_BIT_MASK(32) > > ?static int s3c64xx_spi_map_mssg(struct s3c64xx_spi_driver_data *sdd, > @@ -697,12 +701,10 @@ static void handle_msg(struct s3c64xx_spi_driver_data *sdd, > ? ? ? ? ? ? ? ? ? ? ? ?if (use_dma) { > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?if (xfer->tx_buf != NULL > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?&& (sdd->state & TXBUSY)) > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? s3c2410_dma_ctrl(sdd->tx_dmach, > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? S3C2410_DMAOP_FLUSH); > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? sdd->ops->stop(sdd->tx_ch); > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?if (xfer->rx_buf != NULL > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?&& (sdd->state & RXBUSY)) > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? s3c2410_dma_ctrl(sdd->rx_dmach, > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? S3C2410_DMAOP_FLUSH); > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? sdd->ops->stop(sdd->rx_ch); > ? ? ? ? ? ? ? ? ? ? ? ?} > > ? ? ? ? ? ? ? ? ? ? ? ?goto out; > @@ -742,24 +744,19 @@ out: > > ?static int acquire_dma(struct s3c64xx_spi_driver_data *sdd) > ?{ > - ? ? ? if (s3c2410_dma_request(sdd->rx_dmach, > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? &s3c64xx_spi_dma_client, NULL) < 0) { > - ? ? ? ? ? ? ? dev_err(&sdd->pdev->dev, "cannot get RxDMA\n"); > - ? ? ? ? ? ? ? return 0; > - ? ? ? } > - ? ? ? s3c2410_dma_set_buffdone_fn(sdd->rx_dmach, s3c64xx_spi_dma_rxcb); > - ? ? ? s3c2410_dma_devconfig(sdd->rx_dmach, S3C2410_DMASRC_HW, > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? sdd->sfr_start + S3C64XX_SPI_RX_DATA); > - > - ? ? ? if (s3c2410_dma_request(sdd->tx_dmach, > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? &s3c64xx_spi_dma_client, NULL) < 0) { > - ? ? ? ? ? ? ? dev_err(&sdd->pdev->dev, "cannot get TxDMA\n"); > - ? ? ? ? ? ? ? s3c2410_dma_free(sdd->rx_dmach, &s3c64xx_spi_dma_client); > - ? ? ? ? ? ? ? return 0; > - ? ? ? } > - ? ? ? s3c2410_dma_set_buffdone_fn(sdd->tx_dmach, s3c64xx_spi_dma_txcb); > - ? ? ? s3c2410_dma_devconfig(sdd->tx_dmach, S3C2410_DMASRC_MEM, > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? sdd->sfr_start + S3C64XX_SPI_TX_DATA); > + > + ? ? ? struct samsung_dma_info info; > + ? ? ? sdd->ops = samsung_dma_get_ops(); > + > + ? ? ? info.cap = DMA_SLAVE; > + ? ? ? info.client = &s3c64xx_spi_dma_client; > + ? ? ? info.direction = DMA_FROM_DEVICE; > + ? ? ? info.fifo = sdd->sfr_start + S3C64XX_SPI_RX_DATA; > + ? ? ? info.width = sdd->cur_bpw / 8; > + ? ? ? sdd->rx_ch = sdd->ops->request(sdd->rx_dmach, &info); > + ? ? ? info.direction = DMA_TO_DEVICE; > + ? ? ? info.fifo = sdd->sfr_start + S3C64XX_SPI_TX_DATA; > + ? ? ? sdd->tx_ch = sdd->ops->request(sdd->tx_dmach, &info); > > ? ? ? ?return 1; > ?} > @@ -800,8 +797,8 @@ static void s3c64xx_spi_work(struct work_struct *work) > ? ? ? ?spin_unlock_irqrestore(&sdd->lock, flags); > > ? ? ? ?/* Free DMA channels */ > - ? ? ? s3c2410_dma_free(sdd->tx_dmach, &s3c64xx_spi_dma_client); > - ? ? ? s3c2410_dma_free(sdd->rx_dmach, &s3c64xx_spi_dma_client); > + ? ? ? sdd->ops->release(sdd->rx_ch, &s3c64xx_spi_dma_client); > + ? ? ? sdd->ops->release(sdd->tx_ch, &s3c64xx_spi_dma_client); > ?} Btw, this spi driver is for S3C64xx(with pl080) and S5P(with pl330) series, both of which have DMAENGINE drivers. May be it could be directly switched to using those, rather than via Samsung's wrapper driver. Or am I overlooking something ?
next prev parent reply other threads:[~2011-08-08 17:47 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-07-27 5:31 [PATCH V5 00/15] To use DMA generic APIs for Samsung DMA Boojin Kim 2011-07-27 5:31 ` Boojin Kim 2011-07-27 5:31 ` [PATCH 01/15] DMA: PL330: Add support runtime PM for PL330 DMAC Boojin Kim 2011-07-27 5:31 ` Boojin Kim 2011-07-27 6:14 ` [RFC PATCH] DMA: PL330: Update PL330 DMAC to support runtime PM Chanwoo Choi 2011-07-27 6:14 ` Chanwoo Choi 2011-07-27 7:31 ` Jassi Brar 2011-07-27 7:31 ` Jassi Brar 2011-07-27 8:53 ` Russell King - ARM Linux 2011-07-27 8:53 ` Russell King - ARM Linux 2011-07-27 9:43 ` Chanwoo Choi 2011-07-27 9:43 ` Chanwoo Choi 2011-07-27 7:43 ` [PATCH 01/15] DMA: PL330: Add support runtime PM for PL330 DMAC Jassi Brar 2011-07-27 7:43 ` Jassi Brar 2011-07-27 5:31 ` [PATCH 02/15] DMA: PL330: Update PL330 DMA API driver Boojin Kim 2011-07-27 5:31 ` Boojin Kim 2011-07-27 5:31 ` [PATCH 03/15] DMA: PL330: Support DMA_SLAVE_CONFIG command Boojin Kim 2011-07-27 5:31 ` Boojin Kim 2011-07-27 5:31 ` [PATCH 04/15] DMA: PL330: Add DMA_CYCLIC capability Boojin Kim 2011-07-27 5:31 ` Boojin Kim 2011-07-27 5:31 ` [PATCH 05/15] ARM: SAMSUNG: Update to use PL330-DMA driver Boojin Kim 2011-07-27 5:31 ` Boojin Kim 2011-07-27 5:31 ` [PATCH 06/15] ARM: SAMSUNG: Add common DMA operations Boojin Kim 2011-07-27 5:31 ` Boojin Kim 2011-07-27 5:31 ` [PATCH 07/15] ARM: EXYNOS4: Use generic DMA PL330 driver Boojin Kim 2011-07-27 5:31 ` Boojin Kim 2011-08-15 9:36 ` Thomas Abraham 2011-08-15 9:36 ` Thomas Abraham 2011-08-15 14:15 ` Thomas Abraham 2011-08-15 14:15 ` Thomas Abraham 2011-08-21 8:51 ` Russell King - ARM Linux 2011-08-21 8:51 ` Russell King - ARM Linux 2011-07-27 5:31 ` [PATCH 08/15] ARM: S5PV210: " Boojin Kim 2011-07-27 5:31 ` Boojin Kim 2011-07-27 5:31 ` [PATCH 09/15] ARM: S5PC100: " Boojin Kim 2011-07-27 5:31 ` Boojin Kim 2011-07-27 5:31 ` [PATCH 10/15] ARM: S5P64X0: " Boojin Kim 2011-07-27 5:31 ` Boojin Kim 2011-07-27 5:31 ` [PATCH 11/15] ARM: SAMSUNG: Remove S3C-PL330-DMA driver Boojin Kim 2011-07-27 5:31 ` Boojin Kim 2011-07-27 5:31 ` [PATCH 12/15] spi/s3c64xx: Add support DMA engine API Boojin Kim 2011-07-27 5:31 ` Boojin Kim 2011-08-08 17:47 ` Jassi Brar [this message] 2011-08-08 17:47 ` Jassi Brar 2011-08-08 17:55 ` Heiko Stübner 2011-08-08 17:55 ` Heiko Stübner 2011-08-08 18:16 ` Jassi Brar 2011-08-08 18:16 ` Jassi Brar 2011-08-08 18:26 ` Heiko Stübner 2011-08-08 18:26 ` Heiko Stübner 2011-08-09 4:13 ` Alim Akhtar 2011-08-09 4:13 ` Alim Akhtar 2011-08-19 10:30 ` Alim Akhtar 2011-08-19 10:30 ` Alim Akhtar 2011-08-21 8:46 ` Russell King - ARM Linux 2011-08-21 8:46 ` Russell King - ARM Linux 2011-08-25 1:13 ` Alim Akhtar 2011-08-25 1:13 ` Alim Akhtar 2011-08-11 7:42 ` Boojin Kim 2011-08-11 7:42 ` Boojin Kim 2011-07-27 5:31 ` [PATCH 13/15] spi/s3c64xx: Merge dma control code Boojin Kim 2011-07-27 5:31 ` Boojin Kim 2011-08-08 18:32 ` Jassi Brar 2011-08-08 18:32 ` Jassi Brar 2011-07-27 5:31 ` [PATCH 14/15] ASoC: Samsung: Update DMA interface Boojin Kim 2011-07-27 5:31 ` Boojin Kim 2011-08-08 19:27 ` Jassi Brar 2011-08-08 19:27 ` Jassi Brar 2011-08-11 10:04 ` Boojin Kim 2011-08-11 10:04 ` Boojin Kim 2011-07-27 5:31 ` [PATCH 15/15] ARM: SAMSUNG: Remove Samsung specific enum type for dma direction Boojin Kim 2011-07-27 5:31 ` Boojin Kim 2011-08-04 16:53 ` [PATCH V5 00/15] To use DMA generic APIs for Samsung DMA Linus Walleij 2011-08-04 16:53 ` Linus Walleij 2011-08-08 16:45 ` Koul, Vinod 2011-08-08 16:45 ` Koul, Vinod 2011-08-11 7:26 ` Kukjin Kim 2011-08-11 7:26 ` Kukjin Kim 2011-08-11 22:27 ` Koul, Vinod 2011-08-11 22:27 ` Koul, Vinod 2011-08-13 4:11 ` Kukjin Kim 2011-08-13 4:11 ` Kukjin Kim 2011-08-16 11:01 ` Koul, Vinod 2011-08-16 11:01 ` Koul, Vinod 2011-08-19 5:24 ` Kukjin Kim 2011-08-19 5:24 ` Kukjin Kim 2011-08-19 13:04 ` Koul, Vinod 2011-08-19 13:04 ` Koul, Vinod
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CABb+yY3-d0xTO+s0cCPXPW8qGpTH5G2U+bp-0z4Se47eVvJ__w@mail.gmail.com \ --to=jassisinghbrar@gmail.com \ --cc=boojin.kim@samsung.com \ --cc=broonie@opensource.wolfsonmicro.com \ --cc=dan.j.williams@intel.com \ --cc=grant.likely@secretlab.ca \ --cc=kgene.kim@samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=vinod.koul@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.