lkml.org 
[lkml]   [2021]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 19/31] EDAC/amd64: Define function to get number of interleaved dies
Date
Move parsing of the number of interleaved dies to a separate helper
function. This will be expanded for future DF versions. Also, drop an
unneeded assert to match the reference code.

Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
Link:
https://lkml.kernel.org/r/20210507190140.18854-16-Yazen.Ghannam@amd.com

v1->v2:
* Moved from arch/x86 to EDAC.
* Add new function to data_fabric_ops.

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

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 80192a05bb93..360fbecf0d8b 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -1098,6 +1098,7 @@ struct addr_ctx {
u8 map_num;
u8 intlv_addr_bit;
u8 intlv_num_chan;
+ u8 intlv_num_dies;
u8 cs_id;
int (*dehash_addr)(struct addr_ctx *ctx);
};
@@ -1105,6 +1106,7 @@ struct addr_ctx {
struct data_fabric_ops {
u64 (*get_hi_addr_offset)(struct addr_ctx *ctx);
int (*get_intlv_mode)(struct addr_ctx *ctx);
+ void (*get_intlv_num_dies)(struct addr_ctx *ctx);
};

static u64 get_hi_addr_offset_df2(struct addr_ctx *ctx)
@@ -1145,9 +1147,15 @@ static int get_intlv_mode_df2(struct addr_ctx *ctx)
return 0;
}

+static void get_intlv_num_dies_df2(struct addr_ctx *ctx)
+{
+ ctx->intlv_num_dies = (ctx->reg_limit_addr >> 10) & 0x3;
+}
+
struct data_fabric_ops df2_ops = {
.get_hi_addr_offset = &get_hi_addr_offset_df2,
.get_intlv_mode = &get_intlv_mode_df2,
+ .get_intlv_num_dies = &get_intlv_num_dies_df2,
};

struct data_fabric_ops *df_ops;
@@ -1249,7 +1257,7 @@ 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_sockets;
+ u8 intlv_num_sockets;
u8 num_intlv_bits, cs_mask = 0;

/* Return early if no interleaving. */
@@ -1260,19 +1268,12 @@ static int denormalize_addr(struct addr_ctx *ctx)
return -EINVAL;

intlv_num_sockets = (ctx->reg_limit_addr >> 8) & 0x1;
- intlv_num_dies = (ctx->reg_limit_addr >> 10) & 0x3;

get_intlv_num_chan(ctx);
+ df_ops->get_intlv_num_dies(ctx);

num_intlv_bits = ctx->intlv_num_chan;
-
- if (intlv_num_dies > 2) {
- pr_err("%s: Invalid number of interleaved nodes/dies %d.\n",
- __func__, intlv_num_dies);
- return -EINVAL;
- }
-
- num_intlv_bits += intlv_num_dies;
+ num_intlv_bits += ctx->intlv_num_dies;

/* Add a bit if sockets are interleaved. */
num_intlv_bits += intlv_num_sockets;
@@ -1310,14 +1311,14 @@ static int denormalize_addr(struct addr_ctx *ctx)

sock_id_bit = die_id_bit;

- if (intlv_num_dies || intlv_num_sockets)
+ if (ctx->intlv_num_dies || intlv_num_sockets)
if (amd_df_indirect_read(ctx->nid, df_regs[SYS_FAB_ID_MASK],
ctx->inst_id, &tmp))
return -EINVAL;

/* If interleaved over more than 1 die. */
- if (intlv_num_dies) {
- sock_id_bit = die_id_bit + intlv_num_dies;
+ if (ctx->intlv_num_dies) {
+ sock_id_bit = die_id_bit + ctx->intlv_num_dies;
die_id_shift = (tmp >> 24) & 0xF;
die_id_mask = (tmp >> 8) & 0xFF;

--
2.25.1
\
 
 \ /
  Last update: 2021-06-23 21:21    [W:0.506 / U:0.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site