Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58d714ec authored by Gavin Shan's avatar Gavin Shan Committed by Benjamin Herrenschmidt
Browse files

powerpc/powernv: Free PHB instance upon error 



We don't free PHB instance (struct pnv_phb) on error to creating
the associated PCI controler (struct pci_controller). The patch
fixes that. Also, the output messages have been cleaned for a bit
so that they looks unified for IODA_1/2 cases.

Signed-off-by: default avatarGavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 408a7e08

arch/powerpc/platforms/powernv/pci-ioda.c

+11 −6
Original line number Diff line number Diff line
@@ -1124,13 +1124,18 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np, 
	pr_debug("  PHB-ID  : 0x%016llx\n", phb_id);



	phb = alloc_bootmem(sizeof(struct pnv_phb));

	if (phb) {

	if (!phb) {

		pr_err("  Out of memory !\n");

		return;

	}



	/* Allocate PCI controller */

	memset(phb, 0, sizeof(struct pnv_phb));

	phb->hose = hose = pcibios_alloc_controller(np);

	}

	if (!phb || !phb->hose) {

		pr_err("PCI: Failed to allocate PCI controller for %s\n",

	if (!phb->hose) {

		pr_err("  Can't allocate PCI controller for %s\n",

		       np->full_name);

		free_bootmem((unsigned long)phb, sizeof(struct pnv_phb));

		return;

	}