[SeaBIOS] [PATCHv2] Handle unaligned sizes in iomemcpy()
Kevin O'Connor
kevin at koconnor.net
Tue Jul 27 07:19:03 CEST 2010
Scratch the previous patch - it's simpler to just enhance iomemcpy.
-Kevin
>From b4525a0ec176426788f293cce92160e6573e86b6 Mon Sep 17 00:00:00 2001
From: Kevin O'Connor <kevin at koconnor.net>
Date: Tue, 27 Jul 2010 01:14:11 -0400
Subject: [PATCH] Handle unaligned sizes in iomemcpy().
To: seabios at seabios.org
This fixes a bug causing truncation of uncompressed files in
cbfs_copyfile().
---
src/coreboot.c | 5 ++---
src/util.c | 11 +++++++----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/coreboot.c b/src/coreboot.c
index 5d9a101..db0063b 100644
--- a/src/coreboot.c
+++ b/src/coreboot.c
@@ -510,11 +510,10 @@ cbfs_copyfile(struct cbfs_file *file, void *dst, u32 maxlen)
void *src = (void*)file + ntohl(file->offset);
if (cbfs_iscomp(file)) {
// Compressed - copy to temp ram and uncompress it.
- u32 asize = ALIGN(size, 4);
- void *temp = malloc_tmphigh(asize);
+ void *temp = malloc_tmphigh(size);
if (!temp)
return -1;
- iomemcpy(temp, src, asize);
+ iomemcpy(temp, src, size);
int ret = ulzma(dst, maxlen, temp, size);
yield();
free(temp);
diff --git a/src/util.c b/src/util.c
index 2c22dfc..8e02d1e 100644
--- a/src/util.c
+++ b/src/util.c
@@ -202,24 +202,27 @@ memcpy(void *d1, const void *s1, size_t len)
return d1;
}
-// Copy from memory mapped IO. IO mem is very slow, so yield
-// periodically. 'len' must be 4 byte aligned.
+// Copy to/from memory mapped IO. IO mem is very slow, so yield
+// periodically.
void
iomemcpy(void *d, const void *s, u32 len)
{
yield();
- while (len) {
+ while (len > 3) {
u32 copylen = len;
if (copylen > 2048)
copylen = 2048;
- len -= copylen;
copylen /= 4;
+ len -= copylen * 4;
asm volatile(
"rep movsl (%%esi),%%es:(%%edi)"
: "+c"(copylen), "+S"(s), "+D"(d)
: : "cc", "memory");
yield();
}
+ if (len)
+ // Copy any remaining bytes.
+ memcpy(d, s, len);
}
void *
--
1.7.1.1
More information about the SeaBIOS
mailing list