L1 instruction memory and MMR memory on blackfin can not be accessed by
common functions probe_kernel_read() and probe_kernel_write().
Blackfin asks for 2/4 byte align access to MMR memory and DMA access to L1
instruction memory. These functions need to be reimplemented in
architecture specific kgdb.c.
Signed-off-by: Sonic Zhang <firstname.lastname@example.org>
kernel/kgdb.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/kgdb.c b/kernel/kgdb.c
index eaa21fc..88fbab6 100644
@@ -363,7 +363,7 @@ static void put_packet(char *buffer)
* Convert the memory pointed to by mem into hex, placing result in buf.
* Return a pointer to the last char put in buf (null). May return an error.
-int kgdb_mem2hex(char *mem, char *buf, int count)
+int __weak kgdb_mem2hex(char *mem, char *buf, int count)
@@ -393,7 +393,7 @@ int kgdb_mem2hex(char *mem, char *buf, int count)
* 0x7d escaped with 0x7d. Return a pointer to the character after
* the last byte written.
-static int kgdb_ebin2mem(char *buf, char *mem, int count)
+int __weak kgdb_ebin2mem(char *buf, char *mem, int count)
int err = 0;
@@ -418,7 +418,7 @@ static int kgdb_ebin2mem(char *buf, char *mem, int count)
* Return a pointer to the character AFTER the last byte written.
* May return an error.
-int kgdb_hex2mem(char *buf, char *mem, int count)
+int __weak kgdb_hex2mem(char *buf, char *mem, int count)
This patch is a reasonable change if you are looking to use the common
kgdb code, however your patch needs some further work in that the
documentation and prototypes in include/linux/kgdb.h file need to be
updated as well.
In include/linux/kgdb.h you have:
270 extern int kgdb_mem2hex(char *mem, char *buf, int count);
271 extern int kgdb_hex2mem(char *buf, char *mem, int count);
The above two lines need to be changed by your patch, as well as
adding a definition for the ebin2mem, because we do not want to make
new sparse warnings run have something link to the wrong function with
the various revs of gcc out there.
To fix the documentation, you add some extra information to the
comments preceding the functions prototype in include/linux/kgdb.h,
there are other examples in the same file. IE:
* kgdb_mem2hex - (optional arch overide) traslate bin to hex chars
* @mem: source buffer
* @buf: target buffer
* @count: number of bytes in mem
* Archictures which do not support probe_kernel_(read|write),
* can make an alternate implmentation of this function.
* This function safely reads memory to into hex
* characters for use with the kgdb protocol.
int __weak kgdb_mem2hex(char *mem, char *buf, int count);
The other approach here would be to consider changing the
probe_kernel_write() and probe_kernel_read() to work safely on the
black fin architecture, then you would not need to have an
architecture specific override for these kgdb internals. In the long
run, I suspect other kernel functionality may use the probe_kernel_*
functions so you might consider this. Regardless of the direction you
choose, I have no strong objection to accepting your patch if you make
the requested changes.