github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-07-16 10:03:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

rework to use smart SPI flash detection

Browse source 
Check JEDEC ID is in range between 0x0001 ... 0xFFFE,
Compare the output from 0x90 and 0x9F,
Then the size from the JEDEC ID

Otherwise fall-back to 256 kB

Extend the spi_flash_decode.py to handle more (known) SPI flash ICs
This commit is contained in:
ANTodorov 2024-11-30 14:38:13 +02:00
parent b75818116a
commit bd803ce8fd
No known key found for this signature in database
GPG key ID: 318CC11D7ED4016B
4 changed files with 114 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
## [unreleased][unreleased] ## [unreleased][unreleased]
- Changed SPI flash detection to calculate the size instead of table lookup, updated spi_flash_decode.py script with more ICs (@ANTodorov)
- Add option to set and get maximum read/write block number using `hf_mf_ultimatecard` script (@piotrva) - Add option to set and get maximum read/write block number using `hf_mf_ultimatecard` script (@piotrva)
- Added JEDEC information for SPI flash W25Q64JV (@ANTodorov) - Added JEDEC information for SPI flash W25Q64JV (@ANTodorov)
- Added special iclass legacy config cards in `hf iclass configcard` (@antiklesys) - Added special iclass legacy config cards in `hf iclass configcard` (@antiklesys)

158
client/pyscripts/spi_flash_decode.py
View file

@ -12,62 +12,118 @@ except ModuleNotFoundError:
return str(s) return str(s)
spi = { spi = {
0x68:{
"manufacturer": "Boya",
"jedec" : {
0x40: {
0x15: {
"part": "BY25Q16BS",
"size": "16mbits",
"sizeB": "2MB",
},
},
},
},
0x85:{ 0x85:{
"manufacturer": "Puya", "manufacturer": "Puya",
0x60: { "jedec" : {
0x15: { 0x60: {
"part": "P25Q16H", 0x15: {
"size": "16mbits", "part": "P25Q16H",
"sizeB": "2MB", "size": "16mbits",
"sizeB": "2MB",
},
0x16: {
"part": "P25Q32H",
"size": "32mbits",
"sizeB": "4MB",
},
0x17: {
"part": "P25Q64H",
"size": "64mbits",
"sizeB": "8MB",
},
}, },
}, },
}, },
0xEF:{ 0xEF:{
"manufacturer": "Winbond", "manufacturer": "Winbond",
0x30: { "jedec" : {
0x11: { 0x30: {
"part": "W25X10BV", 0x11: {
"size": "1mbits", "part": "W25X10BV",
"sizeB": "128KB", "size": "1mbits",
"sizeB": "128KB",
},
0x12: {
"part": "W25X20BV",
"size": "2mbits",
"sizeB": "256KB",
},
0x13: {
"part": "W25X40BV",
"size": "4mbits",
"sizeB": "512KB",
},
}, },
0x12: { 0x40: {
"part": "W25X20BV", 0x12: {
"size": "2mbits", "part": "W25Q20BV",
"sizeB": "256KB", "size": "2mbits",
"sizeB": "256KB",
},
0x13: {
"part": "W25Q40BV",
"size": "4mbits",
"sizeB": "512KB",
},
0x14: {
"part": "W25Q80BV",
"size": "8mbits",
"sizeB": "1MB",
},
0x15: {
"part": "W25Q16BV",
"size": "16mbits",
"sizeB": "2MB",
},
0x16: {
"part": "W25Q32BV",
"size": "32mbits",
"sizeB": "4MB",
},
0x17: {
"part": "W25Q64BV",
"size": "64mbits",
"sizeB": "8MB",
},
}, },
0x13: { 0x70: {
"part": "W25X40BV", 0x14: {
"size": "4mbits", "part": "W25Q80JV",
"sizeB": "512KB", "size": "8mbits",
}, "sizeB": "1MB",
}, },
0x40: { 0x15: {
0x13: { "part": "W25Q16JV",
"part": "W25Q40BV", "size": "16mbits",
"size": "4mbits", "sizeB": "2MB",
"sizeB": "512KB", },
}, 0x16: {
0x14: { "part": "W25Q32JV",
"part": "W25Q80BV", "size": "32mbits",
"size": "8mbits", "sizeB": "4MB",
"sizeB": "1MB", },
}, 0x17: {
0x15: { "part": "W25Q64JV",
"part": "W25Q16BV", "size": "64mbits",
"size": "16mbits", "sizeB": "8MB",
"sizeB": "2MB", },
}, 0x22: {
0x16: { "part": "W25Q02JV-IM",
"part": "W25Q32BV", "size": "2mbits",
"size": "32mbits", "sizeB": "256KB",
"sizeB": "4MB", },
},
},
0x70: {
0x22: {
"part": "W25Q02JV-IM",
"size": "2mbits",
"sizeB": "256KB",
}, },
}, },
}, },
@ -90,16 +146,16 @@ for line in p.grabbed_output.split('\n'):
did_h = did >> 8 did_h = did >> 8
did_l = did & 0xff did_l = did & 0xff
t = None t = None
print(f"\n JEDEC ID....... 0x{mid:X} / 0x{did:X}")
if mid in spi: if mid in spi:
mfr = spi[mid]['manufacturer'] mfr = spi[mid]['manufacturer']
if did_h in spi[mid]: if did_h in spi[mid]['jedec']:
if did_l in spi[mid][did_h]: if did_l in spi[mid]['jedec'][did_h]:
t = spi[mid][did_h][did_l] t = spi[mid]['jedec'][did_h][did_l]
print("\n Manufacturer... " + color(f"{mfr}", fg="green") + print("\n Manufacturer... " + color(f"{mfr}", fg="green") +
"\n Device......... " + color(f"{t['part']}", fg="green") + "\n Device......... " + color(f"{t['part']}", fg="green") +
"\n Size........... " + color(f"{t['size']} ({t['sizeB']})", fg="yellow") "\n Size........... " + color(f"{t['size']} ({t['sizeB']})", fg="yellow")

21
common_arm/flashmem.c
View file

@ -366,7 +366,6 @@ void Flashmem_print_status(void) {
); );
} }
Dbprintf(" Device.................. " _YELLOW_("%s"), spi_flash_data.device);
Dbprintf(" Memory size............. " _YELLOW_("%d kB (%d pages * 64k)"), spi_flash_pages64k * 64, spi_flash_pages64k); Dbprintf(" Memory size............. " _YELLOW_("%d kB (%d pages * 64k)"), spi_flash_pages64k * 64, spi_flash_pages64k);
uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0}; uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0};
@ -442,21 +441,13 @@ bool FlashDetect(void) {
} else { } else {
if (g_dbglevel > 3) Dbprintf("Flash_ReadID failed reading Mfr/Dev (0x90)"); if (g_dbglevel > 3) Dbprintf("Flash_ReadID failed reading Mfr/Dev (0x90)");
} }
// default device is 'unknown' // Check JEDEC data is valid, compare the reported device types and then calculate the number of pages
spi_flash_data.device = SpiFlashTable[0].device; // It is covering the most (known) cases of devices but probably there are vendors with different data
// They will be handled when there is such cases
if (ret) { if (ret) {
for (int i = 0; i < ARRAYLEN(SpiFlashTable); i++) { if (spi_flash_data.jedec_id > 0 && spi_flash_data.jedec_id < 0xFFFF) {
if (SpiFlashTable[i].manufacturer_id == spi_flash_data.manufacturer_id) { if (((spi_flash_data.device_id + 1) & 0x0F) == (spi_flash_data.jedec_id & 0x000F)) {
if (SpiFlashTable[i].jedec_id == spi_flash_data.jedec_id) { spi_flash_pages64k = 1 << (spi_flash_data.jedec_id & 0x000F);
spi_flash_pages64k = SpiFlashTable[i].pages64k;
spi_flash_data.device = SpiFlashTable[i].device;
break;
}
if (SpiFlashTable[i].device_id == spi_flash_data.device_id) {
spi_flash_data.device = SpiFlashTable[i].device;
break;
}
} }
} }
} }

