Commit bc9ad9e4 authored by Robert Richter's avatar Robert Richter Committed by Borislav Petkov
Browse files

EDAC: Replace EDAC_DIMM_PTR() macro with edac_get_dimm() function 



The EDAC_DIMM_PTR() macro takes 3 arguments from struct mem_ctl_info.
Clean up this interface to only pass the mci struct and replace this
macro with a new function edac_get_dimm().

Also introduce an edac_get_dimm_by_index() function for later use.
This allows it to get a DIMM pointer only by a given index. This can
be useful if the DIMM's position within the layers of the memory
controller or the exact size of the layers are unknown.

Small style changes made for some hunks after applying the semantic
patch.

Semantic patch used:

@@ expression mci, a, b,c; @@

-EDAC_DIMM_PTR(mci->layers, mci->dimms, mci->n_layers, a, b, c)
+edac_get_dimm(mci, a, b, c)

 [ bp: Touchups. ]

Signed-off-by: default avatarRobert Richter <rrichter@marvell.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
Cc: "linux-edac@vger.kernel.org" <linux-edac@vger.kernel.org>
Cc: James Morse <james.morse@arm.com>
Cc: Jason Baron <jbaron@akamai.com>
Cc: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
Cc: Tero Kristo <t-kristo@ti.com>
Cc: Tony Luck <tony.luck@intel.com>
Link: https://lkml.kernel.org/r/20191106093239.25517-2-rrichter@marvell.com
parent 7fdfee92

drivers/edac/ghes_edac.c

+2 −5
Original line number Diff line number Diff line
@@ -106,9 +106,7 @@ static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg) 


	if (dh->type == DMI_ENTRY_MEM_DEVICE) {

		struct memdev_dmi_entry *entry = (struct memdev_dmi_entry *)dh;

		struct dimm_info *dimm = EDAC_DIMM_PTR(mci->layers, mci->dimms,

						       mci->n_layers,

						       dimm_fill->count, 0, 0);

		struct dimm_info *dimm = edac_get_dimm(mci, dimm_fill->count, 0, 0);

		u16 rdr_mask = BIT(7) | BIT(13);



		if (entry->size == 0xffff) {
@@ -544,8 +542,7 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev) 
		dimm_fill.mci = mci;

		dmi_walk(ghes_edac_dmidecode, &dimm_fill);

	} else {

		struct dimm_info *dimm = EDAC_DIMM_PTR(mci->layers, mci->dimms,

						       mci->n_layers, 0, 0, 0);

		struct dimm_info *dimm = edac_get_dimm(mci, 0, 0, 0);



		dimm->nr_pages = 1;

		dimm->grain = 128;

drivers/edac/i10nm_base.c

+1 −2
Original line number Diff line number Diff line
@@ -154,8 +154,7 @@ static int i10nm_get_dimm_config(struct mem_ctl_info *mci) 


		ndimms = 0;

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

			dimm = EDAC_DIMM_PTR(mci->layers, mci->dimms,

					     mci->n_layers, i, j, 0);

			dimm = edac_get_dimm(mci, i, j, 0);

			mtr = I10NM_GET_DIMMMTR(imc, i, j);

			mcddrtcfg = I10NM_GET_MCDDRTCFG(imc, i, j);

			edac_dbg(1, "dimmmtr 0x%x mcddrtcfg 0x%x (mc%d ch%d dimm%d)\n",

drivers/edac/i3200_edac.c

+1 −2
Original line number Diff line number Diff line
@@ -392,8 +392,7 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx) 
		unsigned long nr_pages;



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

			struct dimm_info *dimm = EDAC_DIMM_PTR(mci->layers, mci->dimms,

							       mci->n_layers, i, j, 0);

			struct dimm_info *dimm = edac_get_dimm(mci, i, j, 0);



			nr_pages = drb_to_nr_pages(drbs, stacked, j, i);

			if (nr_pages == 0)

drivers/edac/i5000_edac.c

+2 −3
Original line number Diff line number Diff line
@@ -1275,8 +1275,7 @@ static int i5000_init_csrows(struct mem_ctl_info *mci) 
			if (!MTR_DIMMS_PRESENT(mtr))

				continue;



			dimm = EDAC_DIMM_PTR(mci->layers, mci->dimms, mci->n_layers,

				       channel / MAX_BRANCHES,

			dimm = edac_get_dimm(mci, channel / MAX_BRANCHES,

					     channel % MAX_BRANCHES, slot);



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

drivers/edac/i5100_edac.c

+1 −2
Original line number Diff line number Diff line
@@ -858,8 +858,7 @@ static void i5100_init_csrows(struct mem_ctl_info *mci) 
		if (!npages)

			continue;



		dimm = EDAC_DIMM_PTR(mci->layers, mci->dimms, mci->n_layers,

			       chan, rank, 0);

		dimm = edac_get_dimm(mci, chan, rank, 0);



		dimm->nr_pages = npages;

		dimm->grain = 32;

CRA Git | Maintained and supported by SUSTech CRA and CCSE