bk://kernel.bkbits.net/gregkh/linux/pci-2.6 ak@suse.de|ChangeSet|20041129191349|13160 ak # This is a BitKeeper generated diff -Nru style patch. # # drivers/pci/hotplug/rpaphp_pci.c # 2004/11/19 19:56:37-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/hotplug/rpaphp_pci.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/hotplug/rpaphp_pci.c # 2004/10/15 22:33:42-07:00 akpm@bix.(none) +0 -2 # Auto merged # # drivers/pci/hotplug/rpaphp_pci.c # 2004/10/15 22:32:39-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/29 11:13:49-08:00 ak@suse.de # [PATCH] PCI: Disable mmconfig on AMD CPUs. # # Disable mmconfig on AMD CPUs. # # This patch fixes various problems on PCI Express boards, like the # Nforce4. They have a MCFG table in ACPI, but not all devices can be # accessed using MMCONFIG. e.g. the CPU builtin PCI devices in the A64 # Northbridge can't. Linux happily uses mmconfig for all PCI devices and # that cause failures and memory corruption. # # Right solution apparently is to get more information from MCFG which is # supposed to tell for which busses mmconfig is legal and for which ones # not. But that would be a much more complicated patch and I don't have # a specification of this enhanced table. # # This patch just disable MMCONFIG on all AMD CPUs. This is a kludge, # but works around the problem for now. # # Patch for both i386 and x86-64 # # Signed-off-by: Andi Kleen # Signed-off-by: Greg Kroah-Hartman # # arch/x86_64/pci/mmconfig.c # 2004/11/29 11:13:05-08:00 ak@suse.de +7 -0 # PCI: Disable mmconfig on AMD CPUs. # # arch/i386/pci/mmconfig.c # 2004/11/29 11:13:05-08:00 ak@suse.de +7 -0 # PCI: Disable mmconfig on AMD CPUs. # # ChangeSet # 2004/11/29 11:12:54-08:00 ak@suse.de # [PATCH] PCI: Add sysfs file to map PCI busses to cpus # # Add sysfs file to map PCI busses to cpus # # Export the information from pcibus_to_cpumask() to sysfs. This # is useful for some user space programs who want to optimize their IO # using O_DIRECT. # # There was some indecision on whether it's more useful to report # cpus or nodes here. In the end cpus was chosen because that is # what the existing macros report. # # Signed-off-by: Andi Kleen # Signed-off-by: Greg Kroah-Hartman # # drivers/pci/pci-sysfs.c # 2004/08/03 17:42:11-07:00 ak@suse.de +11 -0 # PCI: Add sysfs file to map PCI busses to cpus # # ChangeSet # 2004/11/28 22:12:46-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/atm/idt77252.c # 2004/11/28 22:12:39-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/24 14:44:11-08:00 greg@kroah.com # [PATCH] PCI Hotplug: fix warning compile issue in cpqphp driver # # As pointed out by "O.Sezer" in a patch to 2.4 # # Signed-off-by: Greg Kroah-Hartman # # drivers/pci/hotplug/cpqphp_pci.c # 2004/11/24 14:42:17-08:00 greg@kroah.com +1 -1 # PCI Hotplug: fix warning compile issue in cpqphp driver # # ChangeSet # 2004/11/24 14:43:45-08:00 dlsy@snoqualmie.dp.intel.com # [PATCH] PCI Hotplug: Add pci_enable_device() in hot-plug drivers # # Here is the patch to add pci_enable_device() to the two hot-plug # drivers. In 2.6.10-rc2, the unconditional PCI ACPI IRQ routing # has been removed. Without this patch, the drivers won't work in # INTx mode with ACPI enabled. # # # Signed-off-by: Dely Sy # Signed-off-by: Greg Kroah-Hartman # # drivers/pci/hotplug/shpchp_hpc.c # 2004/11/19 16:54:26-08:00 dlsy@snoqualmie.dp.intel.com +3 -0 # PCI Hotplug: Add pci_enable_device() in hot-plug drivers # # drivers/pci/hotplug/pciehp_hpc.c # 2004/11/19 16:54:10-08:00 dlsy@snoqualmie.dp.intel.com +3 -0 # PCI Hotplug: Add pci_enable_device() in hot-plug drivers # # ChangeSet # 2004/11/24 13:29:22-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # arch/i386/kernel/acpi/boot.c # 2004/11/24 13:29:16-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/21 19:59:59-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/video/riva/fbdev.c # 2004/11/21 19:59:55-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/21 16:21:24-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/pci/quirks.c # 2004/11/21 16:21:19-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/19 19:56:41-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/scsi/nsp32.c # 2004/11/19 19:56:37-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/megaraid/megaraid_mbox.c # 2004/11/19 19:56:37-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/parport/parport_pc.c # 2004/11/19 19:56:36-08:00 akpm@bix.(none) +0 -0 # Auto merged # # Documentation/kernel-parameters.txt # 2004/11/19 19:56:36-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/17 19:45:43-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/pci/quirks.c # 2004/11/17 19:45:39-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/ide/ide.c # 2004/11/17 19:45:39-08:00 akpm@bix.(none) +0 -0 # Auto merged # # Documentation/kernel-parameters.txt # 2004/11/17 19:45:39-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/15 20:57:57-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/video/riva/fbdev.c # 2004/11/15 20:57:53-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/14 21:25:25-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/scsi/megaraid/megaraid_mbox.c # 2004/11/14 21:25:20-08:00 akpm@bix.(none) +0 -0 # Auto merged # # Documentation/kernel-parameters.txt # 2004/11/14 21:25:20-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/13 22:05:41-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/parport/parport_pc.c # 2004/11/13 22:05:37-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/13 14:27:20-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/usb/host/ohci-pci.c # 2004/11/13 14:27:16-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/host/ehci-hcd.c # 2004/11/13 14:27:16-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/core/hcd-pci.c # 2004/11/13 14:27:16-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/probe.c # 2004/11/13 14:27:16-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/12 13:08:09-08:00 akpm@bix.(none) # Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6 # into bix.(none):/usr/src/bk-pci # # drivers/pci/quirks.c # 2004/11/12 13:08:04-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/hotplug/ibmphp_core.c # 2004/11/12 13:08:04-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/ide/ide.c # 2004/11/12 13:08:04-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/cyclades.c # 2004/11/12 13:08:04-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/atm/idt77252.c # 2004/11/12 13:08:04-08:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/pci/irq.c # 2004/11/12 13:08:04-08:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/kernel/acpi/boot.c # 2004/11/12 13:08:04-08:00 akpm@bix.(none) +0 -0 # Auto merged # # Documentation/kernel-parameters.txt # 2004/11/12 13:08:04-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/11 14:59:49-08:00 akpm@bix.(none) # Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6 # into bix.(none):/usr/src/bk-pci # # drivers/pci/hotplug/ibmphp_core.c # 2004/11/11 14:59:45-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/ide/ide.c # 2004/11/11 14:59:45-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/11 14:58:34-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/video/riva/fbdev.c # 2004/11/11 14:58:30-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/video/i810/i810_main.c # 2004/11/11 14:58:30-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/video/i810/i810.h # 2004/11/11 14:58:30-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/parport/parport_pc.c # 2004/11/11 14:58:30-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/cyclades.c # 2004/11/11 14:58:30-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/atm/idt77252.c # 2004/11/11 14:58:30-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/09 19:35:19-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/pci/quirks.c # 2004/11/09 19:35:15-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/acpi/motherboard.c # 2004/11/09 19:35:15-08:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/pci/irq.c # 2004/11/09 19:35:15-08:00 akpm@bix.(none) +0 -8 # Auto merged # # arch/i386/kernel/acpi/boot.c # 2004/11/09 19:35:15-08:00 akpm@bix.(none) +0 -1 # Auto merged # # Documentation/kernel-parameters.txt # 2004/11/09 19:35:15-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/07 21:18:04-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/video/riva/fbdev.c # 2004/11/07 21:17:59-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/parport/parport_pc.c # 2004/11/07 21:17:59-08:00 akpm@bix.(none) +0 -0 # Auto merged # # Documentation/kernel-parameters.txt # 2004/11/07 21:17:59-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/05 20:38:01-08:00 akpm@bix.(none) # Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6 # into bix.(none):/usr/src/bk-pci # # drivers/pci/quirks.c # 2004/11/05 20:37:57-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/probe.c # 2004/11/05 20:37:57-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/atm/idt77252.c # 2004/11/05 20:37:57-08:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/ia64/pci/pci.c # 2004/11/05 20:37:57-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/04 18:26:01-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/usb/host/uhci-hcd.c # 2004/11/04 18:25:57-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/host/ohci-pci.c # 2004/11/04 18:25:57-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/host/ehci-hcd.c # 2004/11/04 18:25:57-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/core/hcd.h # 2004/11/04 18:25:57-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/core/hcd-pci.c # 2004/11/04 18:25:57-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/quirks.c # 2004/11/04 18:25:57-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/03 19:38:40-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # arch/ia64/pci/pci.c # 2004/11/03 19:38:36-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/02 19:38:19-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/atm/idt77252.c # 2004/11/02 19:38:14-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/11/01 22:00:31-08:00 akpm@bix.(none) # Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6 # into bix.(none):/usr/src/bk-pci # # drivers/pci/hotplug/shpchp_ctrl.c # 2004/11/01 22:00:27-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/net/tulip/de4x5.c # 2004/11/01 22:00:27-08:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/kernel/acpi/boot.c # 2004/11/01 22:00:27-08:00 akpm@bix.(none) +0 -0 # Auto merged # # Documentation/kernel-parameters.txt # 2004/11/01 22:00:27-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/30 22:57:45-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # Documentation/kernel-parameters.txt # 2004/10/30 22:57:40-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/29 15:50:12-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/video/i810/i810_main.c # 2004/10/29 15:50:09-07:00 akpm@bix.(none) +0 -0 # Auto merged # # Documentation/kernel-parameters.txt # 2004/10/29 15:50:09-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/28 14:14:27-07:00 akpm@bix.(none) # Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6 # into bix.(none):/usr/src/bk-pci # # drivers/net/tulip/de4x5.c # 2004/10/28 14:14:23-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/kernel/acpi/boot.c # 2004/10/28 14:14:23-07:00 akpm@bix.(none) +0 -0 # Auto merged # # Documentation/kernel-parameters.txt # 2004/10/28 14:14:23-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/28 12:12:39-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/video/riva/fbdev.c # 2004/10/28 12:12:34-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/25 19:11:20-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/video/riva/fbdev.c # 2004/10/25 19:11:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/video/i810/i810_main.c # 2004/10/25 19:11:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/video/i810/i810.h # 2004/10/25 19:11:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/quirks.c # 2004/10/25 19:11:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/22 23:09:11-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/usb/host/uhci-hcd.c # 2004/10/22 23:09:08-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/host/ehci-hcd.c # 2004/10/22 23:09:07-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/gadget/net2280.c # 2004/10/22 23:09:07-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/gadget/goku_udc.c # 2004/10/22 23:09:07-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/net/typhoon.c # 2004/10/22 23:09:07-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/message/fusion/mptbase.h # 2004/10/22 23:09:07-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/message/fusion/mptbase.c # 2004/10/22 23:09:07-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/21 14:16:09-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/char/epca.c # 2004/10/21 14:16:05-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/21 00:09:18-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/usb/host/uhci-hcd.c # 2004/10/21 00:09:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/nsp32.h # 2004/10/21 00:09:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/nsp32.c # 2004/10/21 00:09:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/megaraid/megaraid_mbox.c # 2004/10/21 00:09:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/net/typhoon.c # 2004/10/21 00:09:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/ipmi/ipmi_si_intf.c # 2004/10/21 00:09:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/ppc/kernel/pci.c # 2004/10/21 00:09:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/pci/i386.c # 2004/10/21 00:09:13-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/19 22:04:33-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/net/typhoon.c # 2004/10/19 22:04:29-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/19 17:09:45-07:00 akpm@bix.(none) # Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6 # into bix.(none):/usr/src/bk-pci # # drivers/video/riva/fbdev.c # 2004/10/19 17:09:42-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/video/i810/i810_main.c # 2004/10/19 17:09:42-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/video/i810/i810.h # 2004/10/19 17:09:42-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/host/uhci-hcd.c # 2004/10/19 17:09:42-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/host/ohci-pci.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/host/ehci-hcd.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/gadget/net2280.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/gadget/goku_udc.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/core/hcd.h # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/core/hcd-pci.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/nsp32.h # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/nsp32.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/megaraid/megaraid_mbox.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/eata.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pnp/system.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/quirks.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/probe.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/hotplug/shpchp_ctrl.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/parport/parport_pc.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/net/typhoon.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/message/fusion/mptbase.h # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/message/fusion/mptbase.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/ipmi/ipmi_si_intf.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/epca.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/agp/intel-agp.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/block/cpqarray.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/acpi/motherboard.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/sparc/kernel/pcic.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/ppc/kernel/pci.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/pci/i386.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/19 17:08:35-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/video/riva/fbdev.c # 2004/10/19 17:08:32-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/video/i810/i810_main.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/video/i810/i810.h # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/host/uhci-hcd.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/host/ohci-pci.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/host/ehci-hcd.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/gadget/net2280.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/gadget/goku_udc.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/core/hcd.h # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/core/hcd-pci.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/quirks.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/parport/parport_pc.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/net/typhoon.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/message/fusion/mptbase.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/ipmi/ipmi_si_intf.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/epca.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/agp/intel-agp.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/block/cpqarray.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/sparc/kernel/pcic.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/18 20:26:01-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/scsi/megaraid/megaraid_mbox.c # 2004/10/18 20:25:57-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/nsp32.h # 2004/10/18 20:25:56-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/nsp32.c # 2004/10/18 20:25:56-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/eata.c # 2004/10/18 20:25:56-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/message/fusion/mptbase.h # 2004/10/18 20:25:56-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/message/fusion/mptbase.c # 2004/10/18 20:25:56-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/agp/intel-agp.c # 2004/10/18 20:25:56-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/ppc/kernel/pci.c # 2004/10/18 20:25:56-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/15 22:33:45-07:00 akpm@bix.(none) # Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6 # into bix.(none):/usr/src/bk-pci # # ChangeSet # 2004/10/15 22:32:42-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/usb/host/ehci-hcd.c # 2004/10/15 22:32:39-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/gadget/net2280.c # 2004/10/15 22:32:39-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/probe.c # 2004/10/15 22:32:39-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/13 13:21:15-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/scsi/megaraid/megaraid_mbox.c # 2004/10/13 13:21:11-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/10 22:18:48-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/pnp/system.c # 2004/10/10 22:18:43-07:00 akpm@bix.(none) +0 -5 # Auto merged # # drivers/acpi/motherboard.c # 2004/10/10 22:18:43-07:00 akpm@bix.(none) +0 -5 # Auto merged # # arch/i386/pci/i386.c # 2004/10/10 22:18:43-07:00 akpm@bix.(none) +0 -8 # Auto merged # # ChangeSet # 2004/10/06 20:04:33-07:00 akpm@bix.(none) # Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6 # into bix.(none):/usr/src/bk-pci # # drivers/pci/hotplug/shpchp_ctrl.c # 2004/10/06 20:04:29-07:00 akpm@bix.(none) +0 -0 # Auto merged # diff -Nru a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c --- a/arch/i386/pci/mmconfig.c 2004-11-29 21:45:29 -08:00 +++ b/arch/i386/pci/mmconfig.c 2004-11-29 21:45:29 -08:00 @@ -102,6 +102,13 @@ if (!pci_mmcfg_base_addr) goto out; + /* Kludge for now. Don't use mmconfig on AMD systems because + those have some busses where mmconfig doesn't work, + and we don't parse ACPI MCFG well enough to handle that. + Remove when proper handling is added. */ + if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) + goto out; + printk(KERN_INFO "PCI: Using MMCONFIG\n"); raw_pci_ops = &pci_mmcfg; pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF; diff -Nru a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c --- a/arch/x86_64/pci/mmconfig.c 2004-11-29 21:45:29 -08:00 +++ b/arch/x86_64/pci/mmconfig.c 2004-11-29 21:45:29 -08:00 @@ -78,6 +78,13 @@ if (!pci_mmcfg_base_addr) return 0; + /* Kludge for now. Don't use mmconfig on AMD systems because + those have some busses where mmconfig doesn't work, + and we don't parse ACPI MCFG well enough to handle that. + Remove when proper handling is added. */ + if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) + return 0; + /* RED-PEN i386 doesn't do _nocache right now */ pci_mmcfg_virt = ioremap_nocache(pci_mmcfg_base_addr, MMCONFIG_APER_SIZE); if (!pci_mmcfg_virt) { diff -Nru a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c --- a/drivers/pci/hotplug/cpqphp_pci.c 2004-11-29 21:45:29 -08:00 +++ b/drivers/pci/hotplug/cpqphp_pci.c 2004-11-29 21:45:29 -08:00 @@ -194,7 +194,7 @@ static int PCI_ScanBusForNonBridge(struct controller *ctrl, u8 bus_num, u8 * dev_num) { - u8 tdevice; + u16 tdevice; u32 work; u8 tbus; diff -Nru a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c --- a/drivers/pci/hotplug/pciehp_hpc.c 2004-11-29 21:45:29 -08:00 +++ b/drivers/pci/hotplug/pciehp_hpc.c 2004-11-29 21:45:29 -08:00 @@ -1347,6 +1347,9 @@ info("HPC vendor_id %x device_id %x ss_vid %x ss_did %x\n", pdev->vendor, pdev->device, pdev->subsystem_vendor, pdev->subsystem_device); + if (pci_enable_device(pdev)) + goto abort_free_ctlr; + init_MUTEX(&ctrl->crit_sect); /* setup wait queue */ init_waitqueue_head(&ctrl->queue); diff -Nru a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c --- a/drivers/pci/hotplug/shpchp_hpc.c 2004-11-29 21:45:29 -08:00 +++ b/drivers/pci/hotplug/shpchp_hpc.c 2004-11-29 21:45:29 -08:00 @@ -1487,6 +1487,9 @@ info("HPC vendor_id %x device_id %x ss_vid %x ss_did %x\n", pdev->vendor, pdev->device, pdev->subsystem_vendor, pdev->subsystem_device); + + if (pci_enable_device(pdev)) + goto abort_free_ctlr; if (!request_mem_region(pci_resource_start(pdev, 0) + shpc_base_offset, pci_resource_len(pdev, 0), MY_NAME)) { err("%s: cannot reserve MMIO region\n", __FUNCTION__); diff -Nru a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c --- a/drivers/pci/pci-sysfs.c 2004-11-29 21:45:29 -08:00 +++ b/drivers/pci/pci-sysfs.c 2004-11-29 21:45:29 -08:00 @@ -19,6 +19,7 @@ #include #include #include +#include #include "pci.h" @@ -42,6 +43,15 @@ pci_config_attr(class, "0x%06x\n"); pci_config_attr(irq, "%u\n"); +static ssize_t local_cpus_show(struct device *dev, char *buf) +{ + struct pci_dev *pdev = to_pci_dev(dev); + cpumask_t mask = pcibus_to_cpumask(pdev->bus->number); + int len = cpumask_scnprintf(buf, PAGE_SIZE-2, mask); + strcat(buf,"\n"); + return 1+len; +} + /* show resources */ static ssize_t resource_show(struct device * dev, char * buf) @@ -71,6 +81,7 @@ __ATTR_RO(subsystem_device), __ATTR_RO(class), __ATTR_RO(irq), + __ATTR_RO(local_cpus), __ATTR_NULL, };