From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751311AbdFFCln (ORCPT ); Mon, 5 Jun 2017 22:41:43 -0400 Received: from gate2.alliedtelesis.co.nz ([202.36.163.20]:48588 "EHLO gate2.alliedtelesis.co.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751237AbdFFClm (ORCPT ); Mon, 5 Jun 2017 22:41:42 -0400 From: Chris Packham To: bp@alien8.de, linux-edac@vger.kernel.org Cc: mchehab@kernel.org, linux-kernel@vger.kernel.org, Chris Packham Subject: [PATCH] EDAC: mv64x60 calculate memory size correctly Date: Tue, 6 Jun 2017 14:41:36 +1200 Message-Id: <20170606024136.22613-1-chris.packham@alliedtelesis.co.nz> X-Mailer: git-send-email 2.13.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The #address-cells and #size-cells properties need to be accounted for when dealing with the "memory" device tree node. Signed-off-by: Chris Packham --- drivers/edac/mv64x60_edac.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c index 43efb086c0b4..09abb963688f 100644 --- a/drivers/edac/mv64x60_edac.c +++ b/drivers/edac/mv64x60_edac.c @@ -644,15 +644,27 @@ static irqreturn_t mv64x60_mc_isr(int irq, void *dev_id) static void get_total_mem(struct mv64x60_mc_pdata *pdata) { struct device_node *np = NULL; - const unsigned int *reg; - - np = of_find_node_by_type(NULL, "memory"); - if (!np) - return; - - reg = of_get_property(np, "reg", NULL); - - pdata->total_mem = reg[1]; + const unsigned int *reg, *reg_end; + int len, sw, aw; + unsigned long start, size, total_mem = 0; + + for_each_node_by_type(np, "memory") { + aw = of_n_addr_cells(np); + sw = of_n_size_cells(np); + reg = of_get_property(np, "reg", &len); + reg_end = reg + (len / sizeof(u32)); + + total_mem = 0; + do { + start = of_read_number(reg, aw); + reg += aw; + size = of_read_number(reg, sw); + reg += sw; + total_mem += size; + } while (reg < reg_end); + } + + pdata->total_mem = total_mem; } static void mv64x60_init_csrows(struct mem_ctl_info *mci, -- 2.13.0