[PATCH 1/3] mmc-utils: add SanDisk to manufacturer database

[PATCH 1/3] mmc-utils: add SanDisk to manufacturer database

[Enrico Jorns]

Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
 lsmmc.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lsmmc.c b/lsmmc.c
index 55da3aa..da9d69e 100644
--- a/lsmmc.c
+++ b/lsmmc.c
@@ -239,6 +239,11 @@ struct ids_database database[] = {
 		.id = 0x44,
 		.manufacturer = "ATP",
 	},
+	{
+		.type = "mmc",
+		.id = 0x45,
+		.manufacturer = "SanDisk Corporation",
+	},
 	{
 		.type = "mmc",
 		.id = 0x2c,
-- 
2.39.2

[PATCH 2/3] mmc-utils: fix printing OID for mmc in non-verbose mode

[Enrico Jorns]

It is parsed as an integer and printed as a char which does not really
make sense.
E.g. if OID is '0' (which does not seem to be uncommon), then this
prints a '\0' character and makes output nearly unreadable/unparsable.

Also, do not print it like it would be a string, instead use 0x<digit>
format.

Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
 lsmmc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lsmmc.c b/lsmmc.c
index da9d69e..cea43af 100644
--- a/lsmmc.c
+++ b/lsmmc.c
@@ -636,10 +636,10 @@ void print_mmc_cid(struct config *config, char *cid)
 		printf("\tCRC: 0x%02x\n", crc);
 	} else {
 		if (config->mmc_ids[mid])
-			printf("manufacturer: '%s' '%c'\n",
+			printf("manufacturer: '%s' 0x%01x\n",
 			       config->mmc_ids[mid], oid);
 		else
-			printf("manufacturer: 'Unlisted' '%c'\n", oid);
+			printf("manufacturer: 'Unlisted' 0x%01x\n", oid);
 
 		printf("product: '%s' %u.%u\n", pnm, prv_major, prv_minor);
 		printf("serial: 0x%08x\n", psn);
-- 
2.39.2

[PATCH 3/3] mmc-utils: do not hide CID manufacturer information

[Enrico Jorns]

Reading the MID just to convert it to 'Unlisted' is quite unhelpful for
an info command.
Due to the (constantly increasing) amount of valid MIDs it is quite
unlikely to we have it in the database already anyway.

Thus simply always print the manufacturer ID as 0xNN and understand the
manufacturer name as an additional information held in parenthesis.

Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
 lsmmc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lsmmc.c b/lsmmc.c
index cea43af..54c3167 100644
--- a/lsmmc.c
+++ b/lsmmc.c
@@ -636,10 +636,10 @@ void print_mmc_cid(struct config *config, char *cid)
 		printf("\tCRC: 0x%02x\n", crc);
 	} else {
 		if (config->mmc_ids[mid])
-			printf("manufacturer: '%s' 0x%01x\n",
-			       config->mmc_ids[mid], oid);
+			printf("manufacturer: 0x%02x (%s) oid: 0x%01x\n",
+			       mid, config->mmc_ids[mid], oid);
 		else
-			printf("manufacturer: 'Unlisted' 0x%01x\n", oid);
+			printf("manufacturer: 0x%02x (Unlisted) oid: 0x%01x\n", mid, oid);
 
 		printf("product: '%s' %u.%u\n", pnm, prv_major, prv_minor);
 		printf("serial: 0x%08x\n", psn);
-- 
2.39.2

RE: [PATCH 1/3] mmc-utils: add SanDisk to manufacturer database

[Avri Altman]

> 
> Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
Acked-by: Avri Altman <avri.altman@wdc.com>

> ---
>  lsmmc.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/lsmmc.c b/lsmmc.c
> index 55da3aa..da9d69e 100644
> --- a/lsmmc.c
> +++ b/lsmmc.c
> @@ -239,6 +239,11 @@ struct ids_database database[] = {
>                 .id = 0x44,
>                 .manufacturer = "ATP",
>         },
> +       {
> +               .type = "mmc",
> +               .id = 0x45,
> +               .manufacturer = "SanDisk Corporation",
> +       },
>         {
>                 .type = "mmc",
>                 .id = 0x2c,
> --
> 2.39.2

RE: [PATCH 2/3] mmc-utils: fix printing OID for mmc in non-verbose mode

[Avri Altman]

> 
> It is parsed as an integer and printed as a char which does not really
> make sense.
> E.g. if OID is '0' (which does not seem to be uncommon), then this
> prints a '\0' character and makes output nearly unreadable/unparsable.
> 
> Also, do not print it like it would be a string, instead use 0x<digit>
> format.
> 
> Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
Reviewed-by: Avri Altman <avri.altman@wdc.com>

> ---
>  lsmmc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lsmmc.c b/lsmmc.c
> index da9d69e..cea43af 100644
> --- a/lsmmc.c
> +++ b/lsmmc.c
> @@ -636,10 +636,10 @@ void print_mmc_cid(struct config *config, char *cid)
>                 printf("\tCRC: 0x%02x\n", crc);
>         } else {
>                 if (config->mmc_ids[mid])
> -                       printf("manufacturer: '%s' '%c'\n",
> +                       printf("manufacturer: '%s' 0x%01x\n",
>                                config->mmc_ids[mid], oid);
>                 else
> -                       printf("manufacturer: 'Unlisted' '%c'\n", oid);
> +                       printf("manufacturer: 'Unlisted' 0x%01x\n", oid);
> 
>                 printf("product: '%s' %u.%u\n", pnm, prv_major, prv_minor);
>                 printf("serial: 0x%08x\n", psn);
> --
> 2.39.2

RE: [PATCH 3/3] mmc-utils: do not hide CID manufacturer information

[Avri Altman]

> Reading the MID just to convert it to 'Unlisted' is quite unhelpful for an info
> command.
> Due to the (constantly increasing) amount of valid MIDs it is quite unlikely to
> we have it in the database already anyway.
> 
> Thus simply always print the manufacturer ID as 0xNN and understand the
> manufacturer name as an additional information held in parenthesis.
> 
> Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
Reviewed-by: Avri Altman <avri.altman@wdc.com>

> ---
>  lsmmc.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/lsmmc.c b/lsmmc.c
> index cea43af..54c3167 100644
> --- a/lsmmc.c
> +++ b/lsmmc.c
> @@ -636,10 +636,10 @@ void print_mmc_cid(struct config *config, char *cid)
>                 printf("\tCRC: 0x%02x\n", crc);
>         } else {
>                 if (config->mmc_ids[mid])
> -                       printf("manufacturer: '%s' 0x%01x\n",
> -                              config->mmc_ids[mid], oid);
> +                       printf("manufacturer: 0x%02x (%s) oid: 0x%01x\n",
> +                              mid, config->mmc_ids[mid], oid);
>                 else
> -                       printf("manufacturer: 'Unlisted' 0x%01x\n", oid);
> +                       printf("manufacturer: 0x%02x (Unlisted) oid:
> + 0x%01x\n", mid, oid);
> 
>                 printf("product: '%s' %u.%u\n", pnm, prv_major, prv_minor);
>                 printf("serial: 0x%08x\n", psn);
> --
> 2.39.2

Re: [PATCH 1/3] mmc-utils: add SanDisk to manufacturer database

[Ulf Hansson]

On Mon, 22 May 2023 at 23:49, Enrico Jorns <ejo@pengutronix.de> wrote:
>
> Signed-off-by: Enrico Jorns <ejo@pengutronix.de>

Applied to git.kernel.org/pub/scm/utils/mmc/mmc-utils.git master, thanks!

Kind regards
Uffe


> ---
>  lsmmc.c | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/lsmmc.c b/lsmmc.c
> index 55da3aa..da9d69e 100644
> --- a/lsmmc.c
> +++ b/lsmmc.c
> @@ -239,6 +239,11 @@ struct ids_database database[] = {
>                 .id = 0x44,
>                 .manufacturer = "ATP",
>         },
> +       {
> +               .type = "mmc",
> +               .id = 0x45,
> +               .manufacturer = "SanDisk Corporation",
> +       },
>         {
>                 .type = "mmc",
>                 .id = 0x2c,
> --
> 2.39.2
>

Re: [PATCH 2/3] mmc-utils: fix printing OID for mmc in non-verbose mode

[Ulf Hansson]

On Mon, 22 May 2023 at 23:49, Enrico Jorns <ejo@pengutronix.de> wrote:
>
> It is parsed as an integer and printed as a char which does not really
> make sense.
> E.g. if OID is '0' (which does not seem to be uncommon), then this
> prints a '\0' character and makes output nearly unreadable/unparsable.
>
> Also, do not print it like it would be a string, instead use 0x<digit>
> format.
>
> Signed-off-by: Enrico Jorns <ejo@pengutronix.de>

Applied to git.kernel.org/pub/scm/utils/mmc/mmc-utils.git master, thanks!

Kind regards
Uffe


> ---
>  lsmmc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lsmmc.c b/lsmmc.c
> index da9d69e..cea43af 100644
> --- a/lsmmc.c
> +++ b/lsmmc.c
> @@ -636,10 +636,10 @@ void print_mmc_cid(struct config *config, char *cid)
>                 printf("\tCRC: 0x%02x\n", crc);
>         } else {
>                 if (config->mmc_ids[mid])
> -                       printf("manufacturer: '%s' '%c'\n",
> +                       printf("manufacturer: '%s' 0x%01x\n",
>                                config->mmc_ids[mid], oid);
>                 else
> -                       printf("manufacturer: 'Unlisted' '%c'\n", oid);
> +                       printf("manufacturer: 'Unlisted' 0x%01x\n", oid);
>
>                 printf("product: '%s' %u.%u\n", pnm, prv_major, prv_minor);
>                 printf("serial: 0x%08x\n", psn);
> --
> 2.39.2
>

Re: [PATCH 3/3] mmc-utils: do not hide CID manufacturer information

[Ulf Hansson]

On Mon, 22 May 2023 at 23:49, Enrico Jorns <ejo@pengutronix.de> wrote:
>
> Reading the MID just to convert it to 'Unlisted' is quite unhelpful for
> an info command.
> Due to the (constantly increasing) amount of valid MIDs it is quite
> unlikely to we have it in the database already anyway.
>
> Thus simply always print the manufacturer ID as 0xNN and understand the
> manufacturer name as an additional information held in parenthesis.
>
> Signed-off-by: Enrico Jorns <ejo@pengutronix.de>

Applied to git.kernel.org/pub/scm/utils/mmc/mmc-utils.git master, thanks!

Kind regards
Uffe


> ---
>  lsmmc.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/lsmmc.c b/lsmmc.c
> index cea43af..54c3167 100644
> --- a/lsmmc.c
> +++ b/lsmmc.c
> @@ -636,10 +636,10 @@ void print_mmc_cid(struct config *config, char *cid)
>                 printf("\tCRC: 0x%02x\n", crc);
>         } else {
>                 if (config->mmc_ids[mid])
> -                       printf("manufacturer: '%s' 0x%01x\n",
> -                              config->mmc_ids[mid], oid);
> +                       printf("manufacturer: 0x%02x (%s) oid: 0x%01x\n",
> +                              mid, config->mmc_ids[mid], oid);
>                 else
> -                       printf("manufacturer: 'Unlisted' 0x%01x\n", oid);
> +                       printf("manufacturer: 0x%02x (Unlisted) oid: 0x%01x\n", mid, oid);
>
>                 printf("product: '%s' %u.%u\n", pnm, prv_major, prv_minor);
>                 printf("serial: 0x%08x\n", psn);
> --
> 2.39.2
>