From: Michael Ellerman <mpe@ellerman•id.au>
To: Sam Bobroff <sbobroff@linux•ibm.com>, linuxppc-dev@lists•ozlabs.org
Subject: Re: [PATCH 13/13] powerpc/eeh: Refactor report functions
Date: Thu, 03 May 2018 23:27:12 +1000 [thread overview]
Message-ID: <87efisamz3.fsf@concordia.ellerman.id.au> (raw)
In-Reply-To: <313ced0e1c4f5140566846bb41f1c42c26c96a0b.1525242772.git.sbobroff@linux.ibm.com>
Sam Bobroff <sbobroff@linux•ibm.com> writes:
> diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
> index eb4feee81ff4..1c4336dcf9f5 100644
> --- a/arch/powerpc/kernel/eeh_driver.c
> +++ b/arch/powerpc/kernel/eeh_driver.c
> @@ -54,6 +54,25 @@ static int eeh_result_priority(enum pci_ers_result result)
> }
> };
>
> +const char *pci_ers_result_name(enum pci_ers_result r)
> +{
> + switch (r) {
> + case PCI_ERS_RESULT_NONE: return "none";
> + case PCI_ERS_RESULT_CAN_RECOVER: return "can recover";
> + case PCI_ERS_RESULT_NEED_RESET: return "need reset";
> + case PCI_ERS_RESULT_DISCONNECT: return "disconnect";
> + case PCI_ERS_RESULT_RECOVERED: return "recovered";
> + case PCI_ERS_RESULT_NO_AER_DRIVER: return "no AER driver";
> + default:
> + WARN_ONCE(1, "Unknown result type");
> + return "unknown";
> + }
> +};
> +
> +#define eeh_infoline(EDEV, FMT, ...) \
> +pr_info("EEH: PE#%x (PCI %s): " pr_fmt(FMT) "\n", EDEV->pe_config_addr, \
> +((EDEV->pdev) ? dev_name(&EDEV->pdev->dev) : "NONE"), ##__VA_ARGS__)
Ooof, I guess.
It would be nicer as a function.
"infoline" annoys me for some reason, "eeh_info" ?
> @@ -223,123 +242,118 @@ static void eeh_set_irq_state(struct eeh_pe *root, bool enable)
> }
> }
>
> +static void eeh_pe_report(const char *name, struct eeh_pe *root,
> + enum pci_ers_result (*fn)(struct eeh_dev *,
> + struct pci_driver *),
> + enum pci_ers_result *result)
> +{
> + struct eeh_pe *pe;
> + struct eeh_dev *edev, *tmp;
> + enum pci_ers_result new_result;
> +
> + pr_info("EEH: Beginning: '%s'\n", name);
> + eeh_for_each_pe(root, pe) {
> + eeh_pe_for_each_dev(pe, edev, tmp) {
This should be in a separate function.
> + device_lock(&edev->pdev->dev);
> + if (eeh_edev_actionable(edev)) {
> + struct pci_driver *driver;
> +
> + driver = eeh_pcid_get(edev->pdev);
> +
> + if (!driver)
> + eeh_infoline(edev, "no driver");
> + else if (!driver->err_handler)
> + eeh_infoline(edev,
> + "driver not EEH aware");
> + else if (edev->mode & EEH_DEV_NO_HANDLER)
> + eeh_infoline(edev,
> + "driver bound too late");
> + else {
> + new_result = fn(edev, driver);
> + eeh_infoline(edev,
> + "%s driver reports: '%s'",
> + driver->name,
> + pci_ers_result_name(new_result));
> + if (result)
> + *result = merge_result(*result,
> + new_result);
> + }
> + if (driver)
> + eeh_pcid_put(edev->pdev);
> + } else {
> + eeh_infoline(edev, "not actionable (%d,%d,%d)",
> + !!edev->pdev,
> + !eeh_dev_removed(edev),
> + !eeh_pe_passed(edev->pe));
> + }
> + device_unlock(&edev->pdev->dev);
^^^
cheers
next prev parent reply other threads:[~2018-05-03 13:27 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-02 6:34 [PATCH 00/13] EEH refactoring 2 Sam Bobroff
2018-05-02 6:34 ` [PATCH 01/13] powerpc/eeh: Add eeh_max_freezes to initial EEH log line Sam Bobroff
2018-05-04 5:46 ` Russell Currey
2018-05-02 6:35 ` [PATCH 02/13] powerpc/eeh: Add final message for successful recovery Sam Bobroff
2018-05-04 2:55 ` Michael Ellerman
2018-05-04 6:08 ` Russell Currey
2018-05-07 5:35 ` Sam Bobroff
2018-05-07 5:29 ` Sam Bobroff
2018-05-02 6:35 ` [PATCH 03/13] powerpc/eeh: Fix use-after-release of EEH driver Sam Bobroff
2018-05-04 2:56 ` Michael Ellerman
2018-05-07 5:38 ` Sam Bobroff
2018-05-02 6:35 ` [PATCH 04/13] powerpc/eeh: Remove unused eeh_pcid_name() Sam Bobroff
2018-05-04 6:29 ` Russell Currey
2018-05-02 6:35 ` [PATCH 05/13] powerpc/eeh: Strengthen types of eeh traversal functions Sam Bobroff
2018-05-04 6:32 ` Russell Currey
2018-05-02 6:35 ` [PATCH 06/13] powerpc/eeh: Add message when PE processing at parent Sam Bobroff
2018-05-04 6:51 ` Russell Currey
2018-05-02 6:36 ` [PATCH 07/13] powerpc/eeh: Clean up pci_ers_result handling Sam Bobroff
2018-05-04 2:58 ` Michael Ellerman
2018-05-04 6:58 ` Russell Currey
2018-05-08 1:09 ` Sam Bobroff
2018-05-02 6:36 ` [PATCH 08/13] powerpc/eeh: Introduce eeh_for_each_pe() Sam Bobroff
2018-05-04 6:59 ` Russell Currey
2018-05-02 6:36 ` [PATCH 09/13] powerpc/eeh: Introduce eeh_edev_actionable() Sam Bobroff
2018-05-02 6:36 ` [PATCH 10/13] powerpc/eeh: Introduce eeh_set_channel_state() Sam Bobroff
2018-05-02 6:36 ` [PATCH 11/13] powerpc/eeh: Introduce eeh_set_irq_state() Sam Bobroff
2018-05-04 3:02 ` Michael Ellerman
2018-05-08 1:12 ` Sam Bobroff
2018-05-02 6:36 ` [PATCH 12/13] powerpc/eeh: Cleaner handling of EEH_DEV_NO_HANDLER Sam Bobroff
2018-05-02 6:36 ` [PATCH 13/13] powerpc/eeh: Refactor report functions Sam Bobroff
2018-05-03 13:27 ` Michael Ellerman [this message]
2018-05-07 5:23 ` Sam Bobroff
2018-05-09 14:51 ` Michael Ellerman
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=87efisamz3.fsf@concordia.ellerman.id.au \
--to=mpe@ellerman$(echo .)id.au \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=sbobroff@linux$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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