Em Thu, 10 Oct 2019 20:25:07 +0000
Robert Richter <rrich...@marvell.com> escreveu:
> The EDAC_DIMM_OFF() macro takes 5 arguments to get the DIMM's index.
> This can be much simplified now as the offset is already stored in
> struct dimm_info. Use it directly and completely remove the
> EDAC_DIMM_OFF() macro.
Ah, now I understand why you added the dimm idx field. One more reason
why to split it on a separate patch (or perhaps merge it here).
>
> Another advantage is that edac_mc_alloc() could be used even if the
> exact size of the layers is unknown. Only the number of DIMMs would be
> needed.
>
> Signed-off-by: Robert Richter <rrich...@marvell.com>
> ---
> drivers/edac/edac_mc.c | 15 +++++--------
> drivers/edac/edac_mc_sysfs.c | 20 ++++--------------
> include/linux/edac.h | 41 ------------------------------------
> 3 files changed, 9 insertions(+), 67 deletions(-)
>
> diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
> index 3d45adb5957f..72088d49b03b 100644
> --- a/drivers/edac/edac_mc.c
> +++ b/drivers/edac/edac_mc.c
> @@ -314,10 +314,10 @@ struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num,
> struct dimm_info *dimm;
> u32 *ce_per_layer[EDAC_MAX_LAYERS], *ue_per_layer[EDAC_MAX_LAYERS];
> unsigned int pos[EDAC_MAX_LAYERS];
> - unsigned int size, tot_dimms = 1, count = 1;
> + unsigned int idx, size, tot_dimms = 1, count = 1;
> unsigned int tot_csrows = 1, tot_channels = 1, tot_errcount = 0;
> void *pvt, *p, *ptr = NULL;
> - int i, j, row, chn, n, len, off;
> + int i, j, row, chn, n, len;
> bool per_rank = false;
>
> BUG_ON(n_layers > EDAC_MAX_LAYERS || n_layers == 0);
> @@ -425,20 +425,15 @@ struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num,
> memset(&pos, 0, sizeof(pos));
> row = 0;
> chn = 0;
> - for (i = 0; i < tot_dimms; i++) {
> + for (idx = 0; idx < tot_dimms; idx++) {
> chan = mci->csrows[row]->channels[chn];
> - off = EDAC_DIMM_OFF(layer, n_layers, pos[0], pos[1], pos[2]);
> - if (off < 0 || off >= tot_dimms) {
> - edac_mc_printk(mci, KERN_ERR, "EDAC core bug:
> EDAC_DIMM_OFF is trying to do an illegal data access\n");
> - goto error;
> - }
>
> dimm = kzalloc(sizeof(**mci->dimms), GFP_KERNEL);
> if (!dimm)
> goto error;
> - mci->dimms[off] = dimm;
> + mci->dimms[idx] = dimm;
> dimm->mci = mci;
> - dimm->idx = off;
> + dimm->idx = idx;
>
> /*
> * Copy DIMM location and initialize it.
> diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
> index 32d016f1ecd1..91e4c8f155af 100644
> --- a/drivers/edac/edac_mc_sysfs.c
> +++ b/drivers/edac/edac_mc_sysfs.c
> @@ -557,14 +557,8 @@ static ssize_t dimmdev_ce_count_show(struct device *dev,
> {
> struct dimm_info *dimm = to_dimm(dev);
> u32 count;
> - int off;
> -
> - off = EDAC_DIMM_OFF(dimm->mci->layers,
> - dimm->mci->n_layers,
> - dimm->location[0],
> - dimm->location[1],
> - dimm->location[2]);
> - count = dimm->mci->ce_per_layer[dimm->mci->n_layers-1][off];
> +
> + count = dimm->mci->ce_per_layer[dimm->mci->n_layers-1][dimm->idx];
> return sprintf(data, "%u\n", count);
> }
>
> @@ -574,14 +568,8 @@ static ssize_t dimmdev_ue_count_show(struct device *dev,
> {
> struct dimm_info *dimm = to_dimm(dev);
> u32 count;
> - int off;
> -
> - off = EDAC_DIMM_OFF(dimm->mci->layers,
> - dimm->mci->n_layers,
> - dimm->location[0],
> - dimm->location[1],
> - dimm->location[2]);
> - count = dimm->mci->ue_per_layer[dimm->mci->n_layers-1][off];
> +
> + count = dimm->mci->ue_per_layer[dimm->mci->n_layers-1][dimm->idx];
> return sprintf(data, "%u\n", count);
> }
>
> diff --git a/include/linux/edac.h b/include/linux/edac.h
> index 7f9804438589..79c5564ee314 100644
> --- a/include/linux/edac.h
> +++ b/include/linux/edac.h
> @@ -362,47 +362,6 @@ struct edac_mc_layer {
> */
> #define EDAC_MAX_LAYERS 3
>
> -/**
> - * EDAC_DIMM_OFF - Macro responsible to get a pointer offset inside a pointer
> - * array for the element given by [layer0,layer1,layer2]
> - * position
> - *
> - * @layers: a struct edac_mc_layer array, describing how many elements
> - * were allocated for each layer
> - * @nlayers: Number of layers at the @layers array
> - * @layer0: layer0 position
> - * @layer1: layer1 position. Unused if n_layers < 2
> - * @layer2: layer2 position. Unused if n_layers < 3
> - *
> - * For 1 layer, this macro returns "var[layer0] - var";
> - *
> - * For 2 layers, this macro is similar to allocate a bi-dimensional array
> - * and to return "var[layer0][layer1] - var";
> - *
> - * For 3 layers, this macro is similar to allocate a tri-dimensional array
> - * and to return "var[layer0][layer1][layer2] - var".
> - *
> - * A loop could be used here to make it more generic, but, as we only have
> - * 3 layers, this is a little faster.
> - *
> - * By design, layers can never be 0 or more than 3. If that ever happens,
> - * a NULL is returned, causing an OOPS during the memory allocation routine,
> - * with would point to the developer that he's doing something wrong.
> - */
> -#define EDAC_DIMM_OFF(layers, nlayers, layer0, layer1, layer2) ({
> \
> - int __i; \
> - if ((nlayers) == 1) \
> - __i = layer0; \
> - else if ((nlayers) == 2) \
> - __i = (layer1) + ((layers[1]).size * (layer0)); \
> - else if ((nlayers) == 3) \
> - __i = (layer2) + ((layers[2]).size * ((layer1) + \
> - ((layers[1]).size * (layer0)))); \
> - else \
> - __i = -EINVAL; \
> - __i; \
> -})
> -
> struct dimm_info {
> struct device dev;
>
Thanks,
Mauro
