1. 07 7月, 2009 15 次提交
  2. 05 7月, 2009 11 次提交
    • D
      intel-iommu: Don't use identity mapping for PCI devices behind bridges · 3dfc813d
      David Woodhouse 提交于
      Our current strategy for pass-through mode is to put all devices into
      the 1:1 domain at startup (which is before we know what their dma_mask
      will be), and only _later_ take them out of that domain, if it turns out
      that they really can't address all of memory.
      
      However, when there are a bunch of PCI devices behind a bridge, they all
      end up with the same source-id on their DMA transactions, and hence in
      the same IOMMU domain. This means that we _can't_ easily move them from
      the 1:1 domain into their own domain at runtime, because there might be DMA
      in-flight from their siblings.
      
      So we have to adjust our pass-through strategy: For PCI devices not on
      the root bus, and for the bridges which will take responsibility for
      their transactions, we have to start up _out_ of the 1:1 domain, just in
      case.
      
      This fixes the BUG() we see when we have 32-bit-capable devices behind a
      PCI-PCI bridge, and use the software identity mapping.
      
      It does mean that we might end up using 'normal' mapping mode for some
      devices which could actually live with the faster 1:1 mapping -- but
      this is only for PCI devices behind bridges, which presumably aren't the
      devices for which people are most concerned about performance.
      Signed-off-by: NDavid Woodhouse <David.Woodhouse@intel.com>
      3dfc813d
    • D
      intel-iommu: Use iommu_should_identity_map() at startup time too. · 6941af28
      David Woodhouse 提交于
      At boot time, the dma_mask won't have been set on any devices, so we
      assume that all devices will be 64-bit capable (and thus get a 1:1 map).
      Signed-off-by: NDavid Woodhouse <David.Woodhouse@intel.com>
      6941af28
    • L
      Linux 2.6.31-rc2 · 8e4a718f
      Linus Torvalds 提交于
      8e4a718f
    • P
      video: sm501fb: Early initialization of mm_lock mutex. · f50bf2b2
      Paul Mundt 提交于
      Commit 537a1bf0 (fbdev: add mutex for
      fb_mmap locking) introduces a ->mm_lock mutex for protecting smem
      assignments. Unfortunately in the case of sm501fb these happen quite
      early in the initialization code, well before the mutex_init() that takes
      place in register_framebuffer(), leading to:
      
         Badness at kernel/mutex.c:207
      
         Pid : 1, Comm:          swapper
         CPU : 0                 Not tainted  (2.6.31-rc1-00284-g529ba0d9-dirty #2273)
      
         PC is at __mutex_lock_slowpath+0x72/0x1bc
         PR is at __mutex_lock_slowpath+0x66/0x1bc
         ...
      
      matroxfb appears to have the same issue and has solved it with an early
      mutex_init(), so we do the same for sm501fb.
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      Cc: Krzysztof Helt <krzysztof.h1@wp.pl>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f50bf2b2
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 · de481ba9
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: (27 commits)
        parisc: use generic atomic64 on 32-bit
        parisc: superio: fix build breakage
        parisc: Fix PCI resource allocation on non-PAT SBA machines
        parisc: perf: wire up sys_perf_counter_open
        parisc: add task_pt_regs macro
        parisc: wire sys_perf_counter_open to sys_ni_syscall
        parisc: inventory.c, fix bloated stack frame
        parisc: processor.c, fix bloated stack frame
        parisc: fix compile warning in mm/init.c
        parisc: remove dead code from sys_parisc32.c
        parisc: wire up rt_tgsigqueueinfo
        parisc: ensure broadcast tlb purge runs single threaded
        parisc: fix "delay!" timer handling
        parisc: fix mismatched parenthesis in memcpy.c
        parisc: Fix gcc 4.4 warning in lba_pci.c
        parisc: add parameter to read_cr16()
        parisc: decode_exc.c should include kernel.h
        parisc: remove obsolete hw_interrupt_type
        parisc: fix irq compile bugs in arch/parisc/kernel/irq.c
        parisc: advertise PCI devs after "assign_resources"
        ...
      
      Manually fixed up trivial conflicts in tools/perf/perf.h due to addition
      of SH vs HPPA perf-counter support.
      de481ba9
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 · dd0888c2
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
        mfd: fix pcap adc locking
        mfd: sm501, fix lock imbalance
      dd0888c2
    • L
      Merge branch 'for-2.6.31' of git://linux-nfs.org/~bfields/linux · 14c1b7c2
      Linus Torvalds 提交于
      * 'for-2.6.31' of git://linux-nfs.org/~bfields/linux:
        NFSD: Don't hold unrefcounted creds over call to nfsd_setuser()
      14c1b7c2
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 48066267
      Linus Torvalds 提交于
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        MIPS: Fix CONFIG_FLATMEM version of pfn_valid()
        MIPS: Reorganize Cavium OCTEON PCI support.
        Update Yoichi Yuasa's e-mail address
        MIPS: Allow suspend and hibernation again on uniprocessor kernels.
        MIPS: 64-bit: Fix o32 core dump
        MIPS: BC47xx: Fix SSB irq setup
        MIPS: CMP: Update sync-r4k for current kernel
        MIPS: CMP: Move gcmp_probe to before the SMP ops
        MIPS: CMP: activate CMP support
        MIPS: CMP: Extend IPI handling to CPU number
        MIPS: CMP: Extend the GIC IPI interrupts beyond 32
        MIPS: Define __arch_swab64 for all mips r2 cpus
        MIPS: Update VR41xx GPIO driver to use gpiolib
        MIPS: Hookup new syscalls sys_rt_tgsigqueueinfo and sys_perf_counter_open.
        MIPS: Malta: Remove unnecessary function prototypes
        MIPS: MT: Remove unnecessary semicolons
        MIPS: Add support for Texas Instruments AR7 System-on-a-Chip
      48066267
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · f1a74571
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        sound: do not set DEVNAME for OSS devices
        ALSA: hda - Add sanity check in PCM open callback
        ALSA: hda - Call snd_pcm_lib_hw_rates() again after codec open callback
        ALSA: hda - Avoid invalid formats and rates with shared SPDIF
        ALSA: hda - Improve ASUS eeePC 1000 mixer
        ALSA: hda - Add GPIO1 control at muting with HP laptops
        ALSA: usx2y - reparent sound device
        ALSA: snd_usb_caiaq: reparent sound device
        sound: virtuoso: fix Xonar D1/DX silence after resume
        ASoC: Only disable pxa2xx-i2s clocks if we enabled them
        ALSA: hda - Add quirk for HP 6930p
        ALSA: hda - Add missing static to patch_ca0110()
        ASoC: OMAP: fix OMAP1510 broken PCM pointer callback
        ASoC: remove BROKEN from Efika and pcm030 fabric drivers
        ASoC: Fix typo in MPC5200 PSC AC97 driver Kconfig
      f1a74571
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes · 29f31773
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
        kbuild: finally remove the obsolete variable $TOPDIR
        gitignore: ignore scripts/ihex2fw
        Kbuild: Disable the -Wformat-security gcc flag
        gitignore: ignore gcov output files
        kbuild: deb-pkg ship changelog
        Add new __init_task_data macro to be used in arch init_task.c files.
        asm-generic/vmlinux.lds.h: shuffle INIT_TASK* macro names in vmlinux.lds.h
        Add new macros for page-aligned data and bss sections.
        asm-generic/vmlinux.lds.h: Fix up RW_DATA_SECTION definition.
      29f31773
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · 59107c65
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
        block: don't merge requests of different failfast settings
        cciss: Ignore stale commands after reboot
      59107c65
  3. 04 7月, 2009 14 次提交