Eric Lee / smarc-fsl-linux-kernel

18 Mar, 2011

3 commits

  • 804f18536   Merge branch 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen ... Browse Code »

    * 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen: use freeze/restore/thaw PM events for suspend/resume/chkpt
    xen: xenbus PM events support

    Linus Torvalds
     
  • 5a39837f7   Merge branches 'stable/irq.fairness' and 'stable/irq.ween_of_nr_irqs' of git://g… ... Browse Code »

    …it.kernel.org/pub/scm/linux/kernel/git/konrad/xen

    * 'stable/irq.fairness' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen: events: Remove redundant clear of l2i at end of round-robin loop
    xen: events: Make round-robin scan fairer by snapshotting each l2 word once only
    xen: events: Clean up round-robin evtchn scan.
    xen: events: Make last processed event channel a per-cpu variable.
    xen: events: Process event channels notifications in round-robin order.

    * 'stable/irq.ween_of_nr_irqs' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen: events: Fix compile error if CONFIG_SMP is not defined.
    xen: events: correct locking in xen_irq_from_pirq
    xen: events: propagate irq allocation failure instead of panicking
    xen: events: do not workaround too-small nr_irqs
    xen: events: remove use of nr_irqs as upper bound on number of pirqs
    xen: events: dynamically allocate irq info structures
    xen: events: maintain a list of Xen interrupts
    xen: events: push setup of irq<->{evtchn,ipi,virq,pirq} maps into irq_info init functions
    xen: events: turn irq_info constructors into initialiser functions
    xen: events: use per-cpu variable for cpu_evtchn_mask
    xen: events: refactor GSI pirq bindings functions
    xen: events: rename restore_cpu_pirqs -> restore_pirqs
    xen: events: remove unused public functions
    xen: events: fix xen_map_pirq_gsi error return
    xen: events: simplify comment
    xen: events: separate two unrelated halves of if condition

    Fix up trivial conflicts in drivers/xen/events.c

    Linus Torvalds
     
  • 514af9f79   Merge branches 'stable/hvc-console', 'stable/gntalloc.v6' and 'stable/balloon' o… ... Browse Code »

    …f git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

    * 'stable/hvc-console' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/hvc: Disable probe_irq_on/off from poking the hvc-console IRQ line.

    * 'stable/gntalloc.v6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen: gntdev: fix build warning
    xen/p2m/m2p/gnttab: do not add failed grant maps to m2p override
    xen-gntdev: Add cast to pointer
    xen-gntdev: Fix incorrect use of zero handle
    xen: change xen/[gntdev/gntalloc] to default m
    xen-gntdev: prevent using UNMAP_NOTIFY_CLEAR_BYTE on read-only mappings
    xen-gntdev: Avoid double-mapping memory
    xen-gntdev: Avoid unmapping ranges twice
    xen-gntdev: Use map->vma for checking map validity
    xen-gntdev: Fix unmap notify on PV domains
    xen-gntdev: Fix memory leak when mmap fails
    xen/gntalloc,gntdev: Add unmap notify ioctl
    xen-gntalloc: Userspace grant allocation driver
    xen-gntdev: Support mapping in HVM domains
    xen-gntdev: Add reference counting to maps
    xen-gntdev: Use find_vma rather than iterating our vma list manually
    xen-gntdev: Change page limit to be global instead of per-open

    * 'stable/balloon' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (24 commits)
    xen-gntdev: Use ballooned pages for grant mappings
    xen-balloon: Add interface to retrieve ballooned pages
    xen-balloon: Move core balloon functionality out of module
    xen/balloon: Remove pr_info's and don't alter retry_count
    xen/balloon: Protect against CPU exhaust by event/x process
    xen/balloon: Migration from mod_timer() to schedule_delayed_work()
    xen/balloon: Removal of driver_pages

    Linus Torvalds
     

17 Mar, 2011

3 commits

  • 7a6362800   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits)
    bonding: enable netpoll without checking link status
    xfrm: Refcount destination entry on xfrm_lookup
    net: introduce rx_handler results and logic around that
    bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
    bonding: wrap slave state work
    net: get rid of multiple bond-related netdevice->priv_flags
    bonding: register slave pointer for rx_handler
    be2net: Bump up the version number
    be2net: Copyright notice change. Update to Emulex instead of ServerEngines
    e1000e: fix kconfig for crc32 dependency
    netfilter ebtables: fix xt_AUDIT to work with ebtables
    xen network backend driver
    bonding: Improve syslog message at device creation time
    bonding: Call netif_carrier_off after register_netdevice
    bonding: Incorrect TX queue offset
    net_sched: fix ip_tos2prio
    xfrm: fix __xfrm_route_forward()
    be2net: Fix UDP packet detected status in RX compl
    Phonet: fix aligned-mode pipe socket buffer header reserve
    netxen: support for GbE port settings
    ...

    Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
    with the staging updates.

    Linus Torvalds
     
  • b3e96c0c7   xen: use freeze/restore/thaw PM events for suspend/resume/chkpt ... Browse Code »

    Use PM_FREEZE, PM_THAW and PM_RESTORE power events for
    suspend/resume/checkpoint functionality, instead of PM_SUSPEND
    and PM_RESUME. Use of these pm events fixes the Xen Guest hangup
    when taking checkpoints. When a suspend event is cancelled
    (while taking checkpoints once/continuously), we use PM_THAW
    instead of PM_RESUME. PM_RESTORE is used when suspend is not
    cancelled. See Documentation/power/devices.txt and linux/pm.h
    for more info about freeze, thaw and restore. The sequence of
    pm events in a suspend-resume scenario is shown below.

    dpm_suspend_start(PMSG_FREEZE);

    dpm_suspend_noirq(PMSG_FREEZE);

    sysdev_suspend(PMSG_FREEZE);
    cancelled = suspend_hypercall()
    sysdev_resume();

    dpm_resume_noirq(cancelled ? PMSG_THAW : PMSG_RESTORE);

    dpm_resume_end(cancelled ? PMSG_THAW : PMSG_RESTORE);

    Acked-by: Ian Campbell
    Signed-off-by: Shriram Rajagopalan
    Signed-off-by: Konrad Rzeszutek Wilk

    Shriram Rajagopalan
     
  • c7853aea5   xen: xenbus PM events support ... Browse Code »

    Make xenbus frontend device subscribe to PM events
    to receive suspend/resume/freeze/thaw/restore
    notifications.

    Signed-off-by: Kenji Wakamiya
    Signed-off-by: Kazuhiro Suzuki
    Signed-off-by: Shriram Rajagopalan
    Acked-by: Ian Campbell
    [shriram--minor mods and improved commit message]
    Signed-off-by: Konrad Rzeszutek Wilk

    Kazuhiro SUZUKI
     

16 Mar, 2011

