From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [PATCH 1/2] mfd: rtsx: add dma transfer function Date: Mon, 16 Jun 2014 13:20:32 +0100 Message-ID: <20140616122032.GS14323@lee--X1> References: <9021eae37d96aa027d00ae4a7b6cd84dbbd1b6b5.1402037564.git.micky_ching@realsil.com.cn> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mail-ie0-f175.google.com ([209.85.223.175]:49844 "EHLO mail-ie0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751160AbaFPMUk (ORCPT ); Mon, 16 Jun 2014 08:20:40 -0400 Received: by mail-ie0-f175.google.com with SMTP id tp5so4936597ieb.34 for ; Mon, 16 Jun 2014 05:20:40 -0700 (PDT) Content-Disposition: inline In-Reply-To: <9021eae37d96aa027d00ae4a7b6cd84dbbd1b6b5.1402037564.git.micky_ching@realsil.com.cn> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: micky_ching@realsil.com.cn Cc: sameo@linux.intel.com, chris@printf.net, ulf.hansson@linaro.org, devel@linuxdriverproject.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, gregkh@linuxfoundation.org, dan.carpenter@oracle.com, rogerable@realtek.com, wei_wang@realsil.com.cn > From: Micky Ching >=20 > rtsx driver using a single function for transfer data, dma map/unmap = are > placed in one fix function. We need map/unmap dma in different place(= for > mmc async driver), so add three function for dma map, dma transfer an= d > dma unmap. >=20 > Signed-off-by: Micky Ching > --- > drivers/mfd/rtsx_pcr.c | 76 ++++++++++++++++++++++++++------= ---------- > include/linux/mfd/rtsx_pci.h | 6 ++++ > 2 files changed, 54 insertions(+), 28 deletions(-) I don't see any glaring issues with this patch. Does it rely on the first patch, or vise versa, or can it just be applied? > diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c > index 1d15735..d01b8c2 100644 > --- a/drivers/mfd/rtsx_pcr.c > +++ b/drivers/mfd/rtsx_pcr.c > @@ -337,40 +337,64 @@ static void rtsx_pci_add_sg_tbl(struct rtsx_pcr= *pcr, > int rtsx_pci_transfer_data(struct rtsx_pcr *pcr, struct scatterlist = *sglist, > int num_sg, bool read, int timeout) > { > - struct completion trans_done; > - u8 dir; > - int err =3D 0, i, count; > - long timeleft; > - unsigned long flags; > - struct scatterlist *sg; > - enum dma_data_direction dma_dir; > - u32 val; > - dma_addr_t addr; > - unsigned int len; > + int err =3D 0, count; > =20 > dev_dbg(&(pcr->pci->dev), "--> %s: num_sg =3D %d\n", __func__, num_= sg); > + count =3D rtsx_pci_dma_map_sg(pcr, sglist, num_sg, read); > + if (count < 1) > + return -EINVAL; > + dev_dbg(&(pcr->pci->dev), "DMA mapping count: %d\n", count); > + > + err =3D rtsx_pci_dma_transfer(pcr, sglist, count, read, timeout); > + > + rtsx_pci_dma_unmap_sg(pcr, sglist, num_sg, read); > + > + return err; > +} > +EXPORT_SYMBOL_GPL(rtsx_pci_transfer_data); > + > +int rtsx_pci_dma_map_sg(struct rtsx_pcr *pcr, struct scatterlist *sg= list, > + int num_sg, bool read) > +{ > + enum dma_data_direction dir =3D read ? DMA_FROM_DEVICE : DMA_TO_DEV= ICE; > =20 > - /* don't transfer data during abort processing */ > if (pcr->remove_pci) > return -EINVAL; > =20 > if ((sglist =3D=3D NULL) || (num_sg <=3D 0)) > return -EINVAL; > =20 > - if (read) { > - dir =3D DEVICE_TO_HOST; > - dma_dir =3D DMA_FROM_DEVICE; > - } else { > - dir =3D HOST_TO_DEVICE; > - dma_dir =3D DMA_TO_DEVICE; > - } > + return dma_map_sg(&(pcr->pci->dev), sglist, num_sg, dir); > +} > +EXPORT_SYMBOL_GPL(rtsx_pci_dma_map_sg); > =20 > - count =3D dma_map_sg(&(pcr->pci->dev), sglist, num_sg, dma_dir); > - if (count < 1) { > - dev_err(&(pcr->pci->dev), "scatterlist map failed\n"); > +void rtsx_pci_dma_unmap_sg(struct rtsx_pcr *pcr, struct scatterlist = *sglist, > + int num_sg, bool read) > +{ > + enum dma_data_direction dir =3D read ? DMA_FROM_DEVICE : DMA_TO_DEV= ICE; > + > + dma_unmap_sg(&(pcr->pci->dev), sglist, num_sg, dir); > +} > +EXPORT_SYMBOL_GPL(rtsx_pci_dma_unmap_sg); > + > +int rtsx_pci_dma_transfer(struct rtsx_pcr *pcr, struct scatterlist *= sglist, > + int count, bool read, int timeout) > +{ > + struct completion trans_done; > + struct scatterlist *sg; > + dma_addr_t addr; > + long timeleft; > + unsigned long flags; > + unsigned int len; > + int i, err =3D 0; > + u32 val; > + u8 dir =3D read ? DEVICE_TO_HOST : HOST_TO_DEVICE; > + > + if (pcr->remove_pci) > + return -ENODEV; > + > + if ((sglist =3D=3D NULL) || (count < 1)) > return -EINVAL; > - } > - dev_dbg(&(pcr->pci->dev), "DMA mapping count: %d\n", count); > =20 > val =3D ((u32)(dir & 0x01) << 29) | TRIG_DMA | ADMA_MODE; > pcr->sgi =3D 0; > @@ -400,12 +424,10 @@ int rtsx_pci_transfer_data(struct rtsx_pcr *pcr= , struct scatterlist *sglist, > } > =20 > spin_lock_irqsave(&pcr->lock, flags); > - > if (pcr->trans_result =3D=3D TRANS_RESULT_FAIL) > err =3D -EINVAL; > else if (pcr->trans_result =3D=3D TRANS_NO_DEVICE) > err =3D -ENODEV; > - > spin_unlock_irqrestore(&pcr->lock, flags); > =20 > out: > @@ -413,8 +435,6 @@ out: > pcr->done =3D NULL; > spin_unlock_irqrestore(&pcr->lock, flags); > =20 > - dma_unmap_sg(&(pcr->pci->dev), sglist, num_sg, dma_dir); > - > if ((err < 0) && (err !=3D -ENODEV)) > rtsx_pci_stop_cmd(pcr); > =20 > @@ -423,7 +443,7 @@ out: > =20 > return err; > } > -EXPORT_SYMBOL_GPL(rtsx_pci_transfer_data); > +EXPORT_SYMBOL_GPL(rtsx_pci_dma_transfer); > =20 > int rtsx_pci_read_ppbuf(struct rtsx_pcr *pcr, u8 *buf, int buf_len) > { > diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/mfd/rtsx_pc= i.h > index a383597..74346d5 100644 > --- a/include/linux/mfd/rtsx_pci.h > +++ b/include/linux/mfd/rtsx_pci.h > @@ -943,6 +943,12 @@ void rtsx_pci_send_cmd_no_wait(struct rtsx_pcr *= pcr); > int rtsx_pci_send_cmd(struct rtsx_pcr *pcr, int timeout); > int rtsx_pci_transfer_data(struct rtsx_pcr *pcr, struct scatterlist = *sglist, > int num_sg, bool read, int timeout); > +int rtsx_pci_dma_map_sg(struct rtsx_pcr *pcr, struct scatterlist *sg= list, > + int num_sg, bool read); > +void rtsx_pci_dma_unmap_sg(struct rtsx_pcr *pcr, struct scatterlist = *sglist, > + int num_sg, bool read); > +int rtsx_pci_dma_transfer(struct rtsx_pcr *pcr, struct scatterlist *= sglist, > + int count, bool read, int timeout); > int rtsx_pci_read_ppbuf(struct rtsx_pcr *pcr, u8 *buf, int buf_len); > int rtsx_pci_write_ppbuf(struct rtsx_pcr *pcr, u8 *buf, int buf_len)= ; > int rtsx_pci_card_pull_ctl_enable(struct rtsx_pcr *pcr, int card); --=20 Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org =E2=94=82 Open source software for ARM SoCs =46ollow Linaro: Facebook | Twitter | Blog