RAS/AMD/ATL: Expand helpers for adding and removing base and hole

The ret_addr field in struct addr_ctx contains the intermediate value of
the returned address as it passes through multiple steps in the
translation process. Currently, adding the DRAM base and legacy hole
is only done once, so it operates directly on the intermediate value.

However, for DF 4.5 non-power-of-2 denormalization, adding and removing
the DRAM base and legacy hole needs to be done for multiple temporary
address values. During this process, the intermediate value should not be
lost so the ret_addr value can't be reused.

Update the existing 'add' helper to operate on an arbitrary address
and introduce a new 'remove' helper to do the inverse operations.

Signed-off-by: John Allen <john.allen@amd.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Yazen Ghannam <yazen.ghannam@amd.com>
Link: https://lore.kernel.org/r/20240606203313.51197-4-john.allen@amd.com

diff --git a/drivers/ras/amd/atl/core.c b/drivers/ras/amd/atl/core.c
index 82f77f129d541903e7f05dfb9aba0772db0718cb..7cdf7769c18972d7349cc926057e294bb3fd0d88 100644 (file)
--- a/drivers/ras/amd/atl/core.c
+++ b/drivers/ras/amd/atl/core.c
@@ -49,15 +49,26 @@ static bool legacy_hole_en(struct addr_ctx *ctx)
        return FIELD_GET(DF_LEGACY_MMIO_HOLE_EN, reg);
 }
 
-static int add_legacy_hole(struct addr_ctx *ctx)
+static u64 add_legacy_hole(struct addr_ctx *ctx, u64 addr)
 {
        if (!legacy_hole_en(ctx))
-               return 0;
+               return addr;
 
-       if (ctx->ret_addr >= df_cfg.dram_hole_base)
-               ctx->ret_addr += (BIT_ULL(32) - df_cfg.dram_hole_base);
+       if (addr >= df_cfg.dram_hole_base)
+               addr += (BIT_ULL(32) - df_cfg.dram_hole_base);
 
-       return 0;
+       return addr;
+}
+
+static u64 remove_legacy_hole(struct addr_ctx *ctx, u64 addr)
+{
+       if (!legacy_hole_en(ctx))
+               return addr;
+
+       if (addr >= df_cfg.dram_hole_base)
+               addr -= (BIT_ULL(32) - df_cfg.dram_hole_base);
+
+       return addr;
 }
 
 static u64 get_base_addr(struct addr_ctx *ctx)
@@ -72,14 +83,14 @@ static u64 get_base_addr(struct addr_ctx *ctx)
        return base_addr << DF_DRAM_BASE_LIMIT_LSB;
 }
 
-static int add_base_and_hole(struct addr_ctx *ctx)
+u64 add_base_and_hole(struct addr_ctx *ctx, u64 addr)
 {
-       ctx->ret_addr += get_base_addr(ctx);
-
-       if (add_legacy_hole(ctx))
-               return -EINVAL;
+       return add_legacy_hole(ctx, addr + get_base_addr(ctx));
+}
 
-       return 0;
+u64 remove_base_and_hole(struct addr_ctx *ctx, u64 addr)
+{
+       return remove_legacy_hole(ctx, addr) - get_base_addr(ctx);
 }
 
 static bool late_hole_remove(struct addr_ctx *ctx)
@@ -126,14 +137,14 @@ unsigned long norm_to_sys_addr(u8 socket_id, u8 die_id, u8 coh_st_inst_id, unsig
        if (denormalize_address(&ctx))
                return -EINVAL;
 
-       if (!late_hole_remove(&ctx) && add_base_and_hole(&ctx))
-               return -EINVAL;
+       if (!late_hole_remove(&ctx))
+               ctx.ret_addr = add_base_and_hole(&ctx, ctx.ret_addr);
 
        if (dehash_address(&ctx))
                return -EINVAL;
 
-       if (late_hole_remove(&ctx) && add_base_and_hole(&ctx))
-               return -EINVAL;
+       if (late_hole_remove(&ctx))
+               ctx.ret_addr = add_base_and_hole(&ctx, ctx.ret_addr);
 
        if (addr_over_limit(&ctx))
                return -EINVAL;

diff --git a/drivers/ras/amd/atl/internal.h b/drivers/ras/amd/atl/internal.h
index 3596ad5ca3e0b9a134ccf0d899898987d2dbd23d..f623ac23e4b9b07ac73c8507dd87fc4e58e65106 100644 (file)
--- a/drivers/ras/amd/atl/internal.h
+++ b/drivers/ras/amd/atl/internal.h
@@ -239,6 +239,9 @@ int dehash_address(struct addr_ctx *ctx);
 unsigned long norm_to_sys_addr(u8 socket_id, u8 die_id, u8 coh_st_inst_id, unsigned long addr);
 unsigned long convert_umc_mca_addr_to_sys_addr(struct atl_err *err);
 
+u64 add_base_and_hole(struct addr_ctx *ctx, u64 addr);
+u64 remove_base_and_hole(struct addr_ctx *ctx, u64 addr);
+
 /*
  * Make a gap in @data that is @num_bits long starting at @bit_num.
  * e.g. data           = 11111111'b