devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

storage: 64-bit sector offsets

Browse source 
* Create new 'sector_t' type alias:
    * uint64_t for all targets with HAVE_LBA48 or HAVE_SDUC
    * unsigned long for the everything else
 * Alter all storage APIs to use sector_t instead of 'unsigned long'
 * Alter Volume/Partition/storage info structures to use sector_t
 * Disk cache converted to sector_t
 * ATA Core:
    * convert to using sector_t for sector addresses and drive sizes
    * Always fill out upper 16 bits of LBA48 addresses
    * IDENTIFY INFO is fixed at 512 bytes, not SECTOR_SIZE
 * USB mass storage:
    * convert to using sector_t for sector addesses and drive sizes
    * Implement READ_16/WRITE_16 for LBA48 addresses
 * Convert FAT code to use sector_t for all sector references
 * output_dyn_value() now accepts int64_t instead of 'int'
 * Corrected "rockbox info" to work for (MULTIVOLUME & !MULTIDRIVE)
 * Better reporting of disk and (logical+physical) sector sizes in debug info
 * Detect SDUC cards and report on storage debug_info screen

To-do: SDUC

 * Refactor SD core to remove duplicate code in every driver
   * Card probe and init state machine
 * Implement core SDUC support
   * SD2.0 needs to be 2.0+ (fixed for jz47xx and x1000)
   * Host and Card ID (ACMD41)
   * 32-bit addressing for all read/write/erase operations (CMD22)
 * ADD SDUC to target device drivers, defining HAVE_SDUC as appropriate

Change-Id: Ib0138781a0081664d11511037685503df1b93608
This commit is contained in:
Solomon Peachy 2024-07-05 16:00:30 -04:00
parent 9ff308a589
commit 15e5237469
49 changed files with 629 additions and 435 deletions
Download patch file Download diff file Expand all files Collapse all files

78
apps/debug_menu.c
View file

@ -557,14 +557,16 @@ static const char* dbg_partitions_getname(int selected_item, void *data,
if (!disk_partinfo(partition, &p))
return buffer;
// XXX fix this up to use logical sector size
// XXX and if mounted, show free info...
if (selected_item%2)
{
snprintf(buffer, buffer_len, " T:%x %ld MB", p.type,
p.size / ( 2048 / ( SECTOR_SIZE / 512 )));
snprintf(buffer, buffer_len, " T:%x %llu MB", p.type,
(uint64_t)(p.size / ( 2048 / ( SECTOR_SIZE / 512 ))));
}
else
{
snprintf(buffer, buffer_len, "P%d: S:%lx", partition, p.start);
snprintf(buffer, buffer_len, "P%d: S:%llx", partition, (uint64_t)p.start);
}
return buffer;
}
@ -572,7 +574,7 @@ static const char* dbg_partitions_getname(int selected_item, void *data,
static bool dbg_partitions(void)
{
struct simplelist_info info;
simplelist_info_init(&info, "Partition Info", NUM_DRIVES * 4, NULL);
simplelist_info_init(&info, "Partition Info", NUM_DRIVES * MAX_PARTITIONS_PER_DRIVE, NULL);
info.selection_size = 2;
info.scroll_all = true;
info.get_name = dbg_partitions_getname;
@ -1343,6 +1345,22 @@ static int disk_callback(int btn, struct gui_synclist *lists)
"R2W: *%d", card->r2w_factor);
#if (CONFIG_STORAGE & STORAGE_SD)
int csd_structure = card_extract_bits(card->csd, 127, 2);
const char *ver;
switch(csd_structure) {
case 0:
ver = "1 (SD)";
break;
case 1:
ver = "2 (SDHC/SDXC)";
break;
case 2:
ver = "3 (SDUC)";
break;
default:
ver = "Unknown";
break;
}
simplelist_addline("SDVer: %s\n", ver);
if (csd_structure == 0) /* CSD version 1.0 */
#endif
{
@ -1407,15 +1425,41 @@ static int disk_callback(int btn, struct gui_synclist *lists)
buf[8]=0;
simplelist_addline(
"Firmware: %s", buf);
snprintf(buf, sizeof buf, "%ld MB",
((unsigned long)identify_info[61] << 16 |
(unsigned long)identify_info[60]) / 2048 );
uint64_t total_sectors = identify_info[60] | (identify_info[61] << 16);
#ifdef HAVE_LBA48
if (identify_info[83] & 0x0400
&& total_sectors == 0x0FFFFFFF)
total_sectors = identify_info[100] | (identify_info[101] << 16) | ((uint64_t)identify_info[102] << 32) | ((uint64_t)identify_info[103] << 48);
#endif
uint32_t sector_size;
/* Logical sector size > 512B ? */
if ((identify_info[106] & 0xd000) == 0x5000)
sector_size = identify_info[117] | (identify_info[118] << 16);
else
sector_size = SECTOR_SIZE;
total_sectors *= sector_size; /* Convert to bytes */
total_sectors /= (1024 * 1024); /* Convert to MB */
simplelist_addline("Size: %llu MB", total_sectors);
simplelist_addline("Logical sector size: %u B", sector_size);
if((identify_info[106] & 0xe000) == 0x6000)
sector_size *= BIT_N(identify_info[106] & 0x000f);
simplelist_addline(
"Size: %s", buf);
unsigned long free;
"Physical sector size: %d B", sector_size);
#ifndef HAVE_MULTIVOLUME
// XXX this needs to be fixed for multi-volume setups
sector_t free;
volume_size( IF_MV(0,) NULL, &free );
simplelist_addline(
"Free: %ld MB", free / 1024);
"Free: %llu MB", free / 1024);
#endif
simplelist_addline("SSD detected: %s", ata_disk_isssd() ? "yes" : "no");
simplelist_addline(
"Spinup time: %d ms", storage_spinup_time() * (1000/HZ));
@ -1452,11 +1496,7 @@ static int disk_callback(int btn, struct gui_synclist *lists)
simplelist_addline(
"No timing info");
}
int sector_size = 512;
if((identify_info[106] & 0xe000) == 0x6000)
sector_size *= BIT_N(identify_info[106] & 0x000f);
simplelist_addline(
"Physical sector size: %d", sector_size);
#ifdef HAVE_ATA_DMA
if (identify_info[63] & (1<<0)) {
simplelist_addline(
@ -1751,8 +1791,8 @@ static int disk_callback(int btn, struct gui_synclist *lists)
simplelist_addline("Model: %s", info.product);
simplelist_addline("Firmware: %s", info.revision);
simplelist_addline(
"Size: %ld MB", info.num_sectors*(info.sector_size/512)/2024);
unsigned long free;
"Size: %lld MB", (uint64_t)(info.num_sectors*(info.sector_size/512)/2048));
storage_t free;
volume_size( IF_MV(0,) NULL, &free );
simplelist_addline(
"Free: %ld MB", free / 1024);
@ -1771,13 +1811,13 @@ static bool dbg_identify_info(void)
const unsigned short *identify_info = ata_get_identify();
#ifdef ROCKBOX_LITTLE_ENDIAN
/* this is a pointer to a driver buffer so we can't modify it */
for (int i = 0; i < SECTOR_SIZE/2; ++i)
for (int i = 0; i < ATA_IDENTIFY_WORDS; ++i)
{
unsigned short word = swap16(identify_info[i]);
write(fd, &word, 2);
}
#else
write(fd, identify_info, SECTOR_SIZE);
write(fd, identify_info, ATA_IDENTIFY_WORDS*2);
#endif
close(fd);
}