From: Yazen Ghannam <yazen.ghannam@amd.com>

Date: Tue, 22 Oct 2019 20:35:09 +0000

Subject: EDAC/amd64: Make struct amd64_family_type global

Git-commit: 38ddd4d1574530e1447b6ad91d27225d0f7662fb

Patch-mainline: v5.5-rc1

References: bsc#1180552

The struct amd64_family_type doesn't change between multiple nodes and

instances of the module, so make it global.

Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>

Signed-off-by: Borislav Petkov <bp@suse.de>

Cc: "linux-edac@vger.kernel.org" <linux-edac@vger.kernel.org>

Cc: James Morse <james.morse@arm.com>

Cc: Mauro Carvalho Chehab <mchehab@kernel.org>

Cc: Robert Richter <rrichter@marvell.com>

Cc: Tony Luck <tony.luck@intel.com>

Link: https://lkml.kernel.org/r/20191106012448.243970-2-Yazen.Ghannam@amd.com

---

 drivers/edac/amd64_edac.c |   12 +++++-------

 1 file changed, 5 insertions(+), 7 deletions(-)

--- a/drivers/edac/amd64_edac.c

+++ b/drivers/edac/amd64_edac.c

@@ -15,6 +15,8 @@ module_param(ecc_enable_override, int, 0

 static struct msr __percpu *msrs;

+static struct amd64_family_type *fam_type;

+

 /* Per-node stuff */

 static struct ecc_settings **ecc_stngs;

@@ -3268,8 +3270,7 @@ f17h_determine_edac_ctl_cap(struct mem_c

 	}

 }

-static void setup_mci_misc_attrs(struct mem_ctl_info *mci,

-				 struct amd64_family_type *fam)

+static void setup_mci_misc_attrs(struct mem_ctl_info *mci)

 {

 	struct amd64_pvt *pvt = mci->pvt_info;

@@ -3289,7 +3290,7 @@ static void setup_mci_misc_attrs(struct

 	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->ctl_name		= fam_type->ctl_name;

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

 	mci->ctl_page_to_phys	= NULL;

@@ -3303,8 +3304,6 @@ static void setup_mci_misc_attrs(struct

  */

 static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt)

 {

-	struct amd64_family_type *fam_type = NULL;

-

 	pvt->ext_model  = boot_cpu_data.x86_model >> 4;

 	pvt->stepping	= boot_cpu_data.x86_mask;

 	pvt->model	= boot_cpu_data.x86_model;

@@ -3407,7 +3406,6 @@ static void compute_num_umcs(void)

 static int init_one_instance(unsigned int nid)

 {

 	struct pci_dev *F3 = node_to_amd_nb(nid)->misc;

-	struct amd64_family_type *fam_type = NULL;

 	struct mem_ctl_info *mci = NULL;

 	struct edac_mc_layer layers[2];

 	struct amd64_pvt *pvt = NULL;

@@ -3484,7 +3482,7 @@ static int init_one_instance(unsigned in

 	mci->pvt_info = pvt;

 	mci->pdev = &pvt->F3->dev;

-	setup_mci_misc_attrs(mci, fam_type);

+	setup_mci_misc_attrs(mci);

 	if (init_csrows(mci))

 		mci->edac_cap = EDAC_FLAG_NONE;