[PATCH 12/25] x86/MCE/AMD: Define function to get Interleave Address Bit
From: Yazen Ghannam
Date: Fri May 07 2021 - 15:02:29 EST
From: Yazen Ghannam <yazen.ghannam@xxxxxxx>
Move code to find the interleave address bit into a separate helper
function.
Signed-off-by: Yazen Ghannam <yazen.ghannam@xxxxxxx>
---
arch/x86/kernel/cpu/mce/amd.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c
index 58899c57eb76..a60d9d275d14 100644
--- a/arch/x86/kernel/cpu/mce/amd.c
+++ b/arch/x86/kernel/cpu/mce/amd.c
@@ -814,14 +814,9 @@ static int get_dram_addr_map(struct addr_ctx *ctx)
return 0;
}
-static int denormalize_addr(struct addr_ctx *ctx)
+static int get_intlv_addr_bit(struct addr_ctx *ctx)
{
- u32 tmp;
-
- u8 die_id_shift, die_id_mask, socket_id_shift, socket_id_mask;
- u8 intlv_num_dies, intlv_num_chan, intlv_num_sockets;
u8 intlv_addr_sel = (ctx->reg_base_addr >> 8) & 0x7;
- u8 num_intlv_bits, cs_mask = 0;
/* {0, 1, 2, 3} map to address bits {8, 9, 10, 11} respectively */
if (intlv_addr_sel > 3) {
@@ -830,11 +825,25 @@ static int denormalize_addr(struct addr_ctx *ctx)
return -EINVAL;
}
+ ctx->intlv_addr_bit = intlv_addr_sel + 8;
+
+ return 0;
+}
+
+static int denormalize_addr(struct addr_ctx *ctx)
+{
+ u32 tmp;
+
+ u8 die_id_shift, die_id_mask, socket_id_shift, socket_id_mask;
+ u8 intlv_num_dies, intlv_num_chan, intlv_num_sockets;
+ u8 num_intlv_bits, cs_mask = 0;
+
+ if (get_intlv_addr_bit(ctx))
+ return -EINVAL;
+
intlv_num_sockets = (ctx->reg_limit_addr >> 8) & 0x1;
intlv_num_dies = (ctx->reg_limit_addr >> 10) & 0x3;
- ctx->intlv_addr_bit = intlv_addr_sel + 8;
-
/* Re-use intlv_num_chan by setting it equal to log2(#channels) */
switch (intlv_num_chan) {
case 0: intlv_num_chan = 0; break;
--
2.25.1