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 16/24] EDAC/amd64: Define function to make space for CS ID
Date: Thu, 27 Jan 2022 20:41:07 +0000 [thread overview]
Message-ID: <20220127204115.384161-17-yazen.ghannam@amd.com> (raw)
In-Reply-To: <20220127204115.384161-1-yazen.ghannam@amd.com>
Move code that makes a gap for the CS ID into a separate helper function.
The exact bits to use vary based on interleaving mode. New interleaving
modes in future DF versions will be added as new cases.
Also, introduce a helper function that does the bit manipulation to make
the gap. The current version of this function is "simple", and future
interleaving modes may reuse this or use a more advanced function.
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
Link:
https://lore.kernel.org/r/20211028175728.121452-22-yazen.ghannam@amd.com
v3->v4:
* Added glossary entry.
v2->v3:
* Was patch 22 in v2.
v1->v2:
* Moved from arch/x86 to EDAC.
* Added new function pointer to ctx struct.
drivers/edac/amd64_edac.c | 38 ++++++++++++++++++++++++++++++--------
1 file changed, 30 insertions(+), 8 deletions(-)
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index c3342f0bec45..f5b1902e04ac 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -991,6 +991,7 @@ static int sys_addr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr)
/*
* Glossary of acronyms used in address translation for Zen-based systems
*
+ * CS = Coherent Slave
* DF = Data Fabric
*/
@@ -1081,6 +1082,7 @@ struct addr_ctx {
u8 intlv_num_sockets;
u8 cs_id;
int (*dehash_addr)(struct addr_ctx *ctx);
+ void (*make_space_for_cs_id)(struct addr_ctx *ctx);
};
struct data_fabric_ops {
@@ -1090,6 +1092,29 @@ struct data_fabric_ops {
void (*get_intlv_num_sockets)(struct addr_ctx *ctx);
};
+static void expand_bits(u8 start_bit, u8 num_bits, u64 *value)
+{
+ u64 temp1, temp2;
+
+ if (start_bit == 0) {
+ *value <<= num_bits;
+ return;
+ }
+
+ temp1 = *value & GENMASK_ULL(start_bit - 1, 0);
+ temp2 = (*value & GENMASK_ULL(63, start_bit)) << num_bits;
+ *value = temp1 | temp2;
+}
+
+static void make_space_for_cs_id_simple(struct addr_ctx *ctx)
+{
+ u8 num_intlv_bits = ctx->intlv_num_chan;
+
+ num_intlv_bits += ctx->intlv_num_dies;
+ num_intlv_bits += ctx->intlv_num_sockets;
+ expand_bits(ctx->intlv_addr_bit, num_intlv_bits, &ctx->ret_addr);
+}
+
static u64 get_hi_addr_offset_df2(struct addr_ctx *ctx)
{
return (ctx->reg_dram_offset & GENMASK_ULL(31, 20)) << 8;
@@ -1120,6 +1145,8 @@ static int get_intlv_mode_df2(struct addr_ctx *ctx)
ctx->dehash_addr = dehash_addr_df2;
}
+ ctx->make_space_for_cs_id = make_space_for_cs_id_simple;
+
if (ctx->intlv_mode != NONE &&
ctx->intlv_mode != NOHASH_2CH &&
ctx->intlv_mode != DF2_HASH_2CH)
@@ -1247,13 +1274,11 @@ static int denormalize_addr(struct addr_ctx *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;
- num_intlv_bits += ctx->intlv_num_sockets;
+ ctx->make_space_for_cs_id(ctx);
if (num_intlv_bits > 0) {
- u64 temp_addr_x, temp_addr_i, temp_addr_y;
u8 die_id_bit, sock_id_bit, cs_fabric_id;
+ u64 temp_addr_i;
/*
* Read FabricBlockInstanceInformation3_CS[BlockFabricID].
@@ -1308,11 +1333,8 @@ static int denormalize_addr(struct addr_ctx *ctx)
* bits there are. "intlv_addr_bit" tells us how many "Y" bits
* there are (where "I" starts).
*/
- temp_addr_y = ctx->ret_addr & GENMASK_ULL(ctx->intlv_addr_bit - 1, 0);
temp_addr_i = (ctx->cs_id << ctx->intlv_addr_bit);
- temp_addr_x = (ctx->ret_addr & GENMASK_ULL(63, ctx->intlv_addr_bit))
- << num_intlv_bits;
- ctx->ret_addr = temp_addr_x | temp_addr_i | temp_addr_y;
+ ctx->ret_addr |= temp_addr_i;
}
return 0;
--
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 ` [PATCH v4 14/24] EDAC/amd64: Define function to get number of interleaved sockets Yazen Ghannam
2022-01-27 20:41 ` [PATCH v4 15/24] EDAC/amd64: Remove unnecessary assert Yazen Ghannam
2022-01-27 20:41 ` Yazen Ghannam [this message]
2022-02-14 12:50 ` [PATCH v4 16/24] EDAC/amd64: Define function to make space for CS ID 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-17-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).