RAS/AMD/ATL: Validate address map when information is gathered

Validate address maps at the time the information is gathered as the
address map will not change during translation.

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-5-john.allen@amd.com

diff --git a/drivers/ras/amd/atl/dehash.c b/drivers/ras/amd/atl/dehash.c
index 4ea46262c4f588166ce4dd477e24629160d3f407..d4ee7ecabaeee0700d5d08e1126a7a323d2e785d 100644 (file)
--- a/drivers/ras/amd/atl/dehash.c
+++ b/drivers/ras/amd/atl/dehash.c
@@ -12,41 +12,10 @@
 
 #include "internal.h"
 
-/*
- * Verify the interleave bits are correct in the different interleaving
- * settings.
- *
- * If @num_intlv_dies and/or @num_intlv_sockets are 1, it means the
- * respective interleaving is disabled.
- */
-static inline bool map_bits_valid(struct addr_ctx *ctx, u8 bit1, u8 bit2,
-                                 u8 num_intlv_dies, u8 num_intlv_sockets)
-{
-       if (!(ctx->map.intlv_bit_pos == bit1 || ctx->map.intlv_bit_pos == bit2)) {
-               pr_debug("Invalid interleave bit: %u", ctx->map.intlv_bit_pos);
-               return false;
-       }
-
-       if (ctx->map.num_intlv_dies > num_intlv_dies) {
-               pr_debug("Invalid number of interleave dies: %u", ctx->map.num_intlv_dies);
-               return false;
-       }
-
-       if (ctx->map.num_intlv_sockets > num_intlv_sockets) {
-               pr_debug("Invalid number of interleave sockets: %u", ctx->map.num_intlv_sockets);
-               return false;
-       }
-
-       return true;
-}
-
 static int df2_dehash_addr(struct addr_ctx *ctx)
 {
        u8 hashed_bit, intlv_bit, intlv_bit_pos;
 
-       if (!map_bits_valid(ctx, 8, 9, 1, 1))
-               return -EINVAL;
-
        intlv_bit_pos = ctx->map.intlv_bit_pos;
        intlv_bit = !!(BIT_ULL(intlv_bit_pos) & ctx->ret_addr);
 
@@ -67,9 +36,6 @@ static int df3_dehash_addr(struct addr_ctx *ctx)
        bool hash_ctl_64k, hash_ctl_2M, hash_ctl_1G;
        u8 hashed_bit, intlv_bit, intlv_bit_pos;
 
-       if (!map_bits_valid(ctx, 8, 9, 1, 1))
-               return -EINVAL;
-
        hash_ctl_64k = FIELD_GET(DF3_HASH_CTL_64K, ctx->map.ctl);
        hash_ctl_2M  = FIELD_GET(DF3_HASH_CTL_2M, ctx->map.ctl);
        hash_ctl_1G  = FIELD_GET(DF3_HASH_CTL_1G, ctx->map.ctl);
@@ -171,9 +137,6 @@ static int df4_dehash_addr(struct addr_ctx *ctx)
        bool hash_ctl_64k, hash_ctl_2M, hash_ctl_1G;
        u8 hashed_bit, intlv_bit;
 
-       if (!map_bits_valid(ctx, 8, 8, 1, 2))
-               return -EINVAL;
-
        hash_ctl_64k = FIELD_GET(DF4_HASH_CTL_64K, ctx->map.ctl);
        hash_ctl_2M  = FIELD_GET(DF4_HASH_CTL_2M, ctx->map.ctl);
        hash_ctl_1G  = FIELD_GET(DF4_HASH_CTL_1G, ctx->map.ctl);
@@ -247,9 +210,6 @@ static int df4p5_dehash_addr(struct addr_ctx *ctx)
        u8 hashed_bit, intlv_bit;
        u64 rehash_vector;
 
-       if (!map_bits_valid(ctx, 8, 8, 1, 2))
-               return -EINVAL;
-
        hash_ctl_64k = FIELD_GET(DF4_HASH_CTL_64K, ctx->map.ctl);
        hash_ctl_2M  = FIELD_GET(DF4_HASH_CTL_2M, ctx->map.ctl);
        hash_ctl_1G  = FIELD_GET(DF4_HASH_CTL_1G, ctx->map.ctl);
@@ -360,9 +320,6 @@ static int mi300_dehash_addr(struct addr_ctx *ctx)
        bool hashed_bit, intlv_bit, test_bit;
        u8 num_intlv_bits, base_bit, i;
 
-       if (!map_bits_valid(ctx, 8, 8, 4, 1))
-               return -EINVAL;
-
        hash_ctl_4k  = FIELD_GET(DF4p5_HASH_CTL_4K, ctx->map.ctl);
        hash_ctl_64k = FIELD_GET(DF4_HASH_CTL_64K,  ctx->map.ctl);
        hash_ctl_2M  = FIELD_GET(DF4_HASH_CTL_2M,   ctx->map.ctl);

diff --git a/drivers/ras/amd/atl/map.c b/drivers/ras/amd/atl/map.c
index 8b908e8d7495f2a525492a0ed865b0fde7a53037..04419923f0884eb81f812a7f252e460bdc17cdc2 100644 (file)
--- a/drivers/ras/amd/atl/map.c
+++ b/drivers/ras/amd/atl/map.c
@@ -642,6 +642,79 @@ static int get_global_map_data(struct addr_ctx *ctx)
        return 0;
 }
 
+/*
+ * Verify the interleave bits are correct in the different interleaving
+ * settings.
+ *
+ * If @num_intlv_dies and/or @num_intlv_sockets are 1, it means the
+ * respective interleaving is disabled.
+ */
+static inline bool map_bits_valid(struct addr_ctx *ctx, u8 bit1, u8 bit2,
+                                 u8 num_intlv_dies, u8 num_intlv_sockets)
+{
+       if (!(ctx->map.intlv_bit_pos == bit1 || ctx->map.intlv_bit_pos == bit2)) {
+               pr_debug("Invalid interleave bit: %u", ctx->map.intlv_bit_pos);
+               return false;
+       }
+
+       if (ctx->map.num_intlv_dies > num_intlv_dies) {
+               pr_debug("Invalid number of interleave dies: %u", ctx->map.num_intlv_dies);
+               return false;
+       }
+
+       if (ctx->map.num_intlv_sockets > num_intlv_sockets) {
+               pr_debug("Invalid number of interleave sockets: %u", ctx->map.num_intlv_sockets);
+               return false;
+       }
+
+       return true;
+}
+
+static int validate_address_map(struct addr_ctx *ctx)
+{
+       switch (ctx->map.intlv_mode) {
+       case DF2_2CHAN_HASH:
+       case DF3_COD4_2CHAN_HASH:
+       case DF3_COD2_4CHAN_HASH:
+       case DF3_COD1_8CHAN_HASH:
+               if (!map_bits_valid(ctx, 8, 9, 1, 1))
+                       goto err;
+               break;
+
+       case DF4_NPS4_2CHAN_HASH:
+       case DF4_NPS2_4CHAN_HASH:
+       case DF4_NPS1_8CHAN_HASH:
+       case DF4p5_NPS4_2CHAN_1K_HASH:
+       case DF4p5_NPS4_2CHAN_2K_HASH:
+       case DF4p5_NPS2_4CHAN_1K_HASH:
+       case DF4p5_NPS2_4CHAN_2K_HASH:
+       case DF4p5_NPS1_8CHAN_1K_HASH:
+       case DF4p5_NPS1_8CHAN_2K_HASH:
+       case DF4p5_NPS1_16CHAN_1K_HASH:
+       case DF4p5_NPS1_16CHAN_2K_HASH:
+               if (!map_bits_valid(ctx, 8, 8, 1, 2))
+                       goto err;
+               break;
+
+       case MI3_HASH_8CHAN:
+       case MI3_HASH_16CHAN:
+       case MI3_HASH_32CHAN:
+               if (!map_bits_valid(ctx, 8, 8, 4, 1))
+                       goto err;
+               break;
+
+       /* Nothing to do for modes that don't need special validation checks. */
+       default:
+               break;
+       }
+
+       return 0;
+
+err:
+       atl_debug(ctx, "Inconsistent address map");
+       return -EINVAL;
+}
+
 static void dump_address_map(struct dram_addr_map *map)
 {
        u8 i;
@@ -678,5 +751,9 @@ int get_address_map(struct addr_ctx *ctx)
 
        dump_address_map(&ctx->map);
 
+       ret = validate_address_map(ctx);
+       if (ret)
+               return ret;
+
        return ret;
 }