summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2026-08-28 08:30:01 -0700
committerTony Luck <tony.luck@intel.com>2026-09-08 13:49:15 -0700
commit4835abed9f652de1bea8957b867b8479505caa74 (patch)
tree1ed22e74ba52ce47694b959c07d096e816c32a80
parent666192e18fafde5259360a7b8e6b030386d7edcb (diff)
downloadlinux-next-4835abed9f652de1bea8957b867b8479505caa74.tar.gz
linux-next-4835abed9f652de1bea8957b867b8479505caa74.zip
EDAC/intel-bff: Compute unique ID for overflowed filter
Each L2 cache instance has its own bitfix filter, but always reports errors in machine check bank 3 (on Diamond Rapids). Compute a unique bitfix filter instance number based on the CPU that logged the error and the machine check bank number. Special-case the banks associated with the Integrated Memory Hub (IMH). Here the "even" numbered CPU modules are associated with IMH0 and the "odd" modules with IMH1. The unique id will be used to store a time stamp of when the bitfix filter overflowed so that frequent overflows can be logged. Co-developed-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com> Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com> Signed-off-by: Tony Luck <tony.luck@intel.com> Link: https://patch.msgid.link/20260828153002.10290-7-tony.luck@intel.com
-rw-r--r--drivers/edac/intel-bff.c80
1 files changed, 80 insertions, 0 deletions
diff --git a/drivers/edac/intel-bff.c b/drivers/edac/intel-bff.c
index c46d5255f34b..06a79745c2fb 100644
--- a/drivers/edac/intel-bff.c
+++ b/drivers/edac/intel-bff.c
@@ -19,13 +19,18 @@
#include <linux/bitfield.h>
#include <linux/bits.h>
+#include <linux/cacheinfo.h>
+#include <linux/cleanup.h>
#include <linux/cpufeature.h>
+#include <linux/cpuhplock.h>
#include <linux/device-id/x86_cpu.h>
#include <linux/errno.h>
#include <linux/init.h>
+#include <linux/limits.h>
#include <linux/module.h>
#include <linux/notifier.h>
#include <linux/printk.h>
+#include <linux/topology.h>
#include <linux/types.h>
#include <asm/cpu_device_id.h>
@@ -72,12 +77,87 @@ MODULE_DEVICE_TABLE(x86cpu, bff_cpu_ids);
static const enum bff_bank_type *bff_bank_types;
+/* Diamond Rapids maps APICID[2] to the IMH instance within a socket. */
+#define APICID_IMH_NUM GENMASK(2, 2)
+#define IMH_NUM(apicid) FIELD_GET(APICID_IMH_NUM, apicid)
+#define NUM_IMH_PER_SOCKET 2
+
+static void bff_set_imh_id(struct mce *mce, unsigned long *id)
+{
+ int imh_num;
+
+ imh_num = NUM_IMH_PER_SOCKET * topology_physical_package_id(mce->extcpu) +
+ IMH_NUM(mce->apicid);
+
+ *id |= imh_num;
+}
+
+static bool bff_set_cache_id(int cpu, int level, unsigned long *id)
+{
+ int cacheid;
+
+ guard(cpus_read_lock)();
+
+ cacheid = get_cpu_cacheinfo_id(cpu, level);
+ if (cacheid == -1) {
+ pr_warn("Could not get L%d cache id for CPU %d\n", level, cpu);
+ return false;
+ }
+
+ *id |= cacheid;
+
+ return true;
+}
+
+/*
+ * Cache IDs are only unique within a cache level.
+ * Include the MCA bank number so each BFF-capable hardware
+ * resource has a unique tracking ID.
+ */
+#define BFF_ID_BANK_FIELD GENMASK(63, 32)
+
+static unsigned long bff_get_id(struct mce *mce)
+{
+ unsigned long id = FIELD_PREP(BFF_ID_BANK_FIELD, mce->bank);
+
+ switch (bff_bank_types[mce->bank]) {
+ case BFF_BANK_DCU:
+ case BFF_BANK_DTLB:
+ if (!bff_set_cache_id(mce->extcpu, 1, &id))
+ return ULONG_MAX;
+ break;
+
+ case BFF_BANK_MLC:
+ if (!bff_set_cache_id(mce->extcpu, 2, &id))
+ return ULONG_MAX;
+ break;
+
+ case BFF_BANK_CCF:
+ if (!bff_set_cache_id(mce->extcpu, 3, &id))
+ return ULONG_MAX;
+ break;
+
+ case BFF_BANK_HSF:
+ case BFF_BANK_IOCACHE:
+ bff_set_imh_id(mce, &id);
+ break;
+
+ default:
+ return ULONG_MAX;
+ }
+
+ return id;
+}
+
static void bff_reset_and_report(struct mce *mce)
{
/* Reset bitfix filter using the CPU that logged the yellow status */
if (wrmsrq_on_cpu(mce->extcpu, MSR_MCx_BFF_CTL(mce->bank), MCI_BFF_RESET))
pr_warn("Failed to reset bitfix filter for CPU %d Bank %d\n",
mce->extcpu, mce->bank);
+
+ /* Placeholder use of bff_get_id() */
+ pr_debug("unique_id = 0x%lx\n", bff_get_id(mce));
}
static int bff_mce_notify(struct notifier_block *nb, unsigned long val, void *data)