Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor spi flash detection #2643

Merged
merged 3 commits into from
Nov 20, 2024
Merged

refactor spi flash detection #2643

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3fa732
refactor spi flash detection
ANTodorov Nov 18, 2024
3b6530c
Merge branch 'RfidResearchGroup:master' into spi_flash_v2
ANTodorov Nov 20, 2024
76aaef9
rework addressing the review comments
ANTodorov Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions armsrc/appmain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2748,11 +2748,11 @@ static void PacketReceived(PacketCommandNG *packet) {
break;
}

if (payload->startidx == DEFAULT_T55XX_KEYS_OFFSET_P(spi_flash_p64k)) {
if (payload->startidx == DEFAULT_T55XX_KEYS_OFFSET_P(spi_flash_p->p64k)) {
Flash_CheckBusy(BUSY_TIMEOUT);
Flash_WriteEnable();
Flash_Erase4k(3, 0xC);
} else if (payload->startidx == DEFAULT_MF_KEYS_OFFSET_P(spi_flash_p64k)) {
} else if (payload->startidx == DEFAULT_MF_KEYS_OFFSET_P(spi_flash_p->p64k)) {
Flash_CheckBusy(BUSY_TIMEOUT);
Flash_WriteEnable();
Flash_Erase4k(3, 0x8);
Expand All @@ -2762,11 +2762,11 @@ static void PacketReceived(PacketCommandNG *packet) {
Flash_CheckBusy(BUSY_TIMEOUT);
Flash_WriteEnable();
Flash_Erase4k(3, 0xA);
} else if (payload->startidx == DEFAULT_ICLASS_KEYS_OFFSET_P(spi_flash_p64k)) {
} else if (payload->startidx == DEFAULT_ICLASS_KEYS_OFFSET_P(spi_flash_p->p64k)) {
Flash_CheckBusy(BUSY_TIMEOUT);
Flash_WriteEnable();
Flash_Erase4k(3, 0xB);
} else if (payload->startidx == FLASH_MEM_SIGNATURE_OFFSET_P(spi_flash_p64k)) {
} else if (payload->startidx == FLASH_MEM_SIGNATURE_OFFSET_P(spi_flash_p->p64k)) {
Flash_CheckBusy(BUSY_TIMEOUT);
Flash_WriteEnable();
Flash_Erase4k(3, 0xF);
Expand All @@ -2789,7 +2789,7 @@ static void PacketReceived(PacketCommandNG *packet) {
LED_B_OFF();
break;
}
if (page < spi_flash_p64k-1) {
if (page < spi_flash_p->p64k-1) {
isok = Flash_WipeMemoryPage(page);
// let spiffs check and update its info post flash erase
rdv40_spiffs_check();
Expand Down Expand Up @@ -2836,7 +2836,7 @@ static void PacketReceived(PacketCommandNG *packet) {
LED_B_ON();
rdv40_validation_t *info = (rdv40_validation_t *)BigBuf_malloc(sizeof(rdv40_validation_t));

bool isok = Flash_ReadData(FLASH_MEM_SIGNATURE_OFFSET_P(spi_flash_p64k), info->signature, FLASH_MEM_SIGNATURE_LEN);
bool isok = Flash_ReadData(FLASH_MEM_SIGNATURE_OFFSET_P(spi_flash_p->p64k), info->signature, FLASH_MEM_SIGNATURE_LEN);

if (FlashInit()) {
Flash_UniqueID(info->flashid);
Expand All @@ -2856,11 +2856,11 @@ static void PacketReceived(PacketCommandNG *packet) {
if (FlashInit()) {
isok = true;
if (g_dbglevel >= DBG_DEBUG) {
Dbprintf(" CMD_FLASHMEM_PAGE64K 0x%02x (%d 64k pages)", spi_flash_p64k, spi_flash_p64k);
Dbprintf(" CMD_FLASHMEM_PAGE64K 0x%02x (%d 64k pages)", spi_flash_p->p64k, spi_flash_p->p64k);
}
FlashStop();
}
reply_mix(CMD_ACK, isok, 0, 0, &spi_flash_p64k, sizeof(uint8_t));
reply_mix(CMD_ACK, isok, 0, 0, &spi_flash_p->p64k, sizeof(uint8_t));

LED_B_OFF();
break;
Expand Down
4 changes: 2 additions & 2 deletions armsrc/lfops.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2148,7 +2148,7 @@ void T55xx_ChkPwds(uint8_t flags, bool ledcontrol) {
BigBuf_Clear_EM();
uint16_t isok = 0;
uint8_t counter[2] = {0x00, 0x00};
isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET_P(spi_flash_p64k), counter, sizeof(counter));
isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET_P(spi_flash_p->p64k), counter, sizeof(counter));
if (isok != sizeof(counter))
goto OUT;

Expand All @@ -2164,7 +2164,7 @@ void T55xx_ChkPwds(uint8_t flags, bool ledcontrol) {
// adjust available pwd_count
pwd_count = pwd_size_available / 4;

isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET_P(spi_flash_p64k) + 2, pwds, pwd_size_available);
isok = Flash_ReadData(DEFAULT_T55XX_KEYS_OFFSET_P(spi_flash_p->p64k) + 2, pwds, pwd_size_available);
if (isok != pwd_size_available)
goto OUT;

Expand Down
4 changes: 2 additions & 2 deletions armsrc/mifarecmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1789,7 +1789,7 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
BigBuf_free();
uint16_t isok = 0;
uint8_t size[2] = {0x00, 0x00};
isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET_P(spi_flash_p64k), size, 2);
isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET_P(spi_flash_p->p64k), size, 2);
if (isok != 2)
goto OUT;

Expand All @@ -1808,7 +1808,7 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
if (datain == NULL)
goto OUT;

isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET_P(spi_flash_p64k) + 2, datain, key_mem_available);
isok = Flash_ReadData(DEFAULT_MF_KEYS_OFFSET_P(spi_flash_p->p64k) + 2, datain, key_mem_available);
if (isok != key_mem_available)
goto OUT;

Expand Down
2 changes: 1 addition & 1 deletion armsrc/spiffs_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ typedef uint8_t u8_t;
// Instead of giving parameters in config struct, singleton build must
// give parameters in defines below.
#ifndef SPIFFS_CFG_PHYS_SZ
#define SPIFFS_CFG_PHYS_SZ(ignore) (1024 * 64 * (spi_flash_p64k - 1))
#define SPIFFS_CFG_PHYS_SZ(ignore) (1024 * 64 * (spi_flash_p->p64k - 1))
#endif
#ifndef SPIFFS_CFG_PHYS_ERASE_SZ
#define SPIFFS_CFG_PHYS_ERASE_SZ(ignore) (4*1024)
Expand Down
174 changes: 92 additions & 82 deletions common_arm/flashmem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,34 @@ static uint32_t FLASHMEM_SPIBAUDRATE = FLASH_BAUD;

#ifndef AS_BOOTROM

uint8_t spi_flash_p64k = 0;
const spi_flash_t SpiFlashTable[] = {
// first element is the default of 4 * 64kB pages (256kB)
{ 0x00, 0x00, 0x0000, 4, "unknown" }, // 256k
// Manufacturer: Puya
{ 0x85, 0x00, 0x6015, 32, "P25Q16H" }, // 2048k
/// Manufacturer: Renesas
{ 0x1F, 0x46, 0x0000, 32, "AT25XE161D" }, // 2048k
{ 0x1F, 0x47, 0x0000, 64, "AT25XE321D" }, // 4096k
// Manufacturer: Winbond
{ 0xEF, 0x00, 0x3012, 4, "W25X20BV" }, // 256k
{ 0xEF, 0x00, 0x3013, 8, "W25X40BV" }, // 512k

{ 0xEF, 0x00, 0x4013, 8, "W25Q40BV" }, // 512k
{ 0xEF, 0x00, 0x4014, 16, "W25Q80BV" }, // 1024k
{ 0xEF, 0x14, 0x4015, 32, "W25Q16BV" }, // 2048k
{ 0xEF, 0x15, 0x4016, 64, "W25Q32BV" }, // 4096k

{ 0xEF, 0x21, 0x7022, 4, "W25Q02JV" },
// identified by Manufacturer /Device ID
// { 0xEF, 0x05, 0x0000, 1, "Winbond!!!" },
{ 0xEF, 0x10, 0x0000, 2, "W25*10BV!!!" }, // 128k
{ 0xEF, 0x11, 0x0000, 4, "W25*20BV" }, // 256k
{ 0xEF, 0x12, 0x0000, 8, "W25*40BV" }, // 512k
{ 0xEF, 0x13, 0x0000, 16, "W25*80BV" } // 1024k
};
const spi_flash_t *spi_flash_p = SpiFlashTable;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you move this table to the header file where you declare it, you can remove the extern reference to it.
Not sure why you complicate it with pointers. I would have a static extern for table_idx, and a "get_item" function.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right.
Actually only the number of the 64k pages is needed outside of the flashmem.c file.
rework in progress...

spi_flash_t spi_flash_data = {0};


void FlashmemSetSpiBaudrate(uint32_t baudrate) {
FLASHMEM_SPIBAUDRATE = baudrate;
Expand All @@ -60,18 +87,18 @@ bool Flash_ReadID(flash_device_type_t *result, bool read_jedec) {
// 0x9F JEDEC
FlashSendByte(JEDECID);

result->manufacturer_id = (FlashSendByte(0xFF) & 0xFF);
result->device_id = (FlashSendByte(0xFF) & 0xFF);
result->device_id2 = (FlashSendLastByte(0xFF) & 0xFF);
result->mfr_id = (FlashSendByte(0xFF) & 0xFF);
result->device_id = (FlashSendByte(0xFF) & 0xFF);
result->device_id2 = (FlashSendLastByte(0xFF) & 0xFF);
} else {
// 0x90 Manufacture ID / device ID
FlashSendByte(ID);
FlashSendByte(0x00);
FlashSendByte(0x00);
FlashSendByte(0x00);

result->manufacturer_id = (FlashSendByte(0xFF) & 0xFF);
result->device_id = (FlashSendLastByte(0xFF) & 0xFF);
result->mfr_id = (FlashSendByte(0xFF) & 0xFF);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This rename made it hard to understand. Please revert.

result->device_id = (FlashSendLastByte(0xFF) & 0xFF);
}

return true;
Expand Down Expand Up @@ -152,8 +179,8 @@ uint16_t Flash_WriteData(uint32_t address, uint8_t *in, uint16_t len) {
}

// out-of-range
if (((address >> 16) & 0xFF) > spi_flash_p64k) {
Dbprintf("Flash_WriteData, block out-of-range %02x > %02x", (address >> 16) & 0xFF, spi_flash_p64k);
if (((address >> 16) & 0xFF) > spi_flash_p->p64k) {
Dbprintf("Flash_WriteData, block out-of-range %02x > %02x", (address >> 16) & 0xFF, spi_flash_p->p64k);
FlashStop();
return 0;
}
Expand Down Expand Up @@ -190,8 +217,8 @@ uint16_t Flash_WriteDataCont(uint32_t address, uint8_t *in, uint16_t len) {
return 0;
}

if (((address >> 16) & 0xFF) > spi_flash_p64k) {
Dbprintf("Flash_WriteDataCont, block out-of-range %02x > %02x", (address >> 16) & 0xFF, spi_flash_p64k);
if (((address >> 16) & 0xFF) > spi_flash_p->p64k) {
Dbprintf("Flash_WriteDataCont, block out-of-range %02x > %02x", (address >> 16) & 0xFF, spi_flash_p->p64k);
return 0;
}

Expand Down Expand Up @@ -269,7 +296,7 @@ bool Flash_WipeMemory(void) {

// Each block is 64Kb. Four blocks
// one block erase takes 1s ( 1000ms )
for (uint8_t i=0; i < spi_flash_p64k; i++) {
for (uint8_t i=0; i < spi_flash_p->p64k; i++) {
Flash_WriteEnable();
Flash_Erase64k(i);
Flash_CheckBusy(BUSY_TIMEOUT);
Expand All @@ -289,7 +316,7 @@ void Flash_WriteEnable(void) {
// execution time: 0.8ms / 800us
bool Flash_Erase4k(uint8_t block, uint8_t sector) {

if (block > spi_flash_p64k || sector > MAX_SECTORS) return false;
if (block > spi_flash_p->p64k || sector > MAX_SECTORS) return false;

FlashSendByte(SECTORERASE);
FlashSendByte(block);
Expand Down Expand Up @@ -324,7 +351,7 @@ bool Flash_Erase32k(uint32_t address) {
// 0x03 00 00 -- 0x 03 FF FF == block 3
bool Flash_Erase64k(uint8_t block) {

if (block > spi_flash_p64k) return false;
if (block > spi_flash_p->p64k) return false;

FlashSendByte(BLOCK64ERASE);
FlashSendByte(block);
Expand All @@ -350,57 +377,22 @@ void Flashmem_print_status(void) {
}
DbpString(" Init.................... " _GREEN_("ok"));

// NOTE: It would likely be more useful to use JDEC ID command 9F,
// as it provides a third byte indicative of capacity.
flash_device_type_t device_type = {0};
if (!Flash_ReadID(&device_type, false)) {
DbpString(" Device ID............... " _RED_(" --> Not Found <--"));
} else {
if (device_type.manufacturer_id == WINBOND_MANID) {
switch (device_type.device_id) {
case WINBOND_32MB_DEVID:
DbpString(" Memory size............. " _YELLOW_("32 mbits / 4 MB"));
break;
case WINBOND_16MB_DEVID:
DbpString(" Memory size............. " _YELLOW_("16 mbits / 2 MB"));
break;
case WINBOND_8MB_DEVID:
DbpString(" Memory size............. " _YELLOW_("8 mbits / 1 MB"));
break;
case WINBOND_4MB_DEVID:
DbpString(" Memory size............. " _YELLOW_("4 mbits / 512 kb"));
break;
case WINBOND_2MB_DEVID:
DbpString(" Memory size............. " _YELLOW_("2 mbits / 256 kb"));
break;
case WINBOND_1MB_DEVID:
DbpString(" Memory size..... ....... " _YELLOW_("1 mbits / 128 kb"));
break;
case WINBOND_512KB_DEVID:
DbpString(" Memory size............. " _YELLOW_("512 kbits / 64 kb"));
break;
default:
Dbprintf(" Device ID............... " _YELLOW_("%02X / %02X (Winbond)"),
device_type.manufacturer_id,
device_type.device_id
);
break;
}
} else {
Dbprintf(" Device ID............... " _YELLOW_("%02X / %02X (unknown)"),
device_type.manufacturer_id,
device_type.device_id
);
}
if (Flash_ReadID(&device_type, true)) {
Dbprintf(" JEDEC Mfr ID / Dev ID... " _YELLOW_("%02X / %02X%02X"),
device_type.manufacturer_id,
device_type.device_id,
device_type.device_id2
);
}
if (spi_flash_data.device_id > 0 ) {
Dbprintf(" Mfr ID / Dev ID......... " _YELLOW_("%02X / %02X"),
spi_flash_data.mfr_id,
spi_flash_data.device_id
);
}
Dbprintf(" Flash pages (64k)....... " _YELLOW_("0x%02x (%u)"), spi_flash_p64k, spi_flash_p64k);

if (spi_flash_data.jedec_id > 0) {
Dbprintf(" JEDEC Mfr ID / Dev ID... " _YELLOW_("%02X / %04X"),
spi_flash_data.mfr_id,
spi_flash_data.jedec_id
);
}

Dbprintf(" Device.................. " _YELLOW_("%s"), spi_flash_p->desc);
Dbprintf(" Memory size............. " _YELLOW_("%d kB (%d pages * 64k)"), spi_flash_p->p64k * 64, spi_flash_p->p64k);

uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0};
Flash_UniqueID(uid);
Expand Down Expand Up @@ -428,23 +420,23 @@ void Flashmem_print_info(void) {
uint16_t num;

Flash_CheckBusy(BUSY_TIMEOUT);
uint16_t isok = Flash_ReadDataCont(DEFAULT_MF_KEYS_OFFSET_P(spi_flash_p64k), keysum, 2);
uint16_t isok = Flash_ReadDataCont(DEFAULT_MF_KEYS_OFFSET_P(spi_flash_p->p64k), keysum, 2);
if (isok == 2) {
num = ((keysum[1] << 8) | keysum[0]);
if (num != 0xFFFF && num != 0x0)
Dbprintf(" Mifare.................. "_YELLOW_("%u")" / "_GREEN_("%u")" keys", num, DEFAULT_MF_KEYS_MAX);
}

Flash_CheckBusy(BUSY_TIMEOUT);
isok = Flash_ReadDataCont(DEFAULT_T55XX_KEYS_OFFSET_P(spi_flash_p64k), keysum, 2);
isok = Flash_ReadDataCont(DEFAULT_T55XX_KEYS_OFFSET_P(spi_flash_p->p64k), keysum, 2);
if (isok == 2) {
num = ((keysum[1] << 8) | keysum[0]);
if (num != 0xFFFF && num != 0x0)
Dbprintf(" T55x7................... "_YELLOW_("%u")" / "_GREEN_("%u")" keys", num, DEFAULT_T55XX_KEYS_MAX);
}

Flash_CheckBusy(BUSY_TIMEOUT);
isok = Flash_ReadDataCont(DEFAULT_ICLASS_KEYS_OFFSET_P(spi_flash_p64k), keysum, 2);
isok = Flash_ReadDataCont(DEFAULT_ICLASS_KEYS_OFFSET_P(spi_flash_p->p64k), keysum, 2);
if (isok == 2) {
num = ((keysum[1] << 8) | keysum[0]);
if (num != 0xFFFF && num != 0x0)
Expand All @@ -454,26 +446,44 @@ void Flashmem_print_info(void) {
FlashStop();
}

//read spi flash JEDEC ID and fill the global variable spi_flash_p64k
bool FlashDetect(void) {
flash_device_type_t flash_device = {0};

if (!Flash_ReadID(&flash_device, true)) {
if (g_dbglevel > 3) Dbprintf("Flash_ReadID failed");
return false;
bool FlashDetect(const spi_flash_t **spi_flash_ptr) {
flash_device_type_t flash_data = {0};
bool ret = false;
// read JEDEC
if (Flash_ReadID(&flash_data, true)) {
spi_flash_data.mfr_id = flash_data.mfr_id;
spi_flash_data.jedec_id = (flash_data.device_id <<8) + flash_data.device_id2;
ret = true;
} else{
if (g_dbglevel > 3) Dbprintf("Flash_ReadID failed reading JEDEC (0x9F)");
}

uint32_t identifier = (flash_device.manufacturer_id << 16) + (flash_device.device_id <<8 ) + flash_device.device_id2;
int i = 0;
for (; i < ARRAYLEN(SpiFlashTable)-1; i++) {
if (SpiFlashTable[i].identifier == identifier) {
break;
if (Flash_ReadID(&flash_data, false)) {
if (spi_flash_data.mfr_id == 0) {
spi_flash_data.mfr_id = flash_data.mfr_id;
}
spi_flash_data.device_id = flash_data.device_id;
ret = true;
} else {
if (g_dbglevel > 3) Dbprintf("Flash_ReadID failed reading Mfr/Dev (0x90)");
}

spi_flash_p64k = SpiFlashTable[i].pages64;
if (ret) {
for (int i=0; i < ARRAYLEN(SpiFlashTable); i++) {
if (SpiFlashTable[i].mfr_id == spi_flash_data.mfr_id) {
if (SpiFlashTable[i].jedec_id == spi_flash_data.jedec_id) {
*spi_flash_ptr = *spi_flash_ptr + i;
break;
}
if (SpiFlashTable[i].device_id == spi_flash_data.device_id) {
*spi_flash_ptr = *spi_flash_ptr + i;
break;
}
}
}
}

return true;
return ret;
}

#endif // #ifndef AS_BOOTROM
Expand All @@ -491,8 +501,8 @@ bool FlashInit(void) {
}

#ifndef AS_BOOTROM
if (spi_flash_p64k == 0) {
if (!FlashDetect()) {
if (spi_flash_data.mfr_id == 0) {
if (!FlashDetect(&spi_flash_p)) {
return false;
}
}
Expand Down
Loading
Loading