From: Chris Packham <chris.packham@alliedtelesis.co.nz>
To: bp@alien8.de, linux-edac@vger.kernel.org
Cc: mchehab@kernel.org, mpe@ellerman.id.au,
linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
Chris Packham <chris.packham@alliedtelesis.co.nz>
Subject: [PATCH v2 3/3] EDAC: cpc925: simplify calculation of total memory
Date: Wed, 7 Jun 2017 11:55:00 +1200 [thread overview]
Message-ID: <20170606235500.22772-4-chris.packham@alliedtelesis.co.nz> (raw)
In-Reply-To: <20170606235500.22772-1-chris.packham@alliedtelesis.co.nz>
Use of_address_to_resource() and resource_size() instead of manually
parsing the "reg" property from the "memory" node(s).
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
Changes in v2:
- New
drivers/edac/cpc925_edac.c | 32 ++++++++++----------------------
1 file changed, 10 insertions(+), 22 deletions(-)
diff --git a/drivers/edac/cpc925_edac.c b/drivers/edac/cpc925_edac.c
index 837b62c4993d..ea347cd7eb92 100644
--- a/drivers/edac/cpc925_edac.c
+++ b/drivers/edac/cpc925_edac.c
@@ -24,6 +24,7 @@
#include <linux/io.h>
#include <linux/edac.h>
#include <linux/of.h>
+#include <linux/of_address.h>
#include <linux/platform_device.h>
#include <linux/gfp.h>
@@ -296,30 +297,17 @@ struct cpc925_dev_info {
static void get_total_mem(struct cpc925_mc_pdata *pdata)
{
struct device_node *np = NULL;
- const unsigned int *reg, *reg_end;
- int len, sw, aw;
- unsigned long start, size;
+ struct resource res;
+ int ret;
- np = of_find_node_by_type(NULL, "memory");
- if (!np)
- return;
+ for_each_node_by_type(np, "memory") {
+ ret = of_address_to_resource(np, 0, &res);
+ if (ret)
+ continue;
+
+ pdata->total_mem += resource_size(&res);
+ }
- aw = of_n_addr_cells(np);
- sw = of_n_size_cells(np);
- reg = (const unsigned int *)of_get_property(np, "reg", &len);
- reg_end = reg + len/4;
-
- pdata->total_mem = 0;
- do {
- start = of_read_number(reg, aw);
- reg += aw;
- size = of_read_number(reg, sw);
- reg += sw;
- edac_dbg(1, "start 0x%lx, size 0x%lx\n", start, size);
- pdata->total_mem += size;
- } while (reg < reg_end);
-
- of_node_put(np);
edac_dbg(0, "total_mem 0x%lx\n", pdata->total_mem);
}
--
2.13.0
prev parent reply other threads:[~2017-06-06 23:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-06 23:54 EDAC: simplify total memory calculation Chris Packham
2017-06-06 23:54 ` [PATCH v2 1/3] EDAC: mv64x60: calculate memory size correctly Chris Packham
2017-06-06 23:54 ` [PATCH v2 2/3] EDAC: altera: simplify calculation of total memory Chris Packham
2017-06-12 18:34 ` Thor Thayer
2017-06-14 11:50 ` Borislav Petkov
2017-06-06 23:55 ` Chris Packham [this message]
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=20170606235500.22772-4-chris.packham@alliedtelesis.co.nz \
--to=chris.packham@alliedtelesis.co.nz \
--cc=bp@alien8.de \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mchehab@kernel.org \
--cc=mpe@ellerman.id.au \
/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).