1. 24 Mar, 2006 17 commits
  2. 23 Mar, 2006 23 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 · b6585ded
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6: (36 commits)
        [PATCH] hwmon: add required idr locking
        [PATCH] I2C: hwmon: Rename register parameters
        [PATCH] I2C: Drop unneeded i2c-dev.h includes
        [PATCH] I2C: i2c-ixp4xx: Add hwmon class
        [PATCH] I2C: i2c-piix4: Add Broadcom HT-1000 support
        [PATCH] I2C: i2c-amd756-s4882: Improve static mutex initialization
        [PATCH] I2C: i2c-ali1535: Drop redundant mutex
        [PATCH] i2c: Cleanup isp1301_omap
        [PATCH] i2c: Fix i2c-ite name initialization
        [PATCH] i2c: Drop the i2c-frodo bus driver
        [PATCH] i2c: Optimize core_lists mutex usage
        [PATCH] w83781d: Don't reset the chip by default
        [PATCH] w83781d: Document the alarm and beep bits
        [PATCH] w83627ehf: Refactor the sysfs interface
        [PATCH] hwmon: Support the Pentium M VID code
        [PATCH] hwmon: Add support for the Winbond W83687THF
        [PATCH] hwmon: f71805f semaphore to mutex conversions
        [PATCH] hwmon: Semaphore to mutex conversions
        [PATCH] i2c: Semaphore to mutex conversions, part 3
        [PATCH] i2c: Semaphore to mutex conversions, part 2
        ...
      b6585ded
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 · a3ea9b58
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (49 commits)
        [PATCH] acpiphp: fix acpi_path_name
        [PATCH] ibmphp: remove TRUE and FALSE
        [PATCH] PCI Hotplug: add common acpi functions to core
        [PATCH] PCI: kzalloc() conversion in drivers/pci
        [PATCH] acpiphp: Scan slots under the nested P2P bridge
        [PATCH] PCI Hotplug: SN: Fix cleanup on hotplug removal of PPB
        [PATCH] shpchp: cleanup bus speed handling
        [PATCH] PCI: fix pci_request_region[s] arg
        [PATCH] PCI: Provide a boot parameter to disable MSI
        [PATCH] PCI: the scheduled removal of PCI_LEGACY_PROC
        [PATCH] PCI: cpqphp_ctrl.c: board_replaced(): remove dead code
        [PATCH] acpiphp: fix bridge handle
        [PATCH] acpiphp - slot management fix - V4
        [PATCH] acpi: remove dock event handling from ibm_acpi
        [PATCH] acpiphp: add dock event handling
        [PATCH] acpi: export acpi_bus_trim
        [PATCH] acpiphp: add new bus to acpi
        [PATCH] PCI: Move pci_dev_put outside a spinlock
        [PATCH] PCI: PCI/Cardbus cards hidden, needs pci=assign-busses to fix
        [PATCH] PCI: fix problems with MSI-X on ia64
        ...
      a3ea9b58
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 554f593d
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [TG3]: Update driver version and reldate.
        [TG3]: Add 5755 nvram support
        [TG3]: Add 5755 support
        [IPV6]: ip6_xmit: remove unnecessary NULL ptr check
        [NET_SCHED]: cls_u32: remove unnecessary NULL-ptr check
        [IPV4]: Add fib rule netlink notifications
        [BNX2]: Update version and reldate
        [BNX2]: Separate tx producer and consumer fields
        [BNX2]: Move .h files to bnx2.c
        [BNX2]: Combine small mem allocations
        [BNX2]: Fix link change handling
        [PKTGEN]: Add MPLS extension.
      554f593d
    • Linus Torvalds's avatar
      Merge git://oss.sgi.com:8090/oss/git/xfs-2.6 · debf798b
      Linus Torvalds authored
      * git://oss.sgi.com:8090/oss/git/xfs-2.6: (71 commits)
        [XFS] Sync up one/two other minor changes missed in previous merges.
        [XFS] Reenable the noikeep (delete inode cluster space) option by default.
        [XFS] Check that a page has dirty buffers before finding it acceptable for
        [XFS] Fixup naming inconsistencies found by Pekka Enberg and one from Jan
        [XFS] Explain the race closed by the addition of vn_iowait() to the start
        [XFS] Fixing the error caused by the conflict between DIO Write's
        [XFS] Fixing KDB's xrwtrc command, also added the current process id into
        [XFS] Fix compiler warning from xfs_file_compat_invis_ioctl prototype. 
        [XFS] remove bogus INT_GET for u8 variables in xfs_dir_leaf.c 
        [XFS] endianess annotations for xfs_da_node_hdr_t 
        [XFS] endianess annotations for xfs_da_node_entry_t 
        [XFS] store xfs_attr_inactive_list_t in native endian 
        [XFS] store xfs_attr_sf_sort in native endian 
        [XFS] endianess annotations for xfs_attr_shortform_t 
        [XFS] endianess annotations for xfs_attr_leaf_name_remote_t 
        [XFS] endianess annotations for xfs_attr_leaf_name_local_t 
        [XFS] endianess annotations for xfs_attr_leaf_entry_t 
        [XFS] endianess annotations for xfs_attr_leaf_hdr_t 
        [XFS] remove bogus INT_GET on u8 variables in xfs_dir2_block.c 
        [XFS] endianess annotations for xfs_da_blkinfo_t 
        ...
      debf798b
    • MUNEDA Takahiro's avatar
      [PATCH] acpiphp: fix acpi_path_name · b2e6e3ba
      MUNEDA Takahiro authored
      I encountered the problem that the insmod of the acpiphp
      fails because of the mis-freeing of the memory.
      
      I tested this patch on my tiger4 box.
      Signed-off-by: default avatarMUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      b2e6e3ba
    • Kristen Accardi's avatar
      [PATCH] ibmphp: remove TRUE and FALSE · dc6712d1
      Kristen Accardi authored
      This patch removes the defines TRUE and FALSE and just uses 0 or 1.
      Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      dc6712d1
    • Kristen Accardi's avatar
      [PATCH] PCI Hotplug: add common acpi functions to core · 783c49fc
      Kristen Accardi authored
      shpchprm_acpi.c and pciehprm_acpi.c are nearly identical.  In addition,
      there are functions in both these files that are also in acpiphp_glue.c.
      This patch will remove duplicate functions from shpchp, pciehp, and
      acpiphp and move this functionality to pci_hotplug, as it is not
      hardware specific.  Get rid of shpchprm* and pciehprm* files since they
      are no longer needed.  shpchprm_nonacpi.c and pciehprm_nonacpi.c are
      identical, as well as shpchprm_legacy.c and can be replaced with a
      macro.
      
      This patch also changes acpiphp to use the common hpp code.
      Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      783c49fc
    • Eric Sesterhenn's avatar
      [PATCH] PCI: kzalloc() conversion in drivers/pci · f5afe806
      Eric Sesterhenn authored
      this patch converts drivers/pci to kzalloc usage.
      Compile tested with allyes config.
      Signed-off-by: default avatarEric Sesterhenn <snakebyte@gmx.de>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      f5afe806
    • Kenji Kaneshige's avatar
      [PATCH] acpiphp: Scan slots under the nested P2P bridge · 7c8f25da
      Kenji Kaneshige authored
      Current ACPIPHP driver scans only slots under the top level PCI-to-PCI
      bridge. So hotplug PCI slots under the nested PCI-to-PCI bridge would
      not be detected. For example, if the system has the ACPI namespace
      like below, hotplug slots woule not be detected.
      
      Device (PCI0) {						/* Root bridge */
      	Name (_HID, "PNP0A03")
      	Device (P2PA) {					/* PCI-to-PCI bridge */
      		Name (_ADR, ...)
      		Device (P2PB) {				/* PCI-to-PCI bridge */
      			Name (_ADR, ...)
      			Device (S0F0) {			/* hotplug slot */
      				Name (_ADR, ...)
      				Name (_SUN, ...)
      				Method (_EJ0, ...) { ... }
      			}
      			...
      			Device (S0F7) {			/* hotplug slot */
      				Name (_ADR, ...)
      				Name (_SUN, ...)
      				Method (_EJ0, ...) { ... }
      			}
      			Device (S1F0) {			/* hotplug slot */
      				Name (_ADR, ...)
      				Name (_SUN, ...)
      				Method (_EJ0, ...) { ... }
      			}
      			...
      		}
      	}
      }
      
      This patch fixes this issue.
      Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      7c8f25da
    • John Keller's avatar
      [PATCH] PCI Hotplug: SN: Fix cleanup on hotplug removal of PPB · 8e77af6a
      John Keller authored
      When doing a hotplug removal of a PPB, sn_bus_store_sysdata()
      needs to be called for the PPB and all of its children.
      Acked-by: default avatarPrarit Bhargava <prarit@sgi.com>
      Signed-off-by: default avatarJohn Keller <jpk@sgi.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      8e77af6a
    • Kenji Kaneshige's avatar
      [PATCH] shpchp: cleanup bus speed handling · 0afabe90
      Kenji Kaneshige authored
      The code related to handling bus speed in SHPCHP driver is
      unnecessarily complex. This patch cleans up and simplify that.
      Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      0afabe90
    • Jeff Garzik's avatar
      [PATCH] PCI: fix pci_request_region[s] arg · 3c990e92
      Jeff Garzik authored
          Add missing 'const' to pci_request_region[s] 'res_name' arg,
          since we pass it directly to __request_region(), whose 'name' arg
          is also const.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      3c990e92
    • Matthew Wilcox's avatar
      [PATCH] PCI: Provide a boot parameter to disable MSI · 309e57df
      Matthew Wilcox authored
      Several drivers are starting to grow options to disable MSI.  However,
      it's often a host chipset issue, not something which individual drivers
      should handle.  So we add the pci=nomsi kernel parameter to allow the user
      to disable MSI modes for systems we haven't added to the quirk list yet.
      Signed-off-by: default avatarMatthew Wilcox <matthew@wil.cx>
      Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Acked-by: default avatarJeff Garzik <jeff@garzik.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      309e57df
    • Adrian Bunk's avatar
      [PATCH] PCI: the scheduled removal of PCI_LEGACY_PROC · 5eeca8e6
      Adrian Bunk authored
      This patch contains the scheduled removal of PCI_LEGACY_PROC.
      Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      5eeca8e6
    • Adrian Bunk's avatar
      [PATCH] PCI: cpqphp_ctrl.c: board_replaced(): remove dead code · 1305e918
      Adrian Bunk authored
      The Coverity checker correctly noted, that in function board_replaced in
      drivers/pci/hotplug/cpqphp_ctrl.c, the variable src always has the
      value 8, and therefore much code after the
      
      ...
                              if (rc || src) {
      ...
                                      if (rc)
                                              return rc;
                                      else
                                              return 1;
                              }
      ...
      
      can never be called.
      
      This patch removes the unreachable code in this function fixing kernel
      Bugzilla #6073.
      Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      1305e918
    • MUNEDA Takahiro's avatar
      [PATCH] acpiphp: fix bridge handle · 0cccd0c2
      MUNEDA Takahiro authored
      When hotplug slot is under the host bridge,
      DEVICE_ACPI_HANDLE(&bus->self->dev) fails since '&bus->self' was not set.
      This patch fixes it.
      
      This patch is based on kristen's latest patches.
      I tested this patch on my Tiger4.
      Signed-off-by: default avatarMUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      0cccd0c2
    • MUNEDA Takahiro's avatar
      [PATCH] acpiphp - slot management fix - V4 · e27da381
      MUNEDA Takahiro authored
      o This patch removes IDs (for slots management).
      o This patch removes the slot register/unregister processes
        from the init/exit phases. Instead, adds these processes
        in the bridge add/cleanup phases.
      o Currently, this change doesn't have any meanings. But
        these changes are needed to support p2p bridge(with
        hotplug slot)
      Signed-off-by: default avatarMUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com>
      Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      e27da381
    • Kristen Accardi's avatar
      [PATCH] acpi: remove dock event handling from ibm_acpi · 63e5f248
      Kristen Accardi authored
      Remove dock station support from ibm_acpi by default.  This support has
      been put into acpiphp instead.  Allow ibm_acpi to continue to provide
      docking station support via config option for laptops/docking stations
      that are not supported by acpiphp.
      Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      63e5f248
    • Kristen Accardi's avatar
      [PATCH] acpiphp: add dock event handling · 20416ea5
      Kristen Accardi authored
      These patches add generic dock event handling to acpiphp.  If there are
      pci devices that need to be inserted/removed after the dock event, the
      event notification will be handed down to the normal pci hotplug event
      handler in acpiphp so that new bridges/devices can be enumerated.
      
      Because some dock stations do not have pci bridges or pci devices that
      need to be inserted after a dock, acpiphp will remain loaded to handle
      dock events even if no hotpluggable pci slots are discovered.
      
      You probably need to have the pci=assign-busses kernel parameter enabled
      to use these patches, and you may not allow ibm_acpi to handle docking
      notifications and use this patch.
      
      This patch incorporates feedback provided by many.
      Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      20416ea5
    • Kristen Accardi's avatar
      [PATCH] acpi: export acpi_bus_trim · ceaba663
      Kristen Accardi authored
      Export the acpi_bus_trim function so that the pci hotplug driver can
      use it.
      Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      ceaba663
    • Kristen Accardi's avatar
      [PATCH] acpiphp: add new bus to acpi · 15a1ae74
      Kristen Accardi authored
      If we add a new bridge with subordinate busses, we should call make sure
      that acpi is notified so that the PRT (if present) can be read and drivers
      who have registered on this bus will be notified when it is started.
      Also make sure to use the max reserved bus number for the starting the bus
      scan.
      Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      15a1ae74
    • Alan Stern's avatar
      [PATCH] PCI: Move pci_dev_put outside a spinlock · b89b7ea0
      Alan Stern authored
      This patch (as659) fixes a might_sleep problem in the PCI core, by moving
      a call to pci_dev_put() outside the scope of a spinlock.
      Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      b89b7ea0
    • Bernhard Kaindl's avatar
      [PATCH] PCI: PCI/Cardbus cards hidden, needs pci=assign-busses to fix · 8c4b2cf9
      Bernhard Kaindl authored
      "In some cases, especially on modern laptops with a lot of PCI and cardbus
      bridges, we're unable to assign correct secondary/subordinate bus numbers
      to all cardbus bridges due to BIOS limitations unless we are using
      "pci=assign-busses" boot option." -- Ivan Kokshaysky (from a patch comment)
      
      Without it, Cardbus cards inserted are never seen by PCI because the parent
      PCI-PCI Bridge of the Cardbus bridge will not pass and translate Type 1 PCI
      configuration cycles correctly and the system will fail to find and
      initialise the PCI devices in the system.
      
      Reference: PCI-PCI Bridges: PCI Configuration Cycles and PCI Bus Numbering:
      http://www.science.unitn.it/~fiorella/guidelinux/tlk/node72.html
      
      The reason for this is that:
       ``All PCI busses located behind a PCI-PCI bridge must reside between the
      secondary bus number and the subordinate bus number (inclusive).''
      
      "pci=assign-busses" makes pcibios_assign_all_busses return 1 and this
      turns on PCI renumbering during PCI probing.
      
      Alan suggested to use DMI automatically set assign-busses on problem systems.
      
      The only question for me was where to put it.  I put it directly before
      scanning PCI bus into pcibios_scan_root() because it's called from legacy,
      acpi and numa and so it can be one place for all systems and configurations
      which may need it.
      
      AMD64 Laptops are also affected and fixed by assign-busses, and the code is
      also incuded from arch/x86_64/pci/ that place will also work for x86_64
      kernels, I only ifdef'-ed the x86-only Laptop in this example.
      
      Affected and known or assumed to be fixed with it are (found by googling):
      
      * ASUS Z71V and L3s
      * Samsung X20
      * Compaq R3140us and all Compaq R3000 series laptops with TI1620 Controller,
        also Compaq R4000 series (from a kernel.org bugreport)
      * HP zv5000z (AMD64 3700+, known that fixup_parent_subordinate_busnr fixes it)
      * HP zv5200z
      * IBM ThinkPad 240
      * An IBM ThinkPad (1.8 GHz Pentium M) debugged by Pavel Machek
        gives the correspondig message which detects the possible problem.
      * MSI S260 / Medion SIM 2100 MD 95600
      
      The patch also expands the "try pci=assign-busses" warning so testers will
      help us to update the DMI table.
      
      Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Cc: Dominik Brodowski <linux@dominikbrodowski.net>
      Cc: Russell King <rmk@arm.linux.org.uk>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      8c4b2cf9