From: Mauro Carvalho Chehab <mchehab@kernel.org>
To: Tony Luck <tony.luck@intel.com>
Cc: Borislav Petkov <bp@alien8.de>, Qiuxu Zhuo <qiuxu.zhuo@intel.com>,
Aristeu Rozanski <aris@redhat.com>,
linux-edac@vger.kernel.org
Subject: Re: [PATCH 1/2] EDAC, skx_common: Refactor so that we initialize "dev" in result of adxl decode.
Date: Wed, 18 Sep 2019 07:40:40 -0300 [thread overview]
Message-ID: <20190918074040.3e76a2ac@coco.lan> (raw)
In-Reply-To: <20190913221344.13055-2-tony.luck@intel.com>
Em Fri, 13 Sep 2019 15:13:43 -0700
Tony Luck <tony.luck@intel.com> escreveu:
> Simplifies the code a little.
>
> Signed-off-by: Tony Luck <tony.luck@intel.com>
Patch itself looks good...
> ---
> drivers/edac/skx_common.c | 48 +++++++++++++++++++--------------------
> 1 file changed, 23 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/edac/skx_common.c b/drivers/edac/skx_common.c
> index d8ff63d91b86..58b8348d0f71 100644
> --- a/drivers/edac/skx_common.c
> +++ b/drivers/edac/skx_common.c
> @@ -100,6 +100,7 @@ void __exit skx_adxl_put(void)
>
> static bool skx_adxl_decode(struct decoded_addr *res)
> {
> + struct skx_dev *d;
> int i, len = 0;
>
> if (res->addr >= skx_tohm || (res->addr >= skx_tolm &&
> @@ -118,6 +119,24 @@ static bool skx_adxl_decode(struct decoded_addr *res)
> res->channel = (int)adxl_values[component_indices[INDEX_CHANNEL]];
> res->dimm = (int)adxl_values[component_indices[INDEX_DIMM]];
>
> + if (res->imc > NUM_IMC - 1) {
> + skx_printk(KERN_ERR, "Bad imc %d\n", res->imc);
I would report this via EDAC as well.
> + return false;
> + }
> +
> + list_for_each_entry(d, &dev_edac_list, list) {
> + if (d->imc[0].src_id == res->socket) {
> + res->dev = d;
> + break;
> + }
> + }
> +
> + if (!res->dev) {
> + skx_printk(KERN_ERR, "No device for src_id %d imc %d\n",
> + res->socket, res->imc);
I would report this via EDAC as well.
> + return false;
> + }
> +
> for (i = 0; i < adxl_component_count; i++) {
> if (adxl_values[i] == ~0x0ull)
> continue;
> @@ -452,24 +471,6 @@ static void skx_unregister_mci(struct skx_imc *imc)
> edac_mc_free(mci);
> }
>
> -static struct mem_ctl_info *get_mci(int src_id, int lmc)
> -{
> - struct skx_dev *d;
> -
> - if (lmc > NUM_IMC - 1) {
> - skx_printk(KERN_ERR, "Bad lmc %d\n", lmc);
> - return NULL;
> - }
> -
> - list_for_each_entry(d, &dev_edac_list, list) {
> - if (d->imc[0].src_id == src_id)
> - return d->imc[lmc].mci;
> - }
> -
> - skx_printk(KERN_ERR, "No mci for src_id %d lmc %d\n", src_id, lmc);
> - return NULL;
> -}
> -
> static void skx_mce_output_error(struct mem_ctl_info *mci,
> const struct mce *m,
> struct decoded_addr *res)
> @@ -583,15 +584,12 @@ int skx_mce_check_error(struct notifier_block *nb, unsigned long val,
> if (adxl_component_count) {
> if (!skx_adxl_decode(&res))
> return NOTIFY_DONE;
> -
> - mci = get_mci(res.socket, res.imc);
> - } else {
> - if (!skx_decode || !skx_decode(&res))
> - return NOTIFY_DONE;
> -
> - mci = res.dev->imc[res.imc].mci;
> + } else if (!skx_decode || !skx_decode(&res)) {
> + return NOTIFY_DONE;
> }
>
> + mci = res.dev->imc[res.imc].mci;
> +
> if (!mci)
> return NOTIFY_DONE;
>
Thanks,
Mauro
next prev parent reply other threads:[~2019-09-18 10:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-13 22:13 [PATCH 0/2] EDAC, skx: Provide more machine specific location detail Tony Luck
2019-09-13 22:13 ` [PATCH 1/2] EDAC, skx_common: Refactor so that we initialize "dev" in result of adxl decode Tony Luck
2019-09-18 10:40 ` Mauro Carvalho Chehab [this message]
2019-09-23 23:36 ` Luck, Tony
2019-09-13 22:13 ` [RFC PATCH 2/2] EDAC, skx: Retrieve and print retry_rd_err_log registers Tony Luck
2019-09-18 10:52 ` Mauro Carvalho Chehab
2019-09-23 23:57 ` Luck, Tony
2019-09-24 21:52 ` [PATCHv2 " Tony Luck
2019-09-17 20:05 ` [PATCH 0/2] EDAC, skx: Provide more machine specific location detail Aristeu Rozanski
2019-09-18 10:30 ` Mauro Carvalho Chehab
2019-09-25 13:51 ` Aristeu Rozanski
Reply instructions:
You may reply publicly 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=20190918074040.3e76a2ac@coco.lan \
--to=mchehab@kernel.org \
--cc=aris@redhat.com \
--cc=bp@alien8.de \
--cc=linux-edac@vger.kernel.org \
--cc=qiuxu.zhuo@intel.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).