[PATCH v3 12/33] EDAC/amd64: Define function to check DRAM limit address

From: Yazen Ghannam
Date: Thu Oct 28 2021 - 13:59:03 EST


Move the DRAM limit check into a separate helper function.

Signed-off-by: Yazen Ghannam <yazen.ghannam@xxxxxxx>
---
Link:
https://lkml.kernel.org/r/20210623192002.3671647-14-yazen.ghannam@xxxxxxx

v2->v3:
* Was patch 13 in v2.

v1->v2:
* Moved from arch/x86 to EDAC.

drivers/edac/amd64_edac.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index d7a2f621fdc0..b0bf9dd0ba34 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -1316,10 +1316,20 @@ static int add_base_and_hole(struct addr_ctx *ctx)
return 0;
}

-static int umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *sys_addr)
+static int addr_over_limit(struct addr_ctx *ctx)
{
- u64 dram_limit_addr;
+ u64 dram_limit_addr = ((ctx->reg_limit_addr & GENMASK_ULL(31, 12)) << 16)
+ | GENMASK_ULL(27, 0);
+
+ /* Is calculated system address above DRAM limit address? */
+ if (ctx->ret_addr > dram_limit_addr)
+ return -EINVAL;

+ return 0;
+}
+
+static int umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *sys_addr)
+{
struct addr_ctx ctx;

if (!df_ops)
@@ -1345,16 +1355,13 @@ static int umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *sys_addr
if (denormalize_addr(&ctx))
goto out_err;

- dram_limit_addr = ((ctx.reg_limit_addr & GENMASK_ULL(31, 12)) << 16) | GENMASK_ULL(27, 0);
-
if (add_base_and_hole(&ctx))
goto out_err;

if (ctx.dehash_addr && ctx.dehash_addr(&ctx))
goto out_err;

- /* Is calculated system address is above DRAM limit address? */
- if (ctx.ret_addr > dram_limit_addr)
+ if (addr_over_limit(&ctx))
goto out_err;

*sys_addr = ctx.ret_addr;
--
2.25.1