lkml.org 
[lkml]   [2010]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/13] Allow xen platform pci device to be compiled as a module
    Date
    From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

    Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
    ---
    drivers/xen/events.c | 1 +
    drivers/xen/grant-table.c | 20 +++++++++++---------
    drivers/xen/manage.c | 1 +
    drivers/xen/platform-pci.c | 3 +++
    include/xen/grant_table.h | 3 +++
    5 files changed, 19 insertions(+), 9 deletions(-)

    diff --git a/drivers/xen/events.c b/drivers/xen/events.c
    index 44fdbbb..0f7546e 100644
    --- a/drivers/xen/events.c
    +++ b/drivers/xen/events.c
    @@ -689,6 +689,7 @@ void xen_hvm_evtchn_do_upcall(void)
    {
    __xen_evtchn_do_upcall();
    }
    +EXPORT_SYMBOL_GPL(xen_hvm_evtchn_do_upcall);

    /* Rebind a new event channel to an existing irq. */
    void rebind_evtchn_irq(int evtchn, int irq)
    diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
    index 4c959a5..4a3f1b1 100644
    --- a/drivers/xen/grant-table.c
    +++ b/drivers/xen/grant-table.c
    @@ -61,7 +61,8 @@ static unsigned int boot_max_nr_grant_frames;
    static int gnttab_free_count;
    static grant_ref_t gnttab_free_head;
    static DEFINE_SPINLOCK(gnttab_list_lock);
    -static unsigned long hvm_pv_resume_frames;
    +unsigned long xen_hvm_resume_frames;
    +EXPORT_SYMBOL_GPL(xen_hvm_resume_frames);

    static struct grant_entry *shared;

    @@ -436,7 +437,7 @@ static unsigned int __max_nr_grant_frames(void)
    return query.max_nr_frames;
    }

    -static inline unsigned int max_nr_grant_frames(void)
    +unsigned int gnttab_max_grant_frames(void)
    {
    unsigned int xen_max = __max_nr_grant_frames();

    @@ -444,6 +445,7 @@ static inline unsigned int max_nr_grant_frames(void)
    return boot_max_nr_grant_frames;
    return xen_max;
    }
    +EXPORT_SYMBOL_GPL(gnttab_max_grant_frames);

    static int gnttab_map(unsigned int start_idx, unsigned int end_idx)
    {
    @@ -464,7 +466,7 @@ static int gnttab_map(unsigned int start_idx, unsigned int end_idx)
    xatp.domid = DOMID_SELF;
    xatp.idx = i;
    xatp.space = XENMAPSPACE_grant_table;
    - xatp.gpfn = (hvm_pv_resume_frames >> PAGE_SHIFT) + i;
    + xatp.gpfn = (xen_hvm_resume_frames >> PAGE_SHIFT) + i;
    rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp);
    if (rc != 0) {
    printk(KERN_WARNING
    @@ -492,7 +494,7 @@ static int gnttab_map(unsigned int start_idx, unsigned int end_idx)

    BUG_ON(rc || setup.status);

    - rc = arch_gnttab_map_shared(frames, nr_gframes, max_nr_grant_frames(),
    + rc = arch_gnttab_map_shared(frames, nr_gframes, gnttab_max_grant_frames(),
    &shared);
    BUG_ON(rc);

    @@ -505,16 +507,15 @@ int gnttab_resume(void)
    {
    unsigned int max_nr_gframes;

    - max_nr_gframes = max_nr_grant_frames();
    + max_nr_gframes = gnttab_max_grant_frames();
    if (max_nr_gframes < nr_grant_frames)
    return -ENOSYS;

    if (xen_pv_domain())
    return gnttab_map(0, nr_grant_frames - 1);

    - if (!hvm_pv_resume_frames) {
    - hvm_pv_resume_frames = alloc_xen_mmio(PAGE_SIZE * max_nr_gframes);
    - shared = ioremap(hvm_pv_resume_frames, PAGE_SIZE * max_nr_gframes);
    + if (!shared) {
    + shared = ioremap(xen_hvm_resume_frames, PAGE_SIZE * max_nr_gframes);
    if (shared == NULL) {
    printk(KERN_WARNING
    "Fail to ioremap gnttab share frames\n");
    @@ -541,7 +542,7 @@ static int gnttab_expand(unsigned int req_entries)
    cur = nr_grant_frames;
    extra = ((req_entries + (GREFS_PER_GRANT_FRAME-1)) /
    GREFS_PER_GRANT_FRAME);
    - if (cur + extra > max_nr_grant_frames())
    + if (cur + extra > gnttab_max_grant_frames())
    return -ENOSPC;

    rc = gnttab_map(cur, cur + extra - 1);
    @@ -599,6 +600,7 @@ int gnttab_init(void)
    kfree(gnttab_list);
    return -ENOMEM;
    }
    +EXPORT_SYMBOL_GPL(gnttab_init);

    static int __devinit __gnttab_init(void)
    {
    diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
    index 0716ba6..f5162e4 100644
    --- a/drivers/xen/manage.c
    +++ b/drivers/xen/manage.c
    @@ -307,5 +307,6 @@ int xen_setup_shutdown_event(void)

    return 0;
    }
    +EXPORT_SYMBOL_GPL(xen_setup_shutdown_event);

    subsys_initcall(__setup_shutdown_event);
    diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c
    index 6663201..10b92ec 100644
    --- a/drivers/xen/platform-pci.c
    +++ b/drivers/xen/platform-pci.c
    @@ -106,6 +106,7 @@ static int __devinit platform_pci_init(struct pci_dev *pdev,
    int i, ret;
    long ioaddr, iolen;
    long mmio_addr, mmio_len;
    + unsigned int max_nr_gframes;

    i = pci_enable_device(pdev);
    if (i)
    @@ -153,6 +154,8 @@ static int __devinit platform_pci_init(struct pci_dev *pdev,
    }
    }

    + max_nr_gframes = gnttab_max_grant_frames();
    + xen_hvm_resume_frames = alloc_xen_mmio(PAGE_SIZE * max_nr_gframes);
    ret = gnttab_init();
    if (ret)
    goto out;
    diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
    index 811cda5..9a73170 100644
    --- a/include/xen/grant_table.h
    +++ b/include/xen/grant_table.h
    @@ -113,6 +113,9 @@ int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes,
    void arch_gnttab_unmap_shared(struct grant_entry *shared,
    unsigned long nr_gframes);

    +extern unsigned long xen_hvm_resume_frames;
    +unsigned int gnttab_max_grant_frames(void);
    +
    #define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr))

    #endif /* __ASM_GNTTAB_H__ */
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2010-06-21 18:29    [W:0.046 / U:0.096 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site