1. 03 5月, 2007 10 次提交
    • J
      PCI: Require vendor and device for new_id · 6ba18636
      Jean Delvare 提交于
      Currently, there is no minimum number of fields required when adding
      a new device ID to a PCI driver through the new_id sysfs file. It is
      possible to add a new ID with only the vendor ID set, causing the
      driver to attempt to attach to all PCI devices from that vendor. This
      has been reported to happen accidentally:
        http://lists.lm-sensors.org/pipermail/lm-sensors/2007-March/019366.html
      It is even possible to not even set the vendor ID field, causing the
      driver to attempt to attach to _all_ the PCI devices.
      
      This sounds dangerous and I fail to see any valid use of this
      "feature". Thus I suggest that we now require at least the first two
      fields (vendor ID and device ID) to be set. For what it's worth, this
      is what the USB subsystem does.
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      6ba18636
    • J
      PCI: fix sysfs rom file creation for BIOS ROM shadows · 40ee9e9f
      Jesse Barnes 提交于
      At one time, if a BIOS ROM shadow was detected for the boot video
      device (stored at offset 0xc0000), we'd set a special resource flag,
      IORESOURCE_ROM_SHADOW, so that the sysfs ROM file code could handle
      it properly.  That broke along the way somewhere though, so current
      kernels will be missing 'rom' files in sysfs if the video device
      doesn't have an explicit ROM BAR.
      
      This patch fixes the regression by moving the video fixup quirk to a
      little later in the boot cycle (to avoid having its work undone by
      PCI resource allocation) and checking in the PCI sysfs code whether
      a rom file should be created due to a shadow resource, which is also
      moved to a little later in the boot cycle so it will occur after the
      video fixup.  Tested and works on my i386 test box.
      Signed-off-by: NJesse Barnes <jbarnes@virtuousgeek.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      40ee9e9f
    • R
      PCI: kernel-doc fix · 8d7d86e9
      Randy Dunlap 提交于
      Warning(linux-2621-rc3g7/drivers/pci/pci.c:1283): No description found for parameter 'dev'
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      8d7d86e9
    • J
      PCI: Cleanup the includes of <linux/pci.h> · 6473d160
      Jean Delvare 提交于
      I noticed that many source files include <linux/pci.h> while they do
      not appear to need it. Here is an attempt to clean it all up.
      
      In order to find all possibly affected files, I searched for all
      files including <linux/pci.h> but without any other occurence of "pci"
      or "PCI". I removed the include statement from all of these, then I
      compiled an allmodconfig kernel on both i386 and x86_64 and fixed the
      false positives manually.
      
      My tests covered 66% of the affected files, so there could be false
      positives remaining. Untested files are:
      
      arch/alpha/kernel/err_common.c
      arch/alpha/kernel/err_ev6.c
      arch/alpha/kernel/err_ev7.c
      arch/ia64/sn/kernel/huberror.c
      arch/ia64/sn/kernel/xpnet.c
      arch/m68knommu/kernel/dma.c
      arch/mips/lib/iomap.c
      arch/powerpc/platforms/pseries/ras.c
      arch/ppc/8260_io/enet.c
      arch/ppc/8260_io/fcc_enet.c
      arch/ppc/8xx_io/enet.c
      arch/ppc/syslib/ppc4xx_sgdma.c
      arch/sh64/mach-cayman/iomap.c
      arch/xtensa/kernel/xtensa_ksyms.c
      arch/xtensa/platform-iss/setup.c
      drivers/i2c/busses/i2c-at91.c
      drivers/i2c/busses/i2c-mpc.c
      drivers/media/video/saa711x.c
      drivers/misc/hdpuftrs/hdpu_cpustate.c
      drivers/misc/hdpuftrs/hdpu_nexus.c
      drivers/net/au1000_eth.c
      drivers/net/fec_8xx/fec_main.c
      drivers/net/fec_8xx/fec_mii.c
      drivers/net/fs_enet/fs_enet-main.c
      drivers/net/fs_enet/mac-fcc.c
      drivers/net/fs_enet/mac-fec.c
      drivers/net/fs_enet/mac-scc.c
      drivers/net/fs_enet/mii-bitbang.c
      drivers/net/fs_enet/mii-fec.c
      drivers/net/ibm_emac/ibm_emac_core.c
      drivers/net/lasi_82596.c
      drivers/parisc/hppb.c
      drivers/sbus/sbus.c
      drivers/video/g364fb.c
      drivers/video/platinumfb.c
      drivers/video/stifb.c
      drivers/video/valkyriefb.c
      include/asm-arm/arch-ixp4xx/dma.h
      sound/oss/au1550_ac97.c
      
      I would welcome test reports for these files. I am fine with removing
      the untested files from the patch if the general opinion is that these
      changes aren't safe. The tested part would still be nice to have.
      
      Note that this patch depends on another header fixup patch I submitted
      to LKML yesterday:
        [PATCH] scatterlist.h needs types.h
        http://lkml.org/lkml/2007/3/01/141Signed-off-by: NJean Delvare <khali@linux-fr.org>
      Cc: Badari Pulavarty <pbadari@us.ibm.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      6473d160
    • J
      PCI: scatterlist.h needs types.h · a9dfd281
      Jean Delvare 提交于
      Most architectures' scatterlist.h use the type dma_addr_t, but omit to
      include <asm/types.h> which defines it.  This could lead to build failures,
      so let's add the missing includes.
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      a9dfd281
    • K
      PCI: fix multiple definition of `queue_pushbutton_work' · e325e1f0
      Kristen Carlson Accardi 提交于
      Fix duplicate names in shpchp and pciehp.
      Signed-off-by: NKristen Carlson Accardi <kristen.c.accardi@intel.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      
      e325e1f0
    • K
      pciehp: Adapt to device driver model · 92333526
      Kenji Kaneshige 提交于
      This patch adapts PCIEHP driver to PCI device driver model.
      Signed-off-by: NKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
      Signed-off-by: NKristen Carlson Accardi <kristen.c.accardi@intel.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      92333526
    • K
      pciehp: Event handling rework · 5d386e1a
      Kenji Kaneshige 提交于
      The event handler of PCIEHP driver is unnecessarily very complex. In
      addition, current event handler can only a fixed number of events at
      the same time, and some of events would be lost if several number of
      events happened at the same time.
      
      This patch simplify the event handler using 'work queue', and it also
      fix the above-mentioned issue.
      Signed-off-by: NKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
      Signed-off-by: NKristen Carlson Accardi <kristen.c.accardi@intel.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      5d386e1a
    • B
      pci: New PCI-E reset API · f7bdd12d
      Brian King 提交于
      Adds a new API which can be used to issue various types
      of PCI-E reset, including PCI-E warm reset and PCI-E hot reset.
      This is needed for an ipr PCI-E adapter which does not properly
      implement BIST. Running BIST on this adapter results in PCI-E
      errors. The only reliable reset mechanism that exists on this
      hardware is PCI Fundamental reset (warm reset). Since driving
      this type of reset is architecture unique, this provides the
      necessary hooks for architectures to add this support.
      Signed-off-by: NBrian King <brking@linux.vnet.ibm.com>
      Acked-by: NLinas Vepstas <linas@austin.ibm.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      f7bdd12d
    • M
      PCI: Flush MSI-X table writes · 988cbb15
      Mitch Williams 提交于
      This patch fixes a kernel bug which is triggered when using the
      irqbalance daemon with MSI-X hardware.
      
      Because both MSI-X interrupt messages and MSI-X table writes are posted,
      it's possible for them to cross while in-flight.  This results in
      interrupts being received long after the kernel thinks they're disabled,
      and in interrupts being sent to stale vectors after rebalancing.
      
      This patch performs a read flush after writes to the MSI-X table for
      mask and unmask operations.  Since the SMP affinity is set while
      the interrupt is masked, and since it's unmasked immediately after,
      no additional flushes are required in the various affinity setting
      routines.
      
      This patch has been validated with (unreleased) network hardware which
      uses MSI-X.
      
      Revised with input from Eric Biederman.
      Signed-off-by: NMitch Williams <mitch.a.williams@intel.com>
      Acked-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      988cbb15
  2. 01 5月, 2007 11 次提交
  3. 30 4月, 2007 19 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 40caf5ea
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (56 commits)
        ieee1394: remove garbage from Kconfig
        ieee1394: more help in Kconfig
        ieee1394: ohci1394: Fix mistake in printk message.
        ieee1394: ohci1394: remove unnecessary rcvPhyPkt bit flipping in LinkControl register
        ieee1394: ohci1394: fix cosmetic problem in error logging
        ieee1394: eth1394: send async streams at S100 on 1394b buses
        ieee1394: eth1394: fix error path in module_init
        ieee1394: eth1394: correct return codes in hard_start_xmit
        ieee1394: eth1394: hard_start_xmit is called in atomic context
        ieee1394: eth1394: some conditions are unlikely
        ieee1394: eth1394: clean up fragment_overlap
        ieee1394: eth1394: don't use alloc_etherdev
        ieee1394: eth1394: omit useless set_mac_address callback
        ieee1394: eth1394: CONFIG_INET is always defined
        ieee1394: eth1394: allow MTU bigger than 1500
        ieee1394: unexport highlevel_host_reset
        ieee1394: eth1394: contain host reset
        ieee1394: eth1394: shorter error messages
        ieee1394: eth1394: correct a memset argument
        ieee1394: eth1394: refactor .probe and .update
        ...
      40caf5ea
    • L
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid · d6454706
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid: (21 commits)
        USB HID: don't warn on idVendor == 0
        USB HID: add 'quirks' module parameter
        USB HID: add support for dynamically-created quirks
        USB HID: clarify static quirk handling as squirks
        USB HID: encapsulate quirk handling into hid-quirks.c
        USB HID: EMS USBII device needs HID_QUIRK_MULTI_INPUT
        HID: update copyright and authorship macro
        HID: introduce proper zeroing of unused bits in output reports
        USB HID: add support for WiseGroup MP-8800 Quad Joypad
        USB HID: add FF support for Logitech Force 3D Pro Joystick
        USB HID: numlock quirk for dell W7658 keyboard
        USB HID: Logitech MX3000 keyboard needs report descriptor quirk
        USB HID: extend quirk for Logitech S510 keyboard
        USB HID: usbkbd/usbmouse - handle errors when registering devices
        USB HID: add QUIRK_HIDDEV for Belkin Flip KVM
        HID: enable dead keys on a belkin wireless keyboard
        USB HID: Thustmaster firestorm dual power v1 support
        USB HID: specify explicit size for hid_blacklist.quirks
        USB HID: fix retry & reset logic
        USB HID: consolidate vendor/product ids
        ...
      d6454706
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 152a6a9d
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
        [IPV4] SNMP: Support OutMcastPkts and OutBcastPkts
        [IPV4] SNMP: Support InMcastPkts and InBcastPkts
        [IPV4] SNMP: Support InTruncatedPkts
        [IPV4] SNMP: Support InNoRoutes
        [SNMP]: Add definitions for {In,Out}BcastPkts
        [TCP] FRTO: RFC4138 allows Nagle override when new data must be sent
        [TCP] FRTO: Delay skb available check until it's mandatory
        [XFRM]: Restrict upper layer information by bundle.
        [TCP]: Catch skb with S+L bugs earlier
        [PATCH] INET : IPV4 UDP lookups converted to a 2 pass algo
        [L2TP]: Add the ability to autoload a pppox protocol module.
        [SKB]: Introduce skb_queue_walk_safe()
        [AF_IUCV/IUCV]: smp_call_function deadlock
        [IPV6]: Fix slab corruption running ip6sic
        [TCP]: Update references in two old comments
        [XFRM]: Export SPD info
        [IPV6]: Track device renames in snmp6.
        [SCTP]: Fix sctp_getsockopt_local_addrs_old() to use local storage.
        [NET]: Remove NETIF_F_INTERNAL_STATS, default to internal stats.
        [NETPOLL]: Remove CONFIG_NETPOLL_RX
        ...
      152a6a9d
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block · cd9bb7e7
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
        [PATCH] elevator: elv_list_lock does not need irq disabling
        [BLOCK] Don't pin lots of memory in mempools
        cfq-iosched: speedup cic rb lookup
        ll_rw_blk: add io_context private pointer
        cfq-iosched: get rid of cfqq hash
        cfq-iosched: tighten queue request overlap condition
        cfq-iosched: improve sync vs async workloads
        cfq-iosched: never allow an async queue idling
        cfq-iosched: get rid of ->dispatch_slice
        cfq-iosched: don't pass unused preemption variable around
        cfq-iosched: get rid of ->cur_rr and ->cfq_list
        cfq-iosched: slice offset should take ioprio into account
        [PATCH] cfq-iosched: style cleanups and comments
        cfq-iosched: sort IDLE queues into the rbtree
        cfq-iosched: sort RT queues into the rbtree
        [PATCH] cfq-iosched: speed up rbtree handling
        cfq-iosched: rework the whole round-robin list concept
        cfq-iosched: minor updates
        cfq-iosched: development update
        cfq-iosched: improve preemption for cooperating tasks
      cd9bb7e7
    • L
      Merge branch 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 24a77daf
      Linus Torvalds 提交于
      * 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (255 commits)
        [POWERPC] Remove dev_dbg redefinition in drivers/ps3/vuart.c
        [POWERPC] remove kernel module option for booke wdt
        [POWERPC] Avoid putting cpu node twice
        [POWERPC] Spinlock initializer cleanup
        [POWERPC] ppc4xx_sgdma needs dma-mapping.h
        [POWERPC] arch/powerpc/sysdev/timer.c build fix
        [POWERPC] get_property cleanups
        [POWERPC] Remove the unused HTDMSOUND driver
        [POWERPC] cell: cbe_cpufreq cleanup and crash fix
        [POWERPC] Declare enable_kernel_spe in a header
        [POWERPC] Add dt_xlate_addr() to bootwrapper
        [POWERPC] bootwrapper: CONFIG_ -> CONFIG_DEVICE_TREE
        [POWERPC] Don't define a custom bd_t for Xilixn Virtex based boards.
        [POWERPC] Add sane defaults for Xilinx EDK generated xparameters files
        [POWERPC] Add uartlite boot console driver for the zImage wrapper
        [POWERPC] Stop using ppc_sys for Xilinx Virtex boards
        [POWERPC] New registration for common Xilinx Virtex ppc405 platform devices
        [POWERPC] Merge common virtex header files
        [POWERPC] Rework Kconfig dependancies for Xilinx Virtex ppc405 platform
        [POWERPC] Clean up cpufreq Kconfig dependencies
        ...
      24a77daf
    • M
      [IPV4] SNMP: Support OutMcastPkts and OutBcastPkts · 80787ebc
      Mitsuru Chinen 提交于
      A transmitted IP multicast datagram should be counted as OutMcastPkts.
      By the same token, a transmitted IP broadcast datagram should be
      counted as OutBcastPkts.
      Signed-off-by: NMitsuru Chinen <mitch@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      80787ebc
    • M
      [IPV4] SNMP: Support InMcastPkts and InBcastPkts · 5506b54b
      Mitsuru Chinen 提交于
      A received IP multicast datagram should be counted as InMcastPkts.
      By the same token, a received IP broadcast datagram should be
      counted as InBcastPkts.
      Signed-off-by: NMitsuru Chinen <mitch@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5506b54b
    • M
      [IPV4] SNMP: Support InTruncatedPkts · 704aed53
      Mitsuru Chinen 提交于
      An IP datagram which is being discarded because the datagram frame
      didn't carry enough data should be counted as InTruncatedPkts.
      Signed-off-by: NMitsuru Chinen <mitch@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      704aed53
    • M
      [IPV4] SNMP: Support InNoRoutes · e91a47eb
      Mitsuru Chinen 提交于
      An IP datagram which is being discarded because of no routes in the
      forwarding path should be counted as InNoRoutes.
      Signed-off-by: NMitsuru Chinen <mitch@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e91a47eb
    • M
      [SNMP]: Add definitions for {In,Out}BcastPkts · 71ff6c0a
      Mitsuru Chinen 提交于
      The updated IP-MIB RFC (RFC4293) specifys new objects, InBcastPkts
      and OutBcastPkts. This adds definitions for them.
      Signed-off-by: NMitsuru Chinen <mitch@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      71ff6c0a
    • I
      [TCP] FRTO: RFC4138 allows Nagle override when new data must be sent · d551e454
      Ilpo Järvinen 提交于
      This is a corner case where less than MSS sized new data thingie
      is awaiting in the send queue. For F-RTO to work correctly, a
      new data segment must be sent at certain point or F-RTO cannot
      be used at all. RFC4138 allows overriding of Nagle at that
      point.
      
      Implementation uses frto_counter states 2 and 3 to distinguish
      when Nagle override is needed.
      Signed-off-by: NIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d551e454
    • I
      [TCP] FRTO: Delay skb available check until it's mandatory · 575ee714
      Ilpo Järvinen 提交于
      No new data is needed until the first ACK comes, so no need to check
      for application limitedness until then.
      Signed-off-by: NIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      575ee714
    • M
      [XFRM]: Restrict upper layer information by bundle. · 157bfc25
      Masahide NAKAMURA 提交于
      On MIPv6 usage, XFRM sub policy is enabled.
      When main (IPsec) and sub (MIPv6) policy selectors have the same
      address set but different upper layer information (i.e. protocol
      number and its ports or type/code), multiple bundle should be created.
      However, currently we have issue to use the same bundle created for
      the first time with all flows covered by the case.
      
      It is useful for the bundle to have the upper layer information
      to be restructured correctly if it does not match with the flow.
      
      1. Bundle was created by two policies
      Selector from another policy is added to xfrm_dst.
      If the flow does not match the selector, it goes to slow path to
      restructure new bundle by single policy.
      
      2. Bundle was created by one policy
      Flow cache is added to xfrm_dst as originated one. If the flow does
      not match the cache, it goes to slow path to try searching another
      policy.
      Signed-off-by: NMasahide NAKAMURA <nakam@linux-ipv6.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      157bfc25
    • I
      [TCP]: Catch skb with S+L bugs earlier · 34588b4c
      Ilpo Järvinen 提交于
      SACKED_ACKED and LOST are mutually exclusive with SACK, thus
      having their sum larger than packets_out is bug with SACK.
      Eventually these bugs trigger traps in the tcp_clean_rtx_queue
      with SACK but it's much more informative to do this here.
      
      Non-SACK TCP, however, could get more than packets_out duplicate
      ACKs which each increment sacked_out, so it makes sense to do
      this kind of limitting for non-SACK TCP but not for SACK enabled
      one. Perhaps the author had the opposite in mind but did the
      logic accidently wrong way around? Anyway, the sacked_out
      incrementer code for non-SACK already deals this issue before
      calling sync_left_out so this trapping can be done
      unconditionally.
      Signed-off-by: NIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      34588b4c
    • E
      [PATCH] INET : IPV4 UDP lookups converted to a 2 pass algo · 6aaf47fa
      Eric Dumazet 提交于
      Some people want to have many UDP sockets, binded to a single port but
      many different addresses. We currently hash all those sockets into a
      single chain.  Processing of incoming packets is very expensive,
      because the whole chain must be examined to find the best match.
      
      I chose in this patch to hash UDP sockets with a hash function that
      take into account both their port number and address : This has a
      drawback because we need two lookups : one with a given address, one
      with a wildcard (null) address.
      Signed-off-by: NEric Dumazet <dada1@cosmosbay.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6aaf47fa
    • J
      [L2TP]: Add the ability to autoload a pppox protocol module. · 65def812
      James Chapman 提交于
      This patch allows a name "pppox-proto-nnn" to be used in modprobe.conf
      to autoload a PPPoX protocol nnn.
      Signed-off-by: NJames Chapman <jchapman@katalix.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      65def812
    • J
      Merge branch 'cfq' into for-linus · 07e44708
      Jens Axboe 提交于
      07e44708
    • J
      [PATCH] elevator: elv_list_lock does not need irq disabling · 2a12dcd7
      Jens Axboe 提交于
      It's never grabbed from irq context, so just make it plain spin_lock().
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      2a12dcd7
    • J
      [BLOCK] Don't pin lots of memory in mempools · 5972511b
      Jens Axboe 提交于
      Currently we scale the mempool sizes depending on memory installed
      in the machine, except for the bio pool itself which sits at a fixed
      256 entry pre-allocation.
      
      There's really no point in "optimizing" this OOM path, we just need
      enough preallocated to make progress. A single unit is enough, lets
      scale it down to 2 just to be on the safe side.
      
      This patch saves ~150kb of pinned kernel memory on a 32-bit box.
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      5972511b