Commit 494603e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'edac_urgent_for_v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras 

Pull EDAC fix from Tony Luck:
 "Fix 10nm EDAC driver to release and unmap resources on systems without
  HBM"

* tag 'edac_urgent_for_v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/i10nm: Release mdev/mbase when failing to detect HBM
parents 24556728 c370baa3

drivers/edac/i10nm_base.c

+9 −0
Original line number Diff line number Diff line
@@ -358,6 +358,9 @@ static int i10nm_get_hbm_munits(void) 


			mbase = ioremap(base + off, I10NM_HBM_IMC_MMIO_SIZE);

			if (!mbase) {

				pci_dev_put(d->imc[lmc].mdev);

				d->imc[lmc].mdev = NULL;



				i10nm_printk(KERN_ERR, "Failed to ioremap for hbm mc 0x%llx\n",

					     base + off);

				return -ENOMEM;
@@ -368,6 +371,12 @@ static int i10nm_get_hbm_munits(void) 


			mcmtr = I10NM_GET_MCMTR(&d->imc[lmc], 0);

			if (!I10NM_IS_HBM_IMC(mcmtr)) {

				iounmap(d->imc[lmc].mbase);

				d->imc[lmc].mbase = NULL;

				d->imc[lmc].hbm_mc = false;

				pci_dev_put(d->imc[lmc].mdev);

				d->imc[lmc].mdev = NULL;



				i10nm_printk(KERN_ERR, "This isn't an hbm mc!\n");

				return -ENODEV;

			}