Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1631117 > unrolled thread

[PATCH v4] mfd:rtsx: do retry when DMA transfer error

Started by<steven_feng@realsil.com.cn>
First post2017-04-26 04:50 +0200
Last post2017-04-26 11:00 +0200
Articles 3 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH v4] mfd:rtsx: do retry when DMA transfer error <steven_feng@realsil.com.cn> - 2017-04-26 04:50 +0200
    Re: [PATCH v4] mfd:rtsx: do retry when DMA transfer error 冯伟linux <steven_feng@realsil.com.cn> - 2017-04-26 05:10 +0200
      Re: [PATCH v4] mfd:rtsx: do retry when DMA transfer error Lee Jones <lee.jones@linaro.org> - 2017-04-26 11:00 +0200

#1631117 — [PATCH v4] mfd:rtsx: do retry when DMA transfer error

From<steven_feng@realsil.com.cn>
Date2017-04-26 04:50 +0200
Subject[PATCH v4] mfd:rtsx: do retry when DMA transfer error
Message-ID<tAlbH-4FT-5@gated-at.bofh.it>
From: Steven Feng <steven_feng@realsil.com.cn>

The request should be resent when DMA transfer error occurred.
For rts5227, the clock rate needs to be reduced when error occurred.

Signed-off-by: Steven Feng <steven_feng@realsil.com.cn>
---
 drivers/mfd/rtsx_pcr.c       | 18 ++++++++++++++++--
 include/linux/mfd/rtsx_pci.h |  5 +++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c
index 98029ee..8e21fd6 100644
--- a/drivers/mfd/rtsx_pcr.c
+++ b/drivers/mfd/rtsx_pcr.c
@@ -30,6 +30,7 @@
 #include <linux/platform_device.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/rtsx_pci.h>
+#include <linux/mmc/card.h>
 #include <asm/unaligned.h>
 
 #include "rtsx_pcr.h"
@@ -452,8 +453,12 @@ int rtsx_pci_dma_transfer(struct rtsx_pcr *pcr, struct scatterlist *sglist,
 	}
 
 	spin_lock_irqsave(&pcr->lock, flags);
-	if (pcr->trans_result == TRANS_RESULT_FAIL)
-		err = -EINVAL;
+	if (pcr->trans_result == TRANS_RESULT_FAIL) {
+		err = -EILSEQ;
+		if (pcr->dma_error_count < RTS_MAX_TIMES_FREQ_REDUCTION)
+			pcr->dma_error_count++;
+	}
+
 	else if (pcr->trans_result == TRANS_NO_DEVICE)
 		err = -ENODEV;
 	spin_unlock_irqrestore(&pcr->lock, flags);
@@ -659,6 +664,14 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock,
 	if (err < 0)
 		return err;
 
+	/* Reduce MMC card clock by 20MHz each time a DMA transfer error occurs
+	 */
+	if (card_clock == UHS_SDR104_MAX_DTR &&
+		pcr->dma_error_count &&
+		PCI_PID(pcr) == RTS5227_DEVICE_ID)
+		card_clock = UHS_SDR104_MAX_DTR -
+			(pcr->dma_error_count * 20000000);
+
 	card_clock /= 1000000;
 	pcr_dbg(pcr, "Switch card clock to %dMHz\n", card_clock);
 
@@ -894,6 +907,7 @@ static irqreturn_t rtsx_pci_isr(int irq, void *dev_id)
 			pcr->card_removed |= SD_EXIST;
 			pcr->card_inserted &= ~SD_EXIST;
 		}
