Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mmc-utils for openSUSE:Factory
checked in at 2021-09-14 21:14:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mmc-utils (Old)
and /work/SRC/openSUSE:Factory/.mmc-utils.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mmc-utils"
Tue Sep 14 21:14:30 2021 rev:16 rq:918828 version:0.1+git.20210824
Changes:
--------
--- /work/SRC/openSUSE:Factory/mmc-utils/mmc-utils.changes 2021-06-24
18:22:58.884943321 +0200
+++ /work/SRC/openSUSE:Factory/.mmc-utils.new.1899/mmc-utils.changes
2021-09-14 21:14:46.572427795 +0200
@@ -1,0 +2,6 @@
+Tue Sep 14 06:42:42 UTC 2021 - Martin Pluskal <mplus...@suse.com>
+
+- Update to version 0.1+git.20210824:
+ * mmc-utils: Fix for Firmware Version string printing
+
+-------------------------------------------------------------------
Old:
----
mmc-utils-0.1+git.20210330.obscpio
mmc-utils-0.1+git.20210511.obscpio
New:
----
mmc-utils-0.1+git.20210824.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mmc-utils.spec ++++++
--- /var/tmp/diff_new_pack.HLGfQw/_old 2021-09-14 21:14:47.200428412 +0200
+++ /var/tmp/diff_new_pack.HLGfQw/_new 2021-09-14 21:14:47.204428415 +0200
@@ -17,7 +17,7 @@
Name: mmc-utils
-Version: 0.1+git.20210511
+Version: 0.1+git.20210824
Release: 0
Summary: Tools for MMC/SD devices
License: GPL-2.0-only
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.HLGfQw/_old 2021-09-14 21:14:47.240428450 +0200
+++ /var/tmp/diff_new_pack.HLGfQw/_new 2021-09-14 21:14:47.244428455 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git</param>
- <param
name="changesrevision">43282e80e174cc73b09b81a4d17cb3a7b4dc5cfc</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">0eea71e4f22a837ed59e607743767df2d038825e</param></service></servicedata>
\ No newline at end of file
++++++ mmc-utils-0.1+git.20210330.obscpio -> mmc-utils-0.1+git.20210824.obscpio
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mmc-utils-0.1+git.20210330/.gitignore
new/mmc-utils-0.1+git.20210824/.gitignore
--- old/mmc-utils-0.1+git.20210330/.gitignore 1970-01-01 01:00:00.000000000
+0100
+++ new/mmc-utils-0.1+git.20210824/.gitignore 2021-08-24 10:57:33.000000000
+0200
@@ -0,0 +1,3 @@
+.*.o.d
+*.o
+/mmc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mmc-utils-0.1+git.20210330/mmc.c
new/mmc-utils-0.1+git.20210824/mmc.c
--- old/mmc-utils-0.1+git.20210330/mmc.c 2021-03-30 15:28:34.000000000
+0200
+++ new/mmc-utils-0.1+git.20210824/mmc.c 2021-08-24 10:57:33.000000000
+0200
@@ -229,6 +229,14 @@
"Run Field Firmware Update with <image name> on <device>.\n",
NULL
},
+ { do_erase, -4,
+ "erase", "<type> " "<start address> " "<end address> " "<device>\n"
+ "Send Erase CMD38 with specific argument to the <device>\n\n"
+ "NOTE!: This will delete all user data in the specified region
of the device\n"
+ "<type> must be: legacy | discard | secure-erase | "
+ "secure-trim1 | secure-trim2 | trim \n",
+ NULL
+ },
{ 0, 0, 0, 0 }
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mmc-utils-0.1+git.20210330/mmc.h
new/mmc-utils-0.1+git.20210824/mmc.h
--- old/mmc-utils-0.1+git.20210330/mmc.h 2021-03-30 15:28:34.000000000
+0200
+++ new/mmc-utils-0.1+git.20210824/mmc.h 2021-08-24 10:57:33.000000000
+0200
@@ -35,7 +35,15 @@
#define MMC_SET_WRITE_PROT 28 /* ac [31:0] data addr R1b */
#define MMC_CLEAR_WRITE_PROT 29 /* ac [31:0] data addr R1b */
#define MMC_SEND_WRITE_PROT_TYPE 31 /* ac [31:0] data addr R1 */
-
+#define MMC_ERASE_GROUP_START 35 /* ac [31:0] data addr R1 */
+#define MMC_ERASE_GROUP_END 36 /* ac [31:0] data addr R1 */
+#define MMC_ERASE 38 /* ac [31] Secure request
+ [30:16] set to 0
+ [15] Force Garbage Collect request
+ [14:2] set to 0
+ [1] Discard Enable
+ [0] Identify Write Blocks for
+ Erase (or TRIM Enable) R1b */
/*
* EXT_CSD fields
*/
@@ -62,6 +70,7 @@
#define EXT_CSD_CACHE_SIZE_2 251
#define EXT_CSD_CACHE_SIZE_1 250
#define EXT_CSD_CACHE_SIZE_0 249
+#define EXT_CSD_SEC_FEATURE_SUPPORT 231
#define EXT_CSD_BOOT_INFO 228 /* R/W */
#define EXT_CSD_HC_ERASE_GRP_SIZE 224
#define EXT_CSD_HC_WP_GRP_SIZE 221
@@ -190,6 +199,8 @@
#define EXT_CSD_REV_V4_2 2
#define EXT_CSD_REV_V4_1 1
#define EXT_CSD_REV_V4_0 0
+#define EXT_CSD_SEC_GB_CL_EN (1<<4)
+#define EXT_CSD_SEC_ER_EN (1<<0)
/* From kernel linux/mmc/core.h */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mmc-utils-0.1+git.20210330/mmc_cmds.c
new/mmc-utils-0.1+git.20210824/mmc_cmds.c
--- old/mmc-utils-0.1+git.20210330/mmc_cmds.c 2021-03-30 15:28:34.000000000
+0200
+++ new/mmc-utils-0.1+git.20210824/mmc_cmds.c 2021-08-24 10:57:33.000000000
+0200
@@ -1392,6 +1392,7 @@
__u32 regl;
int fd, ret;
char *device;
+ char lbuf[10];
const char *str;
if (nargs != 2) {
@@ -1833,8 +1834,9 @@
}
if (ext_csd_rev >= 7) {
- printf("eMMC Firmware Version: %s\n",
- (char*)&ext_csd[EXT_CSD_FIRMWARE_VERSION]);
+ memset(lbuf, 0, sizeof(lbuf));
+ strncpy(lbuf, (char*)&ext_csd[EXT_CSD_FIRMWARE_VERSION], 8);
+ printf("eMMC Firmware Version: %s\n", lbuf);
printf("eMMC Life Time Estimation A
[EXT_CSD_DEVICE_LIFE_TIME_EST_TYP_A]: 0x%02x\n",
ext_csd[EXT_CSD_DEVICE_LIFE_TIME_EST_TYP_A]);
printf("eMMC Life Time Estimation B
[EXT_CSD_DEVICE_LIFE_TIME_EST_TYP_B]: 0x%02x\n",
@@ -2514,6 +2516,150 @@
return do_cache_ctrl(0, nargs, argv);
}
+static int erase(int dev_fd, __u32 argin, __u32 start, __u32 end)
+{
+ int ret = 0;
+ struct mmc_ioc_multi_cmd *multi_cmd;
+ __u8 ext_csd[512];
+
+
+ ret = read_extcsd(dev_fd, ext_csd);
+ if (ret) {
+ fprintf(stderr, "Could not read EXT_CSD\n");
+ exit(1);
+ }
+ if (ext_csd[EXT_CSD_ERASE_GROUP_DEF] & 0x01) {
+ fprintf(stderr, "High Capacity Erase Unit Size=%d bytes\n" \
+ "High Capacity Erase Timeout=%d ms\n" \
+ "High Capacity Write Protect Group Size=%d bytes\n",
+ ext_csd[224]*0x80000,
+ ext_csd[223]*300,
+ ext_csd[221]*ext_csd[224]*0x80000);
+ }
+
+ multi_cmd = calloc(1, sizeof(struct mmc_ioc_multi_cmd) +
+ 3 * sizeof(struct mmc_ioc_cmd));
+ if (!multi_cmd) {
+ perror("Failed to allocate memory");
+ return -ENOMEM;
+ }
+
+ multi_cmd->num_of_cmds = 3;
+ /* Set erase start address */
+ multi_cmd->cmds[0].opcode = MMC_ERASE_GROUP_START;
+ multi_cmd->cmds[0].arg = start;
+ multi_cmd->cmds[0].flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
+ multi_cmd->cmds[0].write_flag = 1;
+
+ /* Set erase end address */
+ multi_cmd->cmds[1].opcode = MMC_ERASE_GROUP_END;
+ multi_cmd->cmds[1].arg = end;
+ multi_cmd->cmds[1].flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
+ multi_cmd->cmds[1].write_flag = 1;
+
+ /* Send Erase Command */
+ multi_cmd->cmds[2].opcode = MMC_ERASE;
+ multi_cmd->cmds[2].arg = argin;
+ multi_cmd->cmds[2].cmd_timeout_ms = 300*255*255;
+ multi_cmd->cmds[2].flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
+ multi_cmd->cmds[2].write_flag = 1;
+
+ /* send erase cmd with multi-cmd */
+ ret = ioctl(dev_fd, MMC_IOC_MULTI_CMD, multi_cmd);
+ if (ret)
+ perror("Erase multi-cmd ioctl");
+
+ free(multi_cmd);
+ return ret;
+}
+
+int do_erase(int nargs, char **argv)
+{
+ int dev_fd, ret;
+ char *print_str;
+ __u8 ext_csd[512], checkup_mask = 0;
+ __u32 arg, start, end;
+
+ if (nargs != 5) {
+ fprintf(stderr, "Usage: erase <type> <start addr> <end addr>
</path/to/mmcblkX>\n");
+ exit(1);
+ }
+
+ if (strstr(argv[2], "0x") || strstr(argv[2], "0X"))
+ start = strtol(argv[2], NULL, 16);
+ else
+ start = strtol(argv[2], NULL, 10);
+
+ if (strstr(argv[3], "0x") || strstr(argv[3], "0X"))
+ end = strtol(argv[3], NULL, 16);
+ else
+ end = strtol(argv[3], NULL, 10);
+
+ if (end < start) {
+ fprintf(stderr, "erase start [0x%08x] > erase end [0x%08x]\n",
+ start, end);
+ exit(1);
+ }
+
+ if (strcmp(argv[1], "legacy") == 0) {
+ arg = 0x00000000;
+ print_str = "Legacy Erase";
+ } else if (strcmp(argv[1], "discard") == 0) {
+ arg = 0x00000003;
+ print_str = "Discard";
+ } else if (strcmp(argv[1], "secure-erase") == 0) {
+ print_str = "Secure Erase";
+ checkup_mask = EXT_CSD_SEC_ER_EN;
+ arg = 0x80000000;
+ } else if (strcmp(argv[1], "secure-trim1") == 0) {
+ print_str = "Secure Trim Step 1";
+ checkup_mask = EXT_CSD_SEC_ER_EN | EXT_CSD_SEC_GB_CL_EN;
+ arg = 0x80000001;
+ } else if (strcmp(argv[1], "secure-trim2") == 0) {
+ print_str = "Secure Trim Step 2";
+ checkup_mask = EXT_CSD_SEC_ER_EN | EXT_CSD_SEC_GB_CL_EN;
+ arg = 0x80008000;
+ } else if (strcmp(argv[1], "trim") == 0) {
+ print_str = "Trim";
+ checkup_mask = EXT_CSD_SEC_GB_CL_EN;
+ arg = 0x00000001;
+ } else {
+ fprintf(stderr, "Unknown erase type: %s\n", argv[1]);
+ exit(1);
+ }
+
+ dev_fd = open(argv[4], O_RDWR);
+ if (dev_fd < 0) {
+ perror(argv[4]);
+ exit(1);
+ }
+
+ if (checkup_mask) {
+ ret = read_extcsd(dev_fd, ext_csd);
+ if (ret) {
+ fprintf(stderr, "Could not read EXT_CSD from %s\n",
+ argv[4]);
+ goto out;
+ }
+ if ((checkup_mask & ext_csd[EXT_CSD_SEC_FEATURE_SUPPORT]) !=
+ checkup_mask) {
+ fprintf(stderr, "%s is not supported in %s\n",
+ print_str, argv[4]);
+ ret = -ENOTSUP;
+ goto out;
+ }
+
+ }
+ printf("Executing %s from 0x%08x to 0x%08x\n", print_str, start, end);
+
+ ret = erase(dev_fd, arg, start, end);
+out:
+ printf(" %s %s!\n\n", print_str, ret ? "Failed" : "Succeed");
+ close(dev_fd);
+ return ret;
+}
+
+
int do_ffu(int nargs, char **argv)
{
#ifndef MMC_IOC_MULTI_CMD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mmc-utils-0.1+git.20210330/mmc_cmds.h
new/mmc-utils-0.1+git.20210824/mmc_cmds.h
--- old/mmc-utils-0.1+git.20210330/mmc_cmds.h 2021-03-30 15:28:34.000000000
+0200
+++ new/mmc-utils-0.1+git.20210824/mmc_cmds.h 2021-08-24 10:57:33.000000000
+0200
@@ -45,3 +45,4 @@
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_erase(int nargs, char **argv);
++++++ mmc-utils.obsinfo ++++++
--- /var/tmp/diff_new_pack.HLGfQw/_old 2021-09-14 21:14:47.368428577 +0200
+++ /var/tmp/diff_new_pack.HLGfQw/_new 2021-09-14 21:14:47.368428577 +0200
@@ -1,5 +1,5 @@
name: mmc-utils
-version: 0.1+git.20210511
-mtime: 1620729955
-commit: 43282e80e174cc73b09b81a4d17cb3a7b4dc5cfc
+version: 0.1+git.20210824
+mtime: 1629795453
+commit: 0eea71e4f22a837ed59e607743767df2d038825e
