Merge tag 'edac_updates_for_v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull EDAC updates from Borislav Petkov:

 - Drop a now obsolete ppc4xx_edac driver

 - Fix conversion to physical memory addresses on Intel's Elkhart Lake
   and Ice Lake hardware when the system address is above the
   (Top-Of-Memory) TOM address

 - Pay attention to the memory hole on Zynq UltraScale+ MPSoC DDR
   controllers when injecting errors for testing purposes

 - Add support for translating normalized error addresses reported by an
   AMD memory controller into system physical addresses using an UEFI
   mechanism called platform runtime mechanism (PRM).

 - The usual cleanups and fixes

* tag 'edac_updates_for_v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC: Drop obsolete PPC4xx driver
  EDAC/sb_edac: Fix the compile warning of large frame size
  EDAC/{skx_common,i10nm}: Remove the AMAP register for determing DDR5
  EDAC/{skx_common,skx,i10nm}: Move the common debug code to skx_common
  EDAC/igen6: Fix conversion of system address to physical memory address
  EDAC/synopsys: Fix error injection on Zynq UltraScale+
  RAS/AMD/ATL: Translate normalized to system physical addresses using PRM
  ACPI: PRM: Add PRM handler direct call support

diff --combined drivers/edac/skx_common.h
index 473421ba7a18a56a330d00979186666caaf0a0c0,cafae2c7b4975a04a25995c35e3dac94478616e2..f945c1bf5ca4653de0a9df689a263e215ff30676
--- 1/drivers/edac/skx_common.h
--- 2/drivers/edac/skx_common.h
+++ b/drivers/edac/skx_common.h
@@@ -45,6 -45,7 +45,6 @@@
  #define I10NM_NUM_CHANNELS    MAX(I10NM_NUM_DDR_CHANNELS, I10NM_NUM_HBM_CHANNELS)
  #define I10NM_NUM_DIMMS               MAX(I10NM_NUM_DDR_DIMMS, I10NM_NUM_HBM_DIMMS)
  
 -#define MAX(a, b)     ((a) > (b) ? (a) : (b))
  #define NUM_IMC               MAX(SKX_NUM_IMC, I10NM_NUM_IMC)
  #define NUM_CHANNELS  MAX(SKX_NUM_CHANNELS, I10NM_NUM_CHANNELS)
  #define NUM_DIMMS     MAX(SKX_NUM_DIMMS, I10NM_NUM_DIMMS)
@@@ -259,4 -260,12 +259,12 @@@ int skx_mce_check_error(struct notifier
  
  void skx_remove(void);
  
+ #ifdef CONFIG_EDAC_DEBUG
+ void skx_setup_debug(const char *name);
+ void skx_teardown_debug(void);
+ #else
+ static inline void skx_setup_debug(const char *name) {}
+ static inline void skx_teardown_debug(void) {}
+ #endif
+ 
  #endif /* _SKX_COMM_EDAC_H */