LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: emaclite: fix xemaclite_alignedread/write functions 

Use __raw_read* and __raw_write* functions to ensure read/write
is passed to the memory-mapped regions, as non-volatile accesses
may get optimised out.

Signed-off-by: Samuel Obuch <samuel.obuch@codasip.com>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
Link: https://lore.kernel.org/r/20220927112103.155689-2-samuel.obuch@codasip.com
Signed-off-by: Michal Simek <michal.simek@amd.com>
This commit is contained in:
Samuel Obuch 2022-09-27 13:21:02 +02:00 committed by Michal Simek
parent 078d8eb5bb
commit 3d1700296c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/xilinx_emaclite.c
View File

@ -112,12 +112,12 @@ static void xemaclite_alignedread(u32 *srcptr, void *destptr, u32 bytecount)
/* Word aligned buffer, no correction needed. */ /* Word aligned buffer, no correction needed. */
to32ptr = (u32 *) destptr; to32ptr = (u32 *) destptr;
while (bytecount > 3) { while (bytecount > 3) {
*to32ptr++ = *from32ptr++; *to32ptr++ = __raw_readl(from32ptr++);
bytecount -= 4; bytecount -= 4;
} }
to8ptr = (u8 *) to32ptr; to8ptr = (u8 *) to32ptr;
alignbuffer = *from32ptr++; alignbuffer = __raw_readl(from32ptr++);
from8ptr = (u8 *) &alignbuffer; from8ptr = (u8 *) &alignbuffer;
for (i = 0; i < bytecount; i++) for (i = 0; i < bytecount; i++)
@ -135,8 +135,7 @@ static void xemaclite_alignedwrite(void *srcptr, u32 *destptr, u32 bytecount)
from32ptr = (u32 *) srcptr; from32ptr = (u32 *) srcptr;
while (bytecount > 3) { while (bytecount > 3) {
__raw_writel(*from32ptr++, to32ptr++);
*to32ptr++ = *from32ptr++;
bytecount -= 4; bytecount -= 4;
} }
@ -147,7 +146,7 @@ static void xemaclite_alignedwrite(void *srcptr, u32 *destptr, u32 bytecount)
for (i = 0; i < bytecount; i++) for (i = 0; i < bytecount; i++)
*to8ptr++ = *from8ptr++; *to8ptr++ = *from8ptr++;
*to32ptr++ = alignbuffer; __raw_writel(alignbuffer, to32ptr++);
} }
static int wait_for_bit(const char *func, u32 *reg, const u32 mask, static int wait_for_bit(const char *func, u32 *reg, const u32 mask,