From c612beb4e257196c3074751ee6af79957a7dc2b8 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Tue, 19 Oct 2021 16:18:28 -0300 Subject: [PATCH] ACPI: Add revision number display and tweak SMI trap display --- acpi/ACPI.EXE | Bin 24558 -> 24716 bytes acpi/acpi.c | 34 +++++++++++++++++----------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/acpi/ACPI.EXE b/acpi/ACPI.EXE index 908749f3961a895db9c9a00cd280b407286b05aa..4524574b0d814e418a7e516a2a41084d6808f0b3 100644 GIT binary patch delta 4270 zcmZ`-3sh9sx!&h7=QS{Z(NWM0BkK4d)tPAUF)|XxfuJ!H5JYm-uB5t}l*LVOMq{cl zWI|+f26D;HwVKt|;IvJvZC4Cg=>fcoi~%+ADsY#jl3Tgam@|$K3SBrt7IXhIh&Jge zEcV|2_ka7}|Ni#tEbg45{HLj<&zAU+4RMG?$51r7h(iKGUIRjAH2%{H?VJRJo=8L} zAqkVo)&4`gnSgy7=Q|@c?*RI+ToeKNhr+OP#N5y|hZIuNr-uZWQUwy^lhZC8OpQ7*MX z^C+p%+7B(d&N&DPf33W@xT zSwDFfm@FOIK{d-0N2EIbnLZe1Z8V`%CvnqZt0 zCe*tdlg_Ax9+wW3OF?Q+C0|_de9@*t{I%~Er_N#2GN!uC&2>1(P&h911~uj!^Hz+R zcb3*V$E??JN3%hjOuMyBy}+ZLmYh_SO)U_-~iJjjz(`W*ElEs}>6(etZJ=V;} zUh||Y4007U3kU~eJ!Hmuz0#$8470D~eP@Igh%}%M-4B#d&Rs617-JAIzvU4DO)unJq zy~P$66v5(L?%@7QWIDK0B5FAyDv3xvB7D#;*6_8apja~l(%Pz>JQ}GjY_Z0rkAT-0 z6kATri_zTzaDp&j^?f$q)~&qAsc#FA0F6SJjSclCxhO2AHV{U9ii_x|4(>j2h-u3r zIvSd~#8Iy!qC=jzf+9s=U8ccf6!Q4*jX50_q_oR|pzvh&wjvXJ`VYYdYl$>4OOQ zJnl`i-#DTR+RyBKEd9*AUOVUJcXR$rc5X!HrhVi~4nt~O31@c4+s@&$Vnzvh+2CBaM^}HkwOH>9CU~z6Sg^^>Tl}Unp80Ydsqd1n z0lJHqd%A9p|606`avpgyWdn`;ZRuz2UFG^#3Mq|b#E>GE^70j?*V0%<9#1gMhv@AV z*#SYZqYff-@9=Ks>7idOXghlJxlgPYW?GKC%3EqIuaO@mY%gx${T$)tFXhjU?B> z13ZSF&BgjtCxrBiPqqym^*Q#z$kP;KQeYqNH&pV0DyV#Xpc<09B1wsq^IQ z)YDMbPTK*<-=-acQcg~W^4G~(P~J$^mII75pl@8SSErDdW@~cza)2O`nrepIIfzB4lc3VYE+B*}{ zHVxRaSgM!UG8XDy=R3LA$&WHDQmzy%z`@$XApLt8ne#Q#r_{~>*#YrhqpJJdoOdsU z+<)~sG~b*F9~sF=jm1xlA==VemWHXfnl@PEUTirfhhXq5ok8e^~RTVNtlGgYvu zkUNSmg?|rs2S9~#Mn1W?!Y*k^d8TO5$Ygt-Ar5Yde7zl#+bJ}C-RGfS2+BOH zKkil6jD>H4_QN^6*{#7jf@&e}t=vR)lUpmlg7RYKX($^UHPi``vMP7MFTb6V9-pvLJ;XvDECdqOm!j$?Y+#3AYui?`IjDVqH~lhe15JaBcUEtn4r_F#pmDvn z7L##M-Zn|*sa_q8>|7~%am`cId*tAnwD|`#zvy$6@?#!|1j`*NkJdTI)PqrQ49Hu@ z7*i>4H zaP};!h@`AtRe3#} zjIVF|B=5q^u^>b}y8*hpC7Ty$b&>Hl9 zGqyaqkMVZWa>il-_ttas1z*Sdu6_$=)a)z)jKCr=WyR?v7|ig%=XH%&A0yzl*Agf(;n#x+d@cRwo}ebJ!Gttie8<%>{AD!mDv{v+)xL0WM+bL^r_}B-Y*a-Vz6^{5P{9rvgbJcglH{T| zY@7_00UM1_CE|=5qG+53O$i(Bh}dX|aZD)^HYQ5sWX?uzTt6}`_va6qO)a?+H9cEG zev?<{^o*gY$C<;&Derqv>mtIy06EfR9;I=F0!B<7VYTOw7rRc=sFiYA+_Pg8wm ziYLqGSRzH;acZ4*GGfPZ0elRe`YkJG*ag{O6UdP~%c4I#G<_ZWObzwD`g23SaqE)L z`Ti13tv=`ORz!5__(Kx8mzTytcO!I9U6%=W+?I87CV(0MP63cY`q%M^cGw#>!53U= zky9CyU1++uE|sE}NM!oj1x>4;^-EMHp-QF@&*mw7_V!&itNFY3li#x!Kd^TeUyJpe zPbxPjK5QA7alVEcm~rlk`10+$Uf%igzn7WkSf4B=D@ttNLtgnOB}ss`nQGT{MI;9xGlwSLyY}LVd}D}%Z8T^lYQHA7Q7-LGX?)^D2WFbb#@k%<~?(@ Q@^={;azBO?%|qz_0a1~_od5s; delta 4189 zcmY*d4^&e}x}SS1DRxxhdL+w9l-(GOfni?01U0cy}S}NP>skOZr|1J2C8a8>~4Wg&y zWM;na`^`7={buHyA75PgLDttcXV(dIQB`**p>vT4+GXj3)k`hjs+Mmy!?) zB_p(NIYRpd_uhOHJD#w2U0&+X^<70ssveUnMr}c5D<-`zITN{*FBA5@mc@37d(RZ7 zM?{xg0J_ZyzEircX8=AbRg3|=N*s0GHSg`urfZqBv;zQp4q*B?Z1V%J5rIlfae4vR z{{;4fU8k)EuJDWeBD*ivXLVfuDiF+hGQgT6zF+#n@qt>rUPnSWB4gD20)QzuA_GC0fp8l;TO$Ga_qt;lt{2BBx zPWBiGp8*^{#gp3*DYANI$8i%=bIF3nrCj6h`^Mw8;Lvzv0zbVW;<9?Cd=HcE@KsXc+Y#{`qMggL_QL^Jv@KfBHp^<38I;&?)=F~ub27`IygK;SQviy4xw}QyZ z3>s>RxMUqt=F?vaS&WYE6Vj(%)jnXEcacw(muZi%hk1&w79Xk4)vk%tZ*0EM;=F25 z+6w+ha^8UbT@{jNAw~CnvqO2YKyuy+Uv$YlQm%8AP+lQ-0~-k(ti+)X zt@Z2bs`x1dMtU@r6%!lHZ|R^{@Qy^s_cYJxem&(c>^%(I^!KI@Ros}a(U1Y!i9M=Q zRg(V1lpitoRZ^X(YBwajF|`d%YT2e-?LZ%9u_;LYwtTOaul=Oxhh4bD8bw)KPKI=wHHvep`!PY-Qkn}gDY{>u{|kLGwZ26&SoUC<0z+RgOm zNv2#FS`LJ=v9vWQG}e+r4;$ya&5P$ z8B8)$a3(_s($)C?KNWwXctbu$n2ykGd_Uw z(;3fzreNm&v>lw;!~5!P&+~j~>+@INCaZ5*V`TN+(LFopzh)Kz>akR{_pehkpgfRT z3FZH#J_+UWv^;i9pu5ucGdnt`&kAXv8caXK2uR-^)hR!wZ)dFFe0q0xYA>#1Uu}88YZJBb?ct6fP+s)I$oQ2FP>dt9khlS2NIkL!(3iMrDU7Xk(lf-r| zd8~+I{B&2|JnbBzm!Cu5$+PJ0;!rsW`40l|m+}g7Rm!LNX94M;@m^*c2i?4PCxhHy z`W&h)d(uXo`RQ^0$#IRkaJBhiSmWwNUog|}3f(cJX1VCMWPqHE8Se@)Dg zuXCJ7;kQU0D@u7$A$;5xROqUH}yZ->ck6WdwQUaYG%s0$>eFvE+_)((ab zNX5DUOZ)95%wOotC0Ptl9ZMDi$1g51m-?|Z3+OZ2OISBYz6}3M5(wAcjEM=p0;KzL z30jSV9u_ChDQIdJcq1+kcgzqLyphb>S;rn~IVR2;d~j47cpXl~QS6JvJhP6&WrL>L&e{6bQcFov{ZZ_7tOSAu zpW}7R?Gk(WBUpqelsnM}qi=$-1K02nyhzu09c7THN_%*yl;5$6IoAFvmW&gV4Jeox zuVP=w6^}?tZyK|HT^9H)wg!pu7Mu$lxPjXbU~8M*Jwwfd}M?Do)C~E=Y#U0v#^1 z%&)mG`g(Sm_O=e_`$k@MYiIWPK98k0_PNi=7@c_fK8TjA%;cfF5xPIWvVeJxzPU1c zQZWFEt)NJy)>T6Cb=Vv5uTCi6BBg6g*M-iKRp|`-4W_?XKBx2LCz^G%p>iH;HOH&R z)XECqblP9}In>i=aDCRjI+Kl?RaGXtKt-y}lw{}go-O}rcCA=ZxzN0HnQH|-RAr;> zRhhJK11~Jfo7Bw)*>F#<74se#9`1a91Iw}f9L?A`k3L(IKu2m)4Q)971Hec5ALVx} o?x1O#O6JTGk(q&?1`LT{Vs_4k()@!*)N*5> 4) & 0x0f, + printf(" PCS1 = %04X+%X Decode[%c] IntIO[%c] Trap[%c]\n", pci_readw(0, dev, 0, 0x7a), (mask >> 4) & 0x0f, (status & 0x0020) ? '√' : ' ', (status & 0x2000) ? '√' : ' ', (glben & 0x8000) ? '√' : ' '); } else { status = pci_readw(0, dev, 0, 0x8b); - printf("SMI traps: PCS0 %04X+%X Decode[%c] IntIO[%c] Trap[%c]\n", pci_readw(0, dev, 0, 0x78), mask & 0x0f, + printf("SMI traps: PCS0 = %04X+%X Decode[%c] IntIO[%c] Trap[%c]\n", pci_readw(0, dev, 0, 0x78), mask & 0x0f, (status & 0x0100) ? '√' : ' ', (status & 0x1000) ? '√' : ' ', (glben & 0x4000) ? '√' : ' '); - printf(" PCS1 %04X+%X Decode[%c] IntIO[%c] Trap[%c]\n", pci_readw(0, dev, 0, 0x7a), (mask >> 4) & 0x0f, + printf(" PCS1 = %04X+%X Decode[%c] IntIO[%c] Trap[%c]\n", pci_readw(0, dev, 0, 0x7a), (mask >> 4) & 0x0f, (status & 0x0200) ? '√' : ' ', (status & 0x2000) ? '√' : ' ', (glben & 0x8000) ? '√' : ' '); mask = pci_readb(0, dev, 0, 0x8a); glben = inw(acpi_base + 0x42); /* extended I/O trap */ - printf(" PCS2 %04X+%X Decode[%c] IntIO[%c] Trap[%c]\n", pci_readw(0, dev, 0, 0x8c), mask & 0x0f, + printf(" PCS2 = %04X+%X Decode[%c] IntIO[%c] Trap[%c]\n", pci_readw(0, dev, 0, 0x8c), mask & 0x0f, (status & 0x0400) ? '√' : ' ', (status & 0x4000) ? '√' : ' ', (glben & 0x0001) ? '√' : ' '); - printf(" PCS3 %04X+%X Decode[%c] IntIO[%c] Trap[%c]\n", pci_readw(0, dev, 0, 0x8e), (mask >> 4) & 0x0f, + printf(" PCS3 = %04X+%X Decode[%c] IntIO[%c] Trap[%c]\n", pci_readw(0, dev, 0, 0x8e), (mask >> 4) & 0x0f, (status & 0x0800) ? '√' : ' ', (status & 0x8000) ? '√' : ' ', (glben & 0x0002) ? '√' : ' '); } } @@ -153,29 +153,29 @@ main(int argc, char **argv) continue; /* Determine and execute southbridge-specific function. */ - ven_id = pci_readw(0, dev, 3, 0); - dev_id = pci_readw(0, dev, 3, 2); + ven_id = pci_readw(0, dev, 3, 0x00); + dev_id = pci_readw(0, dev, 3, 0x02); if ((ven_id == 0x8086) && (dev_id == 0x7113)) { - printf("Found PIIX4 ACPI at device %02X function %d\n", dev, 3); + printf("Found PIIX4 ACPI revision %02X at device %02X function %d\n", pci_readb(0, dev, 3, 0x08), dev, 3); probe_intel(dev, 3); return 0; } else if ((ven_id == 0x1055) && (dev_id == 0x9463)) { - printf("Found SLC90E66 ACPI at device %02X function %d\n", dev, 3); + printf("Found SLC90E66 ACPI revision %02X at device %02X function %d\n", pci_readb(0, dev, 3, 0x08), dev, 3); probe_intel(dev, 3); return 0; } else if ((ven_id == 0x1106) && (dev_id == 0x3040)) { - printf("Found VT82C586 ACPI at device %02X function %d\n", dev, 3); + printf("Found VT82C586 ACPI revision %02X at device %02X function %d\n", pci_readb(0, dev, 3, 0x08), dev, 3); probe_via(dev, 3, dev_id); return 0; } else if ((ven_id == 0x1106) && (dev_id == 0x3050)) { - printf("Found VT82C596 ACPI at device %02X function %d\n", dev, 3); + printf("Found VT82C596 ACPI revision %02X at device %02X function %d\n", pci_readb(0, dev, 3, 0x08), dev, 3); probe_via(dev, 3, dev_id); return 0; } else { ven_id = pci_readw(0, dev, 4, 0); dev_id = pci_readw(0, dev, 4, 2); if ((ven_id == 0x1106) && (dev_id == 0x3057)) { - printf("Found VT82C686 ACPI at device %02X function %d\n", dev, 4); + printf("Found VT82C686 ACPI revision %02X at device %02X function %d\n", pci_readb(0, dev, 4, 0x08), dev, 4); probe_via(dev, 4, dev_id); return 0; }