1. 29 Oct, 2010 2 commits
    • Paul Mundt's avatar
      sh: mach-microdev: SuperIO-relative ioport mapping. · 46bc8587
      Paul Mundt authored
      The microdev only has to contend with silly PIO mangling on anything
      within the SuperIO range. As each of the SuperIO modules is already
      speciail cased, we just shift that logic over to the ioport map.
      
      With microdev PCI never being merged (and being fudamentally broken in
      hardware), and the ethernet chip only doing 16-bit accesses already,
      there's no need to maintain any of the extra special casing. Kill it all
      off.
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      46bc8587
    • Linus Torvalds's avatar
      Merge branch 'stable/xen-pcifront-0.8.2' of... · 18cb657c
      Linus Torvalds authored
      Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
        and branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm
      
      * 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm:
        xen: register xen pci notifier
        xen: initialize cpu masks for pv guests in xen_smp_init
        xen: add a missing #include to arch/x86/pci/xen.c
        xen: mask the MTRR feature from the cpuid
        xen: make hvc_xen console work for dom0.
        xen: add the direct mapping area for ISA bus access
        xen: Initialize xenbus for dom0.
        xen: use vcpu_ops to setup cpu masks
        xen: map a dummy page for local apic and ioapic in xen_set_fixmap
        xen: remap MSIs into pirqs when running as initial domain
        xen: remap GSIs as pirqs when running as initial domain
        xen: introduce XEN_DOM0 as a silent option
        xen: map MSIs into pirqs
        xen: support GSI -> pirq remapping in PV on HVM guests
        xen: add xen hvm acpi_register_gsi variant
        acpi: use indirect call to register gsi in different modes
        xen: implement xen_hvm_register_pirq
        xen: get the maximum number of pirqs from xen
        xen: support pirq != irq
      
      * 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (27 commits)
        X86/PCI: Remove the dependency on isapnp_disable.
        xen: Update Makefile with CONFIG_BLOCK dependency for biomerge.c
        MAINTAINERS: Add myself to the Xen Hypervisor Interface and remove Chris Wright.
        x86: xen: Sanitse irq handling (part two)
        swiotlb-xen: On x86-32 builts, select SWIOTLB instead of depending on it.
        MAINTAINERS: Add myself for Xen PCI and Xen SWIOTLB maintainer.
        xen/pci: Request ACS when Xen-SWIOTLB is activated.
        xen-pcifront: Xen PCI frontend driver.
        xenbus: prevent warnings on unhandled enumeration values
        xenbus: Xen paravirtualised PCI hotplug support.
        xen/x86/PCI: Add support for the Xen PCI subsystem
        x86: Introduce x86_msi_ops
        msi: Introduce default_[teardown|setup]_msi_irqs with fallback.
        x86/PCI: Export pci_walk_bus function.
        x86/PCI: make sure _PAGE_IOMAP it set on pci mappings
        x86/PCI: Clean up pci_cache_line_size
        xen: fix shared irq device passthrough
        xen: Provide a variant of xen_poll_irq with timeout.
        xen: Find an unbound irq number in reverse order (high to low).
        xen: statically initialize cpu_evtchn_mask_p
        ...
      
      Fix up trivial conflicts in drivers/pci/Makefile
      18cb657c
  2. 28 Oct, 2010 38 commits