lkml.org 
[lkml]   [2021]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 16/25] x86/MCE/AMD: Define function to get number of interleaved sockets
Date
From: Yazen Ghannam <yazen.ghannam@amd.com>

Move parsing of the number of interleaved sockets to a separate helper
function. This will be expanded for future DF versions.

Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
arch/x86/kernel/cpu/mce/amd.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c
index de59fa6cf540..670787be705d 100644
--- a/arch/x86/kernel/cpu/mce/amd.c
+++ b/arch/x86/kernel/cpu/mce/amd.c
@@ -731,6 +731,7 @@ struct addr_ctx {
u8 intlv_addr_bit;
u8 intlv_num_chan;
u8 intlv_num_dies;
+ u8 intlv_num_sockets;
u8 cs_id;
bool hash_enabled;
};
@@ -854,12 +855,16 @@ static void get_intlv_num_dies(struct addr_ctx *ctx)
ctx->intlv_num_dies = (ctx->reg_limit_addr >> 10) & 0x3;
}

+static void get_intlv_num_sockets(struct addr_ctx *ctx)
+{
+ ctx->intlv_num_sockets = (ctx->reg_limit_addr >> 8) & 0x1;
+}
+
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_sockets;
u8 num_intlv_bits, cs_mask = 0;

/* Return early if no interleaving. */
@@ -869,16 +874,13 @@ static int denormalize_addr(struct addr_ctx *ctx)
if (get_intlv_addr_bit(ctx))
return -EINVAL;

- intlv_num_sockets = (ctx->reg_limit_addr >> 8) & 0x1;
-
get_intlv_num_chan(ctx);
get_intlv_num_dies(ctx);
+ get_intlv_num_sockets(ctx);

num_intlv_bits = ctx->intlv_num_chan;
num_intlv_bits += ctx->intlv_num_dies;
-
- /* Add a bit if sockets are interleaved. */
- num_intlv_bits += intlv_num_sockets;
+ num_intlv_bits += ctx->intlv_num_sockets;

/* Assert num_intlv_bits <= 4 */
if (num_intlv_bits > 4) {
@@ -912,7 +914,7 @@ static int denormalize_addr(struct addr_ctx *ctx)

sock_id_bit = die_id_bit;

- if (ctx->intlv_num_dies || intlv_num_sockets)
+ if (ctx->intlv_num_dies || ctx->intlv_num_sockets)
if (amd_df_indirect_read(ctx->nid, df_regs[SYS_FAB_ID_MASK],
ctx->umc, &tmp))
return -EINVAL;
@@ -928,7 +930,7 @@ static int denormalize_addr(struct addr_ctx *ctx)
}

/* If interleaved over more than 1 socket. */
- if (intlv_num_sockets) {
+ if (ctx->intlv_num_sockets) {
socket_id_shift = (tmp >> 28) & 0xF;
socket_id_mask = (tmp >> 16) & 0xFF;

--
2.25.1
\
 
 \ /
  Last update: 2021-05-07 21:03    [W:0.369 / U:0.080 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site