From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bgnRI-0000Ay-Ul for barebox@lists.infradead.org; Mon, 05 Sep 2016 06:31:29 +0000 Date: Mon, 5 Sep 2016 08:31:07 +0200 From: Sascha Hauer Message-ID: <20160905063107.yrndcugua7m3zxsk@pengutronix.de> References: <20160902085037.11653-1-m.olbrich@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20160902085037.11653-1-m.olbrich@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH] mci: mmci: Fix read FIFO handling To: Michael Olbrich Cc: barebox@lists.infradead.org On Fri, Sep 02, 2016 at 10:50:37AM +0200, Michael Olbrich wrote: > According to the Linux kernel and the qemu code, the MMCIFIFOCNT contains > the remaining number of words to read, excluding those that are already in > the FIFO. So the current number of bytes in the FIFO is > host_remain - (readl(base + MMCIFIFOCNT) << 2). > > Also writing to MMCIDATACTRL will reset the read counter. As a result, > MCI_DATABLOCKEND is never set and read_bytes() waits forever. > > With this change, SD-Card support on qemu vexpress works correctly. > > Signed-off-by: Michael Olbrich > --- > drivers/mci/mmci.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Applied, thanks Sascha > > diff --git a/drivers/mci/mmci.c b/drivers/mci/mmci.c > index 9d1e858917de..7489ee03a13c 100644 > --- a/drivers/mci/mmci.c > +++ b/drivers/mci/mmci.c > @@ -212,7 +212,7 @@ static u64 mmci_pio_read(struct mmci_host *host, char *buffer, unsigned int host > struct variant_data *variant = host->variant; > > do { > - int count = readl(base + MMCIFIFOCNT) << 2; > + int count = host_remain - (readl(base + MMCIFIFOCNT) << 2); > > if (count > host_remain) > count = host_remain; > @@ -264,7 +264,6 @@ static int read_bytes(struct mci_host *mci, char *dest, unsigned int blkcount, u > dev_dbg(host->hw_dev, "read_bytes: blkcount=%u blksize=%u\n", blkcount, blksize); > > do { > - mmci_writel(host, MMCIDATACTRL, mmci_readl(host, MMCIDATACTRL)); > len = mmci_pio_read(host, dest, xfercount); > xfercount -= len; > dest += len; > -- > 2.9.3 > > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox