lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

parisc: fix wrong assumption about bus->self

Browse Source 
Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> posted a patch series
to linux-pci to fix a wrong assumption about pci_bus->self==NULL for
all PCI host bus controllers. While PARISC platforms to not behave
this way, I prefer to have the code consistent across architectures.
The following patch replaces pci_bus->self with pci_bus->parent when
used as a test to check for "root bus controller".

Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
This commit is contained in:
Grant Grundler
2009-01-28 22:30:55 -07:00
committed by Kyle McMartin
parent c1da90fd09
commit 9785d646c1
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/parisc/dino.c
View File

@@ -587,7 +587,7 @@ dino_fixup_bus(struct pci_bus *bus)
bus->resource[i+1] = &res[i]; bus->resource[i+1] = &res[i];
} }
} else if(bus->self) { } else if (bus->parent) {
int i; int i;
pci_read_bridge_bases(bus); pci_read_bridge_bases(bus);

7
drivers/parisc/iosapic.c
View File

@@ -487,7 +487,7 @@ iosapic_xlate_pin(struct iosapic_info *isi, struct pci_dev *pcidev)
} }
/* Check if pcidev behind a PPB */ /* Check if pcidev behind a PPB */
if (NULL != pcidev->bus->self) { if (pcidev->bus->parent) {
/* Convert pcidev INTR_PIN into something we /* Convert pcidev INTR_PIN into something we
** can lookup in the IRT. ** can lookup in the IRT.
*/ */
@@ -523,10 +523,9 @@ iosapic_xlate_pin(struct iosapic_info *isi, struct pci_dev *pcidev)
#endif /* PCI_BRIDGE_FUNCS */ #endif /* PCI_BRIDGE_FUNCS */
/* /*
** Locate the host slot the PPB nearest the Host bus * Locate the host slot of the PPB.
** adapter.
*/ */
while (NULL != p->parent->self) while (p->parent->parent)
p = p->parent; p = p->parent;
intr_slot = PCI_SLOT(p->self->devfn); intr_slot = PCI_SLOT(p->self->devfn);

4
drivers/parisc/lba_pci.c
View File

@@ -644,7 +644,7 @@ lba_fixup_bus(struct pci_bus *bus)
** Properly Setup MMIO resources for this bus. ** Properly Setup MMIO resources for this bus.
** pci_alloc_primary_bus() mangles this. ** pci_alloc_primary_bus() mangles this.
*/ */
if (bus->self) { if (bus->parent) {
int i; int i;
/* PCI-PCI Bridge */ /* PCI-PCI Bridge */
pci_read_bridge_bases(bus); pci_read_bridge_bases(bus);
@@ -802,7 +802,7 @@ lba_fixup_bus(struct pci_bus *bus)
** Can't fixup here anyway....garr... ** Can't fixup here anyway....garr...
*/ */
if (fbb_enable) { if (fbb_enable) {
if (bus->self) { if (bus->parent) {
u8 control; u8 control;
/* enable on PPB */ /* enable on PPB */
(void) pci_read_config_byte(bus->self, PCI_BRIDGE_CONTROL, &control); (void) pci_read_config_byte(bus->self, PCI_BRIDGE_CONTROL, &control);