33
common_arm/flashmem.h
View file

@ -140,41 +140,8 @@ typedef struct {
uint8_t manufacturer_id; uint8_t manufacturer_id;
uint8_t device_id; uint8_t device_id;
uint16_t jedec_id; uint16_t jedec_id;
uint8_t pages64k;
char *device;
} spi_flash_t; } spi_flash_t;
static const spi_flash_t SpiFlashTable[] = {
// first element is the default of 4 * 64kB pages (256kB)
{ 0x00, 0x00, 0x0000, 4, "unknown" }, // 256k
// Manufacturer: Puya
{ 0x85, 0x14, 0x6015, 32, "P25Q16H" }, // 2048k
// 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, 0x16, 0x7017, 128, "W25Q64JV" }, // 8192k
{ 0xEF, 0x21, 0x7022, 4, "W25Q02JV" },
// identified by Manufacturer /Device ID only
/// Manufacturer: Renesas
{ 0x1F, 0x46, 0x0000, 32, "AT25XE161D" }, // 2048k
{ 0x1F, 0x47, 0x0000, 64, "AT25XE321D" }, // 4096k
// { 0xEF, 0x05, 0x0000, 1, "Winbond!!!" }, // 64k (too small !!!)
{ 0xEF, 0x10, 0x0000, 2, "W25*10BV!" }, // 128k (small !!!)
{ 0xEF, 0x11, 0x0000, 4, "W25*20BV" }, // 256k
{ 0xEF, 0x12, 0x0000, 8, "W25*40BV" }, // 512k
{ 0xEF, 0x13, 0x0000, 16, "W25*80BV" }, // 1024k
{ 0xEF, 0x14, 0x0000, 32, "W25*16*" }, // 2048k
{ 0xEF, 0x15, 0x0000, 64, "W25*32*" }, // 4096k
{ 0xEF, 0x16, 0x0000, 128, "W25*64*" } // 8192k
};
extern uint8_t spi_flash_pages64k; extern uint8_t spi_flash_pages64k;
bool FlashDetect(void); bool FlashDetect(void);