* [PATCH] mtd-utils: nandtest: handle large nand devices
@ 2023-08-22 8:09 Christian Wendt he/him
2023-08-23 11:19 ` David Oberhollenzer
0 siblings, 1 reply; 6+ messages in thread
From: Christian Wendt he/him @ 2023-08-22 8:09 UTC (permalink / raw)
To: linux-mtd
Running nandtest on devices with sizes of 4Gb or more does not work, as
the size returned in mtd_info_user is reported as 0 for 4Gb devices for
example.
The patch uses sysfs to figure out the size of the nand device (as
recommended in a comment in include/mtd/mtd-abi.h) and changes sizes
and offsets to 64 bit values.
[From: Christian Wendt <cw@brainaid.de>]
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
---
nand-utils/nandtest.c | 47 +++++++++++++++++++++++++++++++++----------
1 file changed, 36 insertions(+), 11 deletions(-)
diff --git a/nand-utils/nandtest.c b/nand-utils/nandtest.c
index 06dec25..98217ba 100644
--- a/nand-utils/nandtest.c
+++ b/nand-utils/nandtest.c
@@ -8,6 +8,7 @@
#include <string.h>
#include <time.h>
#include <unistd.h>
+#include <limits.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/types.h>
@@ -145,6 +146,27 @@ static int erase_and_write(loff_t ofs, unsigned
char *data, unsigned char *rbuf,
}
+static uint64_t get_mem_size(const char* device)
+{
+ const char* p = strrchr(device, '/');
+ char path[PATH_MAX];
+ int fd;
+
+ snprintf(path, sizeof(path), "/sys/class/mtd/%s/size", p);
+ fd = open(path, O_RDONLY);
+ if (fd >= 0) {
+ char buffer[32];
+ ssize_t n = read(fd, buffer, sizeof(buffer));
+ close(fd);
+ if (n > 0) {
+ return strtoull(buffer, NULL, 0);
+ }
+ }
+
+ fprintf(stderr, "Can't read size from %s\n", path);
+ exit(1);
+}
+
/*
* Main program
*/
@@ -156,8 +178,9 @@ int main(int argc, char **argv)
int nr_passes = 1;
int nr_reads = 4;
int keep_contents = 0;
- uint32_t offset = 0;
- uint32_t length = -1;
+ uint64_t offset = 0;
+ uint64_t length = -1;
+ uint64_t mem_size = 0;
int error = 0;
seed = time(NULL);
@@ -212,11 +235,11 @@ int main(int argc, char **argv)
break;
case 'o':
- offset = simple_strtoul(optarg, &error);
+ offset = simple_strtoull(optarg, &error);
break;
case 'l':
- length = simple_strtoul(optarg, &error);
+ length = simple_strtoull(optarg, &error);
break;
}
@@ -238,29 +261,31 @@ int main(int argc, char **argv)
exit(1);
}
+ mem_size = get_mem_size(argv[optind]);
+
if (length == -1)
- length = meminfo.size;
+ length = mem_size;
if (offset % meminfo.erasesize) {
- fprintf(stderr, "Offset %x not multiple of erase size %x\n",
+ fprintf(stderr, "Offset %llx not multiple of erase size %x\n",
offset, meminfo.erasesize);
exit(1);
}
if (length % meminfo.erasesize) {
- fprintf(stderr, "Length %x not multiple of erase size %x\n",
+ fprintf(stderr, "Length %llx not multiple of erase size %x\n",
length, meminfo.erasesize);
exit(1);
}
- if (length + offset > meminfo.size) {
- fprintf(stderr, "Length %x + offset %x exceeds device size %x\n",
- length, offset, meminfo.size);
+ if (length + offset > mem_size) {
+ fprintf(stderr, "Length %llx + offset %llx exceeds device size %llx\n",
+ length, offset, mem_size);
exit(1);
}
wbuf = malloc(meminfo.erasesize * 3);
if (!wbuf) {
fprintf(stderr, "Could not allocate %d bytes for buffer\n",
- meminfo.erasesize * 2);
+ meminfo.erasesize * 3);
exit(1);
}
rbuf = wbuf + meminfo.erasesize;
--
2.39.3
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] mtd-utils: nandtest: handle large nand devices
2023-08-22 8:09 [PATCH] mtd-utils: nandtest: handle large nand devices Christian Wendt he/him
@ 2023-08-23 11:19 ` David Oberhollenzer
0 siblings, 0 replies; 6+ messages in thread
From: David Oberhollenzer @ 2023-08-23 11:19 UTC (permalink / raw)
To: Christian Wendt he/him, linux-mtd
Hi,
I applied this to mtd-utils.git master.
A quick side note: Did you send this via something other than git-send-email?
Your mail client or server seems to have mangled the patch format quite a bit.
E.g. here, there is some white space damage that breaks the file:
On 8/22/23 10:09, Christian Wendt he/him wrote:
> @@ -145,6 +146,27 @@ static int erase_and_write(loff_t ofs, unsigned char *data, unsigned char *rbuf,
> }
> +static uint64_t get_mem_size(const char* device)
> +{
> + const char* p = strrchr(device, '/');
similarly, there are some extra spaces where they don't belong,
and some empty line are missing here:
> @@ -212,11 +235,11 @@ int main(int argc, char **argv)
> break;
> case 'o':
> - offset = simple_strtoul(optarg, &error);
> + offset = simple_strtoull(optarg, &error);
> break;
> case 'l':
> - length = simple_strtoul(optarg, &error);
> + length = simple_strtoull(optarg, &error);
> break;
> }
For now, I massaged the patch file a little to make it apply on my end.
Thanks,
David
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] mtd-utils: nandtest: handle large nand devices
@ 2023-08-10 8:20 Christian Wendt he/him
2023-08-12 2:53 ` Zhihao Cheng
0 siblings, 1 reply; 6+ messages in thread
From: Christian Wendt he/him @ 2023-08-10 8:20 UTC (permalink / raw)
To: linux-mtd
[PATCH] mtd-utils: nandtest: handle large nand devices
Running nandtest on devices with sizes of 4Gb or more does not work, as
the size returned in mtd_info_user is reported as 0 for 4Gb devices for
example.
The patch uses sysfs to figure out the size of the nand device (as
recommended in a comment in include/mtd/mtd-abi.h) and changes sizes
and offsets to 64 bit values.
[From: Christian Wendt <cw@brainaid.de>]
diff --git a/nand-utils/nandtest.c b/nand-utils/nandtest.c
index 06dec25..e60428f 100644
--- a/nand-utils/nandtest.c
+++ b/nand-utils/nandtest.c
@@ -8,6 +8,7 @@
#include <string.h>
#include <time.h>
#include <unistd.h>
+#include <limits.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/types.h>
@@ -145,6 +146,26 @@ static int erase_and_write(loff_t ofs, unsigned
char *data, unsigned char *rbuf,
}
+static uint64_t get_mem_size(const char* device)
+{
+ const char* p = strrchr(device, '/');
+ char path[PATH_MAX];
+ int fd;
+
+ snprintf(path, sizeof(path), "/sys/class/mtd/%s/size", p);
+ fd = open(path, O_RDONLY);
+ if (fd) {
+ char buffer[32];
+ ssize_t n = read(fd, buffer, sizeof(buffer));
+ close(fd);
+ if (n > 0) {
+ return strtoull(buffer, NULL, 0);
+ }
+ }
+
+ return 0;
+}
+
/*
* Main program
*/
@@ -156,8 +177,9 @@ int main(int argc, char **argv)
int nr_passes = 1;
int nr_reads = 4;
int keep_contents = 0;
- uint32_t offset = 0;
- uint32_t length = -1;
+ uint64_t offset = 0;
+ uint64_t length = -1;
+ uint64_t mem_size = 0;
int error = 0;
seed = time(NULL);
@@ -238,29 +260,31 @@ int main(int argc, char **argv)
exit(1);
}
+ mem_size = get_mem_size(argv[optind]);
+
if (length == -1)
- length = meminfo.size;
+ length = mem_size;
if (offset % meminfo.erasesize) {
- fprintf(stderr, "Offset %x not multiple of erase size %x\n",
+ fprintf(stderr, "Offset %llx not multiple of erase size
%x\n",
offset, meminfo.erasesize);
exit(1);
}
if (length % meminfo.erasesize) {
- fprintf(stderr, "Length %x not multiple of erase size %x\n",
+ fprintf(stderr, "Length %llx not multiple of erase size
%x\n",
length, meminfo.erasesize);
exit(1);
}
- if (length + offset > meminfo.size) {
- fprintf(stderr, "Length %x + offset %x exceeds device
size %x\n",
- length, offset, meminfo.size);
+ if (length + offset > mem_size) {
+ fprintf(stderr, "Length %llx + offset %llx exceeds
device size %llx\n",
+ length, offset, mem_size);
exit(1);
}
wbuf = malloc(meminfo.erasesize * 3);
if (!wbuf) {
fprintf(stderr, "Could not allocate %d bytes for buffer\n",
- meminfo.erasesize * 2);
+ meminfo.erasesize * 3);
exit(1);
}
rbuf = wbuf + meminfo.erasesize;
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] mtd-utils: nandtest: handle large nand devices
2023-08-10 8:20 Christian Wendt he/him
@ 2023-08-12 2:53 ` Zhihao Cheng
2023-08-16 14:07 ` Christian Wendt he/him
0 siblings, 1 reply; 6+ messages in thread
From: Zhihao Cheng @ 2023-08-12 2:53 UTC (permalink / raw)
To: linux-mtd
在 2023/8/10 16:20, Christian Wendt he/him 写道:
> [PATCH] mtd-utils: nandtest: handle large nand devices
>
> Running nandtest on devices with sizes of 4Gb or more does not work, as
> the size returned in mtd_info_user is reported as 0 for 4Gb devices for
> example.
>
> The patch uses sysfs to figure out the size of the nand device (as
> recommended in a comment in include/mtd/mtd-abi.h) and changes sizes
> and offsets to 64 bit values.
>
> [From: Christian Wendt <cw@brainaid.de>]
> diff --git a/nand-utils/nandtest.c b/nand-utils/nandtest.c
> index 06dec25..e60428f 100644
> --- a/nand-utils/nandtest.c
> +++ b/nand-utils/nandtest.c
> @@ -8,6 +8,7 @@
> #include <string.h>
> #include <time.h>
> #include <unistd.h>
> +#include <limits.h>
> #include <sys/stat.h>
> #include <sys/ioctl.h>
> #include <sys/types.h>
> @@ -145,6 +146,26 @@ static int erase_and_write(loff_t ofs, unsigned
> char *data, unsigned char *rbuf,
> }
>
>
> +static uint64_t get_mem_size(const char* device)
> +{
> + const char* p = strrchr(device, '/');
> + char path[PATH_MAX];
> + int fd;
> +
> + snprintf(path, sizeof(path), "/sys/class/mtd/%s/size", p);
> + fd = open(path, O_RDONLY);
> + if (fd) {
> + char buffer[32];
> + ssize_t n = read(fd, buffer, sizeof(buffer));
> + close(fd);
> + if (n > 0) {
> + return strtoull(buffer, NULL, 0);
> + }
> + }
It's better to add error handling for open/read failures, otherwise
'length' will be 0 if user doesn't pass '-l' parameter when open/read
'/sys/class/mtd/mtdX/size' failed.
> +
> + return 0;
> +}
> +
> /*
> * Main program
> */
> @@ -156,8 +177,9 @@ int main(int argc, char **argv)
> int nr_passes = 1;
> int nr_reads = 4;
> int keep_contents = 0;
> - uint32_t offset = 0;
> - uint32_t length = -1;
> + uint64_t offset = 0;
> + uint64_t length = -1;
> + uint64_t mem_size = 0;
> int error = 0;
>
> seed = time(NULL);
> @@ -238,29 +260,31 @@ int main(int argc, char **argv)
> exit(1);
> }
>
> + mem_size = get_mem_size(argv[optind]);
> +
> if (length == -1)
> - length = meminfo.size;
> + length = mem_size;
>
> if (offset % meminfo.erasesize) {
> - fprintf(stderr, "Offset %x not multiple of erase size
> %x\n",
> + fprintf(stderr, "Offset %llx not multiple of erase size
> %x\n",
> offset, meminfo.erasesize);
> exit(1);
> }
> if (length % meminfo.erasesize) {
> - fprintf(stderr, "Length %x not multiple of erase size
> %x\n",
> + fprintf(stderr, "Length %llx not multiple of erase size
> %x\n",
> length, meminfo.erasesize);
> exit(1);
> }
> - if (length + offset > meminfo.size) {
> - fprintf(stderr, "Length %x + offset %x exceeds device
> size %x\n",
> - length, offset, meminfo.size);
> + if (length + offset > mem_size) {
> + fprintf(stderr, "Length %llx + offset %llx exceeds
> device size %llx\n",
> + length, offset, mem_size);
> exit(1);
> }
>
> wbuf = malloc(meminfo.erasesize * 3);
> if (!wbuf) {
> fprintf(stderr, "Could not allocate %d bytes for
> buffer\n",
> - meminfo.erasesize * 2);
> + meminfo.erasesize * 3);
> exit(1);
> }
> rbuf = wbuf + meminfo.erasesize;
>
> ______________________________________________________
> Linux MTD discussion mailing list
> http://lists.infradead.org/mailman/listinfo/linux-mtd/
>
> .
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] mtd-utils: nandtest: handle large nand devices
2023-08-12 2:53 ` Zhihao Cheng
@ 2023-08-16 14:07 ` Christian Wendt he/him
2023-08-17 1:17 ` Zhihao Cheng
0 siblings, 1 reply; 6+ messages in thread
From: Christian Wendt he/him @ 2023-08-16 14:07 UTC (permalink / raw)
To: linux-mtd
[PATCH] mtd-utils: nandtest: handle large nand devices
Running nandtest on devices with sizes of 4Gb or more does not work, as
the size returned in mtd_info_user is reported as 0 for 4Gb devices for
example.
The patch uses sysfs to figure out the size of the nand device (as
recommended in a comment in include/mtd/mtd-abi.h) and changes sizes
and offsets to 64 bit values.
[From: Christian Wendt <cw@brainaid.de>]
diff --git a/nand-utils/nandtest.c b/nand-utils/nandtest.c
index 06dec25..98217ba 100644
--- a/nand-utils/nandtest.c
+++ b/nand-utils/nandtest.c
@@ -8,6 +8,7 @@
#include <string.h>
#include <time.h>
#include <unistd.h>
+#include <limits.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/types.h>
@@ -145,6 +146,27 @@ static int erase_and_write(loff_t ofs, unsigned
char *data, unsigned char *rbuf,
}
+static uint64_t get_mem_size(const char* device)
+{
+ const char* p = strrchr(device, '/');
+ char path[PATH_MAX];
+ int fd;
+
+ snprintf(path, sizeof(path), "/sys/class/mtd/%s/size", p);
+ fd = open(path, O_RDONLY);
+ if (fd >= 0) {
+ char buffer[32];
+ ssize_t n = read(fd, buffer, sizeof(buffer));
+ close(fd);
+ if (n > 0) {
+ return strtoull(buffer, NULL, 0);
+ }
+ }
+
+ fprintf(stderr, "Can't read size from %s\n", path);
+ exit(1);
+}
+
/*
* Main program
*/
@@ -156,8 +178,9 @@ int main(int argc, char **argv)
int nr_passes = 1;
int nr_reads = 4;
int keep_contents = 0;
- uint32_t offset = 0;
- uint32_t length = -1;
+ uint64_t offset = 0;
+ uint64_t length = -1;
+ uint64_t mem_size = 0;
int error = 0;
seed = time(NULL);
@@ -212,11 +235,11 @@ int main(int argc, char **argv)
break;
case 'o':
- offset = simple_strtoul(optarg, &error);
+ offset = simple_strtoull(optarg, &error);
break;
case 'l':
- length = simple_strtoul(optarg, &error);
+ length = simple_strtoull(optarg, &error);
break;
}
@@ -238,29 +261,31 @@ int main(int argc, char **argv)
exit(1);
}
+ mem_size = get_mem_size(argv[optind]);
+
if (length == -1)
- length = meminfo.size;
+ length = mem_size;
if (offset % meminfo.erasesize) {
- fprintf(stderr, "Offset %x not multiple of erase size %x\n",
+ fprintf(stderr, "Offset %llx not multiple of erase size
%x\n",
offset, meminfo.erasesize);
exit(1);
}
if (length % meminfo.erasesize) {
- fprintf(stderr, "Length %x not multiple of erase size %x\n",
+ fprintf(stderr, "Length %llx not multiple of erase size
%x\n",
length, meminfo.erasesize);
exit(1);
}
- if (length + offset > meminfo.size) {
- fprintf(stderr, "Length %x + offset %x exceeds device
size %x\n",
- length, offset, meminfo.size);
+ if (length + offset > mem_size) {
+ fprintf(stderr, "Length %llx + offset %llx exceeds
device size %llx\n",
+ length, offset, mem_size);
exit(1);
}
wbuf = malloc(meminfo.erasesize * 3);
if (!wbuf) {
fprintf(stderr, "Could not allocate %d bytes for buffer\n",
- meminfo.erasesize * 2);
+ meminfo.erasesize * 3);
exit(1);
}
rbuf = wbuf + meminfo.erasesize;
On 12-08-2023 04:53, Zhihao Cheng wrote:
> 在 2023/8/10 16:20, Christian Wendt he/him 写道:
>> [PATCH] mtd-utils: nandtest: handle large nand devices
>>
>> Running nandtest on devices with sizes of 4Gb or more does not work, as
>> the size returned in mtd_info_user is reported as 0 for 4Gb devices for
>> example.
>>
>> The patch uses sysfs to figure out the size of the nand device (as
>> recommended in a comment in include/mtd/mtd-abi.h) and changes sizes
>> and offsets to 64 bit values.
>>
>> [From: Christian Wendt <cw@brainaid.de>]
>> diff --git a/nand-utils/nandtest.c b/nand-utils/nandtest.c
>> index 06dec25..e60428f 100644
>> --- a/nand-utils/nandtest.c
>> +++ b/nand-utils/nandtest.c
>> @@ -8,6 +8,7 @@
>> #include <string.h>
>> #include <time.h>
>> #include <unistd.h>
>> +#include <limits.h>
>> #include <sys/stat.h>
>> #include <sys/ioctl.h>
>> #include <sys/types.h>
>> @@ -145,6 +146,26 @@ static int erase_and_write(loff_t ofs, unsigned
>> char *data, unsigned char *rbuf,
>> }
>>
>>
>> +static uint64_t get_mem_size(const char* device)
>> +{
>> + const char* p = strrchr(device, '/');
>> + char path[PATH_MAX];
>> + int fd;
>> +
>> + snprintf(path, sizeof(path), "/sys/class/mtd/%s/size", p);
>> + fd = open(path, O_RDONLY);
>> + if (fd) {
>> + char buffer[32];
>> + ssize_t n = read(fd, buffer, sizeof(buffer));
>> + close(fd);
>> + if (n > 0) {
>> + return strtoull(buffer, NULL, 0);
>> + }
>> + }
>
> It's better to add error handling for open/read failures, otherwise
> 'length' will be 0 if user doesn't pass '-l' parameter when open/read
> '/sys/class/mtd/mtdX/size' failed.
>
>> +
>> + return 0;
>> +}
>> +
>> /*
>> * Main program
>> */
>> @@ -156,8 +177,9 @@ int main(int argc, char **argv)
>> int nr_passes = 1;
>> int nr_reads = 4;
>> int keep_contents = 0;
>> - uint32_t offset = 0;
>> - uint32_t length = -1;
>> + uint64_t offset = 0;
>> + uint64_t length = -1;
>> + uint64_t mem_size = 0;
>> int error = 0;
>>
>> seed = time(NULL);
>> @@ -238,29 +260,31 @@ int main(int argc, char **argv)
>> exit(1);
>> }
>>
>> + mem_size = get_mem_size(argv[optind]);
>> +
>> if (length == -1)
>> - length = meminfo.size;
>> + length = mem_size;
>>
>> if (offset % meminfo.erasesize) {
>> - fprintf(stderr, "Offset %x not multiple of erase size
>> %x\n",
>> + fprintf(stderr, "Offset %llx not multiple of erase
>> size %x\n",
>> offset, meminfo.erasesize);
>> exit(1);
>> }
>> if (length % meminfo.erasesize) {
>> - fprintf(stderr, "Length %x not multiple of erase size
>> %x\n",
>> + fprintf(stderr, "Length %llx not multiple of erase
>> size %x\n",
>> length, meminfo.erasesize);
>> exit(1);
>> }
>> - if (length + offset > meminfo.size) {
>> - fprintf(stderr, "Length %x + offset %x exceeds device
>> size %x\n",
>> - length, offset, meminfo.size);
>> + if (length + offset > mem_size) {
>> + fprintf(stderr, "Length %llx + offset %llx exceeds
>> device size %llx\n",
>> + length, offset, mem_size);
>> exit(1);
>> }
>>
>> wbuf = malloc(meminfo.erasesize * 3);
>> if (!wbuf) {
>> fprintf(stderr, "Could not allocate %d bytes for
>> buffer\n",
>> - meminfo.erasesize * 2);
>> + meminfo.erasesize * 3);
>> exit(1);
>> }
>> rbuf = wbuf + meminfo.erasesize;
>>
>> ______________________________________________________
>> Linux MTD discussion mailing list
>> http://lists.infradead.org/mailman/listinfo/linux-mtd/
>>
>> .
>
>
> ______________________________________________________
> Linux MTD discussion mailing list
> http://lists.infradead.org/mailman/listinfo/linux-mtd/
--
___________________________________________________brainaid_____________
Christian Wendt he/him Fjordvej 105, Junget phone +45 78 76 38 42
7870 Roslev cell +45 50 31 36 50
cw@brainaid.dk Danmark voip +49 241 56529787
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] mtd-utils: nandtest: handle large nand devices
2023-08-16 14:07 ` Christian Wendt he/him
@ 2023-08-17 1:17 ` Zhihao Cheng
0 siblings, 0 replies; 6+ messages in thread
From: Zhihao Cheng @ 2023-08-17 1:17 UTC (permalink / raw)
To: Christian Wendt he/him, linux-mtd
在 2023/8/16 22:07, Christian Wendt he/him 写道:
> [PATCH] mtd-utils: nandtest: handle large nand devices
>
> Running nandtest on devices with sizes of 4Gb or more does not work, as
> the size returned in mtd_info_user is reported as 0 for 4Gb devices for
> example.
>
> The patch uses sysfs to figure out the size of the nand device (as
> recommended in a comment in include/mtd/mtd-abi.h) and changes sizes
> and offsets to 64 bit values.
>
> [From: Christian Wendt <cw@brainaid.de>]
>
It would be better to send it in a patch format, otherwise there is a
indent problem. Anyway,
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
> diff --git a/nand-utils/nandtest.c b/nand-utils/nandtest.c
> index 06dec25..98217ba 100644
> --- a/nand-utils/nandtest.c
> +++ b/nand-utils/nandtest.c
> @@ -8,6 +8,7 @@
> #include <string.h>
> #include <time.h>
> #include <unistd.h>
> +#include <limits.h>
> #include <sys/stat.h>
> #include <sys/ioctl.h>
> #include <sys/types.h>
> @@ -145,6 +146,27 @@ static int erase_and_write(loff_t ofs, unsigned
> char *data, unsigned char *rbuf,
> }
>
>
> +static uint64_t get_mem_size(const char* device)
> +{
> + const char* p = strrchr(device, '/');
> + char path[PATH_MAX];
> + int fd;
> +
> + snprintf(path, sizeof(path), "/sys/class/mtd/%s/size", p);
> + fd = open(path, O_RDONLY);
> + if (fd >= 0) {
> + char buffer[32];
> + ssize_t n = read(fd, buffer, sizeof(buffer));
> + close(fd);
> + if (n > 0) {
> + return strtoull(buffer, NULL, 0);
> + }
> + }
> +
> + fprintf(stderr, "Can't read size from %s\n", path);
> + exit(1);
> +}
> +
> /*
> * Main program
> */
> @@ -156,8 +178,9 @@ int main(int argc, char **argv)
> int nr_passes = 1;
> int nr_reads = 4;
> int keep_contents = 0;
> - uint32_t offset = 0;
> - uint32_t length = -1;
> + uint64_t offset = 0;
> + uint64_t length = -1;
> + uint64_t mem_size = 0;
> int error = 0;
>
> seed = time(NULL);
> @@ -212,11 +235,11 @@ int main(int argc, char **argv)
> break;
>
> case 'o':
> - offset = simple_strtoul(optarg, &error);
> + offset = simple_strtoull(optarg, &error);
> break;
>
> case 'l':
> - length = simple_strtoul(optarg, &error);
> + length = simple_strtoull(optarg, &error);
> break;
>
> }
> @@ -238,29 +261,31 @@ int main(int argc, char **argv)
> exit(1);
> }
>
> + mem_size = get_mem_size(argv[optind]);
> +
> if (length == -1)
> - length = meminfo.size;
> + length = mem_size;
>
> if (offset % meminfo.erasesize) {
> - fprintf(stderr, "Offset %x not multiple of erase size
> %x\n",
> + fprintf(stderr, "Offset %llx not multiple of erase size
> %x\n",
> offset, meminfo.erasesize);
> exit(1);
> }
> if (length % meminfo.erasesize) {
> - fprintf(stderr, "Length %x not multiple of erase size
> %x\n",
> + fprintf(stderr, "Length %llx not multiple of erase size
> %x\n",
> length, meminfo.erasesize);
> exit(1);
> }
> - if (length + offset > meminfo.size) {
> - fprintf(stderr, "Length %x + offset %x exceeds device
> size %x\n",
> - length, offset, meminfo.size);
> + if (length + offset > mem_size) {
> + fprintf(stderr, "Length %llx + offset %llx exceeds
> device size %llx\n",
> + length, offset, mem_size);
> exit(1);
> }
>
> wbuf = malloc(meminfo.erasesize * 3);
> if (!wbuf) {
> fprintf(stderr, "Could not allocate %d bytes for
> buffer\n",
> - meminfo.erasesize * 2);
> + meminfo.erasesize * 3);
> exit(1);
> }
> rbuf = wbuf + meminfo.erasesize;
>
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-08-23 11:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-22 8:09 [PATCH] mtd-utils: nandtest: handle large nand devices Christian Wendt he/him
2023-08-23 11:19 ` David Oberhollenzer
-- strict thread matches above, loose matches on Subject: below --
2023-08-10 8:20 Christian Wendt he/him
2023-08-12 2:53 ` Zhihao Cheng
2023-08-16 14:07 ` Christian Wendt he/him
2023-08-17 1:17 ` Zhihao Cheng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox