Eric Lee / smarc-fsl-linux-kernel

21 Jan, 2011

1 commit

14 Jan, 2011

2 commits

  • 9c4bc1c2b   Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen ... Browse Code »

    * 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/p2m: Fix module linking error.
    xen p2m: clear the old pte when adding a page to m2p_override
    xen gntdev: use gnttab_map_refs and gnttab_unmap_refs
    xen: introduce gnttab_map_refs and gnttab_unmap_refs
    xen p2m: transparently change the p2m mappings in the m2p override
    xen/gntdev: Fix circular locking dependency
    xen/gntdev: stop using "token" argument
    xen: gntdev: move use of GNTMAP_contains_pte next to the map_op
    xen: add m2p override mechanism
    xen: move p2m handling to separate file
    xen/gntdev: add VM_PFNMAP to vma
    xen/gntdev: allow usermode to map granted pages
    xen: define gnttab_set_map_op/unmap_op

    Fix up trivial conflict in drivers/xen/Kconfig

    Linus Torvalds
     
  • 2c0076d8c   Merge branch 'stable/platform-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen ... Browse Code »

    * 'stable/platform-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen-platform: Fix compile errors if CONFIG_PCI is not enabled.
    xen: rename platform-pci module to xen-platform-pci.
    xen-platform: use PCI interfaces to request IO and MEM resources.

    Linus Torvalds
     

13 Jan, 2011

2 commits

  • e528db5b3   xen-platform: Fix compile errors if CONFIG_PCI is not enabled. ... Browse Code »

    drivers/xen/platform-pci.c:127: error: implicit declaration of function
    'pci_request_region'
    drivers/xen/platform-pci.c:165: error: implicit declaration of function
    'pci_release_region'

    Signed-off-by: Konrad Rzeszutek Wilk

    Konrad Rzeszutek Wilk
     
  • 94d4c4cd5   Merge branch 'stable/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen ... Browse Code »

    * 'stable/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/xenbus: making backend support modular is too complex
    xen/pci: Make xen-pcifront be dependent on XEN_XENBUS_FRONTEND
    xen/xenbus: fixup checkpatch issues in xenbus_probe*
    xen/netfront: select XEN_XENBUS_FRONTEND
    xen/xenbus: clean up noise in xenbus_probe_frontend.c
    xen/xenbus: clean up noise in xenbus_probe_backend.c
    xen/xenbus: clean up noise in xenbus_probe.c
    xen/xenbus: cleanup debug noise in xenbus_comms.c
    xen/xenbus: clean up error handling
    xen/xenbus: make frontend bus GPL
    xen/xenbus: make sure backend bus is registered earlier
    xenbus/frontend: register bus earlier
    xen: remove xen/evtchn.h
    xen: add backend driver support
    xen: separate out frontend xenbus

    Linus Torvalds
     

12 Jan, 2011

10 commits

  • 7c8c06c5b   xen: rename platform-pci module to xen-platform-pci. ... Browse Code »

    platform-pci is rather generic for a modular distro style kernel.

    Signed-off-by: Ian Campbell
    Signed-off-by: Konrad Rzeszutek Wilk

    Ian Campbell
     
  • 00f28e403   xen-platform: use PCI interfaces to request IO and MEM resources. ... Browse Code »

    This is the correct interface to use and something has broken the use
    of the previous incorrect interface (which fails because the request
    conflicts with the resources assigned for the PCI device itself
    instead of nesting like the PCI interfaces do).

    Signed-off-by: Ian Campbell
    Signed-off-by: Konrad Rzeszutek Wilk
    Cc: stable@kernel.org # 2.6.37 only

    Ian Campbell
     
  • 87f1d40a7   xen p2m: clear the old pte when adding a page to m2p_override ... Browse Code »

    When adding a page to m2p_override we change the p2m of the page so we
    need to also clear the old pte of the kernel linear mapping because it
    doesn't correspond anymore.

    When we remove the page from m2p_override we restore the original p2m of
    the page and we also restore the old pte of the kernel linear mapping.

    Before changing the p2m mappings in m2p_add_override and
    m2p_remove_override, check that the page passed as argument is valid and
    return an error if it is not.

    Signed-off-by: Jeremy Fitzhardinge
    Signed-off-by: Stefano Stabellini
    Signed-off-by: Konrad Rzeszutek Wilk

    Jeremy Fitzhardinge
     
  • a12b4eb34   xen gntdev: use gnttab_map_refs and gnttab_unmap_refs ... Browse Code »

    Use gnttab_map_refs and gnttab_unmap_refs to map and unmap the grant
    ref, so that we can have a corresponding struct page.

    Signed-off-by: Stefano Stabellini
    Signed-off-by: Jeremy Fitzhardinge
    Signed-off-by: Konrad Rzeszutek Wilk

    Stefano Stabellini
     
  • 289b777ea   xen: introduce gnttab_map_refs and gnttab_unmap_refs ... Browse Code »

    gnttab_map_refs maps some grant refs and uses the new m2p override to
    set a proper m2p mapping for the granted pages.

    gnttab_unmap_refs unmaps the granted refs and removes th mappings from
    the m2p override.

    Signed-off-by: Stefano Stabellini
    Signed-off-by: Jeremy Fitzhardinge
    Signed-off-by: Konrad Rzeszutek Wilk

    Stefano Stabellini
     
  • f0a70c882   xen/gntdev: Fix circular locking dependency ... Browse Code »

    apply_to_page_range will acquire PTE lock while priv->lock is held,
    and mn_invl_range_start tries to acquire priv->lock with PTE already
    held. Fix by not holding priv->lock during the entire map operation.
    This is safe because map->vma is set nonzero while the lock is held,
    which will cause subsequent maps to fail and will cause the unmap
    ioctl (and other users of gntdev_del_map) to return -EBUSY until the
    area is unmapped. It is similarly impossible for gntdev_vma_close to
    be called while the vma is still being created.

    Signed-off-by: Daniel De Graaf
    Signed-off-by: Konrad Rzeszutek Wilk

    Daniel De Graaf
     
  • ba5d10122   xen/gntdev: stop using "token" argument ... Browse Code »

    It's the struct page of the L1 pte page. But we can get its mfn
    by simply doing an arbitrary_virt_to_machine() on it anyway (which is
    the safe conservative choice; since we no longer allow HIGHPTE pages,
    we would never expect to be operating on a mapped pte page).

    Signed-off-by: Jeremy Fitzhardinge
    Signed-off-by: Konrad Rzeszutek Wilk

    Jeremy Fitzhardinge
     
  • 9329e7604   xen: gntdev: move use of GNTMAP_contains_pte next to the map_op ... Browse Code »

    This flag controls the meaning of gnttab_map_grant_ref.host_addr and
    specifies that the field contains a reference to the pte entry to be
    used to perform the mapping. Therefore move the use of this flag to
    the point at which we actually use a reference to the pte instead of
    something else, splitting up the usage of the flag in this way is
    confusing and potentially error prone.

    The other flags are all properties of the mapping itself as opposed to
    properties of the hypercall arguments and therefore it make sense to
    continue to pass them round in map->flags.

    Signed-off-by: Ian Campbell
    Cc: Stefano Stabellini
    Cc: Derek G. Murray
    Cc: Gerd Hoffmann
    Signed-off-by: Jeremy Fitzhardinge
    Signed-off-by: Konrad Rzeszutek Wilk

    Ian Campbell
     
  • 8d3eaea24   xen/gntdev: add VM_PFNMAP to vma ... Browse Code »

    These pages are from other domains, so don't have any local PFN.
    VM_PFNMAP is the closest concept Linux has to this.

    Signed-off-by: Jeremy Fitzhardinge
    Signed-off-by: Konrad Rzeszutek Wilk

    Jeremy Fitzhardinge
     
  • ab31523c2   xen/gntdev: allow usermode to map granted pages ... Browse Code »

    The gntdev driver allows usermode to map granted pages from other
    domains. This is typically used to implement a Xen backend driver
    in user mode.

    Signed-off-by: Gerd Hoffmann
    Signed-off-by: Stefano Stabellini
    Signed-off-by: Jeremy Fitzhardinge
    Signed-off-by: Konrad Rzeszutek Wilk

    Gerd Hoffmann
     

11 Jan, 2011

1 commit

10 Jan, 2011

1 commit

  • 110e7c7e4   xen/event: validate irq before get evtchn by irq ... Browse Code »

    When retrieving the event channel number from irq, the irq
    number may not be valid under some conditions.

    So far that can be when we suspend/resume and irq ends with -1.
    Validate and return sanitized irq and provide diagnostics information.

    [v3: added unlikely on the WARN path]
    [v2: reworded the commit message]
    Signed-off-by: Joe Jin
    Signed-off-by: Konrad Rzeszutek Wilk
    Tested-by: Gurudas Pai
    Cc: Ian Campbell
    Cc: Jeremy Fitzhardinge
    Cc: Andrew Morton

    Joe Jin
     

06 Jan, 2011

13 commits

21 Dec, 2010

1 commit

17 Dec, 2010

2 commits

  • b2e4ae697   xen: Use this_cpu_inc_return ... Browse Code »

    __this_cpu_inc_return reduces code and simplifies code.

    Cc: Jeremy Fitzhardinge
    Acked-by: H. Peter Anvin
    Signed-off-by: Christoph Lameter

    Christoph Lameter
     
  • 780f36d8b   xen: Use this_cpu_ops ... Browse Code »

    Use this_cpu_ops to reduce code size and simplify things in various places.

    V3->V4:
    Move instance of this_cpu_inc_return to a later patchset so that
    this patch can be applied without infrastructure changes.

    Cc: Jeremy Fitzhardinge
    Acked-by: H. Peter Anvin
    Signed-off-by: Christoph Lameter
    Signed-off-by: Tejun Heo

    Christoph Lameter
     

10 Dec, 2010

1 commit

  • d1b758ebc   xen/irq: Cleanup the find_unbound_irq ... Browse Code »

    The "find_unbound_irq" is a bit unusual - it allocates
    virtual IRQ (event channels) in reverse order. This means
    starting at the "top" of the available IRQs (nr_irqs) down
    to the GSI/MSI IRQs (nr_irqs_gsi). Lets document this and
    also make the variables easier to understand.

    Signed-off-by: Konrad Rzeszutek Wilk

    Konrad Rzeszutek Wilk
     

04 Dec, 2010

2 commits

03 Dec, 2010

2 commits

02 Dec, 2010

2 commits