From: Markus Trippelsdorf <markus@trippelsdorf.de>
To: linux-edac@vger.kernel.org
Cc: Borislav Petkov <borislav.petkov@amd.com>,
Doug Thompson <dougthompson@xmission.com>,
linux-kernel@vger.kernel.org
Subject: [EDAC-AMD64] Display correct RAM sizes in ganged mode on F10 CPUs
Date: Sat, 29 Jan 2011 22:15:31 +0100 [thread overview]
Message-ID: <20110129211531.GA1874@gentoo.trippels.de> (raw)
The EDAC_AMD64 module displays only half the actual memory size, when
RAM is running in ganged mode on F10 CPUs. Fix this by moving the the
conversion factor check out of the if block, where it is never reached.
With this patch:
Unganged:
amd64: DRAM ECC enabled.
EDAC amd64: F10h detected (node 0).
EDAC amd64: using x4 syndromes.
EDAC MC: DCT0 chip selects:
kernel: EDAC amd64: MC: 0: 1024MB 1: 1024MB
kernel: EDAC amd64: MC: 2: 1024MB 3: 1024MB
kernel: EDAC amd64: MC: 4: 0MB 5: 0MB
kernel: EDAC amd64: MC: 6: 0MB 7: 0MB
kernel: EDAC MC: DCT1 chip selects:
kernel: EDAC amd64: MC: 0: 1024MB 1: 1024MB
kernel: EDAC amd64: MC: 2: 1024MB 3: 1024MB
kernel: EDAC amd64: MC: 4: 0MB 5: 0MB
kernel: EDAC amd64: MC: 6: 0MB 7: 0MB
kernel: EDAC amd64: MCT channel count: 2
Ganged:
EDAC amd64: DRAM ECC enabled.
EDAC amd64: F10h detected (node 0).
EDAC amd64: using x4 syndromes.
EDAC MC: DCT0 chip selects:
EDAC amd64: MC: 0: 2048MB 1: 2048MB
EDAC amd64: MC: 2: 2048MB 3: 2048MB
EDAC amd64: MC: 4: 0MB 5: 0MB
EDAC amd64: MC: 6: 0MB 7: 0MB
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 4a5ecc5..e872d79 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -1633,10 +1633,10 @@ static void amd64_debug_display_dimm_sizes(int ctrl, struct amd64_pvt *pvt)
u32 dbam;
u32 *dcsb;
- if (boot_cpu_data.x86 == 0xf) {
- if (pvt->dclr0 & F10_WIDTH_128)
- factor = 1;
+ if (pvt->dclr0 & F10_WIDTH_128)
+ factor = 1;
+ if (boot_cpu_data.x86 == 0xf) {
/* K8 families < revF not supported yet */
if (pvt->ext_model < K8_REV_F)
return;
--
Markus
next reply other threads:[~2011-01-29 21:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-29 21:15 Markus Trippelsdorf [this message]
2011-02-01 18:51 ` Borislav Petkov
2011-02-01 19:27 ` Markus Trippelsdorf
2011-02-03 15:17 ` Borislav Petkov
2011-02-03 15:59 ` Markus Trippelsdorf
2011-02-03 16:36 ` Borislav Petkov
2011-02-03 16:42 ` Markus Trippelsdorf
2011-02-03 17:09 ` Borislav Petkov
2011-02-03 17:25 ` Markus Trippelsdorf
2011-02-03 17:58 ` Borislav Petkov
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=20110129211531.GA1874@gentoo.trippels.de \
--to=markus@trippelsdorf.de \
--cc=borislav.petkov@amd.com \
--cc=dougthompson@xmission.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®