Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bios/sdcard: use (512 byte) blocks as the smallest addressable data unit 

In liblitesdcard/sdcard.c, replace s/sector/block/ as the 512 byte sized
unit of data transfer to/from the sdcard.

In bios/cmds/cmd_litesdcard.c, do NOT multiply block numbers by 512,
allowing any "block" (a.k.a. "sector") on the sdcard to be addressed for
testing.

Before this patch, user-input "block numbers" were multiplied by 512 and
passed into sdcard_[read|write]() as "sector numbers", with the sdcard
logic internally treating these as 512-byte sized addressable units on
the card. This resulted in only every 512'th 512-byte sized "sector" being
accessible from the bios command line.

Signed-off-by: Gabriel Somlo <gsomlo@gmail.com>
This commit is contained in:
Gabriel Somlo 2020-08-27 15:16:01 -04:00
parent 222e3f4003
commit d86d20671e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
litex/soc/software/bios/cmds/cmd_litesdcard.c
View File

@ -73,7 +73,7 @@ static void sdread(int nb_params, char **params)
return; return;
} }
sdcard_read(block*512, 1, buf); sdcard_read(block, 1, buf);
dump_bytes((uint32_t *)buf, 512, (unsigned long) buf); dump_bytes((uint32_t *)buf, 512, (unsigned long) buf);
} }
@ -115,7 +115,7 @@ static void sdwrite(int nb_params, char **params)
} }
} }
dump_bytes((uint32_t *)buf, 512, (unsigned long) buf); dump_bytes((uint32_t *)buf, 512, (unsigned long) buf);
sdcard_write(block*512, 1, buf); sdcard_write(block, 1, buf);
} }
define_command(sdwrite, sdwrite, "Write SDCard block", LITESDCARD_CMDS); define_command(sdwrite, sdwrite, "Write SDCard block", LITESDCARD_CMDS);

18
litex/soc/software/liblitesdcard/sdcard.c
View File

@ -464,7 +464,7 @@ int sdcard_init(void) {
#ifdef CSR_SDBLOCK2MEM_BASE #ifdef CSR_SDBLOCK2MEM_BASE
void sdcard_read(uint32_t sector, uint32_t count, uint8_t* buf) void sdcard_read(uint32_t block, uint32_t count, uint8_t* buf)
{ {
/* Initialize DMA Writer */ /* Initialize DMA Writer */
sdblock2mem_dma_enable_write(0); sdblock2mem_dma_enable_write(0);
@ -476,7 +476,7 @@ void sdcard_read(uint32_t sector, uint32_t count, uint8_t* buf)
#ifdef SDCARD_CMD23_SUPPORT #ifdef SDCARD_CMD23_SUPPORT
sdcard_set_block_count(count); sdcard_set_block_count(count);
#endif #endif
sdcard_read_multiple_block(sector, count); sdcard_read_multiple_block(block, count);
/* Wait for DMA Writer to complete */ /* Wait for DMA Writer to complete */
while ((sdblock2mem_dma_done_read() & 0x1) == 0); while ((sdblock2mem_dma_done_read() & 0x1) == 0);
@ -496,7 +496,7 @@ void sdcard_read(uint32_t sector, uint32_t count, uint8_t* buf)
#ifdef CSR_SDMEM2BLOCK_BASE #ifdef CSR_SDMEM2BLOCK_BASE
void sdcard_write(uint32_t sector, uint32_t count, uint8_t* buf) void sdcard_write(uint32_t block, uint32_t count, uint8_t* buf)
{ {
while (count--) { while (count--) {
/* Initialize DMA Reader */ /* Initialize DMA Reader */
@ -509,13 +509,13 @@ void sdcard_write(uint32_t sector, uint32_t count, uint8_t* buf)
#ifdef SDCARD_CMD23_SUPPORT #ifdef SDCARD_CMD23_SUPPORT
sdcard_set_block_count(1); sdcard_set_block_count(1);
#endif #endif
sdcard_write_single_block(sector); sdcard_write_single_block(block);
sdcard_stop_transmission(); sdcard_stop_transmission();
/* Update buf/sector */ /* Update buf/block */
buf += 512; buf += 512;
sector += 1; block += 1;
} }
} }
#endif #endif
@ -538,8 +538,8 @@ DSTATUS disk_initialize(uint8_t drv) {
return sdcardstatus; return sdcardstatus;
} }
DRESULT disk_read(uint8_t drv, uint8_t *buf, uint32_t sector, uint32_t count) { DRESULT disk_read(uint8_t drv, uint8_t *buf, uint32_t block, uint32_t count) {
sdcard_read(sector, count, buf); sdcard_read(block, count, buf);
return RES_OK; return RES_OK;
} }