From nobody Mon Feb 9 04:13:56 2026 Received: from out30-118.freemail.mail.aliyun.com (out30-118.freemail.mail.aliyun.com [115.124.30.118]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 396AA284B26; Thu, 22 Jan 2026 09:47:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.118 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769075282; cv=none; b=rEt2jhcQXzWdlPyK38KrySTkXRkELuvSWTk8m3ERNXH2srb7lt3f/8AlTFqCcsBhPGw6JFXj4IdbqGauHwVGSxEWlcqSNOR2hT5MGXEk2Ybd5BsNKLO8gBq9jGnioVgnBvBPP0ExVxSJqBzegJbcz8etZPcgu1g81HSvupaYOGo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769075282; c=relaxed/simple; bh=DnMBcfwUjtt1RUKLWGSecejfX5UC0YZOIdosE1gy7YA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iHeBEA5H6mAJ6oXfV6oXkB1ZhHH01I7EnXBcef5ttFH9D9W1FMZy4bRn3ZzxHW7vT11ZtE8AnaVnhkPnjbDuzDjHE7NSowGDI67FwIZYcNguJlwSEOvmql8b9Jy20tVKecjckvySNJpDOC+M0Pxtq8ya21bBiPBBN5RFCohJtY0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=vsxdMiNk; arc=none smtp.client-ip=115.124.30.118 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="vsxdMiNk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1769075270; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=a2pQ+C4SUP4Ig2ZogJ3bhHxA66J4i8YOEkIhS0I/+MI=; b=vsxdMiNkkcmF4L+WED2QQEWcAiaRgyP+yH5Zg++FPmSdR7NaxVEt4fIp+f8jTJJ1cXcsRrzftyuZ4JROViqrb4VatV99O/Yzaw29S4IksBWewOM0bMXeaqENpxs61KpG91vIXiD7R3SQ18RxEdQb+aiXJatnjUHtS0KjhLA99TA= Received: from localhost(mailfrom:tianruidong@linux.alibaba.com fp:SMTPD_---0WxbtZj3_1769075266 cluster:ay36) by smtp.aliyun-inc.com; Thu, 22 Jan 2026 17:47:50 +0800 From: Ruidong Tian To: catalin.marinas@arm.com, will@kernel.org, lpieralisi@kernel.org, guohanjun@huawei.com, sudeep.holla@arm.com, rafael@kernel.org, robin.murphy@arm.com, mark.rutland@arm.com, tony.luck@intel.com, bp@alien8.de, tglx@linutronix.de, peterz@infradead.org Cc: lenb@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-edac@vger.kernel.org, mchehab@kernel.org, xueshuai@linux.alibaba.com, zhuo.song@linux.alibaba.com, oliver.yang@linux.alibaba.com, Ruidong Tian Subject: [PATCH v6 06/16] ras: AEST: Support RAS Common Fault Injection Model Extension Date: Thu, 22 Jan 2026 17:46:46 +0800 Message-Id: <20260122094656.73399-7-tianruidong@linux.alibaba.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20260122094656.73399-1-tianruidong@linux.alibaba.com> References: <20260122094656.73399-1-tianruidong@linux.alibaba.com> 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 Content-Type: text/plain; charset="utf-8" Add inject register descripted in Common Fault Injection Model Extension. Signed-off-by: Ruidong Tian --- drivers/ras/aest/aest-core.c | 15 ++++++++++++++- drivers/ras/aest/aest.h | 10 ++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/ras/aest/aest-core.c b/drivers/ras/aest/aest-core.c index 84b2fb8127ff..1218ae51079c 100644 --- a/drivers/ras/aest/aest-core.c +++ b/drivers/ras/aest/aest-core.c @@ -124,7 +124,7 @@ static int aest_init_node(struct aest_device *adev, str= uct aest_node *node, struct acpi_aest_node *anode) { int i, ret; - u64 address; + u64 address, flags; =20 node->adev =3D adev; node->info =3D anode; @@ -145,6 +145,19 @@ static int aest_init_node(struct aest_device *adev, st= ruct aest_node *node, return -ENOMEM; } =20 + flags =3D anode->interface_hdr->flags; + address =3D node->info->common->fault_inject_register_base; + if ((flags & AEST_XFACE_FLAG_FAULT_INJECT) && address) { + if (address - anode->interface_hdr->address < node->group->size) + node->inj =3D node->base + + (address - anode->interface_hdr->address); + else { + node->inj =3D devm_ioremap(adev->dev, address, PAGE_SIZE); + if (!node->inj) + return -ENOMEM; + } + } + ret =3D aest_node_set_errgsr(adev, node); if (ret) return ret; diff --git a/drivers/ras/aest/aest.h b/drivers/ras/aest/aest.h index bf0b9a49fdaa..505ecd9635bc 100644 --- a/drivers/ras/aest/aest.h +++ b/drivers/ras/aest/aest.h @@ -60,6 +60,9 @@ #define ERXMISC1 0x28 #define ERXMISC2 0x30 #define ERXMISC3 0x38 +#define ERXPFGF 0x800 +#define ERXPFGCTL 0x808 +#define ERXPFGCDN 0x810 =20 #define GIC_ERRDEVARCH 0xFFBC =20 @@ -120,6 +123,7 @@ struct aest_node { u8 type; void *errgsr; void *base; + void *inj; =20 /* * This bitmap indicates which of the error records within this error @@ -208,6 +212,9 @@ static inline u64 aest_sysreg_read(void *__unused, u32 = offset) CASE_READ(res, ERXMISC1) CASE_READ(res, ERXMISC2) CASE_READ(res, ERXMISC3) + CASE_READ(res, ERXPFGF) + CASE_READ(res, ERXPFGCTL) + CASE_READ(res, ERXPFGCDN) default : res =3D 0; } @@ -225,6 +232,9 @@ static inline void aest_sysreg_write(void *base, u32 of= fset, u64 val) CASE_WRITE(val, ERXMISC1) CASE_WRITE(val, ERXMISC2) CASE_WRITE(val, ERXMISC3) + CASE_WRITE(val, ERXPFGF) + CASE_WRITE(val, ERXPFGCTL) + CASE_WRITE(val, ERXPFGCDN) default : return; } --=20 2.51.2.612.gdc70283dfc