lkml.org 
[lkml]   [2013]   [Nov]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: linux-next: Tree for Nov 1 (xen_swiotllb)
    On Fri, 1 Nov 2013, Konrad Rzeszutek Wilk wrote:
    > On Fri, Nov 01, 2013 at 11:16:26AM -0700, Randy Dunlap wrote:
    > > On 11/01/13 01:11, Stephen Rothwell wrote:
    > > > Hi all,
    > > >
    > > > Changes since 20131031:
    > > >
    > > > The squashfs tree gained a build failure so I used the version from
    > > > next-20131031.
    > > >
    > > > The block tree gained conflicts against the f2fs, aio-direct and Linus'
    > > > trees and a build failure and generated several warnings so I used the
    > > > version from next-20131031.
    > > >
    > > > The dt-rh tree gained a conflict against the powerpc tree.
    > > >
    > > > The kvm-ppc tree gained a conflict against the powerpc tree.
    > > >
    > > > The leds tree gained a conflict against the powerpc tree.
    > > >
    > > > The tty tree lost its build failure.
    > >
    > >
    > > on x86_64, when CONFIG_PCI is not enabled:
    > >
    > > arch/x86/built-in.o: In function `pci_xen_swiotlb_init_late':
    > > (.text+0x102cc): undefined reference to `pci_request_acs'
    > > arch/x86/built-in.o: In function `pci_xen_swiotlb_init':
    > > (.init.text+0x3f6c): undefined reference to `pci_request_acs'
    >
    > Stefano,
    >
    > Please fix that. I think it is commit 83862ccfc0a03212fde43b4ac29c28381828768b
    > Author: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
    > Date: Thu Oct 10 13:40:44 2013 +0000
    >
    > xen/arm,arm64: enable SWIOTLB_XEN
    >
    > that is causing this. Is it safe to add:
    >
    > depends on PCI
    >
    > back on it?

    On ARM it is possible to use the swiotlb without PCI support.
    Ideally we wouldn't even build arch/x86/xen/pci-swiotlb-xen.c if
    CONFIG_PCI was missing. However other core x86 kernel stuff seem to have
    similar issues, for example arch/x86/kernel/pci-swiotlb.c build with or
    without CONFIG_PCI and references pci_xen_swiotlb_detect.
    I think that the right solution would be to completely disentangle
    CONFIG_PCI from swiotlb related stuff, but for the moment I went for the
    easy fix:


    commit 1e6d541cc26683d0f347e1cedfee1bc57e3f8875
    Author: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
    Date: Mon Nov 4 18:11:54 2013 +0000

    pci-swiotlb-xen: call pci_request_acs only ifdef CONFIG_PCI

    Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

    diff --git a/arch/x86/xen/pci-swiotlb-xen.c b/arch/x86/xen/pci-swiotlb-xen.c
    index 9695704..0e98e5d 100644
    --- a/arch/x86/xen/pci-swiotlb-xen.c
    +++ b/arch/x86/xen/pci-swiotlb-xen.c
    @@ -75,8 +75,10 @@ void __init pci_xen_swiotlb_init(void)
    xen_swiotlb_init(1, true /* early */);
    dma_ops = &xen_swiotlb_dma_ops;

    +#ifdef CONFIG_PCI
    /* Make sure ACS will be enabled */
    pci_request_acs();
    +#endif
    }
    }

    @@ -92,8 +94,10 @@ int pci_xen_swiotlb_init_late(void)
    return rc;

    dma_ops = &xen_swiotlb_dma_ops;
    +#ifdef CONFIG_PCI
    /* Make sure ACS will be enabled */
    pci_request_acs();
    +#endif

    return 0;
    }

    \
     
     \ /
      Last update: 2013-11-04 19:41    [W:2.824 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site