From: Andrew Morton "good to have in -mm" or no, it broke my test box nicely. Bootdata ok (command line is root=/dev/sda3 profile=1 ro rhgb netconsole=4444@192.168.2.15/eth0,5141@192.168.2.33/00:0D:56:C6:C6:CC) Linux version 2.6.17-rc5 (akpm@box) (gcc version 4.0.2) #12 SMP PREEMPT Sat Jun 3 19:51:53 PDT 2006 BIOS-provided physical RAM map: BIOS-e820: 0000000000000000 - 000000000009fc00 (usable) BIOS-e820: 000000000009fc00 - 00000000000a0000 (reserved) BIOS-e820: 00000000000ebbd0 - 0000000000100000 (reserved) BIOS-e820: 0000000000100000 - 000000007ffd0000 (usable) BIOS-e820: 000000007ffd0000 - 000000007ffdf000 (ACPI data) BIOS-e820: 000000007ffdf000 - 0000000080000000 (ACPI NVS) BIOS-e820: 00000000e0000000 - 00000000f0000000 (reserved) BIOS-e820: 00000000ffc00000 - 0000000100000000 (reserved) BIOS-e820: 0000000100000000 - 0000000180000000 (usable) DMI not present or invalid. ACPI: PM-Timer IO Port: 0x408 ACPI: LAPIC (acpi_id[0x01] lapic_id[0x00] enabled) Processor #0 15:3 APIC version 20 ACPI: LAPIC (acpi_id[0x02] lapic_id[0x06] enabled) Processor #6 15:3 APIC version 20 ACPI: LAPIC (acpi_id[0x03] lapic_id[0x01] enabled) Processor #1 15:3 APIC version 20 ACPI: LAPIC (acpi_id[0x04] lapic_id[0x07] enabled) Processor #7 15:3 APIC version 20 ACPI: IOAPIC (id[0x08] address[0xfec00000] gsi_base[0]) IOAPIC[0]: apic_id 8, version 32, address 0xfec00000, GSI 0-23 ACPI: IOAPIC (id[0x09] address[0xfec81000] gsi_base[24]) IOAPIC[1]: apic_id 9, version 32, address 0xfec81000, GSI 24-47 ACPI: IOAPIC (id[0x0a] address[0xfec81400] gsi_base[48]) IOAPIC[2]: apic_id 10, version 32, address 0xfec81400, GSI 48-71 ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl) ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 high level) Setting APIC routing to flat ACPI: HPET id: 0x8086a202 base: 0xfed00000 Using ACPI (MADT) for SMP configuration information Allocating PCI resources starting at 88000000 (gap: 80000000:60000000) Checking aperture... Built 1 zonelists Kernel command line: root=/dev/sda3 profile=1 ro rhgb netconsole=4444@192.168.2.15/eth0,5141@192.168.2.33/00:0D:56:C6:C6:CC kernel profiling enabled (shift: 1) netconsole: local port 4444 netconsole: local IP 192.168.2.15 netconsole: interface eth0 netconsole: remote port 5141 netconsole: remote IP 192.168.2.33 netconsole: remote ethernet address 00:0d:56:c6:c6:cc Initializing CPU#0 PID hash table entries: 4096 (order: 12, 32768 bytes) time.c: Using 14.318180 MHz WALL HPET GTOD HPET/TSC timer. time.c: Detected 3400.244 MHz processor. Console: colour VGA+ 80x25 Dentry cache hash table entries: 524288 (order: 10, 4194304 bytes) Inode-cache hash table entries: 262144 (order: 9, 2097152 bytes) PCI-DMA: Using software bounce buffering for IO (SWIOTLB) Placing software IO TLB between 0x7bfd000 - 0xbbfd000 Memory: 4010356k/6291456k available (2859k kernel code, 183164k reserved, 1897k data, 204k init) Calibrating delay using timer specific routine.. 6806.29 BogoMIPS (lpj=13612590) Mount-cache hash table entries: 256 CPU: Trace cache: 12K uops, L1 D cache: 16K CPU: L2 cache: 1024K using mwait in idle threads. CPU: Physical Processor ID: 0 CPU0: Thermal monitoring enabled (TM1) tbxface-0107 [01] load_tables : ACPI Tables successfully acquired Parsing all Control Methods: Table [DSDT](id 0005) - 461 Objects with 50 Devices 130 Methods 11 Regions ACPI Namespace successfully loaded at root ffffffff8070aa20 evxfevnt-0089 [02] enable : Transition to ACPI mode successful Using local APIC timer interrupts. result 12500780 Detected 12.500 MHz APIC timer. Booting processor 1/4 APIC 0x6 Initializing CPU#1 Calibrating delay using timer specific routine.. 6800.73 BogoMIPS (lpj=13601460) CPU: Trace cache: 12K uops, L1 D cache: 16K CPU: L2 cache: 1024K CPU: Physical Processor ID: 3 CPU1: Thermal monitoring enabled (TM1) Intel(R) Xeon(TM) CPU 3.40GHz stepping 04 Booting processor 2/4 APIC 0x1 Initializing CPU#2 Calibrating delay using timer specific routine.. 6800.50 BogoMIPS (lpj=13601011) CPU: Trace cache: 12K uops, L1 D cache: 16K CPU: L2 cache: 1024K CPU: Physical Processor ID: 0 CPU2: Thermal monitoring enabled (TM1) Intel(R) Xeon(TM) CPU 3.40GHz stepping 04 Booting processor 3/4 APIC 0x7 Initializing CPU#3 Calibrating delay using timer specific routine.. 6800.15 BogoMIPS (lpj=13600306) CPU: Trace cache: 12K uops, L1 D cache: 16K CPU: L2 cache: 1024K CPU: Physical Processor ID: 3 CPU3: Thermal monitoring enabled (TM1) Intel(R) Xeon(TM) CPU 3.40GHz stepping 04 Brought up 4 CPUs testing NMI watchdog ... OK. migration_cost=9,921 NET: Registered protocol family 16 ACPI: bus type pci registered PCI: Using MMCONFIG at e0000000 ACPI: Subsystem revision 20060310 evgpeblk-0951 [04] ev_create_gpe_block : GPE 00 to 1F [_GPE] 4 regs on int 0x9 evgpeblk-1048 [03] ev_initialize_gpe_bloc: Found 8 Wake, Enabled 0 Runtime GPEs in this block Completing Region/Field/Buffer/Package initialization:.............................................................................................. Initialized 10/11 Regions 26/26 Fields 36/36 Buffers 22/23 Packages (470 nodes) Executing all Device _STA and_INI methods:........................................................ 56 Devices found - executed 0 _STA, 0 _INI methods ACPI: Interpreter enabled ACPI: Using IOAPIC for interrupt routing ACPI: PCI Root Bridge [PCI0] (0000:00) Turning off bus mastering on 0000:00:00.0 Turning off bus mastering on 0000:00:1d.0 Turning off bus mastering on 0000:00:1d.1 Turning off bus mastering on 0000:00:1d.2 Turning off bus mastering on 0000:00:1d.7 Turning off bus mastering on 0000:00:1f.0 PCI quirk: region 0400-047f claimed by ICH4 ACPI/GPIO/TCO PCI quirk: region 0500-053f claimed by ICH4 GPIO Turning off bus mastering on 0000:00:1f.2 PCI: Ignoring BAR0-3 of IDE controller 0000:00:1f.2 Turning off bus mastering on 0000:00:1f.5 PCI: PXH quirk detected, disabling MSI for SHPC device Turning off bus mastering on 0000:02:00.1 PCI: PXH quirk detected, disabling MSI for SHPC device Turning off bus mastering on 0000:02:00.3 Turning off bus mastering on 0000:04:03.0 Turning off bus mastering on 0000:04:03.1 Turning off bus mastering on 0000:05:00.0 Turning off bus mastering on 0000:01:02.0 PCI: Transparent bridge - 0000:00:1e.0 ACPI: PCI Interrupt Link [LNKA] (IRQs 3 4 5 6 7 10 *11 12 14 15) ACPI: PCI Interrupt Link [LNKB] (IRQs 3 4 *5 6 7 10 11 12 14 15) ACPI: PCI Interrupt Link [LNKC] (IRQs 3 4 5 6 7 *10 11 12 14 15) ACPI: PCI Interrupt Link [LNKD] (IRQs 3 4 5 6 7 *10 11 12 14 15) ACPI: PCI Interrupt Link [LNKE] (IRQs 3 4 5 6 7 10 11 12 14 15) *0, disabled. ACPI: PCI Interrupt Link [LNKF] (IRQs 3 4 5 6 7 10 11 12 14 15) *0, disabled. ACPI: PCI Interrupt Link [LNKG] (IRQs 3 4 5 6 7 10 11 12 14 15) *0, disabled. ACPI: PCI Interrupt Link [LNKH] (IRQs 3 4 5 6 *7 10 11 12 14 15) SCSI subsystem initialized usbcore: registered new driver usbfs usbcore: registered new driver hub PCI: Using ACPI for IRQ routing PCI: If a device doesn't work, try "pci=routeirq". If it helps, post a report hpet0: at MMIO 0xfed00000 (virtual 0xffffffffff5fe000), IRQs 2, 8, 0 hpet0: 3 64-bit timers, 14318180 Hz PCI: Bridge: 0000:02:00.0 IO window: d000-dfff MEM window: fa400000-fa6fffff PREFETCH window: bfe00000-bfefffff PCI: Bridge: 0000:02:00.2 IO window: disabled. MEM window: disabled. PREFETCH window: disabled. PCI: Bridge: 0000:00:03.0 IO window: d000-dfff MEM window: fa400000-fa8fffff PREFETCH window: bfe00000-bfefffff PCI: Bridge: 0000:00:04.0 IO window: disabled. MEM window: fa900000-feafffff PREFETCH window: bff00000-dfefffff PCI: Bridge: 0000:00:1e.0 IO window: c000-cfff MEM window: fa300000-fa3fffff PREFETCH window: 88000000-880fffff ACPI (acpi_bus-0191): Device is not power manageable [20060310] GSI 16 sharing vector 0xA9 and IRQ 16 ACPI: PCI Interrupt 0000:00:03.0[A] -> GSI 16 (level, low) -> IRQ 16 ACPI (acpi_bus-0191): Device is not power manageable [20060310] ACPI (acpi_bus-0191): Device is not power manageable [20060310] ACPI (acpi_bus-0191): Device is not power manageable [20060310] ACPI: PCI Interrupt 0000:00:04.0[A] -> GSI 16 (level, low) -> IRQ 16 NET: Registered protocol family 2 IP route cache hash table entries: 131072 (order: 8, 1048576 bytes) TCP established hash table entries: 131072 (order: 10, 4194304 bytes) TCP bind hash table entries: 65536 (order: 9, 2097152 bytes) TCP: Hash tables configured (established 131072 bind 65536) TCP reno registered IA32 emulation $Id: sys_ia32.c,v 1.32 2002/03/24 13:02:28 ak Exp $ Installing knfsd (copyright (C) 1996 okir@monad.swb.de). io scheduler noop registered io scheduler anticipatory registered (default) io scheduler deadline registered io scheduler cfq registered Intel E7520/7320/7525 detected.<6>ACPI: Power Button (FF) [PWRF] ACPI: Power Button (CM) [PWRB] Real Time Clock Driver v1.12ac ACPI Error (utglobal-0125): Unknown exception code: 0xFFFFFFF0 [20060310] hw_random hardware driver 1.0.0 loaded Linux agpgart interface v0.101 (c) Dave Jones Hangcheck: starting hangcheck timer 0.9.0 (tick is 180 seconds, margin is 60 seconds). Hangcheck: Using monotonic_clock(). Serial: 8250/16550 driver $Revision: 1.90 $ 4 ports, IRQ sharing disabled serial8250: ttyS0 at I/O 0x3f8 (irq = 4) is a 16550A serial8250: ttyS1 at I/O 0x2f8 (irq = 3) is a 16550A Floppy drive(s): fd0 is 1.44M FDC 0 is a National Semiconductor PC87306 loop: loaded (max 8 devices) Intel(R) PRO/1000 Network Driver - version 7.0.38-k4 Copyright (c) 1999-2006 Intel Corporation. GSI 17 sharing vector 0xB1 and IRQ 17 ACPI: PCI Interrupt 0000:01:02.0[A] -> GSI 17 (level, low) -> IRQ 17 e1000: 0000:01:02.0: e1000_probe: (PCI:33MHz:32-bit) 00:0e:0c:2f:2c:c1 e1000: eth0: e1000_probe: Intel(R) PRO/1000 Network Connection forcedeth.c: Reverse Engineered nForce ethernet driver. Version 0.56. netconsole: device eth0 not up yet, forcing it e1000: eth0: e1000_watchdog_task: NIC Link is Up 100 Mbps Full Duplex netconsole: network logging started GSI 18 sharing vector 0xB9 and IRQ 18 ACPI: PCI Interrupt 0000:04:03.0[A] -> GSI 30 (level, low) -> IRQ 18 scsi0 : Adaptec AIC79XX PCI-X SCSI HBA DRIVER, Rev 3.0 aic7902: Ultra320 Wide Channel A, SCSI Id=7, PCI-X 67-100Mhz, 512 SCBs 0:0:0:0: Attempting to queue an ABORT message:CDB: 0x12 0x0 0x0 0x0 0x24 0x0 0:0:0:0: Command already completed 0:0:0:0: Attempting to queue an ABORT message:CDB: 0x0 0x0 0x0 0x0 0x0 0x0 0:0:0:0: Command already completed 0:0:0:0: Attempting to queue a TARGET RESET message:CDB: 0x12 0x0 0x0 0x0 0x24 0x0 scsi0: Device reset code sleeping scsi0: Device reset timer expired (active 1) scsi0: Device reset returning 0x2003 Recovery SCB completes 00:00.0 Host bridge: Intel Corp. E7525 Memory Controller Hub (rev 08) 00:00.1 Class ff00: Intel Corp. E7525/E7520 Error Reporting Registers (rev 08) 00:03.0 PCI bridge: Intel Corp. E7525/E7520/E7320 PCI Express Port A1 (rev 08) 00:04.0 PCI bridge: Intel Corp. E7525/E7520 PCI Express Port B (rev 08) 00:08.0 System peripheral: Intel Corp. E7525/E7520/E7320 Extended Configuration Registers (rev 08) 00:1d.0 USB Controller: Intel Corp. 82801EB/ER (ICH5/ICH5R) USB UHCI Controller #1 (rev 02) 00:1d.1 USB Controller: Intel Corp. 82801EB/ER (ICH5/ICH5R) USB UHCI Controller #2 (rev 02) 00:1d.2 USB Controller: Intel Corp. 82801EB/ER (ICH5/ICH5R) USB UHCI #3 (rev 02) 00:1d.7 USB Controller: Intel Corp. 82801EB/ER (ICH5/ICH5R) USB2 EHCI Controller (rev 02) 00:1e.0 PCI bridge: Intel Corp. 82801 PCI Bridge (rev c2) 00:1f.0 ISA bridge: Intel Corp. 82801EB/ER (ICH5/ICH5R) LPC Interface Bridge (rev 02) 00:1f.2 IDE interface: Intel Corp. 82801EB (ICH5) SATA Controller (rev 02) 00:1f.3 SMBus: Intel Corp. 82801EB/ER (ICH5/ICH5R) SMBus Controller (rev 02) 00:1f.5 Multimedia audio controller: Intel Corp. 82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller (rev 02) 01:02.0 Ethernet controller: Intel Corp. 82541GI/PI Gigabit Ethernet Controller 02:00.0 PCI bridge: Intel Corp.: Unknown device 0320 (rev 08) 02:00.1 PIC: Intel Corp. 6700/6702PXH I/OxAPIC Interrupt Controller A (rev 08) 02:00.2 PCI bridge: Intel Corp.: Unknown device 0321 (rev 08) 02:00.3 PIC: Intel Corp. 6700PXH I/OxAPIC Interrupt Controller B (rev 08) 04:03.0 SCSI storage controller: Adaptec AIC-7902 U320 (rev 03) 04:03.1 SCSI storage controller: Adaptec AIC-7902 U320 (rev 03) 05:00.0 VGA compatible controller: nVidia Corporation NV37GL [Quadro FX 330] (rev a2) Cc: Greg KH Cc: Ingo Molnar Cc: Linus Torvalds Signed-off-by: Andrew Morton --- drivers/pci/probe.c | 7 ------- 1 file changed, 7 deletions(-) diff -puN drivers/pci/probe.c~revert-gregkh-pci-pci-test-that-drivers-properly-call-pci_set_master drivers/pci/probe.c --- devel/drivers/pci/probe.c~revert-gregkh-pci-pci-test-that-drivers-properly-call-pci_set_master 2006-06-03 19:58:27.000000000 -0700 +++ devel-akpm/drivers/pci/probe.c 2006-06-03 19:58:27.000000000 -0700 @@ -639,7 +639,6 @@ static void pci_read_irq(struct pci_dev */ static int pci_setup_device(struct pci_dev * dev) { - u16 cmd; u32 class; sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus), @@ -665,12 +664,6 @@ static int pci_setup_device(struct pci_d if (class == PCI_CLASS_BRIDGE_PCI) goto bad; pci_read_irq(dev); - pci_read_config_word(dev, PCI_COMMAND, &cmd); - if (cmd & PCI_COMMAND_MASTER) { - printk("Turning off bus mastering on %s\n", pci_name(dev)); - cmd &= ~PCI_COMMAND_MASTER; - pci_write_config_word(dev, PCI_COMMAND, cmd); - } pci_read_bases(dev, 6, PCI_ROM_ADDRESS); pci_read_config_word(dev, PCI_SUBSYSTEM_VENDOR_ID, &dev->subsystem_vendor); pci_read_config_word(dev, PCI_SUBSYSTEM_ID, &dev->subsystem_device); _