bk://kernel.bkbits.net/gregkh/linux/pci-2.6
greg@kroah.com|ChangeSet|20040804221241|62622 greg
# This is a BitKeeper generated diff -Nru style patch.
#
# drivers/pci/hotplug/rpaphp_pci.c
# 2004/07/02 08:59:36-07:00 lxiep@us.ibm.com +18 -3
# PCI Hotplug: rpaphp_add_slot.patch
#
# ChangeSet
# 2004/08/04 17:55:19-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6
# into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/08/04 17:55:15-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/04 14:48:42-07:00 greg@kroah.com
# Merge kroah.com:/home/greg/linux/BK/bleed-2.6
# into kroah.com:/home/greg/linux/BK/pci-2.6
#
# include/linux/pci_ids.h
# 2004/08/04 14:48:28-07:00 greg@kroah.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/04 08:45:13-04:00 dwmw2@shinybook.infradead.org
# PCI quirks -- other architectures
#
# Mostly just removing empty pcibios_fixups[] arrays.
#
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# arch/v850/kernel/rte_mb_a_pci.c
# 2004/08/04 08:44:54-04:00 dwmw2@shinybook.infradead.org +0 -2
# Remove pcibios_fixups[]
#
# arch/sparc64/kernel/pci.c
# 2004/08/04 08:44:54-04:00 dwmw2@shinybook.infradead.org +0 -4
# Remove pcibios_fixups[]
#
# arch/sparc/kernel/pcic.c
# 2004/08/04 08:44:54-04:00 dwmw2@shinybook.infradead.org +0 -4
# Remove pcibios_fixups[]
#
# arch/sh64/kernel/pci_sh5.c
# 2004/08/04 08:44:54-04:00 dwmw2@shinybook.infradead.org +1 -6
# Remove pcibios_fixups[]
#
# arch/sh/drivers/pci/pci-st40.c
# 2004/08/04 08:44:53-04:00 dwmw2@shinybook.infradead.org +1 -7
# Remove pcibios_fixups[]
#
# arch/sh/drivers/pci/pci-sh7751.c
# 2004/08/04 08:44:53-04:00 dwmw2@shinybook.infradead.org +1 -8
# Remove pcibios_fixups[]
#
# arch/sh/drivers/pci/fixups-dreamcast.c
# 2004/08/04 08:44:53-04:00 dwmw2@shinybook.infradead.org +1 -5
# Remove pcibios_fixups[]
#
# arch/sh/boards/overdrive/galileo.c
# 2004/08/04 08:44:53-04:00 dwmw2@shinybook.infradead.org +1 -7
# Remove pcibios_fixups[]
#
# arch/sh/boards/mpc1211/pci.c
# 2004/08/04 08:44:53-04:00 dwmw2@shinybook.infradead.org +1 -8
# Remove pcibios_fixups[]
#
# arch/m68knommu/kernel/comempci.c
# 2004/08/04 08:44:53-04:00 dwmw2@shinybook.infradead.org +0 -2
# Remove pcibios_fixups[]
#
# arch/m68k/kernel/bios32.c
# 2004/08/04 08:44:53-04:00 dwmw2@shinybook.infradead.org +0 -5
# Remove pcibios_fixups[]
#
# arch/ia64/pci/pci.c
# 2004/08/04 08:44:53-04:00 dwmw2@shinybook.infradead.org +0 -2
# Remove pcibios_fixups[]
#
# arch/i386/pci/numa.c
# 2004/08/04 08:44:53-04:00 dwmw2@shinybook.infradead.org +1 -4
# Remove pcibios_fixup[]
#
# arch/alpha/kernel/pci.c
# 2004/08/04 08:44:53-04:00 dwmw2@shinybook.infradead.org +5 -10
# Remove pcibios_fixups[]
#
# ChangeSet
# 2004/08/04 08:43:07-04:00 dwmw2@shinybook.infradead.org
# PCI quirks -- ppc64
#
# Remove pcibios_fixups[] array and move the declarations to live with
# the implementations. Remove unneeded pcibios_name_device() on iSeries.
#
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# arch/ppc64/kernel/pmac_pci.c
# 2004/08/04 08:42:49-04:00 dwmw2@shinybook.infradead.org +1 -0
# Declare own fixup for SATA
#
# arch/ppc64/kernel/pci.c
# 2004/08/04 08:42:48-04:00 dwmw2@shinybook.infradead.org +2 -20
# Remove pcibios_fixups[].
#
# arch/ppc64/kernel/pSeries_pci.c
# 2004/08/04 08:42:48-04:00 dwmw2@shinybook.infradead.org +3 -2
# Declare own fixup for pcibios_name_device(), keep it all in #if 0
#
# arch/ppc64/kernel/iSeries_pci.c
# 2004/08/04 08:42:48-04:00 dwmw2@shinybook.infradead.org +0 -4
# Remove pcibios_name_device()
#
# ChangeSet
# 2004/08/04 08:37:35-04:00 dwmw2@shinybook.infradead.org
# PCI quirks -- parisc.
#
# Remove pcibios_fixups[] from core code and declare the one fixup in
# the same place it's implemented.
#
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/parisc/superio.c
# 2004/08/04 08:37:17-04:00 dwmw2@shinybook.infradead.org +1 -0
# Declare our own PCI fixup locally -- the central array went away.
#
# arch/parisc/kernel/pci.c
# 2004/08/04 08:37:17-04:00 dwmw2@shinybook.infradead.org +0 -9
# Remove pcibios_fixups array.
#
# ChangeSet
# 2004/08/04 08:01:20-04:00 dsaxena@plexity.net
# [5/3][ARM] PCI quirks update for ARM
#
# Good idea. Following is ARM patch.
#
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# arch/arm/kernel/bios32.c
# 2004/08/04 08:01:02-04:00 dsaxena@plexity.net +7 -32
# [5/3][ARM] PCI quirks update for ARM
#
# ChangeSet
# 2004/08/04 07:59:31-04:00 ralf@linux-mips.org
# [4/3] PCI quirks -- MIPS.
#
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# arch/mips/pmc-sierra/yosemite/ht.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +0 -5
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/pci-sb1250.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +0 -4
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/pci-ip27.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +10 -11
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/fixup-yosemite.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +0 -4
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/fixup-tb0226.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +0 -4
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/fixup-tb0219.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +0 -4
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/fixup-sni.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +0 -4
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/fixup-ocelot-g.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +0 -4
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/fixup-ocelot-c.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +0 -4
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/fixup-mpc30x.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +0 -4
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/fixup-malta.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +4 -7
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/fixup-lasat.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +0 -4
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/fixup-jaguar.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +0 -4
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/fixup-ip32.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +0 -4
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/fixup-ddb5477.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +7 -9
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/fixup-ddb5074.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +2 -5
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/fixup-cobalt.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +5 -7
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/fixup-capcella.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +0 -4
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/fixup-au1000.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +0 -4
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# arch/mips/pci/fixup-atlas.c
# 2004/08/04 07:59:12-04:00 ralf@linux-mips.org +2 -8
# Remove the bazillion of pcibios_fixups[] arrays on MIPS and replace them
# with DECLARE_PCI_FIXUP_HEADER / DECLARE_PCI_FIXUP_FINAL where the array
# definition was non-empty.
#
# ChangeSet
# 2004/08/04 07:57:35-04:00 dwmw2@shinybook.infradead.org
# [3/3] PCI quirks -- i386.
#
# Probably best to make i386 build again too... people bitch if their
# favourite legacy architecture breaks.
#
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# arch/i386/pci/fixup.c
# 2004/08/04 07:57:17-04:00 dwmw2@shinybook.infradead.org +18 -111
# Use new method of declaring PCI quirks.
#
# ChangeSet
# 2004/08/04 07:56:07-04:00 dwmw2@shinybook.infradead.org
# [2/3] PCI quirks -- PPC.
#
# Remove up the PPC pcibios_fixups[] array. Remove the ifdefs on
# CONFIG_PPC_PMAC in the kernel PPC code, moving that stuff into
# pmac-specific files where it lives. Add a quirk for the CardBus
# controller on WindRiver SBC8260.
#
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# arch/ppc/platforms/sbc82xx.c
# 2004/08/04 07:55:48-04:00 dwmw2@shinybook.infradead.org +20 -0
# Add PCI quirk to set up the CardBus controller.
#
# arch/ppc/platforms/pmac_pci.c
# 2004/08/04 07:55:48-04:00 dwmw2@shinybook.infradead.org +5 -0
# Declare our own PCI quirks.
#
# arch/ppc/kernel/pci.c
# 2004/08/04 07:55:48-04:00 dwmw2@shinybook.infradead.org +4 -19
# Remove PMAC PCI quirks, convert others to new declaration method.
#
# ChangeSet
# 2004/08/04 07:54:19-04:00 dwmw2@shinybook.infradead.org
# [1/3] Split pci quirks array to allow separate declarations.
#
# It's a pain in the arse to set up platform-specific PCI quirks -- you
# have to put your platform-specific quirk into the generic (or at least
# the architecture) array. This patch fixes that, allowing you to
# DECLARE_PCI_FIXUP_HEADER() or DECLARE_PCI_FIXUP_FINAL() anywhere you
# like.
#
# Note that a lot of the quirks can now be moved out of
# drivers/pci/quirks.c and put somewhere closer to where they belong.
#
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# include/linux/pci.h
# 2004/08/04 07:54:00-04:00 dwmw2@shinybook.infradead.org +12 -3
# Remove old quirks array, add DECLARE_PCI_FIXUP_{FINAL,HEADER}
#
# include/asm-generic/vmlinux.lds.h
# 2004/08/04 07:54:00-04:00 dwmw2@shinybook.infradead.org +10 -0
# Add PCI quirks to RODATA
#
# drivers/pci/quirks.c
# 2004/08/04 07:54:00-04:00 dwmw2@shinybook.infradead.org +126 -135
# Split pci quirks array to allow separate declarations.
#
# ChangeSet
# 2004/08/04 02:57:45-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6
# into bix.(none):/usr/src/bk-pci
#
# drivers/pci/pci.ids
# 2004/08/04 02:57:42-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/02 16:28:17-07:00 nacc@us.ibm.com
# [PATCH] PCI: replace schedule_timeout() with msleep()
#
# Use msleep() instead of schedule_timeout() to guarantee
# the task delays for the desired time.
#
# Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/pci/pci.c
# 2004/07/02 19:45:16-07:00 nacc@us.ibm.com +1 -4
# PCI: replace schedule_timeout() with msleep()
#
# ChangeSet
# 2004/08/02 15:37:32-07:00 greg@kroah.com
# [PATCH] PCI Hotplug: fix build warnings due to msleep() patches.
#
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/pci/hotplug/shpchp_hpc.c
# 2004/08/02 15:32:26-07:00 greg@kroah.com +1 -0
# PCI Hotplug: fix build warnings due to msleep() patches.
#
# drivers/pci/hotplug/ibmphp_hpc.c
# 2004/08/02 15:32:26-07:00 greg@kroah.com +1 -0
# PCI Hotplug: fix build warnings due to msleep() patches.
#
# drivers/pci/hotplug/cpci_hotplug_core.c
# 2004/08/02 15:32:26-07:00 greg@kroah.com +1 -0
# PCI Hotplug: fix build warnings due to msleep() patches.
#
# ChangeSet
# 2004/08/02 15:36:46-07:00 killekulla@rdrz.de
# [PATCH] PCI: fix PCI access mode dependences in arch/i386/Kconfig
#
# While all ACPI stuff is deselected, and PCI access mode is set to "Any",
# CONFIG_ACPI_BOOT is going to be set because of CONFIG_PCI_MMCONFIG.
#
# If CONFIG_ACPI_BOOT is not allready set by other stuff, setting PCI access
# mode to "Any" shouldn't set CONFIG_PCI_MMCONFIG. Anyhow, setting PCI
# access mode to "MMConfig" should select CONFIG_ACPI_BOOT.
#
# Signed-off-by: Raphael Zimmerer <killekulla@rdrz.de>
# Signed-off-by: Andrew Morton <akpm@osdl.org>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# arch/i386/Kconfig
# 2004/07/31 17:52:11-07:00 killekulla@rdrz.de +1 -1
# PCI: fix PCI access mode dependences in arch/i386/Kconfig
#
# ChangeSet
# 2004/08/02 15:36:27-07:00 nacc@us.ibm.com
# [PATCH] PCI Hotplug: shpchp_hpc: replace schedule_timeout() with msleep()
#
# Uses msleep() instead of schedule_timeout() to guarantee
# the task delays the desired time.
#
# Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/pci/hotplug/shpchp_hpc.c
# 2004/07/12 15:19:24-07:00 nacc@us.ibm.com +1 -2
# PCI Hotplug: shpchp_hpc: replace schedule_timeout() with msleep()
#
# ChangeSet
# 2004/08/02 15:36:10-07:00 nacc@us.ibm.com
# [PATCH] PCI Hotplug: ibmphp_hpc: replace long_delay() with msleep()
#
# Replace long_delay() with msleep() to guarantee the task
# delays as desired.
#
# Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/pci/hotplug/ibmphp_hpc.c
# 2004/07/12 15:12:43-07:00 nacc@us.ibm.com +9 -10
# PCI Hotplug: ibmphp_hpc: replace long_delay() with msleep()
#
# ChangeSet
# 2004/08/02 15:35:52-07:00 nacc@us.ibm.com
# [PATCH] PCI Hotplug: ibmphp_core: replace long_delay() with msleep()
#
# Replace long_delay() with msleep() to guarantee the task
# delays as desired.
#
# Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/pci/hotplug/ibmphp_core.c
# 2004/07/08 17:05:25-07:00 nacc@us.ibm.com +2 -2
# PCI Hotplug: ibmphp_core: replace long_delay() with msleep()
#
# ChangeSet
# 2004/08/02 15:35:34-07:00 domen@coderock.org
# [PATCH] PCI: use list_for_each() drivers/pci/setup-bus.c
#
# From: Domen Puncer <domen@coderock.org>
# Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/pci/setup-bus.c
# 2004/07/11 05:41:20-07:00 domen@coderock.org +3 -2
# PCI: use list_for_each() drivers/pci/setup-bus.c
#
# ChangeSet
# 2004/08/02 15:34:59-07:00 nacc@us.ibm.com
# [PATCH] PCI Hotplug: ibmphp: remove long_delay
#
# Remove unused function long_delay().
#
# Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/pci/hotplug/ibmphp.h
# 2004/07/08 17:05:07-07:00 nacc@us.ibm.com +0 -6
# PCI Hotplug: ibmphp: remove long_delay
#
# ChangeSet
# 2004/08/02 15:34:38-07:00 nacc@us.ibm.com
# [PATCH] PCI Hotplug: cpci_hotplug_core: replace schedule_timeout() with msleep()
#
# Uses msleep() instead of schedule_timeout() to guarantee
# the task delays the desired time.
#
# Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/pci/hotplug/cpci_hotplug_core.c
# 2004/07/12 15:10:14-07:00 nacc@us.ibm.com +7 -10
# PCI Hotplug: cpci_hotplug_core: replace schedule_timeout() with msleep()
#
# ChangeSet
# 2004/08/02 15:34:05-07:00 domen@coderock.org
# [PATCH] PCI: use list_for_each() i386/pci/common.c
#
# From: Domen Puncer <domen@coderock.org>
# Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# arch/i386/pci/common.c
# 2004/07/11 05:41:10-07:00 domen@coderock.org +1 -1
# PCI: use list_for_each() i386/pci/common.c
#
# ChangeSet
# 2004/08/02 15:33:31-07:00 domen@coderock.org
# [PATCH] PCI: use list_for_each() i386/pci/pcbios.c
#
# From: Domen Puncer <domen@coderock.org>
# Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# arch/i386/pci/pcbios.c
# 2004/07/11 05:41:13-07:00 domen@coderock.org +1 -1
# PCI: use list_for_each() i386/pci/pcbios.c
#
# ChangeSet
# 2004/08/02 15:24:01-07:00 greg@kroah.com
# PCI: update pci.ids from sf.net site.
#
# Patch taken from http://www.codemonkey.org.uk/projects/pci/pci.ids-2004-08-02.diff
# and tweaked by hand to build with no warnings.
#
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/pci/pci.ids
# 2004/08/02 15:22:50-07:00 greg@kroah.com +389 -152
# PCI: update pci.ids from sf.net site.
#
# Patch taken from http://www.codemonkey.org.uk/projects/pci/pci.ids-2004-08-02.diff
# and tweaked by hand to build with no warnings.
#
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# ChangeSet
# 2004/08/02 13:30:07-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# arch/i386/pci/irq.c
# 2004/08/02 13:30:03-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/01 00:12:39-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/08/01 00:12:36-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/07/30 22:35:06-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/07/30 22:35:02-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/07/16 18:41:52-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6
# into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/07/16 18:41:48-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/pci/pci.ids
# 2004/07/16 18:41:48-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/07/16 18:40:58-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/07/16 18:40:54-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/07/14 16:22:57-07:00 greg@kroah.com
# Merge kroah.com:/home/greg/linux/BK/bleed-2.6
# into kroah.com:/home/greg/linux/BK/pci-2.6
#
# include/linux/pci_ids.h
# 2004/07/14 16:22:52-07:00 greg@kroah.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/07/14 13:31:39-07:00 lxiep@us.ibm.com
# [PATCH] PCI Hotplug: rpaphp_add_slot.patch
#
# I found a bug in rpaphp code during DLPAR I/O testing. When DLPAR ADD
# a non-empty I/O slot to a partition, an adapter in the slot didn't
# get configured. The attached patch fixes that.
#
# Signed-off-by: Linda Xie <lxie@us.ibm.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# ChangeSet
# 2004/07/14 13:31:00-07:00 buytenh@wantstofly.org
# [PATCH] PCI: more New PCI vendor/device ID for Radisys ENP-2611 board
#
# OK, sorry to bother, some more bits.
#
# - Add PCI IDs for the IXP2400 and IXP2800 network processors.
# - Fix typo in description for 8086:9000.
# - Correct tab->space after #define in definition of IXP4xx device ID.
# - ENP-2611 can appear behind a 21555.
#
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# include/linux/pci_ids.h
# 2004/07/02 15:18:42-07:00 buytenh@wantstofly.org +3 -1
# PCI: more New PCI vendor/device ID for Radisys ENP-2611 board
#
# drivers/pci/pci.ids
# 2004/07/02 15:19:15-07:00 buytenh@wantstofly.org +4 -1
# PCI: more New PCI vendor/device ID for Radisys ENP-2611 board
#
# ChangeSet
# 2004/07/14 13:30:11-07:00 vernux@us.ibm.com
# [PATCH] PCI Hotplug: acpiphp extension for 2.6.7 part 2
#
# This patch adds the first driver that actually uses the callback
# function for attention LEDs that the acpiphp-attention patch
# adds. It searches the ACPI namespace for IBM hardware, sets up
# the callbacks and sets up a handler to read ACPI events and
# forward them on to /proc/acpi/event. It also exports an ACPI
# table that shows current hotplug status to userland.
#
#
# Signed-off-by: Vernon Mauery <vernux@us.ibm.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/pci/hotplug/acpiphp_ibm.c
# 2004/07/08 16:54:15-07:00 vernux@us.ibm.com +474 -0
# PCI Hotplug: acpiphp extension for 2.6.7 part 2
#
# drivers/pci/hotplug/Makefile
# 2004/07/08 16:54:15-07:00 vernux@us.ibm.com +1 -0
# PCI Hotplug: acpiphp extension for 2.6.7 part 2
#
# drivers/pci/hotplug/Kconfig
# 2004/07/08 16:54:15-07:00 vernux@us.ibm.com +12 -0
# PCI Hotplug: acpiphp extension for 2.6.7 part 2
#
# drivers/pci/hotplug/acpiphp_ibm.c
# 2004/07/08 16:54:15-07:00 vernux@us.ibm.com +0 -0
# BitKeeper file /home/greg/linux/BK/pci-2.6/drivers/pci/hotplug/acpiphp_ibm.c
#
# ChangeSet
# 2004/07/14 13:29:31-07:00 vernux@us.ibm.com
# [PATCH] PCI Hotplug: acpiphp extension for 2.6.7, part 1
#
# This patch adds the ability to register callback functions with
# the acpiphp core to set and get the current attention LED
# status. The reason this is needed is because there is not set
# ACPI standard for how this is done so each hardware platform may
# implement it differently. To keep hardware specific code out of
# acpiphp, we allow other modules to register their code with it.
#
#
#
# Signed-off-by: Vernon Mauery <vernux@us.ibm.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/pci/hotplug/acpiphp_glue.c
# 2004/07/08 16:54:08-07:00 vernux@us.ibm.com +0 -14
# PCI Hotplug: acpiphp extension for 2.6.7, part 1
#
# drivers/pci/hotplug/acpiphp_core.c
# 2004/07/08 16:54:08-07:00 vernux@us.ibm.com +99 -28
# PCI Hotplug: acpiphp extension for 2.6.7, part 1
#
# drivers/pci/hotplug/acpiphp.h
# 2004/07/08 16:54:08-07:00 vernux@us.ibm.com +16 -0
# PCI Hotplug: acpiphp extension for 2.6.7, part 1
#
# ChangeSet
# 2004/07/11 13:41:14-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# arch/i386/kernel/dmi_scan.c
# 2004/07/11 13:41:11-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/07/05 13:06:46-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# arch/i386/kernel/dmi_scan.c
# 2004/07/05 13:06:42-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/07/02 15:26:07-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/07/02 15:26:03-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/pci/pci.ids
# 2004/07/02 15:26:03-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/07/01 01:43:28-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/07/01 01:43:24-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/28 00:32:35-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# arch/i386/pci/irq.c
# 2004/06/28 00:32:31-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/i386/kernel/dmi_scan.c
# 2004/06/28 00:32:31-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/24 18:25:30-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/06/24 18:25:26-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/i386/pci/irq.c
# 2004/06/24 18:25:26-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/24 12:53:53-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/06/24 12:53:49-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/23 20:35:25-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# arch/i386/pci/irq.c
# 2004/06/23 20:35:21-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/23 02:01:10-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6
# into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/06/23 02:01:06-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/i386/pci/irq.c
# 2004/06/23 02:01:06-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/i386/kernel/dmi_scan.c
# 2004/06/23 02:01:06-07:00 akpm@bix.(none) +0 -7
# Auto merged
#
# ChangeSet
# 2004/06/20 23:49:50-07:00 akpm@bix.(none)
# Merge
#
# arch/i386/pci/irq.c
# 2004/06/20 23:49:47-07:00 akpm@bix.(none) +0 -0
# SCCS merged
#
# arch/i386/kernel/dmi_scan.c
# 2004/06/20 23:49:26-07:00 akpm@bix.(none) +7 -0
# SCCS merged
#
# ChangeSet
# 2004/06/18 12:23:56-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/06/18 12:23:53-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/i386/kernel/dmi_scan.c
# 2004/06/18 12:23:53-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/15 21:56:51-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/06/15 21:56:48-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/pci/pci.ids
# 2004/06/15 21:56:48-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/08 21:55:31-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6
# into bix.(none):/usr/src/bk-pci
#
# arch/i386/kernel/dmi_scan.c
# 2004/06/08 21:55:27-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/03 10:37:43-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/06/03 10:37:40-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/02 13:31:47-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/06/02 13:31:44-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/28 14:10:25-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6
# into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/05/28 14:10:22-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/pci/pci.ids
# 2004/05/28 14:10:22-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/28 14:09:37-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/05/28 14:09:34-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/24 11:42:00-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/05/24 11:41:57-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/22 23:42:26-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci
#
# include/linux/pci_ids.h
# 2004/05/22 23:42:23-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/19 14:16:27-07:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6
# into bix.(none):/usr/src/bk-pci
#
# drivers/pci/pci.ids
# 2004/05/19 14:16:24-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
diff -Nru a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
--- a/arch/alpha/kernel/pci.c 2004-08-04 17:56:07 -07:00
+++ b/arch/alpha/kernel/pci.c 2004-08-04 17:56:07 -07:00
@@ -67,6 +67,7 @@
{
dev->class = PCI_CLASS_BRIDGE_ISA << 8;
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, quirk_isa_bridge);
static void __init
quirk_cypress(struct pci_dev *dev)
@@ -100,6 +101,7 @@
}
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, quirk_cypress);
/* Called for each device after PCI setup is done. */
static void __init
@@ -112,17 +114,10 @@
isa_bridge = dev;
}
}
+DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_final);
-struct pci_fixup pcibios_fixups[] __initdata = {
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378,
- quirk_isa_bridge },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693,
- quirk_cypress },
- { PCI_FIXUP_FINAL, PCI_ANY_ID, PCI_ANY_ID,
- pcibios_fixup_final },
- { 0 }
-};
-
+/* Just declaring that the power-of-ten prefixes are actually the
+ power-of-two ones doesn't make it true :) */
#define KB 1024
#define MB (1024*KB)
#define GB (1024*MB)
diff -Nru a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
--- a/arch/arm/kernel/bios32.c 2004-08-04 17:56:07 -07:00
+++ b/arch/arm/kernel/bios32.c 2004-08-04 17:56:07 -07:00
@@ -128,12 +128,14 @@
pci_write_config_word(dev, 0x44, 0xb000);
outb(0x08, 0x4d1);
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_83C553, pci_fixup_83c553);
static void __devinit pci_fixup_unassign(struct pci_dev *dev)
{
dev->resource[0].end -= dev->resource[0].start;
dev->resource[0].start = 0;
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_89C940F, pci_fixup_unassign);
/*
* Prevent the PCI layer from seeing the resources allocated to this device
@@ -154,6 +156,7 @@
}
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21285, pci_fixup_dec21285);
/*
* Same as above. The PrPMC800 carrier board for the PrPMC1100
@@ -178,6 +181,7 @@
}
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IXP4XX, pci_fixup_prpmc1100);
/*
* PCI IDE controllers use non-standard I/O port decoding, respect it.
@@ -198,6 +202,7 @@
}
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
/*
* Put the DEC21142 to sleep
@@ -206,6 +211,7 @@
{
pci_write_config_dword(dev, 0x40, 0x80000000);
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21142, pci_fixup_dec21142);
/*
* The CY82C693 needs some rather major fixups to ensure that it does
@@ -271,38 +277,7 @@
pci_write_config_byte(dev, 0x45, 0x03);
}
}
-
-struct pci_fixup pcibios_fixups[] = {
- {
- PCI_FIXUP_HEADER,
- PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693,
- pci_fixup_cy82c693
- }, {
- PCI_FIXUP_HEADER,
- PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21142,
- pci_fixup_dec21142
- }, {
- PCI_FIXUP_HEADER,
- PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21285,
- pci_fixup_dec21285
- }, {
- PCI_FIXUP_HEADER,
- PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_83C553,
- pci_fixup_83c553
- }, {
- PCI_FIXUP_HEADER,
- PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_89C940F,
- pci_fixup_unassign
- }, {
- PCI_FIXUP_HEADER,
- PCI_ANY_ID, PCI_ANY_ID,
- pci_fixup_ide_bases
- }, {
- PCI_FIXUP_HEADER,
- PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IXP4XX,
- pci_fixup_prpmc1100
- }, { 0 }
-};
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, pci_fixup_cy82c693);
void __devinit pcibios_update_irq(struct pci_dev *dev, int irq)
{
diff -Nru a/arch/i386/Kconfig b/arch/i386/Kconfig
--- a/arch/i386/Kconfig 2004-08-04 17:56:07 -07:00
+++ b/arch/i386/Kconfig 2004-08-04 17:56:07 -07:00
@@ -1105,7 +1105,7 @@
config PCI_MMCONFIG
bool
- depends on PCI && (PCI_GOMMCONFIG || PCI_GOANY)
+ depends on PCI && (PCI_GOMMCONFIG || (PCI_GOANY && ACPI_BOOT))
select ACPI_BOOT
default y
diff -Nru a/arch/i386/pci/common.c b/arch/i386/pci/common.c
--- a/arch/i386/pci/common.c 2004-08-04 17:56:07 -07:00
+++ b/arch/i386/pci/common.c 2004-08-04 17:56:07 -07:00
@@ -70,7 +70,7 @@
int i;
DBG("PCI: Scanning for ghost devices on bus %d\n", b->number);
- for (ln=b->devices.next; ln != &b->devices; ln=ln->next) {
+ list_for_each(ln, &b->devices) {
d = pci_dev_b(ln);
if ((d->class >> 8) == PCI_CLASS_BRIDGE_HOST)
seen_host_bridge++;
diff -Nru a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c
--- a/arch/i386/pci/fixup.c 2004-08-04 17:56:07 -07:00
+++ b/arch/i386/pci/fixup.c 2004-08-04 17:56:07 -07:00
@@ -29,6 +29,7 @@
}
pcibios_last_bus = -1;
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82451NX, pci_fixup_i450nx);
static void __devinit pci_fixup_i450gx(struct pci_dev *d)
{
@@ -42,6 +43,7 @@
pci_scan_bus(busno, &pci_root_ops, NULL);
pcibios_last_bus = -1;
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82454GX, pci_fixup_i450gx);
static void __devinit pci_fixup_umc_ide(struct pci_dev *d)
{
@@ -55,6 +57,7 @@
for(i=0; i<4; i++)
d->resource[i].flags |= PCI_BASE_ADDRESS_SPACE_IO;
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_UMC, PCI_DEVICE_ID_UMC_UM8886BF, pci_fixup_umc_ide);
static void __devinit pci_fixup_ncr53c810(struct pci_dev *d)
{
@@ -67,6 +70,7 @@
d->class = PCI_CLASS_STORAGE_SCSI << 8;
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, pci_fixup_ncr53c810);
static void __devinit pci_fixup_ide_bases(struct pci_dev *d)
{
@@ -86,6 +90,7 @@
}
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
static void __devinit pci_fixup_ide_trash(struct pci_dev *d)
{
@@ -108,6 +113,10 @@
for(i=0; i<4; i++)
d->resource[i].start = d->resource[i].end = d->resource[i].flags = 0;
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5513, pci_fixup_ide_trash);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_10, pci_fixup_ide_trash);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_11, pci_fixup_ide_trash);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_9, pci_fixup_ide_trash);
static void __devinit pci_fixup_latency(struct pci_dev *d)
{
@@ -118,6 +127,8 @@
DBG("PCI: Setting max latency to 32\n");
pcibios_max_latency = 32;
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5597, pci_fixup_latency);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5598, pci_fixup_latency);
static void __devinit pci_fixup_piix4_acpi(struct pci_dev *d)
{
@@ -126,6 +137,7 @@
*/
d->irq = 9;
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3, pci_fixup_piix4_acpi);
/*
* Addresses issues with problems in the memory write queue timer in
@@ -179,6 +191,10 @@
pci_write_config_byte(d, where, v);
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8363_0, pci_fixup_via_northbridge_bug);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8622, pci_fixup_via_northbridge_bug);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8361, pci_fixup_via_northbridge_bug);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8367_0, pci_fixup_via_northbridge_bug);
/*
* For some reasons Intel decided that certain parts of their
@@ -195,6 +211,7 @@
(dev->device & 0xff00) == 0x2400)
dev->transparent = 1;
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, pci_fixup_transparent_bridge);
/*
* Fixup for C1 Halt Disconnect problem on nForce2 systems.
@@ -236,115 +253,5 @@
pci_write_config_dword(dev, 0x6c, fixed_val);
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2, pci_fixup_nforce2);
-struct pci_fixup pcibios_fixups[] = {
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82451NX,
- .hook = pci_fixup_i450nx
- },
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82454GX,
- .hook = pci_fixup_i450gx
- },
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_VENDOR_ID_UMC,
- .device = PCI_DEVICE_ID_UMC_UM8886BF,
- .hook = pci_fixup_umc_ide
- },
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_VENDOR_ID_SI,
- .device = PCI_DEVICE_ID_SI_5513,
- .hook = pci_fixup_ide_trash
- },
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_ANY_ID,
- .device = PCI_ANY_ID,
- .hook = pci_fixup_ide_bases
- },
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_VENDOR_ID_SI,
- .device = PCI_DEVICE_ID_SI_5597,
- .hook = pci_fixup_latency
- },
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_VENDOR_ID_SI,
- .device = PCI_DEVICE_ID_SI_5598,
- .hook = pci_fixup_latency
- },
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82371AB_3,
- .hook = pci_fixup_piix4_acpi
- },
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801CA_10,
- .hook = pci_fixup_ide_trash
- },
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801CA_11,
- .hook = pci_fixup_ide_trash
- },
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801DB_9,
- .hook = pci_fixup_ide_trash
- },
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_VENDOR_ID_VIA,
- .device = PCI_DEVICE_ID_VIA_8363_0,
- .hook = pci_fixup_via_northbridge_bug
- },
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_VENDOR_ID_VIA,
- .device = PCI_DEVICE_ID_VIA_8622,
- .hook = pci_fixup_via_northbridge_bug
- },
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_VENDOR_ID_VIA,
- .device = PCI_DEVICE_ID_VIA_8361,
- .hook = pci_fixup_via_northbridge_bug
- },
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_VENDOR_ID_VIA,
- .device = PCI_DEVICE_ID_VIA_8367_0,
- .hook = pci_fixup_via_northbridge_bug
- },
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_VENDOR_ID_NCR,
- .device = PCI_DEVICE_ID_NCR_53C810,
- .hook = pci_fixup_ncr53c810
- },
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_ANY_ID,
- .hook = pci_fixup_transparent_bridge
- },
- {
- .pass = PCI_FIXUP_HEADER,
- .vendor = PCI_VENDOR_ID_NVIDIA,
- .device = PCI_DEVICE_ID_NVIDIA_NFORCE2,
- .hook = pci_fixup_nforce2
- },
- { .pass = 0 }
-};
diff -Nru a/arch/i386/pci/numa.c b/arch/i386/pci/numa.c
--- a/arch/i386/pci/numa.c 2004-08-04 17:56:07 -07:00
+++ b/arch/i386/pci/numa.c 2004-08-04 17:56:07 -07:00
@@ -100,10 +100,7 @@
}
pcibios_last_bus = -1;
}
-
-struct pci_fixup pcibios_fixups[] = {
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82451NX, pci_fixup_i450nx },
-};
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82451NX, pci_fixup_i450nx);
static int __init pci_numa_init(void)
{
diff -Nru a/arch/i386/pci/pcbios.c b/arch/i386/pci/pcbios.c
--- a/arch/i386/pci/pcbios.c 2004-08-04 17:56:07 -07:00
+++ b/arch/i386/pci/pcbios.c 2004-08-04 17:56:07 -07:00
@@ -365,7 +365,7 @@
idx = found = 0;
while (pci_bios_find_device(dev->vendor, dev->device, idx, &bus, &devfn) == PCIBIOS_SUCCESSFUL) {
idx++;
- for (ln=pci_devices.next; ln != &pci_devices; ln=ln->next) {
+ list_for_each(ln, &pci_devices) {
d = pci_dev_g(ln);
if (d->bus->number == bus && d->devfn == devfn) {
list_del(&d->global_list);
diff -Nru a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
--- a/arch/ia64/pci/pci.c 2004-08-04 17:56:07 -07:00
+++ b/arch/ia64/pci/pci.c 2004-08-04 17:56:07 -07:00
@@ -46,8 +46,6 @@
#define DBG(x...)
#endif
-struct pci_fixup pcibios_fixups[1];
-
/*
* Low-level SAL-based PCI configuration access functions. Note that SAL
* calls are already serialized (via sal_lock), so we don't need another
diff -Nru a/arch/m68k/kernel/bios32.c b/arch/m68k/kernel/bios32.c
--- a/arch/m68k/kernel/bios32.c 2004-08-04 17:56:07 -07:00
+++ b/arch/m68k/kernel/bios32.c 2004-08-04 17:56:07 -07:00
@@ -77,11 +77,6 @@
static unsigned int io_base;
static unsigned int mem_base;
-struct pci_fixup pcibios_fixups[] =
-{
- { 0 }
-};
-
/*
* static void disable_dev(struct pci_dev *dev)
*
diff -Nru a/arch/m68knommu/kernel/comempci.c b/arch/m68knommu/kernel/comempci.c
--- a/arch/m68knommu/kernel/comempci.c 2004-08-04 17:56:07 -07:00
+++ b/arch/m68knommu/kernel/comempci.c 2004-08-04 17:56:07 -07:00
@@ -351,8 +351,6 @@
}
/*****************************************************************************/
-struct pci_fixup pcibios_fixups[] = { { 0 } };
-
void pcibios_fixup_bus(struct pci_bus *b)
{
}
diff -Nru a/arch/mips/pci/fixup-atlas.c b/arch/mips/pci/fixup-atlas.c
--- a/arch/mips/pci/fixup-atlas.c 2004-08-04 17:56:07 -07:00
+++ b/arch/mips/pci/fixup-atlas.c 2004-08-04 17:56:07 -07:00
@@ -60,13 +60,7 @@
printk ("saa9730_base = %x\n", saa9730_base);
}
-#endif
-
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA9730,
+ atlas_saa9730_base_fixup);
-struct pci_fixup pcibios_fixups[] __initdata = {
-#ifdef CONFIG_KGDB
- {PCI_FIXUP_HEADER, PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA9730,
- atlas_saa9730_base_fixup},
#endif
- { 0 }
-};
diff -Nru a/arch/mips/pci/fixup-au1000.c b/arch/mips/pci/fixup-au1000.c
--- a/arch/mips/pci/fixup-au1000.c 2004-08-04 17:56:07 -07:00
+++ b/arch/mips/pci/fixup-au1000.c 2004-08-04 17:56:07 -07:00
@@ -102,7 +102,3 @@
{
return irq_tab_alchemy[slot][pin];
}
-
-struct pci_fixup pcibios_fixups[] __initdata = {
-{ 0 }
-};
diff -Nru a/arch/mips/pci/fixup-capcella.c b/arch/mips/pci/fixup-capcella.c
--- a/arch/mips/pci/fixup-capcella.c 2004-08-04 17:56:07 -07:00
+++ b/arch/mips/pci/fixup-capcella.c 2004-08-04 17:56:07 -07:00
@@ -42,7 +42,3 @@
{
return irq_tab_capcella[slot][pin];
}
-
-struct pci_fixup pcibios_fixups[] __initdata = {
- { .pass = 0, },
-};
diff -Nru a/arch/mips/pci/fixup-cobalt.c b/arch/mips/pci/fixup-cobalt.c
--- a/arch/mips/pci/fixup-cobalt.c 2004-08-04 17:56:07 -07:00
+++ b/arch/mips/pci/fixup-cobalt.c 2004-08-04 17:56:07 -07:00
@@ -41,6 +41,9 @@
pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, 7);
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1,
+ qube_raq_via_bmIDE_fixup);
+
static void qube_raq_galileo_fixup(struct pci_dev *dev)
{
unsigned short galileo_id;
@@ -73,13 +76,8 @@
}
}
-struct pci_fixup pcibios_fixups[] __initdata = {
- {PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1,
- qube_raq_via_bmIDE_fixup},
- {PCI_FIXUP_HEADER, PCI_VENDOR_ID_GALILEO, PCI_ANY_ID,
- qube_raq_galileo_fixup},
- 0
-};
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_GALILEO, PCI_ANY_ID,
+ qube_raq_galileo_fixup);
static char irq_tab_cobalt[] __initdata = {
[COBALT_PCICONF_CPU] = 0,
diff -Nru a/arch/mips/pci/fixup-ddb5074.c b/arch/mips/pci/fixup-ddb5074.c
--- a/arch/mips/pci/fixup-ddb5074.c 2004-08-04 17:56:07 -07:00
+++ b/arch/mips/pci/fixup-ddb5074.c 2004-08-04 17:56:07 -07:00
@@ -17,8 +17,5 @@
pci_write_config_byte(dev, 0x7e, t8);
}
-struct pci_fixup pcibios_fixups[] __initdata = {
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101,
- ddb5074_fixup },
- {0}
-};
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101,
+ ddb5074_fixup);
diff -Nru a/arch/mips/pci/fixup-ddb5477.c b/arch/mips/pci/fixup-ddb5477.c
--- a/arch/mips/pci/fixup-ddb5477.c 2004-08-04 17:56:07 -07:00
+++ b/arch/mips/pci/fixup-ddb5477.c 2004-08-04 17:56:07 -07:00
@@ -41,6 +41,11 @@
pci_write_config_byte(dev, 0x41, old | 0xd0);
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533,
+ ddb5477_fixup);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1535,
+ ddb5477_fixup);
+
/*
* Fixup baseboard AMD chip so that tx does not underflow.
* bcr_18 |= 0x0800
@@ -69,12 +74,5 @@
outw(temp, ioaddr + PCNET32_WIO_BDP);
}
-struct pci_fixup pcibios_fixups[] __initdata = {
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533,
- ddb5477_fixup },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1535,
- ddb5477_fixup },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE,
- ddb5477_amd_lance_fixup },
- {0}
-};
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE,
+ ddb5477_amd_lance_fixup);
diff -Nru a/arch/mips/pci/fixup-ip32.c b/arch/mips/pci/fixup-ip32.c
--- a/arch/mips/pci/fixup-ip32.c 2004-08-04 17:56:07 -07:00
+++ b/arch/mips/pci/fixup-ip32.c 2004-08-04 17:56:07 -07:00
@@ -44,7 +44,3 @@
{
return irq_tab_mace[slot][pin];
}
-
-struct pci_fixup pcibios_fixups[] = {
- {0}
-};
diff -Nru a/arch/mips/pci/fixup-jaguar.c b/arch/mips/pci/fixup-jaguar.c
--- a/arch/mips/pci/fixup-jaguar.c 2004-08-04 17:56:08 -07:00
+++ b/arch/mips/pci/fixup-jaguar.c 2004-08-04 17:56:08 -07:00
@@ -36,7 +36,3 @@
return 0;
panic("Whooops in pcibios_map_irq");
}
-
-struct pci_fixup pcibios_fixups[] = {
- {0}
-};
diff -Nru a/arch/mips/pci/fixup-lasat.c b/arch/mips/pci/fixup-lasat.c
--- a/arch/mips/pci/fixup-lasat.c 2004-08-04 17:56:07 -07:00
+++ b/arch/mips/pci/fixup-lasat.c 2004-08-04 17:56:07 -07:00
@@ -4,7 +4,3 @@
void __init pcibios_fixup_irqs(void)
{
}
-
-struct pci_fixup pcibios_fixups[] __initdata = {
- { 0 }
-};
diff -Nru a/arch/mips/pci/fixup-malta.c b/arch/mips/pci/fixup-malta.c
--- a/arch/mips/pci/fixup-malta.c 2004-08-04 17:56:07 -07:00
+++ b/arch/mips/pci/fixup-malta.c 2004-08-04 17:56:07 -07:00
@@ -79,6 +79,8 @@
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_0,
+ malta_piix_func0_fixup);
static void __init malta_piix_func1_fixup(struct pci_dev *pdev)
{
@@ -96,10 +98,5 @@
}
}
-struct pci_fixup pcibios_fixups[] __initdata = {
- {PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_0,
- malta_piix_func0_fixup},
- {PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB,
- malta_piix_func1_fixup},
- { 0 }
-};
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB,
+ malta_piix_func1_fixup);
diff -Nru a/arch/mips/pci/fixup-mpc30x.c b/arch/mips/pci/fixup-mpc30x.c
--- a/arch/mips/pci/fixup-mpc30x.c 2004-08-04 17:56:07 -07:00
+++ b/arch/mips/pci/fixup-mpc30x.c 2004-08-04 17:56:07 -07:00
@@ -42,7 +42,3 @@
return irq_tab_mpc30x[slot];
}
-
-struct pci_fixup pcibios_fixups[] __initdata = {
- { .pass = 0, },
-};
diff -Nru a/arch/mips/pci/fixup-ocelot-c.c b/arch/mips/pci/fixup-ocelot-c.c
--- a/arch/mips/pci/fixup-ocelot-c.c 2004-08-04 17:56:08 -07:00
+++ b/arch/mips/pci/fixup-ocelot-c.c 2004-08-04 17:56:08 -07:00
@@ -33,7 +33,3 @@
return 0;
panic("Whooops in pcibios_map_irq");
}
-
-struct pci_fixup pcibios_fixups[] = {
- {0}
-};
diff -Nru a/arch/mips/pci/fixup-ocelot-g.c b/arch/mips/pci/fixup-ocelot-g.c
--- a/arch/mips/pci/fixup-ocelot-g.c 2004-08-04 17:56:07 -07:00
+++ b/arch/mips/pci/fixup-ocelot-g.c 2004-08-04 17:56:07 -07:00
@@ -29,7 +29,3 @@
return -1;
}
-
-struct pci_fixup pcibios_fixups[] = {
- {0}
-};
diff -Nru a/arch/mips/pci/fixup-sni.c b/arch/mips/pci/fixup-sni.c
--- a/arch/mips/pci/fixup-sni.c 2004-08-04 17:56:07 -07:00
+++ b/arch/mips/pci/fixup-sni.c 2004-08-04 17:56:07 -07:00
@@ -82,7 +82,3 @@
return irq_tab_rm200[slot][pin];
}
-
-struct pci_fixup pcibios_fixups[] = {
- {0}
-};
diff -Nru a/arch/mips/pci/fixup-tb0219.c b/arch/mips/pci/fixup-tb0219.c
--- a/arch/mips/pci/fixup-tb0219.c 2004-08-04 17:56:07 -07:00
+++ b/arch/mips/pci/fixup-tb0219.c 2004-08-04 17:56:07 -07:00
@@ -58,7 +58,3 @@
return irq;
}
-
-struct pci_fixup pcibios_fixups[] __initdata = {
- { .pass = 0, },
-};
diff -Nru a/arch/mips/pci/fixup-tb0226.c b/arch/mips/pci/fixup-tb0226.c
--- a/arch/mips/pci/fixup-tb0226.c 2004-08-04 17:56:07 -07:00
+++ b/arch/mips/pci/fixup-tb0226.c 2004-08-04 17:56:07 -07:00
@@ -77,7 +77,3 @@
return irq;
}
-
-struct pci_fixup pcibios_fixups[] __initdata = {
- { .pass = 0, },
-};
diff -Nru a/arch/mips/pci/fixup-yosemite.c b/arch/mips/pci/fixup-yosemite.c
--- a/arch/mips/pci/fixup-yosemite.c 2004-08-04 17:56:07 -07:00
+++ b/arch/mips/pci/fixup-yosemite.c 2004-08-04 17:56:07 -07:00
@@ -33,7 +33,3 @@
return 3; /* Everything goes to one irq bit */
}
-
-struct pci_fixup pcibios_fixups[] = {
- {0}
-};
diff -Nru a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c
--- a/arch/mips/pci/pci-ip27.c 2004-08-04 17:56:08 -07:00
+++ b/arch/mips/pci/pci-ip27.c 2004-08-04 17:56:08 -07:00
@@ -329,6 +329,9 @@
pci_disable_swapping(d);
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3,
+ pci_fixup_ioc3);
+
static void __init pci_fixup_isp1020(struct pci_dev *d)
{
struct bridge_controller *bc = BRIDGE_CONTROLLER(d->bus);
@@ -353,6 +356,9 @@
pci_enable_swapping(d);
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1020,
+ pci_fixup_isp1020);
+
static void __init pci_fixup_isp2x00(struct pci_dev *d)
{
struct bridge_controller *bc = BRIDGE_CONTROLLER(d->bus);
@@ -427,14 +433,7 @@
/*d->resource[1].flags |= 1; */
}
-struct pci_fixup pcibios_fixups[] = {
- {PCI_FIXUP_HEADER, PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3,
- pci_fixup_ioc3},
- {PCI_FIXUP_HEADER, PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1020,
- pci_fixup_isp1020},
- {PCI_FIXUP_HEADER, PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100,
- pci_fixup_isp2x00},
- {PCI_FIXUP_HEADER, PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200,
- pci_fixup_isp2x00},
- {0}
-};
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100,
+ pci_fixup_isp2x00);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200,
+ pci_fixup_isp2x00);
diff -Nru a/arch/mips/pci/pci-sb1250.c b/arch/mips/pci/pci-sb1250.c
--- a/arch/mips/pci/pci-sb1250.c 2004-08-04 17:56:07 -07:00
+++ b/arch/mips/pci/pci-sb1250.c 2004-08-04 17:56:07 -07:00
@@ -279,7 +279,3 @@
return 0;
}
arch_initcall(sb1250_pcibios_init);
-
-struct pci_fixup pcibios_fixups[] = {
- {0}
-};
diff -Nru a/arch/mips/pmc-sierra/yosemite/ht.c b/arch/mips/pmc-sierra/yosemite/ht.c
--- a/arch/mips/pmc-sierra/yosemite/ht.c 2004-08-04 17:56:07 -07:00
+++ b/arch/mips/pmc-sierra/yosemite/ht.c 2004-08-04 17:56:07 -07:00
@@ -414,11 +414,6 @@
titan_ht_config_write_dword
};
-
-struct pci_fixup pcibios_fixups[] = {
- {0}
-};
-
void __init pcibios_fixup_bus(struct pci_bus *c)
{
titan_ht_pcibios_fixup_bus(c);
diff -Nru a/arch/parisc/kernel/pci.c b/arch/parisc/kernel/pci.c
--- a/arch/parisc/kernel/pci.c 2004-08-04 17:56:07 -07:00
+++ b/arch/parisc/kernel/pci.c 2004-08-04 17:56:07 -07:00
@@ -146,15 +146,6 @@
return str;
}
-/* Used in drivers/pci/quirks.c */
-struct pci_fixup pcibios_fixups[] = {
-#ifdef CONFIG_SUPERIO
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87415, superio_fixup_pci },
-#endif
- { 0 }
-};
-
-
/*
* Called by pci_set_master() - a driver interface.
*
diff -Nru a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
--- a/arch/ppc/kernel/pci.c 2004-08-04 17:56:07 -07:00
+++ b/arch/ppc/kernel/pci.c 2004-08-04 17:56:07 -07:00
@@ -45,11 +45,6 @@
static int reparent_resources(struct resource *parent, struct resource *res);
static void fixup_rev1_53c810(struct pci_dev* dev);
static void fixup_cpc710_pci64(struct pci_dev* dev);
-#ifdef CONFIG_PPC_PMAC
-extern void pmac_pci_fixup_cardbus(struct pci_dev* dev);
-extern void pmac_pci_fixup_pciata(struct pci_dev* dev);
-extern void pmac_pci_fixup_k2_sata(struct pci_dev* dev);
-#endif
#ifdef CONFIG_PPC_OF
static u8* pci_to_OF_bus_map;
#endif
@@ -64,20 +59,6 @@
static int pci_bus_count;
-struct pci_fixup pcibios_fixups[] = {
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_TRIDENT, PCI_ANY_ID, fixup_broken_pcnet32 },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810 },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CPC710_PCI64, fixup_cpc710_pci64},
- { PCI_FIXUP_HEADER, PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_resources },
-#ifdef CONFIG_PPC_PMAC
- /* We should add per-machine fixup support in xxx_setup.c or xxx_pci.c */
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_TI, PCI_ANY_ID, pmac_pci_fixup_cardbus },
- { PCI_FIXUP_FINAL, PCI_ANY_ID, PCI_ANY_ID, pmac_pci_fixup_pciata },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SERVERWORKS, 0x0240, pmac_pci_fixup_k2_sata },
-#endif /* CONFIG_PPC_PMAC */
- { 0 }
-};
-
static void
fixup_rev1_53c810(struct pci_dev* dev)
{
@@ -90,6 +71,7 @@
dev->class = PCI_CLASS_STORAGE_SCSI;
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
static void
fixup_broken_pcnet32(struct pci_dev* dev)
@@ -100,6 +82,7 @@
pci_name_device(dev);
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TRIDENT, PCI_ANY_ID, fixup_broken_pcnet32);
static void
fixup_cpc710_pci64(struct pci_dev* dev)
@@ -112,6 +95,7 @@
dev->resource[1].start = dev->resource[1].end = 0;
dev->resource[1].flags = 0;
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CPC710_PCI64, fixup_cpc710_pci64);
static void
pcibios_fixup_resources(struct pci_dev *dev)
@@ -158,6 +142,7 @@
if (ppc_md.pcibios_fixup_resources)
ppc_md.pcibios_fixup_resources(dev);
}
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_resources);
void
pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
diff -Nru a/arch/ppc/platforms/pmac_pci.c b/arch/ppc/platforms/pmac_pci.c
--- a/arch/ppc/platforms/pmac_pci.c 2004-08-04 17:56:07 -07:00
+++ b/arch/ppc/platforms/pmac_pci.c 2004-08-04 17:56:07 -07:00
@@ -1034,6 +1034,8 @@
}
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_TI, PCI_ANY_ID, pmac_pci_fixup_cardbus);
+
void pmac_pci_fixup_pciata(struct pci_dev* dev)
{
u8 progif = 0;
@@ -1074,6 +1076,8 @@
printk(KERN_ERR "Rewrite of PROGIF failed !\n");
}
}
+DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, pmac_pci_fixup_pciata);
+
/*
* Disable second function on K2-SATA, it's broken
@@ -1104,3 +1108,4 @@
}
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SERVERWORKS, 0x0240, pmac_pci_fixup_k2_sata);
diff -Nru a/arch/ppc/platforms/sbc82xx.c b/arch/ppc/platforms/sbc82xx.c
--- a/arch/ppc/platforms/sbc82xx.c 2004-08-04 17:56:07 -07:00
+++ b/arch/ppc/platforms/sbc82xx.c 2004-08-04 17:56:07 -07:00
@@ -20,6 +20,7 @@
#include <linux/stddef.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
+#include <linux/pci.h>
#include <asm/mpc8260.h>
#include <asm/machdep.h>
@@ -237,6 +238,25 @@
}
+static void __devinit quirk_sbc8260_cardbus(struct pci_dev *pdev)
+{
+ uint32_t ctrl;
+
+ if (pdev->bus->number != 0 || pdev->devfn != PCI_DEVFN(17, 0))
+ return;
+
+ printk(KERN_INFO "Setting up CardBus controller\n");
+
+ /* Set P2CCLK bit in System Control Register */
+ pci_read_config_dword(pdev, 0x80, &ctrl);
+ ctrl |= (1<<27);
+ pci_write_config_dword(pdev, 0x80, ctrl);
+
+ /* Set MFUNC up for PCI IRQ routing via INTA and INTB, and LEDs. */
+ pci_write_config_dword(pdev, 0x8c, 0x00c01d22);
+
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1420, quirk_sbc8260_cardbus);
void __init
platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
diff -Nru a/arch/ppc64/kernel/iSeries_pci.c b/arch/ppc64/kernel/iSeries_pci.c
--- a/arch/ppc64/kernel/iSeries_pci.c 2004-08-04 17:56:08 -07:00
+++ b/arch/ppc64/kernel/iSeries_pci.c 2004-08-04 17:56:08 -07:00
@@ -820,7 +820,3 @@
} while (CheckReturnCode("WWL", DevNode, rc) != 0);
}
EXPORT_SYMBOL(iSeries_Write_Long);
-
-void pcibios_name_device(struct pci_dev *dev)
-{
-}
diff -Nru a/arch/ppc64/kernel/pSeries_pci.c b/arch/ppc64/kernel/pSeries_pci.c
--- a/arch/ppc64/kernel/pSeries_pci.c 2004-08-04 17:56:08 -07:00
+++ b/arch/ppc64/kernel/pSeries_pci.c 2004-08-04 17:56:08 -07:00
@@ -519,9 +519,9 @@
return 0;
}
+#if 0
void pcibios_name_device(struct pci_dev *dev)
{
-#if 0
struct device_node *dn;
/*
@@ -541,8 +541,9 @@
}
}
}
-#endif
}
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pcibios_name_device);
+#endif
void __devinit pcibios_fixup_device_resources(struct pci_dev *dev,
struct pci_bus *bus)
diff -Nru a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c
--- a/arch/ppc64/kernel/pci.c 2004-08-04 17:56:07 -07:00
+++ b/arch/ppc64/kernel/pci.c 2004-08-04 17:56:07 -07:00
@@ -55,12 +55,6 @@
unsigned long isa_io_base; /* NULL if no ISA bus */
unsigned long pci_io_base;
-void pcibios_name_device(struct pci_dev* dev);
-void pcibios_final_fixup(void);
-static void fixup_broken_pcnet32(struct pci_dev* dev);
-static void fixup_windbond_82c105(struct pci_dev* dev);
-extern void fixup_k2_sata(struct pci_dev* dev);
-
void iSeries_pcibios_init(void);
struct pci_controller *hose_head;
@@ -74,20 +68,6 @@
/* Cached ISA bridge dev. */
struct pci_dev *ppc64_isabridge_dev = NULL;
-struct pci_fixup pcibios_fixups[] = {
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_TRIDENT, PCI_ANY_ID,
- fixup_broken_pcnet32 },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105,
- fixup_windbond_82c105 },
- { PCI_FIXUP_HEADER, PCI_ANY_ID, PCI_ANY_ID,
- pcibios_name_device },
-#ifdef CONFIG_PPC_PMAC
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SERVERWORKS, 0x0240,
- fixup_k2_sata },
-#endif
- { 0 }
-};
-
static void fixup_broken_pcnet32(struct pci_dev* dev)
{
if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) {
@@ -96,6 +76,7 @@
pci_name_device(dev);
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TRIDENT, PCI_ANY_ID, fixup_broken_pcnet32);
static void fixup_windbond_82c105(struct pci_dev* dev)
{
@@ -118,6 +99,7 @@
dev->resource[i].flags &= ~IORESOURCE_IO;
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105, fixup_windbond_82c105);
void
pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
diff -Nru a/arch/ppc64/kernel/pmac_pci.c b/arch/ppc64/kernel/pmac_pci.c
--- a/arch/ppc64/kernel/pmac_pci.c 2004-08-04 17:56:07 -07:00
+++ b/arch/ppc64/kernel/pmac_pci.c 2004-08-04 17:56:07 -07:00
@@ -777,3 +777,4 @@
}
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SERVERWORKS, 0x0240, fixup_k2_sata);
diff -Nru a/arch/sh/boards/mpc1211/pci.c b/arch/sh/boards/mpc1211/pci.c
--- a/arch/sh/boards/mpc1211/pci.c 2004-08-04 17:56:07 -07:00
+++ b/arch/sh/boards/mpc1211/pci.c 2004-08-04 17:56:07 -07:00
@@ -176,14 +176,7 @@
dev->resource[4].end = 0xf00f;
dev->resource[4].flags = IORESOURCE_IO;
}
-
-
-/* Add future fixups here... */
-struct pci_fixup pcibios_fixups[] = {
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_AL,
- PCI_DEVICE_ID_AL_M5229, quirk_ali_ide_ports },
- { 0 }
-};
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5229, quirk_ali_ide_ports);
char * __devinit pcibios_setup(char *str)
{
diff -Nru a/arch/sh/boards/overdrive/galileo.c b/arch/sh/boards/overdrive/galileo.c
--- a/arch/sh/boards/overdrive/galileo.c 2004-08-04 17:56:07 -07:00
+++ b/arch/sh/boards/overdrive/galileo.c 2004-08-04 17:56:07 -07:00
@@ -455,13 +455,7 @@
}
}
}
-
-
-/* Add future fixups here... */
-struct pci_fixup pcibios_fixups[] = {
- { PCI_FIXUP_HEADER, PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases },
- { 0 }
-};
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
void __init pcibios_init(void)
{
diff -Nru a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c
--- a/arch/sh/drivers/pci/fixups-dreamcast.c 2004-08-04 17:56:07 -07:00
+++ b/arch/sh/drivers/pci/fixups-dreamcast.c 2004-08-04 17:56:07 -07:00
@@ -47,11 +47,7 @@
}
}
-struct pci_fixup pcibios_fixups[] = {
- { PCI_FIXUP_HEADER, PCI_ANY_ID,
- PCI_ANY_ID, gapspci_fixup_resources },
- { 0, }
-};
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, gapspci_fixup_resources);
void __init pcibios_fixup_bus(struct pci_bus *bus)
{
diff -Nru a/arch/sh/drivers/pci/pci-sh7751.c b/arch/sh/drivers/pci/pci-sh7751.c
--- a/arch/sh/drivers/pci/pci-sh7751.c 2004-08-04 17:56:07 -07:00
+++ b/arch/sh/drivers/pci/pci-sh7751.c 2004-08-04 17:56:07 -07:00
@@ -177,15 +177,8 @@
}
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
#endif
-
-/* Add future fixups here... */
-struct pci_fixup pcibios_fixups[] = {
-#if !defined(CONFIG_SH_HS7751RVOIP) && !defined(CONFIG_SH_RTS7751R2D)
- { PCI_FIXUP_HEADER, PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases },
-#endif
- { 0 }
-};
/*
* Called after each bus is probed, but before its children
diff -Nru a/arch/sh/drivers/pci/pci-st40.c b/arch/sh/drivers/pci/pci-st40.c
--- a/arch/sh/drivers/pci/pci-st40.c 2004-08-04 17:56:07 -07:00
+++ b/arch/sh/drivers/pci/pci-st40.c 2004-08-04 17:56:07 -07:00
@@ -160,13 +160,7 @@
}
}
}
-
-
-/* Add future fixups here... */
-struct pci_fixup pcibios_fixups[] = {
- { PCI_FIXUP_HEADER, PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases },
- { 0 }
-};
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
int __init st40pci_init(unsigned memStart, unsigned memSize)
{
diff -Nru a/arch/sh64/kernel/pci_sh5.c b/arch/sh64/kernel/pci_sh5.c
--- a/arch/sh64/kernel/pci_sh5.c 2004-08-04 17:56:08 -07:00
+++ b/arch/sh64/kernel/pci_sh5.c 2004-08-04 17:56:08 -07:00
@@ -48,12 +48,7 @@
}
}
}
-
-/* Add future fixups here... */
-struct pci_fixup pcibios_fixups[] = {
- { PCI_FIXUP_HEADER, PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases },
- { 0 }
-};
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
char * __init pcibios_setup(char *str)
{
diff -Nru a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
--- a/arch/sparc/kernel/pcic.c 2004-08-04 17:56:07 -07:00
+++ b/arch/sparc/kernel/pcic.c 2004-08-04 17:56:07 -07:00
@@ -36,10 +36,6 @@
#include <asm/uaccess.h>
-struct pci_fixup pcibios_fixups[] = {
- { 0 }
-};
-
unsigned int pcic_pin_to_irq(unsigned int pin, char *name);
/*
diff -Nru a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
--- a/arch/sparc64/kernel/pci.c 2004-08-04 17:56:07 -07:00
+++ b/arch/sparc64/kernel/pci.c 2004-08-04 17:56:07 -07:00
@@ -351,10 +351,6 @@
subsys_initcall(pcibios_init);
-struct pci_fixup pcibios_fixups[] = {
- { 0 }
-};
-
void pcibios_fixup_bus(struct pci_bus *pbus)
{
struct pci_pbm_info *pbm = pbus->sysdata;
diff -Nru a/arch/v850/kernel/rte_mb_a_pci.c b/arch/v850/kernel/rte_mb_a_pci.c
--- a/arch/v850/kernel/rte_mb_a_pci.c 2004-08-04 17:56:07 -07:00
+++ b/arch/v850/kernel/rte_mb_a_pci.c 2004-08-04 17:56:07 -07:00
@@ -322,8 +322,6 @@
/* Stubs for things we don't use. */
-struct pci_fixup pcibios_fixups[] = { { 0 } };
-
/* Called after each bus is probed, but before its children are examined. */
void pcibios_fixup_bus(struct pci_bus *b)
{
diff -Nru a/drivers/parisc/superio.c b/drivers/parisc/superio.c
--- a/drivers/parisc/superio.c 2004-08-04 17:56:07 -07:00
+++ b/drivers/parisc/superio.c 2004-08-04 17:56:07 -07:00
@@ -480,6 +480,7 @@
pci_read_config_byte(pdev, PCI_CLASS_PROG, &prog);
printk("PCI: Enabled native mode for NS87415 (pif=0x%x)\n", prog);
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87415, superio_fixup_pci);
/* Because of a defect in Super I/O, all reads of the PCI DMA status
* registers, IDE status register and the IDE select register need to be
diff -Nru a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
--- a/drivers/pci/hotplug/Kconfig 2004-08-04 17:56:08 -07:00
+++ b/drivers/pci/hotplug/Kconfig 2004-08-04 17:56:08 -07:00
@@ -88,6 +88,18 @@
When in doubt, say N.
+config HOTPLUG_PCI_ACPI_IBM
+ tristate "ACPI PCI Hotplug driver IBM extensions"
+ depends on HOTPLUG_PCI_ACPI
+ help
+ Say Y here if you have an IBM system that supports PCI Hotplug using
+ ACPI.
+
+ To compile this driver as a module, choose M here: the
+ module will be called acpiphp_ibm.
+
+ When in doubt, say N.
+
config HOTPLUG_PCI_CPCI
bool "CompactPCI Hotplug driver"
depends on HOTPLUG_PCI
diff -Nru a/drivers/pci/hotplug/Makefile b/drivers/pci/hotplug/Makefile
--- a/drivers/pci/hotplug/Makefile 2004-08-04 17:56:07 -07:00
+++ b/drivers/pci/hotplug/Makefile 2004-08-04 17:56:07 -07:00
@@ -7,6 +7,7 @@
obj-$(CONFIG_HOTPLUG_PCI_COMPAQ) += cpqphp.o
obj-$(CONFIG_HOTPLUG_PCI_IBM) += ibmphp.o
obj-$(CONFIG_HOTPLUG_PCI_ACPI) += acpiphp.o
+obj-$(CONFIG_HOTPLUG_PCI_ACPI_IBM) += acpiphp_ibm.o
obj-$(CONFIG_HOTPLUG_PCI_CPCI_ZT5550) += cpcihp_zt5550.o
obj-$(CONFIG_HOTPLUG_PCI_CPCI_GENERIC) += cpcihp_generic.o
obj-$(CONFIG_HOTPLUG_PCI_PCIE) += pciehp.o
diff -Nru a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h
--- a/drivers/pci/hotplug/acpiphp.h 2004-08-04 17:56:08 -07:00
+++ b/drivers/pci/hotplug/acpiphp.h 2004-08-04 17:56:08 -07:00
@@ -171,6 +171,18 @@
struct pci_resource *bus_head;
};
+/**
+ * struct acpiphp_attention_info - device specific attention registration
+ *
+ * ACPI has no generic method of setting/getting attention status
+ * this allows for device specific driver registration
+ */
+struct acpiphp_attention_info
+{
+ int (*set_attn)(struct hotplug_slot *slot, u8 status);
+ int (*get_attn)(struct hotplug_slot *slot, u8 *status);
+ struct module *owner;
+};
/* PCI bus bridge HID */
#define ACPI_PCI_HOST_HID "PNP0A03"
@@ -211,6 +223,10 @@
#define FUNC_HAS_PS3 (0x00000080)
/* function prototypes */
+
+/* acpiphp_core.c */
+extern int acpiphp_register_attention(struct acpiphp_attention_info*info);
+extern int acpiphp_unregister_attention(struct acpiphp_attention_info *info);
/* acpiphp_glue.c */
extern int acpiphp_glue_init (void);
diff -Nru a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c
--- a/drivers/pci/hotplug/acpiphp_core.c 2004-08-04 17:56:07 -07:00
+++ b/drivers/pci/hotplug/acpiphp_core.c 2004-08-04 17:56:07 -07:00
@@ -51,6 +51,7 @@
/* local variables */
static int num_slots;
+static struct acpiphp_attention_info *attention_info;
#define DRIVER_VERSION "0.4"
#define DRIVER_AUTHOR "Greg Kroah-Hartman <gregkh@us.ibm.com>, Takayoshi Kochi <t-kochi@bq.jp.nec.com>"
@@ -62,10 +63,15 @@
MODULE_PARM_DESC(debug, "Debugging mode enabled or not");
module_param(debug, bool, 644);
+/* export the attention callback registration methods */
+EXPORT_SYMBOL_GPL(acpiphp_register_attention);
+EXPORT_SYMBOL_GPL(acpiphp_unregister_attention);
+
static int enable_slot (struct hotplug_slot *slot);
static int disable_slot (struct hotplug_slot *slot);
static int set_attention_status (struct hotplug_slot *slot, u8 value);
static int get_power_status (struct hotplug_slot *slot, u8 *value);
+static int get_attention_status (struct hotplug_slot *slot, u8 *value);
static int get_address (struct hotplug_slot *slot, u32 *value);
static int get_latch_status (struct hotplug_slot *slot, u8 *value);
static int get_adapter_status (struct hotplug_slot *slot, u8 *value);
@@ -76,11 +82,54 @@
.disable_slot = disable_slot,
.set_attention_status = set_attention_status,
.get_power_status = get_power_status,
+ .get_attention_status = get_attention_status,
.get_latch_status = get_latch_status,
.get_adapter_status = get_adapter_status,
.get_address = get_address,
};
+
+/**
+ * acpiphp_register_attention - set attention LED callback
+ * @info: must be completely filled with LED callbacks
+ *
+ * Description: this is used to register a hardware specific ACPI
+ * driver that manipulates the attention LED. All the fields in
+ * info must be set.
+ **/
+int acpiphp_register_attention(struct acpiphp_attention_info *info)
+{
+ int retval = -EINVAL;
+
+ if (info && info->owner && info->set_attn &&
+ info->get_attn && !attention_info) {
+ retval = 0;
+ attention_info = info;
+ }
+ return retval;
+}
+
+
+/**
+ * acpiphp_unregister_attention - unset attention LED callback
+ * @info: must match the pointer used to register
+ *
+ * Description: this is used to un-register a hardware specific acpi
+ * driver that manipulates the attention LED. The pointer to the
+ * info struct must be the same as the one used to set it.
+ **/
+int acpiphp_unregister_attention(struct acpiphp_attention_info *info)
+{
+ int retval = -EINVAL;
+
+ if (info && attention_info == info) {
+ attention_info = NULL;
+ retval = 0;
+ }
+ return retval;
+}
+
+
/**
* enable_slot - power on and enable a slot
* @hotplug_slot: slot to enable
@@ -117,33 +166,29 @@
}
-/**
- * set_attention_status - set attention LED
- *
- * TBD:
- * ACPI doesn't have known method to manipulate
- * attention status LED.
- *
- */
-static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
-{
- dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
-
- switch (status) {
- case 0:
- /* FIXME turn light off */
- hotplug_slot->info->attention_status = 0;
- break;
-
- case 1:
- default:
- /* FIXME turn light on */
- hotplug_slot->info->attention_status = 1;
- break;
- }
-
- return 0;
-}
+ /**
+ * set_attention_status - set attention LED
+ * @hotplug_slot: slot to set attention LED on
+ * @status: value to set attention LED to (0 or 1)
+ *
+ * attention status LED, so we use a callback that
+ * was registered with us. This allows hardware specific
+ * ACPI implementations to blink the light for us.
+ **/
+ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
+ {
+ int retval = -ENODEV;
+
+ dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+
+ if (attention_info && try_module_get(attention_info->owner)) {
+ retval = attention_info->set_attn(hotplug_slot, status);
+ module_put(attention_info->owner);
+ } else
+ attention_info = NULL;
+ return retval;
+ }
+
/**
* get_power_status - get power status of a slot
@@ -165,6 +210,32 @@
return 0;
}
+
+ /**
+ * get_attention_status - get attention LED status
+ * @hotplug_slot: slot to get status from
+ * @value: returns with value of attention LED
+ *
+ * ACPI doesn't have known method to determine the state
+ * of the attention status LED, so we use a callback that
+ * was registered with us. This allows hardware specific
+ * ACPI implementations to determine its state
+ **/
+static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
+{
+ int retval = -EINVAL;
+
+ dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+
+ if (attention_info && try_module_get(attention_info->owner)) {
+ retval = attention_info->get_attn(hotplug_slot, value);
+ module_put(attention_info->owner);
+ } else
+ attention_info = NULL;
+ return retval;
+}
+
+
/**
* get_latch_status - get latch status of a slot
* @hotplug_slot: slot to get status
@@ -307,7 +378,7 @@
slot->acpi_slot = get_slot_from_id(i);
slot->hotplug_slot->info->power_status = acpiphp_get_power_status(slot->acpi_slot);
- slot->hotplug_slot->info->attention_status = acpiphp_get_attention_status(slot->acpi_slot);
+ slot->hotplug_slot->info->attention_status = 0;
slot->hotplug_slot->info->latch_status = acpiphp_get_latch_status(slot->acpi_slot);
slot->hotplug_slot->info->adapter_status = acpiphp_get_adapter_status(slot->acpi_slot);
slot->hotplug_slot->info->max_bus_speed = PCI_SPEED_UNKNOWN;
diff -Nru a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
--- a/drivers/pci/hotplug/acpiphp_glue.c 2004-08-04 17:56:07 -07:00
+++ b/drivers/pci/hotplug/acpiphp_glue.c 2004-08-04 17:56:07 -07:00
@@ -1302,20 +1302,6 @@
/*
- * attention LED ON: 1
- * OFF: 0
- *
- * TBD
- * no direct attention led status information via ACPI
- *
- */
-u8 acpiphp_get_attention_status(struct acpiphp_slot *slot)
-{
- return 0;
-}
-
-
-/*
* latch closed: 1
* latch open: 0
*/
diff -Nru a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/drivers/pci/hotplug/acpiphp_ibm.c 2004-08-04 17:56:08 -07:00
@@ -0,0 +1,474 @@
+/*
+ * ACPI PCI Hot Plug IBM Extension
+ *
+ * Copyright (C) 2004 Vernon Mauery <vernux@us.ibm.com>
+ * Copyright (C) 2004 IBM Corp.
+ *
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
+ * NON INFRINGEMENT. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Send feedback to <vernux@us.ibm.com>
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <acpi/acpi_bus.h>
+#include <linux/sysfs.h>
+#include <linux/kobject.h>
+#include <asm/uaccess.h>
+#include <linux/moduleparam.h>
+
+#include "acpiphp.h"
+#include "pci_hotplug.h"
+
+#define DRIVER_VERSION "1.0.1"
+#define DRIVER_AUTHOR "Irene Zubarev <zubarev@us.ibm.com>, Vernon Mauery <vernux@us.ibm.com>"
+#define DRIVER_DESC "ACPI Hot Plug PCI Controller Driver IBM extension"
+
+static int debug;
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRIVER_VERSION);
+module_param(debug, bool, 644);
+MODULE_PARM_DESC(debug, " Debugging mode enabled or not");
+#define MY_NAME "acpiphp_ibm"
+
+#undef dbg
+#define dbg(format, arg...) \
+do { \
+ if (debug) \
+ printk(KERN_DEBUG "%s: " format, \
+ MY_NAME , ## arg); \
+} while (0)
+
+#define FOUND_APCI 0x61504349
+/* these are the names for the IBM ACPI pseudo-device */
+#define IBM_HARDWARE_ID1 "IBM37D0"
+#define IBM_HARDWARE_ID2 "IBM37D4"
+
+/* union apci_descriptor - allows access to the
+ * various device descriptors that are embedded in the
+ * aPCI table
+ */
+union apci_descriptor {
+ struct {
+ char sig[4];
+ u8 len;
+ } header;
+ struct {
+ u8 type;
+ u8 len;
+ u16 slot_id;
+ u8 bus_id;
+ u8 dev_num;
+ u8 slot_num;
+ u8 slot_attr[2];
+ u8 attn;
+ u8 status[2];
+ u8 sun;
+ } slot;
+ struct {
+ u8 type;
+ u8 len;
+ } generic;
+};
+
+/* struct notification - keeps info about the device
+ * that cause the ACPI notification event
+ */
+struct notification {
+ struct acpi_device *device;
+ u8 event;
+};
+
+static int ibm_set_attention_status(struct hotplug_slot *slot, u8 status);
+static int ibm_get_attention_status(struct hotplug_slot *slot, u8 *status);
+static void ibm_handle_events(acpi_handle handle, u32 event, void *context);
+static int ibm_get_table_from_acpi(char **bufp);
+static ssize_t ibm_read_apci_table(struct kobject *kobj,
+ char *buffer, loff_t pos, size_t size);
+static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
+ u32 lvl, void *context, void **rv);
+static int __init ibm_acpiphp_init(void);
+static void __exit ibm_acpiphp_exit(void);
+
+static acpi_handle ibm_acpi_handle;
+static struct notification ibm_note;
+static struct bin_attribute ibm_apci_table_attr = {
+ .attr = {
+ .name = "apci_table",
+ .owner = THIS_MODULE,
+ .mode = S_IRUGO,
+ },
+ .read = ibm_read_apci_table,
+ .write = NULL,
+};
+static struct acpiphp_attention_info ibm_attention_info =
+{
+ .set_attn = ibm_set_attention_status,
+ .get_attn = ibm_get_attention_status,
+ .owner = THIS_MODULE,
+};
+
+
+/**
+ * ibm_set_attention_status - callback method to set the attention LED
+ * @slot: the hotplug_slot to work with
+ * @status: what to set the LED to (0 or 1)
+ *
+ * Description: this method is registered with the acpiphp module as a
+ * callback to do the device specific task of setting the LED status
+ **/
+static int ibm_set_attention_status(struct hotplug_slot *slot, u8 status)
+{
+ int retval = 0;
+ union acpi_object args[2];
+ struct acpi_object_list params = { .pointer = args, .count = 2 };
+ acpi_status stat;
+ unsigned long rc = 0;
+ struct acpiphp_slot *acpi_slot;
+
+ acpi_slot = ((struct slot *)(slot->private))->acpi_slot;
+
+ dbg("%s: set slot %d attention status to %d\n", __FUNCTION__,
+ acpi_slot->sun, (status ? 1 : 0));
+
+ args[0].type = ACPI_TYPE_INTEGER;
+ args[0].integer.value = acpi_slot->sun;
+ args[1].type = ACPI_TYPE_INTEGER;
+ args[1].integer.value = (status) ? 1 : 0;
+
+ stat = acpi_evaluate_integer(ibm_acpi_handle, "APLS", ¶ms, &rc);
+ if (ACPI_FAILURE(stat)) {
+ retval = -ENODEV;
+ err("APLS evaluation failed: 0x%08x\n", stat);
+ } else if (!rc) {
+ retval = -ERANGE;
+ err("APLS method failed: 0x%08lx\n", rc);
+ }
+ return retval;
+}
+
+/**
+ * ibm_get_attention_status - callback method to get attention LED status
+ * @slot: the hotplug_slot to work with
+ * @status: returns what the LED is set to (0 or 1)
+ *
+ * Description: this method is registered with the acpiphp module as a
+ * callback to do the device specific task of getting the LED status
+ *
+ * Because there is no direct method of getting the LED status directly
+ * from an ACPI call, we read the aPCI table and parse out our
+ * slot descriptor to read the status from that.
+ **/
+static int ibm_get_attention_status(struct hotplug_slot *slot, u8 *status)
+{
+ int retval = -EINVAL, ind = 0, size;
+ char *table = NULL;
+ struct acpiphp_slot *acpi_slot;
+ union apci_descriptor *des;
+
+ acpi_slot = ((struct slot *)(slot->private))->acpi_slot;
+
+ size = ibm_get_table_from_acpi(&table);
+ if (size <= 0 || !table)
+ goto get_attn_done;
+ // read the header
+ des = (union apci_descriptor *)&table[ind];
+ if (memcmp(des->header.sig, "aPCI", 4) != 0)
+ goto get_attn_done;
+ des = (union apci_descriptor *)&table[ind += des->header.len];
+ while (ind < size && (des->generic.type != 0x82 ||
+ des->slot.slot_id != acpi_slot->sun))
+ des = (union apci_descriptor *)&table[ind += des->generic.len];
+ if (ind < size && des->slot.slot_id == acpi_slot->sun) {
+ retval = 0;
+ if (des->slot.attn & 0xa0 || des->slot.status[1] & 0x08)
+ *status = 1;
+ else
+ *status = 0;
+ }
+
+ dbg("%s: get slot %d attention status is %d retval=%x\n",
+ __FUNCTION__, acpi_slot->sun, *status, retval);
+
+get_attn_done:
+ kfree(table);
+ return retval;
+}
+
+/**
+ * ibm_handle_events - listens for ACPI events for the IBM37D0 device
+ * @handle: an ACPI handle to the device that caused the event
+ * @event: the event info (device specific)
+ * @context: passed context (our notification struct)
+ *
+ * Description: this method is registered as a callback with the ACPI
+ * subsystem it is called when this device has an event to notify the OS of
+ *
+ * The events actually come from the device as two events that get
+ * synthesized into one event with data by this function. The event
+ * ID comes first and then the slot number that caused it. We report
+ * this as one event to the OS.
+ *
+ * From section 5.6.2.2 of the ACPI 2.0 spec, I understand that the OSPM will
+ * only re-enable the interrupt that causes this event AFTER this method
+ * has returned, thereby enforcing serial access for the notification struct.
+ **/
+static void ibm_handle_events(acpi_handle handle, u32 event, void *context)
+{
+ u8 detail = event & 0x0f;
+ u8 subevent = event & 0xf0;
+ struct notification *note = context;
+
+ dbg("%s: Received notification %02x\n", __FUNCTION__, event);
+
+ if (subevent == 0x80) {
+ dbg("%s: generationg bus event\n", __FUNCTION__);
+ acpi_bus_generate_event(note->device, note->event, detail);
+ } else
+ note->event = event;
+}
+
+/**
+ * ibm_get_table_from_acpi - reads the APLS buffer from ACPI
+ * @bufp: address to pointer to allocate for the table
+ *
+ * Description: this method reads the APLS buffer in from ACPI and
+ * stores the "stripped" table into a single buffer
+ * it allocates and passes the address back in bufp
+ *
+ * If NULL is passed in as buffer, this method only calculates
+ * the size of the table and returns that without filling
+ * in the buffer
+ *
+ * returns < 0 on error or the size of the table on success
+ **/
+static int ibm_get_table_from_acpi(char **bufp)
+{
+ union acpi_object *package;
+ struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+ acpi_status status;
+ char *lbuf = NULL;
+ int i, size = -EIO;
+
+ status = acpi_evaluate_object(ibm_acpi_handle, "APCI", NULL, &buffer);
+ if (ACPI_FAILURE(status)) {
+ err("%s: APCI evaluation failed\n", __FUNCTION__);
+ return -ENODEV;
+ }
+
+ package = (union acpi_object *) buffer.pointer;
+ if(!(package) ||
+ (package->type != ACPI_TYPE_PACKAGE) ||
+ !(package->package.elements)) {
+ err("%s: Invalid APCI object\n", __FUNCTION__);
+ goto read_table_done;
+ }
+
+ for(size = 0, i = 0; i < package->package.count; i++) {
+ if (package->package.elements[i].type != ACPI_TYPE_BUFFER) {
+ err("%s: Invalid APCI element %d\n", __FUNCTION__, i);
+ goto read_table_done;
+ }
+ size += package->package.elements[i].buffer.length;
+ }
+
+ if (bufp == NULL)
+ goto read_table_done;
+
+ lbuf = kmalloc(size, GFP_KERNEL);
+ dbg("%s: element count: %i, ASL table size: %i, &table = 0x%p\n",
+ __FUNCTION__, package->package.count, size, lbuf);
+
+ if (lbuf) {
+ *bufp = lbuf;
+ memset(lbuf, 0, size);
+ } else {
+ size = -ENOMEM;
+ goto read_table_done;
+ }
+
+ size = 0;
+ for (i=0; i<package->package.count; i++) {
+ memcpy(&lbuf[size],
+ package->package.elements[i].buffer.pointer,
+ package->package.elements[i].buffer.length);
+ size += package->package.elements[i].buffer.length;
+ }
+
+read_table_done:
+ kfree(buffer.pointer);
+ return size;
+}
+
+/**
+ * ibm_read_apci_table - callback for the sysfs apci_table file
+ * @kobj: the kobject this binary attribute is a part of
+ * @buffer: the kernel space buffer to fill
+ * @pos: the offset into the file
+ * @size: the number of bytes requested
+ *
+ * Description: gets registered with sysfs as the reader callback
+ * to be executed when /sys/bus/pci/slots/apci_table gets read
+ *
+ * Since we don't get notified on open and close for this file,
+ * things get really tricky here...
+ * our solution is to only allow reading the table in all at once
+ **/
+static ssize_t ibm_read_apci_table(struct kobject *kobj,
+ char *buffer, loff_t pos, size_t size)
+{
+ int bytes_read = -EINVAL;
+ char *table = NULL;
+
+ dbg("%s: pos = %d, size = %d\n", __FUNCTION__, (int)pos, size);
+
+ if (pos == 0) {
+ bytes_read = ibm_get_table_from_acpi(&table);
+ if (bytes_read > 0 && bytes_read <= size)
+ memcpy(buffer, table, bytes_read);
+ kfree(table);
+ }
+ return bytes_read;
+}
+
+/**
+ * ibm_find_acpi_device - callback to find our ACPI device
+ * @handle: the ACPI handle of the device we are inspecting
+ * @lvl: depth into the namespace tree
+ * @context: a pointer to our handle to fill when we find the device
+ * @rv: a return value to fill if desired
+ *
+ * Description: used as a callback when calling acpi_walk_namespace
+ * to find our device. When this method returns non-zero
+ * acpi_walk_namespace quits its search and returns our value
+ **/
+static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
+ u32 lvl, void *context, void **rv)
+{
+ acpi_handle *phandle = (acpi_handle *)context;
+ acpi_status status;
+ struct acpi_device_info info;
+ struct acpi_buffer info_buffer = {
+ .length = sizeof(struct acpi_device_info),
+ .pointer = &info,
+ };
+
+ status = acpi_get_object_info(handle, &info_buffer);
+ if (ACPI_FAILURE(status)) {
+ err("%s: Failed to get device information", __FUNCTION__);
+ return 0;
+ }
+ info.hardware_id.value[sizeof(info.hardware_id.value) - 1] = '\0';
+
+ if(info.current_status && (info.valid & ACPI_VALID_HID) &&
+ (!strcmp(info.hardware_id.value, IBM_HARDWARE_ID1) ||
+ !strcmp(info.hardware_id.value, IBM_HARDWARE_ID2))) {
+ dbg("found hardware: %s, handle: %x\n", info.hardware_id.value,
+ (unsigned int)handle);
+ *phandle = handle;
+ /* returning non-zero causes the search to stop
+ * and returns this value to the caller of
+ * acpi_walk_namespace, but it also causes some warnings
+ * in the acpi debug code to print...
+ */
+ return FOUND_APCI;
+ }
+ return 0;
+}
+
+static int __init ibm_acpiphp_init(void)
+{
+ int retval = 0;
+ acpi_status status;
+ struct acpi_device *device;
+ struct kobject *sysdir = &pci_hotplug_slots_subsys.kset.kobj;
+
+ dbg("%s\n", __FUNCTION__);
+
+ if (acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+ ACPI_UINT32_MAX, ibm_find_acpi_device,
+ &ibm_acpi_handle, NULL) != FOUND_APCI) {
+ err("%s: acpi_walk_namespace failed\n", __FUNCTION__);
+ retval = -ENODEV;
+ goto init_return;
+ }
+ dbg("%s: found IBM aPCI device\n", __FUNCTION__);
+ if (acpi_bus_get_device(ibm_acpi_handle, &device)) {
+ err("%s: acpi_bus_get_device failed\n", __FUNCTION__);
+ retval = -ENODEV;
+ goto init_return;
+ }
+ if (acpiphp_register_attention(&ibm_attention_info)) {
+ retval = -ENODEV;
+ goto init_return;
+ }
+
+ ibm_note.device = device;
+ status = acpi_install_notify_handler(
+ ibm_acpi_handle,
+ ACPI_DEVICE_NOTIFY,
+ ibm_handle_events,
+ &ibm_note);
+ if (ACPI_FAILURE(status)) {
+ err("%s: Failed to register notification handler\n",
+ __FUNCTION__);
+ retval = -EBUSY;
+ goto init_cleanup;
+ }
+
+ ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
+ retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
+
+ return retval;
+
+init_cleanup:
+ acpiphp_unregister_attention(&ibm_attention_info);
+init_return:
+ return retval;
+}
+
+static void __exit ibm_acpiphp_exit(void)
+{
+ acpi_status status;
+ struct kobject *sysdir = &pci_hotplug_slots_subsys.kset.kobj;
+
+ dbg("%s\n", __FUNCTION__);
+
+ if (acpiphp_unregister_attention(&ibm_attention_info))
+ err("%s: attention info deregistration failed", __FUNCTION__);
+
+ status = acpi_remove_notify_handler(
+ ibm_acpi_handle,
+ ACPI_DEVICE_NOTIFY,
+ ibm_handle_events);
+ if (ACPI_FAILURE(status))
+ err("%s: Notification handler removal failed\n",
+ __FUNCTION__);
+ // remove the /sys entries
+ if (sysfs_remove_bin_file(sysdir, &ibm_apci_table_attr))
+ err("%s: removal of sysfs file apci_table failed\n",
+ __FUNCTION__);
+}
+
+module_init(ibm_acpiphp_init);
+module_exit(ibm_acpiphp_exit);
diff -Nru a/drivers/pci/hotplug/cpci_hotplug_core.c b/drivers/pci/hotplug/cpci_hotplug_core.c
--- a/drivers/pci/hotplug/cpci_hotplug_core.c 2004-08-04 17:56:07 -07:00
+++ b/drivers/pci/hotplug/cpci_hotplug_core.c 2004-08-04 17:56:07 -07:00
@@ -33,6 +33,7 @@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/smp_lock.h>
+#include <linux/delay.h>
#include "pci_hotplug.h"
#include "cpci_hotplug.h"
@@ -513,11 +514,10 @@
break;
while(controller->ops->query_enum()) {
rc = check_slots();
- if(rc > 0) {
+ if (rc > 0)
/* Give userspace a chance to handle extraction */
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ / 2);
- } else if(rc < 0) {
+ msleep(500);
+ else if (rc < 0) {
dbg("%s - error checking slots", __FUNCTION__);
thread_finished = 1;
break;
@@ -568,11 +568,10 @@
while(controller->ops->query_enum()) {
rc = check_slots();
- if(rc > 0) {
+ if(rc > 0)
/* Give userspace a chance to handle extraction */
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ / 2);
- } else if(rc < 0) {
+ msleep(500);
+ else if (rc < 0) {
dbg("%s - error checking slots", __FUNCTION__);
thread_finished = 1;
break;
@@ -595,8 +594,7 @@
}
}
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ / 10);
+ msleep(100);
}
dbg("poll thread signals exit");
up(&thread_exit);
diff -Nru a/drivers/pci/hotplug/ibmphp.h b/drivers/pci/hotplug/ibmphp.h
--- a/drivers/pci/hotplug/ibmphp.h 2004-08-04 17:56:07 -07:00
+++ b/drivers/pci/hotplug/ibmphp.h 2004-08-04 17:56:07 -07:00
@@ -759,11 +759,5 @@
extern int ibmphp_unconfigure_card (struct slot **, int);
extern struct hotplug_slot_ops ibmphp_hotplug_slot_ops;
-static inline void long_delay (int delay)
-{
- set_current_state (TASK_INTERRUPTIBLE);
- schedule_timeout (delay);
-}
-
#endif //__IBMPHP_H
diff -Nru a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
--- a/drivers/pci/hotplug/ibmphp_core.c 2004-08-04 17:56:08 -07:00
+++ b/drivers/pci/hotplug/ibmphp_core.c 2004-08-04 17:56:08 -07:00
@@ -190,7 +190,7 @@
err ("command not completed successfully in power_on\n");
return -EIO;
}
- long_delay (3 * HZ); /* For ServeRAID cards, and some 66 PCI */
+ msleep(3000); /* For ServeRAID cards, and some 66 PCI */
return 0;
}
@@ -913,7 +913,7 @@
}
/* This is for x440, once Brandon fixes the firmware,
will not need this delay */
- long_delay (1 * HZ);
+ msleep(1000);
debug ("%s -Exit\n", __FUNCTION__);
return 0;
}
diff -Nru a/drivers/pci/hotplug/ibmphp_hpc.c b/drivers/pci/hotplug/ibmphp_hpc.c
--- a/drivers/pci/hotplug/ibmphp_hpc.c 2004-08-04 17:56:07 -07:00
+++ b/drivers/pci/hotplug/ibmphp_hpc.c 2004-08-04 17:56:07 -07:00
@@ -29,6 +29,7 @@
#include <linux/wait.h>
#include <linux/time.h>
+#include <linux/delay.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/smp_lock.h>
@@ -205,7 +206,7 @@
// READ - step 4 : wait until start operation bit clears
i = CMD_COMPLETE_TOUT_SEC;
while (i) {
- long_delay (1 * HZ / 100);
+ msleep(10);
wpg_addr = WPGBbar + WPG_I2CMCNTL_OFFSET;
wpg_data = readl (wpg_addr);
data = swab32 (wpg_data);
@@ -221,7 +222,7 @@
// READ - step 5 : read I2C status register
i = CMD_COMPLETE_TOUT_SEC;
while (i) {
- long_delay (1 * HZ / 100);
+ msleep(10);
wpg_addr = WPGBbar + WPG_I2CSTAT_OFFSET;
wpg_data = readl (wpg_addr);
data = swab32 (wpg_data);
@@ -316,7 +317,7 @@
// WRITE - step 4 : wait until start operation bit clears
i = CMD_COMPLETE_TOUT_SEC;
while (i) {
- long_delay (1 * HZ / 100);
+ msleep(10);
wpg_addr = WPGBbar + WPG_I2CMCNTL_OFFSET;
wpg_data = readl (wpg_addr);
data = swab32 (wpg_data);
@@ -333,7 +334,7 @@
// WRITE - step 5 : read I2C status register
i = CMD_COMPLETE_TOUT_SEC;
while (i) {
- long_delay (1 * HZ / 100);
+ msleep(10);
wpg_addr = WPGBbar + WPG_I2CSTAT_OFFSET;
wpg_data = readl (wpg_addr);
data = swab32 (wpg_data);
@@ -748,7 +749,7 @@
done = TRUE;
}
if (!done) {
- long_delay (1 * HZ);
+ msleep(1000);
if (timeout < 1) {
done = TRUE;
err ("%s - Error command complete timeout\n", __FUNCTION__);
@@ -891,7 +892,7 @@
case POLL_SLEEP:
/* don't sleep with a lock on the hardware */
up (&semOperations);
- long_delay (POLL_INTERVAL_SEC * HZ);
+ msleep(POLL_INTERVAL_SEC * 1000);
if (ibmphp_shutdown)
break;
@@ -908,8 +909,7 @@
/* give up the harware semaphore */
up (&semOperations);
/* sleep for a short time just for good measure */
- set_current_state (TASK_INTERRUPTIBLE);
- schedule_timeout (HZ/10);
+ msleep(100);
}
up (&sem_exit);
debug ("%s - Exit\n", __FUNCTION__);
@@ -974,7 +974,7 @@
if (SLOT_PWRGD (pslot->status)) {
// power goes on and off after closing latch
// check again to make sure power is still ON
- long_delay (1 * HZ);
+ msleep(1000);
rc = ibmphp_hpc_readslot (pslot, READ_SLOTSTATUS, &status);
if (SLOT_PWRGD (status))
update = TRUE;
@@ -1147,7 +1147,7 @@
if (CTLR_WORKING (*pstatus) == HPC_CTLR_WORKING_NO)
done = TRUE;
if (!done) {
- long_delay (1 * HZ);
+ msleep(1000);
if (timeout < 1) {
done = TRUE;
err ("HPCreadslot - Error ctlr timeout\n");
diff -Nru a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c
--- a/drivers/pci/hotplug/rpaphp_pci.c 2004-08-04 17:56:07 -07:00
+++ b/drivers/pci/hotplug/rpaphp_pci.c 2004-08-04 17:56:07 -07:00
@@ -341,7 +341,6 @@
return rc;
}
-
static void rpaphp_eeh_remove_bus_device(struct pci_dev *dev)
{
eeh_remove_device(dev);
@@ -430,10 +429,26 @@
__FUNCTION__, slot->name);
goto exit_rc;
}
- if (init_slot_pci_funcs(slot)) {
- err("%s: init_slot_pci_funcs failed\n", __FUNCTION__);
+
+ if (slot->hotplug_slot->info->adapter_status == NOT_CONFIGURED) {
+ dbg("%s CONFIGURING pci adapter in slot[%s]\n",
+ __FUNCTION__, slot->name);
+ if (rpaphp_config_pci_adapter(slot)) {
+ err("%s: CONFIG pci adapter failed\n", __FUNCTION__);
+ goto exit_rc;
+ }
+ } else if (slot->hotplug_slot->info->adapter_status == CONFIGURED) {
+ if (init_slot_pci_funcs(slot)) {
+ err("%s: init_slot_pci_funcs failed\n", __FUNCTION__);
+ goto exit_rc;
+ }
+
+ } else {
+ err("%s: slot[%s]'s adapter_status is NOT_VALID.\n",
+ __FUNCTION__, slot->name);
goto exit_rc;
}
+
print_slot_pci_funcs(slot);
if (!list_empty(&slot->dev.pci_funcs)) {
slot->state = CONFIGURED;
diff -Nru a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c
--- a/drivers/pci/hotplug/shpchp_hpc.c 2004-08-04 17:56:07 -07:00
+++ b/drivers/pci/hotplug/shpchp_hpc.c 2004-08-04 17:56:07 -07:00
@@ -35,6 +35,7 @@
#include <linux/vmalloc.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>
+#include <linux/delay.h>
#include <linux/pci.h>
#include <asm/system.h>
#include "shpchp.h"
@@ -300,8 +301,7 @@
if (!(cmd_status & 0x1))
break;
/* Check every 0.1 sec for a total of 1 sec*/
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ/10);
+ msleep(100);
}
cmd_status = readw(php_ctlr->creg + CMD_STATUS);
diff -Nru a/drivers/pci/pci.c b/drivers/pci/pci.c
--- a/drivers/pci/pci.c 2004-08-04 17:56:07 -07:00
+++ b/drivers/pci/pci.c 2004-08-04 17:56:07 -07:00
@@ -291,10 +291,7 @@
/* Mandatory power management transition delays */
/* see PCI PM 1.1 5.6.1 table 18 */
if(state == 3 || dev->current_state == 3)
- {
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(HZ/100);
- }
+ msleep(10);
else if(state == 2 || dev->current_state == 2)
udelay(200);
dev->current_state = state;
diff -Nru a/drivers/pci/pci.ids b/drivers/pci/pci.ids
--- a/drivers/pci/pci.ids 2004-08-04 17:56:07 -07:00
+++ b/drivers/pci/pci.ids 2004-08-04 17:56:07 -07:00
@@ -7,7 +7,7 @@
# so if you have anything to contribute, please visit the home page or
# send a diff -u against the most recent pci.ids to pci-ids@ucw.cz.
#
-# Daily snapshot on Thu 2004-04-15 10:00:04
+# Daily snapshot on Mon 2004-07-12 10:00:27
#
# Vendors, devices and subsystems. Please keep sorted.
@@ -150,37 +150,58 @@
0e11 4082 Smart Array 532
0e11 4083 Smart Array 5312
b1a4 NC7131 Gigabit Server Adapter
+ b203 Integrated Lights Out Controller
+ b204 Integrated Lights Out Processor
f130 NetFlex-3/P ThunderLAN 1.0
f150 NetFlex-3/P ThunderLAN 2.3
0e55 HaSoTec GmbH
# Formerly NCR
1000 LSI Logic / Symbios Logic
0001 53c810
- 1000 1000 8100S
+ 1000 1000 LSI53C810AE PCI to SCSI I/O Processor
0002 53c820
0003 53c825
+ 1000 1000 LSI53C825AE PCI to SCSI I/O Processor (Ultra Wide)
0004 53c815
0005 53c810AP
0006 53c860
+ 1000 1000 LSI53C860E PCI to Ultra SCSI I/O Processor
000a 53c1510
- 000b 53c896
+ 1000 1000 LSI53C1510 PCI to Dual Channel Wide Ultra2 SCSI Controller (Nonintelligent mode)
+ 000b 53C896/897
+ 1000 1000 LSI53C896/7 PCI to Dual Channel Ultra2 SCSI Multifunction Controller
+ 1000 1010 LSI22910 PCI to Dual Channel Ultra2 SCSI host adapter
+ 1000 1020 LSI21002 PCI to Dual Channel Ultra2 SCSI host adapter
+# multifunction PCI card: Dual U2W SCSI, dual 10/100TX, graphics
+ 13e9 1000 6221L-4U
000c 53c895
+ 1000 1010 LSI8951U PCI to Ultra2 SCSI host adapter
+ 1000 1020 LSI8952U PCI to Ultra2 SCSI host adapter
+ 1de1 3906 DC-390U2B SCSI adapter
1de1 3907 DC-390U2W
000d 53c885
000f 53c875
0e11 7004 Embedded Ultra Wide SCSI Controller
+ 1000 1000 LSI53C876/E PCI to Dual Channel SCSI Controller
+ 1000 1010 LSI22801 PCI to Dual Channel Ultra SCSI host adapter
+ 1000 1020 LSI22802 PCI to Dual Channel Ultra SCSI host adapter
1092 8760 FirePort 40 Dual SCSI Controller
- 1de1 3904 DC390F Ultra Wide SCSI Controller
+ 1de1 3904 DC390F/U Ultra Wide SCSI Adapter
4c53 1000 CC7/CR7/CP7/VC7/VP7/VR7 mainboard
4c53 1050 CT7 mainboard
- 0010 53c895
+ 0010 53C1510
0e11 4040 Integrated Array Controller
0e11 4048 Integrated Array Controller
+ 1000 1000 53C1510 PCI to Dual Channel Wide Ultra2 SCSI Controller (Intelligent mode)
0012 53c895a
+ 1000 1000 LSI53C895A PCI to Ultra2 SCSI Controller
0013 53c875a
+ 1000 1000 LSI53C875A PCI to Ultra SCSI Controller
0020 53c1010 Ultra3 SCSI Adapter
+ 1000 1000 LSI53C1010-33 PCI to Dual Channel Ultra160 SCSI Controller
1de1 1020 DC-390U3W
0021 53c1010 66MHz Ultra3 SCSI Adapter
+ 1000 1000 LSI53C1000/1000R/1010R/1010-66 PCI to Ultra160 SCSI Controller
124b 1070 PMC-USCSI3
4c53 1080 CT8 mainboard
4c53 1300 P017 mezzanine (32-bit PMC)
@@ -191,6 +212,7 @@
1028 1010 LSI U320 SCSI Controller
0031 53c1030ZC PCI-X Fusion-MPT Dual Ultra320 SCSI
0032 53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI
+ 1000 1000 LSI53C1020/1030 PCI-X to Ultra320 SCSI Controller
0033 1030ZC_53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI
0040 53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI
1000 0033 MegaRAID SCSI 320-2XR
@@ -203,8 +225,10 @@
1000 0530 MegaRAID 530 SCSI 320-0X RAID Controller
1000 0531 MegaRAID 531 SCSI 320-4X RAID Controller
1000 0532 MegaRAID 532 SCSI 320-2X RAID Controller
- 1028 0533 PowerEgde Expandable RAID Controller 4/QC
+ 1028 0533 PowerEdge Expandable RAID Controller 4/QC
8086 0532 Storage RAID Controller SRCU42X
+ 0408 MegaRAID
+ 1028 0002 PowerEdge Expandable RAID Controller 4e/DC
0621 FC909 Fibre Channel Adapter
0622 FC929 Fibre Channel Adapter
1000 1020 44929 O Dual Fibre Channel card
@@ -235,6 +259,7 @@
1028 0518 MegaRAID 518 DELL PERC 4/DC RAID Controller
1028 0520 MegaRAID 520 DELL PERC 4/SC RAID Controller
1028 0531 PowerEdge Expandable RAID Controller 4/QC
+ 1028 0533 PowerEdge Expandable RAID Controller 4/QC
1001 Kolter Electronic
0010 PCI 1616 Measurement card with 32 digital I/O lines
0011 OPTO-PCI Opto-Isolated digital I/O board
@@ -350,6 +375,8 @@
1002 8008 Rage XL
1028 00ce PowerEdge 1400
1028 00d1 PowerEdge 2550
+ 8086 3411 SDS2 Mainboard
+ 8086 3427 S875WP1-E mainboard
4753 Rage XC
1002 4753 Rage XC
4754 3D Rage I/II 215GT [Mach64 GT]
@@ -435,10 +462,12 @@
4e44 Radeon R300 ND [Radeon 9700 Pro]
4e45 Radeon R300 NE [Radeon 9500 Pro]
1002 0002 Radeon R300 NE [Radeon 9500 Pro]
+ 1681 0002 Hercules 3D Prophet 9500 PRO [Radeon 9500 Pro]
# New PCI ID provided by ATI developer relations (correction to above)
4e46 RV350 NF [Radeon 9600]
4e47 Radeon R300 NG [FireGL X1]
- 4e48 Radeon R350 [Radeon 9800]
+# (added pro)
+ 4e48 Radeon R350 [Radeon 9800 Pro]
# New PCI ID provided by ATI developer relations
4e49 Radeon R350 [Radeon 9800]
4e4a RV350 NJ [Radeon 9800 XT]
@@ -451,10 +480,12 @@
4e64 Radeon R300 [Radeon 9700 Pro] (Secondary)
4e65 Radeon R300 [Radeon 9500 Pro] (Secondary)
1002 0003 Radeon R300 NE [Radeon 9500 Pro]
+ 1681 0003 Hercules 3D Prophet 9500 PRO [Radeon 9500 Pro] (Secondary)
# New PCI ID provided by ATI developer relations (correction to above)
4e66 RV350 NF [Radeon 9600] (Secondary)
4e67 Radeon R300 [FireGL X1] (Secondary)
- 4e68 Radeon R350 [Radeon 9800] (Secondary)
+# (added pro)
+ 4e68 Radeon R350 [Radeon 9800 Pro] (Secondary)
# New PCI ID provided by ATI developer relations
4e69 Radeon R350 [Radeon 9800] (Secondary)
4e6a RV350 NJ [Radeon 9800 XT] (Secondary)
@@ -535,6 +566,7 @@
148c 2024 RV200 QW [Radeon 7500LE Dual Display]
148c 2025 RV200 QW [Radeon 7500 Evil Master Multi Display Edition]
148c 2036 RV200 QW [Radeon 7500 PCI Dual Display]
+ 174b 7146 RV200 QW [Radeon 7500 LE]
174b 7147 RV200 QW [Sapphire Radeon 7500LE]
174b 7161 Radeon RV200 QW [Radeon 7500 LE]
17af 0202 RV200 QW [Excalibur Radeon 7500LE]
@@ -624,6 +656,7 @@
5d44 RV280 [Radeon 9200 SE] (Secondary)
700f PCI Bridge [IGP 320M]
7010 PCI Bridge [IGP 340M]
+ 7c37 RV350 AQ [Radeon 9600 SE]
cab0 AGP Bridge [IGP 320M]
cab2 RS200/RS200M AGP Bridge [IGP 340M]
1003 ULSI Systems
@@ -865,6 +898,8 @@
1014 002e ServeRAID-3x
1014 022e ServeRAID-4H
0031 2 Port Serial Adapter
+# AS400 iSeries PCI sync serial card
+ 1014 0031 2721 WAN IOA - 2 Port Sync Serial Adapter
0036 Miami
003a CPU to PCI Bridge
003c GXT250P/GXT255P Graphics Adapter
@@ -946,7 +981,7 @@
0266 PCI-X Dual Channel SCSI
0268 Gigabit Ethernet-SX Adapter (PCI-X)
0269 10/100/1000 Base-TX Ethernet Adapter (PCI-X)
- 0302 XA-32 chipset [Summit]
+ 0302 X-Architecture Bridge [Summit]
ffff MPIC-2 interrupt controller
1015 LSI Logic Corp of Canada
1016 ICL Personal Systems
@@ -1059,20 +1094,27 @@
7454 AMD-8151 System Controller
7455 AMD-8151 AGP Bridge
7460 AMD-8111 PCI
+ 161f 3017 HDAMB
7461 AMD-8111 USB
7462 AMD-8111 Ethernet
7464 AMD-8111 USB
+ 161f 3017 HDAMB
7468 AMD-8111 LPC
+ 161f 3017 HDAMB
7469 AMD-8111 IDE
+ 161f 3017 HDAMB
746a AMD-8111 SMBus 2.0
746b AMD-8111 ACPI
+ 161f 3017 HDAMB
746d AMD-8111 AC97 Audio
+ 161f 3017 HDAMB
746e AMD-8111 MC97 Modem
756b AMD-8111 ACPI
1023 Trident Microsystems
0194 82C194
2000 4DWave DX
2001 4DWave NX
+ 122d 1400 Trident PCI288-Q3DII (NX)
2100 CyberBlade XP4m32
8400 CyberBlade/i7
1023 8400 CyberBlade i7 AGP
@@ -1083,7 +1125,7 @@
0e11 b16e CyberBlade i1 AGP
1023 8520 CyberBlade i1 AGP
8620 CyberBlade/i1
- 1014 0502 ThinkPad T30
+ 1014 0502 ThinkPad R30/T30
8820 CyberBlade XPAi1
9320 TGUI 9320
9350 GUI Accelerator
@@ -1179,34 +1221,30 @@
5453 M5453 PCI AC-Link Controller Modem Device
7101 M7101 PCI PMU Power Management Controller
10b9 7101 M7101 PCI PMU Power Management Controller
-1028 Dell Computer Corporation
+1028 Dell
0001 PowerEdge Expandable RAID Controller 2/Si
- 1028 0001 PowerEdge Expandable RAID Controller 2/Si
- 0002 PowerEdge Expandable RAID Controller 3
- 1028 0002 PowerEdge Expandable RAID Controller 3/Di
- 1028 00d1 PowerEdge Expandable RAID Controller 3/Di
- 1028 00d9 PowerEdge Expandable RAID Controller 3/Di
+ 1028 0001 PowerEdge 2400
+ 0002 PowerEdge Expandable RAID Controller 3/Di
+ 1028 0002 PowerEdge 4400
0003 PowerEdge Expandable RAID Controller 3/Si
- 1028 0003 PowerEdge Expandable RAID Controller 3/Si
- 0004 PowerEdge Expandable RAID Controller 3/Si
- 1028 00d0 PowerEdge Expandable RAID Controller 3/Si
+ 1028 0003 PowerEdge 2450
0006 PowerEdge Expandable RAID Controller 3/Di
- 0007 Remote Access Controller:DRAC III
- 0008 Remote Access Controller
- 0009 BMC/SMIC device not present
- 000a PowerEdge Expandable RAID Controller 3
- 1028 0106 PowerEdge Expandable RAID Controller 3/Di
- 1028 011b PowerEdge Expandable RAID Controller 3/Di
- 1028 0121 PowerEdge Expandable RAID Controller 3/Di
- 000c Remote Access Controller:ERA or ERA/O
- 000d BMC/SMIC device
- 000e PowerEdge Expandable RAID controller 4
- 1028 0123 PowerEdge Expandable RAID Controller 4/Di
- 000f PowerEdge Expandable RAID controller 4
- 1028 013b MegaRAID DELL PERC 4/Di RAID On Motherboard
- 1028 014a PowerEdge Expandable RAID Controller 4/Di
- 1028 014c MegaRAID DELL PERC 4/Di RAID On Motherboard
- 1028 014d MegaRAID DELL PERC 4/Di RAID On Motherboard
+ 0007 Remote Access Card III
+ 0008 Remote Access Card III
+ 0009 Remote Access Card III: BMC/SMIC device not present
+ 000a PowerEdge Expandable RAID Controller 3/Di
+ 000c Embedded Remote Access or ERA/O
+ 000d Embedded Remote Access: BMC/SMIC device
+ 000e PowerEdge Expandable RAID controller 4/Di
+ 000f PowerEdge Expandable RAID controller 4/Di
+ 0010 Remote Access Card 4
+ 0011 Remote Access Card 4 Daughter Card
+ 0012 Remote Access Card 4 Daughter Card Virtual UART
+ 0013 PowerEdge Expandable RAID controller 4
+ 1028 016c PowerEdge Expandable RAID Controller 4e/Si
+ 1028 016d PowerEdge Expandable RAID Controller 4e/Di
+ 1028 016e PowerEdge Expandable RAID Controller 4e/Di
+ 0014 Remote Access Card 4 Daughter Card SMIC interface
1029 Siemens Nixdorf IS
102a LSI Logic
0000 HYDRA
@@ -1542,6 +1580,7 @@
1092 4920 SpeedStar A70
1569 6326 SiS6326 GUI Accelerator
6330 661FX/M661FX/M661MX/741/M741/760/M760 PCI/AGP
+ 1039 6330 [M]661FX/M661MX/[M]741/[M]760 PCI/AGP VGA Display Adapter
7001 USB 1.0 Controller
1039 7000 Onboard USB Controller
7002 USB 2.0 Controller
@@ -1604,7 +1643,7 @@
103c 1049 Tosca Console
103c 104a Tosca Secondary
103c 104b Maestro SP2
- 103c 1223 Halfdome Console
+ 103c 1223 Superdome Console
103c 1226 Keystone SP2
103c 1227 Powerbar SP2
103c 1282 Everest SP2
@@ -1642,7 +1681,7 @@
4057 v8200 GeForce 3
8043 v8240 PAL 128M [P4T] Motherboard
807b v9280/TD [Geforce4 TI4200 8X With TV-Out and DVI]
-1044 Distributed Processing Technology
+1044 Adaptec (formerly DPT)
1012 Domino RAID Engine
a400 SmartCache/Raid I-IV Controller
a500 PCI Bridge
@@ -1683,6 +1722,7 @@
1044 c065 3010S Ultra3 Four Channel
1044 c066 3010S Fibre Channel
a511 SmartRAID V Controller
+ 1044 c032 ASR-2005S I2O Zero Channel
1045 OPTi Inc.
a0f8 82C750 [Vendetta] USB Controller
c101 92C264
@@ -1786,6 +1826,7 @@
1028 00e6 PCI4451 IEEE-1394 Controller (Dell Inspiron 8100)
8029 PCI4510 IEEE-1394 Controller
1071 8160 MIM2900
+ 802e PCI7x20 1394a-2000 OHCI Two-Port PHY/Link-Layer Controller
8400 ACX 100 22Mbps Wireless Interface
00fc 16ec U.S. Robotics 22 Mbps Wireless PC Card (model 2210)
00fd 16ec U.S. Robotics 22Mbps Wireless PCI Adapter (model 2216)
@@ -1894,6 +1935,8 @@
0003 MPC8240 [Kahlua]
0004 MPC107
0006 MPC8245 [Unity]
+ 0008 MPC8540
+ 0009 MPC8560
0100 MC145575 [HFC-PCI]
0431 KTI829c 100VG
1801 DSP56301 Digital Signal Processor
@@ -1939,44 +1982,49 @@
1058 Electronics & Telecommunications RSH
1059 Teknor Industrial Computers Inc
105a Promise Technology, Inc.
- 0d30 20265
+# more correct description from promise linux sources
+ 0d30 PDC20265 (FastTrak100 Lite/Ultra100)
105a 4d33 Ultra100
0d38 20263
105a 4d39 Fasttrak66
1275 20275
3318 PDC20318 (SATA150 TX4)
- 3319 PDC20319 (SATA150 TX4)
- 3373 PDC20378 (SATA150 TX)
+ 3319 PDC20319 (FastTrak S150 TX4)
+ 8086 3427 S875WP1-E mainboard
+ 3371 PDC20371 (FastTrak S150 TX2plus)
+ 3373 PDC20378 (FastTrak 378/SATA 378)
+ 1043 80f5 PC-DL Deluxe motherboard
1462 702e K8T NEO FIS2R motherboard
3375 PDC20375 (SATA150 TX2plus)
- 3376 PDC20376
+ 3376 PDC20376 (FastTrak 376)
1043 809e A7V8X motherboard
- 4d30 20267
+ 4d30 PDC20267 (FastTrak100/Ultra100)
105a 4d33 Ultra100
- 105a 4d39 Fasttrak100
+ 105a 4d39 FastTrak100
4d33 20246
105a 4d33 20246 IDE Controller
- 4d38 20262
+ 4d38 PDC20262 (FastTrak66/Ultra66)
105a 4d30 Ultra Device on SuperTrak
105a 4d33 Ultra66
- 105a 4d39 Fasttrak66
- 4d68 20268
+ 105a 4d39 FastTrak66
+ 4d68 PDC20268 (Ultra100 TX2)
105a 4d68 Ultra100TX2
4d69 20269
105a 4d68 Ultra133TX2
- 5275 PDC20276 IDE
+ 5275 PDC20276 (MBFastTrak133 Lite)
105a 0275 SuperTrak SX6000 IDE
105a 1275 MBFastTrak133 Lite (tm) Controller (RAID mode)
1458 b001 MBUltra 133
5300 DC5300
- 6268 20268R
- 6269 PDC20271
+ 6268 PDC20270 (FastTrak100 LP/TX2/TX4)
+ 105a 4d68 FastTrak100 TX2
+ 6269 PDC20271 (FastTrak TX2000)
105a 6269 FastTrak TX2/TX2000
- 6621 PDC20621 [SX4000] 4 Channel IDE RAID Controller
+ 6621 PDC20621 (FastTrak S150 SX4/FastTrak SX4000 lite)
6622 PDC20621 [SATA150 SX4] 4 Channel IDE RAID Controller
- 6626 PDC20618 Ultra 618
- 6629 PDC20619 FastTrak TX4000 RAID
- 7275 PDC20277
+ 6626 PDC20618 (Ultra 618)
+ 6629 PDC20619 (FastTrak TX4000)
+ 7275 PDC20277 (SBFastTrak133 Lite)
105b Foxconn International, Inc.
105c Wipro Infotech Limited
105d Number 9 Computer Company
@@ -2199,6 +2247,7 @@
107c LG Electronics [Lucky Goldstar Co. Ltd]
107d LeadTek Research Inc.
0000 P86C850
+ 2134 WinFast 3D S320 II
107e Interphase Corporation
0001 5515 ATM Adapter [Flipper]
0002 100 VG AnyLan Controller
@@ -2348,10 +2397,10 @@
0673 USB0673
0680 PCI0680 Ultra ATA-133 Host Controller
1095 3680 Winic W-680 (Silicon Image 680 based)
- 3112 Silicon Image Serial ATARaid Controller [ CMD/Sil 3112/3112A ]
+ 3112 SiI 3112 [SATALink/SATARaid] Serial ATA Controller
1095 6112 Asus A7N8X
- 3114 Silicon Image SiI 3114 SATARaid
- 3512 Silicon Image Serial ATARaid Controller [ CMD/Sil 3512 ]
+ 3114 SiI 3114 [SATALink/SATARaid] Serial ATA Controller
+ 3512 SiI 3512 [SATALink/SATARaid] Serial ATA Controller
1096 Alacron
1097 Appian Technology
1098 Quantum Designs (H.K.) Ltd
@@ -2742,6 +2791,7 @@
10b7 7000 10/100 Mini PCI Ethernet Adapter
10f1 2466 Tiger MPX S2466 (3C920 Integrated Fast Ethernet Controller)
9201 3C920B-EMB Integrated Fast Ethernet Controller [Tornado]
+ 1043 80ab A7N8X Deluxe onboard 3C920B-EMB Integrated Fast Ethernet Controller
9202 3Com 3C920B-EMB-WNM Integrated Fast Ethernet Controller
9210 3C920B-EMB-WNM Integrated Fast Ethernet Controller
9300 3CSOHO100B-TX 910-A01 [tulip]
@@ -2837,6 +2887,7 @@
5219 M5219
5225 M5225
5229 M5229 IDE
+ 1014 050f ThinkPad R30
1043 8053 A7A266 Motherboard IDE
5235 M5225
5237 USB 1.1 Controller
@@ -2859,8 +2910,8 @@
545a SmartLink SmartPCI563 56K Modem
5471 M5471 Memory Stick Controller
5473 M5473 SD-MMC Controller
- 7101 M7101 PMU
- 10b9 7101 ALI M7101 Power Management Controller
+ 7101 M7101 Power Management Controller [PMU]
+ 1014 0510 ThinkPad R30
10ba Mitsubishi Electric Corp.
0301 AccelGraphics AccelECLIPSE
0304 AccelGALAXY A2100 [OEM Evans & Sutherland]
@@ -3001,6 +3052,7 @@
1043 0205 PCI-V3800
1043 4000 AGP-V3800PRO
1048 0c21 Synergy II
+ 107d 2134 WinFast 3D S320 II + TV-Out
1092 4804 Viper V770
1092 4a00 Viper V770
1092 4a02 Viper V770 Ultra
@@ -3041,11 +3093,13 @@
1554 1041 Pixelview RIVA TNT2 M64
002e NV6 [Vanta]
002f NV6 [Vanta]
+ 0041 NV40 OS1RT00B30
0060 nForce2 ISA Bridge
1043 80ad A7N8X Mainboard
0064 nForce2 SMBus (MCP)
0065 nForce2 IDE
0066 nForce2 Ethernet Controller
+ 1043 80a7 A7N8X Mainboard onboard nForce2 Ethernet
0067 nForce2 USB Controller
1043 0c11 A7N8X Mainboard
0068 nForce2 USB Controller
@@ -3292,6 +3346,7 @@
1071 8160 MIM2000
10bd 0320 EP-320X-R
10ec 8139 RT8139
+ 1113 ec01 FNC-0107TX
1186 1300 DFE-538TX
1186 1320 SN5200
1186 8139 DRN-32TX
@@ -3342,7 +3397,7 @@
10f9 PC Direct
10fa Truevision
000c TARGA 1000
-10fb Thesys Gesellschaft fĆ¼r Mikroelektronik mbH
+10fb Thesys Gesellschaft für Mikroelektronik mbH
186f TH 6255
10fc I-O Data Device, Inc.
# What's in the cardbus end of a Sony ACR-A01 card, comes with newer Vaio CD-RW drives
@@ -3358,6 +3413,7 @@
9400 INI-940
9401 INI-950
9500 360P
+ 9502 Initio INI-9100UW Ultra Wide SCSI Controller INIC-950P chip
1102 Creative Labs
0002 SB Live! EMU10k1
1102 0020 CT4850 SBLive! Value
@@ -3507,13 +3563,16 @@
0e11 0097 SoundMax Digital Integrated Audio
0e11 b194 Soundmax integrated digital audio
1019 0985 P6VXA Motherboard
+ 1043 1106 A7V133/A7V133-C Mainboard
1106 4511 Onboard Audio on EP7KXA
1458 7600 Onboard Audio
1462 3091 MS-6309 Onboard Audio
+ 1462 3300 MS-6330 Onboard Audio
15dd 7609 Onboard Audio
3059 VT8233/A/8235/8237 AC97 Audio Controller
1019 0a81 L7VTA v1.0 Motherboard (KT400-8235)
1043 8095 A7V8X Motherboard (Realtek ALC650 codec)
+ 1043 80a1 A7V8X-X Motherboard
1043 80b0 A7V600 motherboard (ADI AD1980 codec [SoundMAX])
1106 3059 L7VMM2 Motherboard
1297 c160 FX41 motherboard (Realtek ALC650 codec)
@@ -3526,6 +3585,7 @@
1186 1401 DFE-530TX rev B
13b9 1421 LD-10/100AL PCI Fast Ethernet Adapter (rev.B)
3068 Intel 537 [AC97 Modem]
+ 1462 309e MS-6309 Saturn Motherboard
3074 VT8233 PCI to ISA Bridge
1043 8052 VT8233A
3091 VT8633 [Apollo Pro266]
@@ -3906,7 +3966,15 @@
1133 1c0b Diva Server V-PRI/T1-24 Cornet NQ 3
1133 1c0c Diva Server V-PRI/E1-30 Cornet NQ 3
e01e Diva Server 2PRI
+ 1133 1e00 Diva Server V-2PRI/E1-60
+ 1133 1e01 Diva Server V-2PRI/T1-48
+ 1133 1e02 Diva Server 2PRI/E1-60
+ 1133 1e03 Diva Server 2PRI/T1-48
e020 Diva Server 4PRI
+ 1133 2000 Diva Server V-4PRI/E1-120
+ 1133 2001 Diva Server V-4PRI/T1-96
+ 1133 2002 Diva Server 4PRI/E1-120
+ 1133 2003 Diva Server 4PRI/T1-96
e024 Diva Server Analog-4P
e028 Diva Server Analog-8P
1134 Mercury Computer Systems
@@ -4145,6 +4213,7 @@
1165 Imagraph Corporation
0001 Motion TPEG Recorder/Player with audio
1166 ServerWorks
+ 0000 CMIC-LE
0005 CNB20-LE Host Bridge
0006 CNB20HE Host Bridge
0007 CNB20-LE Host Bridge
@@ -4152,13 +4221,13 @@
0009 CNB20LE Host Bridge
0010 CIOB30
0011 CMIC-HE
- 0012 CMIC-LE
+ 0012 CMIC-WS Host Bridge (GC-LE chipset)
0013 CNB20-HE Host Bridge
- 0014 CNB20-HE Host Bridge
+ 0014 CMIC-LE Host Bridge (GC-LE chipset)
0015 CMIC-GC Host Bridge
0016 CMIC-GC Host Bridge
0017 GCNB-LE Host Bridge
- 0101 CIOB-X2
+ 0101 CIOB-X2 PCI-X I/O Bridge
0110 CIOB-E I/O Bridge with Gigabit Ethernet
0200 OSB4 South Bridge
0201 CSB5 South Bridge
@@ -4255,6 +4324,7 @@
1186 1300 DFE-538TX 10/100 Ethernet Adapter
1186 1301 DFE-530TX+ 10/100 Ethernet Adapter
1340 DFE-690TXD CardBus PC Card
+ 1541 DFE-680TXD CardBus PC Card
1561 DRP-32TXD Cardbus PC Card
3300 DWL-510 2.4GHz Wireless PCI Adapter
3b05 DWL-G650+ CardBus PC Card
@@ -4337,9 +4407,10 @@
11a9 InnoSys Inc.
4240 AMCC S933Q Intelligent Serial Card
11aa Actel
-# (formerly Galileo technologies)
-11ab Marvell
+# Formerly Galileo Technology, Inc.
+11ab Marvell Technology Group Ltd.
0146 GT-64010/64010A System Controller
+ 1fa6 Marvell W8300 802.11 Adapter
4320 Yukon Gigabit Ethernet 10/100/1000Base-T Adapter
4611 GT-64115 System Controller
4620 GT-64120/64120A/64121A System Controller
@@ -4677,6 +4748,7 @@
6933 OZ6933 Cardbus Controller
1025 1016 Travelmate 612 TX
6972 OZ6912 Cardbus Controller
+ 1014 020c ThinkPad R30
1179 0001 Magnia Z310
7110 OZ711Mx MultiMediaBay Accelerator
7112 OZ711EC1/M1 SmartCardBus MultiMediaBay Controller
@@ -4762,6 +4834,7 @@
122c Sican GmbH
122d Aztech System Ltd
1206 368DSP
+ 1400 Trident PCI288-Q3DII (NX)
50dc 3328 Audio
122d 0001 3328 Audio
80da 3328 Audio
@@ -4905,11 +4978,15 @@
3873 Prism 2.5 Wavelan chipset
1186 3501 DWL-520 Wireless PCI Adapter
1186 3700 DWL-520 Wireless PCI Adapter, Rev E1
+ 1385 4105 MA311 802.11b wireless adapter
1668 0414 HWP01170-01 802.11b PCI Wireless Adapter
16a5 1601 AIR.mate PC-400 PCI Wireless LAN Adapter
1737 3874 WMP11 Wireless 802.11b PCI Adapter
8086 2513 Wireless 802.11b MiniPCI Adapter
+ 3886 ISL3886 [Prism Javelin/Prism Xbow]
3890 Intersil ISL3890 [Prism GT/Prism Duette]
+ 10b8 a835 SMC2835W V2 Wireless Cardbus Adapter
+ 16a5 1605 ALLNET ALL0271 Wireless PCI Adapter
17cf 0014 Ovislink WL-5400PCM, Prism GT
8130 HMP8130 NTSC/PAL Video Decoder
8131 HMP8131 NTSC/PAL Video Decoder
@@ -5155,7 +5232,7 @@
9132 Ethernet 100/10 MBit
1283 Integrated Technology Express, Inc.
673a IT8330G
- 8212 IT/ITE8212 Dual channel ATA RAID
+ 8212 IT/ITE8212 Dual channel ATA RAID controller
8330 IT8330G
8872 IT8874F PCI Dual Serial Port Controller
8888 IT8888F PCI to ISA Bridge with SMB
@@ -5466,7 +5543,8 @@
0985 NC100 Network Everywhere Fast Ethernet 10/100
1985 21x4x DEC-Tulip compatible 10/100 Ethernet
2850 HSP MicroModem 56
- 8201 [ADMtek] SP906B_V2 Wireless LAN adapter
+ 8201 ADMtek ADM8211 802.11b Wireless Interface
+ 10b8 2635 SMC2635W 802.11b (11Mbps) wireless lan pcmcia (cardbus) card
1317 8201 SMC2635W 802.11b (11mbps) wireless lan pcmcia (cardbus) card
9511 21x4x DEC-Tulip compatible 10/100 Ethernet
1318 Packet Engines Inc.
@@ -5535,7 +5613,6 @@
132d Integrated Silicon Solution, Inc.
1330 MMC Networks
1331 Radisys Corp.
- 0030 ENP-2611
8200 82600 Host Bridge
8201 82600 IDE
8202 82600 USB
@@ -5659,9 +5736,11 @@
1385 Netgear
4100 802.11b Wireless Adapter (MA301)
4105 MA311 802.11b wireless adapter
+ 4a00 WAG311 802.11abg Wireless Adapter
620a GA620 Gigabit Ethernet
622a GA622
630a GA630 Gigabit Ethernet
+ f004 FA310TX
1386 Video Domain Technologies
1387 Systran Corp
1388 Hitachi Information Technology Co Ltd
@@ -5720,6 +5799,7 @@
13a6 Videonics Inc
13a7 Teles AG
13a8 Exar Corp.
+ 0154 XR17C154 Quad UART
0158 XR17C158 Octal UART
13a9 Siemens Medical Systems, Ultrasound Group
13aa Broadband Networks Inc
@@ -5752,6 +5832,7 @@
13c1 3ware Inc
1000 3ware ATA-RAID
1001 3ware 7000-series ATA-RAID
+ 13c1 1001 3ware Inc 3ware 7xxx/8xxx-series PATA/SATA-RAID
1002 3ware ATA-RAID
13c2 Technotrend Systemtechnik GmbH
13c3 Janz Computer AG
@@ -5884,10 +5965,11 @@
140f Salient Systems Corp
1410 Midas lab Inc
1411 Ikos Systems Inc
-1412 IC Ensemble Inc
- 1712 ICE1712 [Envy24]
+# formerly IC Ensemble Inc.
+1412 VIA Technologies Inc.
+ 1712 ICE1712 [Envy24] PCI Multi-Channel I/O Controller
1412 d638 M-Audio Delta 410
- 1724 ICE1724 [Envy24HT]
+ 1724 VT1720/24 [Envy24PT/HT] PCI Multi-Channel Audio Controller
1413 Addonics
1414 Microsoft Corporation
1415 Oxford Semiconductor Ltd
@@ -5990,6 +6072,7 @@
1460 DYNARC INC
1461 Avermedia Technologies Inc
1462 Micro-Star International Co., Ltd.
+ 6825 PCI Card wireless 11g [PC54G]
8725 NVIDIA NV25 [GeForce4 Ti 4600] VGA Adapter
# MSI G4Ti4800, 128MB DDR SDRAM, TV-Out, DVI-I
9000 NVIDIA NV28 [GeForce4 Ti 4800] VGA Adapter
@@ -6150,8 +6233,9 @@
14d6 Accusys Inc
14d7 Hirakawa Hewtech Corp
14d8 HOPF Elektronik GmBH
-14d9 Alpha Processor Inc
- 0010 AP1011 HyperTransport-PCI Bridge [Sturgeon]
+# Formerly SiPackets, Inc., formerly API NetWorks, Inc., formerly Alpha Processor, Inc.
+14d9 Alliance Semiconductor Corporation
+ 0010 AP1011/SP1011 HyperTransport-PCI Bridge [Sturgeon]
14da National Aerospace Laboratories
14db AFAVLAB Technology Inc
2120 TK9902
@@ -6175,6 +6259,14 @@
14e2 INFOLIBRIA
14e3 AMTELCO
14e4 Broadcom Corporation
+ 0800 Sentry5 Chipcommon I/O Controller
+ 0804 Sentry5 PCI Bridge
+ 0805 Sentry5 MIPS32 CPU
+ 0806 Sentry5 Ethernet Controller
+ 080b Sentry5 Crypto Accelerator
+ 080f Sentry5 DDR/SDR RAM Controller
+ 0811 Sentry5 External Interface Core
+ 0816 BCM3302 Sentry5 MIPS32 CPU
1644 NetXtreme BCM5700 Gigabit Ethernet
1014 0277 Broadcom Vigil B5700 1000Base-T
1028 00d1 Broadcom BCM5700
@@ -6241,21 +6333,14 @@
164d NetXtreme BCM5702FE Gigabit Ethernet
1653 NetXtreme BCM5705 Gigabit Ethernet
1654 NetXtreme BCM5705_2 Gigabit Ethernet
- 1658 NetXtreme BCM5720 Gigabit Ethernet
- 1659 NetXtreme BCM5721 Gigabit Ethernet
+ 1659 NetXtreme BCM5721 Gigabit Ethernet PCI Express
165d NetXtreme BCM5705M Gigabit Ethernet
165e NetXtreme BCM5705M_2 Gigabit Ethernet
- 166e NetXtreme BCM5705F Gigabit Ethernet
- 1676 NetXtreme BCM5750 Gigabit Ethernet
- 1677 NetXtreme BCM5751 Gigabit Ethernet
- 167c NetXtreme BCM5750M Gigabit Ethernet
- 167d NetXtreme BCM5751M Gigabit Ethernet
- 167e NetXtreme BCM5751F Gigabit Ethernet
+ 1677 NetXtreme BCM5751 Gigabit Ethernet PCI Express
1696 NetXtreme BCM5782 Gigabit Ethernet
103c 12bc HP d530 CMT (DG746A)
14e4 000d NetXtreme BCM5782 1000Base-T
169c NetXtreme BCM5788 Gigabit Ethernet
- 169d NetXtreme BCM5789 Gigabit Ethernet
16a6 NetXtreme BCM5702X Gigabit Ethernet
0e11 00bb NC7760 Gigabit Server Adapter (PCI-X, 10/100/1000-T)
1028 0126 BCM5702 1000Base-T
@@ -6279,13 +6364,17 @@
103c 12ca HP Combo FC/GigE-T [A9784A]
14e4 0009 NetXtreme BCM5703 1000Base-T
14e4 000a NetXtreme BCM5703 1000Base-SX
- 170d NetXtreme BCM5901 Gigabit Ethernet
- 170e NetXtreme BCM5901_2 Gigabit Ethernet
+ 170c BCM4401-B0 100Base-TX
+ 170d NetXtreme BCM5901 100Base-TX
+ 170e NetXtreme BCM5901 100Base-TX
+ 3352 BCM3352
+ 3360 BCM3360
4210 BCM4210 iLine10 HomePNA 2.0
4211 BCM4211 iLine10 HomePNA 2.0 + V.90 56k modem
4212 BCM4212 v.90 56k modem
4301 BCM4301 802.11b
- 4320 BCM94306 802.11g
+ 4307 BCM4307 802.11b Wireless LAN Controller
+ 4320 BCM4306 802.11b/g Wireless LAN Controller
1028 0001 TrueMobile 1300 WLAN Mini-PCI Card
1737 4320 WPC54G
4324 BCM4309 802.11a/b/g
@@ -6293,12 +6382,47 @@
4401 BCM4401 100Base-T
1043 80a8 A7V8X motherboard
4402 BCM4402 Integrated 10/100BaseT
+ 4403 BCM4402 V.90 56k Modem
4410 BCM4413 iLine32 HomePNA 2.0
4411 BCM4413 V.90 56k modem
4412 BCM4413 10/100BaseT
+ 4430 BCM44xx CardBus iLine32 HomePNA 2.0
+ 4432 BCM44xx CardBus 10/100BaseT
+ 4610 BCM4610 Sentry5 PCI to SB Bridge
+ 4611 BCM4610 Sentry5 iLine32 HomePNA 1.0
+ 4612 BCM4610 Sentry5 V.90 56k Modem
+ 4613 BCM4610 Sentry5 Ethernet Controller
+ 4614 BCM4610 Sentry5 External Interface
+ 4615 BCM4610 Sentry5 USB Controller
+ 4704 BCM4704 PCI to SB Bridge
+ 4708 BCM4708 Sentry5 PCI to SB Bridge
+ 4710 BCM4710 Sentry5 PCI to SB Bridge
+ 4711 BCM47xx Sentry5 iLine32 HomePNA 2.0
+ 4712 Sentry5 UART
+ 4713 Sentry5 Ethernet Controller
+ 4714 BCM47xx Sentry5 External Interface
+ 4715 Sentry5 USB Controller
+ 4716 BCM47xx Sentry5 USB Host Controller
+ 4717 BCM47xx Sentry5 USB Device Controller
+ 4718 Sentry5 Crypto Accelerator
+ 5365 BCM5365P Sentry5 Host Bridge
+ 5600 BCM5600 StrataSwitch 24+2 Ethernet Switch Controller
+ 5605 BCM5605 StrataSwitch 24+2 Ethernet Switch Controller
+ 5615 BCM5615 StrataSwitch 24+2 Ethernet Switch Controller
+ 5625 BCM5625 StrataSwitch 24+2 Ethernet Switch Controller
+ 5645 BCM5645 StrataSwitch 24+2 Ethernet Switch Controller
+ 5670 BCM5670 8-Port 10GE Ethernet Switch Fabric
+ 5680 BCM5680 G-Switch 8 Port Gigabit Ethernet Switch Controller
5690 BCM5690 12-port Multi-Layer Gigabit Ethernet Switch
+ 5691 BCM5691 GE/10GE 8+2 Gigabit Ethernet Switch Controller
5820 BCM5820 Crypto Accelerator
5821 BCM5821 Crypto Accelerator
+ 5822 BCM5822 Crypto Accelerator
+ 5823 BCM5823 Crypto Accelerator
+ 5824 BCM5824 Crypto Accelerator
+ 5840 BCM5840 Crypto Accelerator
+ 5841 BCM5841 Crypto Accelerator
+ 5850 BCM5850 Crypto Accelerator
14e5 Pixelfusion Ltd
14e6 SHINING Technology Inc
14e7 3CX
@@ -6823,11 +6947,16 @@
1619 FarSite Communications Ltd
0400 FarSync T2P (2 port X.21/V.35/V.24)
0440 FarSync T4P (4 port X.21/V.35/V.24)
+# www.rioworks.com
+161f Rioworks
1626 TDK Semiconductor Corp.
8410 RTL81xx Fast Ethernet
1629 Kongsberg Spacetec AS
1003 Format synchronizer v3.0
2002 Fast Universal Data Output
+# This seems to occur on their 802.11b Wireless card WMP-11
+1637 Linksys
+ 3874 Linksys 802.11b WMP11 PCI Wireless card
1638 Standard Microsystems Corp [SMC]
1100 SMC2602W EZConnect/Addtron AWA-100/Eumitcom WL11000
163c Smart Link Ltd.
@@ -6862,6 +6991,7 @@
168c 0013 WG511T Wireless CardBus Adapter
168c 1025 DWL-G650B2 Wireless CardBus Adapter
1014 AR5212 802.11abg NIC
+16a5 Tekram Technology Co.,Ltd.
16ab Global Sun Technology Inc
1100 GL24110P
1101 PLX9052 PCMCIA-to-PCI Wireless LAN
@@ -6874,9 +7004,13 @@
16cd Densitron Technologies
# www.pikatechnologies.com
16df PIKA Technologies Inc.
+16e3 European Space Agency
+ 1e0f LEON2FT Processor
16ec U.S. Robotics
00ff USR997900 10/100 Mbps PCI Network Card
3685 Wireless Access PCI Adapter Model 022415
+16f4 Vweb Corp
+ 8000 VW2010
16f6 VideoTele.com, Inc.
# www.internetmachines.com
1702 Internet Machines Corporation (IMC)
@@ -6884,8 +7018,12 @@
170b NetOctave
0100 NSP2000-SSL crypto accelerator
170c YottaYotta Inc.
+# Seems to be a 2nd ID for Vitesse Semiconductor
+1725 Vitesse Semiconductor
+ 7174 VSC7174 PCI/PCI-X Serial ATA Host Bus Controller
172a Accelerated Encryption
1737 Linksys
+ 0013 WMP54G Wireless Pci Card
1032 Gigabit Network Adapter
1737 0015 EG1032 v2 Instant Gigabit Network Adapter
1064 Gigabit Network Adapter
@@ -6914,10 +7052,12 @@
0004 CAMAC Controller
0005 PROFIBUS
0006 AMCC HOTlink
+1797 JumpTec h, GMBH
1799 Belkin
6001 Wireless PCI Card - F5D6001
6020 Wireless PCMCIA Card - F5D6020
6060 Wireless PDA Card - F5D6060
+ 7000 Wireless PCI Card - F5D7000
17af Hightech Information System Ltd.
17b3 Hawking Technologies
ab08 PN672TX 10/100 Ethernet
@@ -6929,6 +7069,9 @@
2280 USB 2.0
# S2io ships 10Gb PCI-X Ethernet adapters www.s2io.com
17d5 S2io Inc.
+# Supplying full name for a currently green entry
+17fe Linksys, A Division of Cisco Systems
+ 2220 [AirConn] INPROCOMM IPN 2220 WLAN Adapter (rev 01)
1813 Ambient Technologies Inc
4000 HaM controllerless modem
16be 0001 V9x HAM Data Fax Modem
@@ -6937,6 +7080,8 @@
1814 RaLink
0101 Wireless PCI Adpator RT2400 / RT2460
0201 Ralink RT2500 802.11 Cardbus Reference Card
+1820 InfiniCon Systems Inc.
+1822 Twinhan Technology Co. Ltd
1830 Credence Systems Corporation
1851 Microtune, Inc.
1852 Anritsu Corp.
@@ -6952,6 +7097,8 @@
# found e.g. on KNC DVB-S card
1894 KNC One
18a1 Astute Networks Inc.
+18bc Info-Tek Corp.
+18c9 ARVOO Engineering BV
18ca XGI - Xabre Graphics Inc
0040 Volari V8
18e6 MPL AG
@@ -7018,6 +7165,7 @@
0008 GLINT Gamma G1
0009 Permedia II 2D+3D
1040 0011 AccelStar II
+ 13e9 1000 6221L-4U
3d3d 0100 AccelStar II 3D Accelerator
3d3d 0111 Permedia 3:16
3d3d 0114 Santa Ana
@@ -7269,10 +7417,11 @@
5555 Genroco, Inc
0003 TURBOstor HFP-832 [HiPPI NIC]
5654 VoiceTronix Pty Ltd
+ 3132 OpenSwitch12
5700 Netpower
5851 Exacq Technologies
6356 UltraStor
-6374 c't Magazin fĆ¼r Computertechnik
+6374 c't Magazin für Computertechnik
6773 GPPCI
6409 Logitec Corp.
6666 Decision Computer International Co.
@@ -7292,6 +7441,8 @@
0008 1000 WorldMark 4300 INCA ASIC
0039 21145 Fast Ethernet
0122 82437FX
+ 0309 80303 I/O Processor PCI-to-PCI Bridge
+ 030d 80312 I/O Companion Chip PCI-to-PCI Bridge
0326 PCI Bridge Hub I/OxAPIC Interrupt Controller A
0327 PCI Bridge Hub I/OxAPIC Interrupt Controller B
0329 PCI Bridge Hub A
@@ -7315,13 +7466,38 @@
0340 41210 [Lanai] Serial to Parallel PCI Bridge
# B-segment bridge
0341 41210 [Lanai] Serial to Parallel PCI Bridge
- 0482 82375EB
- 0483 82424ZX [Saturn]
- 0484 82378IB [SIO ISA Bridge]
- 0486 82430ZX [Aries]
- 04a3 82434LX [Mercury/Neptune]
+ 0482 82375EB/SB PCI to EISA Bridge
+ 0483 82424TX/ZX [Saturn] CPU to PCI bridge
+ 0484 82378ZB/IB, 82379AB (SIO, SIO.A) PCI to ISA Bridge
+ 0486 82425EX/ZX [Aries] PCIset with ISA bridge
+ 04a3 82434LX/NX [Mercury/Neptune] Processor to PCI bridge
04d0 82437FX [Triton FX]
+ 0500 E8870 Processor bus control
+ 0501 E8870 Memory controller
+# and registers common to both SPs
+ 0502 E8870 Scalability Port 0
+# and global performance monitoring
+ 0503 E8870 Scalability Port 1
+ 0510 E8870IO Hub Interface Port 0 registers (8-bit compatibility port)
+ 0511 E8870IO Hub Interface Port 1 registers
+ 0512 E8870IO Hub Interface Port 2 registers
+ 0513 E8870IO Hub Interface Port 3 registers
+ 0514 E8870IO Hub Interface Port 4 registers
+ 0515 E8870IO General SIOH registers
+ 0516 E8870IO RAS registers
+ 0530 E8870SP Scalability Port 0 registers
+ 0531 E8870SP Scalability Port 1 registers
+ 0532 E8870SP Scalability Port 2 registers
+ 0533 E8870SP Scalability Port 3 registers
+ 0534 E8870SP Scalability Port 4 registers
+ 0535 E8870SP Scalability Port 5 registers
+# (bi-interleave 0) and global registers that are neither per-port nor per-interleave
+ 0536 E8870SP Interleave registers 0 and 1
+# (bi-interleave 1)
+ 0537 E8870SP Interleave registers 2 and 3
0600 RAID Controller
+ 8086 01c1 ICP Vortex GDT8546RZ
+ 8086 01f7 SCRU32
0960 80960RP [i960 RP Microprocessor/Bridge]
0962 80960RM [i960RM Bridge]
0964 80960RP [i960 RP Microprocessor/Bridge]
@@ -7406,6 +7582,7 @@
1019 82547EI Gigabit Ethernet Controller (LOM)
1458 1019 GA-8IPE1000 Pro2 motherboard (865PE)
8086 1019 PRO/1000 CT Desktop Connection
+ 8086 3427 S875WP1-E mainboard
101d 82546EB Gigabit Ethernet Controller
8086 1000 PRO/1000 MT Quad Port Server Adapter
101e 82540EP Gigabit Ethernet Controller (Mobile)
@@ -7453,13 +7630,16 @@
16be 1040 V.9X DSP Data Fax Modem
1043 PRO/Wireless LAN 2100 3B Mini PCI Adapter
8086 2527 MIM2000/Centrino
- 1048 Intel(R) PRO/10GbE LR Server Adapter
+ 1048 PRO/10GbE LR Server Adapter
8086 a01f PRO/10GbE LR Server Adapter
8086 a11f PRO/10GbE LR Server Adapter
1050 82562EZ 10/100 Ethernet Controller
1462 728c 865PE Neo2 (MS-6728)
+ 1462 758c MS-6758 (875P Neo)
+ 8086 3427 S875WP1-E mainboard
1051 82801EB/ER (ICH5/ICH5R) integrated LAN Controller
1059 82551QM Ethernet Controller
+ 1065 82801FB/FBM/FR/FW/FRW (ICH6 Family) LAN Controller
# Updated controller name from 82547EI to 82547GI
1075 82547GI Gigabit Ethernet Controller
8086 0075 PRO/1000 CT Network Connection
@@ -7516,8 +7696,8 @@
4c53 1050 CT7 mainboard
4c53 1051 CE7 mainboard
4c53 1070 PC6 mainboard
- 1221 82092AA_0
- 1222 82092AA_1
+ 1221 82092AA PCI to PCMCIA Bridge
+ 1222 82092AA IDE Controller
1223 SAA7116
1225 82452KX/GX [Orion]
1226 82596 PRO/10 PCI
@@ -7587,6 +7767,7 @@
1259 2560 AT-2560 100
1259 2561 AT-2560 100 FX Ethernet Adapter
1266 0001 NE10/100 Adapter
+ 13e9 1000 6221L-4U
144d 2501 SEM-2000 MiniPCI LAN Adapter
144d 2502 SEM-2100IL MiniPCI LAN Adapter
1668 1100 EtherExpress PRO/100B (TX) (MiniPCI Ethernet+Modem)
@@ -7675,6 +7856,7 @@
8086 3010 EtherExpress PRO/100 S Network Connection
8086 3011 EtherExpress PRO/100 S Network Connection
8086 3012 EtherExpress PRO/100 Network Connection
+ 8086 3411 SDS2 Mainboard
122d 430FX - 82437FX TSC [Triton I]
122e 82371FB PIIX ISA [Triton I]
1230 82371FB PIIX IDE [Triton I]
@@ -7682,13 +7864,15 @@
1234 430MX - 82371MX Mobile PCI I/O IDE Xcelerator (MPIIX)
1235 430MX - 82437MX Mob. System Ctrlr (MTSC) & 82438MX Data Path (MTDP)
1237 440FX - 82441FX PMC [Natoma]
- 1239 82371FB
- 123b 82380PB
- 123c 82380AB
+ 1239 82371FB PIIX IDE Interface
+ 123b 82380PB PCI to PCI Docking Bridge
+ 123c 82380AB (MISA) Mobile PCI-to-ISA Bridge
123d 683053 Programmable Interrupt Device
+# in" hidden" mode
+ 123e 82466GX (IHPC) Integrated Hot-Plug Controller
123f 82466GX Integrated Hot-Plug Controller (IHPC)
- 1240 752 AGP
- 124b 82380FB
+ 1240 82752 (752) AGP Graphics Accelerator
+ 124b 82380FB (MPCI2) Mobile Docking Controller
1250 430HX - 82439HX TXC [Triton II]
1360 82806AA PCI64 Hub PCI Bridge
1361 82806AA PCI64 Hub Controller (HRes)
@@ -7782,7 +7966,7 @@
2446 Intel 537 [82801BA/BAM AC'97 Modem]
1025 1016 Travelmate 612 TX
104d 80df Vaio PCG-FX403
- 2448 82801BAM/CAM PCI Bridge
+ 2448 82801 PCI Bridge
2449 82801BA/BAM/CA/CAM Ethernet Controller
0e11 0012 EtherExpress PRO/100 VM
0e11 0091 EtherExpress PRO/100 VE
@@ -7824,7 +8008,7 @@
8086 4532 D815EEA2 mainboard
8086 4557 D815EGEW Mainboard
244c 82801BAM ISA Bridge (LPC)
- 244e 82801BA/CA/DB/EB/ER Hub interface to PCI Bridge
+ 244e 82801 PCI Bridge
1014 0267 NetVista A30p
2450 82801E ISA Bridge (LPC)
2452 82801E USB
@@ -7879,45 +8063,45 @@
248b 82801CA Ultra ATA Storage Controller
15d9 3480 P4DP6
248c 82801CAM ISA Bridge (LPC)
- 24c0 82801DB (ICH4) LPC Bridge
+ 24c0 82801DB/DBL (ICH4/ICH4-L) LPC Bridge
1014 0267 NetVista A30p
1462 5800 845PE Max (MS-6580)
- 24c2 82801DB (ICH4) USB UHCI #1
+ 24c2 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #1
1014 0267 NetVista A30p
1071 8160 MIM2000
1462 5800 845PE Max (MS-6580)
- 24c3 82801DB/DBM (ICH4) SMBus Controller
+ 24c3 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) SMBus Controller
1014 0267 NetVista A30p
1071 8160 MIM2000
1458 24c2 GA-8PE667 Ultra
1462 5800 845PE Max (MS-6580)
4c53 1090 Cx9 / Vx9 mainboard
- 24c4 82801DB (ICH4) USB UHCI #2
+ 24c4 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #2
1014 0267 NetVista A30p
1071 8160 MIM2000
1462 5800 845PE Max (MS-6580)
4c53 1090 Cx9 / Vx9 mainboard
- 24c5 82801DB (ICH4) AC'97 Audio Controller
+ 24c5 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Audio Controller
0e11 00b8 Analog Devices Inc. codec [SoundMAX]
1014 0267 NetVista A30p
1071 8160 MIM2000
1458 a002 GA-8PE667 Ultra
1462 5800 845PE Max (MS-6580)
- 24c6 82801DB (ICH4) AC'97 Modem Controller
+ 24c6 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller
1071 8160 MIM2000
- 24c7 82801DB (ICH4) USB UHCI #3
+ 24c7 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #3
1014 0267 NetVista A30p
1071 8160 MIM2000
1462 5800 845PE Max (MS-6580)
24ca 82801DBM (ICH4) Ultra ATA Storage Controller
1071 8160 MIM2000
- 24cb 82801DB (ICH4) Ultra ATA 100 Storage Controller
+ 24cb 82801DB/DBL (ICH4/ICH4-L) UltraATA-100 IDE Controller
1014 0267 NetVista A30p
1458 24c2 GA-8PE667 Ultra
1462 5800 845PE Max (MS-6580)
4c53 1090 Cx9 / Vx9 mainboard
24cc 82801DBM LPC Interface Controller
- 24cd 82801DB (ICH4) USB2 EHCI Controller
+ 24cd 82801DB/DBM (ICH4/ICH4-M) USB 2.0 EHCI Controller
1014 0267 NetVista A30p
1071 8160 MIM2000
1462 3981 845PE Max (MS-6580)
@@ -7927,19 +8111,23 @@
103c 12bc d530 CMT (DG746A)
1458 24d1 GA-8IPE1000 Pro2 motherboard (865PE)
1462 7280 865PE Neo2 (MS-6728)
+ 8086 3427 S875WP1-E mainboard
24d2 82801EB/ER (ICH5/ICH5R) USB UHCI #1
103c 12bc d530 CMT (DG746A)
1043 80a6 P4P800 Mainboard
1462 7280 865PE Neo2 (MS-6728)
+ 8086 3427 S875WP1-E mainboard
24d3 82801EB/ER (ICH5/ICH5R) SMBus Controller
1043 80a6 P4P800 Mainboard
1458 24d2 GA-8IPE1000 Pro2 motherboard (865PE)
1462 7280 865PE Neo2 (MS-6728)
+ 8086 3427 S875WP1-E mainboard
24d4 82801EB/ER (ICH5/ICH5R) USB UHCI #2
103c 12bc d530 CMT (DG746A)
1043 80a6 P4P800 Mainboard
1458 24d2 GA-8IPE1000 Pro2 motherboard (865PE)
1462 7280 865PE Neo2 (MS-6728)
+ 8086 3427 S875WP1-E mainboard
24d5 82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller
103c 12bc Analog Devices codec [SoundMAX Integrated Digital Audio]
1043 80f3 P4P800 Mainboard
@@ -7950,22 +8138,26 @@
1043 80a6 P4P800 Mainboard
1458 24d2 GA-8IPE1000 Pro2 motherboard (865PE)
1462 7280 865PE Neo2 (MS-6728)
+ 8086 3427 S875WP1-E mainboard
24db 82801EB/ER (ICH5/ICH5R) Ultra ATA 100 Storage Controller
103c 12bc d530 CMT (DG746A)
1043 80a6 P4P800 Mainboard
1458 24d2 GA-8IPE1000 Pro2 motherboard (865PE)
1462 7280 865PE Neo2 (MS-6728)
1462 7580 MSI 875P
+ 8086 3427 S875WP1-E mainboard
24dc 82801EB LPC Interface Controller
24dd 82801EB/ER (ICH5/ICH5R) USB2 EHCI Controller
103c 12bc d530 CMT (DG746A)
1043 80a6 P4P800 Mainboard
1458 5006 GA-8IPE1000 Pro2 motherboard (865PE)
1462 7280 865PE Neo2 (MS-6728)
+ 8086 3427 S875WP1-E mainboard
24de 82801EB/ER (ICH5/ICH5R) USB UHCI #4
1043 80a6 P4P800 Mainboard
1458 24d2 GA-8IPE1000 Pro2 motherboard (865PE)
1462 7280 865PE Neo2 (MS-6728)
+ 8086 3427 S875WP1-E mainboard
24df 82801EB (ICH5R) SATA (cc=RAID)
2500 82820 820 (Camino) Chipset Host Bridge (MCH)
1028 0095 Precision Workstation 220 Chipset
@@ -7984,23 +8176,23 @@
2534 82860 860 (Wombat) Chipset PCI Bridge
2540 E7500 Memory Controller Hub
15d9 3480 P4DP6
- 2541 E7000 Series Host RASUM Controller
+ 2541 E7500/E7501 Host RASUM Controller
15d9 3480 P4DP6
4c53 1090 Cx9 / Vx9 mainboard
- 2543 E7000 Series Hub Interface B PCI-to-PCI Bridge
- 2544 E7000 Series Hub Interface B RASUM Controller
+ 2543 E7500/E7501 Hub Interface B PCI-to-PCI Bridge
+ 2544 E7500/E7501 Hub Interface B RASUM Controller
4c53 1090 Cx9 / Vx9 mainboard
- 2545 E7000 Series Hub Interface C PCI-to-PCI Bridge
- 2546 E7000 Series Hub Interface C RASUM Controller
- 2547 E7000 Series Hub Interface D PCI-to-PCI Bridge
- 2548 E7000 Series Hub Interface D RASUM Controller
+ 2545 E7500/E7501 Hub Interface C PCI-to-PCI Bridge
+ 2546 E7500/E7501 Hub Interface C RASUM Controller
+ 2547 E7500/E7501 Hub Interface D PCI-to-PCI Bridge
+ 2548 E7500/E7501 Hub Interface D RASUM Controller
254c E7501 Memory Controller Hub
4c53 1090 Cx9 / Vx9 mainboard
2550 E7505 Memory Controller Hub
- 2551 E7000 Series RAS Controller
- 2552 E7000 Series Processor to AGP Controller
- 2553 E7000 Series Hub Interface B PCI-to-PCI Bridge
- 2554 E7000 Series Hub Interface B PCI-to-PCI Bridge RAS Controller
+ 2551 E7505/E7205 Series RAS Controller
+ 2552 E7505/E7205 PCI-to-AGP Bridge
+ 2553 E7505 Hub Interface B PCI-to-PCI Bridge
+ 2554 E7505 Hub Interface B PCI-to-PCI Bridge RAS Controller
255d E7205 Memory Controller Hub
2560 82845G/GL[Brookdale-G]/GE/PE DRAM Controller/Host-Hub Interface
1458 2560 GA-8PE667 Ultra
@@ -8022,14 +8214,17 @@
2579 82875P Processor to AGP Controller
257b 82875P Processor to PCI to CSA Bridge
257e 82875P Processor to I/O Memory Interface
- 2580 Memory Controller Hub
- 2581 Memory Controller Hub PCI Express Port
- 2582 Graphics Controller
- 2584 Workstation Memory Controller Hub
- 2585 Workstation Memory Controller Hub PCI Express Port
+ 2580 915G/P/GV Processor to I/O Controller
+ 2581 915G/P/GV PCI Express Root Port
+ 2582 82915G Express Chipset Family Graphics Controller
+ 2584 925X Memory Controller Hub
+ 2585 925X PCI Express Root Port
2588 Server Memory Controller Hub
2589 Server Memory Controller Hub PCI Express Port
258a Graphics Controller
+ 2590 Mobile Memory Controller Hub
+ 2591 Mobile Memory Controller Hub PCI Express Port
+ 2592 Mobile Graphics Controller
25a1 6300ESB LPC Interface Controller
25a2 6300ESB PATA Storage Controller
25a3 6300ESB SATA Storage Controller
@@ -8043,26 +8238,63 @@
25ad 6300ESB USB2 Enhanced Host Controller
25ae 6300ESB 64-bit PCI-X Bridge
25b0 6300ESB SATA RAID Controller
- 2640 I/O Controller Hub LPC
- 2641 I/O Controller Hub LPC
- 2642 I/O Controller Hub LPC
- 2651 I/O Controller Hub SATA cc=ide
- 2652 I/O Controller Hub SATA cc=raid
- 2658 I/O Controller Hub USB
- 2659 I/O Controller Hub USB
- 265a I/O Controller Hub USB
- 265b I/O Controller Hub USB
- 265c I/O Controller Hub USB2
- 2660 I/O Controller Hub PCI Express Port 0
- 2662 I/O Controller Hub PCI Express Port 1
- 2664 I/O Controller Hub PCI Express Port 2
- 2666 I/O Controller Hub PCI Express Port 3
- 2668 I/O Controller Hub Audio
- 266a I/O Controller Hub SMBus
- 266d I/O Controller Hub Modem
- 266e I/O Controller Hub Audio
- 266f I/O Controller Hub PATA
- 2782 Graphics Controller
+ 2600 Server Hub Interface
+ 2601 Server Hub PCI Express x4 Port D
+ 2602 Server Hub PCI Express x4 Port C0
+ 2603 Server Hub PCI Express x4 Port C1
+ 2604 Server Hub PCI Express x4 Port B0
+ 2605 Server Hub PCI Express x4 Port B1
+ 2606 Server Hub PCI Express x4 Port A0
+ 2607 Server Hub PCI Express x4 Port A1
+ 2608 Server Hub PCI Express x8 Port C
+ 2609 Server Hub PCI Express x8 Port B
+ 260a Server Hub PCI Express x8 Port A
+ 260c Server Hub IMI Registers
+ 2610 Server Hub System Bus, Boot, and Interrupt Registers
+ 2611 Server Hub Address Mapping Registers
+ 2612 Server Hub RAS Registers
+ 2613 Server Hub Performance Monitoring Registers
+ 2614 Server Hub Performance Monitoring Registers
+ 2615 Server Hub Performance Monitoring Registers
+ 2617 Server Hub Debug Registers
+ 2618 Server Hub Debug Registers
+ 2619 Server Hub Debug Registers
+ 261a Server Hub Debug Registers
+ 261b Server Hub Debug Registers
+ 261c Server Hub Debug Registers
+ 261d Server Hub Debug Registers
+ 261e Server Hub Debug Registers
+ 2620 External Memory Bridge
+ 2621 External Memory Bridge Control Registers
+ 2622 External Memory Bridge Memory Interleaving Registers
+ 2623 External Memory Bridge DDR Initialization and Calibration
+ 2624 External Memory Bridge Reserved Registers
+ 2625 External Memory Bridge Reserved Registers
+ 2626 External Memory Bridge Reserved Registers
+ 2627 External Memory Bridge Reserved Registers
+ 2640 82801FB/FR (ICH6/ICH6R) LPC Interface Bridge
+ 2641 82801FBM (ICH6M) LPC Interface Bridge
+ 2642 82801FW/FRW (ICH6W/ICH6RW) LPC Interface Bridge
+ 2651 82801FB/FW (ICH6/ICH6W) SATA Controller
+ 2652 82801FR/FRW (ICH6R/ICH6RW) SATA Controller
+ 2653 82801FBM (ICH6M) SATA Controller
+ 2658 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #1
+ 2659 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #2
+ 265a 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #3
+ 265b 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #4
+ 265c 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB2 EHCI Controller
+ 2660 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 1
+ 2662 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 2
+ 2664 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 3
+ 2666 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 4
+ 2668 82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller
+ 266a 82801FB/FBM/FR/FW/FRW (ICH6 Family) SMBus Controller
+ 266c 82801FB/FBM/FR/FW/FRW (ICH6 Family) LAN Controller
+ 266d 82801FB/FBM/FR/FW/FRW (ICH6 Family) AC'97 Modem Controller
+ 266e 82801FB/FBM/FR/FW/FRW (ICH6 Family) AC'97 Audio Controller
+ 266f 82801FB/FBM/FR/FW/FRW (ICH6 Family) IDE Controller
+ 2782 82915G Express Chipset Family Graphics Controller
+ 2792 Mobile Graphics Controller
3092 Integrated RAID
3200 GD31244 PCI-X SATA HBA
3340 82855PM Processor to I/O Controller
@@ -8092,7 +8324,7 @@
359a Memory Controller Hub PCI Express Port C1
359b Memory Controller Hub Extended Configuration Registers
359e Workstation Memory Controller Hub
- 4220 Intel(R) PRO/Wireless 2200BG
+ 4220 PRO/Wireless 2200BG
5200 EtherExpress PRO/100 Intelligent Server
5201 EtherExpress PRO/100 Intelligent Server
8086 0001 EtherExpress PRO/100 Server Ethernet Adapter
@@ -8155,7 +8387,7 @@
7601 82372FB PIIX5 IDE
7602 82372FB PIIX5 USB
7603 82372FB PIIX5 SMBus
- 7800 i740
+ 7800 82740 (i740) AGP Graphics Accelerator
003d 0008 Starfighter AGP
003d 000b Starfighter AGP
1092 0100 Stealth II G460
@@ -8175,7 +8407,9 @@
84e6 460GX - 82466GX Wide and fast PCI eXpander Bridge (WXB)
84ea 460GX - 84460GX AGP Bridge (GXB function 1)
8500 IXP4xx Family Network Processor (IXP420, 421, 422, 425 and IXC1100)
- 9000 Intel IXP2000 Familly Network Processor
+ 9000 Intel IXP2000 Family Network Processor
+ 9001 Intel IXP2400 Network Processor
+ 9004 Intel IXP2800 Network Processor
9621 Integrated RAID
9622 Integrated RAID
9641 Integrated RAID
@@ -8184,10 +8418,12 @@
# observed, and documented in Intel revision note; new mask of 1011:0026
b154 21154 PCI-to-PCI Bridge
b555 21555 Non transparent PCI-to-PCI Bridge
+ 1331 0030 Radisys ENP-2611
4c53 1050 CT7 mainboard
4c53 1051 CE7 mainboard
e4bf 1000 CC8-1-BLUES
ffff 450NX/GX [Orion] - 82453KX/GX Memory controller [BUG]
+8401 TRENDware International Inc.
8800 Trigem Computer Inc.
2008 Video assistent component
8866 T-Square Design Inc.
@@ -8352,15 +8588,18 @@
00c1 AIC-7899B U160/m
00c3 AIC-7899D U160/m
00c5 RAID subsystem HBA
- 1028 00c5 PowerEdge 2550
+ 1028 00c5 PowerEdge 2400,2500,2550,4400
00cf AIC-7899P U160/m
1028 00ce PowerEdge 1400
1028 00d1 PowerEdge 2550
10f1 2462 Thunder K7 S2462
15d9 9005 Onboard SCSI Host Adapter
+ 8086 3411 SDS2 Mainboard
0250 ServeRAID Controller
1014 0279 ServeRAID-xx
1014 028c ServeRAID-xx
+# from kernel sources
+ 0279 ServeRAID 6M
0283 AAC-RAID
9005 0283 Catapult
0284 AAC-RAID
@@ -8429,7 +8668,7 @@
1000 0012 1P2S
9845 PCI 9845 Multi-I/O Controller
1000 0006 0P6S (6 port 16550a serial card)
- 9855 PCI 9855 Multi-I/O Controller 4 Serial 1 Parallel
+ 9855 PCI 9855 Multi-I/O Controller
1000 0014 1P4S
9902 Stargen Inc.
0001 SG2010 PCI over Starfabric Bridge
@@ -8444,6 +8683,7 @@
a727 3Com Corporation
aa42 Scitex Digital Video
ac1e Digital Receiver Technology Inc
+aecb Adrienne Electronics Corporation
b1b3 Shiva Europe Limited
# Pinnacle should be 11bd, but they got it wrong several times --mj
bd11 Pinnacle Systems, Inc. (Wrong ID)
@@ -8464,9 +8704,9 @@
dead Indigita Corporation
e000 Winbond
e000 W89C940
-# see : http://www.schoenfeld.de/inside/Inside_CWMK3.txt
-e159 Individual Computers - Jens Schoenfeld
- 0001 Intel 537
+# see also : http://www.schoenfeld.de/inside/Inside_CWMK3.txt maybe a misuse of TJN id or it use the TJN 3XX chip for other applic
+e159 Tiger Jet Network Inc.
+ 0001 Tiger3XX Modem/ISDN interface
0059 0001 128k ISDN-S/T Adapter
0059 0003 128k ISDN-U Adapter
0002 Tiger100APC ISDN chipset
diff -Nru a/drivers/pci/quirks.c b/drivers/pci/quirks.c
--- a/drivers/pci/quirks.c 2004-08-04 17:56:07 -07:00
+++ b/drivers/pci/quirks.c 2004-08-04 17:56:07 -07:00
@@ -39,6 +39,7 @@
}
}
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82441, quirk_passive_release );
/* The VIA VP2/VP3/MVP3 seem to have some 'features'. There may be a workaround
but VIA don't answer queries. If you happen to have good contacts at VIA
@@ -57,6 +58,17 @@
printk(KERN_INFO "Activating ISA DMA hang workarounds.\n");
}
}
+ /*
+ * Its not totally clear which chipsets are the problematic ones
+ * We know 82C586 and 82C596 variants are affected.
+ */
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_0, quirk_isa_dma_hangs );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C596, quirk_isa_dma_hangs );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371SB_0, quirk_isa_dma_hangs );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, quirk_isa_dma_hangs );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_1, quirk_isa_dma_hangs );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_2, quirk_isa_dma_hangs );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_3, quirk_isa_dma_hangs );
int pci_pci_problems;
@@ -72,6 +84,8 @@
pci_pci_problems|=PCIPCI_FAIL;
}
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5597, quirk_nopcipci );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496, quirk_nopcipci );
/*
* Triton requires workarounds to be used by the drivers
@@ -85,6 +99,10 @@
pci_pci_problems|=PCIPCI_TRITON;
}
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437, quirk_triton );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437VX, quirk_triton );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82439, quirk_triton );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82439TX, quirk_triton );
/*
* VIA Apollo KT133 needs PCI latency patch
@@ -145,6 +163,9 @@
pci_write_config_byte(dev, 0x76, busarb);
printk(KERN_INFO "Applying VIA southbridge workaround.\n");
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8363_0, quirk_vialatency );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8371_1, quirk_vialatency );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8361, quirk_vialatency );
/*
* VIA Apollo VP3 needs ETBF on BT848/878
@@ -158,6 +179,8 @@
pci_pci_problems|=PCIPCI_VIAETBF;
}
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C597_0, quirk_viaetbf );
+
static void __devinit quirk_vsfx(struct pci_dev *dev)
{
if((pci_pci_problems&PCIPCI_VSFX)==0)
@@ -166,6 +189,7 @@
pci_pci_problems|=PCIPCI_VSFX;
}
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C576, quirk_vsfx );
/*
* Ali Magik requires workarounds to be used by the drivers
@@ -182,6 +206,8 @@
pci_pci_problems|=PCIPCI_ALIMAGIK|PCIPCI_TRITON;
}
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1647, quirk_alimagik );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1651, quirk_alimagik );
/*
@@ -197,6 +223,12 @@
pci_pci_problems|=PCIPCI_NATOMA;
}
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82441, quirk_natoma );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443LX_0, quirk_natoma );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443LX_1, quirk_natoma );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0, quirk_natoma );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_1, quirk_natoma );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2, quirk_natoma );
/*
* S3 868 and 968 chips report region size equal to 32M, but they decode 64M.
@@ -212,6 +244,8 @@
r->end = 0x3ffffff;
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3, PCI_DEVICE_ID_S3_868, quirk_s3_64M );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3, PCI_DEVICE_ID_S3_968, quirk_s3_64M );
static void __devinit quirk_io_region(struct pci_dev *dev, unsigned region, unsigned size, int nr)
{
@@ -239,6 +273,7 @@
request_region(0x3b0, 0x0C, "RadeonIGP");
request_region(0x3d3, 0x01, "RadeonIGP");
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS100, quirk_ati_exploding_mce );
/*
* Let's make the southbridge information explicit instead
@@ -260,6 +295,7 @@
pci_read_config_word(dev, 0xE2, ®ion);
quirk_io_region(dev, region, 32, PCI_BRIDGE_RESOURCES+1);
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, quirk_ali7101_acpi );
/*
* PIIX4 ACPI: Two IO regions pointed to by longwords at
@@ -275,6 +311,7 @@
pci_read_config_dword(dev, 0x90, ®ion);
quirk_io_region(dev, region, 32, PCI_BRIDGE_RESOURCES+1);
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3, quirk_piix4_acpi );
/*
* ICH4, ICH4-M, ICH5, ICH5-M ACPI: Three IO regions pointed to by longwords at
@@ -291,6 +328,15 @@
pci_read_config_dword(dev, 0x58, ®ion);
quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES+1);
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_0, quirk_ich4_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_0, quirk_ich4_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0, quirk_ich4_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_10, quirk_ich4_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, quirk_ich4_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12, quirk_ich4_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0, quirk_ich4_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12, quirk_ich4_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0, quirk_ich4_lpc_acpi );
/*
* VIA ACPI: One IO region pointed to by longword at
@@ -308,6 +354,7 @@
quirk_io_region(dev, region, 256, PCI_BRIDGE_RESOURCES);
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3, quirk_vt82c586_acpi );
/*
* VIA VT82C686 ACPI: Three IO region pointed to by (long)words at
@@ -330,6 +377,7 @@
smb &= PCI_BASE_ADDRESS_IO_MASK;
quirk_io_region(dev, smb, 16, PCI_BRIDGE_RESOURCES + 2);
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_vt82c686_acpi );
#ifdef CONFIG_X86_IO_APIC
@@ -358,6 +406,7 @@
/* Offset 0x58: External APIC IRQ output control */
pci_write_config_byte (dev, 0x58, tmp);
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686, quirk_via_ioapic );
/*
* The AMD io apic can hang the box when an apic irq is masked.
@@ -380,12 +429,14 @@
printk(KERN_WARNING " : booting with the \"noapic\" option.\n");
}
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7410, quirk_amd_ioapic );
static void __init quirk_ioapic_rmw(struct pci_dev *dev)
{
if (dev->devfn == 0 && dev->bus->number == 0)
sis_apic_bug = 1;
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI, PCI_ANY_ID, quirk_ioapic_rmw );
#define AMD8131_revA0 0x01
#define AMD8131_revB0 0x11
@@ -407,6 +458,7 @@
pci_write_config_byte( dev, AMD8131_MISC, tmp);
}
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_APIC, quirk_amd_8131_ioapic );
#endif /* CONFIG_X86_IO_APIC */
@@ -444,6 +496,8 @@
if (irq && (irq != 2))
d->irq = irq;
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3, quirk_via_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_via_acpi );
static void __devinit quirk_via_irqpic(struct pci_dev *dev)
{
@@ -459,6 +513,9 @@
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, new_irq);
}
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_2, quirk_via_irqpic );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5, quirk_via_irqpic );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_6, quirk_via_irqpic );
/*
@@ -480,6 +537,8 @@
legsup &= 0x50ef;
pci_write_config_word(dev, 0xc0, legsup);
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371SB_2, quirk_piix3_usb );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_2, quirk_piix3_usb );
/*
* VIA VT82C598 has its device ID settable and many BIOSes
@@ -492,6 +551,7 @@
pci_write_config_byte(dev, 0xfc, 0);
pci_read_config_word(dev, PCI_DEVICE_ID, &dev->device);
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C597_0, quirk_vt82c598_id );
/*
* CardBus controllers have a legacy base address that enables them
@@ -505,6 +565,7 @@
return;
pci_write_config_dword(dev, PCI_CB_LEGACY_MODE_BASE, 0);
}
+DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_cardbus_legacy );
/*
* Following the PCI ordering rules is optional on the AMD762. I'm not
@@ -528,6 +589,7 @@
pci_write_config_dword(dev, 0x84, pcic);
}
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_FE_GATE_700C, quirk_amd_ordering );
/*
* DreamWorks provided workaround for Dunord I-3000 problem
@@ -543,11 +605,21 @@
r -> start = 0;
r -> end = 0xffffff;
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_DUNORD, PCI_DEVICE_ID_DUNORD_I3000, quirk_dunord );
+/*
+ * i82380FB mobile docking controller: its PCI-to-PCI bridge
+ * is subtractive decoding (transparent), and does indicate this
+ * in the ProgIf. Unfortunately, the ProgIf value is wrong - 0x80
+ * instead of 0x01.
+ */
static void __devinit quirk_transparent_bridge(struct pci_dev *dev)
{
dev->transparent = 1;
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82380FB, quirk_transparent_bridge );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TOSHIBA, 0x605, quirk_transparent_bridge );
+
/*
* Common misconfiguration of the MediaGX/Geode PCI master that will
@@ -566,6 +638,8 @@
pci_write_config_byte(dev, 0x41, reg);
}
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_PCI_MASTER, quirk_mediagx_master );
+
/*
* As per PCI spec, ignore base address registers 0-3 of the IDE controllers
@@ -616,6 +690,7 @@
printk(KERN_INFO "PCI: Ignoring BAR%d-%d of IDE controller %s\n",
first_bar, last_bar, pci_name(dev));
}
+DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_ide_bases );
/*
* Ensure C0 rev restreaming is off. This is normally done by
@@ -639,6 +714,7 @@
printk(KERN_INFO "PCI: C0 revision 450NX. Disabling PCI restreaming.\n");
}
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82454NX, quirk_disable_pxb );
/*
* VIA northbridges care about PCI_INTERRUPT_LINE
@@ -651,6 +727,7 @@
if(pdev->devfn == 0)
interrupt_line_quirk = 1;
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_bridge );
/*
* Serverworks CSB5 IDE does not fully support native mode
@@ -667,6 +744,7 @@
quirk_ide_bases(pdev);
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE, quirk_svwks_csb5ide );
/* This was originally an Alpha specific thing, but it really fits here.
* The i82375 PCI/EISA bridge appears as non-classified. Fix that.
@@ -676,6 +754,7 @@
{
dev->class = PCI_CLASS_BRIDGE_EISA << 8;
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82375, quirk_eisa_bridge );
/*
* On ASUS P4B boards, the SMBus PCI Device within the ICH2/4 southbridge
@@ -732,6 +811,12 @@
}
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82845_HB, asus_hides_smbus_hostbridge );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82845G_HB, asus_hides_smbus_hostbridge );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82850_HB, asus_hides_smbus_hostbridge );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_7205_0, asus_hides_smbus_hostbridge );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82855PM_HB, asus_hides_smbus_hostbridge );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82855GM_HB, asus_hides_smbus_hostbridge );
static void __init asus_hides_smbus_lpc(struct pci_dev *dev)
{
@@ -750,6 +835,9 @@
printk(KERN_INFO "PCI: Enabled i801 SMBus device\n");
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0, asus_hides_smbus_lpc );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0, asus_hides_smbus_lpc );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12, asus_hides_smbus_lpc );
/*
* SiS 96x south bridge: BIOS typically hides SMBus device...
@@ -803,6 +891,19 @@
{
sis_96x_compatible = 1;
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_645, quirk_sis_96x_compatible );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_646, quirk_sis_96x_compatible );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_648, quirk_sis_96x_compatible );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_650, quirk_sis_96x_compatible );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_651, quirk_sis_96x_compatible );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_735, quirk_sis_96x_compatible );
+
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503, quirk_sis_503 );
+
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_961, quirk_sis_96x_smbus );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_962, quirk_sis_96x_smbus );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_963, quirk_sis_96x_smbus );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_LPC, quirk_sis_96x_smbus );
#ifdef CONFIG_X86_IO_APIC
static void __init quirk_alder_ioapic(struct pci_dev *pdev)
@@ -825,6 +926,7 @@
}
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EESSC, quirk_alder_ioapic );
#endif
#ifdef CONFIG_SCSI_SATA
@@ -898,6 +1000,7 @@
else
request_region(0x170, 8, "libata"); /* port 1 */
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, quirk_intel_ide_combined );
#endif /* CONFIG_SCSI_SATA */
int pciehp_msi_quirk;
@@ -906,6 +1009,7 @@
{
pciehp_msi_quirk = 1;
}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SMCH, quirk_pciehp_msi );
/*
* The main table of quirks.
@@ -914,141 +1018,11 @@
* be declared __init.
*/
-static struct pci_fixup pci_fixups[] __devinitdata = {
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_DUNORD, PCI_DEVICE_ID_DUNORD_I3000, quirk_dunord },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82441, quirk_passive_release },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82441, quirk_passive_release },
- /*
- * Its not totally clear which chipsets are the problematic ones
- * We know 82C586 and 82C596 variants are affected.
- */
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_0, quirk_isa_dma_hangs },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C596, quirk_isa_dma_hangs },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371SB_0, quirk_isa_dma_hangs },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, quirk_isa_dma_hangs },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82454NX, quirk_disable_pxb },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_1, quirk_isa_dma_hangs },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_2, quirk_isa_dma_hangs },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_3, quirk_isa_dma_hangs },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_S3, PCI_DEVICE_ID_S3_868, quirk_s3_64M },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_S3, PCI_DEVICE_ID_S3_968, quirk_s3_64M },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437, quirk_triton },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437VX, quirk_triton },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82439, quirk_triton },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82439TX, quirk_triton },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82441, quirk_natoma },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443LX_0, quirk_natoma },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443LX_1, quirk_natoma },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0, quirk_natoma },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_1, quirk_natoma },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2, quirk_natoma },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5597, quirk_nopcipci },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496, quirk_nopcipci },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503, quirk_sis_503 },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_LPC, quirk_sis_96x_smbus },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_645, quirk_sis_96x_compatible },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_646, quirk_sis_96x_compatible },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_648, quirk_sis_96x_compatible },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_650, quirk_sis_96x_compatible },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_651, quirk_sis_96x_compatible },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_735, quirk_sis_96x_compatible },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_961, quirk_sis_96x_smbus },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_962, quirk_sis_96x_smbus },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_963, quirk_sis_96x_smbus },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1647, quirk_alimagik },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1651, quirk_alimagik },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8363_0, quirk_vialatency },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8371_1, quirk_vialatency },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8361, quirk_vialatency },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C576, quirk_vsfx },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C597_0, quirk_viaetbf },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C597_0, quirk_vt82c598_id },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3, quirk_vt82c586_acpi },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_vt82c686_acpi },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3, quirk_piix4_acpi },
-
- /* Intel LPC interface bridges all have 128 bytes of magic ACPI/TCO regs and 64 bytes of GPIO */
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_0, quirk_ich4_lpc_acpi },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_0, quirk_ich4_lpc_acpi },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0, quirk_ich4_lpc_acpi },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_10, quirk_ich4_lpc_acpi },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, quirk_ich4_lpc_acpi },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12, quirk_ich4_lpc_acpi },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0, quirk_ich4_lpc_acpi },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12, quirk_ich4_lpc_acpi },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0, quirk_ich4_lpc_acpi },
-
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, quirk_ali7101_acpi },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371SB_2, quirk_piix3_usb },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_2, quirk_piix3_usb },
- { PCI_FIXUP_HEADER, PCI_ANY_ID, PCI_ANY_ID, quirk_ide_bases },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_bridge },
- { PCI_FIXUP_FINAL, PCI_ANY_ID, PCI_ANY_ID, quirk_cardbus_legacy },
-
-#ifdef CONFIG_X86_IO_APIC
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686, quirk_via_ioapic },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7410, quirk_amd_ioapic },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_SI, PCI_ANY_ID, quirk_ioapic_rmw },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_APIC,
- quirk_amd_8131_ioapic },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EESSC, quirk_alder_ioapic },
-#endif
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3, quirk_via_acpi },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_via_acpi },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_2, quirk_via_irqpic },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5, quirk_via_irqpic },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_6, quirk_via_irqpic },
-
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_FE_GATE_700C, quirk_amd_ordering },
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS100, quirk_ati_exploding_mce },
- /*
- * i82380FB mobile docking controller: its PCI-to-PCI bridge
- * is subtractive decoding (transparent), and does indicate this
- * in the ProgIf. Unfortunately, the ProgIf value is wrong - 0x80
- * instead of 0x01.
- */
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82380FB, quirk_transparent_bridge },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_TOSHIBA, 0x605, quirk_transparent_bridge },
-
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_PCI_MASTER, quirk_mediagx_master },
-
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE, quirk_svwks_csb5ide },
-
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82375, quirk_eisa_bridge },
-
- /*
- * on Asus P4B boards, the i801SMBus device is disabled at startup.
- * this also goes for boards in HP Compaq nc6000 and nc8000 notebooks.
- */
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82845_HB, asus_hides_smbus_hostbridge },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82845G_HB, asus_hides_smbus_hostbridge },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82850_HB, asus_hides_smbus_hostbridge },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_7205_0, asus_hides_smbus_hostbridge },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82855PM_HB, asus_hides_smbus_hostbridge },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82855GM_HB, asus_hides_smbus_hostbridge },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0, asus_hides_smbus_lpc },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0, asus_hides_smbus_lpc },
- { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12, asus_hides_smbus_lpc },
-
-#ifdef CONFIG_SCSI_SATA
- /* Fixup BIOSes that configure Parallel ATA (PATA / IDE) and
- * Serial ATA (SATA) into the same PCI ID.
- */
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_ANY_ID,
- quirk_intel_ide_combined },
-#endif /* CONFIG_SCSI_SATA */
- { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SMCH, quirk_pciehp_msi },
-
- { 0 }
-};
-
-
-static void pci_do_fixups(struct pci_dev *dev, int pass, struct pci_fixup *f)
+static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)
{
- while (f->pass) {
- if (f->pass == pass &&
- (f->vendor == dev->vendor || f->vendor == (u16) PCI_ANY_ID) &&
+ while (f < end) {
+ if ((f->vendor == dev->vendor || f->vendor == (u16) PCI_ANY_ID) &&
(f->device == dev->device || f->device == (u16) PCI_ANY_ID)) {
#ifdef DEBUG
printk(KERN_INFO "PCI: Calling quirk %p for %s\n", f->hook, pci_name(dev));
@@ -1059,10 +1033,27 @@
}
}
+extern struct pci_fixup __start_pci_fixups_header[];
+extern struct pci_fixup __end_pci_fixups_header[];
+extern struct pci_fixup __start_pci_fixups_final[];
+extern struct pci_fixup __end_pci_fixups_final[];
+
void pci_fixup_device(int pass, struct pci_dev *dev)
{
- pci_do_fixups(dev, pass, pcibios_fixups);
- pci_do_fixups(dev, pass, pci_fixups);
+ struct pci_fixup *start, *end;
+
+ switch(pass) {
+ case PCI_FIXUP_HEADER:
+ start = __start_pci_fixups_header;
+ end = __end_pci_fixups_header;
+ break;
+
+ case PCI_FIXUP_FINAL:
+ start = __start_pci_fixups_final;
+ end = __end_pci_fixups_final;
+ break;
+ }
+ pci_do_fixups(dev, start, end);
}
EXPORT_SYMBOL(pciehp_msi_quirk);
diff -Nru a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
--- a/drivers/pci/setup-bus.c 2004-08-04 17:56:07 -07:00
+++ b/drivers/pci/setup-bus.c 2004-08-04 17:56:07 -07:00
@@ -537,10 +537,11 @@
/* Depth first, calculate sizes and alignments of all
subordinate buses. */
- for(ln=pci_root_buses.next; ln != &pci_root_buses; ln=ln->next)
+ list_for_each(ln, &pci_root_buses) {
pci_bus_size_bridges(pci_bus_b(ln));
+ }
/* Depth last, allocate resources and update the hardware. */
- for(ln=pci_root_buses.next; ln != &pci_root_buses; ln=ln->next) {
+ list_for_each(ln, &pci_root_buses) {
pci_bus_assign_resources(pci_bus_b(ln));
pci_enable_bridges(pci_bus_b(ln));
}
diff -Nru a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
--- a/include/asm-generic/vmlinux.lds.h 2004-08-04 17:56:07 -07:00
+++ b/include/asm-generic/vmlinux.lds.h 2004-08-04 17:56:07 -07:00
@@ -16,6 +16,16 @@
*(.rodata1) \
} \
\
+ /* PCI quirks */ \
+ .pci_fixup : AT(ADDR(.pci_fixup) - LOAD_OFFSET) { \
+ VMLINUX_SYMBOL(__start_pci_fixups_header) = .; \
+ *(.pci_fixup_header) \
+ VMLINUX_SYMBOL(__end_pci_fixups_header) = .; \
+ VMLINUX_SYMBOL(__start_pci_fixups_final) = .; \
+ *(.pci_fixup_final) \
+ VMLINUX_SYMBOL(__end_pci_fixups_final) = .; \
+ } \
+ \
/* Kernel symbol table: Normal symbols */ \
__ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start___ksymtab) = .; \
diff -Nru a/include/linux/pci.h b/include/linux/pci.h
--- a/include/linux/pci.h 2004-08-04 17:56:07 -07:00
+++ b/include/linux/pci.h 2004-08-04 17:56:07 -07:00
@@ -1001,15 +1001,24 @@
*/
struct pci_fixup {
- int pass;
u16 vendor, device; /* You can use PCI_ANY_ID here of course */
void (*hook)(struct pci_dev *dev);
};
-extern struct pci_fixup pcibios_fixups[];
-
#define PCI_FIXUP_HEADER 1 /* Called immediately after reading configuration header */
#define PCI_FIXUP_FINAL 2 /* Final phase of device fixups */
+
+/* Anonymous variables would be nice... */
+#define DECLARE_PCI_FIXUP_HEADER(vendor, device, hook) \
+ static struct pci_fixup __pci_fixup_##vendor##device##hook __attribute_used__ \
+ __attribute__((__section__(".pci_fixup_header"))) = { \
+ vendor, device, hook };
+
+#define DECLARE_PCI_FIXUP_FINAL(vendor, device, hook) \
+ static struct pci_fixup __pci_fixup_##vendor##device##hook __attribute_used__ \
+ __attribute__((__section__(".pci_fixup_final"))) = { \
+ vendor, device, hook };
+
void pci_fixup_device(int pass, struct pci_dev *dev);
diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h
--- a/include/linux/pci_ids.h 2004-08-04 17:56:08 -07:00
+++ b/include/linux/pci_ids.h 2004-08-04 17:56:08 -07:00
@@ -2228,7 +2228,9 @@
#define PCI_DEVICE_ID_INTEL_82451NX 0x84ca
#define PCI_DEVICE_ID_INTEL_82454NX 0x84cb
#define PCI_DEVICE_ID_INTEL_84460GX 0x84ea
-#define PCI_DEVICE_ID_INTEL_IXP4XX 0x8500
+#define PCI_DEVICE_ID_INTEL_IXP4XX 0x8500
+#define PCI_DEVICE_ID_INTEL_IXP2400 0x9001
+#define PCI_DEVICE_ID_INTEL_IXP2800 0x9004
#define PCI_VENDOR_ID_COMPUTONE 0x8e0e
#define PCI_DEVICE_ID_COMPUTONE_IP2EX 0x0291