From: "Luck, Tony" <tony.luck@intel.com>
To: Borislav Petkov <bp@suse.de>
Cc: Tony Luck <tony.luck@intel.com>,
Qiuxu Zhuo <qiuxu.zhuo@intel.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
"open list:EDAC-PND2" <linux-edac@vger.kernel.org>
Subject: EDAC, pnd2_edac: Fix Apollo Lake DIMM detection
Date: Wed, 28 Jun 2017 16:44:07 -0700 [thread overview]
Message-ID: <20170628234407.21521-1-tony.luck@intel.com> (raw)
From: Tony Luck <tony.luck@intel.com>
Non-existent or empty DIMM slots result in error return from
RD_REGP(). But we shouldn't give up on failure.
So long as we find at least one DIMM we can continue.
Cc: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org> (supporter:EDAC-CORE)
Cc: linux-edac@vger.kernel.org (open list:EDAC-PND2)
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
drivers/edac/pnd2_edac.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/edac/pnd2_edac.c b/drivers/edac/pnd2_edac.c
index 1cad5a9af8d0..8b287bf3e2ec 100644
--- a/drivers/edac/pnd2_edac.c
+++ b/drivers/edac/pnd2_edac.c
@@ -423,16 +423,21 @@ static void dnv_mk_region(char *name, struct region *rp, void *asym)
static int apl_get_registers(void)
{
+ int ret = -ENODEV;
int i;
if (RD_REG(&asym_2way, b_cr_asym_2way_mem_region_mchbar))
return -ENODEV;
+ /*
+ * RD_REGP() will fail for unpopulated or non-existent
+ * DIMM slots. Return success if we find at least one DIMM.
+ */
for (i = 0; i < APL_NUM_CHANNELS; i++)
- if (RD_REGP(&drp0[i], d_cr_drp0, apl_dports[i]))
- return -ENODEV;
+ if (!RD_REGP(&drp0[i], d_cr_drp0, apl_dports[i]))
+ ret = 0;
- return 0;
+ return ret;
}
static int dnv_get_registers(void)
next reply other threads:[~2017-06-28 23:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-28 23:44 Luck, Tony [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-06-29 8:39 EDAC, pnd2_edac: Fix Apollo Lake DIMM detection Boris 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=20170628234407.21521-1-tony.luck@intel.com \
--to=tony.luck@intel.com \
--cc=bp@suse.de \
--cc=linux-edac@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=qiuxu.zhuo@intel.com \
/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