Linux-EDAC Archive on lore.kernel.org
 help / color / Atom feed
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
To: Robert Richter <rrichter@marvell.com>
Cc: Borislav Petkov <bp@alien8.de>, Tony Luck <tony.luck@intel.com>,
	James Morse <james.morse@arm.com>,
	"linux-edac@vger.kernel.org" <linux-edac@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 09/19] EDAC, mc: Reorder functions edac_mc_alloc*()
Date: Fri, 11 Oct 2019 07:45:38 -0300
Message-ID: <20191011074538.7ad8715c@coco.lan> (raw)
In-Reply-To: <20191010202418.25098-10-rrichter@marvell.com>

Em Thu, 10 Oct 2019 20:25:22 +0000
Robert Richter <rrichter@marvell.com> escreveu:

> Reorder the new created functions edac_mc_alloc_csrows() and
> edac_mc_alloc_dimms() and move them before edac_mc_alloc(). No further
> code changes.
> 
> Signed-off-by: Robert Richter <rrichter@marvell.com>

Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

> ---
>  drivers/edac/edac_mc.c | 171 ++++++++++++++++++++---------------------
>  1 file changed, 84 insertions(+), 87 deletions(-)
> 
> diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
> index 0db504cb3419..6d880cf4d599 100644
> --- a/drivers/edac/edac_mc.c
> +++ b/drivers/edac/edac_mc.c
> @@ -305,93 +305,6 @@ static void _edac_mc_free(struct mem_ctl_info *mci)
>  	kfree(mci);
>  }
>  
> -static int edac_mc_alloc_csrows(struct mem_ctl_info *mci);
> -static int edac_mc_alloc_dimms(struct mem_ctl_info *mci);
> -
> -struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num,
> -				   unsigned int n_layers,
> -				   struct edac_mc_layer *layers,
> -				   unsigned int sz_pvt)
> -{
> -	struct mem_ctl_info *mci;
> -	struct edac_mc_layer *layer;
> -	unsigned int idx, size, tot_dimms = 1;
> -	unsigned int tot_csrows = 1, tot_channels = 1;
> -	void *pvt, *ptr = NULL;
> -	bool per_rank = false;
> -
> -	if (WARN_ON(n_layers > EDAC_MAX_LAYERS || n_layers == 0))
> -		return NULL;
> -
> -	/*
> -	 * Calculate the total amount of dimms and csrows/cschannels while
> -	 * in the old API emulation mode
> -	 */
> -	for (idx = 0; idx < n_layers; idx++) {
> -		tot_dimms *= layers[idx].size;
> -		if (layers[idx].is_virt_csrow)
> -			tot_csrows *= layers[idx].size;
> -		else
> -			tot_channels *= layers[idx].size;
> -
> -		if (layers[idx].type == EDAC_MC_LAYER_CHIP_SELECT)
> -			per_rank = true;
> -	}
> -
> -	/* Figure out the offsets of the various items from the start of an mc
> -	 * structure.  We want the alignment of each item to be at least as
> -	 * stringent as what the compiler would provide if we could simply
> -	 * hardcode everything into a single struct.
> -	 */
> -	mci	= edac_align_ptr(&ptr, sizeof(*mci), 1);
> -	layer	= edac_align_ptr(&ptr, sizeof(*layer), n_layers);
> -	pvt	= edac_align_ptr(&ptr, sz_pvt, 1);
> -	size	= ((unsigned long)pvt) + sz_pvt;
> -
> -	edac_dbg(1, "allocating %u bytes for mci data (%d %s, %d csrows/channels)\n",
> -		 size,
> -		 tot_dimms,
> -		 per_rank ? "ranks" : "dimms",
> -		 tot_csrows * tot_channels);
> -
> -	mci = kzalloc(size, GFP_KERNEL);
> -	if (mci == NULL)
> -		return NULL;
> -
> -	/* Adjust pointers so they point within the memory we just allocated
> -	 * rather than an imaginary chunk of memory located at address 0.
> -	 */
> -	layer = (struct edac_mc_layer *)(((char *)mci) + ((unsigned long)layer));
> -	pvt = sz_pvt ? (((char *)mci) + ((unsigned long)pvt)) : NULL;
> -
> -	/* setup index and various internal pointers */
> -	mci->mc_idx = mc_num;
> -	mci->tot_dimms = tot_dimms;
> -	mci->pvt_info = pvt;
> -	mci->n_layers = n_layers;
> -	mci->layers = layer;
> -	memcpy(mci->layers, layers, sizeof(*layer) * n_layers);
> -	mci->nr_csrows = tot_csrows;
> -	mci->num_cschannel = tot_channels;
> -	mci->csbased = per_rank;
> -
> -	if (edac_mc_alloc_csrows(mci))
> -		goto error;
> -
> -	if (edac_mc_alloc_dimms(mci))
> -		goto error;
> -
> -	mci->op_state = OP_ALLOC;
> -
> -	return mci;
> -
> -error:
> -	_edac_mc_free(mci);
> -
> -	return NULL;
> -}
> -EXPORT_SYMBOL_GPL(edac_mc_alloc);
> -
>  static int edac_mc_alloc_csrows(struct mem_ctl_info *mci)
>  {
>  	unsigned int tot_csrows = mci->nr_csrows;
> @@ -520,6 +433,90 @@ static int edac_mc_alloc_dimms(struct mem_ctl_info *mci)
>  	return 0;
>  }
>  
> +struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num,
> +				   unsigned int n_layers,
> +				   struct edac_mc_layer *layers,
> +				   unsigned int sz_pvt)
> +{
> +	struct mem_ctl_info *mci;
> +	struct edac_mc_layer *layer;
> +	unsigned int idx, size, tot_dimms = 1;
> +	unsigned int tot_csrows = 1, tot_channels = 1;
> +	void *pvt, *ptr = NULL;
> +	bool per_rank = false;
> +
> +	if (WARN_ON(n_layers > EDAC_MAX_LAYERS || n_layers == 0))
> +		return NULL;
> +
> +	/*
> +	 * Calculate the total amount of dimms and csrows/cschannels while
> +	 * in the old API emulation mode
> +	 */
> +	for (idx = 0; idx < n_layers; idx++) {
> +		tot_dimms *= layers[idx].size;
> +		if (layers[idx].is_virt_csrow)
> +			tot_csrows *= layers[idx].size;
> +		else
> +			tot_channels *= layers[idx].size;
> +
> +		if (layers[idx].type == EDAC_MC_LAYER_CHIP_SELECT)
> +			per_rank = true;
> +	}
> +
> +	/* Figure out the offsets of the various items from the start of an mc
> +	 * structure.  We want the alignment of each item to be at least as
> +	 * stringent as what the compiler would provide if we could simply
> +	 * hardcode everything into a single struct.
> +	 */
> +	mci	= edac_align_ptr(&ptr, sizeof(*mci), 1);
> +	layer	= edac_align_ptr(&ptr, sizeof(*layer), n_layers);
> +	pvt	= edac_align_ptr(&ptr, sz_pvt, 1);
> +	size	= ((unsigned long)pvt) + sz_pvt;
> +
> +	edac_dbg(1, "allocating %u bytes for mci data (%d %s, %d csrows/channels)\n",
> +		 size,
> +		 tot_dimms,
> +		 per_rank ? "ranks" : "dimms",
> +		 tot_csrows * tot_channels);
> +
> +	mci = kzalloc(size, GFP_KERNEL);
> +	if (mci == NULL)
> +		return NULL;
> +
> +	/* Adjust pointers so they point within the memory we just allocated
> +	 * rather than an imaginary chunk of memory located at address 0.
> +	 */
> +	layer = (struct edac_mc_layer *)(((char *)mci) + ((unsigned long)layer));
> +	pvt = sz_pvt ? (((char *)mci) + ((unsigned long)pvt)) : NULL;
> +
> +	/* setup index and various internal pointers */
> +	mci->mc_idx = mc_num;
> +	mci->tot_dimms = tot_dimms;
> +	mci->pvt_info = pvt;
> +	mci->n_layers = n_layers;
> +	mci->layers = layer;
> +	memcpy(mci->layers, layers, sizeof(*layer) * n_layers);
> +	mci->nr_csrows = tot_csrows;
> +	mci->num_cschannel = tot_channels;
> +	mci->csbased = per_rank;
> +
> +	if (edac_mc_alloc_csrows(mci))
> +		goto error;
> +
> +	if (edac_mc_alloc_dimms(mci))
> +		goto error;
> +
> +	mci->op_state = OP_ALLOC;
> +
> +	return mci;
> +
> +error:
> +	_edac_mc_free(mci);
> +
> +	return NULL;
> +}
> +EXPORT_SYMBOL_GPL(edac_mc_alloc);
> +
>  void edac_mc_free(struct mem_ctl_info *mci)
>  {
>  	edac_dbg(1, "\n");



Thanks,
Mauro

  reply index

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-10 20:25 [PATCH 00/19] EDAC: Rework edac_mc and ghes drivers Robert Richter
2019-10-10 20:25 ` [PATCH 01/19] EDAC: Replace EDAC_DIMM_PTR() macro with edac_get_dimm() function Robert Richter
2019-10-11  9:58   ` Mauro Carvalho Chehab
2019-10-11 11:38     ` Robert Richter
2019-10-10 20:25 ` [PATCH 02/19] EDAC: Remove EDAC_DIMM_OFF() macro Robert Richter
2019-10-11 10:09   ` Mauro Carvalho Chehab
2019-10-11 11:36     ` Robert Richter
2019-10-10 20:25 ` [PATCH 03/19] EDAC: Introduce mci_for_each_dimm() iterator Robert Richter
2019-10-11 10:14   ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 04/19] EDAC, mc: Do not BUG_ON() in edac_mc_alloc() Robert Richter
2019-10-11 10:15   ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 05/19] EDAC, mc: Reduce indentation level in edac_mc_handle_error() Robert Richter
2019-10-10 22:10   ` Joe Perches
2019-10-11  6:50     ` Robert Richter
2019-10-11 10:20     ` Mauro Carvalho Chehab
2019-10-11 10:50       ` Joe Perches
2019-10-11 12:08         ` Robert Richter
2019-10-11 14:49           ` Joe Perches
2019-10-11 10:17   ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 06/19] EDAC, mc: Remove per layer counters Robert Richter
2019-10-11 10:40   ` Mauro Carvalho Chehab
2019-10-14 11:12     ` Robert Richter
2019-10-10 20:25 ` [PATCH 07/19] EDAC, mc: Rename iterator variable to idx Robert Richter
2019-10-11 10:41   ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 08/19] EDAC, mc: Split edac_mc_alloc() into smaller functions Robert Richter
2019-10-11 10:43   ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 09/19] EDAC, mc: Reorder functions edac_mc_alloc*() Robert Richter
2019-10-11 10:45   ` Mauro Carvalho Chehab [this message]
2019-10-10 20:25 ` [PATCH 10/19] EDAC, mc: Rework edac_raw_mc_handle_error() to use struct dimm_info Robert Richter
2019-10-11 10:48   ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 11/19] EDAC: Remove misleading comment in struct edac_raw_error_desc Robert Richter
2019-10-11 10:49   ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 12/19] EDAC: Store error type " Robert Richter
2019-10-11 10:54   ` Mauro Carvalho Chehab
2019-10-14 11:47     ` Robert Richter
2019-10-10 20:25 ` [PATCH 13/19] EDAC, mc: Determine mci pointer from the error descriptor Robert Richter
2019-10-11 10:56   ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 14/19] EDAC, mc: Create new function edac_inc_csrow() Robert Richter
2019-10-11 11:08   ` Mauro Carvalho Chehab
2019-10-14 11:58     ` Robert Richter
2019-10-10 20:25 ` [PATCH 15/19] EDAC, ghes: Use standard kernel macros for page calculations Robert Richter
2019-10-11 11:10   ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 16/19] EDAC, ghes: Fix grain calculation Robert Richter
2019-10-11 11:22   ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 17/19] EDAC, ghes: Remove intermediate buffer pvt->detail_location Robert Richter
2019-10-11 11:20   ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 18/19] EDAC, ghes: Unify trace_mc_event() code with edac_mc driver Robert Richter
2019-10-11 11:23   ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 19/19] EDAC, Documentation: Describe CPER module definition and DIMM ranks Robert Richter
2019-10-11 11:29   ` Mauro Carvalho Chehab
2019-10-10 20:36 ` [PATCH 00/19] EDAC: Rework edac_mc and ghes drivers Robert Richter
2019-10-14 12:00 ` Robert Richter

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191011074538.7ad8715c@coco.lan \
    --to=mchehab+samsung@kernel.org \
    --cc=bp@alien8.de \
    --cc=james.morse@arm.com \
    --cc=linux-edac@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rrichter@marvell.com \
    --cc=tony.luck@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-EDAC Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-edac/0 linux-edac/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-edac linux-edac/ https://lore.kernel.org/linux-edac \
		linux-edac@vger.kernel.org linux-edac@archiver.kernel.org
	public-inbox-index linux-edac

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-edac


AGPL code for this site: git clone https://public-inbox.org/ public-inbox