[Xen-devel] Re: [PATCH] xen: Remove hanging references to CONFIG_XEN_PLATFORM_PCI

[Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>]

On Tue, Nov 08, 2011 at 11:53:55AM -0500, Daniel De Graaf wrote:
> On 10/20/2011 06:28 AM, Stefano Stabellini wrote:
> > On Wed, 19 Oct 2011, Daniel De Graaf wrote:
> >> In 5fbdc10395cd500d6ff844825a918c4e6f38de37 the XEN_PLATFORM_PCI config
> >> option was removed, but references in header files remained. Clean up
> >> those references.
> >>
> >> Signed-off-by: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
> > 
> > Good catch, thanks!
> > 
> 
> This didn't make it into 3.2-rc1, and I don't see it on any of Konrad's
> git trees. The CONFIG_XEN_PVHVM change breaks PV-on-HVM drivers without
> this patch because the grant table is not initialized:

Yikes. Looks like I missed the patch. Thanks for testing, will queue it up.


> 
> [    3.667543] Event-channel device installed.
> [    3.669093] Serial: 8250/16550 driver, 4 ports, IRQ sharing enabled
> ...
> [    3.775482] vbd vbd-51712: 28 granting access to ring page
> [    3.777126] vbd vbd-51712: 28 xenbus_dev_probe on device/vbd/51712
> [    3.778649] vbd: probe of vbd-51712 failed with error -28
> [    3.783523] ata_piix 0000:00:01.1: version 2.13
> [    3.784001] ata_piix 0000:00:01.1: setting latency timer to 64
> [    3.785453] scsi0 : ata_piix
> [    3.786886] scsi1 : ata_piix
> [    3.788174] ata1: PATA max MWDMA2 cmd 0x1f0 ctl 0x3f6 bmdma 0xc160 irq 14
> [    3.789444] ata2: PATA max MWDMA2 cmd 0x170 ctl 0x376 bmdma 0xc168 irq 15
> [    3.790958] Fixed MDIO Bus: probed
> [    3.793015] Initialising Xen virtual ethernet driver.
> [    3.795331] #### netfront can't alloc tx grant refs
> [    3.797402] vif vif-0: 12 creating netdev
> [    3.798859] vif vif-0: 12 xenbus_dev_probe on device/vif/0
> [    3.800777] vif: probe of vif-0 failed with error -12
> 
> Versus a boot with working pv-hvm drivers:
> [    3.284850] Event-channel device installed.
> [    3.286468] xen: --> pirq=22 -> irq=28 (gsi=28)
> [    3.286471] xen-platform-pci 0000:00:03.0: PCI INT A -> GSI 28 (level, 
> low) -> IRQ 28
> [    3.288181] Grant table initialized
> [    3.289598] Serial: 8250/16550 driver, 4 ports, IRQ sharing enabled
> ...
> 
> >> ---
> >>  include/xen/platform_pci.h |    6 ++----
> >>  1 files changed, 2 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/include/xen/platform_pci.h b/include/xen/platform_pci.h
> >> index a785a3b..438c256 100644
> >> --- a/include/xen/platform_pci.h
> >> +++ b/include/xen/platform_pci.h
> >> @@ -29,8 +29,7 @@
> >>  static inline int xen_must_unplug_nics(void) {
> >>  #if (defined(CONFIG_XEN_NETDEV_FRONTEND) || \
> >>            defined(CONFIG_XEN_NETDEV_FRONTEND_MODULE)) && \
> >> -          (defined(CONFIG_XEN_PLATFORM_PCI) || \
> >> -           defined(CONFIG_XEN_PLATFORM_PCI_MODULE))
> >> +          defined(CONFIG_XEN_PVHVM)
> >>          return 1;
> >>  #else
> >>          return 0;
> >> @@ -40,8 +39,7 @@ static inline int xen_must_unplug_nics(void) {
> >>  static inline int xen_must_unplug_disks(void) {
> >>  #if (defined(CONFIG_XEN_BLKDEV_FRONTEND) || \
> >>            defined(CONFIG_XEN_BLKDEV_FRONTEND_MODULE)) && \
> >> -          (defined(CONFIG_XEN_PLATFORM_PCI) || \
> >> -           defined(CONFIG_XEN_PLATFORM_PCI_MODULE))
> >> +          defined(CONFIG_XEN_PVHVM)
> >>          return 1;
> >>  #else
> >>          return 0;
> >> -- 
> >> 1.7.6.4
> >>
> > 
> > _______________________________________________
> > Xen-devel mailing list
> > Xen-devel@xxxxxxxxxxxxxxxxxxx
> > http://lists.xensource.com/xen-devel
> > 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel