Skip to contentSkip to conversation

pci: x86-32/64 switch to pci_get API

PATCH In review Alan Cox 3 participants 10 messages Oct 16, 2006

lore
Share & tools
lore

Alan Cox

author
#0 lore raw

PATCH 1/1 pci: x86-32/64 switch to pci_get API

Use pci_get_bus_and_slot to find the router (and lock it for the kernel lifetime), also use pci_get_device_reverse() to walk the list finding calgary IOMMUs

arch/i386/pci/irq.c +3 -1
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.19-rc1-mm1/arch/i386/pci/irq.c linux-2.6.19-rc1-mm1/arch/i386/pci/irq.c
@@ -758,7 +758,7 @@
 	DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n",
 	    rt->rtr_vendor, rt->rtr_device);
 
-	pirq_router_dev = pci_find_slot(rt->rtr_bus, rt->rtr_devfn);
+	pirq_router_dev = pci_get_bus_and_slot(rt->rtr_bus, rt->rtr_devfn);
 	if (!pirq_router_dev) {
 		DBG(KERN_DEBUG "PCI: Interrupt router not found at "
 			"%02x:%02x\n", rt->rtr_bus, rt->rtr_devfn);
@@ -778,6 +778,8 @@
 		pirq_router_dev->vendor,
 		pirq_router_dev->device,
 		pci_name(pirq_router_dev));
+		
+	/* The device remains referenced for the kernel lifetime */
 }
 
 static struct irq_info *pirq_get_info(struct pci_dev *dev)
arch/x86_64/kernel/pci-calgary.c +1 -1
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.19-rc1-mm1/arch/x86_64/kernel/pci-calgary.c linux-2.6.19-rc1-mm1/arch/x86_64/kernel/pci-calgary.c
@@ -879,7 +879,7 @@
 
 error:
 	do {
-		dev = pci_find_device_reverse(PCI_VENDOR_ID_IBM,
+		dev = pci_get_device_reverse(PCI_VENDOR_ID_IBM,
 					      PCI_DEVICE_ID_IBM_CALGARY,
 					      dev);
 		if (!dev)
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · Alan Cox

Use pci_get_bus_and_slot to find the router (and lock it for the kernel lifetime), also use pci_get_device_reverse() to walk the list finding calgary IOMMUs

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.19-rc1-mm1/arch/x86_64/kernel/pci-calgary.c linux-2.6.19-rc1-mm1/arch/x86_64/kernel/pci-calgary.c

arch/x86_64/kernel/pci-calgary.c line 885

Quoted 8 lines
arch/x86_64/kernel/pci-calgary.c +1 -1
@@ -879,7 +879,7 @@
 
 error:
 	do {
-		dev = pci_find_device_reverse(PCI_VENDOR_ID_IBM,
+		dev = pci_get_device_reverse(PCI_VENDOR_ID_IBM,
 					      PCI_DEVICE_ID_IBM_CALGARY,
 					      dev);
 		if (!dev)

Looks good, this part is

Cheers,
Muli

#2 lore raw
In reply to Alan Cox

arch/x86_64/kernel/pci-calgary.c line 884

Quoted 10 lines
arch/x86_64/kernel/pci-calgary.c +1 -1
@@ -879,7 +879,7 @@
 
 error:
 	do {
-		dev = pci_find_device_reverse(PCI_VENDOR_ID_IBM,
+		dev = pci_get_device_reverse(PCI_VENDOR_ID_IBM,
 					      PCI_DEVICE_ID_IBM_CALGARY,
 					      dev);

No put call anywhere?

-Andi

author
#3 lore raw

Ar Llu, 2006-10-16 am 18:07 +0200, ysgrifennodd Andi Kleen:

Quoted 4 lines
Quoted 4 lines
arch/x86_64/kernel/pci-calgary.c +0 -0
@@ -879,7 +879,7 @@
 
Quoted 8 lines

arch/x86_64/kernel/pci-calgary.c line 884

Quoted 6 lines
arch/x86_64/kernel/pci-calgary.c +1 -1
 error:
 	do {
-		dev = pci_find_device_reverse(PCI_VENDOR_ID_IBM,
+		dev = pci_get_device_reverse(PCI_VENDOR_ID_IBM,
 					      PCI_DEVICE_ID_IBM_CALGARY,
 					      dev);

No put call anywhere?

You can't hot unplug your MMU

#4 lore raw
Quoted 14 lines · Alan Cox

Ar Llu, 2006-10-16 am 18:07 +0200, ysgrifennodd Andi Kleen:

Quoted 4 lines
Quoted 4 lines
arch/x86_64/kernel/pci-calgary.c +0 -0
@@ -879,7 +879,7 @@
 
Quoted 8 lines

arch/x86_64/kernel/pci-calgary.c line 884

Quoted 6 lines
arch/x86_64/kernel/pci-calgary.c +1 -1
 error:
 	do {
-		dev = pci_find_device_reverse(PCI_VENDOR_ID_IBM,
+		dev = pci_get_device_reverse(PCI_VENDOR_ID_IBM,
 					      PCI_DEVICE_ID_IBM_CALGARY,
 					      dev);

No put call anywhere?

Quoted 1 line

You can't hot unplug your MMU

Not sure about that. Calgary is afaik in the bridges and since Summit has pluggable PCI cages and nodes i would assume the MMU instances are also hot pluggables.

-Andi

author
#5 lore raw

Ar Llu, 2006-10-16 am 18:24 +0200, ysgrifennodd Andi Kleen:

Quoted 5 lines
Quoted 1 line

You can't hot unplug your MMU

Not sure about that. Calgary is afaik in the bridges and since Summit has pluggable PCI cages and nodes i would assume the MMU instances are also hot pluggables.

If so Linux doesn't currently support that and the patch keeps things as they are except for using hotplug safe APIs (and since I want to exterminate pci_find_device* shortly thats preferable)

Alan

#6 lore raw
Quoted 11 lines · Alan Cox

Ar Llu, 2006-10-16 am 18:24 +0200, ysgrifennodd Andi Kleen:

Quoted 5 lines
Quoted 1 line

You can't hot unplug your MMU

Not sure about that. Calgary is afaik in the bridges and since Summit has pluggable PCI cages and nodes i would assume the MMU instances are also hot pluggables.

If so Linux doesn't currently support that and the patch keeps things as they are except for using hotplug safe APIs (and since I want to exterminate pci_find_device* shortly thats preferable)

Ok i applied the patch to -rc2, but it results in

arch/x86_64/pci/built-in.o: In function `pcibios_irq_init':
irq.c:(.init.text+0xc7e): undefined reference to `pci_get_bus_and_slot'

That function is also nowhere to be found:

% gid pci_get_bus_and_slot
%

So dropped again.

-Andi

author
#7 lore raw

Ar Llu, 2006-10-16 am 21:01 +0200, ysgrifennodd Andi Kleen:

Quoted 6 lines

Ok i applied the patch to -rc2, but it results in

arch/x86_64/pci/built-in.o: In function `pcibios_irq_init':
irq.c:(.init.text+0xc7e): undefined reference to `pci_get_bus_and_slot'

That function is also nowhere to be found:

I was just cc'ing you on a set of patches for -mm which included this one and the other neccessary PCI changes. Sorry for any confusion.

#8 lore raw
In reply to Andi Kleen
Quoted 18 lines · Andi Kleen
Quoted 11 lines · Alan Cox

Ar Llu, 2006-10-16 am 18:24 +0200, ysgrifennodd Andi Kleen:

Quoted 5 lines
Quoted 1 line

You can't hot unplug your MMU

Not sure about that. Calgary is afaik in the bridges and since Summit has pluggable PCI cages and nodes i would assume the MMU instances are also hot pluggables.

If so Linux doesn't currently support that and the patch keeps things as they are except for using hotplug safe APIs (and since I want to exterminate pci_find_device* shortly thats preferable)

Ok i applied the patch to -rc2, but it results in

arch/x86_64/pci/built-in.o: In function `pcibios_irq_init':
irq.c:(.init.text+0xc7e): undefined reference to `pci_get_bus_and_slot'

Quoted 6 lines

That function is also nowhere to be found:

% gid pci_get_bus_and_slot
%

So dropped again.

Alain submitted the patch to add that function roughly at the same time. See
http://marc.theaimsgroup.com/?l=linux-kernel&m=116101265428620&w=2

Cheers,
Muli

#9 lore raw
In reply to Andi Kleen
Quoted 4 lines · Andi Kleen
Quoted 4 lines
arch/x86_64/kernel/pci-calgary.c +0 -0
@@ -879,7 +879,7 @@
 
Quoted 8 lines

arch/x86_64/kernel/pci-calgary.c line 884

Quoted 6 lines
arch/x86_64/kernel/pci-calgary.c +1 -1
 error:
 	do {
-		dev = pci_find_device_reverse(PCI_VENDOR_ID_IBM,
+		dev = pci_get_device_reverse(PCI_VENDOR_ID_IBM,
 					      PCI_DEVICE_ID_IBM_CALGARY,
 					      dev);

No put call anywhere?

The put is implicit in the call, since for each dev returned from pci_get_device_reverse() we then call it with the same dev as the last ('from') parameter. We take a reference to dev elsewhere, just before we start using it.

In any case these bridges can't be hot-plugged, so as long as the ref count remains positive, we're fine.

Cheers,
Muli