From 00070396b06392fadcee0e19d499a43b81c63c45 Mon Sep 17 00:00:00 2001
From: Anthony Liguori <aliguori@us.ibm.com>
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 <alex.williamson@hp.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 ...e-correct-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 <alex.williamson@hp.com>
+
+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 <alex.williamson@hp.com>
+Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
+---
+
+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
zcwSvpeN0nV6o0oAe1u91wvnMwC~f&FEd|{~#1EisPT4eyx+r5TTSumI%oLp(q+Ma*
z*>#eg#YC6Qu$e^{of#zvxF8@}nf@bNR5qr-{CM?)c5X}*<n7#+udRRF-ru?B{?0kS
zbMCWRS*w-R7~9Xr&0?6AI$V;U{PkU1)beoVEJID=fa$1b(+?Vb5P1XE2MvlMa$JkV
z{}7@ALr65yx?T?17fjYbcUU$_gkVXWE-fdVsdy-D3RdC9*kkOj&66QYKvbI-fjhN-
z7l}I!td*oHRen5w$|q*ZCzkrSzL3l(MDJ>zy(xrbLWEo%mhBJWC~Ry^gmk%rq(On)
zN|u0IzD|)#Zx#@|ndje$aF-7TMO177Vz*c=W*CMKeI^LT9%rK#0V8eth*=14D-MuS
z*RWz(M9gqMDwk{p{d3ny4TMA|lSW97){#%3I9f@{U6s+LgzSf#^KMm*EDdM4e6?(n
zm>U)ZTV+2JgtXONB3us)p&d<xFwA7Y>PHA1MXXV9m{_;TCqttn(ortviuybb1kNVv
z=P2yse61rAhUw^MI|gK-9S)Pv){Q4t%^0qs9aY>#Z?k~EhB2?-5pl!V!<u$W4%cZP
z^l?`o-#A93)uZTLza0B{hAz(4AvAFO749h)#@|IP5Meqb)4@1)h&fZA-A(K!pV%(U
zvb=8>LZmf21nShs{TWDSfbHnVbZnct(=i#E#CRYH&o2Bo*HH;rTIgQlFP;$))JOy>
z&aJJo8A|*VP=Y2fA%LS8tA>c!_>%FUh7srL^l|RG*FF%`FeYuX&Bi7UA;-s7hOsQP
zcP-lddP(uQI;Ta;*k}qtJ7x7R(K_kk89`HBeLlr>@$eMeD)~7dFib@!?2cVl_4z$P
za0l1oDJH^964DC%F)CuvT~<yred_NcAAxtBI}zWb9Wt@To)#Zo<yVdQWo-EyTi;5#
z_^b&_Iigk(wIohhEYv56TB;Oi@_ak)7e+3lDjh;#ujC6RB(lgcs31&BR`cO_fQ4bI
zt;Qby=TT&M3vGd+L7oMX)NSRnNjIh+-A+)q9O@R}!4PvTvMT&j1ujZ!;--kLlz1<_
zA(<k^le4t>v|Ht3M<nOtu1wCQt$R70gQ7m}BKOpLhC$^T#<=TdFHRUv<T%}$jl#sJ
zdp2Ndbw%9mjT>AG<1z?231#tHX6G-PexTdnO8jy8m(x#Hdb%Co8Oxu7PgVOOzMnqu
zTjL-mp_H^kRYElR1`a3iWHH#))kFcTCPw+#BM3F^(rR%Cs%Uz^iPg?RUo+L;S;X_b
zkgqvNa^W}4JLDGRX;a93*sd)iuR)jgAnAn7i816T>`vT9UVuA^!{m49OEQyRAuqW^
zx#u=EZj_Er#h|nBL30&NNTNnsjKFV!j^u)<JD97Z@OteE`cb+|KT0d;M~Mezijmxd
zwJCDq1#`;2xjsDO)~nfx!bq?cr;^Ww(UgtkFsw_}5DV<a^%XdRYZ9DKO%e$M;7y$;
z8XN$LPECFUqi!wx?tmcRLsh|k-8}ZiNpMmZ&&CEo4_wvdMD_MlRVu_6^5n$W-m0K-
ztWxlukeZf@-}3Eg1}ycfG$roa(wd(STRPpH);|P6+7#l>SBsTP|J#Wpc!X@SV1_Y!
zTU2mDA4{}wNuNf3fhYPUNoCk%r<~;!7Ay{{l}vID4GMyF>A1A|JT``xL9sze3ZT-U
zC#&FuK}Xg@ui+6Xh0E#Pqzn!kPldP7n3wxEVO>ValK1|X&7PZrP)}vd4yN&>AAg3=
z&25s5(5ohP7JUa@^XZfKyb41Zi%AzGXTCW%6FVVon`1vmq;16BL9#k4R@$Cq!`GRr
zHO3h_Y`a0(*#3y{DVor0INJ6LvaH9u4mk=RxapSwLrLla5ydki>hU&z+$CRd`BEb>
X_lhzyPM7tPIxU-#VMxzn#*Y09%EI@`

delta 1891
zcwSvpdrVVj6u)0-%O#YyKpWnaN2xptZ6{lByj2)JSag%Pmow_b#hFbbZ0-S+wGggd
zmFz4gXqHK~?BO3<MhQaAc&MWyE>8A`=!ina<uYKP69i@4ov$s()}-g2bH4NVo%5aZ
zna!-(%qE$-yW;#ArlS!_%KYDFI_L7`Ocz5{Vz26}v8*4HGW<vZZ1Z!A?&UbL#IuBm
zz#xqzQpZMVwS*X<FEE?<gG3gm56YD@m6M7#i3l0ffT^!xof0KKlp59rBPaH7A;?K!
zt1L|;^2pK4HZjXKvDC(KN)}Cs+|eHNl9Yr(uu2se<w;>HZFTyCQKcq9P^>bOXmF`s
zR3}i+VuGHD9!`Xu77Xg}SRKkPu~y753?J~1AeaX1tvVDKMcc>2nXp%VoD@1{)H5Pd
z4CCQz$tK8%xK8$hG%|&J2F6G|IRHB%HDrsUDsmSg`{8!fXw6`roZ;4Ml}mxS89}J6
z8fN@3taXAQJ^lykQAJQ#N@!gxVi;Q)Ynrtcv96+NB`R$pwj*M$Y-l{UvAF;{e~uFS
zW`6-q;;(V{xj;T=QJ@k!l587e`#{Xq6b)H=iKS>-Y+3YISlcm<Wl`E;#BW7_t#rC}
zWPyg>F~mLUakD*llmWjv=VXYdAJyi7er|B8V*%xM0e{@(sg^m^aF-|Rx+}in&Rg8m
z-1UdIza@&g{ditWjr<h#U!!kx358g)1?kw!sP<JxOJ`|;QN$|<DAcK_bJgfu$`u`G
zA)XG<a(snTlyeXf8~>c(*D`0{oVAEpEF*p`3yQYd$s9TJ7sjYJV`VXxi&?L}zH`Tg
zMtg;hX<kpEP%`Gg1~t}J@u7zprt&5<#pZ8p{ZkNJk_J2_v^hS<a<m%F458rSy-n@F
z(_zy9Z(R_Cv7nU|jjEK?ZXWh);%Ww$t*vIX&ZgEEQD<-S8B>6j5r{!~kd}GWqveAU
zko{ezq8fco10B<dg%=)sLp{J*aZ+&nq)&4YC8vmLe)nlAs15#W7`_ixV=vH@Si7Z)
z535ijP4EIx)MYILG*f`5sI_((Af9y6`=^~hBDRHabKJF_VYX*P8PHSPSAb4<5!@y2
z{?s`J3u#&42Fs^#_AX7eEK*ihZkqMY>sXRwb6hqdc4&xyEl8XHWVt?pd-30?s-CQy
z;%qnW2+LoE?-Qznk3Bi?XbT`WaThraUnEA73*b!T$t&=s)=Hj+<fIr)7~Wr9x56rx
zVh4*RII-4VI^B+~VC-c)KM!vtoglm6ane3=5%%a(Nk1IZm67*hRCj{7;louisBc<z
zfNTe8@(lS27Lv=!BiNI&Q*-hzPUT}d7L{&$=|p=C1timASj@nG1S2WM;k}5}Ryx>F
zNFNjzeNYPNgK`P-Q%&SD97<J@t5Ba>9ri1paoe=4uP`Dp<HYg1Au4S<al+xWBz!`e
zkiHFFNK4>uTCzyv28BLKByxjZuO&mURlk)zI)Zz6&nbd4`Y3kalJJW@p3U<LEikLk
z4WA#TU8xlJu2T_Hw^L2qu}RIlVN?2Ae20&v8?e;QbPe*i(%YXIU-9(aydwyTHmPg9
zRxJGQCc5wlqbVf}Q$E!pf-4!ZL<-{>>Er=K7;=(J@RIE+mQz<?aagTvDW)79&3TIo
z>(6*Gyb-Dl8lr>G4H+a2t{C(r6Xp%~Ng+%a`>^&l(+~2~E9NC|7!E(RGp97~zi3Y0
z7KCQn#%u}Ar>OrFm(5iq8>Fs9tiNZSqv<-2y#w;q&yrEtuzGh`C>EvY47FS!icVtb
zA#2W8Zm6A)g7d2rwgl&`n9^G`8ao^;Uk;OU9iI<NuX4@9_nK^_6E3=xm`Zlgn^C+X
n<MZgv_c<~%uk?elAg+~^-w+wI&c1nrH0oGmmch7&SvdVKM3v9q

-- 
2.11.4.GIT