From: Gavin Shan <shangw@linux.vnet.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Gavin Shan <shangw@linux.vnet.ibm.com>
Subject: [PATCH 4/5] powerpc/powernv: Pick up correct number of PEs
Date: Wed, 31 Jul 2013 16:47:03 +0800 [thread overview]
Message-ID: <1375260424-20777-4-git-send-email-shangw@linux.vnet.ibm.com> (raw)
In-Reply-To: <1375260424-20777-1-git-send-email-shangw@linux.vnet.ibm.com>
Usually, the property "ibm,opal-num-pes" of PHB dev-tree node
indicates the number of total PEs. If that property isn't existing
or valid, we should fall back to pick the correct number of total
PEs according to PHB type: IODA1 or IODA2.
Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
---
arch/powerpc/platforms/powernv/pci-ioda.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 829047b..6386bb4 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -1172,11 +1172,14 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np,
/* Initialize more IODA stuff */
prop32 = of_get_property(np, "ibm,opal-num-pes", NULL);
- if (!prop32)
- phb->ioda.total_pe = 1;
- else
+ if (prop32)
phb->ioda.total_pe = *prop32;
-
+ else if (phb->type == PNV_PHB_IODA1)
+ phb->ioda.total_pe = 128;
+ else if (phb->type == PNV_PHB_IODA2)
+ phb->ioda.total_pe = 256;
+ else
+ phb->ioda.total_pe = 1;
phb->ioda.m32_size = resource_size(&hose->mem_resources[0]);
/* FW Has already off top 64k of M32 space (MSI space) */
phb->ioda.m32_size += 0x10000;
--
1.7.5.4
next prev parent reply other threads:[~2013-07-31 8:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-31 8:47 [PATCH 1/5] powerpc/powernv: Free PHB instance upon error Gavin Shan
2013-07-31 8:47 ` [PATCH 2/5] powerpc/powernv: Fetch PHB bus range from dev-tree Gavin Shan
2013-07-31 8:47 ` [PATCH 3/5] powerpc/powernv: Check primary PHB through ID Gavin Shan
2013-07-31 8:47 ` Gavin Shan [this message]
2013-07-31 9:18 ` [PATCH 4/5] powerpc/powernv: Pick up correct number of PEs Benjamin Herrenschmidt
2013-08-01 4:24 ` Gavin Shan
2013-08-01 4:42 ` Benjamin Herrenschmidt
2013-07-31 8:47 ` [PATCH 5/5] powerpc/powernv: Needn't IO segment map for PHB3 Gavin Shan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1375260424-20777-4-git-send-email-shangw@linux.vnet.ibm.com \
--to=shangw@linux.vnet.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).