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

Commit 5e2af0c0 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

edac: Don't initialize csrow's first_page & friends when not needed 



Almost all edac	drivers	initialize csrow_info->first_page,
csrow_info->last_page and csrow_info->page_mask. Those vars are
used inside the EDAC core, in order to calculate the csrow affected
by an error, by using the routine edac_mc_find_csrow_by_page().

However, very few drivers actually use it:
        e752x_edac.c
        e7xxx_edac.c
        i3000_edac.c
        i82443bxgx_edac.c
        i82860_edac.c
        i82875p_edac.c
        i82975x_edac.c
        r82600_edac.c

There also a few other drivers that have their own calculus
formula internally using those vars.

All the others are just wasting time by initializing those
data.

While initializing data without using them won't cause any troubles, as
those information is stored at the wrong place (at csrows structure), it
is better to remove what is unused, in order to simplify the next patch.

Reviewed-by: default avatarAristeu Rozanski <arozansk@redhat.com>
Acked-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
Acked-by: default avatarChris Metcalf <cmetcalf@tilera.com>
Cc: Doug Thompson <norsk5@yahoo.com>
Cc: Hitoshi Mitake <h.mitake@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: "Niklas Söderlund" <niklas.soderlund@ericsson.com>
Cc: Josh Boyer <jwboyer@gmail.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 084a4fcc

drivers/edac/amd64_edac.c

+2 −35
Original line number Diff line number Diff line
@@ -715,25 +715,6 @@ static inline u64 input_addr_to_sys_addr(struct mem_ctl_info *mci, 
				     input_addr_to_dram_addr(mci, input_addr));

}



/*

 * Find the minimum and maximum InputAddr values that map to the given @csrow.

 * Pass back these values in *input_addr_min and *input_addr_max.

 */

static void find_csrow_limits(struct mem_ctl_info *mci, int csrow,

			      u64 *input_addr_min, u64 *input_addr_max)

{

	struct amd64_pvt *pvt;

	u64 base, mask;



	pvt = mci->pvt_info;

	BUG_ON((csrow < 0) || (csrow >= pvt->csels[0].b_cnt));



	get_cs_base_and_mask(pvt, csrow, 0, &base, &mask);



	*input_addr_min = base & ~mask;

	*input_addr_max = base | mask;

}



/* Map the Error address to a PAGE and PAGE OFFSET. */

static inline void error_address_to_page_and_offset(u64 error_address,

						    u32 *page, u32 *offset)
@@ -2185,7 +2166,7 @@ static int init_csrows(struct mem_ctl_info *mci) 
{

	struct csrow_info *csrow;

	struct amd64_pvt *pvt = mci->pvt_info;

	u64 input_addr_min, input_addr_max, sys_addr, base, mask;

	u64 base, mask;

	u32 val;

	int i, j, empty = 1;

	enum mem_type mtype;
@@ -2216,28 +2197,14 @@ static int init_csrows(struct mem_ctl_info *mci) 
			csrow->nr_pages = amd64_csrow_nr_pages(pvt, 0, i);

		if (csrow_enabled(i, 1, pvt))

			csrow->nr_pages += amd64_csrow_nr_pages(pvt, 1, i);

		find_csrow_limits(mci, i, &input_addr_min, &input_addr_max);

		sys_addr = input_addr_to_sys_addr(mci, input_addr_min);

		csrow->first_page = (u32) (sys_addr >> PAGE_SHIFT);

		sys_addr = input_addr_to_sys_addr(mci, input_addr_max);

		csrow->last_page = (u32) (sys_addr >> PAGE_SHIFT);



		get_cs_base_and_mask(pvt, i, 0, &base, &mask);

		csrow->page_mask = ~mask;

		/* 8 bytes of resolution */



		mtype = amd64_determine_memory_type(pvt, i);



		debugf1("  for MC node %d csrow %d:\n", pvt->mc_node_id, i);

		debugf1("    input_addr_min: 0x%lx input_addr_max: 0x%lx\n",

			(unsigned long)input_addr_min,

			(unsigned long)input_addr_max);

		debugf1("    sys_addr: 0x%lx  page_mask: 0x%lx\n",

			(unsigned long)sys_addr, csrow->page_mask);

		debugf1("    nr_pages: %u  first_page: 0x%lx "

			"last_page: 0x%lx\n",

			(unsigned)csrow->nr_pages,

			csrow->first_page, csrow->last_page);

		debugf1("    nr_pages: %u\n", csrow->nr_pages);



		/*

		 * determine whether CHIPKILL or JUST ECC or NO ECC is operating

drivers/edac/i3200_edac.c

+0 −5
Original line number Diff line number Diff line
@@ -321,7 +321,6 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx) 
	int rc;

	int i, j;

	struct mem_ctl_info *mci = NULL;

	unsigned long last_page;

	u16 drbs[I3200_CHANNELS][I3200_RANKS_PER_CHANNEL];

	bool stacked;

	void __iomem *window;
@@ -366,7 +365,6 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx) 
	 * cumulative; the last one will contain the total memory

	 * contained in all ranks.

	 */

	last_page = -1UL;

	for (i = 0; i < mci->nr_csrows; i++) {

		unsigned long nr_pages;

		struct csrow_info *csrow = &mci->csrows[i];
@@ -378,9 +376,6 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx) 
		if (nr_pages == 0)

			continue;



		csrow->first_page = last_page + 1;

		last_page += nr_pages;

		csrow->last_page = last_page;

		csrow->nr_pages = nr_pages;



		for (j = 0; j < nr_channels; j++) {

drivers/edac/i5000_edac.c

+0 −5
Original line number Diff line number Diff line
@@ -1263,11 +1263,6 @@ static int i5000_init_csrows(struct mem_ctl_info *mci) 
		if (!MTR_DIMMS_PRESENT(mtr) && !MTR_DIMMS_PRESENT(mtr1))

			continue;



		/* FAKE OUT VALUES, FIXME */

		p_csrow->first_page = 0 + csrow * 20;

		p_csrow->last_page = 9 + csrow * 20;

		p_csrow->page_mask = 0xFFF;



		csrow_megs = 0;

		for (channel = 0; channel < pvt->maxch; channel++) {

			csrow_megs += pvt->dimm_info[csrow][channel].megabytes;

drivers/edac/i5100_edac.c

+0 −2
Original line number Diff line number Diff line
@@ -859,8 +859,6 @@ static void __devinit i5100_init_csrows(struct mem_ctl_info *mci) 
		 * FIXME: these two are totally bogus -- I don't see how to

		 * map them correctly to this structure...

		 */

		mci->csrows[i].first_page = total_pages;

		mci->csrows[i].last_page = total_pages + npages - 1;

		mci->csrows[i].nr_pages = npages;

		mci->csrows[i].csrow_idx = i;

		mci->csrows[i].mci = mci;

drivers/edac/i5400_edac.c

+0 −5
Original line number Diff line number Diff line
@@ -1180,11 +1180,6 @@ static int i5400_init_csrows(struct mem_ctl_info *mci) 
		if (!MTR_DIMMS_PRESENT(mtr))

			continue;



		/* FAKE OUT VALUES, FIXME */

		p_csrow->first_page = 0 + csrow * 20;

		p_csrow->last_page = 9 + csrow * 20;

		p_csrow->page_mask = 0xFFF;



		csrow_megs = 0;

		for (channel = 0; channel < pvt->maxch; channel++) {

			csrow_megs += pvt->dimm_info[csrow][channel].megabytes;