Messages in this thread Patch in this message | | | From | Yazen Ghannam <> | Subject | [PATCH v2 16/31] EDAC/amd64: Define function to get Interleave Address Bit | Date | Wed, 23 Jun 2021 19:19:47 +0000 |
| |
Move code to find the interleave address bit into a separate helper function.
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com> --- Link: https://lkml.kernel.org/r/20210507190140.18854-13-Yazen.Ghannam@amd.com
v1->v2: * Moved from arch/x86 to EDAC.
drivers/edac/amd64_edac.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 496ca863f45a..233f8cec4fe8 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -1211,27 +1211,35 @@ static int get_dram_addr_map(struct addr_ctx *ctx) return 0; } +static int get_intlv_addr_bit(struct addr_ctx *ctx) +{ + u8 intlv_addr_sel = (ctx->reg_base_addr >> 8) & 0x7; + + /* {0, 1, 2, 3} map to address bits {8, 9, 10, 11} respectively */ + if (intlv_addr_sel > 3) { + pr_debug("Invalid interleave address select %d.\n", intlv_addr_sel); + 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 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) { - pr_err("%s: Invalid interleave address select %d.\n", - __func__, intlv_addr_sel); + 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
| |