12 commits

  • ca47ceaa2   xen-gntdev: Use ballooned pages for grant mappings ... Browse Code »

    Grant mappings cause the PFNMFN mapping to be lost on the pages used
    for the mapping. Instead of leaking memory, use pages that have already
    been ballooned out and so have no valid mapping. This removes the need
    for the bad-page leak workaround as pages are repopulated by the balloon
    driver.

    Acked-by: Ian Campbell
    Signed-off-by: Daniel De Graaf
    Signed-off-by: Konrad Rzeszutek Wilk

    Daniel De Graaf
     
  • b6f306798   xen-balloon: Add interface to retrieve ballooned pages ... Browse Code »

    Pages that have been ballooned are useful for other Xen drivers doing
    grant table actions, because these pages have valid struct page/PFNs but
    have no valid MFN so are available for remapping.

    Acked-by: Ian Campbell
    Signed-off-by: Daniel De Graaf
    [v2: Deal with rebasing on top of modified balloon code]
    Signed-off-by: Konrad Rzeszutek Wilk

    Konrad Rzeszutek Wilk
     
  • 803eb047a   xen-balloon: Move core balloon functionality out of module ... Browse Code »

    The basic functionality of ballooning pages is useful for Xen drivers in
    general. Rather than require a dependency on the balloon module, split
    the functionality that is reused into the core. The balloon module is
    still required to follow ballooning requests from xenstore or to view
    balloon statistics in sysfs.

    Acked-by: Ian Campbell
    Signed-off-by: Daniel De Graaf
    Signed-off-by: Konrad Rzeszutek Wilk

    Daniel De Graaf
     
  • 40095de1f   xen/balloon: Remove pr_info's and don't alter retry_count ... Browse Code »

    In the past the retry_count (in other form of this code) was zero.
    Meaning retry forever. Do the same thing here without changing it to
    the value 16.

    Also remove some of the pr_info as there is no need to spam
    the user.

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

    Konrad Rzeszutek Wilk
     
  • e0da2481f   Merge branch 'stable/backends' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen Browse Code »
    David S. Miller
     
  • 5f6fb4546   Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... Browse Code »

    * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (116 commits)
    x86: Enable forced interrupt threading support
    x86: Mark low level interrupts IRQF_NO_THREAD
    x86: Use generic show_interrupts
    x86: ioapic: Avoid redundant lookup of irq_cfg
    x86: ioapic: Use new move_irq functions
    x86: Use the proper accessors in fixup_irqs()
    x86: ioapic: Use irq_data->state
    x86: ioapic: Simplify irq chip and handler setup
    x86: Cleanup the genirq name space
    genirq: Add chip flag to force mask on suspend
    genirq: Add desc->irq_data accessor
    genirq: Add comments to Kconfig switches
    genirq: Fixup fasteoi handler for oneshot mode
    genirq: Provide forced interrupt threading
    sched: Switch wait_task_inactive to schedule_hrtimeout()
    genirq: Add IRQF_NO_THREAD
    genirq: Allow shared oneshot interrupts
    genirq: Prepare the handling of shared oneshot interrupts
    genirq: Make warning in handle_percpu_event useful
    x86: ioapic: Move trigger defines to io_apic.h
    ...

    Fix up trivial(?) conflicts in arch/x86/pci/xen.c due to genirq name
    space changes clashing with the Xen cleanups. The set_irq_msi() had
    moved to xen_bind_pirq_msi_to_irq().

    Linus Torvalds
     
  • 44626e4a3   xen: events: Fix compile error if CONFIG_SMP is not defined. ... Browse Code »

    drivers/xen/events.c:396: error: 'struct irq_data' has no member named 'affinity'

    Reported-by: Randy Dunlap
    Signed-off-by: Konrad Rzeszutek Wilk

    Konrad Rzeszutek Wilk
     
  • 76ca07832   Merge branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm ... Browse Code »

    * 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm:
    xen: suspend: remove xen_hvm_suspend
    xen: suspend: pull pre/post suspend hooks out into suspend_info
    xen: suspend: move arch specific pre/post suspend hooks into generic hooks
    xen: suspend: refactor non-arch specific pre/post suspend hooks
    xen: suspend: add "arch" to pre/post suspend hooks
    xen: suspend: pass extra hypercall argument via suspend_info struct
    xen: suspend: refactor cancellation flag into a structure
    xen: suspend: use HYPERVISOR_suspend for PVHVM case instead of open coding
    xen: switch to new schedop hypercall by default.
    xen: use new schedop interface for suspend
    xen: do not respond to unknown xenstore control requests
    xen: fix compile issue if XEN is enabled but XEN_PVHVM is disabled
    xen: PV on HVM: support PV spinlocks and IPIs
    xen: make the ballon driver work for hvm domains
    xen-blkfront: handle Xen major numbers other than XENVBD
    xen: do not use xen_info on HVM, set pv_info name to "Xen HVM"
    xen: no need to delay xen_setup_shutdown_event for hvm guests anymore

    Linus Torvalds
     
  • 27d2a8b97   Merge branches 'stable/ia64', 'stable/blkfront-cleanup' and 'stable/cleanup' of … ... Browse Code »

    …git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

    * 'stable/ia64' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen: ia64 build broken due to "xen: switch to new schedop hypercall by default."

    * 'stable/blkfront-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen: Union the blkif_request request specific fields

    * 'stable/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen: annotate functions which only call into __init at start of day
    xen p2m: annotate variable which appears unused
    xen: events: mark cpu_evtchn_mask_p as __refdata

    Linus Torvalds
     
  • 010b8f4e2   Merge branch 'stable/irq.cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen ... Browse Code »

    * 'stable/irq.cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen: events: remove dom0 specific xen_create_msi_irq
    xen: events: use xen_bind_pirq_msi_to_irq from xen_create_msi_irq
    xen: events: push set_irq_msi down into xen_create_msi_irq
    xen: events: update pirq_to_irq in xen_create_msi_irq
    xen: events: refactor xen_create_msi_irq slightly
    xen: events: separate MSI PIRQ allocation from PIRQ binding to IRQ
    xen: events: assume PHYSDEVOP_get_free_pirq exists
    xen: pci: collapse apic_register_gsi_xen_hvm and xen_hvm_register_pirq
    xen: events: return irq from xen_allocate_pirq_msi
    xen: events: drop XEN_ALLOC_IRQ flag to xen_allocate_pirq_msi
    xen: events: do not leak IRQ from xen_allocate_pirq_msi when no pirq available.
    xen: pci: only define xen_initdom_setup_msi_irqs if CONFIG_XEN_DOM0

    Linus Torvalds
     
  • 397fae081   Merge branches 'stable/irq.rework' and 'stable/pcifront-fixes' of git://git.kern… ... Browse Code »

    …el.org/pub/scm/linux/kernel/git/konrad/xen

    * 'stable/irq.rework' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/irq: Cleanup up the pirq_to_irq for DomU PV PCI passthrough guests as well.
    xen: Use IRQF_FORCE_RESUME
    xen/timer: Missing IRQF_NO_SUSPEND in timer code broke suspend.
    xen: Fix compile error introduced by "switch to new irq_chip functions"
    xen: Switch to new irq_chip functions
    xen: Remove stale irq_chip.end
    xen: events: do not free legacy IRQs
    xen: events: allocate GSIs and dynamic IRQs from separate IRQ ranges.
    xen: events: add xen_allocate_irq_{dynamic, gsi} and xen_free_irq
    xen:events: move find_unbound_irq inside CONFIG_PCI_MSI
    xen: handled remapped IRQs when enabling a pcifront PCI device.
    genirq: Add IRQF_FORCE_RESUME

    * 'stable/pcifront-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    pci/xen: When free-ing MSI-X/MSI irq->desc also use generic code.
    pci/xen: Cleanup: convert int** to int[]
    pci/xen: Use xen_allocate_pirq_msi instead of xen_allocate_pirq
    xen-pcifront: Sanity check the MSI/MSI-X values
    xen-pcifront: don't use flush_scheduled_work()

    Linus Torvalds
     
  • c7146dd00   Merge branches 'stable/p2m-identity.v4.9.1' and 'stable/e820' of git://git.kerne… ... Browse Code »

    …l.org/pub/scm/linux/kernel/git/konrad/xen

    * 'stable/p2m-identity.v4.9.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/m2p: Check whether the MFN has IDENTITY_FRAME bit set..
    xen/m2p: No need to catch exceptions when we know that there is no RAM
    xen/debug: WARN_ON when identity PFN has no _PAGE_IOMAP flag set.
    xen/debugfs: Add 'p2m' file for printing out the P2M layout.
    xen/setup: Set identity mapping for non-RAM E820 and E820 gaps.
    xen/mmu: WARN_ON when racing to swap middle leaf.
    xen/mmu: Set _PAGE_IOMAP if PFN is an identity PFN.
    xen/mmu: Add the notion of identity (1-1) mapping.
    xen: Mark all initial reserved pages for the balloon as INVALID_P2M_ENTRY.

    * 'stable/e820' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/e820: Don't mark balloon memory as E820_UNUSABLE when running as guest and fix overflow.
    xen/setup: Inhibit resource API from using System RAM E820 gaps as PCI mem gaps.

    Linus Torvalds
     

14 Mar, 2011

4 commits

11 Mar, 2011

18 commits