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

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

powerpc/powernv: Needn't IO segment map for PHB3 



PHB3 doesn't support IO ports and we needn't IO segment map for that.

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

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

+7 −6
Original line number Diff line number Diff line
@@ -1187,21 +1187,22 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np, 
	phb->ioda.io_segsize = phb->ioda.io_size / phb->ioda.total_pe;

	phb->ioda.io_pci_base = 0; /* XXX calculate this ? */



	/* Allocate aux data & arrays

	 *

	 * XXX TODO: Don't allocate io segmap on PHB3

	 */

	/* Allocate aux data & arrays. We don't have IO ports on PHB3 */

	size = _ALIGN_UP(phb->ioda.total_pe / 8, sizeof(unsigned long));

	m32map_off = size;

	size += phb->ioda.total_pe * sizeof(phb->ioda.m32_segmap[0]);

	iomap_off = size;

	if (phb->type == PNV_PHB_IODA1) {

		iomap_off = size;

		size += phb->ioda.total_pe * sizeof(phb->ioda.io_segmap[0]);

	}

	pemap_off = size;

	size += phb->ioda.total_pe * sizeof(struct pnv_ioda_pe);

	aux = alloc_bootmem(size);

	memset(aux, 0, size);

	phb->ioda.pe_alloc = aux;

	phb->ioda.m32_segmap = aux + m32map_off;

	if (phb->type == PNV_PHB_IODA1)

		phb->ioda.io_segmap = aux + iomap_off;

	phb->ioda.pe_array = aux + pemap_off;

	set_bit(0, phb->ioda.pe_alloc);