korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-16 23:45:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

powerpc/powernv/pci: Sprinkle around some WARN_ON()s

Browse Source 
pnv_pci_ioda_configure_bus() should now only ever be called when a device is
added to the bus so add a WARN_ON() to the empty bus check. Similarly,
pnv_pci_ioda_setup_bus_PE() should only ever be called for an unconfigured PE,
so add a WARN_ON() for that case too.

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200417073508.30356-5-oohall@gmail.com
This commit is contained in:
Oliver O'Halloran 2020-04-17 17:35:08 +10:00 committed by Michael Ellerman
parent 718d249aea
commit 6ae8aedf8f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/platforms/powernv/pci-ioda.c
View File

@ -1139,7 +1139,7 @@ static struct pnv_ioda_pe *pnv_ioda_setup_bus_PE(struct pci_bus *bus, bool all)
* We should reuse it instead of allocating a new one. * We should reuse it instead of allocating a new one.
*/ */
pe_num = phb->ioda.pe_rmap[bus->number << 8]; pe_num = phb->ioda.pe_rmap[bus->number << 8];
if (pe_num != IODA_INVALID_PE) { if (WARN_ON(pe_num != IODA_INVALID_PE)) {
pe = &phb->ioda.pe_array[pe_num]; pe = &phb->ioda.pe_array[pe_num];
return NULL; return NULL;
} }
@ -3199,7 +3199,7 @@ static void pnv_pci_configure_bus(struct pci_bus *bus)
dev_info(&bus->dev, "Configuring PE for bus\n"); dev_info(&bus->dev, "Configuring PE for bus\n");
/* Don't assign PE to PCI bus, which doesn't have subordinate devices */ /* Don't assign PE to PCI bus, which doesn't have subordinate devices */
if (list_empty(&bus->devices)) if (WARN_ON(list_empty(&bus->devices)))
return; return;
/* Reserve PEs according to used M64 resources */ /* Reserve PEs according to used M64 resources */