+		pcr->dma_error_count = 0;
 	}
 
 	if (int_reg & MS_INT) {
diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/mfd/rtsx_pci.h
index 7eb7cba..116816f 100644
--- a/include/linux/mfd/rtsx_pci.h
+++ b/include/linux/mfd/rtsx_pci.h
@@ -850,6 +850,9 @@
 
 #define rtsx_pci_init_cmd(pcr)		((pcr)->ci = 0)
 
+#define RTS5227_DEVICE_ID		0x5227
+#define RTS_MAX_TIMES_FREQ_REDUCTION	8
+
 struct rtsx_pcr;
 
 struct pcr_handle {
@@ -957,6 +960,8 @@ struct rtsx_pcr {
 
 	int				num_slots;
 	struct rtsx_slot		*slots;
+
+	u8				dma_error_count;
 };
 
 #define CHK_PCI_PID(pcr, pid)		((pcr)->pci->device == (pid))
-- 
1.9.1

[toc] | [next] | [standalone]

#1631123

From冯伟linux <steven_feng@realsil.com.cn>
Date2017-04-26 05:10 +0200
Message-ID<tAlv3-51U-1@gated-at.bofh.it>
In reply to#1631117

[Multipart message — attachments visible in raw view] — view raw

Hi lee.jones:
    I have just now resented the patch V4, please review it.


steven feng
Realsil Microelectronics CO. LTD.
Mobile：181-6899-0403  Ext：57594

On 2017年04月26日 10:47, 冯伟linux wrote:
> From: Steven Feng <steven_feng@realsil.com.cn>
>
> The request should be resent when DMA transfer error occurred.
> For rts5227, the clock rate needs to be reduced when error occurred.
>
> Signed-off-by: Steven Feng <steven_feng@realsil.com.cn>
> ---
>  drivers/mfd/rtsx_pcr.c       | 18 ++++++++++++++++--
>  include/linux/mfd/rtsx_pci.h |  5 +++++
>  2 files changed, 21 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c
> index 98029ee..8e21fd6 100644
> --- a/drivers/mfd/rtsx_pcr.c
> +++ b/drivers/mfd/rtsx_pcr.c
> @@ -30,6 +30,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/mfd/core.h>
>  #include <linux/mfd/rtsx_pci.h>
> +#include <linux/mmc/card.h>
>  #include <asm/unaligned.h>
>  
>  #include "rtsx_pcr.h"
> @@ -452,8 +453,12 @@ int rtsx_pci_dma_transfer(struct rtsx_pcr *pcr, struct scatterlist *sglist,
>  	}
>  
>  	spin_lock_irqsave(&pcr->lock, flags);
> -	if (pcr->trans_result == TRANS_RESULT_FAIL)
> -		err = -EINVAL;
> +	if (pcr->trans_result == TRANS_RESULT_FAIL) {
> +		err = -EILSEQ;
> +		if (pcr->dma_error_count < RTS_MAX_TIMES_FREQ_REDUCTION)
> +			pcr->dma_error_count++;
> +	}
> +
>  	else if (pcr->trans_result == TRANS_NO_DEVICE)
>  		err = -ENODEV;
>  	spin_unlock_irqrestore(&pcr->lock, flags);
> @@ -659,6 +664,14 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock,
>  	if (err < 0)
>  		return err;
>  
> +	/* Reduce MMC card clock by 20MHz each time a DMA transfer error occurs
> +	 */
> +	if (card_clock == UHS_SDR104_MAX_DTR &&
> +		pcr->dma_error_count &&
> +		PCI_PID(pcr) == RTS5227_DEVICE_ID)
> +		card_clock = UHS_SDR104_MAX_DTR -
> +			(pcr->dma_error_count * 20000000);
> +
>  	card_clock /= 1000000;
>  	pcr_dbg(pcr, "Switch card clock to %dMHz\n", card_clock);
>  
> @@ -894,6 +907,7 @@ static irqreturn_t rtsx_pci_isr(int irq, void *dev_id)
>  			pcr->card_removed |= SD_EXIST;
>  			pcr->card_inserted &= ~SD_EXIST;
>  		}
> +		pcr->dma_error_count = 0;
>  	}
>  
>  	if (int_reg & MS_INT) {
> diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/mfd/rtsx_pci.h
> index 7eb7cba..116816f 100644
> --- a/include/linux/mfd/rtsx_pci.h
> +++ b/include/linux/mfd/rtsx_pci.h
> @@ -850,6 +850,9 @@
>  
>  #define rtsx_pci_init_cmd(pcr)		((pcr)->ci = 0)
>  
> +#define RTS5227_DEVICE_ID		0x5227
> +#define RTS_MAX_TIMES_FREQ_REDUCTION	8
> +
>  struct rtsx_pcr;
>  
>  struct pcr_handle {
> @@ -957,6 +960,8 @@ struct rtsx_pcr {
>  
>  	int				num_slots;
>  	struct rtsx_slot		*slots;
> +
> +	u8				dma_error_count;
>  };
>  
>  #define CHK_PCI_PID(pcr, pid)		((pcr)->pci->device == (pid))

[toc] | [prev] | [next] | [standalone]

#1631260

FromLee Jones <lee.jones@linaro.org>
Date2017-04-26 11:00 +0200
Message-ID<tAqXL-8kP-13@gated-at.bofh.it>
In reply to#1631123
On Wed, 26 Apr 2017, 冯伟linux wrote:

> Hi lee.jones:
>     I have just now resented the patch V4, please review it.

Please don't sent chaser emails.

Especially demanding ones sent within hours/minutes of the patch.

> steven feng
> Realsil Microelectronics CO. LTD.
> Mobile：181-6899-0403  Ext：57594
> 
> On 2017年04月26日 10:47, 冯伟linux wrote:
> > From: Steven Feng <steven_feng@realsil.com.cn>
> >
> > The request should be resent when DMA transfer error occurred.
> > For rts5227, the clock rate needs to be reduced when error occurred.
> >
> > Signed-off-by: Steven Feng <steven_feng@realsil.com.cn>
> > ---
> >  drivers/mfd/rtsx_pcr.c       | 18 ++++++++++++++++--
> >  include/linux/mfd/rtsx_pci.h |  5 +++++
> >  2 files changed, 21 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c
> > index 98029ee..8e21fd6 100644
> > --- a/drivers/mfd/rtsx_pcr.c
> > +++ b/drivers/mfd/rtsx_pcr.c
> > @@ -30,6 +30,7 @@
> >  #include <linux/platform_device.h>
> >  #include <linux/mfd/core.h>
> >  #include <linux/mfd/rtsx_pci.h>
> > +#include <linux/mmc/card.h>
> >  #include <asm/unaligned.h>
> >  
> >  #include "rtsx_pcr.h"
> > @@ -452,8 +453,12 @@ int rtsx_pci_dma_transfer(struct rtsx_pcr *pcr, struct scatterlist *sglist,
> >  	}
> >  
> >  	spin_lock_irqsave(&pcr->lock, flags);
> > -	if (pcr->trans_result == TRANS_RESULT_FAIL)
> > -		err = -EINVAL;
> > +	if (pcr->trans_result == TRANS_RESULT_FAIL) {
> > +		err = -EILSEQ;
> > +		if (pcr->dma_error_count < RTS_MAX_TIMES_FREQ_REDUCTION)
> > +			pcr->dma_error_count++;
> > +	}
> > +
> >  	else if (pcr->trans_result == TRANS_NO_DEVICE)
> >  		err = -ENODEV;
> >  	spin_unlock_irqrestore(&pcr->lock, flags);
> > @@ -659,6 +664,14 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock,
> >  	if (err < 0)
> >  		return err;
> >  
> > +	/* Reduce MMC card clock by 20MHz each time a DMA transfer error occurs
> > +	 */
> > +	if (card_clock == UHS_SDR104_MAX_DTR &&
> > +		pcr->dma_error_count &&
> > +		PCI_PID(pcr) == RTS5227_DEVICE_ID)
> > +		card_clock = UHS_SDR104_MAX_DTR -
> > +			(pcr->dma_error_count * 20000000);
> > +
> >  	card_clock /= 1000000;
> >  	pcr_dbg(pcr, "Switch card clock to %dMHz\n", card_clock);
> >  
> > @@ -894,6 +907,7 @@ static irqreturn_t rtsx_pci_isr(int irq, void *dev_id)
> >  			pcr->card_removed |= SD_EXIST;
> >  			pcr->card_inserted &= ~SD_EXIST;
> >  		}
> > +		pcr->dma_error_count = 0;
> >  	}
> >  
> >  	if (int_reg & MS_INT) {
> > diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/mfd/rtsx_pci.h
> > index 7eb7cba..116816f 100644
> > --- a/include/linux/mfd/rtsx_pci.h
> > +++ b/include/linux/mfd/rtsx_pci.h
> > @@ -850,6 +850,9 @@
> >  
> >  #define rtsx_pci_init_cmd(pcr)		((pcr)->ci = 0)
> >  
> > +#define RTS5227_DEVICE_ID		0x5227
> > +#define RTS_MAX_TIMES_FREQ_REDUCTION	8
> > +
> >  struct rtsx_pcr;
> >  
> >  struct pcr_handle {
> > @@ -957,6 +960,8 @@ struct rtsx_pcr {
> >  
> >  	int				num_slots;
> >  	struct rtsx_slot		*slots;
> > +
> > +	u8				dma_error_count;
> >  };
> >  
> >  #define CHK_PCI_PID(pcr, pid)		((pcr)->pci->device == (pid))
> 

> begin:vcard
> fn;quoted-printable:=E5=86=AF=E4=BC=9F
> n;quoted-printable:;=E5=86=AF=E4=BC=9F
> email;internet:steven_feng@realsil.com.cn
> tel;cell:18168990403
> version:2.1
> end:vcard
> 


-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web