1. 13 12月, 2006 19 次提交
    • R
      IB: Add DMA mapping functions to allow device drivers to interpose · 9b513090
      Ralph Campbell 提交于
      The QLogic InfiniPath HCAs use programmed I/O instead of HW DMA.
      This patch allows a verbs device driver to interpose on DMA mapping
      function calls in order to avoid relying on bus_to_virt() and
      phys_to_virt() to undo the mappings created by dma_map_single(),
      dma_map_sg(), etc.
      Signed-off-by: NRalph Campbell <ralph.campbell@qlogic.com>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      9b513090
    • S
      RDMA/cma: Export rdma cm interface to userspace · 75216638
      Sean Hefty 提交于
      Export the rdma cm interfaces to userspace via a misc device.
      Signed-off-by: NSean Hefty <sean.hefty@intel.com>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      75216638
    • S
      RDMA/cma: Add support for RDMA_PS_UDP · 628e5f6d
      Sean Hefty 提交于
      Allow the use of UD QPs through the rdma_cm, in order to provide
      address translation services for resolving IB addresses for datagram
      messages using SIDR.
      Signed-off-by: NSean Hefty <sean.hefty@intel.com>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      628e5f6d
    • S
      RDMA/cma: Allow early transition to RTS to handle lost CM messages · 0fe313b0
      Sean Hefty 提交于
      During connection establishment, the passive side of a connection can
      receive messages from the active side before the connection event has
      been delivered to the user.  Allow the passive side to send messages
      in response to received data before the event is delivered.  To handle
      the case where the connection messages are lost, a new rdma_notify()
      function is added that users may invoke to force a connection into the
      established state.
      Signed-off-by: NSean Hefty <sean.hefty@intel.com>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      0fe313b0
    • S
      RDMA/cma: Report connect info with connect events · a1b1b61f
      Sean Hefty 提交于
      Connection information was never given to the recipient of a
      connection request or reply message.  Only the event was delivered.
      Report the connection data with the event to allows user to
      reject the connection based on the requested parameters, or adjust
      their resources to match the request.
      Signed-off-by: NSean Hefty <sean.hefty@intel.com>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      a1b1b61f
    • S
      RDMA/cma: Remove unneeded qp_type parameter from rdma_cm · 9b2e9c0c
      Sean Hefty 提交于
      The qp_type parameter into the rdma_cm is unneeded, and can be
      misleading.  The QP type should be determined from the port space.
      Signed-off-by: NSean Hefty <sean.hefty@intel.com>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      9b2e9c0c
    • R
      IB/ipath: Fix IRQ for PCI Express HCAs · 0a1336c8
      Roland Dreier 提交于
      Commit 51f65ebc ("IB/ipath - program intconfig register using new HT
      irq hook"), which fixed interrupts for HyperTransport HCAs, broke PCI
      Express HCAs, because for those HCAs, the driver uses the value of
      pdev->irq before pci_enable_msi() and ends up getting a totally bogus
      IRQ number.  Fix this by using the value of pdev->irq after
      pci_enable_msi().
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      0a1336c8
    • K
      RDMA/amso1100: Fix memory leak in c2_qp_modify() · ad1f9791
      Krishna Kumar 提交于
      vq_req is leaked in error cases.
      Signed-off-by: NKrishna Kumar <krkumar2@in.ibm.com>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      ad1f9791
    • R
      IB/iser: Remove unused "write-only" variables · dee234f4
      Roland Dreier 提交于
      Remove variables that are set but then never looked at in the iSER
      initiator.  These cleanups came from David Binderman's list of "set
      but never used" warnings from icc.
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      dee234f4
    • R
      IB/ipath: Remove unused "write-only" variables · 44f8e3f3
      Roland Dreier 提交于
      Remove variables that are set but then never looked at in the ipath
      driver.  These cleanups came from David Binderman's list of "set but
      never used" warnings from icc.
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      44f8e3f3
    • R
      IB/fmr: ib_flush_fmr_pool() may wait too long · f47e22c6
      Roland Dreier 提交于
      ib_flush_fmr_pool() stashes away the request generation number
      properly, but then goes ahead and rereads it every time it tests
      whether the flush generation number has caught up.  This means that
      there is a theoretical possibility of livelock, if the request
      generation number keeps getting bumped and the flush generation number
      never catches up.  The fix is simple: use the request generation
      number read at the beginning of the function.
      
      Also, atomic_inc() followed by atomic_read() can be replaced with
      atomic_int_return().  There's no real requirement for atomicity here
      but we might as well shrink the code.
      
      This bug was discovered using David Binderman's list of "set but never
      used" warnings from icc.
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      f47e22c6
    • N
      [PATCH] remove config ordering/dependency between ucb1400-ts and sound subsystem · e1036502
      Nicolas Pitre 提交于
      Commit 2d4ba4a3 introduced a dependency
      that was never meant to exist when the ac97_bus.c module was created.
      Move ac97_bus.c up the directory hierarchy to make sure it is built when
      selected even if sound is configured out so things work as originally
      intended.
      Signed-off-by: NNicolas Pitre <nico@cam.org>
      Acked-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      e1036502
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 · 741441ab
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
        [patch 3/3] OCFS2 Configurable timeouts - Protocol changes
        [patch 2/3] OCFS2 Configurable timeouts
        [patch 1/3] OCFS2 - Expose struct o2nm_cluster
        ocfs2: Synchronize feature incompat flags in ocfs2_fs.h
        ocfs2: update mount option documentation
        ocfs2: local mounts
      741441ab
    • L
      Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · 659dba34
      Linus Torvalds 提交于
      * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        i2c: Fix OMAP clock prescaler to match the comment
        i2c: Refactor a kfree in i2c-dev
        i2c: Fix return value check in i2c-dev
        i2c: Enable PEC on more i2c-i801 devices
        i2c: Discard the i2c algo del_bus wrappers
        i2c: New ARM Versatile/Realview bus driver
        i2c: fix broken ds1337 initialization
        i2c: i2c-i801 documentation update
        i2c: Use the __ATTR macro where possible
        i2c: Whitespace cleanups
        i2c: Use put_user instead of copy_to_user where possible
        i2c: New Atmel AT91 bus driver
        i2c: Add support for nested i2c bus locking
        i2c: Cleanups to the i2c-nforce2 bus driver
        i2c: Add request/release_mem_region to i2c-ibm_iic bus driver
        i2c: New Philips PNX bus driver
        i2c: Delete the broken i2c-ite bus driver
        i2c: Update the list of driver IDs
        i2c: Fix documentation typos
      659dba34
    • I
      [PATCH] netpoll: fix netpoll lockup · 3640543d
      Ingo Molnar 提交于
      current -git doesnt boot on my laptop due to netpoll not unlocking the
      tx lock in the else branch.
      
      booted this up on my laptop with lockdep enabled and there are no
      locking complaints and it works fine.
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      3640543d
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 · d224a93d
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (29 commits)
        sh: Fixup SH-2 BUG() trap handling.
        sh: Use early_param() for earlyprintk parsing.
        sh: Fix .empty_zero_page alignment for PAGE_SIZE > 4096.
        sh: Fixup .data.page_aligned.
        sh: Hook up SH7722 scif ipr interrupts.
        sh: Fixup sh_bios() trap handling.
        sh: SH-MobileR SH7722 CPU support.
        sh: Fixup dma_cache_sync() callers.
        sh: Convert remaining remap_area_pages() users to ioremap_page_range().
        sh: Fixup kernel_execve() for syscall cleanups.
        sh: Fix get_wchan().
        sh: BUG() handling through trapa vector.
        rtc: rtc-sh: alarm support.
        rtc: rtc-sh: fix rtc for out-by-one for the month.
        sh: Kill off unused SE7619 I/O ops.
        serial: sh-sci: Shut up various sci_rxd_in() gcc4 warnings.
        sh: Split out atomic ops logically.
        sh: Fix Solution Engine 7619 build.
        sh: Trivial build fixes for SH-2 support.
        sh: IPR IRQ updates for SH7619/SH7206.
        ...
      d224a93d
    • I
      [PATCH] net, 8139too.c: fix netpoll deadlock · b57bd066
      Ingo Molnar 提交于
      fix deadlock in the 8139too driver: poll handlers should never forcibly
      enable local interrupts, because they might be used by netpoll/printk
      from IRQ context.
      
        =================================
        [ INFO: inconsistent lock state ]
        2.6.19 #11
        ---------------------------------
        inconsistent {softirq-on-W} -> {in-softirq-W} usage.
        swapper/1 [HC0[0]:SC1[1]:HE1:SE0] takes:
         (&npinfo->poll_lock){-+..}, at: [<c0350a41>] net_rx_action+0x64/0x1de
        {softirq-on-W} state was registered at:
          [<c0134c86>] mark_lock+0x5b/0x39c
          [<c0135012>] mark_held_locks+0x4b/0x68
          [<c01351e9>] trace_hardirqs_on+0x115/0x139
          [<c02879e6>] rtl8139_poll+0x3d7/0x3f4
          [<c035c85d>] netpoll_poll+0x82/0x32f
          [<c035c775>] netpoll_send_skb+0xc9/0x12f
          [<c035cdcc>] netpoll_send_udp+0x253/0x25b
          [<c0288463>] write_msg+0x40/0x65
          [<c011cead>] __call_console_drivers+0x45/0x51
          [<c011cf16>] _call_console_drivers+0x5d/0x61
          [<c011d4fb>] release_console_sem+0x11f/0x1d8
          [<c011d7d7>] register_console+0x1ac/0x1b3
          [<c02883f8>] init_netconsole+0x55/0x67
          [<c010040c>] init+0x9a/0x24e
          [<c01049cf>] kernel_thread_helper+0x7/0x10
          [<ffffffff>] 0xffffffff
        irq event stamp: 819992
        hardirqs last  enabled at (819992): [<c0350a16>] net_rx_action+0x39/0x1de
        hardirqs last disabled at (819991): [<c0350b1e>] net_rx_action+0x141/0x1de
        softirqs last  enabled at (817552): [<c01214e4>] __do_softirq+0xa3/0xa8
        softirqs last disabled at (819987): [<c0106051>] do_softirq+0x5b/0xc9
      
        other info that might help us debug this:
        no locks held by swapper/1.
      
        stack backtrace:
         [<c0104d88>] dump_trace+0x63/0x1e8
         [<c0104f26>] show_trace_log_lvl+0x19/0x2e
         [<c010532d>] show_trace+0x12/0x14
         [<c0105343>] dump_stack+0x14/0x16
         [<c0134980>] print_usage_bug+0x23c/0x246
         [<c0134d33>] mark_lock+0x108/0x39c
         [<c01356a7>] __lock_acquire+0x361/0x9ed
         [<c0136018>] lock_acquire+0x56/0x72
         [<c03aff1f>] _spin_lock+0x35/0x42
         [<c0350a41>] net_rx_action+0x64/0x1de
         [<c0121493>] __do_softirq+0x52/0xa8
         [<c0106051>] do_softirq+0x5b/0xc9
         [<c0121338>] irq_exit+0x3c/0x48
         [<c0106163>] do_IRQ+0xa4/0xbd
         [<c01047c6>] common_interrupt+0x2e/0x34
         [<c011db92>] vprintk+0x2c0/0x309
         [<c011dbf6>] printk+0x1b/0x1d
         [<c01003f2>] init+0x80/0x24e
         [<c01049cf>] kernel_thread_helper+0x7/0x10
         =======================
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      Acked-by: NJeff Garzik <jeff@garzik.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      b57bd066
    • I
      [PATCH] lockdep: fix seqlock_init() · 99a3eb38
      Ingo Molnar 提交于
      seqlock_init() needs to use spin_lock_init() for dynamic locks, so that
      lockdep is notified about the presence of a new lock.
      
      (this is a fallout of the recent networking merge, which started using
      the so-far unused seqlock_init() API.)
      
      This fix solves the following lockdep-internal warning on current -git:
      
       INFO: trying to register non-static key.
       the code is fine but needs lockdep annotation.
       turning off the locking correctness validator.
           __lock_acquire+0x10c/0x9f9
           lock_acquire+0x56/0x72
           _spin_lock+0x35/0x42
           neigh_destroy+0x9d/0x12e
           neigh_periodic_timer+0x10a/0x15c
           run_timer_softirq+0x126/0x18e
           __do_softirq+0x6b/0xe6
           do_softirq+0x64/0xd2
           ksoftirqd+0x82/0x138
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      99a3eb38
    • L
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb · d907dd2e
      Linus Torvalds 提交于
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
        V4L/DVB (4954): Fix: On ia64, i2c adap->inb/adap->outb are wrongly evaluated
      d907dd2e
  2. 12 12月, 2006 21 次提交