Commit 38ddd4d1 authored by Yazen Ghannam's avatar Yazen Ghannam Committed by Borislav Petkov
Browse files

EDAC/amd64: Make struct amd64_family_type global 



The struct amd64_family_type doesn't change between multiple nodes and
instances of the module, so make it global.

Signed-off-by: default avatarYazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: default avatarBorislav 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
parent 466503d6

drivers/edac/amd64_edac.c

+5 −7
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ module_param(ecc_enable_override, int, 0644); 


static struct msr __percpu *msrs;



static struct amd64_family_type *fam_type;



/* Per-node stuff */

static struct ecc_settings **ecc_stngs;
@@ -3280,8 +3282,7 @@ f17h_determine_edac_ctl_cap(struct mem_ctl_info *mci, struct amd64_pvt *pvt) 
	}

}



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;
@@ -3300,7 +3301,7 @@ 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->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;
@@ -3314,8 +3315,6 @@ static void setup_mci_misc_attrs(struct mem_ctl_info *mci, 
 */

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_stepping;

	pvt->model	= boot_cpu_data.x86_model;
@@ -3422,7 +3421,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;
@@ -3499,7 +3497,7 @@ static int init_one_instance(unsigned int nid) 
	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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE