Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16a832a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'edac_for_4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp 

Pull EDAC updates from Borislav Petkov:

 - pnd2_edac: A minimal sideband driver (Tony Luck)

 - small-ish cleanups and fixes all over the place

* tag 'edac_for_4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, mce_amd: Get rid of local var in amd_filter_mce()
  EDAC, mce_amd: Get rid of most struct cpuinfo_x86 uses
  EDAC, mce_amd: Rename decode_smca_errors() to decode_smca_error()
  EDAC: Make device_type const
  EDAC, pnd2: Properly toggle hidden state for P2SB PCI device
  EDAC, pnd2: Conditionally unhide/hide the P2SB PCI device to read BAR
  EDAC, pnd2: Mask off the lower four bits of a BAR
  EDAC, thunderx: Fix error handling path in thunderx_lmc_probe()
  EDAC, altera: Fix error handling path in altr_edac_device_probe()
  EDAC, pnd2: Build in a minimal sideband driver for Apollo Lake
  EDAC, sb_edac: Classify memory mirroring modes
  EDAC, cpc925, ppc4xx: Convert to using %pOF instead of full_name
  EDAC: Get rid of mci->mod_ver
  EDAC: Constify attribute_group structures
  EDAC, mce_amd: Use cpu_to_node() to find the node ID
parents bafb0762 39844347

drivers/edac/altera_edac.c

+3 −3
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include "edac_module.h"



#define EDAC_MOD_STR		"altera_edac"

#define EDAC_VERSION		"1"

#define EDAC_DEVICE		"Altera"



static const struct altr_sdram_prv_data c5_data = {
@@ -392,7 +391,6 @@ static int altr_sdram_probe(struct platform_device *pdev) 
	mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;

	mci->edac_cap = EDAC_FLAG_SECDED;

	mci->mod_name = EDAC_MOD_STR;

	mci->mod_ver = EDAC_VERSION;

	mci->ctl_name = dev_name(&pdev->dev);

	mci->scrub_mode = SCRUB_SW_SRC;

	mci->dev_name = dev_name(&pdev->dev);
@@ -749,8 +747,10 @@ static int altr_edac_device_probe(struct platform_device *pdev) 
	drvdata->edac_dev_name = ecc_name;



	drvdata->base = devm_ioremap(&pdev->dev, r->start, resource_size(r));

	if (!drvdata->base)

	if (!drvdata->base) {

		res = -ENOMEM;

		goto fail1;

	}



	/* Get driver specific data for this EDAC device */

	drvdata->data = of_match_node(altr_edac_device_of_match, np)->data;

drivers/edac/amd64_edac.c

+0 −1
Original line number Diff line number Diff line
@@ -3130,7 +3130,6 @@ static void setup_mci_misc_attrs(struct mem_ctl_info *mci, 


	mci->edac_cap		= determine_edac_cap(pvt);

	mci->mod_name		= EDAC_MOD_STR;

	mci->mod_ver		= EDAC_AMD64_VERSION;

	mci->ctl_name		= fam->ctl_name;

	mci->dev_name		= pci_name(pvt->F3);

	mci->ctl_page_to_phys	= NULL;

drivers/edac/amd76x_edac.c

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/edac.h>

#include "edac_module.h"



#define AMD76X_REVISION	" Ver: 2.0.2"

#define EDAC_MOD_STR	"amd76x_edac"



#define amd76x_printk(level, fmt, arg...) \
@@ -263,7 +262,6 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) 
	mci->edac_cap = ems_mode ?

		(EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;

	mci->mod_name = EDAC_MOD_STR;

	mci->mod_ver = AMD76X_REVISION;

	mci->ctl_name = amd76x_devs[dev_idx].ctl_name;

	mci->dev_name = pci_name(pdev);

	mci->edac_check = amd76x_check;

drivers/edac/cpc925_edac.c

+1 −2
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ static u32 cpc925_cpu_mask_disabled(void) 
		}



		if (reg == NULL || *reg > 2) {

			cpc925_printk(KERN_ERR, "Bad reg value at %s\n", cpunode->full_name);

			cpc925_printk(KERN_ERR, "Bad reg value at %pOF\n", cpunode);

			continue;

		}
@@ -999,7 +999,6 @@ static int cpc925_probe(struct platform_device *pdev) 
	mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;

	mci->edac_cap = EDAC_FLAG_SECDED;

	mci->mod_name = CPC925_EDAC_MOD_STR;

	mci->mod_ver = CPC925_EDAC_REVISION;

	mci->ctl_name = pdev->name;



	if (edac_op_state == EDAC_OPSTATE_POLL)

drivers/edac/e752x_edac.c

+0 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/edac.h>

#include "edac_module.h"



#define E752X_REVISION	" Ver: 2.0.2"

#define EDAC_MOD_STR	"e752x_edac"



static int report_non_memory_errors;
@@ -1303,7 +1302,6 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) 
		(EDAC_FLAG_NONE | EDAC_FLAG_SECDED | EDAC_FLAG_S4ECD4ED);

	/* FIXME - what if different memory types are in different csrows? */

	mci->mod_name = EDAC_MOD_STR;

	mci->mod_ver = E752X_REVISION;

	mci->pdev = &pdev->dev;



	edac_dbg(3, "init pvt\n");