From 00070396b06392fadcee0e19d499a43b81c63c45 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Fri, 22 May 2009 09:57:32 -0500 Subject: [PATCH] bios: Use the correct mask to size the PCI option ROM BAR Bit 0 is the enable bit, which we not only don't want to set, but it will stick and make us think it's an I/O port resource. Signed-off-by: Alex Williamson Signed-off-by: Anthony Liguori --- ...rect-mask-to-size-pci-option-rom-bar.patch | 33 ++++++++++++++++++ pc-bios/bios-pq/series | 1 + pc-bios/bios.bin | Bin 131072 -> 131072 bytes 3 files changed, 34 insertions(+) create mode 100644 pc-bios/bios-pq/0016-use-correct-mask-to-size-pci-option-rom-bar.patch diff --git a/pc-bios/bios-pq/0016-use-correct-mask-to-size-pci-option-rom-bar.patch b/pc-bios/bios-pq/0016-use-correct-mask-to-size-pci-option-rom-bar.patch new file mode 100644 index 0000000000..556a0bda79 --- /dev/null +++ b/pc-bios/bios-pq/0016-use-correct-mask-to-size-pci-option-rom-bar.patch @@ -0,0 +1,33 @@ +Subject: [PATCH] bios: Use the correct mask to size the PCI option ROM BAR +From: Alex Williamson + +Bit 0 is the enable bit, which we not only don't want to set, but +it will stick and make us think it's an I/O port resource. + +Signed-off-by: Alex Williamson +Signed-off-by: Anthony Liguori +--- + +diff --git a/bios/rombios32.c b/bios/rombios32.c +index d7e18e9..f861f81 100644 +--- a/bios/rombios32.c ++++ b/bios/rombios32.c +@@ -985,11 +985,13 @@ static void pci_bios_init_device(PCIDevice *d) + int ofs; + uint32_t val, size ; + +- if (i == PCI_ROM_SLOT) ++ if (i == PCI_ROM_SLOT) { + ofs = 0x30; +- else ++ pci_config_writel(d, ofs, 0xfffffffe); ++ } else { + ofs = 0x10 + i * 4; +- pci_config_writel(d, ofs, 0xffffffff); ++ pci_config_writel(d, ofs, 0xffffffff); ++ } + val = pci_config_readl(d, ofs); + if (val != 0) { + size = (~(val & ~0xf)) + 1; + + diff --git a/pc-bios/bios-pq/series b/pc-bios/bios-pq/series index aa5a3753ed..c7c7f67e0d 100644 --- a/pc-bios/bios-pq/series +++ b/pc-bios/bios-pq/series @@ -13,3 +13,4 @@ 0013_fix-non-acpi-timer-interrupt-routing.patch 0014_add-srat-acpi-table-support.patch 0015_enable-power-button-even-generation.patch +0016-use-correct-mask-to-size-pci-option-rom-bar.patch diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin index 8aa5b713caa5e76bb3b6a101afa1996ffbfb2149..6c8bc9f6ce04633b5dabff292c07d15c2fb527e7 100644 GIT binary patch delta 1955 zcmZ8ieQZ-z6hCKex3^IGy4i*~*mt|J?{xzep?qxX6k#fXDh3fTI*B4q)2TqpTDy@w zpVh@P}&->lqIp=rI zJ(jIem3JR#1|`Fl~O+g}kH$=Pa9^l7T1yExIOsisn6N_ve|2Y$6l4FF2wZN@AE-hH_M0HW`0 zm`g7h-^cYG*NoTVu#PUIRN~82a_@0$rufu++(%`pMffhQP0hgi4rl6m#CPcQ%(2Gt zg*uR`P5Mb<=^A5h=P;-M#HK@W0OI?X0l@7XMg*92*mM;EWV>KtvQ6;YLV5s@ljVA~ zWFHF10O0lUz~tH?Dbzi#1?U|XdPnq$y|OLj?gs#uISc@ay^Ye*U?*dYwTFXIpma3Y z9=_Dv`}I>_pxAT^0NNHO0Q|rg@A7!=IO~{nQ<|onyUqAXwhLGxgZ#Q$ zvJH9s=&^;=9+u#E)x+Y&=GPeq4M|sG;fx5q!}`Qt_v-#K02dD;5(^^mCS$Cwl}jLS z3ASQ1d0+ryvzBpj#$MLnrNmD$C3pZ60?2EJq!1;gXRV8<+Q+@i%OcW=pl3wY9u|G> z=~f+Fc00$my8s+>J%=7x^US)n2V1?4TyXOcRB!0p9_D%SB`_XgthKG0pZO9{_}T4L z?s*NMp^rAFFKYboJY#-MO9B7_z$78hAnKzb&Fxh5^*oiE(K;$guK{@90I}&juaHf! z40MGMKv@=!%GmXf3ZR>FDf1>Q^$5@%$1Qmi76-?uxTVn;W-Rb|Br1$S&sEwPVa(%H zY9^Y+VQ@PY#-=1|ek&651kmKN3@E?eVl41{gt1uDxSeBjk~z=PSY5jSVAwLC?By^k zhsCVa;gV_9DsKAw8A;`cpLwMkIErT4P8C4DpXA!^N}w4C+WLybA9_!;fWQSd?Xn3~W? zf;lbYdVsO!9}v_g1kgfZz# zcQ(CKG*ftJ^6+(0mXIDh4AAdI)|A0vu1bUYNR5nw$1^{SorKel30jLXhWz*i0bj+onON#L~ zx>2%V_J&0|@EQck=tuybt#)#9ULIx4wJ;(!9aaG-dRkkWfi>hTEx~29x3maX(O~IS zTu;B0_2UNGVfj|qb63AyI87_d*DZMEf6;6?%~%_kalVH86Ssd5X3THXj`OQFAtCzY zXYm;lc#JNWKZu7Yzv8(W6;>UH`|t4_L~%cQdU0M~!&3K+`SfW;_T!c*7s|#{oJ|-` z(t&4!Ch<69t)3(LdDq|EDc4@~^GN`Ho3=IPk^g-rp(UpnQ@-pl%=zW#eONabS6=@8 ShCyu270Sy?%jQA&i~j)1!uQGm delta 1891 zcmYjSeNa?Y6hCJ_ALFub(PdOnK6G~lS=imA27?t8*YJZzOQuhAvZBVE(s3#KSlMmC z;rU!+I*l{xH0jjz;U6`z&I;>^gNDQBc(<-1>B^WFnu~u^o_MZjb*e^-KV-)5-!r* zK~#}Lmxj9V8r^O!I;mquG3rTc$g(H9jZkw#jA&JEBe*(U9S!9sF``wwjnGh@B1W{D z_->{c(Q0XfAup5T8p`KQVdhU^GB_rD*f0;#7;a8}QiroB#cZCD9uFZ`9*^qDX->st zT4na*Jc^kgPhG&htwJ%PT^Qe~#E8~Hj?_6BHn$OC8jA)1l%)R{b9IJ}+W-K>$a_77 z^it~kxIBD2^|lIE(e*hia4i+gy^JrBE-e>7Bxjl(x6!7wOk5xKr9F?hm9D1u*LE#4 zg0#|NnshAPW-Q?A0X2YFH;4e@`+opHz}JHaFd49Jg$h8f5?ps=j}Y?=n*czbDeuxq zRo&O!jYrG$04MnpTBm2SN67w3x+Tp}O2!#K$yEXt%OJn4k!n5N!E+e&3~PepdaHPkX@0BB~6G3mlk z(}>hHBwe^s-{$>XIvwmAmM;H$^$Qg1w=%{89HbWad%i9^?HDTrx;_2%y{Yo zPdy#uNdp5A>&^VKum4rkeF`*TTmha=B5}@ggyv>sKf=^aBcXLg<5Jg9uvgtQCPo4` zN{sMVz}LUW58$02JX`e4bDKAvX$*O7aC9Z7!k2;YIAe_gpE7F)K+UgoFr#$M@jn@h zX&dwa$i+!qtZoeW`U_`ra@iB2wg5nnt5c~PV{9P#{*3y~CXO4Wt(jT1T~p{fzpGOz z=IFEIjD;e+k`e@K<_3I;MS80p8uRM{sqv3?qQT?!{lT&8H6^tNI?4e2QdPHfUb;1O68r#7V^UZ3kaSBrKh!kN zw}xuhokYD3Si|eGiV;K9ko|13rF6Qv_R-DkFU`K`b`wvuNh>Xa@&kRfV0X&?=?`&h z8Mzlek4Na^g=u((q6-y#nm)1A;e(W8ou4`TPsZxo#5#=*Amka8G?q~1aI+c!LRE?~ zN-tUu;1;@PeHqWv3%130k@nlF@Ga`M9l$<%XVH8-O9vNi!zW0Wa~r>iJT?CHYGlZWr^*}}4kLlfPxyXTDda8+tF z=gQ6KYKx|FIo75seY7@z1?p*kz5~Cd*8EJ=)0O<@hptacuKaq9F)^Zxt+Z&^v^o9~ zr>-&PYKxk*0M$b+D!NpVfjYWgkdOb+Tt`VxMX3=&WVao#n4EgXYmE7qjf-{P zsR0xx`5c*OqmLW~m`9f!b}Xb($1Pk=gU$}Dpor^hA(tqDPC|3@~cvC{mW7s|s sk^ea+p^si+Oz8+07GAnY&a$lISpAF2S#;u+U$D_8IEx(4r7(8ne?*nf-v9sr -- 2.51.0