From 6f77ab8344c6dda1c0ced46a933bf3d7669920eb Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Sun, 18 Jul 2021 10:31:10 +0800 Subject: [PATCH] xous: add cache_flush() call This call is designed to flush the CPU caches by calling the `FENCE` instruction. Signed-off-by: Sean Cross --- xous-rs/bin/riscv32i-unknown-none-elf.a | Bin 4058 -> 4220 bytes xous-rs/bin/riscv32imac-unknown-none-elf.a | Bin 4042 -> 4196 bytes xous-rs/bin/riscv32imc-unknown-none-elf.a | Bin 4042 -> 4196 bytes xous-rs/bin/riscv64gc-unknown-none-elf.a | Bin 5758 -> 5988 bytes xous-rs/bin/riscv64imac-unknown-none-elf.a | Bin 5758 -> 5988 bytes xous-rs/src/arch/native.rs | 8 ++++++++ xous-rs/src/asm.S | 5 +++++ 7 files changed, 13 insertions(+) diff --git a/xous-rs/bin/riscv32i-unknown-none-elf.a b/xous-rs/bin/riscv32i-unknown-none-elf.a index 4eb32a794bea9bac188113850a00c4f2bb052ed9..504112be53c9a205941b17b16bfeb99bc6ce77fa 100644 GIT binary patch delta 661 zcmb`FJud`d5XWcs-f_E)ni@oIoh%1yDiDJpcYa|!WTjeBbiDVK=rNR{_ zcb$SlrIDZ^p`f|a2T*wCo)aQUlRPuO`OofuXE*!Q@gWYAc`r4Za-A_D9KrE33*owM zRTW~k4geAWnk@fw{GIG(&Obkz!in|eTxQG9%w?A5{e{)d+!6o}2eN~;rwcLU4gb06 zkmGosC&Y;7Qk&L?SCrN+V+On%i+cbs6bal$1Hl*o29WLo;|QfhFsn7Ae2=0$DiF9Y z({^|e%caxs8HRkR6iVsn3MT$ouT+ffYWaJ4Q&)$wV7A&7Ke8^q*{WUh%zCHNnJu9> zEDQE3ZeZ?H+{kPyZes3M+``-g>1x-?jim;H*;ZUN?Na>P$gCN$scq7A!yT6CIBsHv zF5l@(`_xP(SvSjP){Gag}r1NHcr!| kVaGT4KM4Zpvh-8lNQO4#PHS{xm@Q5{z=71if?2wMciR)Vl4Kx}0QTL#2dfv^=oY*h#wY$iwm2%zSOgE=6Bl%WQJ z*y@Ut(|9j2u9Wp_L`|_(ZePEni#;?Xy!ZmpwzZ#>!7#J=vGcfQ0&C#B$ aC?L(M19VvYWJdvI)+NCB?46v*Cky~@`e0lD diff --git a/xous-rs/bin/riscv32imac-unknown-none-elf.a b/xous-rs/bin/riscv32imac-unknown-none-elf.a index 44d65f411584722d3a85fa8479303407df9a6f86..2b1c8c573ea5082f42e5b92137fe621535ebee43 100644 GIT binary patch delta 657 zcmX>l|3qPebiJ9Wxv7bPg@S^C0tg_J3JNABCSXwog#<1J1_ogU1|}dy9UNbgUs@c$ zaau5=dr@X_a#?(GVsb`md|FOvaRvheNK!9fA8NaTf}xoaR+kzY7?_!vDJU458JSF$ zW71$;G1;AIHakDV2mYppdy^kCo#$X?;bdT7WM-Vaj@fPVH|829QAVIAdVm-L7#TqP zzRBrq`iy;>r?ahQWQ_-kbZj=~$YK=6;efne5G{&NyXqF_1hpc{Y%IF!?Z$d@=bopE?r*(_|5THAaKU*8J+cF`zWU l!oa`>q;x0e^GmbF0G(7gxu0KILV}xtp%*9)1EA0c0RVhMWmfKUWrsY+A->Z~`z=iQU3*md7 zQia$`5JDyip&$RT!-K|tGi)9U72(jX?df*!i zv;cMEhW6pxc!sywS~N3qVnD|#z`4bvfptrx>v%|`@x-ywdch~m79O;y zc|x+QnM=-VPD!5AJT2MLoRwVAEF{lsRz0PFG3=98g>2*u8%cKau%7JGGsrWCc43#L zVUux1uGvMyE9|i;xM$ov8YQF+kIXTzC{C~RFZ6Oq+OF9_Ev2-Y&1nznwo7;5)OL+e p3J-SC6b2zBWf<5zS;MLqBZT1l|3qPebiJ9Wxv7bPg@S^C0tg_J3JNABCSXwog#<1J1_ogU1|}dy9UNbgUs@c$ zaau5=dr@X_a#?(GVsb`md|FOvaRvheNK!9fA8NaTf}xoaR+kzY7?_!vDJU458JSF$ zW71$;G1;AIHakDV2mYppdy^kCo#$X?;bdT7WM-Vaj@fPVH|829QAVIAdVm-L7#TqP zzRBrq`iy;>r?ahQWQ_-kbZj=~$YK=6;efne5G{&NyXqF_1hpc{Y%IF!?Z$d@=bopE?r*(_|5THAaKU*8J+cF`zWU l!oa`>q;x0e^GmbF0G(7gxu0KILV}xtp%*9)1EA0c0RVhMWmfKUWrsY+A->Z~`z=iQU3*md7 zQia$`5JDyip&$RT!-K|tGi)9U72(jX?df*!i zv;cMEhW6pxc!sywS~N3qVnD|#z`4bvfptrx>v%|`@x-ywdch~m79O;y zc|x+QnM=-VPD!5AJT2MLoRwVAEF{lsRz0PFG3=98g>2*u8%cKau%7JGGsrWCc43#L zVUux1uGvMyE9|i;xM$ov8YQF+kIXTzC{C~RFZ6Oq+OF9_Ev2-Y&1nznwo7;5)OL+e p3J-SC6b2zBWf<5zS;MLqBZT1o6{vzwDSdaNL}y{#ow6hzUWc#C-QP-Wpk z?Ww)@Ch=JMC+NY0ry8{4MT$LFkj{%Uum_UfT$3?`sPm!uh53`T_tQ7FQ-@ zcg{=xs|THyT-Wz~&dXlO$3D%~3R#@iz9iG|C%wIOfj8QTp(jiLrZfDZziIX)A|3lW z4E7Pz9S+;WbKSykNssL{TgirIh72GB40f8YQ_IYGz?!%LXnybfn|O9gRN#eJ`8K=X zPVqS7G=55jPPyb1ls+tYyy{%$P=3GU6qHW+oCJv{GBObhN))l{o;So00Hd*kjO6rw z12MffrVqw+E;)T?D5k3%(#e#9GC}$XU{^LZ8}~?aDg4h0wNP!SMp>j51NbX@D;}=Z z9k3(pPdHe#3X&~b1@njs1g`L_6_^J7xB@%avI2I9POhp&X?&NPWEZ%ftK#o&1J805 xt&+iBdy={M)~>QS+_$TCL^nl{V>}h~C0^TOW@NN=SjBu#V1Ab4>|)-^{{#6|a4`S? delta 522 zcmaE&_fKbnbiI+OiHVV+fr0`M0Rb|ppkQKT1Qu0LNZ?{%U=U(pV0=Xl9AA-NS{z?o zS)9Cao2&=mc4Ghf8%oG$%jSMU%n=lzLMF>nzW17c!Z8A6W z<;ky@gEm{SOk$p#z{E0%!({RvcCpP~99c}8&v3;vZg%GR$-;PbvaO&v?^U2*KtK(M zikLGln*3M9p6LMJWIIti#tV~cMeUhBFizelYR8npKlvX}OkuLE vm_1{_(d|Kt$pvvx=KDo#3BrC$0tnfpK(3 diff --git a/xous-rs/bin/riscv64imac-unknown-none-elf.a b/xous-rs/bin/riscv64imac-unknown-none-elf.a index e9d7fb9f3a008f4b8c650f2b59fbb117a044e502..8b8a03a7d7d41cfb941250959f4803031e3a00db 100644 GIT binary patch delta 856 zcmb_a&r2IY6n?WCo82f);$~e-!Ho4+L>o6{vzwDSdaNL}y{#ow6hzUWc#C-QP-Wpk z?Ww)@Ch=JMC+NY0ry8{4MT$LFkj{%Uum_UfT$3?`sPm!uh53`T_tQ7FQ-@ zcg{=xs|THyT-Wz~&dXlO$3D%~3R#@iz9iG|C%wIOfj8QTp(jiLrZfDZziIX)A|3lW z4E7Pz9S+;WbKSykNssL{TgirIh72GB40f8YQ_IYGz?!%LXnybfn|O9gRN#eJ`8K=X zPVqS7G=55jPPyb1ls+tYyy{%$P=3GU6qHW+oCJv{GBObhN))l{o;So00Hd*kjO6rw z12MffrVqw+E;)T?D5k3%(#e#9GC}$XU{^LZ8}~?aDg4h0wNP!SMp>j51NbX@D;}=Z z9k3(pPdHe#3X&~b1@njs1g`L_6_^J7xB@%avI2I9POhp&X?&NPWEZ%ftK#o&1J805 xt&+iBdy={M)~>QS+_$TCL^nl{V>}h~C0^TOW@NN=SjBu#V1Ab4>|)-^{{#6|a4`S? delta 522 zcmaE&_fKbnbiI+OiHVV+fr0`M0Rb|ppkQKT1Qu0LNZ?{%U=U(pV0=Xl9AA-NS{z?o zS)9Cao2&=mc4Ghf8%oG$%jSMU%n=lzLMF>nzW17c!Z8A6W z<;ky@gEm{SOk$p#z{E0%!({RvcCpP~99c}8&v3;vZg%GR$-;PbvaO&v?^U2*KtK(M zikLGln*3M9p6LMJWIIti#tV~cMeUhBFizelYR8npKlvX}OkuLE vm_1{_(d|Kt$pvvx=KDo#3BrC$0tnfpK(3 diff --git a/xous-rs/src/arch/native.rs b/xous-rs/src/arch/native.rs index 3dc1f1d1c..d97ee8971 100644 --- a/xous-rs/src/arch/native.rs +++ b/xous-rs/src/arch/native.rs @@ -379,3 +379,11 @@ pub fn wait_process(_joiner: ProcessHandle) -> crate::SysCallResult { crate::wait_event(); } } + +extern "C" { + fn riscv_cache_flush(); +} + +pub fn cache_flush() { + unsafe { riscv_cache_flush() }; +} diff --git a/xous-rs/src/asm.S b/xous-rs/src/asm.S index 75e434c87..1114e244c 100644 --- a/xous-rs/src/asm.S +++ b/xous-rs/src/asm.S @@ -98,3 +98,8 @@ vex_aes_dec_id_last_2: vex_aes_dec_id_last_3: .word 0x36b5050b // vex_aes_dec_id_last a0, a1, a0, #3 ret + +.global riscv_cache_flush +riscv_cache_flush: + fence + ret