Another patch V4 had send. Thanks. -----Original Message----- From: Anton Vorontsov [mailto:cbouatmailru@xxxxxxxxx] Sent: Wednesday, September 19, 2012 11:42 AM To: Zhang Haijun-B42677 Cc: linux-mmc@xxxxxxxxxxxxxxx; Huang Changming-R66093 Subject: Re: [PATCH V3] Powerpc eSDHC Recover from the ADMA error On Wed, Sep 19, 2012 at 05:22:39PM +0800, Haijun.Zhang@xxxxxxxxxxxxx wrote: > From: Haijun Zhang <Haijun.Zhang@xxxxxxxxxxxxx> > > Signed-off-by: Haijun Zhang <Haijun.Zhang@xxxxxxxxxxxxx> > Signed-off-by: Jerry Huang <Chang-Ming.Huang@xxxxxxxxxxxxx> > CC: Anton Vorontsov <cbouatmailru@xxxxxxxxx> [...] > --- > changes for v3: > - Correct the if statement in function workground > > changes for v2: > - Invert the condition of the if statement in function > workground Just two minor cosmetic comments... > drivers/mmc/host/sdhci-of-esdhc.c | 53 ++++++++++++++++++++++++++++++++++++- > drivers/mmc/host/sdhci.c | 2 + > drivers/mmc/host/sdhci.h | 5 +++- > 3 files changed, 58 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-of-esdhc.c > b/drivers/mmc/host/sdhci-of-esdhc.c > index 1cba55a..7a4c410 100644 > --- a/drivers/mmc/host/sdhci-of-esdhc.c > +++ b/drivers/mmc/host/sdhci-of-esdhc.c > @@ -21,6 +21,7 @@ > #include "sdhci-esdhc.h" > > #define VENDOR_V_22 0x12 > +#define VENDOR_V_23 0x13 The above line uses tab, but you add spaces. A bit inconsistent. [...] > +static void esdhci_of_adma_workaround(struct sdhci_host *host, u32 > +intmask) { > + u32 tmp; > + bool applicable; > + dma_addr_t dmastart; > + dma_addr_t dmanow; > + > + tmp = in_be32(host->ioaddr + SDHCI_SLOT_INT_STATUS); > + tmp = (tmp & SDHCI_VENDOR_VER_MASK) >> SDHCI_VENDOR_VER_SHIFT; > + > + applicable = (intmask & SDHCI_INT_DATA_END) && > + (intmask & SDHCI_INT_BLK_GAP) && > + (tmp == VENDOR_V_23); > + if (!applicable) > + return; > + > + host->data->error = 0; > + dmastart = sg_dma_address(host->data->sg); > + dmanow = dmastart + host->data->bytes_xfered; > + /* > + * Force update to the next DMA block boundary. > + */ > + dmanow = (dmanow & > + ~(SDHCI_DEFAULT_BOUNDARY_SIZE - 1)) + These two lines can be put into one. > + SDHCI_DEFAULT_BOUNDARY_SIZE; > + host->data->bytes_xfered = dmanow - dmastart; > + sdhci_writel(host, dmanow, SDHCI_DMA_ADDRESS); } The rest looks OK, so for of-esdhc part, feel free to add: Acked-by: Anton Vorontsov <cbouatmailru@xxxxxxxxx> Thanks! ��.n��������+%������w��{.n�����{��i��)�� jg��� �����ݢj����G���� ���j:+v���w�m������w�������h�����٥
