From: Yazen Ghannam <yazen.ghannam@amd.com>
To: <linux-edac@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <bp@alien8.de>,
<mchehab@kernel.org>, <tony.luck@intel.com>,
<james.morse@arm.com>, <rric@kernel.org>,
<Smita.KoralahalliChannabasappa@amd.com>,
Yazen Ghannam <yazen.ghannam@amd.com>
Subject: [PATCH v4 14/24] EDAC/amd64: Define function to get number of interleaved sockets
Date: Thu, 27 Jan 2022 20:41:05 +0000 [thread overview]
Message-ID: <20220127204115.384161-15-yazen.ghannam@amd.com> (raw)
In-Reply-To: <20220127204115.384161-1-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>
---
Link:
https://lore.kernel.org/r/20211028175728.121452-20-yazen.ghannam@amd.com
v3->v4:
* Remove leading whitespace in function pointer.
v2->v3:
* Was patch 20 in v2.
v1->v2:
* Moved from arch/x86 to EDAC.
* Add new function to data_fabric_ops.
drivers/edac/amd64_edac.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 2973b7b5e8a2..898f53eaaff3 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -1078,6 +1078,7 @@ struct addr_ctx {
u8 intlv_addr_bit;
u8 intlv_num_chan;
u8 intlv_num_dies;
+ u8 intlv_num_sockets;
u8 cs_id;
int (*dehash_addr)(struct addr_ctx *ctx);
};
@@ -1086,6 +1087,7 @@ 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);
+ void (*get_intlv_num_sockets)(struct addr_ctx *ctx);
};
static u64 get_hi_addr_offset_df2(struct addr_ctx *ctx)
@@ -1131,10 +1133,16 @@ static void get_intlv_num_dies_df2(struct addr_ctx *ctx)
ctx->intlv_num_dies = (ctx->reg_limit_addr >> 10) & 0x3;
}
+static void get_intlv_num_sockets_df2(struct addr_ctx *ctx)
+{
+ ctx->intlv_num_sockets = (ctx->reg_limit_addr >> 8) & 0x1;
+}
+
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,
+ .get_intlv_num_sockets = get_intlv_num_sockets_df2,
};
struct data_fabric_ops *df_ops;
@@ -1226,7 +1234,6 @@ static void get_intlv_num_chan(struct addr_ctx *ctx)
static int denormalize_addr(struct addr_ctx *ctx)
{
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. */
@@ -1236,16 +1243,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);
df_ops->get_intlv_num_dies(ctx);
+ df_ops->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) {
@@ -1280,7 +1284,7 @@ static int denormalize_addr(struct addr_ctx *ctx)
sock_id_bit = die_id_bit;
/* Read D18F1x208 (SystemFabricIdMask). */
- if (ctx->intlv_num_dies || intlv_num_sockets)
+ if (ctx->intlv_num_dies || ctx->intlv_num_sockets)
if (df_indirect_read_broadcast(ctx->nid, 1, 0x208, &ctx->tmp))
return -EINVAL;
@@ -1295,7 +1299,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 = (ctx->tmp >> 28) & 0xF;
socket_id_mask = (ctx->tmp >> 16) & 0xFF;
--
2.25.1
next prev parent reply other threads:[~2022-01-27 20:42 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-27 20:40 [PATCH v4 00/24] AMD MCA Address Translation Updates Yazen Ghannam
2022-01-27 20:40 ` [PATCH v4 01/24] EDAC/amd64: Define Data Fabric operations Yazen Ghannam
2022-02-11 19:10 ` Borislav Petkov
2022-03-09 21:42 ` Yazen Ghannam
2022-01-27 20:40 ` [PATCH v4 02/24] EDAC/amd64: Define functions for DramOffset Yazen Ghannam
2022-02-11 19:23 ` Borislav Petkov
2022-03-09 21:43 ` Yazen Ghannam
2022-01-27 20:40 ` [PATCH v4 03/24] EDAC/amd64: Define function to read DRAM address map registers Yazen Ghannam
2022-01-27 20:40 ` [PATCH v4 04/24] EDAC/amd64: Define function to find interleaving mode Yazen Ghannam
2022-01-27 20:40 ` [PATCH v4 05/24] EDAC/amd64: Define function to denormalize address Yazen Ghannam
2022-01-27 20:40 ` [PATCH v4 06/24] EDAC/amd64: Define function to add DRAM base and hole Yazen Ghannam
2022-01-27 20:40 ` [PATCH v4 07/24] EDAC/amd64: Define function to dehash address Yazen Ghannam
2022-02-11 22:47 ` Borislav Petkov
2022-03-09 21:50 ` Yazen Ghannam
2022-03-10 16:01 ` Borislav Petkov
2022-01-27 20:40 ` [PATCH v4 08/24] EDAC/amd64: Define function to check DRAM limit address Yazen Ghannam
2022-02-14 10:06 ` Borislav Petkov
2022-03-09 22:03 ` Yazen Ghannam
2022-01-27 20:41 ` [PATCH v4 09/24] EDAC/amd64: Remove goto statements Yazen Ghannam
2022-01-27 20:41 ` [PATCH v4 10/24] EDAC/amd64: Define function to get Interleave Address Bit Yazen Ghannam
2022-02-14 12:10 ` Borislav Petkov
2022-03-09 22:12 ` Yazen Ghannam
2022-03-10 16:09 ` Borislav Petkov
2022-01-27 20:41 ` [PATCH v4 11/24] EDAC/amd64: Skip denormalization if no interleaving Yazen Ghannam
2022-01-27 20:41 ` [PATCH v4 12/24] EDAC/amd64: Define function to get number of interleaved channels Yazen Ghannam
2022-02-14 12:20 ` Borislav Petkov
2022-03-09 22:13 ` Yazen Ghannam
2022-01-27 20:41 ` [PATCH v4 13/24] EDAC/amd64: Define function to get number of interleaved dies Yazen Ghannam
2022-01-27 20:41 ` Yazen Ghannam [this message]
2022-01-27 20:41 ` [PATCH v4 15/24] EDAC/amd64: Remove unnecessary assert Yazen Ghannam
2022-01-27 20:41 ` [PATCH v4 16/24] EDAC/amd64: Define function to make space for CS ID Yazen Ghannam
2022-02-14 12:50 ` Borislav Petkov
2022-03-09 22:25 ` Yazen Ghannam
2022-03-11 21:00 ` Borislav Petkov
2022-01-27 20:41 ` [PATCH v4 17/24] EDAC/amd64: Define function to calculate " Yazen Ghannam
2022-01-27 20:41 ` [PATCH v4 18/24] EDAC/amd64: Define function to insert CS ID into address Yazen Ghannam
2022-02-14 13:09 ` Borislav Petkov
2022-03-09 22:31 ` Yazen Ghannam
2022-01-27 20:41 ` [PATCH v4 19/24] EDAC/amd64: Define function to get CS Fabric ID Yazen Ghannam
2022-01-27 20:41 ` [PATCH v4 20/24] EDAC/amd64: Define function to find shift and mask values Yazen Ghannam
2022-01-27 20:41 ` [PATCH v4 21/24] EDAC/amd64: Update CS ID calculation to match reference code Yazen Ghannam
2022-02-14 13:42 ` Borislav Petkov
2022-03-09 22:32 ` Yazen Ghannam
2022-01-27 20:41 ` [PATCH v4 22/24] EDAC/amd64: Match hash function to " Yazen Ghannam
2022-01-27 20:41 ` [PATCH v4 23/24] EDAC/amd64: Define function to get interleave address select bit Yazen Ghannam
2022-01-27 20:41 ` [PATCH v4 24/24] EDAC/amd64: Add support for address translation on DF3 systems Yazen Ghannam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220127204115.384161-15-yazen.ghannam@amd.com \
--to=yazen.ghannam@amd.com \
--cc=Smita.KoralahalliChannabasappa@amd.com \
--cc=bp@alien8.de \
--cc=james.morse@arm.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=rric@kernel.org \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).