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

Commit 5566cb7c authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

i7core_edac: Memory info fixes and preparation for properly filling cswrow data 



Now, memory size is properly displayed:

    EDAC i7core: DOD Max limits: DIMMS: 2, 1-ranked, 8-banked
    EDAC i7core: DOD Max rows x colums = 0x4000 x 0x400
    EDAC i7core: Memory channel configuration:
    EDAC i7core: Ch0 phy rd0, wr0 (0x063f7c31): 2 ranks, UDIMMs
    EDAC i7core:    dimm 0 (0x00000288) 1024 Mb offset: 0, numbank: 8,
                    numrank: 1, numrow: 0x4000, numcol: 0x400
    EDAC i7core:    dimm 1 (0x00001288) 1024 Mb offset: 4, numbank: 8,
                    numrank: 1, numrow: 0x4000, numcol: 0x400
    EDAC i7core: Ch1 phy rd1, wr1 (0x063f7c31): 2 ranks, UDIMMs
    EDAC i7core:    dimm 0 (0x00000288) 1024 Mb offset: 0, numbank: 8,
                    numrank: 1, numrow: 0x4000, numcol: 0x400
    EDAC i7core: Ch2 phy rd3, wr3 (0x063f7c31): 2 ranks, UDIMMs
    EDAC i7core:    dimm 0 (0x00000288) 1024 Mb offset: 0, numbank: 8,
                    numrank: 1, numrow: 0x4000, numcol: 0x400

Still, as the way to retrieve csrows info is not known, it does a
mapping of what's available to csrows basic unit at edac core.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 854d3349

drivers/edac/i7core_edac.c

+19 −9
Original line number Original line Diff line number Diff line
@@ -113,8 +113,8 @@ 
  #define MC_DOD_NUMBANK(x)		(((x) & MC_DOD_NUMBANK_MASK) >> 7)

  #define MC_DOD_NUMBANK(x)		(((x) & MC_DOD_NUMBANK_MASK) >> 7)

  #define MC_DOD_NUMRANK_MASK		((1 << 6) | (1 << 5))

  #define MC_DOD_NUMRANK_MASK		((1 << 6) | (1 << 5))

  #define MC_DOD_NUMRANK(x)		(((x) & MC_DOD_NUMRANK_MASK) >> 5)

  #define MC_DOD_NUMRANK(x)		(((x) & MC_DOD_NUMRANK_MASK) >> 5)

  #define MC_DOD_NUMROW_MASK		((1 << 4) | (1 << 3))

  #define MC_DOD_NUMROW_MASK		((1 << 4) | (1 << 3)| (1 << 2))

  #define MC_DOD_NUMROW(x)		(((x) & MC_DOD_NUMROW_MASK) >> 3)

  #define MC_DOD_NUMROW(x)		(((x) & MC_DOD_NUMROW_MASK) >> 2)

  #define MC_DOD_NUMCOL_MASK		3

  #define MC_DOD_NUMCOL_MASK		3

  #define MC_DOD_NUMCOL(x)		((x) & MC_DOD_NUMCOL_MASK)

  #define MC_DOD_NUMCOL(x)		((x) & MC_DOD_NUMCOL_MASK)
@@ -361,6 +361,7 @@ static int get_dimm_config(struct mem_ctl_info *mci) 
	struct csrow_info *csr;

	struct csrow_info *csr;

	struct pci_dev *pdev;

	struct pci_dev *pdev;

	int i, j, csrow = 0;

	int i, j, csrow = 0;

	unsigned long last_page = 0;

	enum edac_type mode;

	enum edac_type mode;

	enum mem_type mtype;

	enum mem_type mtype;
@@ -450,6 +451,7 @@ static int get_dimm_config(struct mem_ctl_info *mci) 




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

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

			u32 banks, ranks, rows, cols;

			u32 banks, ranks, rows, cols;

			u32 size, npages;





			if (!DIMM_PRESENT(dimm_dod[j]))

			if (!DIMM_PRESENT(dimm_dod[j]))

				continue;

				continue;
@@ -459,19 +461,27 @@ static int get_dimm_config(struct mem_ctl_info *mci) 
			rows = numrow(MC_DOD_NUMROW(dimm_dod[j]));

			rows = numrow(MC_DOD_NUMROW(dimm_dod[j]));

			cols = numcol(MC_DOD_NUMCOL(dimm_dod[j]));

			cols = numcol(MC_DOD_NUMCOL(dimm_dod[j]));





			/* DDR3 has 8 I/O banks */

			size = (rows * cols * banks * ranks) >> (20 - 3);



			pvt->channel[i].dimms++;

			pvt->channel[i].dimms++;





			debugf0("\tdimm %d offset: %x, numbank: %#x, "

			debugf0("\tdimm %d (0x%08x) %d Mb offset: %x, "

				"numrank: %#x, numrow: %#x, numcol: %#x\n",

				"numbank: %d,\n\t\t"

				j,

				"numrank: %d, numrow: %#x, numcol: %#x\n",

				j, dimm_dod[j], size,

				RANKOFFSET(dimm_dod[j]),

				RANKOFFSET(dimm_dod[j]),

				banks, ranks, rows, cols);

				banks, ranks, rows, cols);





			npages = cols * rows; /* FIXME */



			csr = &mci->csrows[csrow];

			csr = &mci->csrows[csrow];

			csr->first_page = 0;

			csr->first_page = last_page + 1;

			csr->last_page = 0;

			last_page += npages;

			csr->last_page = last_page;

			csr->nr_pages = npages;



			csr->page_mask = 0;

			csr->page_mask = 0;

			csr->nr_pages = 0;

			csr->grain = 0;

			csr->grain = 0;

			csr->csrow_idx = csrow;

			csr->csrow_idx = csrow;