From: "Darrick J. Wong" <djwong@us.ibm.com>
To: Corinna Schultz <cschultz@linux.vnet.ibm.com>
Cc: mingo@elte.hu, linux-kernel@vger.kernel.org,
akpm@linux-foundation.org, coschult@us.ibm.com
Subject: Re: [PATCH RESEND] (revised) Calgary: increase max PHB number
Date: Thu, 24 Jun 2010 14:26:47 -0700 [thread overview]
Message-ID: <20100624212647.GI15515@tux1.beaverton.ibm.com> (raw)
In-Reply-To: <20100621144150.2j0xuwksg4cwg84c@imap.linux.ibm.com>
Newer systems (x3950M2) can have 48 PHBs per chassis and 8 chassis, so bump the
limits up and provide an explanation of the requirements for each class.
Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Acked-by: Muli Ben-Yehuda <muli@il.ibm.com>
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index fb99f7e..967c646 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -103,11 +103,14 @@ int use_calgary __read_mostly = 0;
#define PMR_SOFTSTOPFAULT 0x40000000
#define PMR_HARDSTOP 0x20000000
-#define MAX_NUM_OF_PHBS 8 /* how many PHBs in total? */
-#define MAX_NUM_CHASSIS 8 /* max number of chassis */
-/* MAX_PHB_BUS_NUM is the maximal possible dev->bus->number */
-#define MAX_PHB_BUS_NUM (MAX_NUM_OF_PHBS * MAX_NUM_CHASSIS * 2)
-#define PHBS_PER_CALGARY 4
+/*
+ * The maximum PHB bus number.
+ * x3950M2 (rare): 8 chassis, 48 PHBs per chassis = 384
+ * x3950M2: 4 chassis, 48 PHBs per chassis = 192
+ * x3950 (PCIE): 8 chassis, 32 PHBs per chassis = 256
+ * x3950 (PCIX): 8 chassis, 16 PHBs per chassis = 128
+ */
+#define MAX_PHB_BUS_NUM 384
/* register offsets in Calgary's internal register space */
static const unsigned long tar_offsets[] = {
next prev parent reply other threads:[~2010-06-24 21:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-21 18:41 Corinna Schultz
2010-06-24 21:26 ` Darrick J. Wong [this message]
2010-06-25 14:14 ` Ingo Molnar
2010-06-25 15:29 ` [tip:x86/urgent] x86, Calgary: Increase " tip-bot for Darrick J. Wong
2010-06-29 22:51 ` Andrew Morton
2010-06-30 21:31 ` H. Peter Anvin
2010-06-30 21:45 ` Darrick J. Wong
2010-06-30 21:49 ` [PATCH] " Darrick J. Wong
2010-06-30 23:05 ` H. Peter Anvin
2010-07-01 0:45 ` Darrick J. Wong
2010-07-01 5:45 ` [tip:x86/urgent] x86, Calgary: Limit the max PHB number to 256 tip-bot for Darrick J. Wong
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=20100624212647.GI15515@tux1.beaverton.ibm.com \
--to=djwong@us.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=coschult@us.ibm.com \
--cc=cschultz@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/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
all inboxes | Powered by JetHome®