From b52b73ddfa22e62b8c7d756617fe0bbd0705b149 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sat, 19 Mar 2022 16:56:03 +0800 Subject: [PATCH] add functionality to override the CSR data in case it is corrupted --- tools/csr_data_0.9.5.bin | Bin 0 -> 32768 bytes tools/csr_data_0.9.6.bin | Bin 0 -> 32768 bytes tools/csr_data_0.9.7.bin | Bin 0 -> 32768 bytes tools/usb_update.py | 15 ++++++++++++--- 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 tools/csr_data_0.9.5.bin create mode 100644 tools/csr_data_0.9.6.bin create mode 100644 tools/csr_data_0.9.7.bin diff --git a/tools/csr_data_0.9.5.bin b/tools/csr_data_0.9.5.bin new file mode 100644 index 0000000000000000000000000000000000000000..58f40c876f748183a2b9c86ae4846d1a0d6c4598 GIT binary patch literal 32768 zcmeHOJFo0W5ncq*)n*$Zk|S1vT`~7E_Poy7fLB7oBPGJ}*gfZZ&x}3To;l|T35ke} zh!B5(oR<)+AmUGuYzRL9l7#?i`KsOB?rxVoBeY?U?v?IUe^p)mRaHN#+n@c$8*jY* z@>Bl3c>Cs?r?z@|FG^9Tt;lb-&o|#K@ZXzvL@d_XCVuzkOE=#sTJeLMch>98cD;zj zyEj#N6VK!5Wi)>o-`&jP_g2w+tNDvh-@dG=lWp3FSuM6z)z0QmyLtDU&0d(swm67- zt{Nk>+l^U$uUcZS<^EVys%hahozhx&w(^>?s%)ygP=Xt;H9Z~^OZd)fF3O$mGWD98 zIz1%fNq4*Tnh)Zz&vMmk<~3&3LAB&wOA%+PMR+aSR-8rIHmaF;wP`zurYW|1oJ1QU56aOrj29E-B5lcw6WNl_}cBHu|JN~u_T zDjvl1wn}S7X5_mN%|-dX$h7WTPrMOAi~8<`Xsull`3_D`xsJEU_ikI4_sN5(OR-l* z`!1GO_kEvckyGc7>a%8=24W9 z^E+!|-@T8!LbdqLEpkL;u`5KKAl?3tw-E@E`$P$E+&`Be$k7o6woEv;} zn&&F22)CS#0<+`ES9{B#yJ;ucSEd*XaZZ{xZBIIh zfzHU#${oK}dQOg_%nKbRP#(?4#|7o0OwANPXwG8HugT$%9g@60I;_d47?R=O_f__w zvuO?i*@0)hBTx%NHsBmJ4*apk(xs>bUXtSlhl9`S{Mo=ea;B_FO+dw0kdvov^4M#? zXguL{z(POgSz5x9>eL=jIt6614Oy4KqI7T^*%Fu6#aXikeVn06UyBG)BLZ;LLQK@h zO3iHZg^D_lSgDbg&PLCHgybTwvr%kMdSM4{)W%b@&5OngV}Q9ZkV^f0S|BEwe9~Aq zn*biQ*3TtiIg4rdN&VD5DNg0oH*}_iwNJa#UULc{=S`(g9FDCHYanIM9{UpM48-`NXo^a2T2g+7H>x2538TB?&C75bj8jpq zml^1uG&?V9GuHt-YW8uTw!5l6B>Er598CEm6l!SFruDtqbfz?y4<+<@E0Tc= z=0Hp8y$zH?`w0g$M}CiX(=FrEt%p0w2J{3Qxj0+Z0$?Z12G-d^1I?KYf)leW%ahlT zU&7RS=>~?QmM{p2wl>=#06Fsr=okjvm|;HkIiG)|axl#S%Q3024(Wh$mZHRv=ulC? zD$k!of(Ypj9zd>l0=7?j_5og|%>wI>3%u==%oH zF*^so5o-JCB^;Rmtm7L%IU;qDhw#qmWD#IE0oiyrKOu0b1IHlXIZAX{3ALLpR_Msg z9YPHdr<)$hdBh;?0g_tTzc<5baNHX}Q05feBYO(~ow6WyIHsByXM!n>xw#OHoR@nz z9pe=h@~Avqb9(Hd*$Z)W7Aoo>qlL-~r(Vbl5(uy<;0QQTLK2+U9SJ*3NI<58XH!=m z^avU`+A1s-tJ6Uw7D>P_nei&T3zWoov7&%ZSm`6_I8?i68_=$=0iSRk;EtmgIL$LzCV5B(1>fP? z(E+plgPUWhAaWVmp&!!+aXO+(c&an)76@<=+6km6Tb_&dIibrCm1+>+ChSh2Ne{<8 z3TmLHE-GCXUh+#!Cvq;fy=r#t?Qp(#pp=_U4A^xJ(42D&+VRbDB&gg{yT68XMfc$v z;#KGeTMm-rmJ&wJu~Jtq{LuHTq?-ZfVu0g8_0?_7m80b~!7%U?G#C5ynI>=3meUrz-`@22hB~z zHhSftFWJ3z(3kAq*l4zFYg=;bpeOD2BX^^MYmCD|>_UJ`3}cQTy&Hb11irhM9K@Hr zp=4$*TvR6hZRK#&2)($p^fE$Ll7=c37Ub!v1i%sYNGaX#^w(~5CCcTc(n?^;GnEG; zMJIWUI#`QF3MvNdu8t$c6oYow9e_EbJ8=D!WUaol1(I{LL0W^`@<((7rG-ZE04T?B z2W{Q{+137g5=hSJ zUYACrk#dyXkDuteBsI~~AlF9=xiDhvMrS|> zT;+~!!Od7>V*S__+?K!=gMH+$eQ_vSON^U!$HaO{mfV4KOsuD5DaSS)>&D2XVRCsX z8oRO0v7Xd=LCNRK>xMQ@cG%9oHl3~H&?bV!bXJ{8i^81E|Wv#t&KHpv%rz^Wp zyG?W9(qEOT+Yc)DXGk(ZP-y zGM79F8D~eG&vQAD2@+AA!5`zW{8Ii|$7pE3Hn{T=B$+bQ%GFW!|003W5OGi9qE zxk5Etm697biN%w@^)6N4<&NqWm3pZU z#a*p)0;&%mfQ}}Vh4vJMi{5l9mK`&|sP+wOB& zDs3mc^?;WIMrQ&e(7)gXzT4qX4#7O(CHQ6gaj@2Jcu8P%BIxbuAMug^7ct%IeCHAj zx98jprjX7p1fZPR25Mg_0LxjdusJ^bY0Lo?SoTs>eoByZSRLFuDp3t9i;i9$SioM? zs}Be}%7hDg^=<*!i+Xh?>?l+(=v}L<0rsNajlm*>M)e+=`(%%=En0m}+fh7>!u`c_ zH)l_0isZq%3HXGs{UsAQb?pm|F(*>a-%X@yEg+yF}toPu)I0#krT$!j!Z9Buz8mZSNby}^vgvJA?-_c`sj!o4&lfHYLi1SZWQ_xC7g`xfEjsW zV$iPzLUt?k9R+>b#13m$B<9UVEWdIZG6XkD^k<*L($kl4T zvs?Q|aeY4yHR`jyzSS9m+_rb0j9NWJj%y@FT|)F~B8N%&(M{h-1I453s>UNId~J!< zp!=eg?wIK}Td!7&^{l8oluorIS084H-Hvv#cuc=q&*V&ydm{R^J62ViBI!4a)|<^H zhJ~y|_Zl2{y6&alEMBZo85~#x5A9Ihpp6!-C-j>|i)9=^`7N(o<_GX}DyH9zQ>(wD zC6HXG7*H4RohI2idXDCscxWX)UTS z_$2%S1A&3SKwuy+5Euvy1O@^Ffq}q4U?4CM7zhjm1_A?tfxtjuATSUZ2n+-U0t118 zz(8OiFc26B3)*t^BfBn^4e>lAQ@N<9r z?dKovKl;jlKlsTH|MRLY8{^{Ev{SQEB Bw3Pq= literal 0 HcmV?d00001 diff --git a/tools/csr_data_0.9.6.bin b/tools/csr_data_0.9.6.bin new file mode 100644 index 0000000000000000000000000000000000000000..841e75ecd55cd6f453c76382a88ef5d96329eff7 GIT binary patch literal 32768 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 DGC`Cr literal 0 HcmV?d00001 diff --git a/tools/csr_data_0.9.7.bin b/tools/csr_data_0.9.7.bin new file mode 100644 index 0000000000000000000000000000000000000000..0687dd649dd64bb4db6bfbfd81a57a7e82214396 GIT binary patch literal 32768 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 JU;g_0{{yTkmIeR- literal 0 HcmV?d00001 diff --git a/tools/usb_update.py b/tools/usb_update.py index 1ce109493..d3af734c7 100755 --- a/tools/usb_update.py +++ b/tools/usb_update.py @@ -197,10 +197,16 @@ class PrecursorUsb: self.spinor_command_value(exec=1, lock_reads=1, cmd_code=self.PP4B, has_arg=1, data_words=(data_bytes//2)) ) - def load_csrs(self): + def load_csrs(self, fname=None): LOC_CSRCSV = 0x20277000 # this address shouldn't change because it's how we figure out our version number + # CSR extraction: + # dd if=soc_csr.bin of=csr_data_0.9.6.bin skip=2524 count=32 bs=1024 + if fname == None: + csr_data = self.burst_read(LOC_CSRCSV, 0x8000) + else: + with open(fname, "rb") as f: + csr_data = f.read(0x8000) - csr_data = self.burst_read(LOC_CSRCSV, 0x8000) hasher = hashlib.sha512() hasher.update(csr_data[:0x7FC0]) digest = hasher.digest() @@ -452,6 +458,9 @@ def main(): parser.add_argument( "--factory-new", help="reset the entire image to mimic exactly what comes out of the factory, including temp files for testing. Warning: this will take a long time.", action="store_true" ) + parser.add_argument( + "--override-csr", required=False, help="CSR file to use instead of CSR values stored with the image. Used to recover in case of partial update of soc_csr.bin", type=str, + ) args = parser.parse_args() if not len(sys.argv) > 1: @@ -494,7 +503,7 @@ def main(): # print("match") exit(0) - pc_usb.load_csrs() # prime the CSR values + pc_usb.load_csrs(args.override_csr) # prime the CSR values if "v0.8" in pc_usb.gitrev: locs = { "LOC_SOC" : [0x0000_0000, "soc_csr.bin"],