Merge tag 'edac_updates_for_v7.4_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

Pull EDAC updates from Borislav Petkov:

 - Orphan several EDAC drivers: i82975x, x38, xgene, i3200. Those have
   been receiving just drive-by updates and no one really uses them. At
   least there are no traces of usage on the mailing lists. So, with the
   advent of AI-generated fixes frenzy, and because no one can really
   test fixes on those, it is time to sunset them and point them towards
   the eternal happy hunting-grounds

 - Add a dummy EDAC driver with which the EDAC core glue can be
   exercised in a VM for the cases where one does not necessarily have
   access to the hardware. This glue should be extended with all the
   necessary functionality that needs and can be tested this way

 - Add an EDAC driver to reset bitfix filters in Intel hardware. Bitfix
   filters are a hw mechanism for tracking stuck bits in memory and CPU
   arrays due to, e.g., silicon aging. Those filters can become clogged
   by transient errors accumulating over a long system uptime so this
   intel-bff (LOL :)) driver glue resets those filters on overflow. Work
   by Qiuxu Zhuo and Tony Luck

 - Export get_cpu_cacheinfo_id() for use by the new intel-bff driver

 - i10nm: Handle the case where hw disables memory controllers which
   leads to reporting the wrong memory controller when reporting an
   error

 - The now-usual AI-powered fixes and other misc cleanups and updates
   all over the place

* tag 'edac_updates_for_v7.4_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  MAINTAINERS: Orphan drivers/edac/i3200_edac.c
  EDAC/skx_base: Fix ambiguous bitwise and logical operator style
  EDAC/i10nm: Fix mdev reference leak in i10nm_get_ddr_munits()
  MAINTAINERS: Orphan drivers/edac/xgene_edac.c
  MAINTAINERS: Orphan drivers/edac/x38_edac.c
  MAINTAINERS: Orphan drivers/edac/i82975x_edac.c
  EDAC/dummy: Add a dummy EDAC driver
  EDAC/ie31200: Disable PCI device when probing fails
  EDAC/{bluefield,loongson}: Use named initializers for acpi_device_id
  MAINTAINERS: Update Qiuxu Zhuo's email address
  EDAC/intel-bff: Report frequent filter overflows
  EDAC/intel-bff: Compute unique ID for overflowed filter
  EDAC/intel-bff: Reset bitfix filter when it overflows
  EDAC/intel-bff: Add Diamond Rapids support
  EDAC/intel-bff: Add stub Intel bitfix filter driver
  x86/mce: Add enumeration for Intel bitfix filter reset
  cacheinfo: Export get_cpu_cacheinfo_id() for loadable modules
  EDAC/i10nm: Fix Granite Rapids ADXL MC mapping

1 files changed, 1 insertions, 11 deletions

diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h
index fc879ac4cc4f..56fa646df0d1 100644
--- a/include/linux/cacheinfo.h
+++ b/include/linux/cacheinfo.h
@@ -82,6 +82,7 @@ struct cpu_cacheinfo {
 };
 
 struct cpu_cacheinfo *get_cpu_cacheinfo(unsigned int cpu);
+int get_cpu_cacheinfo_id(int cpu, int level);
 int early_cache_level(unsigned int cpu);
 int init_cache_level(unsigned int cpu);
 int init_of_cache_level(unsigned int cpu);
@@ -137,17 +138,6 @@ static inline struct cacheinfo *get_cpu_cacheinfo_level(int cpu, int level)
 	return NULL;
 }
 
-/*
- * Get the id of the cache associated with @cpu at level @level.
- * cpuhp lock must be held.
- */
-static inline int get_cpu_cacheinfo_id(int cpu, int level)
-{
-	struct cacheinfo *ci = get_cpu_cacheinfo_level(cpu, level);
-
-	return ci ? ci->id : -1;
-}
-
 #if defined(CONFIG_ARM64) || defined(CONFIG_ARM)
 #define use_arch_cache_info()	(true)
 #else