Merge branches 'edac-ghes' and 'edac-misc' into edac-updates-for-v6.2

Combine all queued EDAC changes for submission into v6.2:

* ras/edac-ghes:
  EDAC/igen6: Return the correct error type when not the MC owner
  apei/ghes: Use xchg_release() for updating new cache slot instead of cmpxchg()
  EDAC: Check for GHES preference in the chipset-specific EDAC drivers
  EDAC/ghes: Make ghes_edac a proper module
  EDAC/ghes: Prepare to make ghes_edac a proper module
  EDAC/ghes: Add a notifier for reporting memory errors
  efi/cper: Export several helpers for ghes_edac to use

* ras/edac-misc:
  EDAC/i10nm: fix refcount leak in pci_get_dev_wrapper()
  EDAC/i5400: Fix typo in comment: vaious -> various
  EDAC/mc_sysfs: Increase legacy channel support to 12
  MAINTAINERS: Make Mauro EDAC reviewer
  MAINTAINERS: Make Manivannan Sadhasivam the maintainer of qcom_edac
  EDAC/i5000: Mark as BROKEN

Signed-off-by: Borislav Petkov (AMD) <[email protected]>

diff --combined drivers/edac/Kconfig
index cde0849cf8612aa736414e322c558e02f7e7d0f3,70a84aba2b48b2d0aefa94ac0eb9d52d7eb1e131..4cfdefbd744da31a653fde7ce020adf274a33796
--- 1/drivers/edac/Kconfig
--- 2/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@@ -53,8 -53,8 +53,8 @@@ config EDAC_DECODE_MC
          has been initialized.
  
  config EDAC_GHES
 -      bool "Output ACPI APEI/GHES BIOS detected errors via EDAC"
 -      depends on ACPI_APEI_GHES && (EDAC=y)
 +      tristate "Output ACPI APEI/GHES BIOS detected errors via EDAC"
 +      depends on ACPI_APEI_GHES
        select UEFI_CPER
        help
          Not all machines support hardware-driven error report. Some of those
@@@ -211,6 -211,7 +211,7 @@@ config EDAC_R8260
  config EDAC_I5000
        tristate "Intel Greencreek/Blackford chipset"
        depends on X86 && PCI
+       depends on BROKEN
        help
          Support for error detection and correction the Intel
          Greekcreek/Blackford chipsets.

diff --combined drivers/edac/i10nm_base.c
index ba77c79d234d103bd424346685f243dc22fd906e,8af4d2523194a760f4fc95acebaf2a73134c2b02..65aeea53e2df47bf8d21e64cd561309cef70364f
--- 1/drivers/edac/i10nm_base.c
--- 2/drivers/edac/i10nm_base.c
+++ b/drivers/edac/i10nm_base.c
@@@ -304,11 -304,10 +304,10 @@@ static struct pci_dev *pci_get_dev_wrap
        if (unlikely(pci_enable_device(pdev) < 0)) {
                edac_dbg(2, "Failed to enable device %02x:%02x.%x\n",
                         bus, dev, fun);
+               pci_dev_put(pdev);
                return NULL;
        }
  
-       pci_dev_get(pdev);
- 
        return pdev;
  }
  
@@@ -756,9 -755,6 +755,9 @@@ static int __init i10nm_init(void
  
        edac_dbg(2, "\n");
  
 +      if (ghes_get_devices())
 +              return -EBUSY;
 +
        owner = edac_get_owner();
        if (owner && strncmp(owner, EDAC_MOD_STR, sizeof(EDAC_MOD_STR)))
                return -EBUSY;