From nobody Sat Sep 26 11:02:35 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4A453409E12; Wed, 2 Sep 2026 09:04:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788339869; cv=none; b=rHu+X826zt0Khumwx69s0V9b6O4qqCgEQFgtVC6CYt/j6odHiXDKtGRn3sWa1gMTuH9XfheCb+j3myijUmOHbHP6pFG1wMxig3WKuvYibfftknsGMRJoJP1w5NRdZjd5YGkqZuu5/tc7znIzgeeE+fPOdKX5MIgJYviu4T46GlA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788339869; c=relaxed/simple; bh=XAtqTBuPsM9NimO/yWd9dM2SlI/sWTG9h8tImFNeelQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ilj9rR5vpQN63nFvXGVMYmm38AleCzp0+mbzJVbfrxPsW6101YUw2LljEfMuwDngpRExwhwrs1rZpCZ1ikU8Egf4ddz7NvF/JBvmzEaPjpeylWqcfR+X6d1qEWnmYPV9Yu3ytBbjFlyh/XVHQYj8O6/dD/talaPS6FmZb2PWT9I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [10.40.54.123]) by gateway (Coremail) with SMTP id _____8CxKvCV5pdqp7QHAA--.21840S3; Wed, 02 Sep 2026 17:04:21 +0800 (CST) Received: from localhost.localdomain (unknown [10.40.54.123]) by front1 (Coremail) with SMTP id qMiowJDxg8yM5pdqsXgZAA--.26394S3; Wed, 02 Sep 2026 17:04:21 +0800 (CST) From: Qunqin Zhao To: bp@alien8.de Cc: tony.luck@intel.com, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, chenhuacai@kernel.org, Wang Jinwei , Yulong Wang , Dongyan Qian , Chao Li , Qunqin Zhao Subject: [PATCH v4 1/3] EDAC/loongson: Encode node and MC info into mc_idx Date: Wed, 2 Sep 2026 16:48:25 +0800 Message-ID: <20260902084827.2652-2-zhaoqunqin@loongson.cn> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20260902084827.2652-1-zhaoqunqin@loongson.cn> References: <20260902084827.2652-1-zhaoqunqin@loongson.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowJDxg8yM5pdqsXgZAA--.26394S3 X-CM-SenderInfo: 52kd01pxqtx0o6or00hjvr0hdfq/ X-Coremail-Antispam: 1Uk129KBj93XoWxGF4ftr18trWUJrykGrW8Xwc_yoWrAryUpF 4UCa1YgrWrtrnruws7tF1UZ3WakF1rKa9Fq397Aw40kry2y34DXF93XryayFn7Cry8KFy5 Xas3Krs7CFWUJFcCm3ZEXasCq-sJn29KB7ZKAUJUUUUr529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUU9Yb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2kKe7AKxVWUXVWUAwAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07 AIYIkI8VC2zVCFFI0UMc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWU AVWUtwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7V AKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMxCIbckI1I0E14v2 6r1Y6r17MI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17 CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF 0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIx AIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIev Ja73UjIFyTuYvjxUc0eHDUUUU Content-Type: text/plain; charset="utf-8" From: Wang Jinwei On Loongson multi-node systems, memory controllers are distributed across multiple nodes. Encode node and MC information into mc_idx so that sysfs entries uniquely identify each controller. The driver gets mc-idx from ACPI _DSD property if firmware provides it. If not, it falls back to edac_device_alloc_index() for legacy firmware compatibility. The number of memory controllers per node (mcs-per-node) is obtained from firmware via ACPI _DSD property, with a default of 4 for backward compatibility. Validate that the firmware-provided value is non-zero to prevent division by zero. The node and MC IDs are decoded from mc_idx: node =3D mc_idx / mcs_per_node mc =3D mc_idx % mcs_per_node Cc: Yulong Wang Cc: Dongyan Qian Cc: Chao Li Signed-off-by: Wang Jinwei Signed-off-by: Qunqin Zhao Reviewed-by: Huacai Chen --- drivers/edac/loongson_edac.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/drivers/edac/loongson_edac.c b/drivers/edac/loongson_edac.c index 38745800e..42270076e 100644 --- a/drivers/edac/loongson_edac.c +++ b/drivers/edac/loongson_edac.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "edac_module.h" =20 #define ECC_CS_COUNT_REG 0x18 @@ -23,6 +24,8 @@ struct loongson_edac_pvt { * register state. */ int last_ce_count; + u32 mcs_per_node; + bool mc_idx_valid; }; =20 static int read_ecc(struct mem_ctl_info *mci) @@ -44,7 +47,8 @@ static int read_ecc(struct mem_ctl_info *mci) static void edac_check(struct mem_ctl_info *mci) { struct loongson_edac_pvt *pvt =3D mci->pvt_info; - int new, add; + char other_detail[64] =3D {0}; + int new, add, node, mc; =20 new =3D read_ecc(mci); add =3D new - pvt->last_ce_count; @@ -52,8 +56,14 @@ static void edac_check(struct mem_ctl_info *mci) if (add <=3D 0) return; =20 + if (pvt->mc_idx_valid) { + node =3D mci->mc_idx / pvt->mcs_per_node; + mc =3D mci->mc_idx % pvt->mcs_per_node; + snprintf(other_detail, sizeof(other_detail), "node:%d mc:%d", node, mc); + } + edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, add, - 0, 0, 0, 0, 0, -1, "error", ""); + 0, 0, 0, 0, 0, -1, "error", other_detail); } =20 static void dimm_config_init(struct mem_ctl_info *mci) @@ -72,20 +82,26 @@ static void dimm_config_init(struct mem_ctl_info *mci) dimm->grain =3D 8; } =20 -static void pvt_init(struct mem_ctl_info *mci, void __iomem *vbase) +static void pvt_init(struct mem_ctl_info *mci, void __iomem *vbase, + bool mc_idx_valid, u32 mcs_per_node) { struct loongson_edac_pvt *pvt =3D mci->pvt_info; =20 pvt->ecc_base =3D vbase; pvt->last_ce_count =3D read_ecc(mci); + pvt->mc_idx_valid =3D mc_idx_valid; + pvt->mcs_per_node =3D mcs_per_node; } =20 static int edac_probe(struct platform_device *pdev) { struct edac_mc_layer layers[2]; struct mem_ctl_info *mci; + struct device *dev =3D &pdev->dev; void __iomem *vbase; + u32 mcs_per_node; int ret; + bool mc_idx_valid =3D true; =20 vbase =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(vbase)) @@ -102,7 +118,6 @@ static int edac_probe(struct platform_device *pdev) if (mci =3D=3D NULL) return -ENOMEM; =20 - mci->mc_idx =3D edac_device_alloc_index(); mci->mtype_cap =3D MEM_FLAG_RDDR4; mci->edac_ctl_cap =3D EDAC_FLAG_NONE; mci->edac_cap =3D EDAC_FLAG_NONE; @@ -114,7 +129,15 @@ static int edac_probe(struct platform_device *pdev) mci->error_desc.grain =3D 8; mci->edac_check =3D edac_check; =20 - pvt_init(mci, vbase); + if (device_property_read_u32(dev, "mc-idx", &mci->mc_idx)) { + mci->mc_idx =3D edac_device_alloc_index(); + mc_idx_valid =3D false; + } + + if (device_property_read_u32(dev, "mcs-per-node", &mcs_per_node) || mcs_p= er_node =3D=3D 0) + mcs_per_node =3D 4; + + pvt_init(mci, vbase, mc_idx_valid, mcs_per_node); dimm_config_init(mci); =20 ret =3D edac_mc_add_mc(mci); --=20 2.47.2 From nobody Sat Sep 26 11:02:35 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7F0F2408026; Wed, 2 Sep 2026 09:04:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788339867; cv=none; b=g0xlJh0kX98EuHpZtINZQaOPFjjrfc+ONtiLarA9YWxRK5YRX4Z8V5zdk4pj05S+Jt3uy7n6qBuKpVchSSEMJ6tBTTf0/ihSvzz8Igp09ye5W7PdD/kvjqoQb5flUwAl5j4wC9V96PM4W6M5mGK4LUagnlT2qeZ3lonVeFDSWSQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788339867; c=relaxed/simple; bh=yAwX0ux0WBk4a3BM6cekXwPqYTRtgppxubAc1KG8qZg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PvlIYWUUr/FAs76LsuZEtbMjafBEISTblxX7iNwljXBKm3SsPyfwSkcnZbSfxtVuwUp0+4qNTOtXSd/5Ras8yG2pWGneulvbdfKde/VSjJZtiWv6j2s8qPgkL/E3I6XyFS33ffxD750FyfzQoDpyAY2h0RIwk1Vbbzt5CiXfD+0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [10.40.54.123]) by gateway (Coremail) with SMTP id _____8Bx79KX5pdqrLQHAA--.22023S3; Wed, 02 Sep 2026 17:04:23 +0800 (CST) Received: from localhost.localdomain (unknown [10.40.54.123]) by front1 (Coremail) with SMTP id qMiowJDxg8yM5pdqsXgZAA--.26394S4; Wed, 02 Sep 2026 17:04:22 +0800 (CST) From: Qunqin Zhao To: bp@alien8.de Cc: tony.luck@intel.com, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, chenhuacai@kernel.org, Wang Jinwei , Dongyan Qian , Chao Li , Qunqin Zhao Subject: [PATCH v4 2/3] EDAC/loongson: Get DIMM size from ACPI _DSM method Date: Wed, 2 Sep 2026 16:48:26 +0800 Message-ID: <20260902084827.2652-3-zhaoqunqin@loongson.cn> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20260902084827.2652-1-zhaoqunqin@loongson.cn> References: <20260902084827.2652-1-zhaoqunqin@loongson.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowJDxg8yM5pdqsXgZAA--.26394S4 X-CM-SenderInfo: 52kd01pxqtx0o6or00hjvr0hdfq/ X-Coremail-Antispam: 1Uk129KBj93XoW7Zr13ZryrZr1kGw15uFWfWFX_yoW8Kr4rpF 45u34Skr43trnF9wsIyrW5uF13u34fJasrGFWxJ3yYgw1DA34UXFWrGa43JFZ8A345JFWU ZrWkGws5u3WDJrcCm3ZEXasCq-sJn29KB7ZKAUJUUUUr529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUU9Fb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r126r13M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2kKe7AKxVWUXVWUAwAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07 AIYIkI8VC2zVCFFI0UMc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWU tVWrXwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7V AKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMxCIbckI1I0E14v2 6r1Y6r17MI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17 CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF 0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIx AIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2 KfnxnUUI43ZEXa7IU8XyCJUUUUU== Content-Type: text/plain; charset="utf-8" From: Wang Jinwei Add support to retrieve DIMM size from ACPI _DSM method instead of using hardcoded values. 1. Add loongson_get_dimm_size_acpi() to call ACPI _DSM method to Get DIMM size in MB. 2. Update dimm_config_init() to use the size from ACPI, with fallback to default 1 MB if ACPI method fails. 3. Add ACPI UUID and DSM function definitions for EDAC. The DIMM size is passed from UEFI through ACPI OperationRegion and _DSM method, enabling correct display of memory size in /sys/devices/system/edac/mc/mc*/size_mb. Cc: Dongyan Qian Cc: Chao Li Signed-off-by: Wang Jinwei Signed-off-by: Qunqin Zhao Reviewed-by: Huacai Chen --- drivers/edac/loongson_edac.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/drivers/edac/loongson_edac.c b/drivers/edac/loongson_edac.c index 42270076e..8946c90b0 100644 --- a/drivers/edac/loongson_edac.c +++ b/drivers/edac/loongson_edac.c @@ -13,6 +13,8 @@ #include "edac_module.h" =20 #define ECC_CS_COUNT_REG 0x18 +#define LOONGSON_EDAC_DSM_UUID "65d0431b-7eb8-46df-b914-b7d568553140" +#define LOONGSON_EDAC_DSM_FUNC_GET_DIMM_SIZE 1 =20 struct loongson_edac_pvt { void __iomem *ecc_base; @@ -66,13 +68,39 @@ static void edac_check(struct mem_ctl_info *mci) 0, 0, 0, 0, 0, -1, "error", other_detail); } =20 +static u32 loongson_get_dimm_size_acpi(struct device *dev) +{ + acpi_handle handle =3D ACPI_HANDLE(dev); + union acpi_object *obj; + u32 size_mb =3D 1; + guid_t guid; + + if (!handle) + return size_mb; + + if (guid_parse(LOONGSON_EDAC_DSM_UUID, &guid)) + return size_mb; + + obj =3D acpi_evaluate_dsm(handle, &guid, 0, + LOONGSON_EDAC_DSM_FUNC_GET_DIMM_SIZE, NULL); + if (!obj) + return size_mb; + + if (obj->type =3D=3D ACPI_TYPE_INTEGER) + size_mb =3D (u32)obj->integer.value; + + ACPI_FREE(obj); + return size_mb; +} + static void dimm_config_init(struct mem_ctl_info *mci) { struct dimm_info *dimm; + struct device *dev =3D mci->pdev; u32 size, npages; =20 - /* size not used */ - size =3D -1; + size =3D loongson_get_dimm_size_acpi(dev); + npages =3D MiB_TO_PAGES(size); =20 dimm =3D edac_get_dimm(mci, 0, 0, 0); --=20 2.47.2 From nobody Sat Sep 26 11:02:35 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 52B2F40B11F; Wed, 2 Sep 2026 09:04:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788339874; cv=none; b=V8IfD2Ns8A+AbNdjoSIYjQwncgjuvtaZMmU/V4rjitWOPVMgFQPUD9xXAYdE3bDp82WF9ekqa/SdlX3HXmusJhXKmSxfeszYM8B6V+UqUKccrnU/79AR2d6Ntq7teFwlShyTtvD9ub+1rJbpD/ZxT+pR7yO0ByRM1O0jhjVWGsY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788339874; c=relaxed/simple; bh=RaRQWBFKMRRd4R4qgmTUyjrpWNDaqtRyHm+JIctTVLI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LF1vKPsXr2n5TGuQ3wYiZeN/qk35eLVttmqCHAhWAw5fxFQripdZ0MgaITAK0jn9ekIwjkcZU0SNArPMnZkyl/u+dppJjnuVxp9F4GcSSOuTILY4gbP6S59xWY1qCk8EmFWrjlMe/RaG7WFdSytMhRbz99gdsBtOLkRhm4yJIfA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [10.40.54.123]) by gateway (Coremail) with SMTP id _____8CxPtOY5pdqsLQHAA--.21786S3; Wed, 02 Sep 2026 17:04:24 +0800 (CST) Received: from localhost.localdomain (unknown [10.40.54.123]) by front1 (Coremail) with SMTP id qMiowJDxg8yM5pdqsXgZAA--.26394S5; Wed, 02 Sep 2026 17:04:23 +0800 (CST) From: Qunqin Zhao To: bp@alien8.de Cc: tony.luck@intel.com, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, chenhuacai@kernel.org, Qunqin Zhao , Wusheng , Wang Jinwei Subject: [PATCH v4 3/3] EDAC/loongson: Add CS4-7 timeout filter for cross-node access Date: Wed, 2 Sep 2026 16:48:27 +0800 Message-ID: <20260902084827.2652-4-zhaoqunqin@loongson.cn> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20260902084827.2652-1-zhaoqunqin@loongson.cn> References: <20260902084827.2652-1-zhaoqunqin@loongson.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowJDxg8yM5pdqsXgZAA--.26394S5 X-CM-SenderInfo: 52kd01pxqtx0o6or00hjvr0hdfq/ X-Coremail-Antispam: 1Uk129KBj93XoWxXFWUWF1UKryxCw4DXr48Zrc_yoW5Zw4fpF W5Ca15trW0qrnF9w1ktrWUZa45CFZagFZrWrZ3A3yrWr9Iy34DZrySgry2vFn8C34FyryY qw1rKrs7CF4UA3XCm3ZEXasCq-sJn29KB7ZKAUJUUUUr529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUU9Fb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2kKe7AKxVWUXVWUAwAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07 AIYIkI8VC2zVCFFI0UMc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWU tVWrXwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7V AKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMxCIbckI1I0E14v2 6r1Y6r17MI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17 CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF 0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIx AIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2 KfnxnUUI43ZEXa7IU8EeHDUUUUU== Content-Type: text/plain; charset="utf-8" On Loongson 3C6000 multi-node systems, when the EDAC driver running on one node accesses the memory controller registers of another node, the read operation may timeout and return random values. This causes false CE error reports because the random values in CS0-3 (low 32 bits) are misinterpreted as valid ECC error counts. For cross-node accesses, check CS4-7 (high 32 bits) of the ECC count register. If the valid-cs-bits firmware property is set and the high bits are non-zero, it indicates a timeout or random value, so skip the report and return the previous count. To avoid undefined behavior on 8-CS systems where valid_cs_bits=3D64, guard the shift with a bounds check (valid_cs_bits < 64). Signed-off-by: Wusheng Signed-off-by: Wang Jinwei Signed-off-by: Qunqin Zhao Reviewed-by: Huacai Chen --- drivers/edac/loongson_edac.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/edac/loongson_edac.c b/drivers/edac/loongson_edac.c index 8946c90b0..605320b81 100644 --- a/drivers/edac/loongson_edac.c +++ b/drivers/edac/loongson_edac.c @@ -27,6 +27,7 @@ struct loongson_edac_pvt { */ int last_ce_count; u32 mcs_per_node; + u32 valid_cs_bits; bool mc_idx_valid; }; =20 @@ -37,11 +38,21 @@ static int read_ecc(struct mem_ctl_info *mci) int cs; =20 ecc =3D readq(pvt->ecc_base + ECC_CS_COUNT_REG); - /* cs0 -- cs3 */ + /* Discard the read value if any invalid bit is set to 1 */ + if (pvt->valid_cs_bits < 64 && (ecc >> pvt->valid_cs_bits)) { + edac_mc_printk(mci, KERN_DEBUG, "ECC read invalid, skip: 0x%llx\n", ecc); + return pvt->last_ce_count; + } + + /* cs0 -- cs7 */ cs =3D ecc & 0xff; cs +=3D (ecc >> 8) & 0xff; cs +=3D (ecc >> 16) & 0xff; cs +=3D (ecc >> 24) & 0xff; + cs +=3D (ecc >> 32) & 0xff; + cs +=3D (ecc >> 40) & 0xff; + cs +=3D (ecc >> 48) & 0xff; + cs +=3D (ecc >> 56) & 0xff; =20 return cs; } @@ -111,14 +122,15 @@ static void dimm_config_init(struct mem_ctl_info *mci) } =20 static void pvt_init(struct mem_ctl_info *mci, void __iomem *vbase, - bool mc_idx_valid, u32 mcs_per_node) + bool mc_idx_valid, u32 mcs_per_node, u32 valid_cs_bits) { struct loongson_edac_pvt *pvt =3D mci->pvt_info; =20 pvt->ecc_base =3D vbase; - pvt->last_ce_count =3D read_ecc(mci); pvt->mc_idx_valid =3D mc_idx_valid; pvt->mcs_per_node =3D mcs_per_node; + pvt->valid_cs_bits =3D valid_cs_bits; + pvt->last_ce_count =3D read_ecc(mci); } =20 static int edac_probe(struct platform_device *pdev) @@ -127,7 +139,7 @@ static int edac_probe(struct platform_device *pdev) struct mem_ctl_info *mci; struct device *dev =3D &pdev->dev; void __iomem *vbase; - u32 mcs_per_node; + u32 mcs_per_node, valid_cs_bits; int ret; bool mc_idx_valid =3D true; =20 @@ -165,7 +177,10 @@ static int edac_probe(struct platform_device *pdev) if (device_property_read_u32(dev, "mcs-per-node", &mcs_per_node) || mcs_p= er_node =3D=3D 0) mcs_per_node =3D 4; =20 - pvt_init(mci, vbase, mc_idx_valid, mcs_per_node); + if (device_property_read_u32(dev, "valid-cs-bits", &valid_cs_bits)) + valid_cs_bits =3D 32; + + pvt_init(mci, vbase, mc_idx_valid, mcs_per_node, valid_cs_bits); dimm_config_init(mci); =20 ret =3D edac_mc_add_mc(mci); --=20 2.47.2