[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20251222094351.38792-5-tianruidong@linux.alibaba.com>
Date: Mon, 22 Dec 2025 17:43:37 +0800
From: Ruidong Tian <tianruidong@...ux.alibaba.com>
To: catalin.marinas@....com,
will@...nel.org,
lpieralisi@...nel.org,
guohanjun@...wei.com,
sudeep.holla@....com,
xueshuai@...ux.alibaba.com,
linux-kernel@...r.kernel.org,
linux-acpi@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org,
rafael@...nel.org,
lenb@...nel.org,
tony.luck@...el.com,
bp@...en8.de,
yazen.ghannam@....com,
misono.tomohiro@...itsu.com
Cc: tianruidong@...ux.alibaba.com
Subject: [PATCH v4 04/17] ras: AEST: Unify the read/write interface for system and MMIO register
Use record_read/write to simultaneously read and write system registers and
MMIO registers while maintaining code conciseness.
Signed-off-by: Ruidong Tian <tianruidong@...ux.alibaba.com>
---
drivers/ras/aest/aest-core.c | 1 +
drivers/ras/aest/aest.h | 94 ++++++++++++++++++++++++++++++++++++
2 files changed, 95 insertions(+)
diff --git a/drivers/ras/aest/aest-core.c b/drivers/ras/aest/aest-core.c
index acebb293ac75..f4a5119dc513 100644
--- a/drivers/ras/aest/aest-core.c
+++ b/drivers/ras/aest/aest-core.c
@@ -29,6 +29,7 @@ static int aest_init_record(struct aest_record *record, int i,
record->regs_base =
node->base + sizeof(struct ras_ext_regs) * i;
+ record->access = &aest_access[node->info->interface_hdr->type];
record->addressing_mode = test_bit(i, node->info->addressing_mode);
record->index = i;
record->node = node;
diff --git a/drivers/ras/aest/aest.h b/drivers/ras/aest/aest.h
index 3250675e99b7..31131cce9928 100644
--- a/drivers/ras/aest/aest.h
+++ b/drivers/ras/aest/aest.h
@@ -10,6 +10,11 @@
#define MAX_GSI_PER_NODE 2
+#define record_read(record, offset) \
+ record->access->read(record->regs_base, offset)
+#define record_write(record, offset, val) \
+ record->access->write(record->regs_base, offset, val)
+
#define aest_dev_err(__adev, format, ...) \
dev_err((__adev)->dev, format, ##__VA_ARGS__)
#define aest_dev_info(__adev, format, ...) \
@@ -47,6 +52,20 @@
#define ERXGROUP_16K_ERRGSR_NUM 4
#define ERXGROUP_64K_ERRGSR_NUM 14
+#define ERXFR 0x0
+#define ERXCTLR 0x8
+#define ERXSTATUS 0x10
+#define ERXADDR 0x18
+#define ERXMISC0 0x20
+#define ERXMISC1 0x28
+#define ERXMISC2 0x30
+#define ERXMISC3 0x38
+
+struct aest_access {
+ u64 (*read)(void *base, u32 offset);
+ void (*write)(void *base, u32 offset, u64 val);
+};
+
struct aest_record {
char *name;
int index;
@@ -63,6 +82,7 @@ struct aest_record {
*/
int addressing_mode;
struct aest_node *node;
+ const struct aest_access *access;
};
struct aest_group {
@@ -159,3 +179,77 @@ static inline int aest_set_name(struct aest_device *adev,
return 0;
}
+
+#define CASE_READ(res, x) \
+ case (x): { \
+ res = read_sysreg_s(SYS_##x##_EL1); \
+ break; \
+ }
+
+#define CASE_WRITE(val, x) \
+ case (x): { \
+ write_sysreg_s((val), SYS_##x##_EL1); \
+ break; \
+ }
+
+static inline u64 aest_sysreg_read(void *__unused, u32 offset)
+{
+ u64 res;
+
+ switch (offset) {
+ CASE_READ(res, ERXFR)
+ CASE_READ(res, ERXCTLR)
+ CASE_READ(res, ERXSTATUS)
+ CASE_READ(res, ERXADDR)
+ CASE_READ(res, ERXMISC0)
+ CASE_READ(res, ERXMISC1)
+ CASE_READ(res, ERXMISC2)
+ CASE_READ(res, ERXMISC3)
+ default :
+ res = 0;
+ }
+ return res;
+}
+
+static inline void aest_sysreg_write(void *base, u32 offset, u64 val)
+{
+ switch (offset) {
+ CASE_WRITE(val, ERXFR)
+ CASE_WRITE(val, ERXCTLR)
+ CASE_WRITE(val, ERXSTATUS)
+ CASE_WRITE(val, ERXADDR)
+ CASE_WRITE(val, ERXMISC0)
+ CASE_WRITE(val, ERXMISC1)
+ CASE_WRITE(val, ERXMISC2)
+ CASE_WRITE(val, ERXMISC3)
+ default :
+ return;
+ }
+}
+
+static inline u64 aest_iomem_read(void *base, u32 offset)
+{
+ return readq_relaxed(base + offset);
+}
+
+static inline void aest_iomem_write(void *base, u32 offset, u64 val)
+{
+ writeq_relaxed(val, base + offset);
+}
+
+/* access type is decided by AEST interface type. */
+static const struct aest_access aest_access[] = {
+ [ACPI_AEST_NODE_SYSTEM_REGISTER] = {
+ .read = aest_sysreg_read,
+ .write = aest_sysreg_write,
+ },
+ [ACPI_AEST_NODE_MEMORY_MAPPED] = {
+ .read = aest_iomem_read,
+ .write = aest_iomem_write,
+ },
+ [ACPI_AEST_NODE_SINGLE_RECORD_MEMORY_MAPPED] = {
+ .read = aest_iomem_read,
+ .write = aest_iomem_write,
+ },
+ { }
+};
--
2.51.2.612.gdc70283dfc
Powered by blists - more mailing lists