Author: mmel
Date: Sat Oct 31 16:05:24 2020
New Revision: 367217
URL: https://svnweb.freebsd.org/changeset/base/367217
Log:
MFC r362388:
Use native-sized accesses when accessing memory from kdb. Not all MMIO
mapped devices supports byte access.
Modified:
stable/12/sys/arm64/arm64/db_interface.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/arm64/arm64/db_interface.c
==============================================================================
--- stable/12/sys/arm64/arm64/db_interface.c Sat Oct 31 16:03:35 2020
(r367216)
+++ stable/12/sys/arm64/arm64/db_interface.c Sat Oct 31 16:05:24 2020
(r367217)
@@ -118,12 +118,25 @@ db_read_bytes(vm_offset_t addr, size_t size, char *dat
void *prev_jb;
const char *src;
int ret;
+ uint64_t tmp64;
+ uint32_t tmp32;
+ uint16_t tmp16;
prev_jb = kdb_jmpbuf(jb);
ret = setjmp(jb);
if (ret == 0) {
src = (const char *)addr;
+ if (size == 8 && (addr & 7) == 0) {
+ tmp64 = *((const int *)src);
+ src = (const char *)&tmp64;
+ } else if (size == 4 && (addr & 3) == 0) {
+ tmp32 = *((const int *)src);
+ src = (const char *)&tmp32;
+ } else if (size == 2 && (addr & 1) == 0) {
+ tmp16 = *((const short *)src);
+ src = (const char *)&tmp16;
+ }
while (size-- > 0)
*data++ = *src++;
}
@@ -142,14 +155,33 @@ db_write_bytes(vm_offset_t addr, size_t size, char *da
void *prev_jb;
char *dst;
int ret;
+ uint64_t tmp64;
+ uint32_t tmp32;
+ uint16_t tmp16;
prev_jb = kdb_jmpbuf(jb);
ret = setjmp(jb);
if (ret == 0) {
- dst = (char *)addr;
- while (size-- > 0)
- *dst++ = *data++;
-
+ if (size == 8 && (addr & 7) == 0) {
+ dst = (char *)&tmp64;
+ while (size-- > 0)
+ *dst++ = *data++;
+ *((uint64_t *)addr) = tmp64;
+ } else if (size == 4 && (addr & 3) == 0) {
+ dst = (char *)&tmp32;
+ while (size-- > 0)
+ *dst++ = *data++;
+ *((uint32_t *)addr) = tmp32;
+ } else if (size == 2 && (addr & 1) == 0) {
+ dst = (char *)&tmp16;
+ while (size-- > 0)
+ *dst++ = *data++;
+ *((uint32_t *)addr) = tmp16;
+ } else {
+ dst = (char *)addr;
+ while (size-- > 0)
+ *dst++ = *data++;
+ }
dsb(ish);
/* Clean D-cache and invalidate I-cache */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
