linux.git/drivers/pci, branch v2.6.26-rc7

PCI: fixup write combine comment in pci_mmap_resource

2008-06-12T20:51:46+00:00

Now that we can actually do write combining properly, there's no need to have
the FIXME.

Signed-off-by: Jesse Barnes

Merge branch 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip into for-linus

2008-06-12T20:51:05+00:00

x86: PAT export resource_wc in pci sysfs

2008-06-12T08:12:42+00:00

For the ranges with IORESOURCE_PREFETCH, export a new resource_wc interface in
pci /sysfs along with resource (which is uncached).

Signed-off-by: Venkatesh Pallipadi 
Signed-off-by: Suresh Siddha 
Acked-by: Jesse Barnes 
Signed-off-by: Ingo Molnar 
Signed-off-by: Thomas Gleixner

PCI: fix rpadlpar pci hotplug driver sysfs usage

2008-05-30T16:50:46+00:00

When Greg "fixed" the sysfs usage of that driver a while back, he seem
to have introduced a bug where the quotes are added around the name of
our specific sysfs files, thus breaking the user space tool.

This fixes it. Tested DLPAR operations on a POWER6 machine successfully.

Signed-off-by: Benjamin Herrenschmidt 
Signed-off-by: Jesse Barnes

pciehp: add message about pciehp_slot_with_bus option

2008-05-27T22:43:47+00:00

Some (broken?) platform assign the same slot name to multiple hotplug
slots. On such system, slot initialization would fail because of name
collision. The pciehp driver already have a "slot_with_bus" module
option which adds the bus number into the slot name. This patch adds
the message about this module option that will be displayed when slot
name collision is detected.

Signed-off-by: Kenji Kaneshige 
Signed-off-by: Kristen Carlson Accardi 
Signed-off-by: Jesse Barnes

pci hotplug core: add check of duplicate slot name

2008-05-27T22:43:40+00:00

Fix the following errors reported by Jan C. Nordholz in
http://bugzilla.kernel.org/show_bug.cgi?id=10751.

kobject_add_internal failed for 2 with -EEXIST, don't try to register things with the same name in the same directory.
Pid: 1, comm: swapper Tainted: G        W 2.6.26-rc3 #1
 [] kobject_add_internal+0x140/0x190
 [] kobject_init_and_add+0x2d/0x40
 [] pci_hp_register+0x81/0x2f0
 [] pciehp_probe+0x1a7/0x470
 [] sysfs_add_one+0x44/0xa0
 [] sysfs_addrm_start+0x3f/0xb0
 [] sysfs_create_link+0x8a/0xf0
 [] pcie_port_probe_service+0x50/0x80
 [] driver_sysfs_add+0x55/0x70
 [] driver_probe_device+0x82/0x180
 [] __driver_attach+0x6c/0x70
 [] bus_for_each_dev+0x3a/0x60
 [] pcied_init+0x0/0x80
 [] driver_attach+0x16/0x20
 [] __driver_attach+0x0/0x70
 [] bus_add_driver+0x1a1/0x220
 [] pcied_init+0x0/0x80
 [] driver_register+0x4d/0x120
 [] ibm_acpiphp_init+0x0/0x190
 [] printk+0x1b/0x20
 [] pcied_init+0x0/0x80
 [] pcied_init+0xe/0x80
 [] kernel_init+0x10a/0x300
 [] schedule_tail+0x18/0x50
 [] ret_from_fork+0x6/0x1c
 [] kernel_init+0x0/0x300
 [] kernel_init+0x0/0x300
 [] kernel_thread_helper+0x7/0x1c
 =======================
pci_hotplug: Unable to register kobject '2'<3>pciehp: pci_hp_register failed with error -22

Slot with the same name can be registered multiple times if shpchp or
pciehp driver is loaded after acpiphp is loaded because ACPI based
hotplug driver and Native OS hotplug driver trying to handle the same
physical slot. In this case, current pci_hotplug core will call
kobject_init_and_add() muliple time with the same name. This is the
cause of this problem. To fix this problem, this patch adds the check
into pci_hp_register() to see if the slot with the same name.

Signed-off-by: Kenji Kaneshige 
Signed-off-by: Kristen Carlson Accardi 
Signed-off-by: Jesse Barnes

pciehp: move msleep after power off

2008-05-27T22:43:33+00:00

According to the PCI Express specification, we must wait for at least
1 second after turning power off before taking any action that relies
on power having been removed from the slot/adapter. For this, current
pciehp wait for 1 second after issuing the power off command in
hpc_power_off_slot() function. But waiting for 1 second in
hpc_power_off_slot() can make pciehp probing slow-down because pciehp
probe code calls hpc_power_off_slot() if the slot is not occupied just
in case. We don't need to wait for 1 second at the pciehp probe time
because there is no action on that empty slot. So move 1 second wait
from hpc_power_off_slot() to the caller of hpc_power_off_slot().

Signed-off-by: Kenji Kaneshige 
Signed-off-by: Kristen Carlson Accardi 
Signed-off-by: Jesse Barnes

pciehp: poll cmd completion if hotplug interrupt is disabled

2008-05-27T22:43:25+00:00

Fix improper long wait for command completion in pciehp probing.

As described in PCI Express specification, software notification is
not generated if the command that occurs as a result of a write to the
Slot Control register that disables software notification of command
completed events. Since pciehp driver doesn't take it into account,
such command is issued in pciehp probing, and it causes improper long
wait for command completion.

This patch changes the pciehp driver to take such command into
account.

Signed-off-by: Kenji Kaneshige 
Signed-off-by: Kristen Carlson Accardi 
Signed-off-by: Jesse Barnes

pciehp: fix slow probing

2008-05-27T22:43:16+00:00

Fix the "pciehp probing slow" problem reported from Jan C. Nordholz in
http://bugzilla.kernel.org/show_bug.cgi?id=10751.

The command completed bit in Slot Status register applies only to
commands issued to control the attention indicator, power indicator,
power controller, or electromechanical interlock. However, writes to
other parts of the Slot Control register would end up writing to the
control fields. Hence, any write to Slot Control register is
considered as a command. However, if the controller doesn't support
any of attention indicator, power indicator, power controller and
electromechanical interlock, command completed bit would not set in
writing to Slot Control register. In this case, we should not wait for
command completed bit set, otherwise all commands would be considered
not completed in timeout seconds (1 sec.).

The cause of the problem is pciehp driver didn't take this situation
into account. This patch changes pciehp to take it into account. This
patch also add the check for "No Command Completed Support" bit in
Slot Capability register. If it is set, we should not wait for command
completed bit set as well.

This problem seems to be revealed by the commit
c27fb883dffe11aa4cb35ecea1fa1832ba45d4da that fixed the bug that
pciehp did not wait for command completed properly (pciehp just
ignored the command completion event).

Signed-off-by: Kenji Kaneshige 
Signed-off-by: Kristen Carlson Accardi 
Signed-off-by: Jesse Barnes

pciehp: fix NULL dereference in interrupt handler

2008-05-27T22:43:08+00:00

Fix the following NULL dereference problem reported from Pierre Ossman
and Ingo Molnar.

pciehp: HPC vendor_id 8086 device_id 27d0 ss_vid 0 ss_did 0
pciehp: pciehp_find_slot: slot (device=0x0) not found
BUG: unable to handle kernel NULL pointer dereference at 0000000000000070
IP: [] pciehp_handle_presence_change+0x7e/0x113
PGD 0
Oops: 0000 [1]
CPU 0
Modules linked in:
Pid: 1, comm: swapper Tainted: G        W 2.6.26-rc3-sched-devel.git-00001-g2b99b26-dirty #170
RIP: 0010:[]  [] pciehp_handle_presence_change+0x7e/0x113
RSP: 0000:ffff81003f83fbb0  EFLAGS: 00010046
RAX: 0000000000000039 RBX: 0000000000000000 RCX: 0000000000000000
RDX: 0000000000000000 RSI: 0000000000000001 RDI: 0000000000000046
RBP: ffff81003f83fbd0 R08: 0000000000000001 R09: ffffffff80245103
R10: 0000000000000020 R11: 0000000000000000 R12: ffff81003ea53a30
R13: 0000000000000000 R14: 0000000000000011 R15: ffffffff80495926
FS:  0000000000000000(0000) GS:ffffffff80be7400(0000) knlGS:0000000000000000
CS:  0010 DS: 0018 ES: 0018 CR0: 000000008005003b
CR2: 0000000000000070 CR3: 0000000000201000 CR4: 00000000000006a0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process swapper (pid: 1, threadinfo ffff81003f83e000, task ffff81003f840000)
Stack:  0000000000000008 ffff81003f83fbf6 ffff81003ea53a30 0000000000000008
 ffff81003f83fc10 ffffffff80495ab4 0000000000000011 0000000000000002
 0000000000000202 0000000000000202 00000000fffffff4 ffff81003ea53a30
Call Trace:
 [] pcie_isr+0x18e/0x1bc
 [] request_irq+0x106/0x12f
 [] pcie_init+0x15e/0x6cc
 [] pciehp_probe+0x64/0x541
 [] pcie_port_probe_service+0x4c/0x76
 [] driver_probe_device+0xd4/0x1f0
 [] __driver_attach+0x7c/0x7e
 [] ? __driver_attach+0x0/0x7e
 [] bus_for_each_dev+0x53/0x7d
 [] driver_attach+0x1c/0x1e
 [] bus_add_driver+0xdd/0x25b
 [] ? pcied_init+0x0/0x8b
 [] driver_register+0x5f/0x13e
 [] ? pcied_init+0x0/0x8b
 [] pcie_port_service_register+0x47/0x49
 [] pcied_init+0x15/0x8b
 [] kernel_init+0x75/0x243
 [] ? _spin_unlock_irq+0x2b/0x3a
 [] ? finish_task_switch+0x57/0x9a
 [] child_rip+0xa/0x12
 [] ? restore_args+0x0/0x30
 [] ? kernel_init+0x0/0x243
 [] ? child_rip+0x0/0x12

Code: 83 80 00 00 00 48 39 f0 75 e1 0f b6 c9 48 c7 c2 00 0e 8d 80 48 c7 c6 8a 60 a6 80 48 c7 c7 10 db a8 80 31 c0 e8 3f 8d d9 ff 31 db <48> 8b 43 70 48 8d 75 ef 48 89 df ff 50 30 80 7d ef 00 74 37 48
RIP  [] pciehp_handle_presence_change+0x7e/0x113
 RSP 
CR2: 0000000000000070
Kernel panic - not syncing: Fatal exception

The situation under which it occurs is hw and timing related: it appears
to happen on a system that has PCI hotplug hardware but with no active
hotplug cards, and another interrupt in the same (shared) IRQ line
arrives too early, before the hotplug-slot entry has been set up - as
triggered by CONFIG_DEBUG_SHIRQ=y:

This patch contains the following two fixes.

(1) Clear all events bits in Slot Status register to prevent the pciehp
    driver from detecting the spurious events that would have been occur
    before pciehp loading.

(2) Add check whether slot initialization had been already done.

This is short term fix. We need more structural fixes to install
interrupt handler after slot initialization is done.

Signed-off-by: Ingo Molnar 
Signed-off-by: Kenji Kaneshige 
Signed-off-by: Kristen Carlson Accardi 
Signed-off-by: Jesse Barnes