mmc-utils: improve lsmmc usability
Subsystems (2)
v2 cover mmc-utils: improve lsmmc usability
This series improves lsmmc in four areas: external manufacturer ID files, accepting /dev and /sys/block paths for register reads, an mmc list command, and bash completion for mmc-utils.
A cleanup patch is prepended to refactor CID parsing into shared structs and helpers used by all three print functions.
Changes since v1 (review by Avri Altman):
- Patch 1 (new): refactor CID parsing into struct sd_cid/mmc_cid and parse_sd_cid()/parse_mmc_cid() helpers; used by print_sd_cid, print_mmc_cid, and print_list_entry
- Patch 2: get_manufacturer: fix static buffer lifetime, return strdup()
- Patch 2: get_manufacturer: simplify fopen fallback, warn once if ids files missing
- Patch 2: replace read_file() with read_file_at(dir, name), remove all chdir() calls
- Patch 2: struct config: remove ids_dir field
- Patch 2: print_sd_cid, print_mmc_cid: free() the manufacturer string
- Patch 3: resolve_dev_path: use stack buffer, strip partition suffix, validate device type
- Patch 4: month_name: switch to 0-indexed 16-entry array, drop "???" sentinel
- Patch 4: do_list: move struct config outside loop
- Patch 4: do_list: remove redundant access() check
- Patch 5: bash completion: accept more than 9 devices (/dev/mmcblk[0-9] replaced with compgen -G + grep regex)
Torstein Eide (5):
mmc-utils: lsmmc: Refactor CID parsing into shared structs
mmc-utils: lsmmc: Use external .ids files for manufacturer lookup
mmc-utils: lsmmc: Accept /dev and /sys/block paths for register reads
mmc-utils: lsmmc: Add mmc list command
mmc-utils: Add bash completion
Makefile | 11 +- completion/mmc | 62 +++++ docs/HOWTO.rst | 77 +++++- lsmmc.c | 594 ++++++++++++++++++++++++++------------------- mmc.c | 6 +- mmc_cmds.h | 1 + multimediacard.ids | 16 ++ sdcard.ids | 23 ++ 8 files changed, 531 insertions(+), 259 deletions(-) create mode 100644 completion/mmc create mode 100644 multimediacard.ids create mode 100644 sdcard.ids
Signature · 1 line
2.53.0
PATCH v2 1/5 mmc-utils: lsmmc: Refactor CID parsing into shared structs
Add struct sd_cid and struct mmc_cid with parse_sd_cid() and parse_mmc_cid() helpers. Use them in print_sd_cid(), print_mmc_cid() and print_list_entry() to eliminate duplicated parse_bin() format strings and local variable lists.
Also fix print_list_entry() using const char * for the strdup'd manufacturer string without a matching free().
--- lsmmc.c | 250 +++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 184 insertions(+), 66 deletions(-)
lsmmc.c +184 -66
@@ -509,62 +509,89 @@ static void parse_bin(char *hexstr, char *fmt, ...)free (origstr); } -/* MMC/SD information parsing functions */ -static void print_sd_cid (struct config *config,char *cid) -{ -static const char *months[] = { -"jan" ,"feb" ,"mar" ,"apr" ,"may" ,"jun" , -"jul" ,"aug" ,"sep" ,"oct" ,"nov" ,"dec" , -"invalid0" ,"invalid1" ,"invalid2" ,"invalid3" , - }; +struct sd_cid {unsigned int mid;char oid[3 ];char pnm[6 ];unsigned int prv_major;unsigned int prv_minor;unsigned int psn; +unsigned int mdt_year;unsigned int mdt_month; +unsigned int crc; +}; + +struct mmc_cid { +unsigned int mid; +unsigned int cbx; +unsigned int oid; +char pnm[7 ]; +unsigned int prv_major; +unsigned int prv_minor; +unsigned int psn;unsigned int mdt_year; +unsigned int mdt_month;unsigned int crc; -char *manufacturer =NULL ; +}; -parse_bin (cid,"8u16a40a4u4u32u4r8u4u7u1r" , - &mid, &oid[0 ], &pnm[0 ], &prv_major, &prv_minor, &psn, - &mdt_year, &mdt_month, &crc); +static void parse_sd_cid (char *raw,struct sd_cid *c) +{ +parse_bin (raw,"8u16a40a4u4u32u4r8u4u7u1r" , + &c->mid, &c->oid[0 ], &c->pnm[0 ], &c->prv_major, &c->prv_minor, + &c->psn, &c->mdt_year, &c->mdt_month, &c->crc); + c->oid[2 ] ='\0' ; + c->pnm[5 ] ='\0' ; +} - oid[2 ] ='\0' ; - pnm[5 ] ='\0' ; +static void parse_mmc_cid (char *raw,struct mmc_cid *c) +{ +parse_bin (raw,"8u6r2u8u48a4u4u32u4u4u7u1r" , + &c->mid, &c->cbx, &c->oid, &c->pnm[0 ], &c->prv_major, + &c->prv_minor, &c->psn, &c->mdt_year, &c->mdt_month, &c->crc); + c->pnm[6 ] ='\0' ; +} + +/* MMC/SD information parsing functions */ +static void print_sd_cid (struct config *config,char *cid) +{ +static const char *months[] = { +"jan" ,"feb" ,"mar" ,"apr" ,"may" ,"jun" , +"jul" ,"aug" ,"sep" ,"oct" ,"nov" ,"dec" , +"invalid0" ,"invalid1" ,"invalid2" ,"invalid3" , + }; +struct sd_cid c; +char *manufacturer; - manufacturer =get_manufacturer (config, mid); +parse_sd_cid (cid, &c); + manufacturer =get_manufacturer (config, c.mid);if (config->verbose) {printf ("======SD/CID======\n" ); -printf ("\tMID: 0x%02x (" , mid); +printf ("\tMID: 0x%02x (" , c.mid);if (manufacturer)printf ("%s)\n" , manufacturer);else printf ("Unlisted)\n" ); -printf ("\tOID: %s\n" , oid); -printf ("\tPNM: %s\n" , pnm); -printf ("\tPRV: 0x%01x%01x " , prv_major, prv_minor); -printf ("(%u.%u)\n" , prv_major, prv_minor); -printf ("\tPSN: 0x%08x\n" , psn); -printf ("\tMDT: 0x%02x%01x %u %s\n" , mdt_year, mdt_month, -2000 + mdt_year, months[mdt_month]); -printf ("\tCRC: 0x%02x\n" , crc); +printf ("\tOID: %s\n" , c.oid); +printf ("\tPNM: %s\n" , c.pnm); +printf ("\tPRV: 0x%01x%01x " , c.prv_major, c.prv_minor); +printf ("(%u.%u)\n" , c.prv_major, c.prv_minor); +printf ("\tPSN: 0x%08x\n" , c.psn); +printf ("\tMDT: 0x%02x%01x %u %s\n" , c.mdt_year, c.mdt_month, +2000 + c.mdt_year, months[c.mdt_month]); +printf ("\tCRC: 0x%02x\n" , c.crc); }else {if (manufacturer) -printf ("manufacturer: '%s' '%s'\n" , - manufacturer, oid); +printf ("manufacturer: '%s' '%s'\n" , manufacturer, c.oid);else -printf ("manufacturer: 'Unlisted' '%s'\n" , oid); +printf ("manufacturer: 'Unlisted' '%s'\n" , c.oid); -printf ("product: '%s' %u.%u\n" , pnm, prv_major, prv_minor); -printf ("serial: 0x%08x\n" , psn); -printf ("manufacturing date: %u %s\n" ,2000 + mdt_year, - months[mdt_month]); +printf ("product: '%s' %u.%u\n" , c.pnm, c.prv_major, c.prv_minor); +printf ("serial: 0x%08x\n" , c.psn); +printf ("manufacturing date: %u %s\n" ,2000 + c.mdt_year, + months[c.mdt_month]); } }
@@ -575,37 +602,23 @@ static void print_mmc_cid(struct config *config, char *cid)"jul" ,"aug" ,"sep" ,"oct" ,"nov" ,"dec" , "invalid0", "invalid1", "invalid2", "invalid3", }; -unsigned int mid; -unsigned int cbx; -unsigned int oid; -char pnm[7 ]; -unsigned int prv_major; -unsigned int prv_minor; -unsigned int psn; -unsigned int mdt_month; -unsigned int mdt_year; -unsigned int crc; -char *manufacturer =NULL ; - -parse_bin (cid,"8u6r2u8u48a4u4u32u4u4u7u1r" , - &mid, &cbx, &oid, &pnm[0 ], &prv_major, &prv_minor, &psn, - &mdt_year, &mdt_month, &crc); - - pnm[6 ] ='\0' ; +struct mmc_cid c; +char *manufacturer; - manufacturer =get_manufacturer (config, mid); +parse_mmc_cid (cid, &c); + manufacturer =get_manufacturer (config, c.mid);if (config->verbose) {printf ("======MMC/CID======\n" ); -printf ("\tMID: 0x%02x (" , mid); +printf ("\tMID: 0x%02x (" , c.mid);if (manufacturer)printf ("%s)\n" , manufacturer);else printf ("Unlisted)\n" ); -printf ("\tCBX: 0x%01x (" , cbx); -switch (cbx) { +printf ("\tCBX: 0x%01x (" , c.cbx); +switch (c.cbx) {case 0 :printf ("card)\n" );break ;
@@ -620,25 +633,26 @@ static void print_mmc_cid(struct config *config, char *cid)break ; } -printf ("\tOID: 0x%01x\n" , oid); -printf ("\tPNM: %s\n" , pnm); -printf ("\tPRV: 0x%01x%01x " , prv_major, prv_minor); -printf ("(%u.%u)\n" , prv_major, prv_minor); -printf ("\tPSN: 0x%08x\n" , psn); -printf ("\tMDT: 0x%01x%01x %u %s\n" , mdt_month, mdt_year, -1997 + mdt_year, months[mdt_month]); -printf ("\tCRC: 0x%02x\n" , crc); +printf ("\tOID: 0x%01x\n" , c.oid); +printf ("\tPNM: %s\n" , c.pnm); +printf ("\tPRV: 0x%01x%01x " , c.prv_major, c.prv_minor); +printf ("(%u.%u)\n" , c.prv_major, c.prv_minor); +printf ("\tPSN: 0x%08x\n" , c.psn); +printf ("\tMDT: 0x%01x%01x %u %s\n" , c.mdt_month, c.mdt_year, +1997 + c.mdt_year, months[c.mdt_month]); +printf ("\tCRC: 0x%02x\n" , c.crc); }else {if (manufacturer)printf ("manufacturer: 0x%02x (%s) oid: 0x%01x\n" , - mid, manufacturer, oid); + c.mid, manufacturer, c.oid);else -printf ("manufacturer: 0x%02x (Unlisted) oid: 0x%01x\n" , mid, oid); +printf ("manufacturer: 0x%02x (Unlisted) oid: 0x%01x\n" , + c.mid, c.oid); -printf ("product: '%s' %u.%u\n" , pnm, prv_major, prv_minor); -printf ("serial: 0x%08x\n" , psn); -printf ("manufacturing date: %u %s\n" ,1997 + mdt_year, - months[mdt_month]); +printf ("product: '%s' %u.%u\n" , c.pnm, c.prv_major, c.prv_minor); +printf ("serial: 0x%08x\n" , c.psn); +printf ("manufacturing date: %u %s\n" ,1997 + c.mdt_year, + months[c.mdt_month]); } }
@@ -2270,6 +2284,110 @@ static int do_read_reg(int argc, char **argv, enum REG_TYPE reg)return ret; } +static const char *month_name (unsigned int month) +{ +static const char *months[] = { +"jan" ,"feb" ,"mar" ,"apr" ,"may" ,"jun" , +"jul" ,"aug" ,"sep" ,"oct" ,"nov" ,"dec" , +"invalid0" ,"invalid1" ,"invalid2" ,"invalid3" , + }; + +if (month >=ARRAY_SIZE (months)) +return "invalid" ; + +return months[month]; +} + +static void print_list_entry (struct config *cfg,const char *devname, +const char *blkdev,char *cid) +{ +char *mfr; +char devnode[32 ]; + +snprintf (devnode,sizeof (devnode),"/dev/%s" , blkdev ? blkdev :"?" ); + +if (cfg->bus ==SD ) { +struct sd_cid c; + +parse_sd_cid (cid, &c); + mfr =get_manufacturer (cfg, c.mid); +printf ("%-14s %-14s SD %-20s %-10s %u.%u 0x%08x %u-%s\n" , + devname, devnode, mfr ? mfr :"Unlisted" , c.pnm, + c.prv_major, c.prv_minor, c.psn,2000 + c.mdt_year, +month_name (c.mdt_month)); + }else { +struct mmc_cid c; + +parse_mmc_cid (cid, &c); + mfr =get_manufacturer (cfg, c.mid); +printf ("%-14s %-14s MMC %-20s %-10s %u.%u 0x%08x %u-%s\n" , + devname, devnode, mfr ? mfr :"Unlisted" , c.pnm, + c.prv_major, c.prv_minor, c.psn,1997 + c.mdt_year, +month_name (c.mdt_month)); + } + +free (mfr); +} + +int do_list (int nargs,char **argv) +{ +const char *bus_path ="/sys/bus/mmc/devices" ; +DIR *d; +struct dirent *ent; +bool header_printed = false; + + d =opendir (bus_path); +if (!d) { +fprintf (stderr,"Cannot open %s\n" , bus_path); +return -1 ; + } + +struct config cfg = {}; + +while ((ent =readdir (d)) !=NULL ) { +char devpath[PATH_MAX ]; +char resolved[PATH_MAX ]; +char *type, *cid, *blkdev; + +if (!strchr (ent->d_name,':' )) +continue ; + +snprintf (devpath,sizeof (devpath),"%s/%s" , bus_path, ent->d_name); +if (realpath (devpath, resolved) ==NULL ) +continue ; + + type =read_file_at (resolved,"type" ); +if (!type) +continue ; + + cid =read_file_at (resolved,"cid" ); +if (!cid) { +free (type); +continue ; + } + + blkdev =find_block_devname (resolved); + cfg.bus =strcmp (type,"MMC" ) ?SD :MMC ; + +if (!header_printed) { +printf ("%-14s %-14s %-5s%-20s %-10s %-5s %-12s %s\n" , +"DEVICE" ,"DEV" ,"TYPE" ,"MANUFACTURER" ,"PRODUCT" , +"REV" ,"SERIAL" ,"DATE" ); + header_printed = true; + } + +print_list_entry (&cfg, ent->d_name, blkdev, cid); + +free (blkdev); +free (cid); +free (type); + } + +closedir (d); +return 0 ; +} + +int do_read_csd (int argc,char **argv) {return do_read_reg (argc, argv,CSD );
Signature · 1 line
2.53.0
RE: [PATCH v2 1/5] mmc-utils: lsmmc: Refactor CID parsing into shared structs
Quoted 9 lines
Add struct
sd_cidand structmmc_cidwithparse_sd_cid()andparse_mmc_cid()helpers. Use them inprint_sd_cid(),print_mmc_cid()andprint_list_entry()to eliminate duplicatedparse_bin()format strings and local variable lists.Also fix
print_list_entry()using const char * for the strdup'd manufacturer string without a matchingfree().Signed-off-by Torstein Eide <[email protected]>
RE: [PATCH v2 1/5] mmc-utils: lsmmc: Refactor CID parsing into shared structs
Quoted 11 lines
Quoted 10 lines
Add struct
sd_cidand structmmc_cidwithparse_sd_cid()andparse_mmc_cid()helpers. Use them inprint_sd_cid(),print_mmc_cid()andprint_list_entry()to eliminate duplicatedparse_bin()format strings and local variable lists.Also fix
print_list_entry()using const char * for the strdup'd manufacturer string without a matchingfree().Signed-off-by Torstein Eide <[email protected]>Reviewed-by Avri Altman <[email protected]>
Ahh - no - Please ignore this. Will review it later.
Sorry about the confusion.
Avri
RE: [PATCH v2 1/5] mmc-utils: lsmmc: Refactor CID parsing into shared structs
In reply to Torstein EideQuoted 9 lines
Add struct
sd_cidand structmmc_cidwithparse_sd_cid()andparse_mmc_cid()helpers. Use them inprint_sd_cid(),print_mmc_cid()andprint_list_entry()to eliminate duplicatedparse_bin()format strings and local variable lists.Also fix
print_list_entry()using const char * for the strdup'd manufacturer string without a matchingfree().Signed-off-by Torstein Eide <[email protected]>
Looks like you are missing:
8f41ccb (origin/master, origin/HEAD, master) mmc-utils: recognize ext_csd_rev 9 388e059 mmc-utils: lsmmc: cache ext_csd revision for MMC devices 2364dc6 mmc-utils: lsmmc: fix CID manufacturing date decoding 4dbd897 mmc-utils: lsmmc.c: print_{mmc,sd}_cid(): correct month names 6f6b6e1 mmc-utils: lsmmc.c: print_mmc_cid(): correct year/month parsing
Please rebase.
Thanks,
Avri
Re: [PATCH v2 1/5] mmc-utils: lsmmc: Refactor CID parsing into shared structs
søn. 17. mai 2026 kl. 07:19 skrev Avri Altman <[email protected]>:
Quoted 18 lines
Quoted 10 lines
Add struct
sd_cidand structmmc_cidwithparse_sd_cid()andparse_mmc_cid()helpers. Use them inprint_sd_cid(),print_mmc_cid()andprint_list_entry()to eliminate duplicatedparse_bin()format strings and local variable lists.Also fix
print_list_entry()using const char * for the strdup'd manufacturer string without a matchingfree().Signed-off-by Torstein Eide <[email protected]>Looks like you are missing:
8f41ccb (origin/master, origin/HEAD, master) mmc-utils: recognizeext_csd_rev9 388e059 mmc-utils: lsmmc: cacheext_csdrevision for MMC devices 2364dc6 mmc-utils: lsmmc: fix CID manufacturing date decoding 4dbd897 mmc-utils:lsmmc.c: print_{mmc,sd}_cid(): correct month names 6f6b6e1 mmc-utils:lsmmc.c:print_mmc_cid(): correct year/month parsing
Quoted 4 lines
Please rebase.
Thanks,
Avri
I see why, i was cloning this mirror https://github.com/mhei/mmc-utils/
it is no longer update, it is 28 commits behind. my fault.
I will update to the https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git
Once you have review the last i do a V3.
PATCH v2 2/5 mmc-utils: lsmmc: Use external .ids files for manufacturer lookup
In reply to Torstein EideSimilar to pci.ids and usb.ids, move the statically defined manufacturer ID arrays out of the source and into external sdcard.ids and multimediacard.ids files. This allows other programs to use the same database without an API, ABI, or cmd interface.
Make the program able to read from the base directory to test without installing.
Make it possible from the Makefile to change the install directory of the database.
--- Makefile | 8 +- lsmmc.c | 252 +++++++++++++-------------------------------- multimediacard.ids | 16 +++ sdcard.ids | 23 +++++ 4 files changed, 116 insertions(+), 183 deletions(-) create mode 100644 multimediacard.ids create mode 100644 sdcard.ids
Makefile +7 -1
@@ -1,7 +1,9 @@ CC ?= gcc GIT_VERSION := "$(shell git describe --abbrev=6 --always --tags)" AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 \ - -DVERSION=\"$(GIT_VERSION)\" + -DVERSION=\"$(GIT_VERSION)\" \ + -DSD_IDS_PATH=\"$(idsdir)/sdcard.ids\" \ + -DMMC_IDS_PATH=\"$(idsdir)/multimediacard.ids\" CFLAGS ?= -g -O2 objects = \ mmc.o \
@@ -19,6 +21,7 @@ override CFLAGS := $(CHECKFLAGS) $(AM_CFLAGS) $(CFLAGS) INSTALL = install prefix ?= /usr/local bindir = $(prefix)/bin +idsdir ?= /usr/share/misc LIBS= RESTORE_LIBS= mandir = /usr/share/man
@@ -55,6 +58,9 @@ install: $(progs) $(INSTALL) $(progs) $(DESTDIR)$(bindir) $(INSTALL) -m755 -d $(DESTDIR)$(mandir)/man1 $(INSTALL) -m 644 mmc.1 $(DESTDIR)$(mandir)/man1 + $(INSTALL) -m755 -d $(DESTDIR)$(idsdir) + $(INSTALL) -m 644 sdcard.ids $(DESTDIR)$(idsdir) + $(INSTALL) -m 644 multimediacard.ids $(DESTDIR)$(idsdir) -include $(foreach obj,$(objects), $(dir $(obj))/.$(notdir $(obj)).d)
lsmmc.c +70 -182
340 lines not on this page · raw message
multimediacard.ids new file +16 -0
@@ -0,0 +1,16 @@ +# MMC manufacturer IDs +# This file is maintained at: https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git +0x00 SanDisk +0x02 Kingston/SanDisk +0x03 Toshiba +0x05 Unknown +0x06 Unknown +0x11 Toshiba +0x13 Micron +0x15 Samsung/SanDisk/LG +0x37 KingMax +0x44 ATP +0x45 SanDisk Corporation +0x2c Kingston +0x70 Kingston +0xfe Micron
sdcard.ids new file +23 -0
@@ -0,0 +1,23 @@ +# SD card (secure digital) manufacturer IDs +# This file is maintained at: https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git +0x01 Panasonic +0x02 Toshiba/Kingston/Viking +0x03 SanDisk +0x08 Silicon Power +0x18 Infineon +0x1b Transcend/Samsung +0x1c Transcend +0x1d Corsair/AData +0x1e Transcend +0x1f Kingston +0x27 Delkin/Phison +0x28 Lexar +0x30 SanDisk +0x31 Silicon Power +0x33 STMicroelectronics +0x41 Kingston +0x6f STMicroelectronics +0x74 Transcend +0x76 Patriot +0x82 Gobe/Sony +0x89 Unknown
Signature · 1 line
2.53.0
RE: [PATCH v2 2/5] mmc-utils: lsmmc: Use external .ids files for manufacturer lookup
Quoted 11 lines
Similar to pci.ids and usb.ids, move the statically defined manufacturer ID arrays out of the source and into external sdcard.ids and multimediacard.ids files. This allows other programs to use the same database without an API, ABI, or cmd interface.
Make the program able to read from the base directory to test without installing.
Make it possible from the
Makefileto change the install directory of the database.Signed-off-by Torstein Eide <[email protected]>
PATCH v2 3/5 mmc-utils: lsmmc: Accept /dev and /sys/block paths for register reads
In reply to Torstein EideCommands like 'cid read' previously required a raw sysfs device path such as /sys/bus/mmc/devices/mmc0:0001/. Most users know their block device as /dev/mmcblk0 or /sys/block/mmcblk0.
Add resolve_dev_path() which follows /sys/class/block/<dev>/device via realpath() to reach the canonical sysfs device directory. Paths that start with /dev/ or /sys/block/ are resolved automatically in do_read_reg() before processing, and the resolved sysfs path is printed so the caller can see which device was matched.
--- docs/HOWTO.rst | 59 +++++++++++++++++++++++++++++++++++++++++-------- lsmmc.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 9 deletions(-)
docs/HOWTO.rst +50 -9
@@ -35,19 +35,60 @@ Running mmc-utils Set user area write protection. ``csd read [-h] [-v] [-b bus_type] [-r register] <device path>`` - Print CSD data from <device path>. The device path should specify the csd sysfs file directory. - if [bus_type] is passed (mmc or sd) the [register] content must be passed as well, and no need for device path. - it is useful for cases we are getting the register value without having the actual platform. + Print CSD data from <device path>. The device path may be one of the following: + - sysfs device directory (/sys/devices/platform/fe310000.mmc/mmc_host/mmc0/mmc0:0001) + - device node (/dev/mmcblkN) + - sysfs block device entry (/sys/block/mmcblkN) + /dev/ and /sys/block/ paths are resolved to the sysfs device + directory automatically and the resolved path is printed. + If [-b bus_type] is passed (mmc or sd) the [-r register] content must + be passed as well, and no device path is required. Useful when the + register value is known without access to the actual hardware. + + Example:: + + $ mmc csd read /dev/mmcblk0 + sysfs: /sys/devices/platform/fe310000.mmc/mmc_host/mmc0/mmc0:0001 + CSD Register: 00000000... ``cid read <device path>`` - Print CID data from <device path>. The device path should specify the cid sysfs file directory. - if [bus_type] is passed (mmc or sd) the [register] content must be passed as well, and no need for device path. - it is useful for cases we are getting the register value without having the actual platform. + Print CID data from <device path>. The device path may be one of the following: + - sysfs device directory (/sys/devices/platform/fe310000.mmc/mmc_host/mmc0/mmc0:0001) + - device node (/dev/mmcblkN) + - sysfs block device entry (/sys/block/mmcblkN) + /dev/ and /sys/block/ paths are resolved to the sysfs device + directory automatically and the resolved path is printed. + If [-b bus_type] is passed (mmc or sd) the [-r register] content must + be passed as well, and no device path is required. Useful when the + register value is known without access to the actual hardware. + + Example:: + + $ mmc cid read /dev/mmcblk0 + sysfs: /sys/devices/platform/fe310000.mmc/mmc_host/mmc0/mmc0:0001 + Manufacturer ID: 0x15 + OEM ID: 0x0100 + Product name: MAG4FA + Product revision: 1.0 + Serial number: 0x1a2b3c4d + Manufacturing date: 01/2021 ``scr read <device path>`` - Print SCR data from <device path>. The device path should specify the scr sysfs file directory. - if [bus_type] is passed (mmc or sd) the [register] content must be passed as well, and no need for device path. - it is useful for cases we are getting the register value without having the actual platform. + Print SCR data from <device path>. The device path may be one of the following: + - sysfs device directory (/sys/devices/platform/fe320000.mmc/mmc_host/mmc1/mmc1:aaaa) + - device node (/dev/mmcblkN) + - sysfs block device entry (/sys/block/mmcblkN) + /dev/ and /sys/block/ paths are resolved to the sysfs device + directory automatically and the resolved path is printed. + If [-b bus_type] is passed (mmc or sd) the [-r register] content must + be passed as well, and no device path is required. Useful when the + register value is known without access to the actual hardware. + + Example:: + + $ mmc scr read /dev/mmcblk1 + sysfs: /sys/devices/platform/fe320000.mmc/mmc_host/mmc1/mmc1:aaaa + SCR Register: 0235800000000000 ``ffu <image name> <device> [chunk-bytes]`` Default mode. Run Field Firmware Update with `<image name>` on `<device>`. `[chunk-bytes]` is optional and defaults to its max - 512k. Should be in decimal bytes and sector aligned.
lsmmc.c +60 -0
72 lines not on this page · raw message
Signature · 1 line
2.53.0
RE: [PATCH v2 3/5] mmc-utils: lsmmc: Accept /dev and /sys/block paths for register reads
Quoted 11 lines
Commands like 'cid read' previously required a raw sysfs device path such as /sys/bus/mmc/devices/mmc0:0001/. Most users know their block device as
/dev/mmcblk0or/sys/block/mmcblk0.Add
resolve_dev_path()which follows /sys/class/block/<dev>/device viarealpath()to reach the canonical sysfs device directory. Paths that start with/dev/or/sys/block/are resolved automatically indo_read_reg()before processing, and the resolved sysfs path is printed so the caller can see which device was matched.Signed-off-by Torstein Eide <[email protected]>
Minor nit below.
Snip
Quoted 4 lines
lsmmc.c +4
-0+static char *resolve_dev_path (const char *path) { +const char *devname =strrchr (path,'/' ); +char basedev[NAME_MAX +1 ]; +char syspath[PATH_MAX ];
lsmmc.c static char *read_file_at(const char *dir, const char *name) · line 298
Quoted 10 lines
lsmmc.c +10
-0+char resolved[PATH_MAX ]; +char *p, *type; + + devname = devname ? devname +1 : path; +if (*devname =='\0' ) +return NULL ; + +/* strip partition suffix: mmcblk0p1 -> mmcblk0 */ +strncpy (basedev, devname,sizeof (basedev) -1 ); + basedev[sizeof (basedev) -1 ] ='\0' ;
snprintf(basedev, sizeof(basedev), "%s", devname) does the same in one line.
Thanks,
Avri
PATCH v2 4/5 mmc-utils: lsmmc: Add mmc list command
In reply to Torstein EideAdd a 'mmc list' command that scans /sys/bus/mmc/devices/, resolves each card's sysfs path, and prints a one-line summary per device.
find_block_devname() maps a sysfs device path back to its mmcblkN name by scanning /sys/class/block/mmcblkN/device symlinks.
print_list_entry() parses the CID register and formats a fixed-width table row with device name, /dev path, bus type, manufacturer, product, revision, serial number, and manufacturing date.
The header is printed once before the first result. Devices without a readable cid file are skipped silently via access() so unrelated sysfs entries do not produce spurious error messages.
--- docs/HOWTO.rst | 12 ++++++++++++ lsmmc.c | 34 +++++++++++++++++++++++++++++++++- mmc.c | 6 +++++- mmc_cmds.h | 1 + 4 files changed, 51 insertions(+), 2 deletions(-)
docs/HOWTO.rst +12 -0
@@ -90,6 +90,18 @@ Running mmc-utils sysfs: /sys/devices/platform/fe320000.mmc/mmc_host/mmc1/mmc1:aaaa SCR Register: 0235800000000000 + ``list`` + List all MMC/SD devices present on the system. Output is a table with + columns: DEVICE (sysfs name), DEV (/dev path), TYPE (MMC or SD), + MANUFACTURER, PRODUCT, REV, SERIAL, and DATE. + + Example:: + + $ mmc list + DEVICE DEV TYPE MANUFACTURER PRODUCT REV SERIAL DATE + mmc0:0001 /dev/mmcblk0 MMC Samsung MAG4FA 1.0 0x1a2b3c4d 2021-jan + mmc1:aaaa /dev/mmcblk1 SD SanDisk SP32G 8.0 0x5e6f7a8b 2020-mar + ``ffu <image name> <device> [chunk-bytes]`` Default mode. Run Field Firmware Update with `<image name>` on `<device>`. `[chunk-bytes]` is optional and defaults to its max - 512k. Should be in decimal bytes and sector aligned.
lsmmc.c +33 -1
@@ -225,6 +225,39 @@ static char *get_manufacturer(struct config *config, unsigned int manid)return NULL ; } +static char *find_block_devname (const char *sysfs_devpath) +{ +DIR *d; +struct dirent *ent; + + d =opendir ("/sys/class/block" ); +if (!d) +return NULL ; + +while ((ent =readdir (d)) !=NULL ) { +char linkpath[PATH_MAX ]; +char resolved[PATH_MAX ]; + +if (strncmp (ent->d_name,"mmcblk" ,6 ) !=0 ) +continue ; +if (strchr (ent->d_name +6 ,'p' )) +continue ; + +snprintf (linkpath,sizeof (linkpath), +"/sys/class/block/%s/device" , ent->d_name); +if (realpath (linkpath, resolved) ==NULL ) +continue ; +if (strcmp (resolved, sysfs_devpath) ==0 ) { +closedir (d); +return strdup (ent->d_name); + } + } + +closedir (d); +return NULL ; +} + +/* MMC/SD file parsing functions */ static char *read_file_at (const char *dir,const char *name) {
@@ -2335,7 +2368,6 @@ int do_list(int nargs, char **argv)return 0 ; } -int do_read_csd (int argc,char **argv) {return do_read_reg (argc, argv,CSD );
mmc.c +5 -1
@@ -292,6 +292,11 @@ static struct Command commands[] = { "4. The MMC will perform a soft reset, if your system cannot handle that do not use the boot operation from mmc-utils.\n", NULL }, + { do_list,0 , +"list" ,"\n" +"List all MMC/SD devices with their /dev path and CID info." , +NULL + }, { NULL, 0, NULL, NULL } };
@@ -567,4 +572,3 @@ int main(int ac, char **av )exit (func (nargs, args)); } -
mmc_cmds.h +1 -0
@@ -49,6 +49,7 @@ int do_opt_ffu4(int nargs, char **argv);int do_read_scr (int argc,char **argv);int do_read_cid (int argc,char **argv);int do_read_csd (int argc,char **argv); +int do_list (int nargs,char **argv);int do_erase (int nargs,char **argv);int do_general_cmd_read (int nargs,char **argv);int do_softreset (int nargs,char **argv);
Signature · 1 line
2.53.0
RE: [PATCH v2 4/5] mmc-utils: lsmmc: Add mmc list command
Quoted 15 lines
Add a 'mmc list' command that scans
/sys/bus/mmc/devices/, resolves each card's sysfs path, and prints a one-line summary per device.
find_block_devname()maps a sysfs device path back to its mmcblkN name by scanning/sys/class/block/mmcblkN/devicesymlinks.
print_list_entry()parses the CID register and formats a fixed-width table row with device name, /dev path, bus type, manufacturer, product, revision, serial number, and manufacturing date.The header is printed once before the first result. Devices without a readable cid file are skipped silently via
access()so unrelated sysfs entries do not produce spurious error messages.
Quoted 5 lines
Signed-off-by Torstein Eide <[email protected]>--- docs/HOWTO.rst | 12 ++++++++++++ lsmmc.c | 34 +++++++++++++++++++++++++++++++++- mmc.c | 6 +++++-
Looks like you are missing the do_list body in mmc_cmds.c ?
Thanks,
Avri
Quoted 117 lines
mmc_cmds.h | 1 + 4 files changed, 51 insertions(+), 2 deletions(-)docs/HOWTO.rst +0
-0@@ -90,6 +90,18 @@ Running mmc-utils sysfs:/sys/devices/platform/fe320000.mmc/mmc_host/mmc1/mmc1:aaaa
SCR Register: 0235800000000000docs/HOWTO.rst +9
-0+ ``list`` + List all MMC/SD devices present on the system. Output is a table with + columns: DEVICE (sysfs name), DEV (/dev path), TYPE (MMC or SD), + MANUFACTURER, PRODUCT, REV, SERIAL, and DATE. + + Example:: + + $ mmc list + DEVICE DEV TYPE MANUFACTURER PRODUCT REVSERIAL DATE
+ mmc0:0001/dev/mmcblk0MMC Samsung MAG4FA 1.00x1a2b3c4d2021-jan
+ mmc1:aaaa/dev/mmcblk1SD SanDisk SP32G 8.00x5e6f7a8b2020-mar
+
``ffu <image name> <device> [chunk-bytes]``
Default mode. Run Field Firmware Update with<image name>on<device>.[chunk-bytes]is optional and defaults to its max - 512k. Should be in decimal bytes and sector aligned.lsmmc.c +33
-0@@ -225,6 +225,39 @@ static char *get_manufacturer(struct config *config, unsigned int manid)return NULL ; } +static char *find_block_devname (const char *sysfs_devpath) { +DIR *d; +struct dirent *ent; + + d =opendir ("/sys/class/block" ); +if (!d) +return NULL ; + +while ((ent =readdir (d)) !=NULL ) { +char linkpath[PATH_MAX ]; +char resolved[PATH_MAX ]; + +if (strncmp (ent->d_name,"mmcblk" ,6 ) !=0 ) +continue ; +if (strchr (ent->d_name +6 ,'p' )) +continue ; + +snprintf (linkpath,sizeof (linkpath), +"/sys/class/block/%s/device" , ent->d_name); +if (realpath (linkpath, resolved) ==NULL ) +continue ; +if (strcmp (resolved, sysfs_devpath) ==0 ) { +closedir (d); +return strdup (ent->d_name); + } + } + +closedir (d); +return NULL ; +} + +/* MMC/SD file parsing functions */ static char *read_file_at(const char *dir, const char *name) { @@ -2335,7 +2368,6 @@ int do_list(int nargs, char **argv)return 0;}
-
intdo_read_csd(int argc, char **argv){ return do_read_reg(argc, argv, CSD); diff --git a/mmc.c b/mmc.c index077e901..01ad181 100644
mmc.c +5
-1@@ -292,6 +292,11 @@ static struct Command commands[] = { "4. The MMC will perform a soft reset, if your system cannot handle that do not use the boot operation from mmc-utils.\n", NULL }, + { do_list, 0, + "list", "\n" + "List all MMC/SD devices with their /dev path and CID info.", + NULL + }, { NULL, 0, NULL, NULL } };@@ -567,4 +572,3 @@ int main(int ac, char **av )exit (func (nargs, args)); } -mmc_cmds.h +0
-0@@ -49,6 +49,7 @@ int do_opt_ffu4(int nargs, char **argv); int do_read_scr(intargc, char **argv); int
do_read_cid(int argc, char **argv); intdo_read_csd(int argc, char **argv);
+intdo_list(int nargs, char **argv);
intdo_erase(int nargs, char **argv);
intdo_general_cmd_read(int nargs, char **argv); int do_softreset(int nargs,
char **argv);
--
2.53.0
RE: [PATCH v2 4/5] mmc-utils: lsmmc: Add mmc list command
Quoted 14 lines
Quoted 14 lines
Add a 'mmc list' command that scans
/sys/bus/mmc/devices/, resolves each card's sysfs path, and prints a one-line summary per device.
find_block_devname()maps a sysfs device path back to its mmcblkN name by scanning/sys/class/block/mmcblkN/devicesymlinks.
print_list_entry()parses the CID register and formats a fixed-width table row with device name, /dev path, bus type, manufacturer, product, revision, serial number, and manufacturing date.The header is printed once before the first result. Devices without a readable cid file are skipped silently via
access()so unrelated sysfs entries do not produce spurious error messages.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Torstein Eide <[email protected]>--- docs/HOWTO.rst | 12 ++++++++++++ lsmmc.c | 34 +++++++++++++++++++++++++++++++++- mmc.c | 6 +++++-Looks like you are missing the
do_listbody inmmc_cmds.c?
Or in lsmmc.c. Either way it is missing.
Thanks,
Avri
Quoted 123 lines
Thanks,
AvriQuoted 118 lines
mmc_cmds.h | 1 + 4 files changed, 51 insertions(+), 2 deletions(-)docs/HOWTO.rst index 76214a3..167a153 renamed from docs/HOWTO.rst +0
-0100644
docs/HOWTO.rst +0
-0@@ -90,6 +90,18 @@ Running mmc-utils sysfs:/sys/devices/platform/fe320000.mmc/mmc_host/mmc1/mmc1:aaaa
SCR Register: 0235800000000000docs/HOWTO.rst +9
-0+ ``list`` + List all MMC/SD devices present on the system. Output is a table with + columns: DEVICE (sysfs name), DEV (/dev path), TYPE (MMC or SD), + MANUFACTURER, PRODUCT, REV, SERIAL, and DATE. + + Example:: + + $ mmc list + DEVICE DEV TYPE MANUFACTURER PRODUCT REVSERIAL DATE
+ mmc0:0001/dev/mmcblk0MMC Samsung MAG4FA 1.00x1a2b3c4d2021-jan
+ mmc1:aaaa/dev/mmcblk1SD SanDisk SP32G 8.00x5e6f7a8b2020-mar
+
``ffu <image name> <device> [chunk-bytes]``
Default mode. Run Field Firmware Update with<image name>on<device>.[chunk-bytes]is optional and defaults to its max - 512k. Should be in decimal bytes and sector aligned.lsmmc.c +33
-2@@ -225,6 +225,39 @@ static char *get_manufacturer(struct config *config, unsigned int manid)return NULL ; } +static char *find_block_devname (const char *sysfs_devpath) { +DIR *d; +struct dirent *ent; + + d =opendir ("/sys/class/block" ); +if (!d) +return NULL ; + +while ((ent =readdir (d)) !=NULL ) { +char linkpath[PATH_MAX ]; +char resolved[PATH_MAX ]; + +if (strncmp (ent->d_name,"mmcblk" ,6 ) !=0 ) +continue ; +if (strchr (ent->d_name +6 ,'p' )) +continue ; + +snprintf (linkpath,sizeof (linkpath), +"/sys/class/block/%s/device" , ent->d_name); +if (realpath (linkpath, resolved) ==NULL ) +continue ; +if (strcmp (resolved, sysfs_devpath) ==0 ) { +closedir (d); +return strdup (ent->d_name); + } + } + +closedir (d); +return NULL ; +} + +/* MMC/SD file parsing functions */ static char *read_file_at(const char *dir, const char *name) { @@ -2335,7 +2368,6 @@ int do_list(int nargs, char **argv) return 0; } -int do_read_csd (int argc,char **argv) { return do_read_reg(argc, argv, CSD); diff --git a/mmc.c
b/mmc.cindex
077e901..01ad181 100644mmc.c +5
-1@@ -292,6 +292,11 @@ static struct Command commands[] = { "4. The MMC will perform a soft reset, if your system cannot handle that do not use the boot operation from mmc-utils.\n", NULL }, + { do_list, 0, + "list", "\n" + "List all MMC/SD devices with their /dev path and CID info.", + NULL + }, { NULL, 0, NULL, NULL } };@@ -567,4 +572,3 @@ int main(int ac, char **av )exit (func (nargs, args)); } -mmc_cmds.h +0
-0@@ -49,6 +49,7 @@ int do_opt_ffu4(int nargs, char **argv); int
do_read_scr(int argc, char **argv); intdo_read_cid(int argc, char **argv); intdo_read_csd(int argc, char **argv);
+intdo_list(int nargs, char **argv);
intdo_erase(int nargs, char **argv); int do_general_cmd_read(int
nargs, char **argv); intdo_softreset(int nargs, char **argv); --
2.53.0
Re: [PATCH v2 4/5] mmc-utils: lsmmc: Add mmc list command
I included it in patch1 ill move to patch4.
søn. 17. mai 2026 kl. 08:07 skrev Avri Altman <[email protected]>:
Quoted 151 lines
Quoted 15 lines
Quoted 15 lines
Add a 'mmc list' command that scans
/sys/bus/mmc/devices/, resolves each card's sysfs path, and prints a one-line summary per device.
find_block_devname()maps a sysfs device path back to its mmcblkN name by scanning/sys/class/block/mmcblkN/devicesymlinks.
print_list_entry()parses the CID register and formats a fixed-width table row with device name, /dev path, bus type, manufacturer, product, revision, serial number, and manufacturing date.The header is printed once before the first result. Devices without a readable cid file are skipped silently via
access()so unrelated sysfs entries do not produce spurious error messages.Quoted 7 lines
Quoted 5 lines
Signed-off-by Torstein Eide <[email protected]>--- docs/HOWTO.rst | 12 ++++++++++++ lsmmc.c | 34 +++++++++++++++++++++++++++++++++- mmc.c | 6 +++++-Looks like you are missing the
do_listbody inmmc_cmds.c?Or in
lsmmc.c. Either way it is missing.Thanks,
AvriQuoted 123 lines
Thanks,
AvriQuoted 118 lines
mmc_cmds.h | 1 + 4 files changed, 51 insertions(+), 2 deletions(-)docs/HOWTO.rst index 76214a3..167a153 renamed from docs/HOWTO.rst +0
-0100644
docs/HOWTO.rst +0
-0@@ -90,6 +90,18 @@ Running mmc-utils sysfs:/sys/devices/platform/fe320000.mmc/mmc_host/mmc1/mmc1:aaaa
SCR Register: 0235800000000000docs/HOWTO.rst +9
-0+ ``list`` + List all MMC/SD devices present on the system. Output is a table with + columns: DEVICE (sysfs name), DEV (/dev path), TYPE (MMC or SD), + MANUFACTURER, PRODUCT, REV, SERIAL, and DATE. + + Example:: + + $ mmc list + DEVICE DEV TYPE MANUFACTURER PRODUCT REVSERIAL DATE
+ mmc0:0001/dev/mmcblk0MMC Samsung MAG4FA 1.00x1a2b3c4d2021-jan
+ mmc1:aaaa/dev/mmcblk1SD SanDisk SP32G 8.00x5e6f7a8b2020-mar
+
``ffu <image name> <device> [chunk-bytes]``
Default mode. Run Field Firmware Update with<image name>on<device>.[chunk-bytes]is optional and defaults to its max - 512k. Should be in decimal bytes and sector aligned.lsmmc.c +33
-2@@ -225,6 +225,39 @@ static char *get_manufacturer(struct config *config, unsigned int manid)return NULL ; } +static char *find_block_devname (const char *sysfs_devpath) { +DIR *d; +struct dirent *ent; + + d =opendir ("/sys/class/block" ); +if (!d) +return NULL ; + +while ((ent =readdir (d)) !=NULL ) { +char linkpath[PATH_MAX ]; +char resolved[PATH_MAX ]; + +if (strncmp (ent->d_name,"mmcblk" ,6 ) !=0 ) +continue ; +if (strchr (ent->d_name +6 ,'p' )) +continue ; + +snprintf (linkpath,sizeof (linkpath), +"/sys/class/block/%s/device" , ent->d_name); +if (realpath (linkpath, resolved) ==NULL ) +continue ; +if (strcmp (resolved, sysfs_devpath) ==0 ) { +closedir (d); +return strdup (ent->d_name); + } + } + +closedir (d); +return NULL ; +} + +/* MMC/SD file parsing functions */ static char *read_file_at(const char *dir, const char *name) { @@ -2335,7 +2368,6 @@ int do_list(int nargs, char **argv) return 0; } -int do_read_csd (int argc,char **argv) { return do_read_reg(argc, argv, CSD); diff --git a/mmc.c
b/mmc.cindex
077e901..01ad181 100644mmc.c +5
-1@@ -292,6 +292,11 @@ static struct Command commands[] = { "4. The MMC will perform a soft reset, if your system cannot handle that do not use the boot operation from mmc-utils.\n", NULL }, + { do_list, 0, + "list", "\n" + "List all MMC/SD devices with their /dev path and CID info.", + NULL + }, { NULL, 0, NULL, NULL } };@@ -567,4 +572,3 @@ int main(int ac, char **av )exit (func (nargs, args)); } -mmc_cmds.h +0
-0@@ -49,6 +49,7 @@ int do_opt_ffu4(int nargs, char **argv); int
do_read_scr(int argc, char **argv); intdo_read_cid(int argc, char **argv); intdo_read_csd(int argc, char **argv);
+intdo_list(int nargs, char **argv);
intdo_erase(int nargs, char **argv); int do_general_cmd_read(int
nargs, char **argv); intdo_softreset(int nargs, char **argv); --
2.53.0
PATCH v2 5/5 mmc-utils: Add bash completion
In reply to Torstein EideAdd a bash completion script in completion/mmc that completes subcommands and /dev/mmcblkN device paths for all mmc commands.
The completion directory is named 'completion/' rather than 'bash-completion/' so shell-specific scripts for other shells (zsh, fish, etc.) can be placed alongside it without renaming.
Add bashcompletiondir variable to the Makefile (defaulting to the standard /usr/share/bash-completion/completions) and install the script as part of 'make install'. The install path can be overridden at build time with make bashcompletiondir=<path>.
--- Makefile | 5 +++- completion/mmc | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ docs/HOWTO.rst | 6 +++++ 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 completion/mmc
Makefile +4 -1
@@ -5,6 +5,8 @@ AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 \ -DSD_IDS_PATH=\"$(idsdir)/sdcard.ids\" \ -DMMC_IDS_PATH=\"$(idsdir)/multimediacard.ids\" CFLAGS ?= -g -O2 +idsdir = /usr/share/misc +bashcompletiondir = /usr/share/bash-completion/completions objects = \ mmc.o \ mmc_cmds.o \
@@ -21,7 +23,6 @@ override CFLAGS := $(CHECKFLAGS) $(AM_CFLAGS) $(CFLAGS) INSTALL = install prefix ?= /usr/local bindir = $(prefix)/bin -idsdir ?= /usr/share/misc LIBS= RESTORE_LIBS= mandir = /usr/share/man
@@ -61,6 +62,8 @@ install: $(progs) $(INSTALL) -m755 -d $(DESTDIR)$(idsdir) $(INSTALL) -m 644 sdcard.ids $(DESTDIR)$(idsdir) $(INSTALL) -m 644 multimediacard.ids $(DESTDIR)$(idsdir) + $(INSTALL) -m755 -d $(DESTDIR)$(bashcompletiondir) + $(INSTALL) -m 644 completion/mmc $(DESTDIR)$(bashcompletiondir)/mmc -include $(foreach obj,$(objects), $(dir $(obj))/.$(notdir $(obj)).d)
completion/mmc new file +62 -0
62 lines not on this page · raw message
docs/HOWTO.rst +6 -0
@@ -2,6 +2,12 @@ Running mmc-utils ----------------- +**Bash completion** + Source ``completion/mmc`` to enable tab-completion for all subcommands and + device paths. When installed via ``make install``, the file is placed in + ``$(bashcompletiondir)`` (default: ``/usr/share/bash-completion/completions/mmc``) + and loaded automatically by bash-completion. + **Name** mmc - a tool for configuring MMC storage devices **Synopsis**
Signature · 1 line
2.53.0
Still don't apply cleanly.
I will review your patches, but Ilf won't pick them up until they do. From your development branch please share:
$ git log --oneline -10
Thanks,
Avri