1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
Fix building qemu-ppce500 target with binutils ~2.38.
https://bugs.debian.org/1003490
The incompatibility was introduced in binutils commit:
https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=b25f942e18d6ecd7ec3e2d2e9930eb4f996c258a
--- u-boot-2022.01+dfsg.orig/arch/powerpc/cpu/mpc85xx/tlb.c
+++ u-boot-2022.01+dfsg/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -50,7 +50,10 @@ void read_tlbcam_entry(int idx, u32 *val
u32 _mas1;
mtspr(MAS0, FSL_BOOKE_MAS0(1, idx, 0));
- asm volatile("tlbre;isync");
+ asm volatile(".machine push;\n"
+ ".machine e500;\n"
+ "tlbre;isync;\n"
+ ".machine pop;\n");
_mas1 = mfspr(MAS1);
*valid = (_mas1 & MAS1_VALID);
@@ -109,7 +112,10 @@ void init_used_tlb_cams(void)
/* walk all the entries */
for (i = 0; i < num_cam; i++) {
mtspr(MAS0, FSL_BOOKE_MAS0(1, i, 0));
- asm volatile("tlbre;isync");
+ asm volatile(".machine push;\n"
+ ".machine e500;\n"
+ "tlbre;isync;\n"
+ ".machine pop;");
if (mfspr(MAS1) & MAS1_VALID)
use_tlb_cam(i);
}
@@ -183,7 +189,10 @@ void disable_tlb(u8 esel)
#ifdef CONFIG_ENABLE_36BIT_PHYS
mtspr(MAS7, 0);
#endif
- asm volatile("isync;msync;tlbwe;isync");
+ asm volatile(".machine push;\n"
+ ".machine e500;\n"
+ "isync;msync;tlbwe;isync;\n"
+ ".machine pop;\n");
#ifdef CONFIG_ADDR_MAP
if (gd->flags & GD_FLG_RELOC)
@@ -193,7 +202,11 @@ void disable_tlb(u8 esel)
static void tlbsx (const volatile unsigned *addr)
{
- __asm__ __volatile__ ("tlbsx 0,%0" : : "r" (addr), "m" (*addr));
+ __asm__ __volatile__ (".machine push;\n"
+ ".machine e500;\n"
+ "tlbsx 0,%0;\n"
+ ".machine pop;\n"
+ : : "r" (addr), "m" (*addr));
}
/* return -1 if we didn't find anything */
|
