Commit b62061b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'edac_for_5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras 

Pull EDAC updates from Borislav Petkov:
 "A totally boring branch this time around: a garden variety of small
  fixes all over the place"

* tag 'edac_for_5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/amd64: Do not warn when removing instances
  EDAC/sifive: Fix return value check in ecc_register()
  EDAC/aspeed: Remove unneeded semicolon
  EDAC: remove set but not used variable 'ecc_loc'
  EDAC: skx_common: downgrade message importance on missing PCI device
  EDAC/Kconfig: Fix Kconfig indentation
parents 35417d57 7e5d6cf3

drivers/edac/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -491,8 +491,7 @@ config EDAC_TI 
	tristate "Texas Instruments DDR3 ECC Controller"

	depends on ARCH_KEYSTONE || SOC_DRA7XX

	help

	  Support for error detection and correction on the

          TI SoCs.

	  Support for error detection and correction on the TI SoCs.



config EDAC_QCOM

	tristate "QCOM EDAC Controller"

drivers/edac/amd64_edac.c

+0 −3
Original line number Diff line number Diff line
@@ -3573,9 +3573,6 @@ static void remove_one_instance(unsigned int nid) 
	struct mem_ctl_info *mci;

	struct amd64_pvt *pvt;



	mci = find_mci_by_dev(&F3->dev);

	WARN_ON(!mci);



	/* Remove from EDAC CORE tracking list */

	mci = edac_mc_del_mc(&F3->dev);

	if (!mci)

drivers/edac/aspeed_edac.c

+2 −2
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static int init_csrows(struct mem_ctl_info *mci) 
	if (!np) {

		dev_err(mci->pdev, "dt: missing /memory node\n");

		return -ENODEV;

	};

	}



	rc = of_address_to_resource(np, 0, &r);
@@ -252,7 +252,7 @@ static int init_csrows(struct mem_ctl_info *mci) 
	if (rc) {

		dev_err(mci->pdev, "dt: failed requesting resource for /memory node\n");

		return rc;

	};

	}



	dev_dbg(mci->pdev, "dt: /memory node resources: first page r.start=0x%x, resource_size=0x%x, PAGE_SHIFT macro=0x%x\n",

		r.start, resource_size(&r), PAGE_SHIFT);

drivers/edac/i5100_edac.c

+0 −7
Original line number Diff line number Diff line
@@ -259,11 +259,6 @@ static inline u32 i5100_nrecmemb_ras(u32 a) 
	return a & ((1 << 16) - 1);

}



static inline u32 i5100_redmemb_ecc_locator(u32 a)

{

	return a & ((1 << 18) - 1);

}



static inline u32 i5100_recmema_merr(u32 a)

{

	return i5100_nrecmema_merr(a);
@@ -486,7 +481,6 @@ static void i5100_read_log(struct mem_ctl_info *mci, int chan, 
	u32 dw;

	u32 dw2;

	unsigned syndrome = 0;

	unsigned ecc_loc = 0;

	unsigned merr;

	unsigned bank;

	unsigned rank;
@@ -499,7 +493,6 @@ static void i5100_read_log(struct mem_ctl_info *mci, int chan, 
		pci_read_config_dword(pdev, I5100_REDMEMA, &dw2);

		syndrome = dw2;

		pci_read_config_dword(pdev, I5100_REDMEMB, &dw2);

		ecc_loc = i5100_redmemb_ecc_locator(dw2);

	}



	if (i5100_validlog_recmemvalid(dw)) {

drivers/edac/sifive_edac.c

+2 −2
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ static int ecc_register(struct platform_device *pdev) 
	p->dci = edac_device_alloc_ctl_info(0, "sifive_ecc", 1, "sifive_ecc",

					    1, 1, NULL, 0,

					    edac_device_alloc_index());

	if (IS_ERR(p->dci))

		return PTR_ERR(p->dci);

	if (!p->dci)

		return -ENOMEM;



	p->dci->dev = &pdev->dev;

	p->dci->mod_name = "Sifive ECC Manager";

CRA Git | Maintained and supported by SUSTech CRA and CCSE