1. 13 Jul, 2006 16 commits
    • David S. Miller's avatar
      [SPARC]: Fix OF register translations under sub-PCI busses. · a83f9823
      David S. Miller authored
      There is an implicit assumption in the code that ranges will translate
      to something that can fit in 2 32-bit cells, or a 64-bit value.  For
      certain kinds of things below PCI this isn't necessarily true.
      
      Here is what the relevant OF device hierarchy looks like for one of
      the serial controllers on an Ultra5:
      
          Node 0xf005f1e0
              ranges:      00000000.00000000.00000000.000001fe.01000000.00000000.01000000
                           01000000.00000000.00000000.000001fe.02000000.00000000.01000000
                           02000000.00000000.00000000.000001ff.00000000.00000001.00000000
                           03000000.00000000.00000000.000001ff.00000000.00000001.00000000
              device_type:  'pci'
              model:  'SUNW,sabre'
      
              Node 0xf005f9d4
                  device_type:  'pci'
                  model:  'SUNW,simba'
      
                 Node 0xf0060d24
                      ranges:  00000010.00000000 82010810.00000000.f0000000 01000000
      			 00000014.00000000 82010814.00000000.f1000000 00800000
                      name:  'ebus'
      
                      Node 0xf0062dac
                          reg:  00000014.003083f8.00000008 --> 0x1ff.f13083f8
                          device_type:  'serial'
                          name:  'su'
      
      So the correct translation here is:
      
      1) Match "su" register to second ranges entry of 'ebus', which translates
         into a PCI triplet "82010814.00000000.f1000000" of size 00800000, which
         gives us "82010814.00000000.f13083f8".
      
      2) Pass-through "SUNW,simba" since it lacks ranges property
      
      3) Match "82010814.00000000.f13083f8" to third ranges property of PCI
         controller node 'SUNW,sabre', and we arrive at the final physical
         MMIO address of "0x1fff13083f8".
      
      Due to the 2-cell assumption, we couldn't translate to a PCI 3-cell
      value, and we couldn't perform a pass-thru on it either.
      
      It was easiest to just stop splitting the ranges application operation
      between two methods, ->map and ->translate, and just let ->map do all
      the work.  That way it would work purely on 32-bit cell arrays instead
      of having to "return" some value like a u64.
      
      It's still not %100 correct because the out-of-range check is still
      done using the 64 least significant bits of the range and address.
      But it does work for all the cases I've thrown at it so far.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a83f9823
    • David S. Miller's avatar
      [SPARC64]: Refine Sabre wsync logic. · 9bbd952e
      David S. Miller authored
      It is only needed when there is a PCI-PCI bridge sitting
      between the device and the PCI host controller which is
      not a Simba APB bridge.
      
      Add logic to handle two special cases:
      
      1) device behind EBUS, which sits on PCI
      2) PCI controller interrupts
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9bbd952e
    • David S. Miller's avatar
      [SERIAL] sunsu: Handle keyboard and mouse ports directly. · 91d1ed1a
      David S. Miller authored
      The sunsu_ports[] array exists merely to be able to easily
      use an integer index to get at the proper serial console
      port struct.
      
      We size this only for real ports, not for the keyboard and
      mouse, and thus keyboard and mouse port registration would
      fail.
      
      Fix this by dynamically allocating the port struct for the
      keyboard and mouse, instead of using the sunsu_ports[]
      array.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      91d1ed1a
    • David S. Miller's avatar
      [SPARC64]: Fix 2 bugs in sabre_irq_build() · a23c3a86
      David S. Miller authored
      When installing the IRQ pre-handler, we were not setting up the second
      argument correctly.  It should be a pointer to the sabre_irq_data, not
      the config space PIO address.
      
      Furthermore, we only need this pre-handler installed if the device
      sits behind a PCI bridge that is not Sabre or Simba/APB.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a23c3a86
    • David S. Miller's avatar
      [SPARC64]: Update defconfig. · 17556fe8
      David S. Miller authored
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      17556fe8
    • David Woodhouse's avatar
      [SPARC64]: Fix make headers_install · 50f73fe0
      David Woodhouse authored
      A minor typo in the include/asm-sparc64/Kbuild file prevents the make
      headers_install from building a useful tree of kernel headers for
      sparc64.
      Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
      Signed-off-by: default avatarTom "spot" Callaway <tcallawa@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      50f73fe0
    • Andrew Morton's avatar
      [SPARC64]: of_device_register() error checking fix · 6cc8b6f5
      Andrew Morton authored
      device_create_file() can fail.  This causes the sparc64 compile to
      fail when my fanatical __must_check patch is applied, due to -Werror.
      
      [ Added necessary identical fix for sparc32. -DaveM]
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6cc8b6f5
    • Linus Torvalds's avatar
      Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD · e47f3178
      Linus Torvalds authored
      * HEAD:
        [NET]: fix __sk_stream_mem_reclaim
        [Bluetooth] Fix deadlock in the L2CAP layer
        [Bluetooth] Let BT_HIDP depend on INPUT
        [Bluetooth] Avoid NULL pointer dereference with tty->driver
        [Bluetooth] Remaining transitions to use kzalloc()
        [WAN]: converting generic HDLC to use netif_dormant*()
        [IPV4]: Fix error handling for fib_insert_node call
        [NETROM] lockdep: fix false positive
        [ROSE] lockdep: fix false positive
        [AX.25]: Optimize AX.25 socket list lock
        [IPCOMP]: Fix truesize after decompression
        [IPV6]: Use ipv6_addr_src_scope for link address sorting.
        [TCP] tcp_highspeed: Fix AI updates.
        [MAINTAINERS]: Add proper entry for TC classifier
        [NETROM]: Drop lock before calling nr_destroy_socket
        [NETROM]: Fix locking order when establishing a NETROM circuit.
        [AX.25]: Fix locking of ax25 protocol function list.
        [IPV6]: order addresses by scope
      e47f3178
    • Linus Torvalds's avatar
      Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 of HEAD · a0486407
      Linus Torvalds authored
      * HEAD:
        [PATCH] hwmon: Documentation update for abituguru
        [PATCH] hwmon: Fix for first generation Abit uGuru chips
        [PATCH] hwmon: New maintainer for w83791d
        [PATCH] pca9539: Honor the force parameter
        [PATCH] i2c-algo-bit: Wipe out dead code
        [PATCH] i2c: Handle i2c_add_adapter failure in i2c algorithm drivers
        [PATCH] i2c: New mailing list
        [PATCH] i2c-ite: Plan for removal
        [PATCH] i2c-powermac: Fix master_xfer return value
        [PATCH] scx200_acb: Fix the block transactions
        [PATCH] scx200_acb: Fix the state machine
        [PATCH] i2c-iop3xx: Avoid addressing self
        [PATCH] i2c: Fix 'ignore' module parameter handling in i2c-core
      a0486407
    • Linus Torvalds's avatar
      Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 of HEAD · 2513eb8e
      Linus Torvalds authored
      * HEAD:
        [PATCH] The scheduled unexport of insert_resource
        [PATCH] remove kernel/power/pm.c:pm_unregister_all()
        [PATCH] Driver core: bus.c cleanups
        [PATCH] Driver core: kernel-doc in drivers/base/core.c corrections
        [PATCH] Driver core: fix driver-core kernel-doc
      2513eb8e
    • Linus Torvalds's avatar
      Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 of HEAD · d3745f46
      Linus Torvalds authored
      * HEAD:
        [PATCH] PCI: PCIE power management quirk
        [PATCH] PCI: add PCI Express AER register definitions to pci_regs.h
        [PATCH] PCI: Clear abnormal poweroff flag on VIA southbridges, fix resume
        [PATCH] PCI: poper prototype for arch/i386/pci/pcbios.c:pcibios_sort()
      d3745f46
    • Linus Torvalds's avatar
      Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 of HEAD · 70d002bc
      Linus Torvalds authored
      * HEAD: (44 commits)
        [PATCH] USB: move usb-serial.h to include/linux/usb/
        [PATCH] USB: Anydata: Fixes wrong URB callback.
        [PATCH] USB: gadget section fixups
        [PATCH] USB: another unusual device
        [PATCH] USB: Add one VID/PID to ftdi_sio
        [PATCH] USB: unusual_devs entry for Sony DSC-H5
        [PATCH] USB: unusual_devs entry for Nokia E61
        [PATCH] USB: unusual_devs entry for Nokia N91
        [PATCH] USB: add ZyXEL vendor/product ID to rtl8150 driver
        [PATCH] USB: Option driver: new product ID
        [PATCH] USB: add support for WiseGroup., Ltd SmartJoy Dual PLUS Adapter
        [PATCH] USB: ipw.c driver fix
        [PATCH] USB: remove devfs information from Kconfig
        [PATCH] USB: remove empty destructor from drivers/usb/mon/mon_text.c
        [PATCH] USB: ipaq.c timing parameters
        [PATCH] USB: ipaq.c bugfixes
        [PATCH] USB: ehci: fix bogus alteration of a local variable
        [PATCH] USB: add driver for non-composite Sierra Wireless devices
        [PATCH] USB: fix pointer dereference in drivers/usb/misc/usblcd
        [PATCH] USB: Kill compiler warning in quirk_usb_handoff_ohci
        ...
      70d002bc
    • Linus Torvalds's avatar
      Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6 of HEAD · 7f0852f9
      Linus Torvalds authored
      * HEAD:
        [PATCH] w1: remove drivers/w1/w1.h
        [PATCH] w1: fix idle check loop in ds2482
        [PATCH] W1: remove w1 mail list from lm_sensors.
      7f0852f9
    • Linus Torvalds's avatar
      Revert "[PATCH] pcmcia: Make ide_cs work with the memory space of CF-Cards if... · 2f1b9250
      Linus Torvalds authored
      Revert "[PATCH] pcmcia: Make ide_cs work with the memory space of CF-Cards if IO space is not available"
      
      This reverts commit 5040cb8b.
      
      It breaks previously working ide-cs PIO configurations, causing problems
      like
      
      	ide2: I/O resource 0xF883200E-0xF883200E not free.
      	ide2: ports already in use, skipping probe
      
      rather than a working kernel.
      
      Cc: Thomas Kleffel <tk@maintech.de>
      Cc: Dominik Brodowski <linux@dominikbrodowski.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      2f1b9250
    • Len Brown's avatar
      [PATCH] Revert "ACPI: execute Notify() handlers on new thread" · 72945b2b
      Len Brown authored
      This effectively reverts commit b8d35192
      by reverts acpi_os_queue_for_execution() to what it was before that,
      except it changes the name to acpi_os_execute() to match ACPICA
      20060512.
      Signed-off-by: default avatarLen Brown <len.brown@intel.com>
      
      [ The thread execution doesn't actually solve the bug it set out to
        solve (see
      
      	http://bugzilla.kernel.org/show_bug.cgi?id=5534
      
        for more details) because the new events can get caught behind the AML
        semaphore or other serialization.  And when that happens, the notify
        threads keep on piling up until the system dies. ]
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      72945b2b
    • Ian McDonald's avatar
      [NET]: fix __sk_stream_mem_reclaim · a6f157a8
      Ian McDonald authored
      __sk_stream_mem_reclaim is only called by sk_stream_mem_reclaim.
      
      As such the check on sk->sk_forward_alloc is not needed and can be
      removed.
      Signed-off-by: default avatarIan McDonald <ian.mcdonald@jandi.co.nz>
      Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a6f157a8
  2. 12 Jul, 2006 24 commits