Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-29 04:19:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

risc-v/mpfs: emmcsd: fix csd read

Browse Source 
Reading the CSD field misses 3 bytes as the residual bytes
are not carried over properly. Fix this by adding the missing
bytes due to shifting.

Signed-off-by: Eero Nurkkala <eero.nurkkala@offcode.fi>
This commit is contained in:
Eero Nurkkala
2023-07-17 12:53:02 +03:00
committed by Xiang Xiao
parent 3db1654b80
commit b79671a336
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/risc-v/src/mpfs/mpfs_emmcsd.c
+14 -4
View File
@@ -2579,6 +2579,7 @@ static int mpfs_recvlong(struct sdio_dev_s *dev, uint32_t cmd,
uint32_t rlong[4]) uint32_t rlong[4])
{ {
struct mpfs_dev_s *priv = (struct mpfs_dev_s *)dev; struct mpfs_dev_s *priv = (struct mpfs_dev_s *)dev;
uint32_t tmp;
int ret; int ret;
ret = mpfs_check_recverror(priv); ret = mpfs_check_recverror(priv);
@@ -2587,15 +2588,24 @@ static int mpfs_recvlong(struct sdio_dev_s *dev, uint32_t cmd,
if (rlong) if (rlong)
{ {
/* Last 8-bits are missing, see SRS04 documemntation, RESP3[23:0] /* Last 8-bits are missing, see SRS04 documentation, RESP3[23:0]
* has only 24 bits unlike RESP2, RESP1 and RESP0 that have 32 bits. * has only 24 bits unlike RESP2, RESP1 and RESP0 that have 32 bits.
* We have to shift left 8 bits to match the proper long response. * We have to shift left 8 bits to match the proper long response.
*/ */
rlong[3] = getreg32(MPFS_EMMCSD_SRS04) << 8;
rlong[2] = getreg32(MPFS_EMMCSD_SRS05) << 8;
rlong[1] = getreg32(MPFS_EMMCSD_SRS06) << 8;
rlong[0] = getreg32(MPFS_EMMCSD_SRS07) << 8; rlong[0] = getreg32(MPFS_EMMCSD_SRS07) << 8;
tmp = getreg32(MPFS_EMMCSD_SRS06);
rlong[0] |= tmp >> 24;
rlong[1] = tmp << 8;
tmp = getreg32(MPFS_EMMCSD_SRS05);
rlong[1] |= tmp >> 24;
rlong[2] = tmp << 8;
tmp = getreg32(MPFS_EMMCSD_SRS04);
rlong[2] |= tmp >> 24;
rlong[3] = tmp << 8;
mcinfo("recv: %08" PRIx32 " %08" PRIx32 " %08" PRIx32 " %08" \ mcinfo("recv: %08" PRIx32 " %08" PRIx32 " %08" PRIx32 " %08" \
PRIx32"\n", rlong[0], rlong[1], rlong[2], rlong[3]); PRIx32"\n", rlong[0], rlong[1], rlong[2], rlong[3]);